Index: uspace/console/console.c =================================================================== --- uspace/console/console.c (revision 2def78824559e9a326693314a605af8e1e7e690a) +++ uspace/console/console.c (revision f19d77a17efac5a8719586ead1f7f39ca6cc3b1d) @@ -71,15 +71,24 @@ typedef struct { keybuffer_t keybuffer; /**< Buffer for incoming keys. */ - FIFO_CREATE_STATIC(keyrequests, ipc_callid_t , MAX_KEYREQUESTS_BUFFERED); /**< Buffer for unsatisfied request for keys. */ + /** Buffer for unsatisfied request for keys. */ + FIFO_CREATE_STATIC(keyrequests, ipc_callid_t, + MAX_KEYREQUESTS_BUFFERED); int keyrequest_counter; /**< Number of requests in buffer. */ int client_phone; /**< Phone to connected client. */ - int used; /**< 1 if this virtual console is connected to some client.*/ - screenbuffer_t screenbuffer; /**< Screenbuffer for saving screen contents and related settings. */ + int used; /**< 1 if this virtual console is + * connected to some client.*/ + screenbuffer_t screenbuffer; /**< Screenbuffer for saving screen + * contents and related settings. */ } connection_t; -static connection_t connections[CONSOLE_COUNT]; /**< Array of data for virtual consoles */ -static keyfield_t *interbuffer = NULL; /**< Pointer to memory shared with framebufer used for faster virt. console switching */ - -static int kernel_pixmap = -1; /**< Number of fb pixmap, where kernel console is stored */ +static connection_t connections[CONSOLE_COUNT]; /**< Array of data for virtual + * consoles */ +static keyfield_t *interbuffer = NULL; /**< Pointer to memory shared + * with framebufer used for + * faster virtual console + *switching */ + +static int kernel_pixmap = -1; /**< Number of fb pixmap, where kernel + * console is stored */ @@ -116,5 +125,6 @@ static void set_style(style_t *style) { - async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color, style->bg_color); + async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color, + style->bg_color); } @@ -138,32 +148,28 @@ switch (key) { - case '\n': - scr->position_y += 1; - scr->position_x = 0; - break; - case '\r': - break; - case '\t': - scr->position_x += 8; - scr->position_x -= scr->position_x % 8; - break; - case '\b': - if (scr->position_x == 0) - break; - - scr->position_x--; - - if (console == active_console) - prtchr(' ', scr->position_y, scr->position_x); - - screenbuffer_putchar(scr, ' '); - - break; - default: - if (console == active_console) - prtchr(key, scr->position_y, scr->position_x); - - screenbuffer_putchar(scr, key); - scr->position_x++; + case '\n': + scr->position_y += 1; + scr->position_x = 0; + break; + case '\r': + break; + case '\t': + scr->position_x += 8; + scr->position_x -= scr->position_x % 8; + break; + case '\b': + if (scr->position_x == 0) + break; + scr->position_x--; + if (console == active_console) + prtchr(' ', scr->position_y, scr->position_x); + screenbuffer_putchar(scr, ' '); + break; + default: + if (console == active_console) + prtchr(key, scr->position_y, scr->position_x); + + screenbuffer_putchar(scr, key); + scr->position_x++; } @@ -258,7 +264,10 @@ for (i = 0; i < conn->screenbuffer.size_x; i++) for (j = 0; j < conn->screenbuffer.size_y; j++) - interbuffer[i + j*conn->screenbuffer.size_x] = *get_field_at(&(conn->screenbuffer),i, j); + interbuffer[i + j * conn->screenbuffer.size_x] + = *get_field_at(&(conn->screenbuffer), + i, j); /* This call can preempt, but we are already at the end */ - rc = async_req_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL); + rc = async_req_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, + NULL); }; @@ -270,9 +279,12 @@ for (j = 0; j < conn->screenbuffer.size_y; j++) for (i = 0; i < conn->screenbuffer.size_x; i++) { - field = get_field_at(&(conn->screenbuffer),i, j); + field = get_field_at(&(conn->screenbuffer), i, + j); if (!style_same(*style, field->style)) set_style(&field->style); style = &field->style; - if ((field->character == ' ') && (style_same(field->style, conn->screenbuffer.style))) + if ((field->character == ' ') && + (style_same(field->style, + conn->screenbuffer.style))) continue; @@ -281,5 +293,6 @@ } - curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x); + curs_goto(conn->screenbuffer.position_y, + conn->screenbuffer.position_x); curs_visibility(conn->screenbuffer.is_cursor_visible); @@ -311,5 +324,6 @@ break; case KBD_MS_MOVE: - gcons_mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call)); + gcons_mouse_move(IPC_GET_ARG1(call), + IPC_GET_ARG2(call)); retval = 0; break; @@ -322,5 +336,8 @@ conn = &connections[active_console]; -// if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) { +/* + * if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + + * CONSOLE_COUNT)) { + */ if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) { if (c == 0x112) @@ -334,5 +351,6 @@ if (conn->keyrequest_counter > 0) { conn->keyrequest_counter--; - ipc_answer_fast(fifo_pop(conn->keyrequests), 0, c, 0); + ipc_answer_fast(fifo_pop(conn->keyrequests), 0, + c, 0); break; } @@ -386,5 +404,6 @@ while (conn->keyrequest_counter > 0) { conn->keyrequest_counter--; - ipc_answer_fast(fifo_pop(conn->keyrequests), ENOENT, 0, 0); + ipc_answer_fast(fifo_pop(conn->keyrequests), + ENOENT, 0, 0); break; } @@ -405,11 +424,10 @@ break; case CONSOLE_GOTO: - - screenbuffer_goto(&conn->screenbuffer, IPC_GET_ARG2(call), IPC_GET_ARG1(call)); + screenbuffer_goto(&conn->screenbuffer, + IPC_GET_ARG2(call), IPC_GET_ARG1(call)); if (consnum == active_console) - curs_goto(IPC_GET_ARG1(call),IPC_GET_ARG2(call)); - - break; - + curs_goto(IPC_GET_ARG1(call), + IPC_GET_ARG2(call)); + break; case CONSOLE_GETSIZE: arg1 = fb_info.rows; @@ -418,8 +436,8 @@ case CONSOLE_FLUSH: if (consnum == active_console) - async_req_2(fb_info.phone, FB_FLUSH, 0, 0, NULL, NULL); + async_req_2(fb_info.phone, FB_FLUSH, 0, 0, + NULL, NULL); break; case CONSOLE_SET_STYLE: - arg1 = IPC_GET_ARG1(call); arg2 = IPC_GET_ARG2(call); @@ -427,5 +445,4 @@ if (consnum == active_console) set_style_col(arg1, arg2); - break; case CONSOLE_CURSOR_VISIBILITY: @@ -438,15 +455,18 @@ if (keybuffer_empty(&conn->keybuffer)) { /* buffer is empty -> store request */ - if (conn->keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) { + if (conn->keyrequest_counter < + MAX_KEYREQUESTS_BUFFERED) { fifo_push(conn->keyrequests, callid); conn->keyrequest_counter++; } else { - /* no key available and too many requests => fail */ + /* + * No key available and too many + * requests => fail. + */ ipc_answer_fast(callid, ELIMIT, 0, 0); } continue; - }; - keybuffer_pop(&conn->keybuffer, (int *)&arg1); - + } + keybuffer_pop(&conn->keybuffer, (int *) &arg1); break; } @@ -465,16 +485,19 @@ /* Connect to keyboard driver */ - while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) { + while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) + < 0) { usleep(10000); - }; - - if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) { + } + + if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) + { return -1; - }; + } async_new_connection(phonehash, 0, NULL, keyboard_events); /* Connect to framebuffer driver */ - while ((fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) { + while ((fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) + < 0) { usleep(10000); } @@ -490,5 +513,6 @@ async_msg_2(fb_info.phone, FB_VIEWPORT_DB, (sysarg_t)-1, 1); - async_req_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); + async_req_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), + &(fb_info.cols)); set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND); clrscr(); @@ -499,9 +523,11 @@ keybuffer_init(&(connections[i].keybuffer)); - connections[i].keyrequests.head = connections[i].keyrequests.tail = 0; + connections[i].keyrequests.head = + connections[i].keyrequests.tail = 0; connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED; connections[i].keyrequest_counter = 0; - if (screenbuffer_init(&(connections[i].screenbuffer), fb_info.cols, fb_info.rows ) == NULL) { + if (screenbuffer_init(&(connections[i].screenbuffer), + fb_info.cols, fb_info.rows) == NULL) { /*FIXME: handle error */ return -1; @@ -510,7 +536,11 @@ connections[KERNEL_CONSOLE].used = 1; - if ((interbuffer = mmap(NULL, sizeof(keyfield_t) * fb_info.cols * fb_info.rows , PROTO_READ|PROTO_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, 0 ,0 )) != NULL) { - if (async_req_3(fb_info.phone, IPC_M_AS_AREA_SEND, (ipcarg_t)interbuffer, 0, AS_AREA_READ, NULL, NULL, NULL) != 0) { - munmap(interbuffer, sizeof(keyfield_t) * fb_info.cols * fb_info.rows); + if ((interbuffer = mmap(NULL, sizeof(keyfield_t) * fb_info.cols * + fb_info.rows, PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | + MAP_PRIVATE, 0, 0)) != NULL) { + if (async_req_3(fb_info.phone, IPC_M_AS_AREA_SEND, (ipcarg_t) + interbuffer, 0, AS_AREA_READ, NULL, NULL, NULL) != 0) { + munmap(interbuffer, sizeof(keyfield_t) * fb_info.cols + * fb_info.rows); interbuffer = NULL; } @@ -523,5 +553,5 @@ if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) { return -1; - }; + } async_manager(); Index: uspace/console/gcons.c =================================================================== --- uspace/console/gcons.c (revision 2def78824559e9a326693314a605af8e1e7e690a) +++ uspace/console/gcons.c (revision f19d77a17efac5a8719586ead1f7f39ca6cc3b1d) @@ -75,5 +75,5 @@ /** List of pixmaps identifying these icons */ -static int ic_pixmaps[CONS_LAST] = {-1,-1,-1,-1,-1,-1}; +static int ic_pixmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1}; static int animation = -1; @@ -120,10 +120,12 @@ vp_switch(cstatus_vp[consnum]); if (ic_pixmaps[state] != -1) - async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum], ic_pixmaps[state]); - - if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state != CONS_DISCONNECTED_SEL) { - snprintf(data, 5, "%d", consnum+1); - for (i=0;data[i];i++) - tran_putch(data[i], 1, 2+i); + async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum], + ic_pixmaps[state]); + + if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state != + CONS_DISCONNECTED_SEL) { + snprintf(data, 5, "%d", consnum + 1); + for (i=0; data[i]; i++) + tran_putch(data[i], 1, 2 + i); } } @@ -138,5 +140,5 @@ if (active_console == KERNEL_CONSOLE) { - for (i=0; i < CONSOLE_COUNT; i++) + for (i = 0; i < CONSOLE_COUNT; i++) redraw_state(i); if (animation != -1) @@ -167,5 +169,6 @@ return; - if (consnum == active_console || console_state[consnum] == CONS_HAS_DATA) + if (consnum == active_console || console_state[consnum] == + CONS_HAS_DATA) return; @@ -258,7 +261,7 @@ static int gcons_find_conbut(int x, int y) { - int status_start = STATUS_START + (xres-800) / 2;; - - if (y < STATUS_TOP || y >= STATUS_TOP+STATUS_HEIGHT) + int status_start = STATUS_START + (xres - 800) / 2;; + + if (y < STATUS_TOP || y >= STATUS_TOP + STATUS_HEIGHT) return -1; @@ -266,10 +269,10 @@ return -1; - if (x >= status_start + (STATUS_WIDTH+STATUS_SPACE)*CONSOLE_COUNT) + if (x >= status_start + (STATUS_WIDTH + STATUS_SPACE) * CONSOLE_COUNT) return -1; if (((x - status_start) % (STATUS_WIDTH+STATUS_SPACE)) < STATUS_SPACE) return -1; - return (x-status_start) / (STATUS_WIDTH+STATUS_SPACE); + return (x - status_start) / (STATUS_WIDTH+STATUS_SPACE); } @@ -315,5 +318,6 @@ /* Create area */ - shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); + shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | + MAP_ANONYMOUS, 0, 0); if (shm == MAP_FAILED) return; @@ -321,8 +325,10 @@ memcpy(shm, logo, size); /* Send area */ - rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL); + rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm, 0, NULL, + NULL); if (rc) goto exit; - rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL); + rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0, + PROTO_READ, NULL, NULL, NULL); if (rc) goto drop; @@ -352,8 +358,10 @@ set_style(MAIN_COLOR, MAIN_COLOR); clear(); - draw_pixmap(_binary_helenos_ppm_start, (size_t)&_binary_helenos_ppm_size, xres-66, 2); - draw_pixmap(_binary_nameic_ppm_start, (size_t)&_binary_nameic_ppm_size, 5, 17); - - for (i=0;i < CONSOLE_COUNT; i++) + draw_pixmap(_binary_helenos_ppm_start, (size_t) + &_binary_helenos_ppm_size, xres - 66, 2); + draw_pixmap(_binary_nameic_ppm_start, (size_t) + &_binary_nameic_ppm_size, 5, 17); + + for (i=0;i < CONSOLE_COUNT; i++) redraw_state(i); vp_switch(console_vp); @@ -373,5 +381,6 @@ /* Create area */ - shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); + shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | + MAP_ANONYMOUS, 0, 0); if (shm == MAP_FAILED) return -1; @@ -379,8 +388,10 @@ memcpy(shm, data, size); /* Send area */ - rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL); + rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm, 0, NULL, + NULL); if (rc) goto exit; - rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL); + rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0, + PROTO_READ, NULL, NULL, NULL); if (rc) goto drop; @@ -409,4 +420,5 @@ extern char _binary_anim_4_ppm_start[0]; extern int _binary_anim_4_ppm_size; + static void make_anim(void) { @@ -414,18 +426,23 @@ int pm; - an = async_req(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE], NULL); + an = async_req(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE], + NULL); if (an < 0) return; - pm = make_pixmap(_binary_anim_1_ppm_start, (int)&_binary_anim_1_ppm_size); + pm = make_pixmap(_binary_anim_1_ppm_start, (int) + &_binary_anim_1_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - pm = make_pixmap(_binary_anim_2_ppm_start, (int)&_binary_anim_2_ppm_size); + pm = make_pixmap(_binary_anim_2_ppm_start, (int) + &_binary_anim_2_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - pm = make_pixmap(_binary_anim_3_ppm_start, (int)&_binary_anim_3_ppm_size); + pm = make_pixmap(_binary_anim_3_ppm_start, (int) + &_binary_anim_3_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - pm = make_pixmap(_binary_anim_4_ppm_start, (int)&_binary_anim_4_ppm_size); + pm = make_pixmap(_binary_anim_4_ppm_start, (int) + &_binary_anim_4_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); @@ -443,4 +460,5 @@ extern char _binary_cons_kernel_ppm_start[0]; extern int _binary_cons_kernel_ppm_size; + /** Initialize nice graphical console environment */ void gcons_init(int phone) @@ -461,15 +479,16 @@ /* create console viewport */ /* Align width & height to character size */ - console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, - ALIGN_DOWN(xres-2*CONSOLE_MARGIN, 8), - ALIGN_DOWN(yres-(CONSOLE_TOP+CONSOLE_MARGIN),16)); + console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, ALIGN_DOWN(xres - + 2 * CONSOLE_MARGIN, 8), ALIGN_DOWN(yres - (CONSOLE_TOP + + CONSOLE_MARGIN), 16)); if (console_vp < 0) return; /* Create status buttons */ - status_start += (xres-800) / 2; - for (i=0; i < CONSOLE_COUNT; i++) { - cstatus_vp[i] = vp_create(status_start+CONSOLE_MARGIN+i*(STATUS_WIDTH+STATUS_SPACE), - STATUS_TOP, STATUS_WIDTH, STATUS_HEIGHT); + status_start += (xres - 800) / 2; + for (i = 0; i < CONSOLE_COUNT; i++) { + cstatus_vp[i] = vp_create(status_start + CONSOLE_MARGIN + i * + (STATUS_WIDTH + STATUS_SPACE), STATUS_TOP, + STATUS_WIDTH, STATUS_HEIGHT); if (cstatus_vp[i] < 0) return; @@ -479,14 +498,17 @@ /* Initialize icons */ - ic_pixmaps[CONS_SELECTED] = make_pixmap(_binary_cons_selected_ppm_start, - (int)&_binary_cons_selected_ppm_size); - ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start, - (int)&_binary_cons_idle_ppm_size); - ic_pixmaps[CONS_HAS_DATA] = make_pixmap(_binary_cons_has_data_ppm_start, - (int)&_binary_cons_has_data_ppm_size); - ic_pixmaps[CONS_DISCONNECTED] = make_pixmap(_binary_cons_idle_ppm_start, - (int)&_binary_cons_idle_ppm_size); + ic_pixmaps[CONS_SELECTED] = + make_pixmap(_binary_cons_selected_ppm_start, (int) + &_binary_cons_selected_ppm_size); + ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start, (int) + &_binary_cons_idle_ppm_size); + ic_pixmaps[CONS_HAS_DATA] = + make_pixmap(_binary_cons_has_data_ppm_start, (int) + &_binary_cons_has_data_ppm_size); + ic_pixmaps[CONS_DISCONNECTED] = + make_pixmap(_binary_cons_idle_ppm_start, (int) + &_binary_cons_idle_ppm_size); ic_pixmaps[CONS_KERNEL] = make_pixmap(_binary_cons_kernel_ppm_start, - (int)&_binary_cons_kernel_ppm_size); + (int) &_binary_cons_kernel_ppm_size); ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];