Changeset 463

Timestamp:

01/13/05 23:19:01 (8 years ago)

Author:

sam

Message:

• src/graphics.c: + Implemented caca_get_screen().

Location:

libcaca/trunk/src

Files:

• caca.h (modified) (1 diff)
• graphics.c (modified) (24 diffs)

libcaca/trunk/src/caca.h

@@ -279 +279 @@
 void caca_putstr(int, int, char const *);
 void caca_printf(int, int, char const *, ...);
+void caca_get_screen(char *);
 void caca_clear(void);
 /*  @} */

libcaca/trunk/src/graphics.c

@@ -97 +97 @@
  * Local variables
  */
+#if !defined(_DOXYGEN_SKIP_ME)
+static uint8_t *cache_char, *cache_attr;
+#endif
+
 #if defined(USE_NCURSES)
 static int ncurses_attr[16*16];
@@ -175 +179 @@
 int x11_font_width, x11_font_height;
 unsigned int x11_new_width, x11_new_height;
-static uint8_t *x11_char, *x11_attr;
 static int x11_colors[16];
 static Font x11_font;
@@ -186 +189 @@
 
 #if defined(USE_WIN32)
-static uint8_t *win32_char, *win32_attr;
 HANDLE win32_hin, win32_hout;
 static HANDLE win32_front, win32_back;
@@ -377 +379 @@
         return;
 
+    cache_char[x + y * _caca_width] = c;
+    cache_attr[x + y * _caca_width] = (_caca_bgcolor << 4) | _caca_fgcolor;
+
     switch(_caca_driver)
     {
@@ -405 +410 @@
 #if defined(USE_X11)
     case CACA_DRIVER_X11:
-        x11_char[x + y * _caca_width] = c;
-        x11_attr[x + y * _caca_width] = (_caca_bgcolor << 4) | _caca_fgcolor;
         break;
 #endif
 #if defined(USE_WIN32)
     case CACA_DRIVER_WIN32:
-        win32_char[x + y * _caca_width] = c;
-        win32_attr[x + y * _caca_width] = (_caca_bgcolor << 4) | _caca_fgcolor;
         break;
 #endif
@@ -439 +440 @@
     char *attrbuf;
 #endif
+    char const *t;
     unsigned int len;
 
@@ -461 +463 @@
         _caca_scratch_line[len] = '\0';
         s = _caca_scratch_line;
+    }
+
+    charbuf = cache_char + x + y * _caca_width;
+    attrbuf = cache_attr + x + y * _caca_width;
+    t = s;
+    while(*t)
+    {
+        *charbuf++ = *t++;
+        *attrbuf++ = (_caca_bgcolor << 4) | _caca_fgcolor;
     }
 
@@ -498 +509 @@
 #if defined(USE_X11)
     case CACA_DRIVER_X11:
-        charbuf = x11_char + x + y * _caca_width;
-        attrbuf = x11_attr + x + y * _caca_width;
-        while(*s)
-        {
-            *charbuf++ = *s++;
-            *attrbuf++ = (_caca_bgcolor << 4) | _caca_fgcolor;
-        }
         break;
 #endif
 #if defined(USE_WIN32)
     case CACA_DRIVER_WIN32:
-        charbuf = win32_char + x + y * _caca_width;
-        attrbuf = win32_attr + x + y * _caca_width;
-        while(*s)
-        {
-            *charbuf++ = *s++;
-            *attrbuf++ = (_caca_bgcolor << 4) | _caca_fgcolor;
-        }
         break;
 #endif
@@ -561 +558 @@
     if(buf != tmp)
         free(buf);
+}
+
+/** \brief Get the screen.
+ *
+ *  This function fills a byte array with the character values.
+ */
+void caca_get_screen(char *buffer)
+{
+    unsigned int x, y;
+
+    for(y = 0; y < _caca_height; y++)
+    {
+        for(x = 0; x < _caca_width; x++)
+        {
+            *buffer++ = cache_attr[x + y * _caca_width];
+            *buffer++ = cache_char[x + y * _caca_width];
+        }
+    }
 }
 
@@ -727 +742 @@
             _caca_height = 32;
 
-        x11_char = malloc(_caca_width * _caca_height * sizeof(int));
-        if(x11_char == NULL)
-            return -1;
-
-        x11_attr = malloc(_caca_width * _caca_height * sizeof(int));
-        if(x11_attr == NULL)
-        {
-            free(x11_char);
-            return -1;
-        }
-
-        memset(x11_char, 0, _caca_width * _caca_height * sizeof(int));
-        memset(x11_attr, 0, _caca_width * _caca_height * sizeof(int));
-
         x11_dpy = XOpenDisplay(NULL);
         if(x11_dpy == NULL)
-        {
-            free(x11_char);
-            free(x11_attr);
             return -1;
-        }
 
         if(getenv("CACA_FONT") && *(getenv("CACA_FONT")))
@@ -759 +756 @@
         {
             XCloseDisplay(x11_dpy);
-            free(x11_char);
-            free(x11_attr);
             return -1;
         }
