Changeset 4049 for neercs/trunkTweet

Timestamp:

Nov 27, 2009, 11:55:14 AM (12 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Restored bell behaviour

Location:

neercs/trunk

Files:

• TODO (modified) (1 diff)
• XCode/XCode.xcodeproj/project.pbxproj (modified) (2 diffs)
• src/server.c (modified) (2 diffs)
• src/term.c (modified) (1 diff)
• src/wm.c (modified) (4 diffs)

neercs/trunk/TODO

@@ -1 +1 @@
 - Add some options
  * Autolock after n seconds of screensaver
+- Handle multiple clients on the same server to mimic screen
 - Improve performance

neercs/trunk/XCode/XCode.xcodeproj/project.pbxproj

@@ -74 +74 @@
                                 E6DB675110B2AAE300B6F924 /* config.h */,
                                 E6DB672410B19E2200B6F924 /* neercs.h */,
+                                E6BC2FBF10BEE46A00CED875 /* widgets.h */,
                                 E6DB672110B19E2200B6F924 /* mygetopt.h */,
                                 E6DB672310B19E2200B6F924 /* mytrace.h */,
@@ -94 +95 @@
                                 E6A767B510B44014008B6DEC /* client.c */,
                                 E6A76A3D10B97B65008B6DEC /* help.c */,
+                                E6BC2FC010BEE46A00CED875 /* widgets.c */,
                                 E6DB672510B19E2200B6F924 /* neercsrc */,
                                 E6DB671F10B19E2200B6F924 /* Makefile.am */,
-                                E6BC2FBF10BEE46A00CED875 /* widgets.h */,
-                                E6BC2FC010BEE46A00CED875 /* widgets.c */,
                         );
                         name = src;

neercs/trunk/src/server.c

@@ -323 +323 @@
         long long int tdiff =
             (current_time - screen_list->last_refresh_time) / 1000;
-
-
+        
         if (screen_list->force_refresh)
         {
             wm_refresh(screen_list);
+            refresh = 1;
         }
 
@@ -358 +358 @@
             if (tdiff >= screen_list->delay)
             {
-                screen_list->was_in_bell = screen_list->in_bell;
                 refresh_screens(screen_list);
                 set_title(screen_list);

neercs/trunk/src/term.c

@@ -146 +146 @@
     {
         if (!sc->bell)
-            screen_list->in_bell++;
+            screen_list->in_bell=10;
         sc->bell = 1;
     }

neercs/trunk/src/wm.c

@@ -203 +203 @@
     {
         caca_set_color_ansi(screen_list->cv, CACA_RED, CACA_BLACK);
-        screen_list->screen[screen_list->pty]->bell = 0;
         screen_list->in_bell--;
+        screen_list->force_refresh = 1;
+        if (!screen_list->in_bell)
+        {
+            screen_list->was_in_bell = 1;
+            screen_list->screen[screen_list->pty]->bell = 0;
+        }
     }
     else
     {
+        if (screen_list->was_in_bell)
+        {
+            screen_list->screen[screen_list->pty]->bell = 0;
+            screen_list->force_refresh = 1;
+            screen_list->was_in_bell = 0;
+            screen_list->changed = 1;
+        }
         caca_set_color_ansi(screen_list->cv, CACA_LIGHTGREEN, CACA_BLACK);
     }
@@ -214 +226 @@
 static void wm_box(struct screen_list *screen_list, int pty)
 {
-    if (!screen_list->screen[pty]->changed
-        && !screen_list->changed)
+    if (!screen_list->screen[pty]->changed && !screen_list->changed)
         return;
 
@@ -221 +232 @@
         return;
 
+    /* Color determined by wm_bell() */
     caca_draw_cp437_box(screen_list->cv,
                         screen_list->screen[pty]->x - 1,
@@ -396 +408 @@
     {
         wm_refresh_full(screen_list);
-        screen_list->force_refresh = 0;
+        // screen_list->force_refresh = 0;
     }
     else