Changeset 25eec4e in mainline for uspace/lib/gui/terminal.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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.

Message:

Merge mainline chages.

File:

• uspace/lib/gui/terminal.c (modified) (5 diffs)

uspace/lib/gui/terminal.c

@@ -77 +77 @@
 static void term_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void term_set_cursor_visibility(con_srv_t *, bool);
-static int term_get_event(con_srv_t *, kbd_event_t *);
+static int term_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -196 +196 @@
         uint16_t glyph = fb_font_glyph(field->ch);
         
-        // FIXME: This font drawing routine is shamelessly
-        //        suboptimal. It should be optimized for
-        //        aligned memory transfers, etc.
-        
         for (unsigned int y = 0; y < FONT_SCANLINES; y++) {
-                for (unsigned int x = 0; x < FONT_WIDTH; x++) {
-                        pixel_t pixel =
-                            (fb_font[glyph][y] & (1 << (7 - x))) ? fgcolor : bgcolor;
-                        surface_put_pixel(surface, bx + x, by + y, pixel);
+                pixel_t *dst = pixelmap_pixel_at(
+                    surface_pixmap_access(surface), bx, by + y);
+                pixel_t *dst_max = pixelmap_pixel_at(
+                    surface_pixmap_access(surface), bx + FONT_WIDTH - 1, by + y);
+                if (!dst || !dst_max) continue;
+                int count = FONT_WIDTH;
+                while (count-- != 0) {
+                        *dst++ = (fb_font[glyph][y] & (1 << count)) ? fgcolor : bgcolor;
                 }
         }
+        surface_add_damaged_region(surface, bx, by, FONT_WIDTH, FONT_SCANLINES);
 }
 
@@ -419 +420 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&term->input_pc);
-                        kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
+                        cons_event_t *event = list_get_instance(link, cons_event_t, link);
                         
                         /* Accept key presses of printable chars only. */
-                        if ((event->type == KEY_PRESS) && (event->c != 0)) {
+                        if (event->type == CEV_KEY && event->ev.key.type == KEY_PRESS &&
+                            event->ev.key.c != 0) {
                                 wchar_t tmp[2] = {
-                                        event->c,
+                                        event->ev.key.c,
                                         0
                                 };
@@ -578 +580 @@
 }
 
-static int term_get_event(con_srv_t *srv, kbd_event_t *event)
+static int term_get_event(con_srv_t *srv, cons_event_t *event)
 {
         terminal_t *term = srv_to_terminal(srv);
         link_t *link = prodcons_consume(&term->input_pc);
-        kbd_event_t *kevent = list_get_instance(link, kbd_event_t, link);
-        
-        *event = *kevent;
-        free(kevent);
+        cons_event_t *ev = list_get_instance(link, cons_event_t, link);
+        
+        *event = *ev;
+        free(ev);
         return EOK;
 }
@@ -633 +635 @@
 }
 
+static void terminal_queue_cons_event(terminal_t *term, cons_event_t *ev)
+{
+        /* Got key press/release event */
+        cons_event_t *event =
+            (cons_event_t *) malloc(sizeof(cons_event_t));
+        if (event == NULL)
+                return;
+        
+        *event = *ev;
+        link_initialize(&event->link);
+        
+        prodcons_produce(&term->input_pc, &event->link);
+}
+
+/* Got key press/release event */
 static void terminal_handle_keyboard_event(widget_t *widget,
     kbd_event_t kbd_event)
 {
         terminal_t *term = (terminal_t *) widget;
-        
-        /* Got key press/release event */
-        kbd_event_t *event =
-            (kbd_event_t *) malloc(sizeof(kbd_event_t));
-        if (event == NULL)
-                return;
-        
-        link_initialize(&event->link);
-        event->type = kbd_event.type;
-        event->key = kbd_event.key;
-        event->mods = kbd_event.mods;
-        event->c = kbd_event.c;
-        
-        prodcons_produce(&term->input_pc, &event->link);
-}
-
-static void terminal_handle_position_event(widget_t *widget, pos_event_t event)
-{
-        /*
-         * Mouse events are ignored so far.
-         * There is no consumer for it.
-         */
+        cons_event_t event;
+        
+        event.type = CEV_KEY;
+        event.ev.key = kbd_event;
+        
+        terminal_queue_cons_event(term, &event);
+}
+
+static void terminal_handle_position_event(widget_t *widget, pos_event_t pos_event)
+{
+        cons_event_t event;
+        terminal_t *term = (terminal_t *) widget;
+        sysarg_t sx = term->widget.hpos;
+        sysarg_t sy = term->widget.vpos;
+
+        if (pos_event.type == POS_PRESS) {
+                event.type = CEV_POS;
+                event.ev.pos.type = pos_event.type;
+                event.ev.pos.pos_id = pos_event.pos_id;
+                event.ev.pos.btn_num = pos_event.btn_num;
+
+                event.ev.pos.hpos = (pos_event.hpos - sx) / FONT_WIDTH;
+                event.ev.pos.vpos = (pos_event.vpos - sy) / FONT_SCANLINES;
+                terminal_queue_cons_event(term, &event);
+        }
 }