Changeset 354 for libcaca/trunk/srcTweet

Timestamp:

Jan 18, 2004, 5:17:35 AM (19 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/src

Files:

• event.c (modified) (1 diff)
• graphics.c (modified) (1 diff)

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));