@@ -769 +764 @@
             XUnloadFont(x11_dpy, x11_font);
             XCloseDisplay(x11_dpy);
-            free(x11_char);
-            free(x11_attr);
             return -1;
         }
@@ -886 +879 @@
         SetConsoleActiveScreenBuffer(win32_front);
 
-        win32_char = malloc(_caca_width * _caca_height * sizeof(int));
-        if(win32_char == NULL)
-            return -1;
-
-        win32_attr = malloc(_caca_width * _caca_height * sizeof(int));
-        if(win32_attr == NULL)
-        {
-            free(win32_char);
-            return -1;
-        }
-
         win32_buffer = malloc(_caca_width * _caca_height * sizeof(CHAR_INFO));
         if(win32_buffer == NULL)
-        {
-            free(win32_attr);
-            free(win32_char);
             return -1;
-        }
-
-        memset(win32_char, 0, _caca_width * _caca_height * sizeof(int));
-        memset(win32_attr, 0, _caca_width * _caca_height * sizeof(int));
     }
     else
@@ -913 +888 @@
         /* Dummy */
     }
+
+    cache_char = malloc(_caca_width * _caca_height * sizeof(uint8_t));
+    if(cache_char == NULL)
+        return -1;
+
+    cache_attr = malloc(_caca_width * _caca_height * sizeof(uint8_t));
+    if(cache_attr == NULL)
+    {
+        free(cache_char);
+        return -1;
+    }
+
+    memset(cache_char, 0, _caca_width * _caca_height * sizeof(uint8_t));
+    memset(cache_attr, 0, _caca_width * _caca_height * sizeof(uint8_t));
 
     _caca_empty_line = malloc(_caca_width + 1);
@@ -928 +917 @@
 int _caca_end_graphics(void)
 {
+    free(cache_char);
+    free(cache_attr);
+
 #if defined(USE_SLANG)
     /* Nothing to do */
@@ -955 +947 @@
         XDestroyWindow(x11_dpy, x11_window);
         XCloseDisplay(x11_dpy);
-        free(x11_char);
-        free(x11_attr);
     }
     else
@@ -966 +956 @@
         CloseHandle(win32_back);
         CloseHandle(win32_front);
-        free(win32_char);
-        free(win32_attr);
     }
     else
@@ -1167 +1155 @@
             for(x = 0; x < _caca_width; x += len)
             {
-                unsigned char *attr = x11_attr + x + y * _caca_width;
+                uint8_t *attr = cache_attr + x + y * _caca_width;
 
                 len = 1;
@@ -1186 +1174 @@
             for(x = 0; x < _caca_width; x += len)
             {
-                unsigned char *attr = x11_attr + x + y * _caca_width;
+                uint8_t *attr = cache_attr + x + y * _caca_width;
 
                 len = 1;
 
                 /* Skip spaces */
-                if(x11_char[x + y * _caca_width] == ' ')
+                if(cache_char[x + y * _caca_width] == ' ')
                     continue;
 
@@ -1201 +1189 @@
                 XDrawString(x11_dpy, x11_pixmap, x11_gc, x * x11_font_width,
                             (y + 1) * x11_font_height - x11_font_offset,
-                            x11_char + x + y * _caca_width, len);
+                            cache_char + x + y * _caca_width, len);
             }
         }
@@ -1222 +1210 @@
         for(i = 0; i < _caca_width * _caca_height; i++)
         {
-            win32_buffer[i].Char.AsciiChar = win32_char[i];
-            win32_buffer[i].Attributes = win32_fg_palette[win32_attr[i] & 0xf]
-                                       | win32_bg_palette[win32_attr[i] >> 4];
+            win32_buffer[i].Char.AsciiChar = cache_char[i];
+            win32_buffer[i].Attributes = win32_fg_palette[cache_attr[i] & 0xf]
+                                       | win32_bg_palette[cache_attr[i] >> 4];
         }
 
@@ -1319 +1307 @@
         _caca_width = x11_new_width;
         _caca_height = x11_new_height;
-
-        free(x11_char);
-        free(x11_attr);
 
         new_pixmap = XCreatePixmap(x11_dpy, x11_window,
@@ -1333 +1318 @@
         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));
-        x11_attr = malloc(_caca_width * _caca_height * sizeof(int));
-        memset(x11_attr, 0, _caca_width * _caca_height * sizeof(int));
     }
     else
@@ -1349 +1329 @@
     {
         /* Dummy */
+    }
+
+    if(_caca_width != old_width || _caca_height != old_height)
+    {
+        free(cache_char);
+        free(cache_attr);
+
+        cache_char = malloc(_caca_width * _caca_height * sizeof(uint8_t));
+        memset(cache_char, 0, _caca_width * _caca_height * sizeof(uint8_t));
+        cache_attr = malloc(_caca_width * _caca_height * sizeof(uint8_t));
+        memset(cache_attr, 0, _caca_width * _caca_height * sizeof(uint8_t));
     }