Changeset beb9336 in mainline for uspace/srv/hid/console/console.c
- Timestamp:
- 2012-08-24T14:07:52Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 041ab64
- Parents:
- bd29f9c9 (diff), db81577 (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 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/console/console.c
rbd29f9c9 rbeb9336 36 36 #include <stdio.h> 37 37 #include <adt/prodcons.h> 38 #include <i pc/input.h>38 #include <io/input.h> 39 39 #include <ipc/console.h> 40 40 #include <ipc/vfs.h> … … 43 43 #include <loc.h> 44 44 #include <event.h> 45 #include <io/kbd_event.h> 45 46 #include <io/keycode.h> 46 #include < screenbuffer.h>47 #include < fb.h>48 #include <i mgmap.h>47 #include <io/chargrid.h> 48 #include <io/console.h> 49 #include <io/output.h> 49 50 #include <align.h> 50 51 #include <malloc.h> 51 52 #include <as.h> 52 53 #include <fibril_synch.h> 53 #include "images.h"54 54 #include "console.h" 55 55 … … 57 57 #define NAMESPACE "term" 58 58 59 #define CONSOLE_TOP 66 60 #define CONSOLE_MARGIN 12 61 62 #define STATE_START 100 63 #define STATE_TOP 8 64 #define STATE_SPACE 4 65 #define STATE_WIDTH 48 66 #define STATE_HEIGHT 48 67 68 typedef enum { 69 CONS_DISCONNECTED = 0, 70 CONS_DISCONNECTED_SELECTED, 71 CONS_SELECTED, 72 CONS_IDLE, 73 CONS_DATA, 74 CONS_KERNEL, 75 CONS_LAST 76 } console_state_t; 77 78 #define UTF8_CHAR_BUFFER_SIZE (STR_BOUNDS(1) + 1) 59 #define UTF8_CHAR_BUFFER_SIZE (STR_BOUNDS(1) + 1) 79 60 80 61 typedef struct { 81 atomic_t refcnt; /**< Connection reference count */ 82 prodcons_t input_pc; /**< Incoming keyboard events */ 83 char char_remains[UTF8_CHAR_BUFFER_SIZE]; /**< Not yet sent bytes of last char event. */ 84 size_t char_remains_len; /**< Number of not yet sent bytes. */ 85 86 fibril_mutex_t mtx; /**< Lock protecting mutable fields */ 87 88 size_t index; /**< Console index */ 89 console_state_t state; /**< Console state */ 90 service_id_t dsid; /**< Service handle */ 91 92 vp_handle_t state_vp; /**< State icon viewport */ 93 sysarg_t cols; /**< Number of columns */ 94 sysarg_t rows; /**< Number of rows */ 95 console_caps_t ccaps; /**< Console capabilities */ 96 97 screenbuffer_t *frontbuf; /**< Front buffer */ 98 frontbuf_handle_t fbid; /**< Front buffer handle */ 62 atomic_t refcnt; /**< Connection reference count */ 63 prodcons_t input_pc; /**< Incoming keyboard events */ 64 65 /** 66 * Not yet sent bytes of last char event. 67 */ 68 char char_remains[UTF8_CHAR_BUFFER_SIZE]; 69 size_t char_remains_len; /**< Number of not yet sent bytes. */ 70 71 fibril_mutex_t mtx; /**< Lock protecting mutable fields */ 72 73 size_t index; /**< Console index */ 74 service_id_t dsid; /**< Service handle */ 75 76 sysarg_t cols; /**< Number of columns */ 77 sysarg_t rows; /**< Number of rows */ 78 console_caps_t ccaps; /**< Console capabilities */ 79 80 chargrid_t *frontbuf; /**< Front buffer */ 81 frontbuf_handle_t fbid; /**< Front buffer handle */ 99 82 } console_t; 100 83 101 typedef enum { 102 GRAPHICS_NONE = 0, 103 GRAPHICS_BASIC = 1, 104 GRAPHICS_FULL = 2 105 } graphics_state_t; 106 107 /** Current console state */ 108 static graphics_state_t graphics_state = GRAPHICS_NONE; 109 110 /** State icons */ 111 static imagemap_handle_t state_icons[CONS_LAST]; 112 113 /** Session to the input server */ 114 static async_sess_t *input_sess; 115 116 /** Session to the framebuffer server */ 117 static async_sess_t *fb_sess; 118 119 /** Framebuffer resolution */ 120 static sysarg_t xres; 121 static sysarg_t yres; 84 /** Input server proxy */ 85 static input_t *input; 86 87 /** Session to the output server */ 88 static async_sess_t *output_sess; 89 90 /** Output dimensions */ 91 static sysarg_t cols; 92 static sysarg_t rows; 122 93 123 94 /** Array of data for virtual consoles */ … … 131 102 static console_t *kernel_console = &consoles[KERNEL_CONSOLE]; 132 103 133 static imgmap_t *logo_img; 134 static imgmap_t *nameic_img; 135 136 static imgmap_t *anim_1_img; 137 static imgmap_t *anim_2_img; 138 static imgmap_t *anim_3_img; 139 static imgmap_t *anim_4_img; 140 141 static imagemap_handle_t anim_1; 142 static imagemap_handle_t anim_2; 143 static imagemap_handle_t anim_3; 144 static imagemap_handle_t anim_4; 145 146 static sequence_handle_t anim_seq; 147 148 static imgmap_t *cons_data_img; 149 static imgmap_t *cons_dis_img; 150 static imgmap_t *cons_dis_sel_img; 151 static imgmap_t *cons_idle_img; 152 static imgmap_t *cons_kernel_img; 153 static imgmap_t *cons_sel_img; 154 155 static vp_handle_t logo_vp; 156 static imagemap_handle_t logo_handle; 157 158 static vp_handle_t nameic_vp; 159 static imagemap_handle_t nameic_handle; 160 161 static vp_handle_t screen_vp; 162 static vp_handle_t console_vp; 163 164 struct { 165 sysarg_t x; 166 sysarg_t y; 167 168 sysarg_t btn_x; 169 sysarg_t btn_y; 170 171 bool pressed; 172 } mouse; 173 174 static void cons_redraw_state(console_t *cons) 175 { 176 if (graphics_state == GRAPHICS_FULL) { 177 fibril_mutex_lock(&cons->mtx); 178 179 fb_vp_imagemap_damage(fb_sess, cons->state_vp, 180 state_icons[cons->state], 0, 0, STATE_WIDTH, STATE_HEIGHT); 181 182 if ((cons->state != CONS_DISCONNECTED) && 183 (cons->state != CONS_KERNEL) && 184 (cons->state != CONS_DISCONNECTED_SELECTED)) { 185 char data[5]; 186 snprintf(data, 5, "%zu", cons->index + 1); 187 188 for (size_t i = 0; data[i] != 0; i++) 189 fb_vp_putchar(fb_sess, cons->state_vp, i + 2, 1, data[i]); 190 } 191 192 fibril_mutex_unlock(&cons->mtx); 193 } 194 } 195 196 static void cons_kernel_sequence_start(console_t *cons) 197 { 198 if (graphics_state == GRAPHICS_FULL) { 199 fibril_mutex_lock(&cons->mtx); 200 201 fb_vp_sequence_start(fb_sess, cons->state_vp, anim_seq); 202 fb_vp_imagemap_damage(fb_sess, cons->state_vp, 203 state_icons[cons->state], 0, 0, STATE_WIDTH, STATE_HEIGHT); 204 205 fibril_mutex_unlock(&cons->mtx); 206 } 207 } 208 209 static void cons_update_state(console_t *cons, console_state_t state) 210 { 211 bool update = false; 212 213 fibril_mutex_lock(&cons->mtx); 214 215 if (cons->state != state) { 216 cons->state = state; 217 update = true; 218 } 219 220 fibril_mutex_unlock(&cons->mtx); 221 222 if (update) 223 cons_redraw_state(cons); 224 } 225 226 static void cons_notify_data(console_t *cons) 104 static int input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t); 105 static int input_ev_move(input_t *, int, int); 106 static int input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned); 107 static int input_ev_button(input_t *, int, int); 108 109 static input_ev_ops_t input_ev_ops = { 110 .key = input_ev_key, 111 .move = input_ev_move, 112 .abs_move = input_ev_abs_move, 113 .button = input_ev_button 114 }; 115 116 static void cons_update(console_t *cons) 227 117 { 228 118 fibril_mutex_lock(&switch_mtx); 229 230 if (cons != active_console) 231 cons_update_state(cons, CONS_DATA); 232 119 fibril_mutex_lock(&cons->mtx); 120 121 if ((cons == active_console) && (active_console != kernel_console)) { 122 output_update(output_sess, cons->fbid); 123 output_cursor_update(output_sess, cons->fbid); 124 } 125 126 fibril_mutex_unlock(&cons->mtx); 233 127 fibril_mutex_unlock(&switch_mtx); 234 128 } 235 129 236 static void cons_ notify_connect(console_t *cons)130 static void cons_update_cursor(console_t *cons) 237 131 { 238 132 fibril_mutex_lock(&switch_mtx); 239 240 if (cons == active_console)241 cons_update_state(cons, CONS_SELECTED);242 else243 cons_update_state(cons, CONS_IDLE);244 133 fibril_mutex_lock(&cons->mtx); 134 135 if ((cons == active_console) && (active_console != kernel_console)) 136 output_cursor_update(output_sess, cons->fbid); 137 138 fibril_mutex_unlock(&cons->mtx); 245 139 fibril_mutex_unlock(&switch_mtx); 246 140 } 247 141 248 static void cons_notify_disconnect(console_t *cons) 142 static void cons_clear(console_t *cons) 143 { 144 fibril_mutex_lock(&cons->mtx); 145 chargrid_clear(cons->frontbuf); 146 fibril_mutex_unlock(&cons->mtx); 147 148 cons_update(cons); 149 } 150 151 static void cons_damage(console_t *cons) 249 152 { 250 153 fibril_mutex_lock(&switch_mtx); 251 252 if (cons == active_console)253 cons_update_state(cons, CONS_DISCONNECTED_SELECTED);254 else255 cons_update_state(cons, CONS_DISCONNECTED);256 257 fibril_mutex_unlock(&switch_mtx);258 }259 260 static void cons_update(console_t *cons)261 {262 fibril_mutex_lock(&switch_mtx);263 154 fibril_mutex_lock(&cons->mtx); 264 155 265 156 if ((cons == active_console) && (active_console != kernel_console)) { 266 fb_vp_update(fb_sess, console_vp, cons->fbid); 267 fb_vp_cursor_update(fb_sess, console_vp, cons->fbid); 268 } 269 270 fibril_mutex_unlock(&cons->mtx); 271 fibril_mutex_unlock(&switch_mtx); 272 } 273 274 static void cons_update_cursor(console_t *cons) 275 { 276 fibril_mutex_lock(&switch_mtx); 277 fibril_mutex_lock(&cons->mtx); 278 279 if ((cons == active_console) && (active_console != kernel_console)) 280 fb_vp_cursor_update(fb_sess, console_vp, cons->fbid); 281 282 fibril_mutex_unlock(&cons->mtx); 283 fibril_mutex_unlock(&switch_mtx); 284 } 285 286 static void cons_clear(console_t *cons) 287 { 288 fibril_mutex_lock(&cons->mtx); 289 screenbuffer_clear(cons->frontbuf); 290 fibril_mutex_unlock(&cons->mtx); 291 292 cons_update(cons); 293 } 294 295 static void cons_damage_all(console_t *cons) 296 { 297 fibril_mutex_lock(&switch_mtx); 298 fibril_mutex_lock(&cons->mtx); 299 300 if ((cons == active_console) && (active_console != kernel_console)) { 301 fb_vp_damage(fb_sess, console_vp, cons->fbid, 0, 0, cons->cols, 157 output_damage(output_sess, cons->fbid, 0, 0, cons->cols, 302 158 cons->rows); 303 fb_vp_cursor_update(fb_sess, console_vp, cons->fbid);159 output_cursor_update(output_sess, cons->fbid); 304 160 } 305 161 … … 318 174 319 175 if (cons == kernel_console) { 320 fb_yield(fb_sess);176 output_yield(output_sess); 321 177 if (!console_kcon()) { 322 fb_claim(fb_sess);178 output_claim(output_sess); 323 179 fibril_mutex_unlock(&switch_mtx); 324 180 return; … … 327 183 328 184 if (active_console == kernel_console) 329 fb_claim(fb_sess);185 output_claim(output_sess); 330 186 331 187 prev_console = active_console; 332 188 active_console = cons; 333 189 334 if (prev_console->state == CONS_DISCONNECTED_SELECTED)335 cons_update_state(prev_console, CONS_DISCONNECTED);336 else337 cons_update_state(prev_console, CONS_IDLE);338 339 if ((cons->state == CONS_DISCONNECTED) ||340 (cons->state == CONS_DISCONNECTED_SELECTED))341 cons_update_state(cons, CONS_DISCONNECTED_SELECTED);342 else343 cons_update_state(cons, CONS_SELECTED);344 345 190 fibril_mutex_unlock(&switch_mtx); 346 191 347 cons_damage _all(cons);192 cons_damage(cons); 348 193 } 349 194 … … 351 196 { 352 197 fibril_mutex_lock(&switch_mtx); 353 198 354 199 console_t *active_uspace = active_console; 355 if (active_uspace == kernel_console) {200 if (active_uspace == kernel_console) 356 201 active_uspace = prev_console; 357 }202 358 203 assert(active_uspace != kernel_console); 359 204 360 205 fibril_mutex_unlock(&switch_mtx); 361 206 362 207 return active_uspace; 363 208 } 364 209 365 static ssize_t limit(ssize_t val, ssize_t lo, ssize_t hi) 366 { 367 if (val > hi) 368 return hi; 369 370 if (val < lo) 371 return lo; 372 373 return val; 374 } 375 376 static void cons_mouse_move(sysarg_t dx, sysarg_t dy) 377 { 378 ssize_t sx = (ssize_t) dx; 379 ssize_t sy = (ssize_t) dy; 380 381 mouse.x = limit(mouse.x + sx, 0, xres); 382 mouse.y = limit(mouse.y + sy, 0, yres); 383 384 fb_pointer_update(fb_sess, mouse.x, mouse.y, true); 385 } 386 387 static console_t *cons_find_icon(sysarg_t x, sysarg_t y) 388 { 389 sysarg_t status_start = 390 STATE_START + (xres - 800) / 2 + CONSOLE_MARGIN; 391 392 if ((y < STATE_TOP) || (y >= STATE_TOP + STATE_HEIGHT)) 393 return NULL; 394 395 if (x < status_start) 396 return NULL; 397 398 if (x >= status_start + (STATE_WIDTH + STATE_SPACE) * CONSOLE_COUNT) 399 return NULL; 400 401 if (((x - status_start) % (STATE_WIDTH + STATE_SPACE)) >= STATE_WIDTH) 402 return NULL; 403 404 sysarg_t btn = (x - status_start) / (STATE_WIDTH + STATE_SPACE); 405 406 if (btn < CONSOLE_COUNT) 407 return consoles + btn; 408 409 return NULL; 410 } 411 412 /** Handle mouse click 413 * 414 * @param state Button state (true - pressed, false - depressed) 415 * 416 */ 417 static console_t *cons_mouse_button(bool state) 418 { 419 if (graphics_state != GRAPHICS_FULL) 420 return NULL; 421 422 if (state) { 423 console_t *cons = cons_find_icon(mouse.x, mouse.y); 424 if (cons != NULL) { 425 mouse.btn_x = mouse.x; 426 mouse.btn_y = mouse.y; 427 mouse.pressed = true; 428 } 429 430 return NULL; 431 } 432 433 if ((!state) && (!mouse.pressed)) 434 return NULL; 435 436 console_t *cons = cons_find_icon(mouse.x, mouse.y); 437 if (cons == cons_find_icon(mouse.btn_x, mouse.btn_y)) 438 return cons; 439 440 mouse.pressed = false; 441 return NULL; 442 } 443 444 static void input_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) 445 { 446 /* Ignore parameters, the connection is already opened */ 447 while (true) { 448 ipc_call_t call; 449 ipc_callid_t callid = async_get_call(&call); 450 451 if (!IPC_GET_IMETHOD(call)) { 452 /* TODO: Handle hangup */ 453 async_hangup(input_sess); 454 return; 455 } 456 457 kbd_event_type_t type; 458 keycode_t key; 459 keymod_t mods; 460 wchar_t c; 461 462 switch (IPC_GET_IMETHOD(call)) { 463 case INPUT_EVENT_KEY: 464 type = IPC_GET_ARG1(call); 465 key = IPC_GET_ARG2(call); 466 mods = IPC_GET_ARG3(call); 467 c = IPC_GET_ARG4(call); 468 469 if ((key >= KC_F1) && (key < KC_F1 + CONSOLE_COUNT) && 470 ((mods & KM_CTRL) == 0)) 471 cons_switch(&consoles[key - KC_F1]); 472 else { 473 /* Got key press/release event */ 474 kbd_event_t *event = 475 (kbd_event_t *) malloc(sizeof(kbd_event_t)); 476 if (event == NULL) { 477 async_answer_0(callid, ENOMEM); 478 break; 479 } 480 481 link_initialize(&event->link); 482 event->type = type; 483 event->key = key; 484 event->mods = mods; 485 event->c = c; 486 487 /* 488 * Kernel console does not read events 489 * from us, so we will redirect them 490 * to the (last) active userspace console 491 * if necessary. 492 */ 493 console_t *target_console = cons_get_active_uspace(); 494 495 prodcons_produce(&target_console->input_pc, 496 &event->link); 497 } 498 499 async_answer_0(callid, EOK); 500 break; 501 case INPUT_EVENT_MOVE: 502 cons_mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call)); 503 async_answer_0(callid, EOK); 504 break; 505 case INPUT_EVENT_BUTTON: 506 /* Got pointer button press/release event */ 507 if (IPC_GET_ARG1(call) == 1) { 508 console_t *cons = 509 cons_mouse_button((bool) IPC_GET_ARG2(call)); 510 if (cons != NULL) 511 cons_switch(cons); 512 } 513 async_answer_0(callid, EOK); 514 break; 515 default: 516 async_answer_0(callid, EINVAL); 517 } 518 } 210 static int input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key, 211 keymod_t mods, wchar_t c) 212 { 213 if ((key >= KC_F1) && (key < KC_F1 + CONSOLE_COUNT) && 214 ((mods & KM_CTRL) == 0)) { 215 cons_switch(&consoles[key - KC_F1]); 216 } else { 217 /* Got key press/release event */ 218 kbd_event_t *event = 219 (kbd_event_t *) malloc(sizeof(kbd_event_t)); 220 if (event == NULL) { 221 return ENOMEM; 222 } 223 224 link_initialize(&event->link); 225 event->type = type; 226 event->key = key; 227 event->mods = mods; 228 event->c = c; 229 230 /* 231 * Kernel console does not read events 232 * from us, so we will redirect them 233 * to the (last) active userspace console 234 * if necessary. 235 */ 236 console_t *target_console = cons_get_active_uspace(); 237 238 prodcons_produce(&target_console->input_pc, 239 &event->link); 240 } 241 242 return EOK; 243 } 244 245 static int input_ev_move(input_t *input, int dx, int dy) 246 { 247 return EOK; 248 } 249 250 static int input_ev_abs_move(input_t *input, unsigned x , unsigned y, 251 unsigned max_x, unsigned max_y) 252 { 253 return EOK; 254 } 255 256 static int input_ev_button(input_t *input, int bnum, int bpress) 257 { 258 return EOK; 519 259 } 520 260 … … 528 268 switch (ch) { 529 269 case '\n': 530 updated = screenbuffer_newline(cons->frontbuf);270 updated = chargrid_newline(cons->frontbuf); 531 271 break; 532 272 case '\r': 533 273 break; 534 274 case '\t': 535 updated = screenbuffer_tabstop(cons->frontbuf, 8);275 updated = chargrid_tabstop(cons->frontbuf, 8); 536 276 break; 537 277 case '\b': 538 updated = screenbuffer_backspace(cons->frontbuf);278 updated = chargrid_backspace(cons->frontbuf); 539 279 break; 540 280 default: 541 updated = screenbuffer_putchar(cons->frontbuf, ch, true);281 updated = chargrid_putchar(cons->frontbuf, ch, true); 542 282 } 543 283 … … 551 291 { 552 292 fibril_mutex_lock(&cons->mtx); 553 screenbuffer_set_cursor(cons->frontbuf, col, row);293 chargrid_set_cursor(cons->frontbuf, col, row); 554 294 fibril_mutex_unlock(&cons->mtx); 555 295 … … 560 300 { 561 301 fibril_mutex_lock(&cons->mtx); 562 screenbuffer_set_cursor_visibility(cons->frontbuf, visible);302 chargrid_set_cursor_visibility(cons->frontbuf, visible); 563 303 fibril_mutex_unlock(&cons->mtx); 564 304 … … 572 312 573 313 fibril_mutex_lock(&cons->mtx); 574 screenbuffer_get_cursor(cons->frontbuf, &col, &row);314 chargrid_get_cursor(cons->frontbuf, &col, &row); 575 315 fibril_mutex_unlock(&cons->mtx); 576 316 … … 595 335 async_answer_1(iid, EOK, size); 596 336 free(buf); 597 598 cons_notify_data(cons);599 337 } 600 338 … … 660 398 { 661 399 fibril_mutex_lock(&cons->mtx); 662 screenbuffer_set_style(cons->frontbuf, style);400 chargrid_set_style(cons->frontbuf, style); 663 401 fibril_mutex_unlock(&cons->mtx); 664 402 } … … 668 406 { 669 407 fibril_mutex_lock(&cons->mtx); 670 screenbuffer_set_color(cons->frontbuf, bgcolor, fgcolor, attr);408 chargrid_set_color(cons->frontbuf, bgcolor, fgcolor, attr); 671 409 fibril_mutex_unlock(&cons->mtx); 672 410 } … … 676 414 { 677 415 fibril_mutex_lock(&cons->mtx); 678 screenbuffer_set_rgb_color(cons->frontbuf, bgcolor, fgcolor);416 chargrid_set_rgb_color(cons->frontbuf, bgcolor, fgcolor); 679 417 fibril_mutex_unlock(&cons->mtx); 680 418 } … … 708 446 } 709 447 710 if (atomic_postinc(&cons->refcnt) == 0) {448 if (atomic_postinc(&cons->refcnt) == 0) 711 449 cons_set_cursor_visibility(cons, true); 712 cons_notify_connect(cons);713 }714 450 715 451 /* Accept the connection */ … … 720 456 ipc_callid_t callid = async_get_call(&call); 721 457 722 if (!IPC_GET_IMETHOD(call)) { 723 if (atomic_postdec(&cons->refcnt) == 1) 724 cons_notify_disconnect(cons); 725 458 if (!IPC_GET_IMETHOD(call)) 726 459 return; 727 }728 460 729 461 switch (IPC_GET_IMETHOD(call)) { … … 781 513 } 782 514 783 static async_sess_t *input_connect(const char *svc)515 static int input_connect(const char *svc) 784 516 { 785 517 async_sess_t *sess; … … 787 519 788 520 int rc = loc_service_get_id(svc, &dsid, 0); 789 if (rc == EOK) { 790 sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0); 791 if (sess == NULL) { 792 printf("%s: Unable to connect to input service %s\n", NAME, 793 svc); 794 return NULL; 795 } 796 } else 797 return NULL; 798 799 async_exch_t *exch = async_exchange_begin(sess); 800 rc = async_connect_to_me(exch, 0, 0, 0, input_events, NULL); 801 async_exchange_end(exch); 802 521 if (rc != EOK) { 522 printf("%s: Input service %s not found\n", NAME, svc); 523 return rc; 524 } 525 526 sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0); 527 if (sess == NULL) { 528 printf("%s: Unable to connect to input service %s\n", NAME, 529 svc); 530 return EIO; 531 } 532 533 rc = input_open(sess, &input_ev_ops, NULL, &input); 803 534 if (rc != EOK) { 804 535 async_hangup(sess); 805 printf("%s: Unable to c reate callback connection toservice %s (%s)\n",536 printf("%s: Unable to communicate with service %s (%s)\n", 806 537 NAME, svc, str_error(rc)); 807 return NULL;808 } 809 810 return sess;538 return rc; 539 } 540 541 return EOK; 811 542 } 812 543 … … 816 547 } 817 548 818 static async_sess_t * fb_connect(const char *svc)549 static async_sess_t *output_connect(const char *svc) 819 550 { 820 551 async_sess_t *sess; … … 825 556 sess = loc_service_connect(EXCHANGE_SERIALIZE, dsid, 0); 826 557 if (sess == NULL) { 827 printf("%s: Unable to connect to framebufferservice %s\n",558 printf("%s: Unable to connect to output service %s\n", 828 559 NAME, svc); 829 560 return NULL; … … 835 566 } 836 567 837 static bool console_srv_init(char *input_svc, char *fb_svc) 838 { 839 /* Avoid double initialization */ 840 if (graphics_state != GRAPHICS_NONE) 568 static bool console_srv_init(char *input_svc, char *output_svc) 569 { 570 int rc; 571 572 /* Connect to input service */ 573 rc = input_connect(input_svc); 574 if (rc != EOK) 841 575 return false; 842 576 843 /* Connect to input service */ 844 input_sess = input_connect(input_svc); 845 if (input_sess == NULL) 846 return false; 847 848 /* Connect to framebuffer service */ 849 fb_sess = fb_connect(fb_svc); 850 if (fb_sess == NULL) 577 /* Connect to output service */ 578 output_sess = output_connect(output_svc); 579 if (output_sess == NULL) 851 580 return false; 852 581 853 582 /* Register server */ 854 583 async_set_client_connection(client_connection); 855 intrc = loc_server_register(NAME);584 rc = loc_server_register(NAME); 856 585 if (rc != EOK) { 857 586 printf("%s: Unable to register server (%s)\n", NAME, … … 860 589 } 861 590 862 fb_get_resolution(fb_sess, &xres, &yres); 863 864 /* Initialize the screen */ 865 screen_vp = fb_vp_create(fb_sess, 0, 0, xres, yres); 866 867 if ((xres >= 800) && (yres >= 600)) { 868 logo_vp = fb_vp_create(fb_sess, xres - 66, 2, 64, 60); 869 logo_img = imgmap_decode_tga((void *) helenos_tga, 870 helenos_tga_size, IMGMAP_FLAG_SHARED); 871 logo_handle = fb_imagemap_create(fb_sess, logo_img); 872 873 nameic_vp = fb_vp_create(fb_sess, 5, 17, 100, 26); 874 nameic_img = imgmap_decode_tga((void *) nameic_tga, 875 nameic_tga_size, IMGMAP_FLAG_SHARED); 876 nameic_handle = fb_imagemap_create(fb_sess, nameic_img); 877 878 cons_data_img = imgmap_decode_tga((void *) cons_data_tga, 879 cons_data_tga_size, IMGMAP_FLAG_SHARED); 880 cons_dis_img = imgmap_decode_tga((void *) cons_dis_tga, 881 cons_dis_tga_size, IMGMAP_FLAG_SHARED); 882 cons_dis_sel_img = imgmap_decode_tga((void *) cons_dis_sel_tga, 883 cons_dis_sel_tga_size, IMGMAP_FLAG_SHARED); 884 cons_idle_img = imgmap_decode_tga((void *) cons_idle_tga, 885 cons_idle_tga_size, IMGMAP_FLAG_SHARED); 886 cons_kernel_img = imgmap_decode_tga((void *) cons_kernel_tga, 887 cons_kernel_tga_size, IMGMAP_FLAG_SHARED); 888 cons_sel_img = imgmap_decode_tga((void *) cons_sel_tga, 889 cons_sel_tga_size, IMGMAP_FLAG_SHARED); 890 891 state_icons[CONS_DISCONNECTED] = 892 fb_imagemap_create(fb_sess, cons_dis_img); 893 state_icons[CONS_DISCONNECTED_SELECTED] = 894 fb_imagemap_create(fb_sess, cons_dis_sel_img); 895 state_icons[CONS_SELECTED] = 896 fb_imagemap_create(fb_sess, cons_sel_img); 897 state_icons[CONS_IDLE] = 898 fb_imagemap_create(fb_sess, cons_idle_img); 899 state_icons[CONS_DATA] = 900 fb_imagemap_create(fb_sess, cons_data_img); 901 state_icons[CONS_KERNEL] = 902 fb_imagemap_create(fb_sess, cons_kernel_img); 903 904 anim_1_img = imgmap_decode_tga((void *) anim_1_tga, 905 anim_1_tga_size, IMGMAP_FLAG_SHARED); 906 anim_2_img = imgmap_decode_tga((void *) anim_2_tga, 907 anim_2_tga_size, IMGMAP_FLAG_SHARED); 908 anim_3_img = imgmap_decode_tga((void *) anim_3_tga, 909 anim_3_tga_size, IMGMAP_FLAG_SHARED); 910 anim_4_img = imgmap_decode_tga((void *) anim_4_tga, 911 anim_4_tga_size, IMGMAP_FLAG_SHARED); 912 913 anim_1 = fb_imagemap_create(fb_sess, anim_1_img); 914 anim_2 = fb_imagemap_create(fb_sess, anim_2_img); 915 anim_3 = fb_imagemap_create(fb_sess, anim_3_img); 916 anim_4 = fb_imagemap_create(fb_sess, anim_4_img); 917 918 anim_seq = fb_sequence_create(fb_sess); 919 fb_sequence_add_imagemap(fb_sess, anim_seq, anim_1); 920 fb_sequence_add_imagemap(fb_sess, anim_seq, anim_2); 921 fb_sequence_add_imagemap(fb_sess, anim_seq, anim_3); 922 fb_sequence_add_imagemap(fb_sess, anim_seq, anim_4); 923 924 console_vp = fb_vp_create(fb_sess, CONSOLE_MARGIN, CONSOLE_TOP, 925 xres - 2 * CONSOLE_MARGIN, yres - (CONSOLE_TOP + CONSOLE_MARGIN)); 926 927 fb_vp_clear(fb_sess, screen_vp); 928 fb_vp_imagemap_damage(fb_sess, logo_vp, logo_handle, 929 0, 0, 64, 60); 930 fb_vp_imagemap_damage(fb_sess, nameic_vp, nameic_handle, 931 0, 0, 100, 26); 932 933 graphics_state = GRAPHICS_FULL; 934 } else { 935 console_vp = screen_vp; 936 graphics_state = GRAPHICS_BASIC; 937 } 938 939 fb_vp_set_style(fb_sess, console_vp, STYLE_NORMAL); 940 fb_vp_clear(fb_sess, console_vp); 941 942 sysarg_t cols; 943 sysarg_t rows; 944 fb_vp_get_dimensions(fb_sess, console_vp, &cols, &rows); 591 output_get_dimensions(output_sess, &cols, &rows); 592 output_set_style(output_sess, STYLE_NORMAL); 945 593 946 594 console_caps_t ccaps; 947 fb_vp_get_caps(fb_sess, console_vp, &ccaps); 948 949 mouse.x = xres / 2; 950 mouse.y = yres / 2; 951 mouse.pressed = false; 595 output_get_caps(output_sess, &ccaps); 952 596 953 597 /* Inititalize consoles */ … … 959 603 consoles[i].char_remains_len = 0; 960 604 961 if (graphics_state == GRAPHICS_FULL) { 962 /* Create state buttons */ 963 consoles[i].state_vp = 964 fb_vp_create(fb_sess, STATE_START + (xres - 800) / 2 + 965 CONSOLE_MARGIN + i * (STATE_WIDTH + STATE_SPACE), 966 STATE_TOP, STATE_WIDTH, STATE_HEIGHT); 967 } 968 969 if (i == KERNEL_CONSOLE) { 970 consoles[i].state = CONS_KERNEL; 971 cons_redraw_state(&consoles[i]); 972 cons_kernel_sequence_start(&consoles[i]); 605 if (i == KERNEL_CONSOLE) 973 606 continue; 974 }975 976 if (i == 0)977 consoles[i].state = CONS_DISCONNECTED_SELECTED;978 else979 consoles[i].state = CONS_DISCONNECTED;980 607 981 608 consoles[i].cols = cols; … … 983 610 consoles[i].ccaps = ccaps; 984 611 consoles[i].frontbuf = 985 screenbuffer_create(cols, rows, SCREENBUFFER_FLAG_SHARED);612 chargrid_create(cols, rows, CHARGRID_FLAG_SHARED); 986 613 987 614 if (consoles[i].frontbuf == NULL) { … … 990 617 } 991 618 992 consoles[i].fbid = fb_frontbuf_create(fb_sess, consoles[i].frontbuf); 619 consoles[i].fbid = output_frontbuf_create(output_sess, 620 consoles[i].frontbuf); 993 621 if (consoles[i].fbid == 0) { 994 622 printf("%s: Unable to create frontbuffer %zu\n", NAME, i); … … 996 624 } 997 625 998 cons_redraw_state(&consoles[i]);999 1000 626 char vc[LOC_NAME_MAXLEN + 1]; 1001 627 snprintf(vc, LOC_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i); … … 1006 632 } 1007 633 } 634 635 cons_damage(active_console); 1008 636 1009 637 /* Receive kernel notifications */ … … 1017 645 } 1018 646 1019 static void usage( void)1020 { 1021 printf("Usage: console <input_dev> <framebuffer_dev>\n");647 static void usage(char *name) 648 { 649 printf("Usage: %s <input_dev> <output_dev>\n", name); 1022 650 } 1023 651 … … 1025 653 { 1026 654 if (argc < 3) { 1027 usage( );655 usage(argv[0]); 1028 656 return -1; 1029 657 } … … 1038 666 async_manager(); 1039 667 668 /* Never reached */ 1040 669 return 0; 1041 670 }
Note:
See TracChangeset
for help on using the changeset viewer.