Changeset 04803bf in mainline for uspace/srv/hid/fb/serial_console.c
- Timestamp:
- 2011-03-21T22:00:17Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 143932e3
- Parents:
- b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - File:
-
- 1 moved
-
uspace/srv/hid/fb/serial_console.c (moved) (moved from uspace/srv/fb/serial_console.c ) (21 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/fb/serial_console.c
rb50b5af2 r04803bf 31 31 /** 32 32 * @defgroup serial Serial console 33 * @brief 33 * @brief Serial console services (putc, puts, clear screen, cursor goto,...) 34 34 * @{ 35 */ 35 */ 36 36 37 37 /** @file … … 39 39 40 40 #include <stdio.h> 41 #include <ipc/ipc.h>42 41 #include <async.h> 43 42 #include <ipc/fb.h> … … 46 45 #include <io/color.h> 47 46 #include <io/style.h> 48 #include <string.h> 49 50 #include "../console/screenbuffer.h" 47 #include <str.h> 48 #include <inttypes.h> 49 #include <io/screenbuffer.h> 50 51 51 #include "main.h" 52 52 #include "serial_console.h" … … 54 54 #define MAX_CONTROL 20 55 55 56 static void serial_sgr(const unsigned int mode); 57 void serial_putchar(wchar_t ch); 58 59 static int scr_width; 60 static int scr_height; 61 static bool color = true; /** True if producing color output. */ 62 static bool utf8 = false; /** True if producing UTF8 output. */ 56 static sysarg_t scr_width; 57 static sysarg_t scr_height; 58 static bool color = true; /**< True if producing color output. */ 59 static bool utf8 = false; /**< True if producing UTF8 output. */ 63 60 static putc_function_t putc_function; 61 62 static sysarg_t lastcol = 0; 63 static sysarg_t lastrow = 0; 64 static attrs_t cur_attr = { 65 .t = at_style, 66 .a.s.style = STYLE_NORMAL 67 }; 64 68 65 69 /* Allow only 1 connection */ … … 67 71 68 72 enum sgr_color_index { 69 CI_BLACK 70 CI_RED 71 CI_GREEN 72 CI_BROWN 73 CI_BLUE 74 CI_MAGENTA 75 CI_CYAN 76 CI_WHITE = 7,73 CI_BLACK = 0, 74 CI_RED = 1, 75 CI_GREEN = 2, 76 CI_BROWN = 3, 77 CI_BLUE = 4, 78 CI_MAGENTA = 5, 79 CI_CYAN = 6, 80 CI_WHITE = 7 77 81 }; 78 82 79 83 enum sgr_command { 80 SGR_RESET = 0, 81 SGR_BOLD = 1, 82 SGR_BLINK = 5, 83 SGR_REVERSE = 7, 84 SGR_NORMAL_INT = 22, 85 SGR_BLINK_OFF = 25, 86 SGR_REVERSE_OFF = 27, 87 SGR_FGCOLOR = 30, 88 SGR_BGCOLOR = 40 84 SGR_RESET = 0, 85 SGR_BOLD = 1, 86 SGR_UNDERLINE = 4, 87 SGR_BLINK = 5, 88 SGR_REVERSE = 7, 89 SGR_FGCOLOR = 30, 90 SGR_BGCOLOR = 40 89 91 }; 90 92 91 93 static int color_map[] = { 92 [COLOR_BLACK] 93 [COLOR_BLUE] 94 [COLOR_GREEN] 95 [COLOR_CYAN] 96 [COLOR_RED] 94 [COLOR_BLACK] = CI_BLACK, 95 [COLOR_BLUE] = CI_RED, 96 [COLOR_GREEN] = CI_GREEN, 97 [COLOR_CYAN] = CI_CYAN, 98 [COLOR_RED] = CI_RED, 97 99 [COLOR_MAGENTA] = CI_MAGENTA, 98 [COLOR_YELLOW] 99 [COLOR_WHITE] 100 [COLOR_YELLOW] = CI_BROWN, 101 [COLOR_WHITE] = CI_WHITE 100 102 }; 101 103 102 void serial_puts(c har *str)104 void serial_puts(const char *str) 103 105 { 104 106 while (*str) … … 106 108 } 107 109 108 void serial_putchar(wchar_t ch) 109 { 110 uint8_t buf[STR_BOUNDS(1)]; 111 size_t offs; 112 size_t i; 113 110 static void serial_putchar(wchar_t ch) 111 { 114 112 if (utf8 != true) { 115 113 if (ch >= 0 && ch < 128) 116 114 (*putc_function)((uint8_t) ch); 117 else 115 else 118 116 (*putc_function)('?'); 117 119 118 return; 120 119 } 121 122 offs = 0; 120 121 size_t offs = 0; 122 char buf[STR_BOUNDS(1)]; 123 123 if (chr_encode(ch, buf, &offs, STR_BOUNDS(1)) == EOK) { 124 size_t i; 124 125 for (i = 0; i < offs; i++) 125 126 (*putc_function)(buf[i]); 126 } else {127 } else 127 128 (*putc_function)('?'); 128 } 129 130 } 131 132 void serial_goto(const unsigned int col, const unsigned int row) 129 } 130 131 void serial_goto(const sysarg_t col, const sysarg_t row) 133 132 { 134 133 if ((col > scr_width) || (row > scr_height)) … … 136 135 137 136 char control[MAX_CONTROL]; 138 snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1); 137 snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f", 138 row + 1, col + 1); 139 139 serial_puts(control); 140 } 141 142 /** ECMA-48 Set Graphics Rendition. */ 143 static void serial_sgr(const unsigned int mode) 144 { 145 char control[MAX_CONTROL]; 146 snprintf(control, MAX_CONTROL, "\033[%um", mode); 147 serial_puts(control); 148 } 149 150 static void serial_set_style(console_style_t style) 151 { 152 switch (style) { 153 case STYLE_EMPHASIS: 154 serial_sgr(SGR_RESET); 155 if (color) { 156 serial_sgr(SGR_FGCOLOR + CI_RED); 157 serial_sgr(SGR_BGCOLOR + CI_WHITE); 158 } 159 serial_sgr(SGR_BOLD); 160 break; 161 case STYLE_INVERTED: 162 serial_sgr(SGR_RESET); 163 if (color) { 164 serial_sgr(SGR_FGCOLOR + CI_WHITE); 165 serial_sgr(SGR_BGCOLOR + CI_BLACK); 166 } else 167 serial_sgr(SGR_REVERSE); 168 break; 169 case STYLE_SELECTED: 170 serial_sgr(SGR_RESET); 171 if (color) { 172 serial_sgr(SGR_FGCOLOR + CI_WHITE); 173 serial_sgr(SGR_BGCOLOR + CI_RED); 174 } else 175 serial_sgr(SGR_UNDERLINE); 176 break; 177 default: 178 serial_sgr(SGR_RESET); 179 if (color) { 180 serial_sgr(SGR_FGCOLOR + CI_BLACK); 181 serial_sgr(SGR_BGCOLOR + CI_WHITE); 182 } 183 } 184 } 185 186 static void serial_set_idx(uint8_t fgcolor, uint8_t bgcolor, 187 uint8_t flags) 188 { 189 serial_sgr(SGR_RESET); 190 if (color) { 191 serial_sgr(SGR_FGCOLOR + color_map[fgcolor & 7]); 192 serial_sgr(SGR_BGCOLOR + color_map[bgcolor & 7]); 193 if (flags & CATTR_BRIGHT) 194 serial_sgr(SGR_BOLD); 195 } else { 196 if (fgcolor >= bgcolor) 197 serial_sgr(SGR_REVERSE); 198 } 199 } 200 201 static void serial_set_rgb(uint32_t fgcolor, uint32_t bgcolor) 202 { 203 serial_sgr(SGR_RESET); 204 205 if (fgcolor >= bgcolor) 206 serial_sgr(SGR_REVERSE); 207 } 208 209 static void serial_set_attrs(attrs_t *a) 210 { 211 switch (a->t) { 212 case at_style: 213 serial_set_style(a->a.s.style); 214 break; 215 case at_rgb: 216 serial_set_rgb(a->a.r.fg_color, a->a.r.bg_color); 217 break; 218 case at_idx: 219 serial_set_idx(a->a.i.fg_color, a->a.i.bg_color, 220 a->a.i.flags); 221 break; 222 } 140 223 } 141 224 … … 148 231 serial_sgr(SGR_BGCOLOR + CI_WHITE); 149 232 } 150 233 151 234 serial_puts("\033[2J"); 152 } 153 154 void serial_scroll(int i) 235 236 serial_set_attrs(&cur_attr); 237 } 238 239 void serial_scroll(ssize_t i) 155 240 { 156 241 if (i > 0) { … … 165 250 } 166 251 167 /** ECMA-48 Set Graphics Rendition. */168 static void serial_sgr(const unsigned int mode)252 /** Set scrolling region. */ 253 void serial_set_scroll_region(sysarg_t last_row) 169 254 { 170 255 char control[MAX_CONTROL]; 171 snprintf(control, MAX_CONTROL, "\033[ %um", mode);256 snprintf(control, MAX_CONTROL, "\033[0;%" PRIun "r", last_row); 172 257 serial_puts(control); 173 258 } 174 259 175 /** Set scrolling region. */176 void serial_set_scroll_region(unsigned last_row)177 {178 char control[MAX_CONTROL];179 snprintf(control, MAX_CONTROL, "\033[0;%ur", last_row);180 serial_puts(control);181 }182 183 260 void serial_cursor_disable(void) 184 261 { … … 191 268 } 192 269 193 void serial_console_init(putc_function_t putc_fn, uint32_t w, uint32_t h)270 void serial_console_init(putc_function_t putc_fn, sysarg_t w, sysarg_t h) 194 271 { 195 272 scr_width = w; … … 198 275 } 199 276 200 static void serial_set_style(int style)201 {202 if (style == STYLE_EMPHASIS) {203 if (color) {204 serial_sgr(SGR_RESET);205 serial_sgr(SGR_FGCOLOR + CI_RED);206 serial_sgr(SGR_BGCOLOR + CI_WHITE);207 }208 serial_sgr(SGR_BOLD);209 } else {210 if (color) {211 serial_sgr(SGR_RESET);212 serial_sgr(SGR_FGCOLOR + CI_BLACK);213 serial_sgr(SGR_BGCOLOR + CI_WHITE);214 }215 serial_sgr(SGR_NORMAL_INT);216 }217 }218 219 static void serial_set_idx(unsigned fgcolor, unsigned bgcolor,220 unsigned flags)221 {222 if (color) {223 serial_sgr(SGR_RESET);224 serial_sgr(SGR_FGCOLOR + color_map[fgcolor]);225 serial_sgr(SGR_BGCOLOR + color_map[bgcolor]);226 } else {227 if (fgcolor < bgcolor)228 serial_sgr(SGR_RESET);229 else230 serial_sgr(SGR_REVERSE);231 }232 }233 234 static void serial_set_rgb(uint32_t fgcolor, uint32_t bgcolor)235 {236 if (fgcolor < bgcolor)237 serial_sgr(SGR_REVERSE_OFF);238 else239 serial_sgr(SGR_REVERSE);240 }241 242 static void serial_set_attrs(const attrs_t *a)243 {244 switch (a->t) {245 case at_style:246 serial_set_style(a->a.s.style);247 break;248 case at_rgb:249 serial_set_rgb(a->a.r.fg_color, a->a.r.bg_color);250 break;251 case at_idx:252 serial_set_idx(a->a.i.fg_color,253 a->a.i.bg_color, a->a.i.flags);254 break;255 default:256 break;257 }258 }259 260 277 /** Draw text data to viewport. 261 278 * 262 * @param vport Viewport id 263 * @param data Text data. 264 * @param x Leftmost column of the area. 265 * @param y Topmost row of the area. 266 * @param w Number of rows. 267 * @param h Number of columns. 268 */ 269 static void draw_text_data(keyfield_t *data, unsigned int x, 270 unsigned int y, unsigned int w, unsigned int h) 271 { 272 unsigned int i, j; 273 keyfield_t *field; 274 attrs_t *a0, *a1; 275 276 serial_goto(x, y); 277 a0 = &data[0].attrs; 279 * @param vport Viewport id 280 * @param data Text data. 281 * @param x0 Leftmost column of the area. 282 * @param y0 Topmost row of the area. 283 * @param width Number of rows. 284 * @param height Number of columns. 285 * 286 */ 287 static void draw_text_data(keyfield_t *data, sysarg_t x0, sysarg_t y0, 288 sysarg_t width, sysarg_t height) 289 { 290 attrs_t *a0 = &data[0].attrs; 278 291 serial_set_attrs(a0); 279 280 for (j = 0; j < h; j++) { 281 if (j > 0 && w != scr_width) 282 serial_goto(x, j); 283 284 for (i = 0; i < w; i++) { 285 field = &data[j * w + i]; 286 287 a1 = &field->attrs; 288 if (!attrs_same(*a0, *a1)) 289 serial_set_attrs(a1); 290 serial_putchar(field->character); 291 a0 = a1; 292 293 sysarg_t y; 294 for (y = 0; y < height; y++) { 295 serial_goto(x0, y0 + y); 296 297 sysarg_t x; 298 for (x = 0; x < width; x++) { 299 attrs_t *attr = &data[y * width + x].attrs; 300 301 if (!attrs_same(*a0, *attr)) { 302 serial_set_attrs(attr); 303 a0 = attr; 304 } 305 306 serial_putchar(data[y * width + x].character); 292 307 } 293 308 } 294 309 } 295 296 int lastcol = 0;297 int lastrow = 0;298 310 299 311 /** … … 302 314 void serial_client_connection(ipc_callid_t iid, ipc_call_t *icall) 303 315 { 304 int retval;305 ipc_callid_t callid;306 ipc_call_t call;307 316 keyfield_t *interbuf = NULL; 308 317 size_t intersize = 0; 309 310 wchar_t c;311 int col, row, w, h;312 int i;313 314 attrs_t cur_attr;315 318 316 319 if (client_connected) { 317 ipc_answer_0(iid, ELIMIT);320 async_answer_0(iid, ELIMIT); 318 321 return; 319 322 } 320 323 321 324 client_connected = 1; 322 ipc_answer_0(iid, EOK); 323 324 cur_attr.t = at_style; 325 cur_attr.a.s.style = STYLE_NORMAL; 325 async_answer_0(iid, EOK); 326 326 327 327 /* Clear the terminal, set scrolling region … … 332 332 333 333 while (true) { 334 callid = async_get_call(&call); 335 switch (IPC_GET_METHOD(call)) { 334 ipc_call_t call; 335 ipc_callid_t callid = async_get_call(&call); 336 337 wchar_t c; 338 sysarg_t col; 339 sysarg_t row; 340 sysarg_t w; 341 sysarg_t h; 342 ssize_t rows; 343 344 int retval; 345 346 switch (IPC_GET_IMETHOD(call)) { 336 347 case IPC_M_PHONE_HUNGUP: 337 348 client_connected = 0; 338 ipc_answer_0(callid, EOK); 349 async_answer_0(callid, EOK); 350 351 /* Exit thread */ 339 352 return; 340 353 case IPC_M_SHARE_OUT: … … 347 360 continue; 348 361 } 362 349 363 retval = EINVAL; 350 364 break; … … 354 368 w = IPC_GET_ARG3(call); 355 369 h = IPC_GET_ARG4(call); 370 356 371 if (!interbuf) { 357 372 retval = EINVAL; 358 373 break; 359 374 } 360 if (col + w > scr_width || row + h > scr_height) { 375 376 if ((col + w > scr_width) || (row + h > scr_height)) { 361 377 retval = EINVAL; 362 378 break; 363 379 } 380 364 381 draw_text_data(interbuf, col, row, w, h); 365 382 lastcol = col + w; … … 371 388 col = IPC_GET_ARG2(call); 372 389 row = IPC_GET_ARG3(call); 390 373 391 if ((lastcol != col) || (lastrow != row)) 374 392 serial_goto(col, row); 393 375 394 lastcol = col + 1; 376 395 lastrow = row; … … 387 406 break; 388 407 case FB_GET_CSIZE: 389 ipc_answer_2(callid, EOK, scr_width, scr_height);408 async_answer_2(callid, EOK, scr_width, scr_height); 390 409 continue; 391 410 case FB_GET_COLOR_CAP: 392 ipc_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :411 async_answer_1(callid, EOK, color ? FB_CCAP_INDEXED : 393 412 FB_CCAP_STYLE); 394 413 continue; … … 400 419 cur_attr.t = at_style; 401 420 cur_attr.a.s.style = IPC_GET_ARG1(call); 402 cur_attr.a.i.bg_color = IPC_GET_ARG2(call);403 421 serial_set_attrs(&cur_attr); 404 405 422 retval = 0; 406 423 break; … … 411 428 cur_attr.a.i.flags = IPC_GET_ARG3(call); 412 429 serial_set_attrs(&cur_attr); 413 414 430 retval = 0; 415 431 break; 416 432 case FB_SET_RGB_COLOR: 417 433 cur_attr.t = at_rgb; 418 cur_attr.a. i.fg_color = IPC_GET_ARG1(call);419 cur_attr.a. i.bg_color = IPC_GET_ARG2(call);434 cur_attr.a.r.fg_color = IPC_GET_ARG1(call); 435 cur_attr.a.r.bg_color = IPC_GET_ARG2(call); 420 436 serial_set_attrs(&cur_attr); 421 422 437 retval = 0; 423 438 break; 424 439 case FB_SCROLL: 425 i = IPC_GET_ARG1(call); 426 if ((i > scr_height) || (i < -scr_height)) { 427 retval = EINVAL; 428 break; 440 rows = IPC_GET_ARG1(call); 441 442 if (rows >= 0) { 443 if ((sysarg_t) rows > scr_height) { 444 retval = EINVAL; 445 break; 446 } 447 } else { 448 if ((sysarg_t) (-rows) > scr_height) { 449 retval = EINVAL; 450 break; 451 } 429 452 } 430 serial_scroll(i); 453 454 serial_scroll(rows); 431 455 serial_goto(lastcol, lastrow); 432 456 retval = 0; … … 448 472 case FB_SCREEN_RECLAIM: 449 473 serial_clrscr(); 450 serial_set_attrs(&cur_attr);451 474 retval = 0; 452 475 break; … … 454 477 retval = ENOENT; 455 478 } 456 ipc_answer_0(callid, retval);479 async_answer_0(callid, retval); 457 480 } 458 481 }
Note:
See TracChangeset
for help on using the changeset viewer.
