Changeset 3541 for neercs/trunk/srcTweet

Timestamp:

Jun 9, 2009, 2:03:47 PM (12 years ago)

Author:

Pascal Terjan

Message:

• Export full canvas when we don't have dirty rectangles support

Location:

neercs/trunk/src

Files:

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

neercs/trunk/src/main.c

@@ -204 +204 @@
                     {
                         l2 += lb;
+#if defined HAVE_CACA_DIRTY_RECTANGLES
                         l = caca_import_area_from_memory(screen_list->cv, x, y, buf, l2, "caca");
+#else
+                        l = caca_import_memory(screen_list->cv, buf, l2, "caca");
+#endif
                     }
                 }

neercs/trunk/src/server.c

@@ -112 +112 @@
         void *buf;
         char buf2[32];
-        int x, y, w, h, i;
+        int x, y, i;
 
         getsockopt(screen_list->socket[SOCK_CLIENT], SOL_SOCKET, SO_SNDBUF,
@@ -122 +122 @@
         for (i=0; i<ndirty; i++)
         {
+            int w, h;
             caca_get_dirty_rect(screen_list->cv, i, &x, &y, &w, &h);
             debug("dirty @%d,%d %dx%d [%dx%d]", x, y, w, h, caca_get_canvas_width(screen_list->cv), caca_get_canvas_height(screen_list->cv));
-#else
-        {
-            i = 0;
-            x = 0;
-            y = 0;
-            w = caca_get_canvas_width(screen_list->cv);
-            h = caca_get_canvas_height(screen_list->cv);
-#endif
             buf = caca_export_area_to_memory (screen_list->cv,
                                               x, y, w, h,
                                               "caca",
                                               &bytes);
+#else
+        {
+            i = 0;
+            x = 0;
+            y = 0;
+            buf = caca_export_memory (screen_list->cv,
+                                      "caca",
+                                      &bytes);
+#endif
             debug("Requesting refresh for %d", bytes);
             towrite = bytes;