Changeset 349Tweet

Timestamp:

Jan 13, 2004, 11:33:09 PM (18 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c src/event.c: + The ncurses and S-Lang drivers properly return CACA_EVENT_RESIZE.
• test/event.c: + Display CACA_EVENT_RESIZE.

Location:

libcaca/trunk

Files:

• src/caca_internals.h (modified) (2 diffs)
• src/event.c (modified) (3 diffs)
• src/graphics.c (modified) (10 diffs)
• test/event.c (modified) (1 diff)

libcaca/trunk/src/caca_internals.h

@@ -74 +74 @@
 extern unsigned int _caca_width;
 extern unsigned int _caca_height;
-extern unsigned int _caca_new_width;
-extern unsigned int _caca_new_height;
+extern int _caca_resize;
+extern int _caca_resize_event;
 
 /* Internal libcaca features */
@@ -88 +88 @@
 extern long int x11_event_mask;
 extern int x11_font_width, x11_font_height;
+extern unsigned int x11_new_width, x11_new_height;
 #endif
 

libcaca/trunk/src/event.c

@@ -263 +263 @@
                     continue;
 
-                _caca_new_width = w;
-                _caca_new_height = h;
+                x11_new_width = w;
+                x11_new_height = h;
+
+                if(_caca_resize)
+                    continue;
+
+                _caca_resize = 1;
 
                 return CACA_EVENT_RESIZE;
@@ -342 +347 @@
     if(_caca_driver == CACA_DRIVER_NCURSES)
     {
-        int intkey = getch();
+        int intkey;
+
+        if(_caca_resize_event)
+        {
+            _caca_resize_event = 0;
+            return CACA_EVENT_RESIZE;
+        }
+
+        intkey = getch();
         if(intkey == ERR)
             return CACA_EVENT_NONE;
@@ -518 +531 @@
     {
         int intkey;
+
+        if(_caca_resize_event)
+        {
+            _caca_resize_event = 0;
+            return CACA_EVENT_RESIZE;
+        }
 
         if(!SLang_input_pending(0))

libcaca/trunk/src/graphics.c

@@ -86 +86 @@
 unsigned int _caca_width = 0;
 unsigned int _caca_height = 0;
-unsigned int _caca_new_width = 0;
-unsigned int _caca_new_height = 0;
+int _caca_resize = 0;
+int _caca_resize_event = 0;
 #endif
 
@@ -167 +167 @@
             | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
 int x11_font_width, x11_font_height;
+unsigned int x11_new_width, x11_new_height;
 static GC x11_gc;
 static Pixmap x11_pixmap;
@@ -827 +828 @@
                                    DefaultDepth(x11_dpy,
                                                 DefaultScreen(x11_dpy)));
+
+        x11_new_width = x11_new_height = 0;
     }
     else
@@ -907 +910 @@
 
     _caca_scratch_line = malloc(_caca_width + 1);
-
-    _caca_new_width = _caca_width;
-    _caca_new_height = _caca_height;
 
     _caca_delay = 0;
@@ -1185 +1185 @@
     }
 
-    if(_caca_width != _caca_new_width || _caca_height != _caca_new_height)
+    if(_caca_resize)
+    {
+        _caca_resize = 0;
         caca_handle_resize();
+    }
 
     /* Wait until _caca_delay + time of last call */
@@ -1215 +1218 @@
     unsigned int old_height = _caca_height;
 
-    _caca_width = _caca_new_width;
-    _caca_height = _caca_new_height;
-
-    if(_caca_width != old_width)
-    {
-        free(_caca_empty_line);
-        _caca_empty_line = malloc(_caca_width + 1);
-        memset(_caca_empty_line, ' ', _caca_width);
-        _caca_empty_line[_caca_width] = '\0';
-
-        free(_caca_scratch_line);
-        _caca_scratch_line = malloc(_caca_width + 1);
-    }
-
 #if defined(USE_SLANG)
     if(_caca_driver == CACA_DRIVER_SLANG)
     {
-        SLsmg_reinit_smg();
+        SLtt_get_screen_size();
+        _caca_width = SLtt_Screen_Cols;
+        _caca_height = SLtt_Screen_Rows;
+
+        if(_caca_width != old_width || _caca_height != old_height)
+            SLsmg_reinit_smg();
     }
     else
@@ -1239 +1233 @@
     if(_caca_driver == CACA_DRIVER_NCURSES)
     {
-        resize_term(_caca_height, _caca_width);
-        wrefresh(curscr);
+        struct winsize size;
+
+        if(ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0)
+        {
+            _caca_width = size.ws_col;
+            _caca_height = size.ws_row;
+            resize_term(_caca_height, _caca_width);
+            wrefresh(curscr);
+        }
     }
     else
@@ -1253 +1254 @@
     if(_caca_driver == CACA_DRIVER_X11)
     {
+        _caca_width = x11_new_width;
+        _caca_height = x11_new_height;
+
         XFreePixmap(x11_dpy, x11_pixmap);
         free(x11_char);
@@ -1277 +1281 @@
     {
         /* Dummy */
+    }
+
+    if(_caca_width != old_width)
+    {
+        free(_caca_empty_line);
+        _caca_empty_line = malloc(_caca_width + 1);
+        memset(_caca_empty_line, ' ', _caca_width);
+        _caca_empty_line[_caca_width] = '\0';
+
+        free(_caca_scratch_line);
+        _caca_scratch_line = malloc(_caca_width + 1);
     }
 }
@@ -1336 +1351 @@
 static RETSIGTYPE sigwinch_handler(int sig)
 {
-    struct winsize size;
-
-#if defined(USE_SLANG)
-    if(_caca_driver == CACA_DRIVER_SLANG)
-    {
-        SLtt_get_screen_size();
-        _caca_new_width = SLtt_Screen_Cols;
-        _caca_new_height = SLtt_Screen_Rows;
-    }
-    else
-#endif
-#if defined(USE_NCURSES)
-    if(_caca_driver == CACA_DRIVER_NCURSES)
-    {
-        if(ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0)
-        {
-            _caca_new_width = size.ws_col;
-            _caca_new_height = size.ws_row;
-        }
-    }
-    else
-#endif
-    {
-        /* Dummy */
-    }
+    _caca_resize_event = 1;
 
     signal(SIGWINCH, sigwinch_handler);;

libcaca/trunk/test/event.c

@@ -138 +138 @@
                     event & 0x00ffffff);
         break;
+    case CACA_EVENT_RESIZE:
+        caca_printf(x, y, "CACA_EVENT_RESIZE");
+        break;
     default:
         caca_printf(x, y, "CACA_EVENT_UNKNOWN");