Changeset f1d6866 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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 changes

File:

• uspace/srv/hid/console/console.c (modified) (4 diffs)

uspace/srv/hid/console/console.c

@@ -60 +60 @@
 #define CONSOLE_MARGIN  12
 
-#define STATE_START   110
+#define STATE_START   100
 #define STATE_TOP     8
 #define STATE_SPACE   4
@@ -368 +368 @@
 static console_t *cons_find_icon(sysarg_t x, sysarg_t y)
 {
-        sysarg_t status_start = STATE_START + (xres - 800) / 2;
+        sysarg_t status_start =
+            STATE_START + (xres - 800) / 2 + CONSOLE_MARGIN;
         
         if ((y < STATE_TOP) || (y >= STATE_TOP + STATE_HEIGHT))
@@ -379 +380 @@
                 return NULL;
         
-        if (((x - status_start) % (STATE_WIDTH + STATE_SPACE)) < STATE_SPACE)
+        if (((x - status_start) % (STATE_WIDTH + STATE_SPACE)) >= STATE_WIDTH)
                 return NULL;
         
@@ -894 +895 @@
         fb_vp_get_caps(fb_sess, console_vp, &ccaps);
         
+        mouse.x = xres / 2;
+        mouse.y = yres / 2;
         mouse.pressed = false;