Changeset 5f483be in mainline for uspace/srv/hid/display/window.c

Timestamp:

2020-05-24T20:38:57Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8e2485

Parents:

b3b00b6

Message:

Do not deliver events that triggered WM actions to the client

This could cause e.g. false button press.

File:

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

uspace/srv/hid/display/window.c

@@ -471 +471 @@
             (int) pos->x, (int) pos->y);
 
-        if (wnd->state != dsw_moving)
-                return;
+        assert(wnd->state == dsw_moving);
 
         gfx_coord2_subtract(pos, &wnd->orig_pos, &dmove);
@@ -500 +499 @@
             (int) pos->x, (int) pos->y);
 
-        if (wnd->state != dsw_moving)
-                return;
+        assert(wnd->state == dsw_moving);
 
         gfx_rect_translate(&wnd->preview_pos, &wnd->rect, &drect);
@@ -569 +567 @@
             (int) pos->x, (int) pos->y);
 
-        if (wnd->state != dsw_resizing)
-                return;
+        assert(wnd->state == dsw_resizing);
 
         (void) ds_display_paint(wnd->display, NULL);
@@ -604 +601 @@
             (int) pos->x, (int) pos->y);
 
-        if (wnd->state != dsw_resizing)
-                return;
+        assert(wnd->state == dsw_resizing);
 
         gfx_rect_translate(&wnd->dpos, &wnd->preview_rect, &drect);
@@ -672 +668 @@
         inside = gfx_pix_inside_rect(&pos, &drect);
 
-        if (event->type == POS_PRESS && event->btn_num == 2 && inside)
+        if (event->type == POS_PRESS && event->btn_num == 2 && inside) {
                 ds_window_start_move(wnd, &pos);
+                return EOK;
+        }
 
         if (event->type == POS_RELEASE) {
-                ds_window_finish_move(wnd, &pos);
-                ds_window_finish_resize(wnd, &pos);
+                if (wnd->state == dsw_moving) {
+                        ds_window_finish_move(wnd, &pos);
+                        return EOK;
+                }
+
+                if (wnd->state == dsw_resizing) {
+                        ds_window_finish_resize(wnd, &pos);
+                        return EOK;
+                }
         }
 
         if (event->type == POS_UPDATE) {
-                ds_window_update_move(wnd, &pos);
-                ds_window_update_resize(wnd, &pos);
+                if (wnd->state == dsw_moving) {
+                        ds_window_update_move(wnd, &pos);
+                        return EOK;
+                }
+
+                if (wnd->state == dsw_resizing) {
+                        ds_window_update_resize(wnd, &pos);
+                        return EOK;
+                }
         }