Changeset 2821 for libcaca/trunk/tools/optipal.c
- Timestamp:
- Sep 27, 2008, 3:12:46 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/tools/optipal.c
r2299 r2821 19 19 #endif 20 20 21 #include "c ucul.h" /* Only necessary for CUCUL_* macros */21 #include "caca.h" /* Only necessary for CACA_* macros */ 22 22 23 23 static void base_colors(void); … … 30 30 static unsigned int const hue_list[] = 31 31 { 32 C UCUL_RED, CUCUL_BROWN, CUCUL_GREEN,33 C UCUL_CYAN, CUCUL_BLUE, CUCUL_MAGENTA32 CACA_RED, CACA_BROWN, CACA_GREEN, 33 CACA_CYAN, CACA_BLUE, CACA_MAGENTA 34 34 }; 35 35 … … 168 168 /* black background colour pairs that are needed for the old renderer */ 169 169 for(i = 1; i < 16; i++) 170 SETPAIR(i, C UCUL_BLACK, cur++);170 SETPAIR(i, CACA_BLACK, cur++); 171 171 172 172 /* gray combinations used for grayscale dithering */ 173 SETPAIR(C UCUL_BLACK, CUCUL_DARKGRAY, cur++);174 SETPAIR(C UCUL_DARKGRAY, CUCUL_LIGHTGRAY, cur++);175 SETPAIR(C UCUL_LIGHTGRAY, CUCUL_DARKGRAY, cur++);176 SETPAIR(C UCUL_WHITE, CUCUL_LIGHTGRAY, cur++);177 SETPAIR(C UCUL_LIGHTGRAY, CUCUL_WHITE, cur++);173 SETPAIR(CACA_BLACK, CACA_DARKGRAY, cur++); 174 SETPAIR(CACA_DARKGRAY, CACA_LIGHTGRAY, cur++); 175 SETPAIR(CACA_LIGHTGRAY, CACA_DARKGRAY, cur++); 176 SETPAIR(CACA_WHITE, CACA_LIGHTGRAY, cur++); 177 SETPAIR(CACA_LIGHTGRAY, CACA_WHITE, cur++); 178 178 179 179 /* white/light, light/dark, lightgray/light, darkgray/dark, dark/black … … 183 183 for(i = 1; i < 7; i++) 184 184 { 185 SETPAIR(C UCUL_WHITE, i + 8, cur++);186 SETPAIR(i + 8, C UCUL_WHITE, cur++);185 SETPAIR(CACA_WHITE, i + 8, cur++); 186 SETPAIR(i + 8, CACA_WHITE, cur++); 187 187 SETPAIR(i, i + 8, cur++); 188 188 SETPAIR(i + 8, i, cur++); 189 SETPAIR(C UCUL_LIGHTGRAY, i + 8, cur++);190 SETPAIR(i + 8, C UCUL_LIGHTGRAY, cur++);191 SETPAIR(C UCUL_DARKGRAY, i, cur++);192 SETPAIR(i, C UCUL_DARKGRAY, cur++);193 SETPAIR(C UCUL_BLACK, i, cur++);189 SETPAIR(CACA_LIGHTGRAY, i + 8, cur++); 190 SETPAIR(i + 8, CACA_LIGHTGRAY, cur++); 191 SETPAIR(CACA_DARKGRAY, i, cur++); 192 SETPAIR(i, CACA_DARKGRAY, cur++); 193 SETPAIR(CACA_BLACK, i, cur++); 194 194 } 195 195 … … 216 216 /* black on light gray, black on white, white on dark gray, dark gray 217 217 * on white, white on blue, light gray on blue (chosen arbitrarily) */ 218 SETPAIR(C UCUL_BLACK, CUCUL_LIGHTGRAY, cur++);219 SETPAIR(C UCUL_BLACK, CUCUL_WHITE, cur++);220 SETPAIR(C UCUL_WHITE, CUCUL_DARKGRAY, cur++);221 SETPAIR(C UCUL_DARKGRAY, CUCUL_WHITE, cur++);222 SETPAIR(C UCUL_WHITE, CUCUL_BLUE, cur++);223 SETPAIR(C UCUL_LIGHTGRAY, CUCUL_BLUE, cur++);218 SETPAIR(CACA_BLACK, CACA_LIGHTGRAY, cur++); 219 SETPAIR(CACA_BLACK, CACA_WHITE, cur++); 220 SETPAIR(CACA_WHITE, CACA_DARKGRAY, cur++); 221 SETPAIR(CACA_DARKGRAY, CACA_WHITE, cur++); 222 SETPAIR(CACA_WHITE, CACA_BLUE, cur++); 223 SETPAIR(CACA_LIGHTGRAY, CACA_BLUE, cur++); 224 224 } 225 225 … … 237 237 for(i = 1; i < 7; i++) 238 238 { 239 if(i != C UCUL_BLUE)239 if(i != CACA_BLUE) 240 240 { 241 SETPAIR(C UCUL_LIGHTGRAY, i, 128 +241 SETPAIR(CACA_LIGHTGRAY, i, 128 + 242 242 slang_assoc[i + 8 + 16 * i]); 243 SETPAIR(C UCUL_WHITE, i, 128 +244 slang_assoc[C UCUL_LIGHTGRAY + 16 * (i + 8)]);243 SETPAIR(CACA_WHITE, i, 128 + 244 slang_assoc[CACA_LIGHTGRAY + 16 * (i + 8)]); 245 245 } 246 SETPAIR(C UCUL_BLACK, i + 8,247 128 + slang_assoc[C UCUL_DARKGRAY + 16 * i]);248 SETPAIR(C UCUL_DARKGRAY, i + 8,246 SETPAIR(CACA_BLACK, i + 8, 247 128 + slang_assoc[CACA_DARKGRAY + 16 * i]); 248 SETPAIR(CACA_DARKGRAY, i + 8, 249 249 128 + slang_assoc[i + 16 * (i + 8)]); 250 SETPAIR(i + 8, C UCUL_DARKGRAY,251 128 + slang_assoc[i + 16 * C UCUL_DARKGRAY]);252 SETPAIR(i, C UCUL_LIGHTGRAY,253 128 + slang_assoc[i + 8 + 16 * C UCUL_LIGHTGRAY]);254 SETPAIR(i, C UCUL_WHITE,255 128 + slang_assoc[i + 8 + 16 * C UCUL_WHITE]);250 SETPAIR(i + 8, CACA_DARKGRAY, 251 128 + slang_assoc[i + 16 * CACA_DARKGRAY]); 252 SETPAIR(i, CACA_LIGHTGRAY, 253 128 + slang_assoc[i + 8 + 16 * CACA_LIGHTGRAY]); 254 SETPAIR(i, CACA_WHITE, 255 128 + slang_assoc[i + 8 + 16 * CACA_WHITE]); 256 256 } 257 257 … … 287 287 { 288 288 SETPAIR(hue_list[i], hue_list[(i + 3) % 6], 289 128 + slang_assoc[hue_list[i] + 16 * C UCUL_BLACK]);289 128 + slang_assoc[hue_list[i] + 16 * CACA_BLACK]); 290 290 SETPAIR(hue_list[i] + 8, hue_list[(i + 3) % 6], 291 128 + slang_assoc[hue_list[i] + 8 + 16 * C UCUL_BLACK]);291 128 + slang_assoc[hue_list[i] + 8 + 16 * CACA_BLACK]); 292 292 SETPAIR(hue_list[(i + 3) % 6], hue_list[i] + 8, 293 128 + slang_assoc[C UCUL_BLACK + 16 * hue_list[i]]);293 128 + slang_assoc[CACA_BLACK + 16 * hue_list[i]]); 294 294 SETPAIR(hue_list[(i + 3) % 6] + 8, hue_list[i] + 8, 295 128 + slang_assoc[C UCUL_WHITE + 16 * (hue_list[i] + 8)]);295 128 + slang_assoc[CACA_WHITE + 16 * (hue_list[i] + 8)]); 296 296 } 297 297 }
Note: See TracChangeset
for help on using the changeset viewer.