Changeset 2056 for libcaca/trunk/caca/driver_x11.cTweet

Timestamp:

Nov 25, 2007, 3:12:01 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Introduce cucul_get_canvas_chars() and cucul_get_canvas_attrs() to avoid direct cv->chars and cv->attrs access by display drivers.

File:

• libcaca/trunk/caca/driver_x11.c (modified) (12 diffs)

libcaca/trunk/caca/driver_x11.c

@@ -34 +34 @@
 #include <string.h>
 
+#include "cucul.h"
+#include "cucul_internals.h"
 #include "caca.h"
 #include "caca_internals.h"
-#include "cucul.h"
-#include "cucul_internals.h"
 
 /*
@@ -78 +78 @@
     char const *fonts[] = { NULL, "8x13bold", "fixed" }, **parser;
     char const *geometry;
-    unsigned int width = dp->cv->width, height = dp->cv->height;
+    unsigned int width = cucul_get_canvas_width(dp->cv);
+    unsigned int height = cucul_get_canvas_height(dp->cv);
     int i;
 
@@ -91 +92 @@
     dp->resize.allow = 1;
     cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    width = cucul_get_canvas_width(dp->cv);
+    height = cucul_get_canvas_height(dp->cv);
     dp->resize.allow = 0;
 
@@ -193 +196 @@
     dp->drv.p->window =
         XCreateWindow(dp->drv.p->dpy, DefaultRootWindow(dp->drv.p->dpy), 0, 0,
-                      dp->cv->width * dp->drv.p->font_width,
-                      dp->cv->height * dp->drv.p->font_height,
+                      width * dp->drv.p->font_width,
+                      height * dp->drv.p->font_height,
                       0, 0, InputOutput, 0,
                       CWBackingStore | CWBackPixel | CWEventMask,
@@ -241 +244 @@
 
     dp->drv.p->pixmap = XCreatePixmap(dp->drv.p->dpy, dp->drv.p->window,
-                                   dp->cv->width * dp->drv.p->font_width,
-                                   dp->cv->height * dp->drv.p->font_height,
-                                   DefaultDepth(dp->drv.p->dpy,
-                                            DefaultScreen(dp->drv.p->dpy)));
+                                      width * dp->drv.p->font_width,
+                                      height * dp->drv.p->font_height,
+                                      DefaultDepth(dp->drv.p->dpy,
+                                      DefaultScreen(dp->drv.p->dpy)));
     dp->drv.p->pointer = None;
 
@@ -279 +282 @@
 static unsigned int x11_get_display_width(caca_display_t const *dp)
 {
-    return dp->cv->width * dp->drv.p->font_width;
+    return cucul_get_canvas_width(dp->cv) * dp->drv.p->font_width;
 }
 
 static unsigned int x11_get_display_height(caca_display_t const *dp)
 {
-    return dp->cv->height * dp->drv.p->font_height;
+    return cucul_get_canvas_height(dp->cv) * dp->drv.p->font_height;
 }
 
 static void x11_display(caca_display_t *dp)
 {
+    uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
+    uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
+    unsigned int width = cucul_get_canvas_width(dp->cv);
+    unsigned int height = cucul_get_canvas_height(dp->cv);
     unsigned int x, y, len;
 
     /* First draw the background colours. Splitting the process in two
      * loops like this is actually slightly faster. */
-    for(y = 0; y < dp->cv->height; y++)
-    {
-        for(x = 0; x < dp->cv->width; x += len)
-        {
-            uint32_t *attrs = dp->cv->attrs + x + y * dp->cv->width;
+    for(y = 0; y < height; y++)
+    {
+        for(x = 0; x < width; x += len)
+        {
+            uint32_t const *attrs = cvattrs + x + y * width;
             uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);
 
             len = 1;
-            while(x + len < dp->cv->width
+            while(x + len < width
                    && _cucul_attr_to_rgb12bg(attrs[len]) == bg)
                 len++;
@@ -316 +323 @@
 
     /* Then print the foreground characters */
-    for(y = 0; y < dp->cv->height; y++)
+    for(y = 0; y < height; y++)
     {
         unsigned int yoff = (y + 1) * dp->drv.p->font_height
                                     - dp->drv.p->font_offset;
-        uint32_t *chars = dp->cv->chars + y * dp->cv->width;
-        uint32_t *attrs = dp->cv->attrs + y * dp->cv->width;
-
-        for(x = 0; x < dp->cv->width; x++, chars++, attrs++)
+        uint32_t const *chars = cvchars + y * width;
+        uint32_t const *attrs = cvattrs + y * width;
+
+        for(x = 0; x < width; x++, chars++, attrs++)
         {
             XSetForeground(dp->drv.p->dpy, dp->drv.p->gc,
@@ -349 +356 @@
     XCopyArea(dp->drv.p->dpy, dp->drv.p->pixmap, dp->drv.p->window,
               dp->drv.p->gc, 0, 0,
-              dp->cv->width * dp->drv.p->font_width,
-              dp->cv->height * dp->drv.p->font_height,
+              width * dp->drv.p->font_width,
+              height * dp->drv.p->font_height,
               0, 0);
     XFlush(dp->drv.p->dpy);
@@ -374 +381 @@
 static int x11_get_event(caca_display_t *dp, caca_privevent_t *ev)
 {
+    unsigned int width = cucul_get_canvas_width(dp->cv);
+    unsigned int height = cucul_get_canvas_height(dp->cv);
     XEvent xevent;
     char key;
@@ -387 +396 @@
             XCopyArea(dp->drv.p->dpy, dp->drv.p->pixmap,
                       dp->drv.p->window, dp->drv.p->gc, 0, 0,
-                      dp->cv->width * dp->drv.p->font_width,
-                      dp->cv->height * dp->drv.p->font_height, 0, 0);
+                      width * dp->drv.p->font_width,
+                      height * dp->drv.p->font_height, 0, 0);
             continue;
         }
@@ -402 +411 @@
                   / dp->drv.p->font_height;
 
-            if(!w || !h || (w == dp->cv->width && h == dp->cv->height))
+            if(!w || !h || (w == width && h == height))
                 continue;
 
@@ -418 +427 @@
             unsigned int newy = xevent.xmotion.y / dp->drv.p->font_height;
 
-            if(newx >= dp->cv->width)
-                newx = dp->cv->width - 1;
-            if(newy >= dp->cv->height)
-                newy = dp->cv->height - 1;
+            if(newx >= width)
+                newx = width - 1;
+            if(newy >= height)
+                newy = height - 1;
 
             if(dp->mouse.x == newx && dp->mouse.y == newy)