Terminal: use poll for PTY and window, Kernel: Fixed PTYDevice CanRea…

…d() for master devices, LibLemon: More gfx fixes
Weiww-Xu · Sep 9, 2020 · 7b25efa · 7b25efa
1 parent d29461b
commit 7b25efa
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
@@ -480,7 +480,14 @@ int main(char argc, char** argv){
 
 	ioctl(masterPTYFd, TIOCSWINSZ, &wSz);
 
+	std::vector<pollfd> fds;
+	fds.push_back({.fd = masterPTYFd, .events = POLLIN});
+
+	auto& wMHandler = window->GetHandler();
+	fds.insert(fds.begin(), wMHandler.GetFileDescriptors().begin(), wMHandler.GetFileDescriptors().end());
 	for(;;){
+		poll(fds.data(), fds.size(), -1);
+
 		Lemon::LemonEvent ev;
 		while(window->PollEvent(ev)){
 			if(ev.event == Lemon::EventKeyPressed){

diff --git a/Kernel/include/fs/filesystem.h b/Kernel/include/fs/filesystem.h
@@ -204,7 +204,7 @@ class FsNode{
     virtual void Sync(); // Sync node to device
 
     virtual bool CanRead() { return true; }
-    virtual bool CanWrite() { return false; }
+    virtual bool CanWrite() { return true; }
 
     FsNode* link;
     FsNode* parent;

diff --git a/Kernel/src/tty/pty.cpp b/Kernel/src/tty/pty.cpp
@@ -104,7 +104,16 @@ int PTYDevice::Ioctl(uint64_t cmd, uint64_t arg){
 	return 0;
 }
 
-bool PTYDevice::CanRead() { return !(pty->IsCanonical() && !pty->slave.lines); };
+bool PTYDevice::CanRead() {
+	if(device == PTYMasterDevice){
+		return !!pty->master.bufferPos;
+	} else if(device == PTYSlaveDevice){
+		if(pty->IsCanonical())
+			return !!pty->slave.lines;
+		else 
+			return !!pty->slave.bufferPos;
+	}
+}
 
 PTY::PTY(){
 	slaveFile.flags = FS_NODE_CHARDEVICE;

diff --git a/LibLemon/include/core/msghandler.h b/LibLemon/include/core/msghandler.h
@@ -10,11 +10,11 @@ namespace Lemon{
     };
 
     class MessageHandler {
+    public:
+        virtual std::vector<pollfd> GetFileDescriptors() = 0;
     protected:
         friend class MessageMultiplexer;
 
-        virtual std::vector<pollfd> GetFileDescriptors() = 0;
-
         virtual ~MessageHandler() = default;
     };
 

diff --git a/LibLemon/src/gfx/sse2.asm b/LibLemon/src/gfx/sse2.asm
@@ -24,6 +24,9 @@ memcpy_sse2:
 memcpy_sse2_unaligned:
 	xor rax, rax
 	mov rcx, rdx
+	
+	test rcx, rcx
+	jz .ret
 .loop:
 	movdqu xmm0, [rsi + rax]
 
@@ -32,6 +35,7 @@ memcpy_sse2_unaligned:
 	add rax, 0x10
 	loop .loop
 	
+.ret:
 	ret
 
 memset32_sse2:

diff --git a/System/LemonWM/lemonwm.h b/System/LemonWM/lemonwm.h
@@ -16,7 +16,7 @@
 #define CONTEXT_ITEM_WIDTH 128
 
 //#define LEMONWM_USE_CLIPPING
-#define LEMONWM_FRAMERATE_COUNTER
+//#define LEMONWM_FRAMERATE_COUNTER
 
 using WindowBuffer = Lemon::GUI::WindowBuffer;