Changeset 274Tweet

Timestamp:

Dec 24, 2003, 4:43:45 PM (16 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c: + Replace CACA_WIDTH and CACA_HEIGHT with CACA_GEOMETRY.
• src/caca.c: + Documented the CACA_GEOMETRY environment variable.

Location:

libcaca/trunk

Files:

• NEWS (modified) (1 diff)
• src/caca.h (modified) (1 diff)
• src/graphics.c (modified) (1 diff)

libcaca/trunk/NEWS

@@ -6 +6 @@
   * preliminary X11 graphics driver
   * support for simultaneously compiled-in drivers
-  * honour the CACA_DRIVER, CACA_WIDTH, CACA_HEIGHT and CACA_FONT environment
-    variables
+  * honour the CACA_DRIVER, CACA_GEOMETRY and CACA_FONT environment variables
   * more documentation
 

libcaca/trunk/src/caca.h

@@ -62 +62 @@
  *      - \c slang uses the S-Lang library.
  *      - \c x11 uses the native X11 driver.
+ *
+ *  \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 driver.
  *
  *  \li \b CACA_BACKGROUND: set the background type.

libcaca/trunk/src/graphics.c

@@ -521 +521 @@
         int i;
 
-        if(getenv("CACA_WIDTH"))
-            _caca_width = atoi(getenv("CACA_WIDTH"));
+        if(getenv("CACA_GEOMETRY"))
+            sscanf(getenv("CACA_GEOMETRY"),
+                   "%ux%u", &_caca_width, &_caca_height);
+
         if(!_caca_width)
             _caca_width = 80;
-
-        if(getenv("CACA_HEIGHT"))
-            _caca_height = atoi(getenv("CACA_HEIGHT"));
         if(!_caca_height)
             _caca_height = 32;