Changeset 611 for libcaca/trunkTweet

Timestamp:

Mar 15, 2006, 11:01:14 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Support CACA_GEOMETRY in the network driver. Still defaults to 80x24.
• Use RETSIGTYPE for signal handler return values.

Location:

libcaca/trunk/caca

Files:

• caca.h (modified) (1 diff)
• driver_network.c (modified) (3 diffs)

libcaca/trunk/caca/caca.h

@@ -88 +88 @@
  *  \li \b CACA_GEOMETRY: set the video display size. The format of this
  *      variable must be XxY, with X and Y being integer values. This option
- *      currently only works with the X11 and the GL driver.
+ *      currently works with the network, X11 and GL drivers.
  *
  *  \li \b CACA_FONT: set the rendered font. The format of this variable is

libcaca/trunk/caca/driver_network.c

@@ -91 +91 @@
     struct client *clients;
 
-    void (*sigpipe_handler)(int);
+    RETSIGTYPE (*sigpipe_handler)(int);
 };
 
@@ -102 +102 @@
     int yes = 1, flags;
     int port = 0xCACA; /* 51914 */
-    char *network_port, *tmp;
+    unsigned int width = 0, height = 0;
+    char *tmp;
 
     kk->drv.p = malloc(sizeof(struct driver_private));
@@ -109 +110 @@
 
 #if defined(HAVE_GETENV)
-    network_port = getenv("CACA_PORT");
-    if(network_port && *network_port)
-    {
-        int new_port = atoi(network_port);
+    tmp = getenv("CACA_PORT");
+    if(tmp && *tmp)
+    {
+        int new_port = atoi(tmp);
         if(new_port)
             port = new_port;
     }
+
+    tmp = getenv("CACA_GEOMETRY");
+    if(tmp && *tmp)
+        sscanf(tmp, "%ux%u", &width, &height);
 #endif
 
-    kk->drv.p->width = 80;
-    kk->drv.p->height = 24;
+    if(width && height)
+    {
+        kk->drv.p->width = width;
+        kk->drv.p->height = height;
+    }
+    else
+    {
+        kk->drv.p->width = 80;
+        kk->drv.p->height = 24;
+    }
+
     kk->drv.p->client_count = 0;
     kk->drv.p->clients = NULL;