Changeset 03f0b02 in mainline

Timestamp:

2012-11-19T20:22:56Z (11 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8e6ec6e

Parents:

a7f7ed12

Message:

Resolved Ticket #478 (Single-pixel line not redrawn in vterm).

File:

• uspace/srv/hid/compositor/compositor.c (modified) (1 diff)

uspace/srv/hid/compositor/compositor.c

@@ -267 +267 @@
     sysarg_t *x_out, sysarg_t *y_out, sysarg_t *w_out, sysarg_t *h_out)
 {
-        sysarg_t x[4];
-        sysarg_t y[4];
-        comp_coord_from_client(x_in, y_in, win_trans, &x[0], &y[0]);
-        comp_coord_from_client(x_in + w_in, y_in, win_trans, &x[1], &y[1]);
-        comp_coord_from_client(x_in + w_in, y_in + h_in, win_trans, &x[2], &y[2]);
-        comp_coord_from_client(x_in, y_in + h_in, win_trans, &x[3], &y[3]);
-        (*x_out) = x[0];
-        (*y_out) = y[0];
-        (*w_out) = x[0];
-        (*h_out) = y[0];
-        for (int i = 1; i < 4; ++i) {
-                (*x_out) = (x[i] < (*x_out)) ? x[i] : (*x_out);
-                (*y_out) = (y[i] < (*y_out)) ? y[i] : (*y_out);
-                (*w_out) = (x[i] > (*w_out)) ? x[i] : (*w_out);
-                (*h_out) = (y[i] > (*h_out)) ? y[i] : (*h_out);
-        }
-        (*w_out) -= (*x_out);
-        (*h_out) -= (*y_out);
+        if (w_in > 0 && h_in > 0) {
+                sysarg_t x[4];
+                sysarg_t y[4];
+                comp_coord_from_client(x_in, y_in, win_trans, &x[0], &y[0]);
+                comp_coord_from_client(x_in + w_in - 1, y_in, win_trans, &x[1], &y[1]);
+                comp_coord_from_client(x_in + w_in - 1, y_in + h_in - 1, win_trans, &x[2], &y[2]);
+                comp_coord_from_client(x_in, y_in + h_in - 1, win_trans, &x[3], &y[3]);
+                (*x_out) = x[0];
+                (*y_out) = y[0];
+                (*w_out) = x[0];
+                (*h_out) = y[0];
+                for (int i = 1; i < 4; ++i) {
+                        (*x_out) = (x[i] < (*x_out)) ? x[i] : (*x_out);
+                        (*y_out) = (y[i] < (*y_out)) ? y[i] : (*y_out);
+                        (*w_out) = (x[i] > (*w_out)) ? x[i] : (*w_out);
+                        (*h_out) = (y[i] > (*h_out)) ? y[i] : (*h_out);
+                }
+                (*w_out) = (*w_out) - (*x_out) + 1;
+                (*h_out) = (*h_out) - (*y_out) + 1;
+        } else {
+                (*w_out) = 0;
+                (*h_out) = 0;
+        }
 }