Changeset 836
- Timestamp:
- 08/23/07 22:52:26 (15 months ago)
- Location:
- branches/volker_dev
- Files:
-
- 4 modified
-
drv_generic_graphic.h (modified) (1 diff)
-
drv_serdisplib.c (modified) (3 diffs)
-
qprintf.c (modified) (5 diffs)
-
widget_bar.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/volker_dev/drv_generic_graphic.h
r810 r836 36 36 extern RGBA HG_COL; /* halfground color */ 37 37 extern RGBA BG_COL; /* background color */ 38 extern RGBA BL_COL; /* backlight color */38 extern RGBA BL_COL; /* backlight color */ 39 39 40 40 /* these functions must be implemented by the real driver */ -
branches/volker_dev/drv_serdisplib.c
r834 r836 34 34 35 35 #include "config.h" 36 #include "debug.h" // verbose_level36 #include "debug.h" // verbose_level 37 37 38 38 #include <stdlib.h> … … 83 83 for (c = col; c < col + width; c++) { 84 84 p = drv_generic_graphic_rgb(r, c); 85 // printf("blit (%d,%d) A%d.R%d.G%d.B%d\n", c, r, p.A, p.R, p.G, p.B);85 // printf("blit (%d,%d) A%d.R%d.G%d.B%d\n", c, r, p.A, p.R, p.G, p.B); 86 86 serdisp_setcolour(dd, c, r, serdisp_pack2ARGB(0xff, p.R, p.G, p.B)); 87 87 } … … 284 284 285 285 if (verbose_level > 0) { 286 printf(" Supported displays:\n");287 displaydesc.dispname = "";288 printf(" display name alias names description\n");289 printf(" --------------- -------------------- -----------------------------------\n");290 while(serdisp_nextdisplaydescription(&displaydesc)) { 291 printf(" %-15s %-20s %-35s\n", displaydesc.dispname, displaydesc.aliasnames, displaydesc.description);292 }286 printf(" Supported displays:\n"); 287 displaydesc.dispname = ""; 288 printf(" display name alias names description\n"); 289 printf(" --------------- -------------------- -----------------------------------\n"); 290 while (serdisp_nextdisplaydescription(&displaydesc)) { 291 printf(" %-15s %-20s %-35s\n", displaydesc.dispname, displaydesc.aliasnames, displaydesc.description); 292 } 293 293 } else { 294 displaydesc.dispname = "";295 while (serdisp_nextdisplaydescription(&displaydesc)) {296 printf("%s ", displaydesc.dispname);297 }298 printf("\n (use -vl to see detailed list of serdisplib)");294 displaydesc.dispname = ""; 295 while (serdisp_nextdisplaydescription(&displaydesc)) { 296 printf("%s ", displaydesc.dispname); 297 } 298 printf("\n (use -vl to see detailed list of serdisplib)"); 299 299 } 300 300 -
branches/volker_dev/qprintf.c
r821 r836 58 58 if (value < 0) { 59 59 sign = 1; 60 if (fill0)61 fixedlen -= 1;60 if (fill0) 61 fixedlen -= 1; 62 62 value = -value; 63 63 } … … 74 74 } while (value != 0 && p > buffer); 75 75 76 if (sign && ! fill0 && p > buffer)76 if (sign && !fill0 && p > buffer) 77 77 *--p = '-'; 78 78 79 79 /* fill fixed length */ 80 80 while (p > buffer && strlen(p) < fixedlen) { 81 if (fill0) {82 *--p = '0';83 } else {84 *--p = ' ';85 }86 } 87 81 if (fill0) { 82 *--p = '0'; 83 } else { 84 *--p = ' '; 85 } 86 } 87 88 88 if (sign && fill0 && p > buffer) 89 89 *--p = '-'; … … 114 114 /* fill fixed length */ 115 115 while (p > buffer && strlen(p) < fixedlen) { 116 if (fill0) {117 *--p = '0';118 } else {119 *--p = ' ';120 }121 } 122 116 if (fill0) { 117 *--p = '0'; 118 } else { 119 *--p = ' '; 120 } 121 } 122 123 123 return p; 124 124 } … … 145 145 *--p = (digit < 10 ? '0' : 'a' - 10) + digit; 146 146 } while (value != 0 && p > buffer); 147 147 148 148 /* fill fixed length */ 149 149 while (p > buffer && strlen(p) < fixedlen) { 150 if (fill0) {151 *--p = '0';152 } else {153 *--p = ' ';154 }150 if (fill0) { 151 *--p = '0'; 152 } else { 153 *--p = ' '; 154 } 155 155 } 156 156 … … 190 190 int d; 191 191 unsigned int u; 192 unsigned int fixedlen = 0;193 unsigned int fill0 = 0;194 195 if (*++src == '0')196 fill0 = 1;197 while (*src >= '0' && *src <= '9') {198 fixedlen = fixedlen * 10 + (*src - '0');199 src++;200 }201 192 unsigned int fixedlen = 0; 193 unsigned int fill0 = 0; 194 195 if (*++src == '0') 196 fill0 = 1; 197 while (*src >= '0' && *src <= '9') { 198 fixedlen = fixedlen * 10 + (*src - '0'); 199 src++; 200 } 201 202 202 switch (*src) { 203 203 case 's': -
branches/volker_dev/widget_bar.c
r828 r836 157 157 break; 158 158 default: 159 error("widget %s has unknown direction '%s'; known directions: 'E', 'W', 'N', 'S'; using 'E(ast)'", Self->name, c); 159 error("widget %s has unknown direction '%s'; known directions: 'E', 'W', 'N', 'S'; using 'E(ast)'", Self->name, 160 c); 160 161 Bar->direction = DIR_EAST; 161 162 } … … 168 169 Bar->style = STYLE_HOLLOW; 169 170 if (!(Bar->direction & (DIR_EAST | DIR_WEST))) { 170 error("widget %s with style \"hollow\" not implemented for other directions than E(ast) or W(est)", Self->name); 171 error("widget %s with style \"hollow\" not implemented for other directions than E(ast) or W(est)", 172 Self->name); 171 173 Bar->style = 0; 172 174 } 173 175 break; 174 176 case '0': 175 Bar->style = 0;176 break;177 Bar->style = 0; 178 break; 177 179 default: 178 error("widget %s has unknown style '%s'; known styles: '0' or 'H'; using '0'", Self->name, c);180 error("widget %s has unknown style '%s'; known styles: '0' or 'H'; using '0'", Self->name, c); 179 181 Bar->style = 0; 180 182 }
