Browse Source

* Use the internal version of cucul_set_size in output drivers so that

they can force a resize. We need to find a way to make those specific
    cucul - caca interactions unavailable to the clueless user.
tags/v0.99.beta14
Sam Hocevar sam 19 years ago
parent
commit
d1e1dbd630
7 changed files with 11 additions and 11 deletions
  1. +2
    -2
      caca/driver_conio.c
  2. +1
    -1
      caca/driver_gl.c
  3. +1
    -1
      caca/driver_ncurses.c
  4. +2
    -2
      caca/driver_network.c
  5. +2
    -2
      caca/driver_win32.c
  6. +1
    -1
      caca/driver_x11.c
  7. +2
    -2
      caca/graphics.c

+ 2
- 2
caca/driver_conio.c View File

@@ -58,8 +58,8 @@ static int conio_init_graphics(caca_t *kk)
# else # else
/* FIXME */ /* FIXME */
# endif # endif
cucul_set_size(kk->qq, kk->drv.p->ti.screenwidth,
kk->drv.p->ti.screenheight);
_cucul_set_size(kk->qq, kk->drv.p->ti.screenwidth,
kk->drv.p->ti.screenheight);
return 0; return 0;
} }




+ 1
- 1
caca/driver_gl.c View File

@@ -108,7 +108,7 @@ static int gl_init_graphics(caca_t *kk)
sscanf(geometry, "%ux%u", &width, &height); sscanf(geometry, "%ux%u", &width, &height);


if(width && height) if(width && height)
cucul_set_size(kk->qq, width, height);
_cucul_set_size(kk->qq, width, height);


kk->drv.p->font_width = 9; kk->drv.p->font_width = 9;
kk->drv.p->font_height = 15; kk->drv.p->font_height = 15;


+ 1
- 1
caca/driver_ncurses.c View File

@@ -148,7 +148,7 @@ static int ncurses_init_graphics(caca_t *kk)
} }
} }


cucul_set_size(kk->qq, COLS, LINES);
_cucul_set_size(kk->qq, COLS, LINES);


return 0; return 0;
} }


+ 2
- 2
caca/driver_network.c View File

@@ -10,7 +10,7 @@
*/ */


/** \file driver_network.c /** \file driver_network.c
* \version \$Id: driver_gl.c 330 2006-03-07 09:17:35Z sam $
* \version \$Id$
* \author Jean-Yves Lamoureux <jylam@lnxscene.org> * \author Jean-Yves Lamoureux <jylam@lnxscene.org>
* \brief Network driver * \brief Network driver
* *
@@ -89,7 +89,7 @@ static int network_init_graphics(caca_t *kk)






cucul_set_size(kk->qq, kk->drv.p->width, kk->drv.p->height);
_cucul_set_size(kk->qq, kk->drv.p->width, kk->drv.p->height);




printf("socket\n"); printf("socket\n");


+ 2
- 2
caca/driver_win32.c View File

@@ -122,8 +122,8 @@ static int win32_init_graphics(caca_t *kk)


/* Sample code to get the biggest possible window */ /* Sample code to get the biggest possible window */
//size = GetLargestConsoleWindowSize(kk->drv.p->hout); //size = GetLargestConsoleWindowSize(kk->drv.p->hout);
cucul_set_size(kk->qq, csbi.srWindow.Right - csbi.srWindow.Left + 1,
csbi.srWindow.Bottom - csbi.srWindow.Top + 1);
_cucul_set_size(kk->qq, csbi.srWindow.Right - csbi.srWindow.Left + 1,
csbi.srWindow.Bottom - csbi.srWindow.Top + 1);
size.X = kk->qq->width; size.X = kk->qq->width;
size.Y = kk->qq->height; size.Y = kk->qq->height;
SetConsoleScreenBufferSize(kk->drv.p->front, size); SetConsoleScreenBufferSize(kk->drv.p->front, size);


+ 1
- 1
caca/driver_x11.c View File

@@ -97,7 +97,7 @@ static int x11_init_graphics(caca_t *kk)
sscanf(geometry, "%ux%u", &width, &height); sscanf(geometry, "%ux%u", &width, &height);


if(width && height) if(width && height)
cucul_set_size(kk->qq, width, height);
_cucul_set_size(kk->qq, width, height);


kk->drv.p->dpy = XOpenDisplay(NULL); kk->drv.p->dpy = XOpenDisplay(NULL);
if(kk->drv.p->dpy == NULL) if(kk->drv.p->dpy == NULL)


+ 2
- 2
caca/graphics.c View File

@@ -46,8 +46,8 @@ int caca_set_window_title(caca_t *kk, char const *title)
* *
* If libcaca runs in a window, get the usable window width. This value can * If libcaca runs in a window, get the usable window width. This value can
* be used for aspect ratio calculation. If libcaca does not run in a window * be used for aspect ratio calculation. If libcaca does not run in a window
* or if there is no way to know the font size, assume a 6x10 font is being
* used. Note that the units are not necessarily pixels.
* or if there is no way to know the font size, most drivers will assume a
* 6x10 font is being used. Note that the units are not necessarily pixels.
* *
* \return The window width. * \return The window width.
*/ */


Loading…
Cancel
Save