Changeset 684 for libcaca/trunk/caca
- Timestamp:
- Mar 24, 2006, 10:48:20 AM (15 years ago)
- Location:
- libcaca/trunk/caca
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/caca.c
r681 r684 123 123 { 124 124 #if defined(USE_WIN32) 125 if(!strcasecmp(var, "win32")) 126 win32_init_driver(kk); 127 else 125 if(!strcasecmp(var, "win32")) return win32_install(kk); 128 126 #endif 129 127 #if defined(USE_CONIO) 130 if(!strcasecmp(var, "conio")) 131 conio_init_driver(kk); 132 else 128 if(!strcasecmp(var, "conio")) return conio_install(kk); 133 129 #endif 134 130 #if defined(USE_X11) 135 if(!strcasecmp(var, "x11")) 136 x11_init_driver(kk); 137 else 131 if(!strcasecmp(var, "x11")) return x11_install(kk); 138 132 #endif 139 133 #if defined(USE_GL) 140 if(!strcasecmp(var, "gl")) 141 gl_init_driver(kk); 142 else 134 if(!strcasecmp(var, "gl")) return gl_install(kk); 143 135 #endif 144 136 #if defined(USE_SLANG) 145 if(!strcasecmp(var, "slang")) 146 slang_init_driver(kk); 147 else 137 if(!strcasecmp(var, "slang")) return slang_install(kk); 148 138 #endif 149 139 #if defined(USE_NCURSES) 150 if(!strcasecmp(var, "ncurses")) 151 ncurses_init_driver(kk); 152 else 140 if(!strcasecmp(var, "ncurses")) return ncurses_install(kk); 153 141 #endif 154 142 #if defined(USE_NETWORK) 155 if(!strcasecmp(var, "network")) 156 network_init_driver(kk); 157 else 143 if(!strcasecmp(var, "network")) return network_install(kk); 158 144 #endif 159 145 #if defined(USE_VGA) 160 if(!strcasecmp(var, "vga")) 161 vga_init_driver(kk); 162 else 146 if(!strcasecmp(var, "vga")) return vga_install(kk); 163 147 #endif 164 return -1; 165 166 return 0; 148 return -1; 167 149 } 168 150 #endif 169 151 170 152 #if defined(USE_WIN32) 171 win32_init_driver(kk); 172 return 0; 153 if(win32_install(kk) == 0) return 0; 173 154 #endif 174 155 #if defined(USE_CONIO) 175 conio_init_driver(kk); 176 return 0; 156 if(conio_install(kk) == 0) return 0; 177 157 #endif 178 158 #if defined(USE_VGA) 179 vga_init_driver(kk); 180 return 0; 159 if(vga_install(kk) == 0) return 0; 181 160 #endif 182 161 #if defined(USE_X11) 183 #if defined(HAVE_GETENV) 184 if(getenv("DISPLAY") && *(getenv("DISPLAY"))) 185 #endif 186 { 187 x11_init_driver(kk); 188 return 0; 189 } 162 if(x11_install(kk) == 0) return 0; 190 163 #endif 191 164 #if defined(USE_GL) 192 #if defined(HAVE_GETENV) && defined(GLUT_XLIB_IMPLEMENTATION) 193 if(getenv("DISPLAY") && *(getenv("DISPLAY"))) 194 #endif 195 { 196 gl_init_driver(kk); 197 return 0; 198 } 165 if(gl_install(kk) == 0) return 0; 199 166 #endif 200 167 #if defined(USE_SLANG) 201 slang_init_driver(kk); 202 return 0; 168 if(slang_install(kk) == 0) return 0; 203 169 #endif 204 170 #if defined(USE_NCURSES) 205 ncurses_init_driver(kk); 206 return 0; 171 if(ncurses_install(kk) == 0) return 0; 207 172 #endif 208 173 #if defined(USE_NETWORK) 209 network_init_driver(kk); 210 return 0; 174 if(network_install(kk) == 0) return 0; 211 175 #endif 212 176 -
libcaca/trunk/caca/caca_internals.h
r681 r684 39 39 enum caca_driver 40 40 { 41 CACA_DRIVER_NONE = 0, 41 42 #if defined(USE_CONIO) 42 43 CACA_DRIVER_CONIO = 1, … … 63 64 CACA_DRIVER_VGA = 8, 64 65 #endif 65 CACA_DRIVER_NONE = 066 66 }; 67 67 68 68 /* Available drivers */ 69 69 #if defined(USE_CONIO) 70 void conio_init_driver(caca_t *);70 int conio_install(caca_t *); 71 71 #endif 72 72 #if defined(USE_GL) 73 void gl_init_driver(caca_t *);73 int gl_install(caca_t *); 74 74 #endif 75 75 #if defined(USE_NCURSES) 76 void ncurses_init_driver(caca_t *);76 int ncurses_install(caca_t *); 77 77 #endif 78 78 #if defined(USE_SLANG) 79 void slang_init_driver(caca_t *);79 int slang_install(caca_t *); 80 80 #endif 81 81 #if defined(USE_WIN32) 82 void win32_init_driver(caca_t *);82 int win32_install(caca_t *); 83 83 #endif 84 84 #if defined(USE_X11) 85 void x11_init_driver(caca_t *);85 int x11_install(caca_t *); 86 86 #endif 87 87 #if defined(USE_NETWORK) 88 void network_init_driver(caca_t *);88 int network_install(caca_t *); 89 89 #endif 90 90 #if defined(USE_VGA) 91 void vga_init_driver(caca_t *);91 int vga_install(caca_t *); 92 92 #endif 93 93 94 /* Timer structure */ 94 95 struct caca_timer … … 129 130 { 130 131 int resized; /* A resize event was requested */ 131 //int acked; /* The event has been acknowledged by the user */132 132 unsigned w, h; /* Requested width and height */ 133 133 } resize; -
libcaca/trunk/caca/driver_conio.c
r681 r684 152 152 */ 153 153 154 void conio_init_driver(caca_t *kk)154 int conio_install(caca_t *kk) 155 155 { 156 156 kk->drv.driver = CACA_DRIVER_CONIO; … … 164 164 kk->drv.handle_resize = conio_handle_resize; 165 165 kk->drv.get_event = conio_get_event; 166 167 return 0; 166 168 } 167 169 -
libcaca/trunk/caca/driver_gl.c
r681 r684 107 107 gl_kk = kk; 108 108 109 #if defined(HAVE_GETENV) 109 110 geometry = getenv("CACA_GEOMETRY"); 110 111 if(geometry && *geometry) 111 112 sscanf(geometry, "%ux%u", &width, &height); 113 #endif 112 114 113 115 if(width && height) … … 446 448 */ 447 449 448 void gl_init_driver(caca_t *kk) 449 { 450 int gl_install(caca_t *kk) 451 { 452 #if defined(HAVE_GETENV) && defined(GLUT_XLIB_IMPLEMENTATION) 453 if(!getenv("DISPLAY") || !*(getenv("DISPLAY"))) 454 return -1; 455 #endif 456 450 457 kk->drv.driver = CACA_DRIVER_GL; 451 458 … … 458 465 kk->drv.handle_resize = gl_handle_resize; 459 466 kk->drv.get_event = gl_get_event; 467 468 return 0; 460 469 } 461 470 -
libcaca/trunk/caca/driver_ncurses.c
r681 r684 531 531 */ 532 532 533 void ncurses_init_driver(caca_t *kk)533 int ncurses_install(caca_t *kk) 534 534 { 535 535 kk->drv.driver = CACA_DRIVER_NCURSES; … … 543 543 kk->drv.handle_resize = ncurses_handle_resize; 544 544 kk->drv.get_event = ncurses_get_event; 545 546 return 0; 545 547 } 546 548 -
libcaca/trunk/caca/driver_network.c
r681 r684 551 551 */ 552 552 553 void network_init_driver(caca_t *kk)553 int network_install(caca_t *kk) 554 554 { 555 555 kk->drv.driver = CACA_DRIVER_NETWORK; … … 563 563 kk->drv.handle_resize = network_handle_resize; 564 564 kk->drv.get_event = network_get_event; 565 566 return 0; 565 567 } 566 568 -
libcaca/trunk/caca/driver_slang.c
r681 r684 469 469 */ 470 470 471 void slang_init_driver(caca_t *kk)471 int slang_install(caca_t *kk) 472 472 { 473 473 kk->drv.driver = CACA_DRIVER_SLANG; … … 481 481 kk->drv.handle_resize = slang_handle_resize; 482 482 kk->drv.get_event = slang_get_event; 483 484 return 0; 483 485 } 484 486 -
libcaca/trunk/caca/driver_vga.c
r681 r684 146 146 */ 147 147 148 void vga_init_driver(caca_t *kk)148 int vga_install(caca_t *kk) 149 149 { 150 150 kk->drv.driver = CACA_DRIVER_VGA; … … 158 158 kk->drv.handle_resize = vga_handle_resize; 159 159 kk->drv.get_event = vga_get_event; 160 161 return 0; 160 162 } 161 163 -
libcaca/trunk/caca/driver_win32.c
r681 r684 334 334 */ 335 335 336 void win32_init_driver(caca_t *kk)336 int win32_install(caca_t *kk) 337 337 { 338 338 kk->drv.driver = CACA_DRIVER_WIN32; … … 346 346 kk->drv.handle_resize = win32_handle_resize; 347 347 kk->drv.get_event = win32_get_event; 348 349 return 0; 348 350 } 349 351 -
libcaca/trunk/caca/driver_x11.c
r681 r684 93 93 kk->drv.p = malloc(sizeof(struct driver_private)); 94 94 95 #if defined(HAVE_GETENV) 95 96 geometry = getenv("CACA_GEOMETRY"); 96 97 if(geometry && *geometry) 97 98 sscanf(geometry, "%ux%u", &width, &height); 99 #endif 98 100 99 101 if(width && height) … … 104 106 return -1; 105 107 108 #if defined(HAVE_GETENV) 106 109 fonts[0] = getenv("CACA_FONT"); 107 110 if(fonts[0] && *fonts[0]) 108 111 parser = fonts; 109 112 else 113 #endif 110 114 parser = fonts + 1; 111 115 … … 544 548 */ 545 549 546 void x11_init_driver(caca_t *kk) 547 { 550 int x11_install(caca_t *kk) 551 { 552 #if defined(HAVE_GETENV) 553 if(!getenv("DISPLAY") || !*(getenv("DISPLAY"))) 554 return -1; 555 #endif 556 548 557 kk->drv.driver = CACA_DRIVER_X11; 549 558 … … 556 565 kk->drv.handle_resize = x11_handle_resize; 557 566 kk->drv.get_event = x11_get_event; 567 568 return 0; 558 569 } 559 570
Note: See TracChangeset
for help on using the changeset viewer.