Changeset 354Tweet

Timestamp:

Jan 18, 2004, 5:17:35 AM (16 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c: + When resizing under X11, copy the old pixmap to the new one.
• examples/cacaview.c: + Resizing support.

Location:

libcaca/trunk

Files:

• examples/cacaview.c (modified) (4 diffs)
• src/event.c (modified) (1 diff)
• src/graphics.c (modified) (1 diff)

libcaca/trunk/examples/cacaview.c

@@ -112 +112 @@
     while(!quit)
     {
-        int ww = caca_get_width();
-        int wh = caca_get_height();
-
+        int ww, wh;
         unsigned int event, new_status = 0, new_help = 0;
 
+        ww = caca_get_width();
+        wh = caca_get_height();
+
         if(update)
-            event = caca_get_event(CACA_EVENT_KEY_PRESS);
+            event = caca_get_event(CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE);
         else
-            event = caca_wait_event(CACA_EVENT_KEY_PRESS);
+            event = caca_wait_event(CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE);
 
         while(event)
@@ -126 +127 @@
             unsigned int key = event & 0x00ffffff;
 
-            switch(key)
+            if(key) switch(key)
             {
             case 'n':
@@ -232 +233 @@
             }
 
+            if(event == CACA_EVENT_RESIZE)
+            {
+                caca_refresh();
+                ww = caca_get_width();
+                wh = caca_get_height();
+                update = 1;
+            }
+
             if(status || new_status)
                 status = new_status;
@@ -259 +268 @@
             caca_putstr((ww - strlen(buffer)) / 2, wh / 2, buffer);
             caca_refresh();
+            ww = caca_get_width();
+            wh = caca_get_height();
 
             unload_image();

libcaca/trunk/src/event.c

@@ -274 +274 @@
                 unsigned int w, h;
 
+                w = (xevent.xconfigure.width + x11_font_width / 3)
+                      / x11_font_width;
                 h = (xevent.xconfigure.height + x11_font_height / 3)
                       / x11_font_height;
-                w = (xevent.xconfigure.width + x11_font_width / 3)
-                      / x11_font_width;
 
                 if(w == _caca_width && h == _caca_height)

libcaca/trunk/src/graphics.c

@@ -1321 +1321 @@
     if(_caca_driver == CACA_DRIVER_X11)
     {
+        Pixmap new_pixmap;
+
         _caca_width = x11_new_width;
         _caca_height = x11_new_height;
 
-        XFreePixmap(x11_dpy, x11_pixmap);
         free(x11_char);
         free(x11_attr);
 
-        x11_pixmap = XCreatePixmap(x11_dpy, x11_window,
+        new_pixmap = XCreatePixmap(x11_dpy, x11_window,
                                    _caca_width * x11_font_width,
                                    _caca_height * x11_font_height,
                                    DefaultDepth(x11_dpy,
                                                 DefaultScreen(x11_dpy)));
+        XCopyArea(x11_dpy, x11_pixmap, new_pixmap, x11_gc, 0, 0,
+                  old_width * x11_font_width, old_height * x11_font_height,
+                  0, 0);
+        XFreePixmap(x11_dpy, x11_pixmap);
+        x11_pixmap = new_pixmap;
+
         x11_char = malloc(_caca_width * _caca_height * sizeof(int));
         memset(x11_char, 0, _caca_width * _caca_height * sizeof(int));