Changeset 553 for libcaca/trunk/caca/driver_gl.cTweet

Timestamp:

Mar 8, 2006, 8:41:53 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Fixed async issues between the driver and libcaca when resizing windows, and simplified the handle_resize() API. Still can be polished.

File:

• libcaca/trunk/caca/driver_gl.c (modified) (6 diffs)

libcaca/trunk/caca/driver_gl.c

@@ -76 +76 @@
     int window;
     unsigned int width, height;
+    unsigned int new_width, new_height;
     float font_width, font_height;
     float incx, incy;
     int id[94];
-    unsigned char resized, bit;
+    unsigned char bit;
     unsigned char mouse_changed, mouse_clicked;
     unsigned int mouse_x, mouse_y;
@@ -86 +87 @@
     unsigned char key;
     int special_key;
-    int new_width;
-    int new_height;
 
     float sw, sh;
@@ -118 +117 @@
     kk->drv.p->height = kk->qq->height * kk->drv.p->font_height;
 
-    kk->drv.p->resized = 0;
     kk->drv.p->bit = 0;
 
@@ -294 +292 @@
 }
 
-static void gl_handle_resize(caca_t *kk, unsigned int *new_width,
-                                         unsigned int *new_height)
+static void gl_handle_resize(caca_t *kk)
 {
     kk->drv.p->width = kk->drv.p->new_width;
     kk->drv.p->height = kk->drv.p->new_height;
-
-    *new_width = kk->drv.p->width / kk->drv.p->font_width;
-    *new_height = (kk->drv.p->height / kk->drv.p->font_height) + 1;
 
     glMatrixMode(GL_PROJECTION);
@@ -318 +312 @@
     glutMainLoopEvent();
 
-    if(kk->drv.p->resized && !kk->resize)
-    {
-        kk->resize = 1;
-        kk->drv.p->resized = 0;
+    if(kk->resize.resized)
         return CACA_EVENT_RESIZE;
-    }
 
     if(kk->drv.p->mouse_changed)
@@ -401 +391 @@
         kk->drv.p->new_height = h;
 
-        kk->drv.p->resized = 1;
+        kk->resize.w = w / kk->drv.p->font_width;
+        kk->resize.h = (h / kk->drv.p->font_height) + 1;
+
+        kk->resize.resized = 1;
     }
     else