Changeset 3946Tweet

Timestamp:

11/18/09 18:09:26 (4 years ago)

Author:

jylam

Message:

• Explode server.c a bit more. KABOOOOM. (Maybe) fix a bug of missing refresh after cube transition

Location:

neercs/trunk/src

Files:

• neercs.h (modified) (1 diff)
• server.c (modified) (8 diffs)

neercs/trunk/src/neercs.h

@@ -164 +164 @@
     long long unsigned int last_key_time;
     int command;
+    int was_in_bell;
+    long long unsigned int last_refresh_time;
+
 
     /* Detaching */

neercs/trunk/src/server.c

@@ -37 +37 @@
 
 static void server_init(struct screen_list *screen_list);
-static int handle_key(struct screen_list *screen_list, unsigned int c);
+static int refresh_screen(struct screen_list *screen_list, int refresh);
+static int handle_key(struct screen_list *screen_list, unsigned int c, int refresh);
 static int handle_attach(struct screen_list *screen_list, char *buf);
 
@@ -65 +66 @@
     char buf[1024];
     int bytes;
-    char *title;
+    char *title = NULL;
 
     if (screen_list->attached)
@@ -204 +205 @@
 {
     int i;
-    int eof = 0, refresh = 1, was_in_bell = 0;
-    long long unsigned int last_refresh_time = 0;
+    int eof = 0, refresh = 1;
 
     screen_list->last_key_time = 0;
     screen_list->attached = 0;
     screen_list->command = 0;
+    screen_list->was_in_bell = 0;
+    screen_list->last_refresh_time = 0;
 
     server_init(screen_list);
@@ -255 +257 @@
             {
                 unsigned int c = atoi(buf + 4);
-                refresh |= handle_key(screen_list, c);
+                refresh |= handle_key(screen_list, c, refresh);
             }
             else
@@ -278 +280 @@
 
         /* Refresh screen */
-        if (!screen_list->attached)
-        {
-            /* No need to refresh Don't use the CPU too much Would be better
-               to select on terms + socket */
-            sleep(1);
-        }
-        else
-        {
-            long long unsigned int current_time = get_us();
-            long long int tdiff = (current_time - last_refresh_time) / 1000;
-            /* Draw lock window */
-            if (screen_list->locked)
-            {
-                draw_lock(screen_list);
-                refresh = 1;
-            }
-            else if ((current_time - screen_list->last_key_time >=
-                      screen_list->autolock_timeout))
-            {
-                screen_list->locked = 1;
-                refresh = 1;
-            }
-            else if ((current_time - screen_list->last_key_time >=
-                      screen_list->screensaver_timeout))
-            {
-                if (!screen_list->in_screensaver)
-                {
-                    screensaver_init(screen_list);
-                    screen_list->in_screensaver = 1;
-                    set_cursor(0, screen_list);
-                }
-                draw_screensaver(screen_list);
-                refresh = 1;
-            }
-            else if (refresh || was_in_bell)
-            {
-                if (tdiff >= screen_list->delay)
-                {
-                    was_in_bell = screen_list->in_bell;
-                    refresh_screens(screen_list);
-                    set_title(screen_list);
-                    refresh = 1;
-                }
-            }
-            if (refresh)
-            {
-                if (tdiff >= screen_list->delay)
-                {
-                    request_refresh(screen_list);
-                    refresh = 0;
-                    last_refresh_time = current_time;
-                }
-                else
-                    debug("Skipping refresh (%lld < %d)", tdiff,
-                          screen_list->delay);
-            }
-        }
-
-        if (screen_list->force_refresh)
-        {
-            wm_refresh(screen_list);
-            request_refresh(screen_list);
-        }
+        refresh |= refresh_screen(screen_list, refresh);
 
         eof = 1;
@@ -357 +297 @@
 }
 
+static int refresh_screen(struct screen_list *screen_list, int refresh)
+{    
+    if (!screen_list->attached)
+    {
+        /* No need to refresh Don't use the CPU too much Would be better to
+           select on terms + socket */
+        sleep(1);
+    }
+    else
+    {
+        long long unsigned int current_time = get_us();
+        long long int tdiff = (current_time - screen_list->last_refresh_time) / 1000;
+        
+        
+        if (screen_list->force_refresh)
+        {
+            wm_refresh(screen_list);
+            request_refresh(screen_list);
+        }
+        
+        
+        /* Draw lock window */
+        if (screen_list->locked)
+        {
+            draw_lock(screen_list);
+            refresh = 1;
+        }
+        else if ((current_time - screen_list->last_key_time >=
+                  screen_list->autolock_timeout))
+        {
+            screen_list->locked = 1;
+            refresh = 1;
+        }
+        else if ((current_time - screen_list->last_key_time >=
+                  screen_list->screensaver_timeout))
+        {
+            if (!screen_list->in_screensaver)
+            {
+                screensaver_init(screen_list);
+                screen_list->in_screensaver = 1;
+                set_cursor(0, screen_list);
+            }
+            draw_screensaver(screen_list);
+            refresh = 1;
+        }
+        else if (refresh || screen_list->was_in_bell)
+        {
+            if (tdiff >= screen_list->delay)
+            {
+                screen_list->was_in_bell = screen_list->in_bell;
+                refresh_screens(screen_list);
+                set_title(screen_list);
+                refresh = 1;
+            }
+        }
+        if (refresh)
+        {
+            if (tdiff >= screen_list->delay)
+            {
+                request_refresh(screen_list);
+                refresh = 0;
+                screen_list->last_refresh_time = current_time;
+            }
+            else
+            {
+                debug("Skipping refresh (%lld < %d)", tdiff,
+                      screen_list->delay);
+            }
+        }
+    }
+  
+    return 1;
+}
 
 static void server_init(struct screen_list *screen_list)
@@ -428 +441 @@
 }
 
-static int handle_key(struct screen_list *screen_list, unsigned int c)
-{
-    int refresh = 0;
+static int handle_key(struct screen_list *screen_list, unsigned int c, int refresh)
+{
     char *str = NULL;
     int size = 0;
@@ -549 +561 @@
     screen_list->cv = caca_create_canvas(0, 0);
     screen_list->dp = caca_create_display(screen_list->cv);
-    
+
     if (!screen_list->dp)
         return -3;
-    
+
     caca_set_display_time(screen_list->dp, screen_list->delay * 1000);
     caca_set_cursor(screen_list->dp, 1);