Changeset 819
- Timestamp:
- Apr 19, 2006, 12:10:58 PM (16 years ago)
- Location:
- libcaca/trunk
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/caca.c
r811 r819 42 42 * \return The caca graphical context or NULL if an error occurred. 43 43 */ 44 caca_display_t * caca_ attach(cucul_canvas_t * cv)44 caca_display_t * caca_create_display(cucul_canvas_t * cv) 45 45 { 46 46 caca_display_t *dp = malloc(sizeof(caca_display_t)); … … 101 101 * \param dp The libcaca graphical context. 102 102 */ 103 void caca_ detach(caca_display_t *dp)103 void caca_free_display(caca_display_t *dp) 104 104 { 105 105 dp->drv.end_graphics(dp); -
libcaca/trunk/caca/caca.h
r811 r819 204 204 * 205 205 * @{ */ 206 caca_display_t * caca_ attach(cucul_canvas_t *);207 void caca_ detach(caca_display_t *);206 caca_display_t * caca_create_display(cucul_canvas_t *); 207 void caca_free_display(caca_display_t *); 208 208 void caca_set_delay(caca_display_t *, unsigned int); 209 void caca_ display(caca_display_t *);209 void caca_refresh_display(caca_display_t *); 210 210 unsigned int caca_get_rendertime(caca_display_t *); 211 unsigned int caca_get_ window_width(caca_display_t *);212 unsigned int caca_get_ window_height(caca_display_t *);213 int caca_set_ window_title(caca_display_t *, char const *);211 unsigned int caca_get_display_width(caca_display_t *); 212 unsigned int caca_get_display_height(caca_display_t *); 213 int caca_set_display_title(caca_display_t *, char const *); 214 214 /* @} */ 215 215 -
libcaca/trunk/caca/caca_internals.h
r811 r819 104 104 int (* init_graphics) (caca_display_t *); 105 105 int (* end_graphics) (caca_display_t *); 106 int (* set_ window_title) (caca_display_t *, char const *);107 unsigned int (* get_ window_width) (caca_display_t *);108 unsigned int (* get_ window_height) (caca_display_t *);106 int (* set_display_title) (caca_display_t *, char const *); 107 unsigned int (* get_display_width) (caca_display_t *); 108 unsigned int (* get_display_height) (caca_display_t *); 109 109 void (* display) (caca_display_t *); 110 110 void (* handle_resize) (caca_display_t *); -
libcaca/trunk/caca/driver_conio.c
r813 r819 77 77 } 78 78 79 static int conio_set_ window_title(caca_display_t *dp, char const *title)79 static int conio_set_display_title(caca_display_t *dp, char const *title) 80 80 { 81 81 return 0; 82 82 } 83 83 84 static unsigned int conio_get_ window_width(caca_display_t *dp)84 static unsigned int conio_get_display_width(caca_display_t *dp) 85 85 { 86 86 /* Fallback to a 6x10 font */ … … 88 88 } 89 89 90 static unsigned int conio_get_ window_height(caca_display_t *dp)90 static unsigned int conio_get_display_height(caca_display_t *dp) 91 91 { 92 92 /* Fallback to a 6x10 font */ … … 156 156 dp->drv.init_graphics = conio_init_graphics; 157 157 dp->drv.end_graphics = conio_end_graphics; 158 dp->drv.set_ window_title = conio_set_window_title;159 dp->drv.get_ window_width = conio_get_window_width;160 dp->drv.get_ window_height = conio_get_window_height;158 dp->drv.set_display_title = conio_set_display_title; 159 dp->drv.get_display_width = conio_get_display_width; 160 dp->drv.get_display_height = conio_get_display_height; 161 161 dp->drv.display = conio_display; 162 162 dp->drv.handle_resize = conio_handle_resize; -
libcaca/trunk/caca/driver_gl.c
r813 r819 203 203 } 204 204 205 static int gl_set_ window_title(caca_display_t *dp, char const *title)205 static int gl_set_display_title(caca_display_t *dp, char const *title) 206 206 { 207 207 glutSetWindowTitle(title); … … 209 209 } 210 210 211 static unsigned int gl_get_ window_width(caca_display_t *dp)211 static unsigned int gl_get_display_width(caca_display_t *dp) 212 212 { 213 213 return dp->drv.p->width; 214 214 } 215 215 216 static unsigned int gl_get_ window_height(caca_display_t *dp)216 static unsigned int gl_get_display_height(caca_display_t *dp) 217 217 { 218 218 return dp->drv.p->height; … … 502 502 dp->drv.init_graphics = gl_init_graphics; 503 503 dp->drv.end_graphics = gl_end_graphics; 504 dp->drv.set_ window_title = gl_set_window_title;505 dp->drv.get_ window_width = gl_get_window_width;506 dp->drv.get_ window_height = gl_get_window_height;504 dp->drv.set_display_title = gl_set_display_title; 505 dp->drv.get_display_width = gl_get_display_width; 506 dp->drv.get_display_height = gl_get_display_height; 507 507 dp->drv.display = gl_display; 508 508 dp->drv.handle_resize = gl_handle_resize; -
libcaca/trunk/caca/driver_ncurses.c
r813 r819 169 169 } 170 170 171 static int ncurses_set_ window_title(caca_display_t *dp, char const *title)171 static int ncurses_set_display_title(caca_display_t *dp, char const *title) 172 172 { 173 173 return 0; 174 174 } 175 175 176 static unsigned int ncurses_get_ window_width(caca_display_t *dp)176 static unsigned int ncurses_get_display_width(caca_display_t *dp) 177 177 { 178 178 /* Fallback to a 6x10 font */ … … 180 180 } 181 181 182 static unsigned int ncurses_get_ window_height(caca_display_t *dp)182 static unsigned int ncurses_get_display_height(caca_display_t *dp) 183 183 { 184 184 /* Fallback to a 6x10 font */ … … 535 535 dp->drv.init_graphics = ncurses_init_graphics; 536 536 dp->drv.end_graphics = ncurses_end_graphics; 537 dp->drv.set_ window_title = ncurses_set_window_title;538 dp->drv.get_ window_width = ncurses_get_window_width;539 dp->drv.get_ window_height = ncurses_get_window_height;537 dp->drv.set_display_title = ncurses_set_display_title; 538 dp->drv.get_display_width = ncurses_get_display_width; 539 dp->drv.get_display_height = ncurses_get_display_height; 540 540 dp->drv.display = ncurses_display; 541 541 dp->drv.handle_resize = ncurses_handle_resize; -
libcaca/trunk/caca/driver_raw.c
r818 r819 37 37 } 38 38 39 static int raw_set_ window_title(caca_display_t *dp, char const *title)39 static int raw_set_display_title(caca_display_t *dp, char const *title) 40 40 { 41 41 return 0; 42 42 } 43 43 44 static unsigned int raw_get_ window_width(caca_display_t *dp)44 static unsigned int raw_get_display_width(caca_display_t *dp) 45 45 { 46 46 return 0; 47 47 } 48 48 49 static unsigned int raw_get_ window_height(caca_display_t *dp)49 static unsigned int raw_get_display_height(caca_display_t *dp) 50 50 { 51 51 return 0; … … 84 84 dp->drv.init_graphics = raw_init_graphics; 85 85 dp->drv.end_graphics = raw_end_graphics; 86 dp->drv.set_ window_title = raw_set_window_title;87 dp->drv.get_ window_width = raw_get_window_width;88 dp->drv.get_ window_height = raw_get_window_height;86 dp->drv.set_display_title = raw_set_display_title; 87 dp->drv.get_display_width = raw_get_display_width; 88 dp->drv.get_display_height = raw_get_display_height; 89 89 dp->drv.display = raw_display; 90 90 dp->drv.handle_resize = raw_handle_resize; -
libcaca/trunk/caca/driver_slang.c
r813 r819 180 180 } 181 181 182 static int slang_set_ window_title(caca_display_t *dp, char const *title)182 static int slang_set_display_title(caca_display_t *dp, char const *title) 183 183 { 184 184 /* FIXME */ … … 186 186 } 187 187 188 static unsigned int slang_get_ window_width(caca_display_t *dp)188 static unsigned int slang_get_display_width(caca_display_t *dp) 189 189 { 190 190 /* Fallback to a 6x10 font */ … … 192 192 } 193 193 194 static unsigned int slang_get_ window_height(caca_display_t *dp)194 static unsigned int slang_get_display_height(caca_display_t *dp) 195 195 { 196 196 /* Fallback to a 6x10 font */ … … 473 473 dp->drv.init_graphics = slang_init_graphics; 474 474 dp->drv.end_graphics = slang_end_graphics; 475 dp->drv.set_ window_title = slang_set_window_title;476 dp->drv.get_ window_width = slang_get_window_width;477 dp->drv.get_ window_height = slang_get_window_height;475 dp->drv.set_display_title = slang_set_display_title; 476 dp->drv.get_display_width = slang_get_display_width; 477 dp->drv.get_display_height = slang_get_display_height; 478 478 dp->drv.display = slang_display; 479 479 dp->drv.handle_resize = slang_handle_resize; -
libcaca/trunk/caca/driver_vga.c
r813 r819 94 94 } 95 95 96 static int vga_set_ window_title(caca_display_t *dp, char const *title)96 static int vga_set_display_title(caca_display_t *dp, char const *title) 97 97 { 98 98 /* Unsupported, of course. */ … … 100 100 } 101 101 102 static unsigned int vga_get_ window_width(caca_display_t *dp)102 static unsigned int vga_get_display_width(caca_display_t *dp) 103 103 { 104 104 /* Fallback to a 320x200 screen */ … … 106 106 } 107 107 108 static unsigned int vga_get_ window_height(caca_display_t *dp)108 static unsigned int vga_get_display_height(caca_display_t *dp) 109 109 { 110 110 /* Fallback to a 320x200 screen */ … … 150 150 dp->drv.init_graphics = vga_init_graphics; 151 151 dp->drv.end_graphics = vga_end_graphics; 152 dp->drv.set_ window_title = vga_set_window_title;153 dp->drv.get_ window_width = vga_get_window_width;154 dp->drv.get_ window_height = vga_get_window_height;152 dp->drv.set_display_title = vga_set_display_title; 153 dp->drv.get_display_width = vga_get_display_width; 154 dp->drv.get_display_height = vga_get_display_height; 155 155 dp->drv.display = vga_display; 156 156 dp->drv.handle_resize = vga_handle_resize; -
libcaca/trunk/caca/driver_win32.c
r813 r819 163 163 } 164 164 165 static int win32_set_ window_title(caca_display_t *dp, char const *title)165 static int win32_set_display_title(caca_display_t *dp, char const *title) 166 166 { 167 167 SetConsoleTitle(title); … … 169 169 } 170 170 171 static unsigned int win32_get_ window_width(caca_display_t *dp)171 static unsigned int win32_get_display_width(caca_display_t *dp) 172 172 { 173 173 /* FIXME */ … … 177 177 } 178 178 179 static unsigned int win32_get_ window_height(caca_display_t *dp)179 static unsigned int win32_get_display_height(caca_display_t *dp) 180 180 { 181 181 /* FIXME */ … … 338 338 dp->drv.init_graphics = win32_init_graphics; 339 339 dp->drv.end_graphics = win32_end_graphics; 340 dp->drv.set_ window_title = win32_set_window_title;341 dp->drv.get_ window_width = win32_get_window_width;342 dp->drv.get_ window_height = win32_get_window_height;340 dp->drv.set_display_title = win32_set_display_title; 341 dp->drv.get_display_width = win32_get_display_width; 342 dp->drv.get_display_height = win32_get_display_height; 343 343 dp->drv.display = win32_display; 344 344 dp->drv.handle_resize = win32_handle_resize; -
libcaca/trunk/caca/driver_x11.c
r813 r819 221 221 } 222 222 223 static int x11_set_ window_title(caca_display_t *dp, char const *title)223 static int x11_set_display_title(caca_display_t *dp, char const *title) 224 224 { 225 225 XStoreName(dp->drv.p->dpy, dp->drv.p->window, title); … … 227 227 } 228 228 229 static unsigned int x11_get_ window_width(caca_display_t *dp)229 static unsigned int x11_get_display_width(caca_display_t *dp) 230 230 { 231 231 return dp->cv->width * dp->drv.p->font_width; 232 232 } 233 233 234 static unsigned int x11_get_ window_height(caca_display_t *dp)234 static unsigned int x11_get_display_height(caca_display_t *dp) 235 235 { 236 236 return dp->cv->height * dp->drv.p->font_height; … … 593 593 dp->drv.init_graphics = x11_init_graphics; 594 594 dp->drv.end_graphics = x11_end_graphics; 595 dp->drv.set_ window_title = x11_set_window_title;596 dp->drv.get_ window_width = x11_get_window_width;597 dp->drv.get_ window_height = x11_get_window_height;595 dp->drv.set_display_title = x11_set_display_title; 596 dp->drv.get_display_width = x11_get_display_width; 597 dp->drv.get_display_height = x11_get_display_height; 598 598 dp->drv.display = x11_display; 599 599 dp->drv.handle_resize = x11_handle_resize; -
libcaca/trunk/caca/graphics.c
r813 r819 23 23 #include "cucul_internals.h" 24 24 25 /** \brief Set the windowtitle.25 /** \brief Set the display title. 26 26 * 27 27 * If libcaca runs in a window, try to change its title. This works with … … 29 29 * 30 30 * \param dp The libcaca graphical context. 31 * \param title The desired windowtitle.31 * \param title The desired display title. 32 32 * \return 0 upon success, a non-zero value if an error occurs. 33 33 */ 34 int caca_set_ window_title(caca_display_t *dp, char const *title)34 int caca_set_display_title(caca_display_t *dp, char const *title) 35 35 { 36 return dp->drv.set_ window_title(dp, title);36 return dp->drv.set_display_title(dp, title); 37 37 } 38 38 39 /** \brief Get the windowwidth.39 /** \brief Get the display width. 40 40 * 41 41 * If libcaca runs in a window, get the usable window width. This value can … … 45 45 * 46 46 * \param dp The libcaca graphical context. 47 * \return The windowwidth.47 * \return The display width. 48 48 */ 49 unsigned int caca_get_ window_width(caca_display_t *dp)49 unsigned int caca_get_display_width(caca_display_t *dp) 50 50 { 51 return dp->drv.get_ window_width(dp);51 return dp->drv.get_display_width(dp); 52 52 } 53 53 54 /** \brief Get the windowheight.54 /** \brief Get the display height. 55 55 * 56 56 * If libcaca runs in a window, get the usable window height. This value can … … 60 60 * 61 61 * \param dp The libcaca graphical context. 62 * \return The windowheight.62 * \return The display height. 63 63 */ 64 unsigned int caca_get_ window_height(caca_display_t *dp)64 unsigned int caca_get_display_height(caca_display_t *dp) 65 65 { 66 return dp->drv.get_ window_height(dp);66 return dp->drv.get_display_height(dp); 67 67 } 68 68 … … 70 70 * 71 71 * This function sets the refresh delay in microseconds. The refresh delay 72 * is used by caca_ display() to achieve constant framerate. See the73 * caca_ display() documentation for more details.72 * is used by caca_refresh_display() to achieve constant framerate. See the 73 * caca_refresh_display() documentation for more details. 74 74 * 75 75 * If the argument is zero, constant framerate is disabled. This is the … … 87 87 * 88 88 * This function returns the average rendering time, which is the average 89 * measured time between two caca_ display() calls, in microseconds. If89 * measured time between two caca_refresh_display() calls, in microseconds. If 90 90 * constant framerate was activated by calling caca_set_delay(), the average 91 91 * rendering time will not be considerably shorter than the requested delay … … 103 103 * 104 104 * This function flushes all graphical operations and prints them to the 105 * screen. Nothing will show on the screen until caca_ display() is105 * screen. Nothing will show on the screen until caca_refresh_display() is 106 106 * called. 107 107 * 108 * If caca_set_delay() was called with a non-zero value, caca_display()109 * will use that value to achieve constant framerate: if two consecutive110 * calls to caca_display() are within a time range shorter than the value111 * set with caca_set_delay(), the second call will wait a bit before112 * performing the screen refresh.108 * If caca_set_delay() was called with a non-zero value, 109 * caca_refresh_display() will use that value to achieve constant 110 * framerate: if two consecutive calls to caca_refresh_display() are 111 * within a time range shorter than the value set with caca_set_delay(), 112 * the second call will be delayed before performing the screen refresh. 113 113 * 114 114 * \param dp The libcaca graphical context. 115 115 */ 116 void caca_ display(caca_display_t *dp)116 void caca_refresh_display(caca_display_t *dp) 117 117 { 118 118 #if !defined(_DOXYGEN_SKIP_ME) -
libcaca/trunk/cpp/caca++.cpp
r811 r819 28 28 Caca::Caca(Cucul *cv) 29 29 { 30 dp = caca_ attach(cv->get_cucul_canvas_t());30 dp = caca_create_display(cv->get_cucul_canvas_t()); 31 31 if(!dp) throw -1; 32 32 } 33 33 Caca::~Caca() 34 34 { 35 caca_ detach(dp);35 caca_free_display(dp); 36 36 } 37 37 void Caca::attach(Cucul *cv) 38 38 { 39 dp = caca_ attach(cv->get_cucul_canvas_t());39 dp = caca_create_display(cv->get_cucul_canvas_t()); 40 40 if(!dp) throw -1; 41 41 } 42 42 void Caca::detach () 43 43 { 44 caca_ detach(dp);44 caca_free_display(dp); 45 45 } 46 46 void Caca::set_delay (unsigned int d) … … 50 50 void Caca::display () 51 51 { 52 caca_ display(dp);52 caca_refresh_display(dp); 53 53 } 54 54 unsigned int Caca::get_rendertime () … … 56 56 return caca_get_rendertime(dp); 57 57 } 58 unsigned int Caca::get_ window_width ()58 unsigned int Caca::get_display_width () 59 59 { 60 return caca_get_ window_width(dp);60 return caca_get_display_width(dp); 61 61 } 62 unsigned int Caca::get_ window_height ()62 unsigned int Caca::get_display_height () 63 63 { 64 return caca_get_ window_height(dp);64 return caca_get_display_height(dp); 65 65 } 66 int Caca::set_ window_title (char const *s)66 int Caca::set_display_title (char const *s) 67 67 { 68 return caca_set_ window_title(dp, s);68 return caca_set_display_title(dp, s); 69 69 } 70 70 int Caca::get_event (unsigned int g, Event *n, int aa) -
libcaca/trunk/cpp/caca++.h
r811 r819 62 62 void display (); 63 63 unsigned int get_rendertime (); 64 unsigned int get_ window_width ();65 unsigned int get_ window_height ();66 int set_ window_title (char const *);64 unsigned int get_display_width (); 65 unsigned int get_display_height (); 66 int set_display_title (char const *); 67 67 int get_event (unsigned int, Event*, int); 68 68 unsigned int get_mouse_x (); -
libcaca/trunk/cucul/cucul.c
r818 r819 137 137 * 138 138 * It is an error to try to resize the canvas if an output driver has 139 * been attached to the canvas using caca_ attach(). You need to remove140 * the output driver using caca_detach() before you can change the141 * canvas size again. However, the caca output driver can cause a canvas142 * resize through user interaction. See the caca_event() documentation139 * been attached to the canvas using caca_create_display(). You need to 140 * remove the output driver using caca_free_display() before you can change 141 * the canvas size again. However, the caca output driver can cause a 142 * canvas resize through user interaction. See the caca_event() documentation 143 143 * for more about this. 144 144 * -
libcaca/trunk/python/pypycaca.c
r769 r819 23 23 {"set_width", pycaca_set_width, METH_VARARGS, "Set width"}, 24 24 {"set_height", pycaca_set_height, METH_VARARGS, "Set height"}, 25 {"set_ window_title", pycaca_set_window_title, METH_VARARGS, "Set window titl"},26 {"get_ window_width", pycaca_get_window_width, METH_NOARGS, "Get window width"},27 {"get_ window_height", pycaca_get_window_height, METH_NOARGS, "Get Window height"},25 {"set_display_title", pycaca_set_display_title, METH_VARARGS, "Set window titl"}, 26 {"get_display_width", pycaca_get_display_width, METH_NOARGS, "Get window width"}, 27 {"get_display_height", pycaca_get_display_height, METH_NOARGS, "Get Window height"}, 28 28 {"refresh", pycaca_refresh, METH_NOARGS, "Refresh window"}, 29 29 {"end", pycaca_end, METH_NOARGS, "End libcaca"}, … … 256 256 257 257 static PyObject * 258 pycaca_set_ window_title(PyObject *self, PyObject *args)258 pycaca_set_display_title(PyObject *self, PyObject *args) 259 259 { 260 260 int ret; 261 261 const char *str; 262 262 if (!PyArg_ParseTuple(args, "s", &str)); 263 ret = caca_set_ window_title(str);263 ret = caca_set_display_title(str); 264 264 return Py_BuildValue("i", ret); /* FIXME */ 265 265 } 266 266 267 267 static PyObject * 268 pycaca_get_ window_width(PyObject *self, PyObject *args)269 { 270 int ret = caca_get_ window_width();271 return Py_BuildValue("i", ret); 272 } 273 274 static PyObject * 275 pycaca_get_ window_height(PyObject *self, PyObject *args)276 { 277 int ret = caca_get_ window_height();268 pycaca_get_display_width(PyObject *self, PyObject *args) 269 { 270 int ret = caca_get_display_width(); 271 return Py_BuildValue("i", ret); 272 } 273 274 static PyObject * 275 pycaca_get_display_height(PyObject *self, PyObject *args) 276 { 277 int ret = caca_get_display_height(); 278 278 return Py_BuildValue("i", ret); 279 279 } -
libcaca/trunk/python/pypycaca.h
r769 r819 39 39 pycaca_set_height(PyObject *self, PyObject *args); 40 40 static PyObject * 41 pycaca_set_ window_title(PyObject *self, PyObject *args);41 pycaca_set_display_title(PyObject *self, PyObject *args); 42 42 static PyObject * 43 pycaca_get_ window_width(PyObject *self, PyObject *args);43 pycaca_get_display_width(PyObject *self, PyObject *args); 44 44 static PyObject * 45 pycaca_get_ window_height(PyObject *self, PyObject *args);45 pycaca_get_display_height(PyObject *self, PyObject *args); 46 46 static PyObject * 47 47 pycaca_refresh(PyObject *self, PyObject *args); -
libcaca/trunk/src/aafire.c
r816 r819 107 107 exit (1); 108 108 } 109 dp = caca_ attach(cv);109 dp = caca_create_display(cv); 110 110 if (!dp) 111 111 { … … 155 155 { 156 156 #ifdef LIBCACA 157 caca_ detach(dp);157 caca_free_display(dp); 158 158 cucul_free_canvas(cv); 159 159 #else … … 244 244 cucul_get_canvas_height(cv) - 2, " -=[ Powered by libcaca ]=- "); 245 245 246 caca_ display(dp);246 caca_refresh_display(dp); 247 247 /*XSIZ = caca_get_width() * 2; 248 248 YSIZ = caca_get_height() * 2 - 4;*/ -
libcaca/trunk/src/cacaball.c
r816 r819 57 57 if(!cv) 58 58 return 1; 59 dp = caca_ attach(cv);59 dp = caca_create_display(cv); 60 60 if(!dp) 61 61 return 1; … … 163 163 " -=[ Powered by libcaca ]=- "); 164 164 165 caca_ display(dp);165 caca_refresh_display(dp); 166 166 } 167 167 … … 169 169 end: 170 170 cucul_free_dither(cucul_dither); 171 caca_ detach(dp);171 caca_free_display(dp); 172 172 cucul_free_canvas(cv); 173 173 -
libcaca/trunk/src/cacamoir.c
r816 r819 46 46 if(!cv) 47 47 return 1; 48 dp = caca_ attach(cv);48 dp = caca_create_display(cv); 49 49 if(!dp) 50 50 return 1; … … 115 115 cucul_get_canvas_height(cv) - 2, 116 116 " -=[ Powered by libcaca ]=- "); 117 caca_ display(dp);117 caca_refresh_display(dp); 118 118 } 119 119 120 120 end: 121 121 cucul_free_dither(dither); 122 caca_ detach(dp);122 caca_free_display(dp); 123 123 cucul_free_canvas(cv); 124 124 -
libcaca/trunk/src/cacaplas.c
r816 r819 50 50 if(!cv) 51 51 return 1; 52 dp = caca_ attach(cv);52 dp = caca_create_display(cv); 53 53 if(!dp) 54 54 return 1; … … 137 137 cucul_get_canvas_height(cv) - 2, 138 138 " -=[ Powered by libcaca ]=- "); 139 caca_ display(dp);139 caca_refresh_display(dp); 140 140 } 141 141 142 142 end: 143 143 cucul_free_dither(dither); 144 caca_ detach(dp);144 caca_free_display(dp); 145 145 cucul_free_canvas(cv); 146 146 -
libcaca/trunk/src/cacaplay.c
r813 r819 63 63 } 64 64 65 dp = caca_ attach(cv);65 dp = caca_create_display(cv); 66 66 67 caca_ display(dp);67 caca_refresh_display(dp); 68 68 69 69 while(caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1)) … … 74 74 75 75 /* Clean up */ 76 caca_ detach(dp);76 caca_free_display(dp); 77 77 cucul_free_canvas(cv); 78 78 -
libcaca/trunk/src/cacaview.c
r816 r819 76 76 } 77 77 78 dp = caca_ attach(cv);78 dp = caca_create_display(cv); 79 79 if(!dp) 80 80 { … … 84 84 85 85 /* Set the window title */ 86 caca_set_ window_title(dp, "cacaview");86 caca_set_display_title(dp, "cacaview"); 87 87 88 88 ww = cucul_get_canvas_width(cv); … … 274 274 else if(ev.type == CACA_EVENT_RESIZE) 275 275 { 276 caca_ display(dp);276 caca_refresh_display(dp); 277 277 ww = ev.data.resize.w; 278 278 wh = ev.data.resize.h; … … 304 304 cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE); 305 305 cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer); 306 caca_ display(dp);306 caca_refresh_display(dp); 307 307 ww = cucul_get_canvas_width(cv); 308 308 wh = cucul_get_canvas_height(cv); … … 400 400 } 401 401 402 caca_ display(dp);402 caca_refresh_display(dp); 403 403 update = 0; 404 404 } … … 407 407 if(im) 408 408 unload_image(im); 409 caca_ detach(dp);409 caca_free_display(dp); 410 410 cucul_free_canvas(cv); 411 411 … … 477 477 yfactor = xfactor * ww / height * im->h / im->w 478 478 * cucul_get_canvas_height(cv) / cucul_get_canvas_width(cv) 479 * caca_get_ window_width(dp) / caca_get_window_height(dp);479 * caca_get_display_width(dp) / caca_get_display_height(dp); 480 480 481 481 if(yfactor > xfactor) -
libcaca/trunk/test/colors.c
r814 r819 32 32 return 1; 33 33 34 dp = caca_ attach(cv);34 dp = caca_create_display(cv); 35 35 if(!dp) 36 36 return 1; … … 50 50 } 51 51 52 caca_ display(dp);52 caca_refresh_display(dp); 53 53 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 54 54 55 caca_ detach(dp);55 caca_free_display(dp); 56 56 cucul_free_canvas(cv); 57 57 -
libcaca/trunk/test/demo.c
r816 r819 49 49 if(!cv) 50 50 return 1; 51 dp = caca_ attach(cv);51 dp = caca_create_display(cv); 52 52 if(!dp) 53 53 return 1; … … 67 67 /* Main menu */ 68 68 display_menu(); 69 caca_ display(dp);69 caca_refresh_display(dp); 70 70 71 71 /* Go ! */ … … 166 166 cucul_putstr(cv, xmouse, ymouse + 1, "|\\"); 167 167 } 168 caca_ display(dp);168 caca_refresh_display(dp); 169 169 mouse = menu = 0; 170 170 } … … 180 180 1000000 / caca_get_rendertime(dp), 181 181 (10000000 / caca_get_rendertime(dp)) % 10); 182 caca_ display(dp);182 caca_refresh_display(dp); 183 183 } 184 184 } … … 186 186 /* Clean up */ 187 187 cucul_free_sprite(sprite); 188 caca_ detach(dp);188 caca_free_display(dp); 189 189 cucul_free_canvas(cv); 190 190 … … 226 226 cucul_putstr(cv, 4, yo - 2, "'q': quit"); 227 227 228 caca_ display(dp);228 caca_refresh_display(dp); 229 229 } 230 230 -
libcaca/trunk/test/dithering.c
r815 r819 42 42 43 43 cv = cucul_create_canvas(0, 0); 44 dp = caca_ attach(cv);44 dp = caca_create_display(cv); 45 45 46 46 for(x = 0; x < 100; x++) … … 123 123 } 124 124 125 caca_ display(dp);125 caca_refresh_display(dp); 126 126 127 127 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 128 128 129 caca_ detach(dp);129 caca_free_display(dp); 130 130 cucul_free_canvas(cv); 131 131 -
libcaca/trunk/test/event.c
r814 r819 34 34 if(!cv) 35 35 return 1; 36 dp = caca_ attach(cv);36 dp = caca_create_display(cv); 37 37 if(!dp) 38 38 return 1; … … 46 46 cucul_putstr(cv, 0, h, "type \"quit\" to exit"); 47 47 48 caca_ display(dp);48 caca_refresh_display(dp); 49 49 50 50 events = malloc(h * sizeof(caca_event_t)); … … 97 97 print_event(0, i, events + i); 98 98 99 caca_ display(dp);99 caca_refresh_display(dp); 100 100 } 101 101 102 102 /* Clean up */ 103 caca_ detach(dp);103 caca_free_display(dp); 104 104 cucul_free_canvas(cv); 105 105 -
libcaca/trunk/test/font.c
r816 r819 79 79 /* Just for fun, render the image using libcaca */ 80 80 cucul_set_canvas_size(cv, 80, 32); 81 dp = caca_ attach(cv);81 dp = caca_create_display(cv); 82 82 83 83 #if defined(HAVE_ENDIAN_H) … … 96 96 cucul_dither_bitmap(cv, 0, 0, cucul_get_canvas_width(cv), 97 97 cucul_get_canvas_height(cv), d, buf); 98 caca_ display(dp);98 caca_refresh_display(dp); 99 99 100 100 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 101 101 102 102 /* Free everything */ 103 caca_ detach(dp);103 caca_free_display(dp); 104 104 free(buf); 105 105 cucul_free_dither(d); -
libcaca/trunk/test/gamma.c
r816 r819 42 42 43 43 cv = cucul_create_canvas(0, 0); 44 dp = caca_ attach(cv);44 dp = caca_create_display(cv); 45 45 46 46 cw = cucul_create_canvas(cucul_get_canvas_width(cv), cucul_get_canvas_height(cv)); … … 107 107 "gamma=%g - use arrows to change, Esc to quit", gam); 108 108 109 caca_ display(dp);109 caca_refresh_display(dp); 110 110 } 111 111 … … 113 113 cucul_free_dither(right); 114 114 115 caca_ detach(dp);115 caca_free_display(dp); 116 116 cucul_free_canvas(cv); 117 117 -
libcaca/trunk/test/hsv.c
r816 r819 37 37 38 38 cv = cucul_create_canvas(0, 0); 39 dp = caca_ attach(cv);39 dp = caca_create_display(cv); 40 40 41 41 for(y = 0; y < 256; y++) … … 51 51 cucul_free_dither(dither); 52 52 53 caca_ display(dp);53 caca_refresh_display(dp); 54 54 55 55 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 56 56 57 caca_ detach(dp);57 caca_free_display(dp); 58 58 cucul_free_canvas(cv); 59 59 -
libcaca/trunk/test/spritedit.c
r814 r819 41 41 if(!cv) 42 42 return 1; 43 dp = caca_ attach(cv);43 dp = caca_create_display(cv); 44 44 if(!dp) 45 45 return 1; … … 49 49 if(!sprite) 50 50 { 51 caca_ detach(dp);51 caca_free_display(dp); 52 52 cucul_free_canvas(cv); 53 53 fprintf(stderr, "%s: could not open `%s'.\n", argv[0], argv[1]); … … 133 133 cucul_draw_sprite(cv, 20, 10, sprite, frame); 134 134 135 caca_ display(dp);135 caca_refresh_display(dp); 136 136 } 137 137 138 138 /* Clean up */ 139 caca_ detach(dp);139 caca_free_display(dp); 140 140 cucul_free_canvas(cv); 141 141 -
libcaca/trunk/test/transform.c
r813 r819 56 56 57 57 cv = cucul_create_canvas(0, 0); 58 dp = caca_ attach(cv);58 dp = caca_create_display(cv); 59 59 60 60 normal = cucul_create_canvas(70, 6); … … 107 107 cucul_blit(cv, 10, 18, rotate, NULL); 108 108 109 caca_ display(dp);109 caca_refresh_display(dp); 110 110 111 111 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 112 112 113 caca_ detach(dp);113 caca_free_display(dp); 114 114 cucul_free_canvas(rotate); 115 115 cucul_free_canvas(flop); -
libcaca/trunk/test/truecolor.c
r813 r819 34 34 35 35 cv = cucul_create_canvas(32, 16); 36 dp = caca_ attach(cv);36 dp = caca_create_display(cv); 37 37 38 38 for(y = 0; y < 16; y++) … … 49 49 cucul_putstr(cv, 2, 1, " truecolor libcaca "); 50 50 51 caca_ display(dp);51 caca_refresh_display(dp); 52 52 53 53 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 54 54 55 caca_ detach(dp);55 caca_free_display(dp); 56 56 cucul_free_canvas(cv); 57 57 -
libcaca/trunk/test/unicode.c
r813 r819 32 32 33 33 cv = cucul_create_canvas(0, 0); 34 dp = caca_ attach(cv);34 dp = caca_create_display(cv); 35 35 36 36 cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE); … … 86 86 cucul_putstr(cv, 1, 22, "drawing blocks: ███ ▓▓▓ ▒▒▒ ░░░ ▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟"); 87 87 88 caca_ display(dp);88 caca_refresh_display(dp); 89 89 90 90 caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1); 91 91 92 caca_ detach(dp);92 caca_free_display(dp); 93 93 cucul_free_canvas(cv); 94 94
Note: See TracChangeset
for help on using the changeset viewer.