Changeset 2368Tweet

Timestamp:

06/13/08 14:52:48 (5 years ago)

Author:

jylam

Message:

• Added bell handling

Location:

neercs/trunk/src

Files:

• main.c (modified) (7 diffs)
• neercs.h (modified) (3 diffs)
• term.c (modified) (2 diffs)

neercs/trunk/src/main.c

@@ -91 +91 @@
     screen_list->height = cucul_get_canvas_height(cv) - ((mini*6) + (status));
     screen_list->wm_type = WM_CARD;
+    screen_list->in_bell = 0;
 
     for(i = 0; i < nt; i++)
@@ -189 +190 @@
             unsigned long int bytes;
 
-            bytes = import_term(screen_list->screen[i], screen_list->screen[i]->buf, screen_list->screen[i]->total);
+            bytes = import_term(screen_list, screen_list->screen[i], screen_list->screen[i]->buf, screen_list->screen[i]->total);
 
             if(bytes > 0)
@@ -286 +287 @@
 
         /* Refresh screen */
-        if(refresh)
+        if(refresh || screen_list->in_bell)
         {
             refresh = 0;
@@ -302 +303 @@
             for(i = screen_list->count - 1; i >=0; i--)
             {
-
                 if(i!=pty)
                 {
@@ -314 +314 @@
                                          screen_list->screen[i]->w + 2,
                                          screen_list->screen[i]->h + 2);
-
                 }
 
@@ -324 +323 @@
                        screen_list->screen[pty]->y,
                    screen_list->screen[pty]->cv, NULL);
+            if(screen_list->screen[pty]->bell)
+            {
+                cucul_set_color_ansi(cv, CUCUL_RED, CUCUL_BLACK);
+                screen_list->screen[pty]->bell = 0;
+                screen_list->in_bell--;
+            }
+            else
+            {
+                cucul_set_color_ansi(cv, CUCUL_LIGHTGREEN, CUCUL_BLACK);
+            }
             cucul_draw_cp437_box(cv,
                                  screen_list->screen[pty]->x - 1,
@@ -436 +445 @@
     s->h = h+1;
     s->fd = create_pty(command, w, h);
+    s->bell = 0;
+
     if(s->fd < 0)
     {

neercs/trunk/src/neercs.h

@@ -42 +42 @@
     unsigned char *buf;
     long int total;
+    int bell;
 
     int x, y;
@@ -50 +51 @@
 {
     int wm_type;
+    int in_bell;
     int count;
     int width, height;
@@ -57 +59 @@
 
 
-long int import_term(struct screen *sc, void const *data, unsigned int size);
+long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size);
 int set_tty_size(int fd, unsigned int w, unsigned int h);
 

neercs/trunk/src/term.c

@@ -26 +26 @@
                             unsigned int, unsigned int const *);
 
-long int import_term(struct screen *sc, void const *data, unsigned int size)
+long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size)
 {
     unsigned char const *buffer = (unsigned char const*)data;
@@ -68 +68 @@
             x = 0;
             y++;
+        }
+        else if(buffer[i] == '\a')
+        {
+            screen_list->in_bell = 10;
+            sc->bell = 10;
         }