- Timestamp:
- Nov 26, 2007, 2:04:32 AM (13 years ago)
- Location:
- libcaca/trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/caca.c
r2061 r2074 199 199 } 200 200 201 /** \brief Return the \e libcaca version. 202 * 203 * Return a read-only string with the \e libcaca version information. 204 * 205 * This function never fails. 206 * 207 * \return The \e libcaca version information. 208 */ 209 char const * caca_get_version(void) 210 { 211 return VERSION; 212 } 213 201 214 /* 202 215 * XXX: The following functions are local. -
libcaca/trunk/caca/caca.h
r2073 r2074 165 165 __extern int caca_set_mouse(caca_display_t *, int); 166 166 __extern int caca_set_cursor(caca_display_t *, int); 167 __extern char const * caca_get_version(void); 167 168 /* @} */ 168 169 -
libcaca/trunk/cucul/cucul.c
r2056 r2074 333 333 334 334 return min + (int)((1.0 * (max - min)) * rand() / (RAND_MAX + 1.0)); 335 } 336 337 /** \brief Return the \e libcucul version. 338 * 339 * Return a read-only string with the \e libcucul version information. 340 * 341 * This function never fails. 342 * 343 * \return The \e libcucul version information. 344 */ 345 char const * cucul_get_version(void) 346 { 347 return VERSION; 335 348 } 336 349 -
libcaca/trunk/cucul/cucul.h
r2071 r2074 94 94 __extern int cucul_free_canvas(cucul_canvas_t *); 95 95 __extern int cucul_rand(int, int); 96 __extern char const * cucul_get_version(void); 96 97 /* @} */ 97 98 -
libcaca/trunk/cucul/export.c
r2057 r2074 379 379 /* HTML header */ 380 380 cur += sprintf(cur, "<html><head>\n"); 381 cur += sprintf(cur, "<title>Generated by libcaca %s</title>\n", VERSION); 381 cur += sprintf(cur, "<title>Generated by libcaca %s</title>\n", 382 cucul_get_version()); 382 383 cur += sprintf(cur, "</head><body>\n"); 383 384 -
libcaca/trunk/cxx/caca++.cpp
r2050 r2074 97 97 } 98 98 99 const char * Caca::getVersion() 100 { 101 return caca_get_version(); 102 } 103 -
libcaca/trunk/cxx/caca++.h
r2071 r2074 79 79 void setMouse(int); 80 80 81 static char const * getVersion(); 81 82 private: 82 83 caca_display_t *dp; -
libcaca/trunk/cxx/cucul++.cpp
r1952 r2074 237 237 } 238 238 239 const char * Cucul::getVersion() 240 { 241 return cucul_get_version(); 242 } 243 239 244 int Cucul::setAttr(unsigned long int attr) 240 245 { -
libcaca/trunk/cxx/cucul++.h
r2071 r2074 130 130 void drawThinTriangle(int, int, int, int, int, int); 131 131 void fillTriangle(int, int, int, int, int, int, unsigned long int); 132 int Rand(int, int);133 132 int setBoundaries(cucul_canvas_t *, int, int, unsigned int, unsigned int); 134 133 unsigned int getFrameCount(); … … 143 142 void *exportMemory(char const *, unsigned long int *); 144 143 144 static int Rand(int, int); 145 static char const * getVersion(); 145 146 protected: 146 147 cucul_canvas_t *get_cucul_canvas_t(); -
libcaca/trunk/cxx/cxxtest.cpp
r2070 r2074 12 12 * http://sam.zoy.org/wtfpl/COPYING for more details. 13 13 */ 14 15 #include "config.h"16 14 17 15 #include <iostream> … … 42 40 int main(int argc, char *argv[]) 43 41 { 44 Cucul * qq, *pig;45 Caca * kk;42 Cucul *cv, *pig; 43 Caca *dp; 46 44 47 45 int x = 0, y = 0, ix = 1, iy = 1; 48 46 49 47 try { 50 qq= new Cucul();48 cv = new Cucul(); 51 49 } 52 50 catch (int e) { … … 56 54 57 55 try { 58 kk = new Caca(qq);56 dp = new Caca(cv); 59 57 } 60 58 catch(int e) { … … 74 72 } 75 73 76 kk->setDisplayTime(20000);74 dp->setDisplayTime(20000); 77 75 78 while(! kk->getEvent(Event::CACA_EVENT_KEY_PRESS, NULL, 0))76 while(!dp->getEvent(Event::CACA_EVENT_KEY_PRESS, NULL, 0)) 79 77 { 80 78 81 79 /* In case of resize ...*/ 82 if((x + pig->getWidth())-1 >= qq->getWidth() || x < 0 )80 if((x + pig->getWidth())-1 >= cv->getWidth() || x < 0 ) 83 81 x = 0; 84 if((y + pig->getHeight())-1 >= qq->getHeight() || y < 0 )82 if((y + pig->getHeight())-1 >= cv->getHeight() || y < 0 ) 85 83 y = 0; 86 84 87 qq->Clear();85 cv->Clear(); 88 86 89 87 /* Draw pig */ 90 qq->Blit(x, y, pig, NULL);88 cv->Blit(x, y, pig, NULL); 91 89 92 90 /* printf works */ 93 qq->setColorANSI(CUCUL_LIGHTBLUE, CUCUL_BLACK);94 qq->Printf(qq->getWidth() / 2 - 10, qq->getHeight() / 2,95 "Powered by libcaca %s", VERSION);91 cv->setColorANSI(CUCUL_LIGHTBLUE, CUCUL_BLACK); 92 cv->Printf(cv->getWidth() / 2 - 10, cv->getHeight() / 2, 93 "Powered by libcaca %s", dp->getVersion()); 96 94 97 95 /* Blit */ 98 kk->Display();96 dp->Display(); 99 97 100 98 x += ix; 101 99 y += iy; 102 100 103 if(x + pig->getWidth() >= qq->getWidth() || x < 0 )101 if(x + pig->getWidth() >= cv->getWidth() || x < 0 ) 104 102 ix = -ix; 105 if(y + pig->getHeight() >= qq->getHeight() || y < 0 )103 if(y + pig->getHeight() >= cv->getHeight() || y < 0 ) 106 104 iy = -iy; 107 105 108 106 } 109 107 110 delete kk;111 delete qq;108 delete dp; 109 delete cv; 112 110 113 111 return 0; -
libcaca/trunk/src/img2txt.c
r1919 r2074 89 89 "The latest version of img2txt is available from the web site,\n" 90 90 " http://libcaca.zoy.org/ in the libcaca package.\n" 91 "\n" 92 , VERSION, __DATE__);91 "\n", 92 cucul_get_version(), __DATE__); 93 93 } 94 94 int main(int argc, char **argv)
Note: See TracChangeset
for help on using the changeset viewer.