Changeset 515Tweet

Timestamp:

Nov 21, 2005, 6:24:33 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added caca_set_width, set_height_, set_size

Location:

libcaca/trunk

Files:

• examples/cacaball.c (modified) (1 diff)
• src/caca.h (modified) (1 diff)
• src/graphics.c (modified) (6 diffs)

libcaca/trunk/examples/cacaball.c

@@ -60 +60 @@
     int p, frame = 0, pause = 0;
 
+    caca_set_size(40,40);
     if(caca_init())
         return 1;

libcaca/trunk/src/caca.h

@@ -251 +251 @@
 unsigned int caca_get_width(void);
 unsigned int caca_get_height(void);
+void caca_set_size(unsigned int width, unsigned int height);
+void caca_set_width(unsigned int width);
+void caca_set_height(unsigned int height);
 int caca_set_window_title(char const *);
 unsigned int caca_get_window_width(void);

libcaca/trunk/src/graphics.c

@@ -673 +673 @@
 int _caca_init_graphics(void)
 {
+
+
 #if defined(HAVE_SIGNAL) && (defined(USE_NCURSES) || defined(USE_SLANG))
     signal(SIGWINCH, sigwinch_handler);
@@ -806 +808 @@
         int i;
 
+        if(!_caca_width && !_caca_height)
         if(getenv("CACA_GEOMETRY") && *(getenv("CACA_GEOMETRY")))
             sscanf(getenv("CACA_GEOMETRY"),
@@ -932 +935 @@
         /* Sample code to get the biggest possible window */
         //size = GetLargestConsoleWindowSize(win32_hout);
-
-        _caca_width = csbi.srWindow.Right - csbi.srWindow.Left + 1;
-        _caca_height = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
-
+        if(!_caca_width && !_caca_height)
+          {
+            _caca_width = csbi.srWindow.Right - csbi.srWindow.Left + 1;
+            _caca_height = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
+          }
         size.X = _caca_width;
         size.Y = _caca_height;
@@ -965 +969 @@
         int i;
         char *empty;
-
-        if(getenv("CACA_GEOMETRY") && *(getenv("CACA_GEOMETRY")))
+        
+        if(!_caca_width && !_caca_height)
+          if(getenv("CACA_GEOMETRY") && *(getenv("CACA_GEOMETRY")))
             sscanf(getenv("CACA_GEOMETRY"),
                    "%ux%u", &_caca_width, &_caca_height);
@@ -1054 +1059 @@
     if(_caca_driver == CACA_DRIVER_NULL)
     {
+      if(!_caca_width && !_caca_height)
         if(getenv("CACA_GEOMETRY") && *(getenv("CACA_GEOMETRY")))
-            sscanf(getenv("CACA_GEOMETRY"),
-                   "%ux%u", &_caca_width, &_caca_height);
-        if(!_caca_width)
-            _caca_width = 80;
-        if(!_caca_height)
-            _caca_height = 32;
+          sscanf(getenv("CACA_GEOMETRY"),
+                 "%ux%u", &_caca_width, &_caca_height);
+      if(!_caca_width)
+        _caca_width = 80;
+      if(!_caca_height)
+        _caca_height = 32;
     }
     else
@@ -1280 +1286 @@
     return _caca_height * 10;
 }
+
+
+/** \brief Set the size of the display on devices that permit it
+ *
+ *  This function sets the display width and height, on devices
+ *  that permit it. We're talking here about the size in 
+ *  CHARACTERS fo the window, NOT in pixels.
+ *  \param width The width of the window, in CHARACTERS.
+ *  \param heigth The height of the window, in CHARACTERS.
+ */
+void caca_set_size(unsigned int width, unsigned int height)
+{
+  _caca_width = width;
+  _caca_height = height;
+}
+
+
+
+/** \brief Set the width of the window, in characters, if device permits it.
+ *
+ *  This function sets the width of displayable image, in characters.
+ *  \param width The width of the window, in CHARACTERS.
+ */
+void caca_set_width(unsigned int width)
+{
+   _caca_width = width;
+}
+/** \brief Set the height of the window, in characters, if device permits it.
+ *
+ *  This function sets the height of displayable image, in characters.
+ *  \param width The width of the window, in CHARACTERS.
+ */
+void caca_set_height(unsigned int height)
+{
+   _caca_height = height;
+}
+
+
 
 /** \brief Set the refresh delay.