wm: spawn more windows for testing

- pipefs: correctly handle empty buffer
ffwff · Sep 8, 2019 · d367adb · d367adb
1 parent 1914f5a
commit d367adb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/pkgs/wm/canvwin.c b/pkgs/wm/canvwin.c
@@ -90,8 +90,6 @@ int main(int argc, char **argv) {
     window_redraw(ctx, &sprite, 0);
 
     // connect
-    int fd = open("/fb0", 0);
-
     printf("initializing connection\n");
     int fb_fd = open("/fb0", 0);
 
@@ -149,6 +147,11 @@ int main(int argc, char **argv) {
                             sprite.x += atom.mouse_event.delta_x;
                         if(!(atom.mouse_event.delta_y < 0 && sprite.y < -atom.mouse_event.delta_y))
                             sprite.y += atom.mouse_event.delta_y;
+                        if((atom.mouse_event.x - sprite.x) < 10) {
+                            // window_redraw(ctx, &sprite, 1);
+                            char *spawn_argv[] = {"canvwin", NULL};
+                            spawnv("canvwin", (char **)spawn_argv);
+                        }
                     }
                 } else if (atom.mouse_event.type == WM_MOUSE_RELEASE && mouse_drag) {
                     mouse_drag = 0;

diff --git a/pkgs/wm/wm.c b/pkgs/wm/wm.c
@@ -242,12 +242,12 @@ int main(int argc, char **argv) {
         wm.mouse_win->z_index = (size_t)-1;
     }
 
+    wm_sort_windows_by_z(&wm);
+
     // sample win
     char *spawn_argv[] = {"canvwin", NULL};
     spawnv("canvwin", (char **)spawn_argv);
 
-    wm_sort_windows_by_z(&wm);
-
     // disable console
     ioctl(STDOUT_FILENO, TIOCGSTATE, 0);
 

diff --git a/src/fs/impl/pipefs.cr b/src/fs/impl/pipefs.cr
@@ -57,6 +57,7 @@ private class PipeFSNode < VFSNode
   property prev_node
 
   def initialize(@name : GcString, @parent : PipeFSRoot, @fs : PipeFS)
+    # Serial.puts "mk ", @name, '\n'
   end
 
   @buffer = Pointer(UInt8).null
@@ -78,10 +79,10 @@ private class PipeFSNode < VFSNode
 
   def read(slice : Slice, offset : UInt32,
            process : Multiprocessing::Process? = nil) : Int32
+    # Serial.puts "read ", @name, " ", process.not_nil!.pid, '\n'
     init_buffer
     if @buffer_pos == 0
-      # TODO
-      VFS_ERR
+      0
     else
       # pop message from buffer
       size = min(slice.size, @buffer_pos)
@@ -93,10 +94,10 @@ private class PipeFSNode < VFSNode
 
   def write(slice : Slice, offset : UInt32,
             process : Multiprocessing::Process? = nil) : Int32
+    # Serial.puts "write ", @name, " ", process.not_nil!.pid, '\n'
     init_buffer
     if @buffer_pos == BUFFER_CAPACITY
-      # TODO
-      VFS_ERR
+      0
     else
       # push the message on to the buffer stack
       size = min(slice.size, BUFFER_CAPACITY - @buffer_pos)