mirror of
https://onedev.site.tesses.net/tesses-framework
synced 2026-02-08 07:45:46 +00:00
Fix apple
This commit is contained in:
@@ -1,10 +1,7 @@
|
|||||||
#include "TessesFramework/Streams/PtyStream.hpp"
|
#include "TessesFramework/Streams/PtyStream.hpp"
|
||||||
#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
||||||
#if defined(__APPLE__)
|
|
||||||
#include <util.h>
|
|
||||||
#else
|
|
||||||
#include <pty.h>
|
#include <pty.h>
|
||||||
#endif
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
@@ -14,7 +11,7 @@
|
|||||||
namespace Tesses::Framework::Streams {
|
namespace Tesses::Framework::Streams {
|
||||||
PtyStream::PtyStream(WindowSize windowSize,std::string filename, std::vector<std::string> args, std::vector<std::string> env)
|
PtyStream::PtyStream(WindowSize windowSize,std::string filename, std::vector<std::string> args, std::vector<std::string> env)
|
||||||
{
|
{
|
||||||
#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
||||||
this->wS = windowSize;
|
this->wS = windowSize;
|
||||||
this->eos=false;
|
this->eos=false;
|
||||||
winsize sz;
|
winsize sz;
|
||||||
@@ -84,7 +81,7 @@ namespace Tesses::Framework::Streams {
|
|||||||
size_t PtyStream::Read(uint8_t* buff, size_t sz)
|
size_t PtyStream::Read(uint8_t* buff, size_t sz)
|
||||||
{
|
{
|
||||||
if(this->eos) return 0;
|
if(this->eos) return 0;
|
||||||
#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
||||||
auto res = read(this->socket, buff,sz);
|
auto res = read(this->socket, buff,sz);
|
||||||
|
|
||||||
if(res == -1)
|
if(res == -1)
|
||||||
@@ -100,7 +97,7 @@ namespace Tesses::Framework::Streams {
|
|||||||
}
|
}
|
||||||
size_t PtyStream::Write(const uint8_t* buff, size_t sz)
|
size_t PtyStream::Write(const uint8_t* buff, size_t sz)
|
||||||
{
|
{
|
||||||
#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
||||||
auto res = write(this->socket, buff,sz);
|
auto res = write(this->socket, buff,sz);
|
||||||
return res;
|
return res;
|
||||||
#else
|
#else
|
||||||
@@ -113,7 +110,7 @@ namespace Tesses::Framework::Streams {
|
|||||||
}
|
}
|
||||||
void PtyStream::Resize(WindowSize windowSize)
|
void PtyStream::Resize(WindowSize windowSize)
|
||||||
{
|
{
|
||||||
#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
||||||
this->wS = windowSize;
|
this->wS = windowSize;
|
||||||
winsize sz;
|
winsize sz;
|
||||||
sz.ws_col =(unsigned short)windowSize.Columns;
|
sz.ws_col =(unsigned short)windowSize.Columns;
|
||||||
@@ -132,7 +129,7 @@ namespace Tesses::Framework::Streams {
|
|||||||
{
|
{
|
||||||
if(this->eos) return;
|
if(this->eos) return;
|
||||||
this->eos=true;
|
this->eos=true;
|
||||||
#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
|
||||||
close(this->socket);
|
close(this->socket);
|
||||||
|
|
||||||
kill((pid_t)this->pid,SIGHUP);
|
kill((pid_t)this->pid,SIGHUP);
|
||||||
|
|||||||
Reference in New Issue
Block a user