Changeset 4789Tweet

Timestamp:

Dec 9, 2011, 12:21:41 AM (10 years ago)

Author:

Pascal Terjan

Message:

Don't handle events before we finished attaching

Location:

neercs/trunk/src

Files:

• client.c (modified) (2 diffs)
• neercs.h (modified) (1 diff)
• screen_list.c (modified) (1 diff)

neercs/trunk/src/client.c

@@ -254 +254 @@
                     send_delay(screen_list);
                 }
+                screen_list->comm.attached = 1;
             }
             else if (!strncmp("CURSOR ", buf, 7))
@@ -270 +271 @@
         }
 
-        if (ret)
-        {
-            debug("ret1\n");
-            break;
-        }
-        ret = caca_get_event(screen_list->dp,
-                             CACA_EVENT_KEY_PRESS
-                             | CACA_EVENT_MOUSE_PRESS
-                             | CACA_EVENT_MOUSE_RELEASE
-                             | CACA_EVENT_MOUSE_MOTION
-                             | CACA_EVENT_RESIZE
-                             | CACA_EVENT_QUIT, &ev, 10000);
-        if (ret)
-            ret = send_event(ev, screen_list);
-
-        if (ret)
-        {
-            debug("ret2\n");
-            break;
+        /* Wait to have finished attaching before handling events */
+        if (screen_list->comm.attached)
+        {
+           ret = caca_get_event(screen_list->dp,
+                                CACA_EVENT_KEY_PRESS
+                                | CACA_EVENT_MOUSE_PRESS
+                                | CACA_EVENT_MOUSE_RELEASE
+                                | CACA_EVENT_MOUSE_MOTION
+                                | CACA_EVENT_RESIZE
+                                | CACA_EVENT_QUIT, &ev, 10000);
+           if (ret)
+               ret = send_event(ev, screen_list);
+           if (ret)
+           {
+               debug("Failed send event, quitting: %s\n", strerror(errno));
+               break;
+           }
         }
     }

neercs/trunk/src/neercs.h

@@ -175 +175 @@
 {
     /* Detaching */
-    int attached;                /* Are we attached to a terminal */
+    int attached;                /* Are we attached to a terminal or a server */
     int socket[2];               /* Sockets to write to the server / to the client */
     char *socket_path[2];        /* Sockets to write to the server / to the client */

neercs/trunk/src/screen_list.c

@@ -77 +77 @@
     screen_list->lock.lock_offset = 0;
     screen_list->lock.lock_on_detach = 0;
-    screen_list->comm.attached = 1;
+    screen_list->comm.attached = 0;
     screen_list->comm.socket[SOCK_SERVER] = 0;
     screen_list->comm.socket[SOCK_CLIENT] = 0;