Changeset 2055 for libcaca/trunk/cacaTweet

Timestamp:

Nov 25, 2007, 3:11:58 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Add cucul_manage_canvas() and cucul_unmanage_canvas(). Display drivers no longer need to access the cv->refcount private member and cucul_set_canvas_size() is no longer needed.

Location:

libcaca/trunk/caca

Files:

• caca.c (modified) (8 diffs)
• caca_internals.h (modified) (1 diff)
• driver_cocoa.m (modified) (1 diff)
• driver_conio.c (modified) (1 diff)
• driver_gl.c (modified) (1 diff)
• driver_ncurses.c (modified) (1 diff)
• driver_raw.c (modified) (1 diff)
• driver_slang.c (modified) (1 diff)
• driver_vga.c (modified) (1 diff)
• driver_win32.c (modified) (1 diff)
• driver_x11.c (modified) (1 diff)
• graphics.c (modified) (1 diff)

libcaca/trunk/caca/caca.c

@@ -43 +43 @@
 #endif
 
+static int caca_can_resize(caca_display_t *);
 static int caca_select_driver(caca_display_t *);
 #if defined(USE_PLUGINS)
@@ -62 +63 @@
  *  \return The caca graphical context or NULL if an error occurred.
  */
-caca_display_t * caca_create_display(cucul_canvas_t * cv)
+caca_display_t * caca_create_display(cucul_canvas_t *cv)
 {
     caca_display_t *dp = malloc(sizeof(caca_display_t));
@@ -69 +70 @@
     {
         seterrno(ENOMEM);
+        return NULL;
+    }
+
+    if(cucul_manage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp))
+    {
+        free(dp);
+        seterrno(EBUSY);
         return NULL;
     }
@@ -83 +91 @@
             dlclose(dp->plugin);
 #endif
+        cucul_unmanage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp);
         free(dp);
         seterrno(ENODEV);
@@ -94 +103 @@
             dlclose(dp->plugin);
 #endif
+        cucul_unmanage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp);
         free(dp);
         seterrno(ENODEV);
         return NULL;
     }
-
-    /* Attached! */
-    dp->cv->refcount++;
 
     /* Graphics stuff */
@@ -128 +135 @@
     /* Resize events */
     dp->resize.resized = 0;
+    dp->resize.allow = 0;
 
     return dp;
@@ -150 +158 @@
         dlclose(dp->plugin);
 #endif
-    dp->cv->refcount--;
+    cucul_unmanage_canvas(dp->cv, (int (*)(void *))caca_can_resize, (void *)dp);
     free(dp);
 
@@ -159 +167 @@
  * XXX: The following functions are local.
  */
+
+static int caca_can_resize(caca_display_t *dp)
+{
+    return dp->resize.allow;
+}
 
 static int caca_select_driver(caca_display_t *dp)

libcaca/trunk/caca/caca_internals.h

@@ -142 +142 @@
     {
         int resized;   /* A resize event was requested */
+        int allow;     /* The display driver allows resizing */
         unsigned w, h; /* Requested width and height */
     } resize;

libcaca/trunk/caca/driver_cocoa.m

@@ -835 +835 @@
 
     unsigned int width = dp->cv->width, height = dp->cv->height;
-    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    dp->resize.allow = 0;
 
     // first create a full cocoa app if the host has no bundle

libcaca/trunk/caca/driver_conio.c

@@ -59 +59 @@
     /* FIXME */
 #   endif
-    __cucul_set_canvas_size(dp->cv, dp->drv.p->ti.screenwidth,
-                                    dp->drv.p->ti.screenheight);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, dp->drv.p->ti.screenwidth,
+                                  dp->drv.p->ti.screenheight);
+    dp->resize.allow = 0;
+
     return 0;
 }

libcaca/trunk/caca/driver_gl.c

@@ -103 +103 @@
 #endif
 
-    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    dp->resize.allow = 0;
 
     /* Load a libcucul internal font */

libcaca/trunk/caca/driver_ncurses.c

@@ -302 +302 @@
         }
 
-    __cucul_set_canvas_size(dp->cv, COLS, LINES);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, COLS, LINES);
+    dp->resize.allow = 0;
 
     return 0;

libcaca/trunk/caca/driver_raw.c

@@ -41 +41 @@
 #endif
 
-    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 24);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 24);
+    dp->resize.allow = 0;
 
     return 0;

libcaca/trunk/caca/driver_slang.c

@@ -171 +171 @@
 #endif
 
-    __cucul_set_canvas_size(dp->cv, SLtt_Screen_Cols, SLtt_Screen_Rows);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, SLtt_Screen_Cols, SLtt_Screen_Rows);
+    dp->resize.allow = 0;
 
     return 0;

libcaca/trunk/caca/driver_vga.c

@@ -77 +77 @@
 
     /* We don't have much choice */
-    __cucul_set_canvas_size(dp->cv, 80, 25);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, 80, 25);
+    dp->resize.allow = 0;
 
     return 0;

libcaca/trunk/caca/driver_win32.c

@@ -127 +127 @@
         return -1;
 
-    __cucul_set_canvas_size(dp->cv,
-                            csbi.srWindow.Right - csbi.srWindow.Left + 1,
-                            csbi.srWindow.Bottom - csbi.srWindow.Top + 1);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv,
+                          csbi.srWindow.Right - csbi.srWindow.Left + 1,
+                          csbi.srWindow.Bottom - csbi.srWindow.Top + 1);
+    dp->resize.allow = 0;
 
     SetConsoleMode(dp->drv.p->screen, 0);

libcaca/trunk/caca/driver_x11.c

@@ -89 +89 @@
 #endif
 
-    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    dp->resize.allow = 1;
+    cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    dp->resize.allow = 0;
 
     dp->drv.p->dpy = XOpenDisplay(NULL);

libcaca/trunk/caca/graphics.c

@@ -239 +239 @@
     /* Tell libcucul we changed size */
     if(dp->resize.w != dp->cv->width || dp->resize.h != dp->cv->height)
-        __cucul_set_canvas_size(dp->cv, dp->resize.w, dp->resize.h);
+    {
+        dp->resize.allow = 1;
+        cucul_set_canvas_size(dp->cv, dp->resize.w, dp->resize.h);
+        dp->resize.allow = 0;
+    }
 }