Changeset e80d8f8 in mainline

Timestamp:

2012-11-30T05:15:11Z (11 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

3e6a98c5

Parents:

69c1995

Message:

Avoid underflow in calculation of damage region position.

File:

• uspace/srv/hid/compositor/compositor.c (modified) (5 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -266 +266 @@
 }
 
-static void comp_coord_from_client(sysarg_t x_in, sysarg_t y_in, transform_t win_trans,
+static void comp_coord_from_client(double x_in, double y_in, transform_t win_trans,
     sysarg_t *x_out, sysarg_t *y_out)
 {
@@ -279 +279 @@
 }
 
-static void comp_coord_bounding_rect(sysarg_t x_in, sysarg_t y_in,
-    sysarg_t w_in, sysarg_t h_in, transform_t win_trans,
+static void comp_coord_bounding_rect(double x_in, double y_in,
+    double w_in, double h_in, transform_t win_trans,
     sysarg_t *x_out, sysarg_t *y_out, sysarg_t *w_out, sysarg_t *h_out)
 {
@@ -303 +303 @@
                 (*h_out) = (*h_out) - (*y_out) + 1;
         } else {
+                (*x_out) = 0;
+                (*y_out) = 0;
                 (*w_out) = 0;
                 (*h_out) = 0;
@@ -547 +549 @@
 static void comp_window_damage(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
 {
-        sysarg_t x = IPC_GET_ARG1(*icall);
-        sysarg_t y = IPC_GET_ARG2(*icall);
-        sysarg_t width = IPC_GET_ARG3(*icall);
-        sysarg_t height = IPC_GET_ARG4(*icall);
+        double x = IPC_GET_ARG1(*icall);
+        double y = IPC_GET_ARG2(*icall);
+        double width = IPC_GET_ARG3(*icall);
+        double height = IPC_GET_ARG4(*icall);
 
         if (width == 0 || height == 0) {
@@ -556 +558 @@
         } else {
                 fibril_mutex_lock(&window_list_mtx);
+                sysarg_t x_dmg_glob, y_dmg_glob, w_dmg_glob, h_dmg_glob;
                 comp_coord_bounding_rect(x - 1, y - 1, width + 2, height + 2,
-                    win->transform, &x, &y, &width, &height);
+                    win->transform, &x_dmg_glob, &y_dmg_glob, &w_dmg_glob, &h_dmg_glob);
                 fibril_mutex_unlock(&window_list_mtx);
-                comp_damage(x, y, width, height);
+                comp_damage(x_dmg_glob, y_dmg_glob, w_dmg_glob, h_dmg_glob);
         }