| 81,7 → 81,7 |
|---|
| |
| static void vp_switch(int vp) |
| { |
| async_msg_1(fbphone,FB_VIEWPORT_SWITCH, vp); |
| async_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp); |
| } |
| |
| /** Create view port */ |
| 105,7 → 105,7 |
|---|
| /** Transparent putchar */ |
| static void tran_putch(char c, int row, int col) |
| { |
| async_msg_3(fbphone, FB_TRANS_PUTCHAR, c, row, col); |
| async_msg_3(fbphone, FB_PUTCHAR, c, row, col); |
| } |
| |
| /** Redraw the button showing state of a given console */ |
| 189,10 → 189,10 |
|---|
| console_state[consnum] = CONS_DISCONNECTED_SEL; |
| else |
| console_state[consnum] = CONS_DISCONNECTED; |
| |
| |
| if (active_console == KERNEL_CONSOLE) |
| return; |
| |
| |
| redraw_state(consnum); |
| vp_switch(console_vp); |
| } |
| 217,16 → 217,10 |
|---|
| /** Change to kernel console */ |
| void gcons_in_kernel(void) |
| { |
| if (console_state[active_console] == CONS_DISCONNECTED_SEL) |
| console_state[active_console] = CONS_DISCONNECTED; |
| else |
| console_state[active_console] = CONS_IDLE; |
| redraw_state(active_console); |
| |
| if (animation != -1) |
| async_msg_1(fbphone, FB_ANIM_STOP, animation); |
| |
| active_console = KERNEL_CONSOLE; /* Set to kernel console */ |
| |
| active_console = KERNEL_CONSOLE; |
| vp_switch(0); |
| } |
| |
| 250,8 → 244,8 |
|---|
| */ |
| void gcons_mouse_move(int dx, int dy) |
| { |
| mouse_x = limit(mouse_x+dx, 0, xres); |
| mouse_y = limit(mouse_y+dy, 0, yres); |
| mouse_x = limit(mouse_x + dx, 0, xres); |
| mouse_y = limit(mouse_y + dy, 0, yres); |
| |
| async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y); |
| } |
| 258,7 → 252,7 |
|---|
| |
| static int gcons_find_conbut(int x, int y) |
| { |
| int status_start = STATUS_START + (xres - 800) / 2;; |
| int status_start = STATUS_START + (xres - 800) / 2; |
| |
| if (y < STATUS_TOP || y >= STATUS_TOP + STATUS_HEIGHT) |
| return -1; |
| 268,10 → 262,10 |
|---|
| |
| if (x >= status_start + (STATUS_WIDTH + STATUS_SPACE) * CONSOLE_COUNT) |
| return -1; |
| if (((x - status_start) % (STATUS_WIDTH+STATUS_SPACE)) < STATUS_SPACE) |
| 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); |
| } |
| |
| /** Handle mouse click |
| 342,11 → 336,12 |
|---|
| extern int _binary_helenos_ppm_size; |
| extern char _binary_nameic_ppm_start[0]; |
| extern int _binary_nameic_ppm_size; |
| /** Redraws console graphics */ |
| static void gcons_redraw_console(void) |
| |
| /** Redraws console graphics */ |
| void gcons_redraw_console(void) |
| { |
| int i; |
| |
| |
| if (!use_gcons) |
| return; |
| |
| 357,7 → 352,7 |
|---|
| (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); |
| 459,16 → 454,16 |
|---|
| int rc; |
| int i; |
| int status_start = STATUS_START; |
| |
| |
| fbphone = phone; |
| |
| |
| rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres); |
| if (rc) |
| return; |
| |
| if (xres < 800 || yres < 600) |
| if ((xres < 800) || (yres < 600)) |
| return; |
| |
| |
| /* create console viewport */ |
| /* Align width & height to character size */ |
| console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, |
| 506,13 → 501,12 |
|---|
| ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED]; |
| |
| make_anim(); |
| |
| |
| use_gcons = 1; |
| console_state[0] = CONS_DISCONNECTED_SEL; |
| console_state[KERNEL_CONSOLE] = CONS_KERNEL; |
| gcons_redraw_console(); |
| } |
| |
| |
| /** @} |
| */ |
| |