Changeset 3249673 in mainline

Timestamp:

2010-08-29T19:41:31Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

20235a3, 7431b665

Parents:

df908b3 (diff), 5b8b66c (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 two fixes for a fb crash when mouse was moved early in the boot process.

Location:

uspace/srv/hid

Files:

• console/gcons.c (modified) (1 diff)
• fb/fb.c (modified) (1 diff)

uspace/srv/hid/console/gcons.c

@@ -286 +286 @@
         ssize_t nx = (ssize_t) mouse_x + dx;
         ssize_t ny = (ssize_t) mouse_y + dy;
+
+        if (!use_gcons)
+                return;
         
         mouse_x = (size_t) limit(nx, 0, xres);

uspace/srv/hid/fb/fb.c

@@ -1347 +1347 @@
 {
         mouse_hide();
-        pointer_x = x;
-        pointer_y = y;
+        pointer_x = x % screen.xres;
+        pointer_y = y % screen.yres;
         mouse_show();
 }