Changeset 3500Tweet

Timestamp:

May 22, 2009, 11:03:40 AM (11 years ago)

Author:

Pascal Terjan

Message:

Send cursor position, now that we no longer export full canvas

Location:

neercs/trunk/src

Files:

• main.c (modified) (1 diff)
• server.c (modified) (3 diffs)

neercs/trunk/src/main.c

@@ -209 +209 @@
                 fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, O_NONBLOCK);
             }
-            else if(!strncmp("REFRESH", buf, 7))
-            {
-                int dt;
+            else if(!strncmp("REFRESH ", buf, 8))
+            {
+                int dt, x, y;
+                /* FIXME check the length before calling atoi*/
+                x = atoi(buf+8);
+                y = atoi(buf+19);
+                caca_gotoxy(screen_list->cv, x, y);
                 caca_refresh_display(screen_list->dp);
                 dt = caca_get_display_time(screen_list->dp);

neercs/trunk/src/server.c

@@ -111 +111 @@
         size_t bytes;
         void *buf;
-        char buf2[30];
+        char buf2[32];
         int x, y, w, h, i;
 
@@ -137 +137 @@
             debug("Requesting refresh for %d", bytes);
             towrite = bytes;
-            sprintf(buf2, "UPDATE %10d %10d ", x, y);
-            ret = write(screen_list->socket[SOCK_CLIENT], buf2, 29);
+            sprintf(buf2, "UPDATE %10d %10d", x, y);
+            ret = write(screen_list->socket[SOCK_CLIENT], buf2, strlen(buf2)+1);
             if(ret < 29 && errno != EAGAIN)
             {
@@ -164 +164 @@
             free(buf);
         }
-        write(screen_list->socket[SOCK_CLIENT], "REFRESH", 7);
+        sprintf(buf2, "REFRESH %10d %10d", caca_get_cursor_x(screen_list->cv), caca_get_cursor_y(screen_list->cv));
+        write(screen_list->socket[SOCK_CLIENT], buf2, strlen(buf2)+1);
 #if defined HAVE_CACA_DIRTY_RECTANGLES
         caca_clear_dirty_rect_list(screen_list->cv);