Changeset 353Tweet

Timestamp:

Jan 18, 2004, 5:01:32 AM (18 years ago)

Author:

Sam Hocevar

Message:

• src/event.c: + Refresh the X11 window when an exposure event is received. + When resizing the X11 window, start showing extra characters when two

thirds are visible.

Location:

libcaca/trunk/src

Files:

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

libcaca/trunk/src/caca_internals.h

@@ -86 +86 @@
 extern Display *x11_dpy;
 extern Window x11_window;
+extern Pixmap x11_pixmap;
+extern GC x11_gc;
 extern long int x11_event_mask;
 extern int x11_font_width, x11_font_height;

libcaca/trunk/src/event.c

@@ -260 +260 @@
             KeySym keysym;
 
+            /* Expose event */
+            if(xevent.type == Expose)
+            {
+                XCopyArea(x11_dpy, x11_pixmap, x11_window, x11_gc, 0, 0,
+                          _caca_width * x11_font_width,
+                          _caca_height * x11_font_height, 0, 0);
+                continue;
+            }
+
             /* Resize event */
             if(xevent.type == ConfigureNotify)
             {
-                unsigned int w = xevent.xconfigure.width / x11_font_width;
-                unsigned int h = xevent.xconfigure.height / x11_font_height;
+                unsigned int w, h;
+
+                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

@@ -164 +164 @@
 Display *x11_dpy;
 Window x11_window;
+Pixmap x11_pixmap;
+GC x11_gc;
 long int x11_event_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask
-            | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
+            | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask
+            | ExposureMask;
 int x11_font_width, x11_font_height;
 unsigned int x11_new_width, x11_new_height;
-static GC x11_gc;
-static Pixmap x11_pixmap;
 static uint8_t *x11_char, *x11_attr;
 static int x11_colors[16];