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

Timestamp:

2020-03-05T11:23:41Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1e4a937

Parents:

338d0935

git-author:

Jiri Svoboda <jiri@…> (2020-03-04 19:23:29)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-05 11:23:41)

Message:

Move windows by dragging decoration

Or dragging anywhere with button 2. Need to add Ctrl/Alt/Shift state
to pos_event_t and change the latter to Alt-drag/Shift-drag.

File:

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

uspace/srv/hid/display/window.c

@@ -436 +436 @@
 }
 
+/** Start moving a window, detected by client.
+ *
+ * @param wnd Window
+ * @param pos Position where the pointer was when the move started
+ *            relative to the window
+ * @param event Button press event
+ */
+void ds_window_move_req(ds_window_t *wnd, gfx_coord2_t *pos)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_move_req (%d, %d)",
+            (int) pos->x, (int) pos->y);
+
+        if (wnd->state != dsw_idle)
+                return;
+
+        gfx_coord2_add(&wnd->dpos, pos, &wnd->orig_pos);
+        wnd->state = dsw_moving;
+}
+
 /** Start moving a window by mouse drag.
  *
@@ -446 +465 @@
             (int) event->hpos, (int) event->vpos);
 
-        assert(wnd->state == dsw_idle);
+        if (wnd->state != dsw_idle)
+                return;
 
         wnd->orig_pos.x = event->hpos;
@@ -467 +487 @@
             (int) event->hpos, (int) event->vpos);
 
-        assert(wnd->state == dsw_moving);
+        if (wnd->state != dsw_moving)
+                return;
+
         pos.x = event->hpos;
         pos.y = event->vpos;
@@ -497 +519 @@
             (int) event->hpos, (int) event->vpos);
 
+        if (wnd->state != dsw_moving)
+                return;
+
         gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
 
@@ -505 +530 @@
         }
 
-        assert(wnd->state == dsw_moving);
         pos.x = event->hpos;
         pos.y = event->vpos;
@@ -559 +583 @@
 {
         pos_event_t tevent;
+        gfx_coord2_t pos;
+        gfx_rect_t drect;
+        bool inside;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG,
@@ -564 +591 @@
             (int) event->hpos, (int) event->vpos);
 
-        if (event->type == POS_PRESS) {
-                if (wnd->state == dsw_idle)
-                        ds_window_start_move(wnd, event);
-        }
-
-        if (event->type == POS_RELEASE) {
-                if (wnd->state == dsw_moving)
-                        ds_window_finish_move(wnd, event);
-        }
-
-        if (event->type == POS_UPDATE) {
-                if (wnd->state == dsw_moving)
-                        ds_window_update_move(wnd, event);
-        }
+        pos.x = event->hpos;
+        pos.y = event->vpos;
+        gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
+        inside = gfx_pix_inside_rect(&pos, &drect);
+
+        if (event->type == POS_PRESS && event->btn_num == 2 && inside)
+                ds_window_start_move(wnd, event);
+
+        if (event->type == POS_RELEASE)
+                ds_window_finish_move(wnd, event);
+
+        if (event->type == POS_UPDATE)
+                ds_window_update_move(wnd, event);
 
         /* Transform event coordinates to window-local */