Index: uspace/srv/hid/output/ctl/serial.c =================================================================== --- uspace/srv/hid/output/ctl/serial.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/ctl/serial.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,5 +63,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + return vt100_yield(state); } @@ -70,5 +70,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + return vt100_claim(state); } @@ -78,5 +78,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + vt100_get_dimensions(state, cols, rows); } @@ -91,5 +91,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + vt100_goto(state, col, row); vt100_cursor_visibility(state, visible); @@ -101,5 +101,5 @@ charfield_t *field = chargrid_charfield_at(dev->backbuf, col, row); - + draw_char(state, field, col, row); } @@ -130,5 +130,5 @@ if (state == NULL) return ENOMEM; - + outdev_t *dev = outdev_register(&serial_ops, state); if (dev == NULL) { @@ -136,5 +136,5 @@ return ENOMEM; } - + return EOK; } Index: uspace/srv/hid/output/gfx/font-8x16.c =================================================================== --- uspace/srv/hid/output/gfx/font-8x16.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/gfx/font-8x16.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,317 +49,317 @@ if (ch == 0x0000) return 0; - + if ((ch >= 0x0020) && (ch <= 0x007f)) return (ch - 32); - + if ((ch >= 0x00a0) && (ch <= 0x021f)) return (ch - 64); - + if ((ch >= 0x0222) && (ch <= 0x0233)) return (ch - 66); - + if ((ch >= 0x0250) && (ch <= 0x02ad)) return (ch - 94); - + if ((ch >= 0x02b0) && (ch <= 0x02cf)) return (ch - 96); - + if ((ch >= 0x02d8) && (ch <= 0x02dd)) return (ch - 104); - + if (ch == 0x02ee) return 630; - + if ((ch >= 0x0300) && (ch <= 0x0301)) return (ch - 137); - + if (ch == 0x0303) return 633; - + if (ch == 0x0309) return 634; - + if ((ch >= 0x0312) && (ch <= 0x0314)) return (ch - 151); - + if (ch == 0x0323) return 638; - + if ((ch >= 0x0340) && (ch <= 0x0341)) return (ch - 193); - + if ((ch >= 0x0374) && (ch <= 0x0375)) return (ch - 243); - + if (ch == 0x037a) return 643; - + if (ch == 0x037e) return 644; - + if ((ch >= 0x0384) && (ch <= 0x038a)) return (ch - 255); - + if (ch == 0x038c) return 652; - + if ((ch >= 0x038e) && (ch <= 0x03a1)) return (ch - 257); - + if ((ch >= 0x03a3) && (ch <= 0x03ce)) return (ch - 258); - + if ((ch >= 0x03d0) && (ch <= 0x03d7)) return (ch - 259); - + if ((ch >= 0x03da) && (ch <= 0x03f3)) return (ch - 261); - + if ((ch >= 0x0400) && (ch <= 0x0486)) return (ch - 273); - + if ((ch >= 0x0488) && (ch <= 0x04ce)) return (ch - 274); - + if ((ch >= 0x04d0) && (ch <= 0x04f5)) return (ch - 275); - + if ((ch >= 0x04f8) && (ch <= 0x04f9)) return (ch - 277); - + if ((ch >= 0x0500) && (ch <= 0x050f)) return (ch - 283); - + if ((ch >= 0x0530) && (ch <= 0x0556)) return (ch - 315); - + if ((ch >= 0x0559) && (ch <= 0x055f)) return (ch - 317); - + if ((ch >= 0x0561) && (ch <= 0x0587)) return (ch - 318); - + if ((ch >= 0x0589) && (ch <= 0x058a)) return (ch - 319); - + if ((ch >= 0x0591) && (ch <= 0x05a1)) return (ch - 325); - + if ((ch >= 0x05a3) && (ch <= 0x05b9)) return (ch - 326); - + if ((ch >= 0x05bb) && (ch <= 0x05c4)) return (ch - 327); - + if ((ch >= 0x05d0) && (ch <= 0x05ea)) return (ch - 338); - + if ((ch >= 0x05f0) && (ch <= 0x05f4)) return (ch - 343); - + if (ch == 0x060c) return 1182; - + if (ch == 0x061b) return 1183; - + if (ch == 0x061f) return 1184; - + if ((ch >= 0x0621) && (ch <= 0x063a)) return (ch - 384); - + if ((ch >= 0x0640) && (ch <= 0x0655)) return (ch - 389); - + if ((ch >= 0x0660) && (ch <= 0x066d)) return (ch - 399); - + if ((ch >= 0x0670) && (ch <= 0x06ed)) return (ch - 401); - + if ((ch >= 0x06f0) && (ch <= 0x06fe)) return (ch - 403); - + if (ch == 0x10d3) return 1388; - + if (ch == 0x10d7) return 1389; - + if (ch == 0x10da) return 1390; - + if (ch == 0x10dd) return 1391; - + if (ch == 0x10e6) return 1392; - + if ((ch >= 0x1e00) && (ch <= 0x1e9b)) return (ch - 6287); - + if ((ch >= 0x1ea0) && (ch <= 0x1ef9)) return (ch - 6291); - + if ((ch >= 0x1f00) && (ch <= 0x1f07)) return (ch - 6297); - + if ((ch >= 0x2000) && (ch <= 0x2027)) return (ch - 6545); - + if ((ch >= 0x2030) && (ch <= 0x2046)) return (ch - 6553); - + if ((ch >= 0x2048) && (ch <= 0x204d)) return (ch - 6554); - + if (ch == 0x2070) return 1716; - + if ((ch >= 0x2074) && (ch <= 0x208f)) return (ch - 6591); - + if ((ch >= 0x20a0) && (ch <= 0x20af)) return (ch - 6607); - + if ((ch >= 0x2100) && (ch <= 0x213a)) return (ch - 6687); - + if ((ch >= 0x2153) && (ch <= 0x2183)) return (ch - 6711); - + if ((ch >= 0x2190) && (ch <= 0x21f3)) return (ch - 6723); - + if ((ch >= 0x2200) && (ch <= 0x22f1)) return (ch - 6735); - + if (ch == 0x2300) return 2211; - + if (ch == 0x2302) return 2212; - + if ((ch >= 0x2308) && (ch <= 0x230b)) return (ch - 6755); - + if (ch == 0x2310) return 2217; - + if (ch == 0x2318) return 2218; - + if ((ch >= 0x231a) && (ch <= 0x231b)) return (ch - 6767); - + if ((ch >= 0x2320) && (ch <= 0x2321)) return (ch - 6771); - + if ((ch >= 0x2329) && (ch <= 0x232a)) return (ch - 6778); - + if ((ch >= 0x239b) && (ch <= 0x23bd)) return (ch - 6890); - + if (ch == 0x23ce) return 2260; - + if ((ch >= 0x2409) && (ch <= 0x240d)) return (ch - 6964); - + if ((ch >= 0x2423) && (ch <= 0x2424)) return (ch - 6985); - + if (ch == 0x2426) return 2268; - + if ((ch >= 0x2500) && (ch <= 0x2595)) return (ch - 7203); - + if ((ch >= 0x25a0) && (ch <= 0x25f7)) return (ch - 7213); - + if ((ch >= 0x2600) && (ch <= 0x2602)) return (ch - 7221); - + if ((ch >= 0x2605) && (ch <= 0x260d)) return (ch - 7223); - + if ((ch >= 0x2610) && (ch <= 0x2613)) return (ch - 7225); - + if (ch == 0x2620) return 2523; - + if (ch == 0x2622) return 2524; - + if (ch == 0x2626) return 2525; - + if ((ch >= 0x2628) && (ch <= 0x262b)) return (ch - 7242); - + if ((ch >= 0x262e) && (ch <= 0x2637)) return (ch - 7244); - + if ((ch >= 0x2639) && (ch <= 0x2653)) return (ch - 7245); - + if ((ch >= 0x2660) && (ch <= 0x2667)) return (ch - 7257); - + if ((ch >= 0x2669) && (ch <= 0x266f)) return (ch - 7258); - + if ((ch >= 0xfb00) && (ch <= 0xfb05)) return (ch - 61674); - + if ((ch >= 0xfb50) && (ch <= 0xfbb1)) return (ch - 61748); - + if ((ch >= 0xfbd3) && (ch <= 0xfbe9)) return (ch - 61781); - + if ((ch >= 0xfbfc) && (ch <= 0xfbff)) return (ch - 61799); - + if ((ch >= 0xfc5b) && (ch <= 0xfc63)) return (ch - 61890); - + if (ch == 0xfc90) return 2722; - + if ((ch >= 0xfcf2) && (ch <= 0xfcf4)) return (ch - 62031); - + if ((ch >= 0xfd3c) && (ch <= 0xfd3f)) return (ch - 62102); - + if (ch == 0xfdf2) return 2730; - + if ((ch >= 0xfe50) && (ch <= 0xfe52)) return (ch - 62373); - + if ((ch >= 0xfe54) && (ch <= 0xfe66)) return (ch - 62374); - + if ((ch >= 0xfe68) && (ch <= 0xfe6b)) return (ch - 62375); - + if ((ch >= 0xfe70) && (ch <= 0xfe72)) return (ch - 62379); - + if (ch == 0xfe74) return 2760; - + if ((ch >= 0xfe76) && (ch <= 0xfefc)) return (ch - 62381); - + if (ch == 0xfeff) return 2896; - + return 2898; } @@ -3264,5 +3264,5 @@ {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8}, {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00}, - + /* Special glyph for unknown character */ {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00} Index: uspace/srv/hid/output/output.c =================================================================== --- uspace/srv/hid/output/output.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/output.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,5 +44,5 @@ typedef struct { link_t link; - + size_t size; unsigned int flags; @@ -56,14 +56,14 @@ { assert(ops->get_dimensions); - + outdev_t *dev = (outdev_t *) malloc(sizeof(outdev_t)); if (dev == NULL) return NULL; - + link_initialize(&dev->link); - + dev->ops = *ops; dev->data = data; - + ops->get_dimensions(dev, &dev->cols, &dev->rows); dev->backbuf = chargrid_create(dev->cols, dev->rows, @@ -73,5 +73,5 @@ return NULL; } - + list_append(&dev->link, &outdevs); return dev; @@ -81,13 +81,13 @@ { errno_t ret = EOK; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.yield); - + errno_t rc = dev->ops.yield(dev); if (rc != EOK) ret = rc; } - + async_answer_0(iid, ret); } @@ -96,13 +96,13 @@ { errno_t ret = EOK; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.claim); - + errno_t rc = dev->ops.claim(dev); if (rc != EOK) ret = rc; } - + async_answer_0(iid, ret); } @@ -112,10 +112,10 @@ sysarg_t cols = MAX_COLS; sysarg_t rows = MAX_ROWS; - + list_foreach(outdevs, link, outdev_t, dev) { cols = min(cols, dev->cols); rows = min(rows, dev->rows); } - + async_answer_2(iid, EOK, cols, rows); } @@ -124,11 +124,11 @@ { console_caps_t caps = 0; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.get_caps); - + caps |= dev->ops.get_caps(dev); } - + async_answer_1(iid, EOK, caps); } @@ -143,10 +143,10 @@ } } - + if (frontbuf == NULL) { async_answer_0(iid, ENOENT); return NULL; } - + return frontbuf; } @@ -159,7 +159,7 @@ return; } - + link_initialize(&frontbuf->link); - + ipc_callid_t callid; if (!async_share_out_receive(&callid, &frontbuf->size, @@ -169,5 +169,5 @@ return; } - + errno_t rc = async_share_out_finalize(callid, &frontbuf->data); if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) { @@ -176,5 +176,5 @@ return; } - + list_append(&frontbuf->link, &frontbufs); async_answer_1(iid, EOK, (sysarg_t) frontbuf); @@ -186,9 +186,9 @@ if (frontbuf == NULL) return; - + list_remove(&frontbuf->link); as_area_destroy(frontbuf->data); free(frontbuf); - + async_answer_0(iid, EOK); } @@ -199,22 +199,22 @@ if (frontbuf == NULL) return; - + chargrid_t *buf = (chargrid_t *) frontbuf->data; bool visible = chargrid_get_cursor_visibility(buf); - + sysarg_t col; sysarg_t row; chargrid_get_cursor(buf, &col, &row); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.cursor_update); - + sysarg_t prev_col; sysarg_t prev_row; chargrid_get_cursor(dev->backbuf, &prev_col, &prev_row); - + chargrid_set_cursor(dev->backbuf, col, row); chargrid_set_cursor_visibility(dev->backbuf, visible); - + dev->ops.cursor_update(dev, prev_col, prev_row, col, row, visible); @@ -222,5 +222,5 @@ } - + async_answer_0(iid, EOK); } @@ -233,5 +233,5 @@ (console_style_t) IPC_GET_ARG1(*icall); } - + async_answer_0(iid, EOK); } @@ -248,5 +248,5 @@ (console_color_attr_t) IPC_GET_ARG3(*icall); } - + async_answer_0(iid, EOK); } @@ -259,5 +259,5 @@ dev->attrs.val.rgb.fgcolor = IPC_GET_ARG2(*icall); } - + async_answer_0(iid, EOK); } @@ -266,12 +266,12 @@ { assert(dev->ops.char_update); - + sysarg_t top_row = chargrid_get_top_row(buf); - + if (dev->top_row == top_row) return false; - + dev->top_row = top_row; - + for (sysarg_t y = 0; y < dev->rows; y++) { for (sysarg_t x = 0; x < dev->cols; x++) { @@ -281,22 +281,22 @@ chargrid_charfield_at(dev->backbuf, x, y); bool update = false; - + if (front_field->ch != back_field->ch) { back_field->ch = front_field->ch; update = true; } - + if (!attrs_same(front_field->attrs, back_field->attrs)) { back_field->attrs = front_field->attrs; update = true; } - + front_field->flags &= ~CHAR_FLAG_DIRTY; - + if (update) dev->ops.char_update(dev, x, y); } } - + return true; } @@ -307,13 +307,13 @@ if (frontbuf == NULL) return; - + chargrid_t *buf = (chargrid_t *) frontbuf->data; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.char_update); - + if (srv_update_scroll(dev, buf)) continue; - + for (sysarg_t y = 0; y < dev->rows; y++) { for (sysarg_t x = 0; x < dev->cols; x++) { @@ -323,5 +323,5 @@ chargrid_charfield_at(dev->backbuf, x, y); bool update = false; - + if ((front_field->flags & CHAR_FLAG_DIRTY) == CHAR_FLAG_DIRTY) { @@ -330,5 +330,5 @@ update = true; } - + if (!attrs_same(front_field->attrs, back_field->attrs)) { @@ -336,17 +336,17 @@ update = true; } - + front_field->flags &= ~CHAR_FLAG_DIRTY; } - + if (update) dev->ops.char_update(dev, x, y); } } - + dev->ops.flush(dev); } - - + + async_answer_0(iid, EOK); } @@ -357,19 +357,19 @@ if (frontbuf == NULL) return; - + chargrid_t *buf = (chargrid_t *) frontbuf->data; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.char_update); - + if (srv_update_scroll(dev, buf)) continue; - + sysarg_t col = IPC_GET_ARG2(*icall); sysarg_t row = IPC_GET_ARG3(*icall); - + sysarg_t cols = IPC_GET_ARG4(*icall); sysarg_t rows = IPC_GET_ARG5(*icall); - + for (sysarg_t y = 0; y < rows; y++) { for (sysarg_t x = 0; x < cols; x++) { @@ -378,5 +378,5 @@ charfield_t *back_field = chargrid_charfield_at(dev->backbuf, col + x, row + y); - + back_field->ch = front_field->ch; back_field->attrs = front_field->attrs; @@ -395,14 +395,14 @@ /* Accept the connection */ async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { async_answer_0(callid, EOK); break; } - + switch (IPC_GET_IMETHOD(call)) { case OUTPUT_YIELD: @@ -418,5 +418,5 @@ srv_get_caps(callid, &call); break; - + case OUTPUT_FRONTBUF_CREATE: srv_frontbuf_create(callid, &call); @@ -425,5 +425,5 @@ srv_frontbuf_destroy(callid, &call); break; - + case OUTPUT_CURSOR_UPDATE: srv_cursor_update(callid, &call); @@ -444,5 +444,5 @@ srv_damage(callid, &call); break; - + default: async_answer_0(callid, EINVAL); @@ -462,7 +462,7 @@ return 1; } - + printf("%s: HelenOS output service\n", NAME); - + /* Register server */ async_set_fallback_port_handler(client_connection, NULL); @@ -472,5 +472,5 @@ return rc; } - + service_id_t service_id; rc = loc_service_register(argv[1], &service_id); @@ -479,15 +479,15 @@ return rc; } - + if (!config_key_exists("console")) { ega_init(); } - + chardev_init(); - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/hid/output/output.h =================================================================== --- uspace/srv/hid/output/output.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/output.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,9 +44,9 @@ errno_t (*yield)(struct outdev *dev); errno_t (*claim)(struct outdev *dev); - + void (*get_dimensions)(struct outdev *dev, sysarg_t *cols, sysarg_t *rows); console_caps_t (*get_caps)(struct outdev *dev); - + void (*cursor_update)(struct outdev *dev, sysarg_t prev_col, sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible); @@ -57,12 +57,12 @@ typedef struct outdev { link_t link; - + sysarg_t cols; sysarg_t rows; char_attrs_t attrs; - + chargrid_t *backbuf; sysarg_t top_row; - + outdev_ops_t ops; void *data; Index: uspace/srv/hid/output/port/ega.c =================================================================== --- uspace/srv/hid/output/port/ega.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/port/ega.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,8 +47,8 @@ sysarg_t cols; sysarg_t rows; - + uint8_t style_normal; uint8_t style_inverted; - + size_t size; uint8_t *addr; @@ -60,5 +60,5 @@ { uint8_t attr = 0; - + switch (attrs.type) { case CHAR_ATTR_STYLE: @@ -81,8 +81,8 @@ attr = ((attrs.val.index.bgcolor & 7) << 4) | (attrs.val.index.fgcolor & 7); - + if (attrs.val.index.attr & CATTR_BRIGHT) attr |= 0x08; - + break; case CHAR_ATTR_RGB: @@ -91,5 +91,5 @@ break; } - + return attr; } @@ -105,12 +105,12 @@ { uint8_t glyph; - + if (ascii_check(field->ch)) glyph = field->ch; else glyph = '?'; - + uint8_t attr = attrs_attr(field->attrs); - + ega.addr[FB_POS(col, row)] = glyph; ega.addr[FB_POS(col, row) + 1] = attr; @@ -143,16 +143,16 @@ /* Cursor position */ uint16_t cursor = row * ega.cols + col; - + pio_write_8(EGA_IO_BASE, 0x0e); pio_write_8(EGA_IO_BASE + 1, (cursor >> 8) & 0xff); pio_write_8(EGA_IO_BASE, 0x0f); pio_write_8(EGA_IO_BASE + 1, cursor & 0xff); - + /* Cursor visibility */ pio_write_8(EGA_IO_BASE, 0x0a); uint8_t stat = pio_read_8(EGA_IO_BASE + 1); - + pio_write_8(EGA_IO_BASE, 0x0a); - + if (visible) pio_write_8(EGA_IO_BASE + 1, stat & (~(1 << 5))); @@ -165,5 +165,5 @@ charfield_t *field = chargrid_charfield_at(dev->backbuf, col, row); - + draw_char(field, col, row); } @@ -189,36 +189,36 @@ if (rc != EOK) present = false; - + if (!present) return ENOENT; - + sysarg_t kind; rc = sysinfo_get_value("fb.kind", &kind); if (rc != EOK) kind = (sysarg_t) -1; - + if (kind != 2) return EINVAL; - + sysarg_t paddr; rc = sysinfo_get_value("fb.address.physical", &paddr); if (rc != EOK) return rc; - + rc = sysinfo_get_value("fb.width", &ega.cols); if (rc != EOK) return rc; - + rc = sysinfo_get_value("fb.height", &ega.rows); if (rc != EOK) return rc; - + rc = pio_enable((void*)EGA_IO_BASE, EGA_IO_SIZE, NULL); if (rc != EOK) return rc; - + ega.size = (ega.cols * ega.rows) << 1; ega.addr = AS_AREA_ANY; - + rc = physmem_map(paddr, ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH, @@ -226,18 +226,18 @@ if (rc != EOK) return rc; - + sysarg_t blinking; rc = sysinfo_get_value("fb.blinking", &blinking); if (rc != EOK) blinking = false; - + ega.style_normal = 0xf0; ega.style_inverted = 0x0f; - + if (blinking) { ega.style_normal &= 0x77; ega.style_inverted &= 0x77; } - + outdev_t *dev = outdev_register(&ega_ops, (void *) &ega); if (dev == NULL) { @@ -245,5 +245,5 @@ return EINVAL; } - + return EOK; } Index: uspace/srv/hid/output/port/kfb.c =================================================================== --- uspace/srv/hid/output/port/kfb.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/port/kfb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -87,18 +87,18 @@ size_t scanline; visual_t visual; - + size_t size; uint8_t *addr; - + pixel2visual_t pixel2visual; visual2pixel_t visual2pixel; visual_mask_t visual_mask; size_t pixel_bytes; - + sysarg_t pointer_x; sysarg_t pointer_y; bool pointer_visible; imgmap_t *pointer_imgmap; - + /* * Pre-rendered mask for rendering @@ -106,9 +106,9 @@ * visual. */ - + size_t glyph_scanline; size_t glyph_bytes; uint8_t *glyphs; - + uint8_t *backbuf; } kfb_t; @@ -135,5 +135,5 @@ [COLOR_YELLOW] = 0xf0f000, [COLOR_WHITE] = 0xf0f0f0, - + [COLOR_BLACK + 8] = 0x000000, [COLOR_BLUE + 8] = 0x0000ff, @@ -150,5 +150,5 @@ if ((x >= kfb.width) || (y >= kfb.height)) return; - + kfb.pixel2visual(kfb.addr + FB_POS(x, y), pixel); } @@ -158,5 +158,5 @@ if ((x >= kfb.width) || (y >= kfb.height)) return 0; - + return kfb.visual2pixel(kfb.addr + FB_POS(x, y)); } @@ -169,11 +169,11 @@ sysarg_t dx = kfb.pointer_x + x; sysarg_t dy = kfb.pointer_y + y; - + pixel_t pixel = get_pixel(dx, dy); imgmap_put_pixel(kfb.pointer_imgmap, x, y, pixel); - + size_t offset = y * ((POINTER_WIDTH - 1) / 8 + 1) + x / 8; bool visible = pointer_mask[offset] & (1 << (x % 8)); - + if (visible) { pixel = (pointer[offset] & (1 << (x % 8))) ? @@ -193,5 +193,5 @@ sysarg_t dx = kfb.pointer_x + x; sysarg_t dy = kfb.pointer_y + y; - + pixel_t pixel = imgmap_get_pixel(kfb.pointer_imgmap, x, y); @@ -210,11 +210,11 @@ if ((y1 >= y2) || (x1 >= x2)) return; - + uint8_t cbuf[4]; kfb.pixel2visual(cbuf, color); - + for (sysarg_t y = y1; y < y2; y++) { uint8_t *dst = kfb.addr + FB_POS(x1, y); - + for (sysarg_t x = x1; x < x2; x++) { memcpy(dst, cbuf, kfb.pixel_bytes); @@ -290,5 +290,5 @@ { size_t word_size = sizeof(unsigned long); - + /* * Prepare a pair of words, one filled with foreground-color @@ -297,5 +297,5 @@ unsigned long fg_buf; unsigned long bg_buf; - + for (size_t i = 0; i < word_size / kfb.pixel_bytes; i++) { kfb.pixel2visual(&((uint8_t *) &bg_buf)[i * kfb.pixel_bytes], @@ -304,20 +304,20 @@ fgcolor); } - + /* Pointer to the current position in the mask. */ unsigned long *maskp = (unsigned long *) &kfb.glyphs[GLYPH_POS( fb_font_glyph(ch), 0, inverted)]; - + /* Pointer to the current position on the screen. */ unsigned long *dst = (unsigned long *) &kfb.addr[FB_POS(x, y)]; - + /* Width of the character cell in words. */ size_t ww = FONT_WIDTH * kfb.pixel_bytes / word_size; - + /* Offset to add when moving to another screen scanline. */ size_t d_add = kfb.scanline - FONT_WIDTH * kfb.pixel_bytes; - + for (size_t yd = 0; yd < FONT_SCANLINES; yd++) { /* @@ -329,5 +329,5 @@ *dst++ = (fg_buf & mask) | (bg_buf & ~mask); } - + /* Move to the beginning of the next scanline of the cell. */ dst = (unsigned long *) ((uint8_t *) dst + d_add); @@ -353,9 +353,9 @@ /* Character glyph */ uint16_t glyph = fb_font_glyph(ch); - + /* Pre-render the foreground and background color pixels. */ uint8_t fg_buf[4]; uint8_t bg_buf[4]; - + if (inverted) { kfb.pixel2visual(bg_buf, fgcolor); @@ -365,27 +365,27 @@ kfb.pixel2visual(fg_buf, fgcolor); } - + /* Pointer to the current position on the screen. */ uint8_t *dst = (uint8_t *) &kfb.addr[FB_POS(x, y)]; - + /* Offset to add when moving to another screen scanline. */ size_t d_add = kfb.scanline - FONT_WIDTH * kfb.pixel_bytes; - + for (size_t yd = 0; yd < FONT_SCANLINES; yd++) { /* Byte containing bits of the glyph scanline. */ uint8_t byte = fb_font[glyph][yd]; - + for (size_t i = 0; i < FONT_WIDTH; i++) { /* Choose color based on the current bit. */ uint8_t *src = (byte & 0x80) ? fg_buf : bg_buf; - + /* Copy the pixel. */ for (size_t j = 0; j < kfb.pixel_bytes; j++) *dst++ = *src++; - + /* Move to the next bit. */ byte <<= 1; } - + /* Move to the beginning of the next scanline of the cell. */ dst += d_add; @@ -403,17 +403,17 @@ { kfb_vp_t *kfb_vp = (kfb_vp_t *) vp->data; - + sysarg_t x = vp->x + COL2X(col); sysarg_t y = vp->y + ROW2Y(row); - + charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row); - + pixel_t bgcolor = 0; pixel_t fgcolor = 0; attrs_rgb(field->attrs, &bgcolor, &fgcolor); - + bool inverted = (vp->cursor_flash) && screenbuffer_cursor_at(vp->backbuf, col, row); - + (*kfb_vp->draw_char)(x, y, inverted, field->ch, bgcolor, fgcolor); } @@ -427,9 +427,9 @@ return ENOMEM; } - + for (sysarg_t y = 0; y < kfb.height; y++) memcpy(kfb.backbuf + y * kfb.width * kfb.pixel_bytes, kfb.addr + FB_POS(0, y), kfb.width * kfb.pixel_bytes); - + return EOK; } @@ -439,10 +439,10 @@ if (kfb.backbuf == NULL) return ENOENT; - + for (sysarg_t y = 0; y < kfb.height; y++) memcpy(kfb.addr + FB_POS(0, y), kfb.backbuf + y * kfb.width * kfb.pixel_bytes, kfb.width * kfb.pixel_bytes); - + return EOK; } @@ -452,9 +452,9 @@ { pointer_hide(); - + kfb.pointer_x = x; kfb.pointer_y = y; kfb.pointer_visible = visible; - + pointer_show(); } @@ -479,5 +479,5 @@ if (kfb_vp == NULL) return ENOMEM; - + /* * Conditions necessary to select aligned glyph @@ -489,5 +489,5 @@ */ size_t word_size = sizeof(unsigned long); - + if (((word_size % kfb.pixel_bytes) == 0) && ((FONT_WIDTH * kfb.pixel_bytes) % word_size == 0) @@ -497,10 +497,10 @@ else kfb_vp->draw_char = draw_char_fallback; - + vp->attrs.type = CHAR_ATTR_RGB; vp->attrs.val.rgb.bgcolor = DEFAULT_BGCOLOR; vp->attrs.val.rgb.fgcolor = DEFAULT_FGCOLOR; vp->data = (void *) kfb_vp; - + return EOK; } @@ -514,22 +514,22 @@ { pointer_hide(); - + for (sysarg_t row = 0; row < vp->rows; row++) { for (sysarg_t col = 0; col < vp->cols; col++) { charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row); - + field->ch = 0; field->attrs = vp->attrs; } } - + pixel_t bgcolor = 0; pixel_t fgcolor = 0; attrs_rgb(vp->attrs, &bgcolor, &fgcolor); - + draw_filled_rect(vp->x, vp->y, vp->x + vp->width, vp->y + vp->height, bgcolor); - + pointer_show(); } @@ -569,5 +569,5 @@ { pointer_hide(); - + for (sysarg_t y = 0; y < height; y++) { for (sysarg_t x = 0; x < width; x++) { @@ -576,5 +576,5 @@ } } - + pointer_show(); } @@ -605,5 +605,5 @@ { memset(kfb.glyphs, 0, sz); - + for (unsigned int glyph = 0; glyph < FONT_GLYPHS; glyph++) { for (unsigned int y = 0; y < FONT_SCANLINES; y++) { @@ -626,46 +626,46 @@ if (rc != EOK) present = false; - + if (!present) return ENOENT; - + sysarg_t kind; rc = sysinfo_get_value("fb.kind", &kind); if (rc != EOK) kind = (sysarg_t) -1; - + if (kind != 1) return EINVAL; - + sysarg_t paddr; rc = sysinfo_get_value("fb.address.physical", &paddr); if (rc != EOK) return rc; - + sysarg_t offset; rc = sysinfo_get_value("fb.offset", &offset); if (rc != EOK) offset = 0; - + sysarg_t width; rc = sysinfo_get_value("fb.width", &width); if (rc != EOK) return rc; - + sysarg_t height; rc = sysinfo_get_value("fb.height", &height); if (rc != EOK) return rc; - + sysarg_t scanline; rc = sysinfo_get_value("fb.scanline", &scanline); if (rc != EOK) return rc; - + sysarg_t visual; rc = sysinfo_get_value("fb.visual", &visual); if (rc != EOK) return rc; - + kfb.width = width; kfb.height = height; @@ -673,5 +673,5 @@ kfb.scanline = scanline; kfb.visual = visual; - + switch (visual) { case VISUAL_INDIRECT_8: @@ -744,17 +744,17 @@ return EINVAL; } - + kfb.glyph_scanline = FONT_WIDTH * kfb.pixel_bytes; kfb.glyph_bytes = kfb.glyph_scanline * FONT_SCANLINES; - + size_t sz = 2 * FONT_GLYPHS * kfb.glyph_bytes; kfb.glyphs = (uint8_t *) malloc(sz); if (kfb.glyphs == NULL) return EINVAL; - + render_glyphs(sz); - + kfb.size = scanline * height; - + rc = physmem_map((void *) paddr + offset, ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH, @@ -764,5 +764,5 @@ return rc; } - + kfb.pointer_x = 0; kfb.pointer_y = 0; @@ -770,7 +770,7 @@ kfb.pointer_imgmap = imgmap_create(POINTER_WIDTH, POINTER_HEIGHT, VISUAL_RGB_0_8_8_8, IMGMAP_FLAG_NONE); - + kfb.backbuf = NULL; - + fbdev_t *dev = fbdev_register(&kfb_ops, (void *) &kfb); if (dev == NULL) { @@ -779,5 +779,5 @@ return EINVAL; } - + return EOK; } Index: uspace/srv/hid/output/proto/vt100.c =================================================================== --- uspace/srv/hid/output/proto/vt100.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/proto/vt100.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,5 +77,5 @@ { char control[MAX_CONTROL]; - + snprintf(control, MAX_CONTROL, "\033[%um", mode); state->control_puts(control); @@ -85,5 +85,5 @@ { char control[MAX_CONTROL]; - + snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f", row + 1, col + 1); @@ -123,15 +123,15 @@ vt100_sgr(state, SGR_BGCOLOR + color_map[attrs.val.index.bgcolor & 7]); vt100_sgr(state, SGR_FGCOLOR + color_map[attrs.val.index.fgcolor & 7]); - + if (attrs.val.index.attr & CATTR_BRIGHT) vt100_sgr(state, SGR_BOLD); - + break; case CHAR_ATTR_RGB: vt100_sgr(state, SGR_RESET); - + if (attrs.val.rgb.bgcolor <= attrs.val.rgb.fgcolor) vt100_sgr(state, SGR_REVERSE); - + break; } @@ -145,18 +145,18 @@ if (state == NULL) return NULL; - + state->putchar = putchar_fn; state->control_puts = control_puts_fn; state->flush = flush_fn; - + state->cols = cols; state->rows = rows; - + state->cur_col = (sysarg_t) -1; state->cur_row = (sysarg_t) -1; - + state->cur_attrs.type = CHAR_ATTR_STYLE; state->cur_attrs.val.style = STYLE_NORMAL; - + /* Initialize graphic rendition attributes */ vt100_sgr(state, SGR_RESET); @@ -195,5 +195,5 @@ if ((col >= state->cols) || (row >= state->rows)) return; - + if ((col != state->cur_col) || (row != state->cur_row)) { vt100_set_pos(state, col, row); @@ -223,5 +223,5 @@ state->putchar(ch == 0 ? ' ' : ch); state->cur_col++; - + if (state->cur_col >= state->cols) { state->cur_row += state->cur_col / state->cols; Index: uspace/srv/hid/output/proto/vt100.h =================================================================== --- uspace/srv/hid/output/proto/vt100.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/proto/vt100.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -42,9 +42,9 @@ sysarg_t cols; sysarg_t rows; - + sysarg_t cur_col; sysarg_t cur_row; char_attrs_t cur_attrs; - + vt100_putchar_t putchar; vt100_control_puts_t control_puts;