Changeset 2d879f7 in mainline for uspace/lib/ui/src

Timestamp:

2020-11-26T11:59:59Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

554a5f1

Parents:

d8ddf7a

git-author:

Jiri Svoboda <jiri@…> (2020-11-25 18:46:07)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-26 11:59:59)

Message:

Basic support for window resizing

Location:

uspace/lib/ui/src

Files:

• wdecor.c (modified) (6 diffs)
• window.c (modified) (10 diffs)

uspace/lib/ui/src/wdecor.c

@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -54 +55 @@
 };
 
+enum {
+        wdecor_corner_w = 24,
+        wdecor_corner_h = 24,
+        wdecor_edge_w = 4,
+        wdecor_edge_h = 4
+};
+
 /** Create new window decoration.
  *
  * @param resource UI resource
  * @param caption Window caption
+ * @param style Style
  * @param rwdecor Place to store pointer to new window decoration
  * @return EOK on success, ENOMEM if out of memory
  */
 errno_t ui_wdecor_create(ui_resource_t *resource, const char *caption,
-    ui_wdecor_t **rwdecor)
+    ui_wdecor_style_t style, ui_wdecor_t **rwdecor)
 {
         ui_wdecor_t *wdecor;
@@ -89 +98 @@
         wdecor->res = resource;
         wdecor->active = true;
+        wdecor->style = style;
         *rwdecor = wdecor;
         return EOK;
@@ -244 +254 @@
 }
 
+/** Send decoration resize event.
+ *
+ * @param wdecor Window decoration
+ * @param rsztype Resize type
+ * @param pos Position where the button was pressed
+ */
+void ui_wdecor_resize(ui_wdecor_t *wdecor, ui_wdecor_rsztype_t rsztype,
+    gfx_coord2_t *pos)
+{
+        if (wdecor->cb != NULL && wdecor->cb->resize != NULL)
+                wdecor->cb->resize(wdecor, wdecor->arg, rsztype, pos);
+}
+
+/** Send cursor change event.
+ *
+ * @param wdecor Window decoration
+ * @param cursor Cursor
+ */
+void ui_wdecor_set_cursor(ui_wdecor_t *wdecor, ui_stock_cursor_t cursor)
+{
+        if (wdecor->cb != NULL && wdecor->cb->set_cursor != NULL)
+                wdecor->cb->set_cursor(wdecor, wdecor->arg, cursor);
+}
+
 /** Get window decoration geometry.
  *
@@ -287 +321 @@
 }
 
+/** Get resize type for pointer at the specified position.
+ *
+ * @param wdecor Window decoration
+ * @param pos Pointer position
+ * @return Resize type
+ */
+ui_wdecor_rsztype_t ui_wdecor_get_rsztype(ui_wdecor_t *wdecor,
+    gfx_coord2_t *pos)
+{
+        bool eleft, eright;
+        bool etop, ebottom;
+        bool edge;
+        bool cleft, cright;
+        bool ctop, cbottom;
+
+        /* Window not resizable? */
+        if ((wdecor->style & ui_wds_resizable) == 0)
+                return ui_wr_none;
+
+        /* Position not inside window? */
+        if (!gfx_pix_inside_rect(pos, &wdecor->rect))
+                return ui_wr_none;
+
+        /* Position is within edge width from the outside */
+        eleft = (pos->x < wdecor->rect.p0.x + wdecor_edge_w);
+        eright = (pos->x >= wdecor->rect.p1.x - wdecor_edge_w);
+        etop = (pos->y < wdecor->rect.p0.y + wdecor_edge_h);
+        ebottom = (pos->y >= wdecor->rect.p1.y - wdecor_edge_h);
+
+        /* Position is on one of the four edges */
+        edge = eleft || eright || etop || ebottom;
+
+        /* Position is within resize-corner distance from the outside */
+        cleft = (pos->x < wdecor->rect.p0.x + wdecor_corner_w);
+        cright = (pos->x >= wdecor->rect.p1.x - wdecor_corner_w);
+        ctop = (pos->y < wdecor->rect.p0.y + wdecor_corner_h);
+        cbottom = (pos->y >= wdecor->rect.p1.y - wdecor_corner_h);
+
+        /* Top-left corner */
+        if (edge && cleft && ctop)
+                return ui_wr_top_left;
+
+        /* Top-right corner */
+        if (edge && cright && ctop)
+                return ui_wr_top_right;
+
+        /* Bottom-left corner */
+        if (edge && cleft && cbottom)
+                return ui_wr_bottom_left;
+
+        /* Bottom-right corner */
+        if (edge && cright && cbottom)
+                return ui_wr_bottom_right;
+
+        /* Left edge */
+        if (eleft)
+                return ui_wr_left;
+
+        /* Right edge */
+        if (eright)
+                return ui_wr_right;
+
+        /* Top edge */
+        if (etop)
+                return ui_wr_top;
+
+        /* Bottom edge */
+        if (ebottom)
+                return ui_wr_bottom;
+
+        return ui_wr_none;
+}
+
+/** Get stock cursor to use for the specified window resize type.
+ *
+ * The resize type must be valid, otherwise behavior is undefined.
+ *
+ * @param rsztype Resize type
+ * @return Cursor to use for this resize type
+ */
+ui_stock_cursor_t ui_wdecor_cursor_from_rsztype(ui_wdecor_rsztype_t rsztype)
+{
+        switch (rsztype) {
+        case ui_wr_none:
+                return ui_curs_arrow;
+
+        case ui_wr_top:
+        case ui_wr_bottom:
+                return ui_curs_size_ud;
+
+        case ui_wr_left:
+        case ui_wr_right:
+                return ui_curs_size_lr;
+
+        case ui_wr_top_left:
+        case ui_wr_bottom_right:
+                return ui_curs_size_uldr;
+
+        case ui_wr_top_right:
+        case ui_wr_bottom_left:
+                return ui_curs_size_urdl;
+
+        default:
+                assert(false);
+                return ui_curs_arrow;
+        }
+}
+
+/** Handle window frame position event.
+ *
+ * @param wdecor Window decoration
+ * @param pos_event Position event
+ */
+void ui_wdecor_frame_pos_event(ui_wdecor_t *wdecor, pos_event_t *event)
+{
+        gfx_coord2_t pos;
+        ui_wdecor_rsztype_t rsztype;
+        ui_stock_cursor_t cursor;
+
+        pos.x = event->hpos;
+        pos.y = event->vpos;
+
+        /* Set appropriate resizing cursor, or set arrow cursor */
+
+        rsztype = ui_wdecor_get_rsztype(wdecor, &pos);
+        cursor = ui_wdecor_cursor_from_rsztype(rsztype);
+
+        ui_wdecor_set_cursor(wdecor, cursor);
+
+        /* Press on window border? */
+        if (rsztype != ui_wr_none && event->type == POS_PRESS)
+                ui_wdecor_resize(wdecor, rsztype, &pos);
+}
+
 /** Handle window decoration position event.
  *
@@ -307 +475 @@
                 return;
 
+        ui_wdecor_frame_pos_event(wdecor, event);
+
         if (event->type == POS_PRESS &&
             gfx_pix_inside_rect(&pos, &geom.title_bar_rect))

uspace/lib/ui/src/window.c

@@ -59 +59 @@
 static void dwnd_kbd_event(void *, kbd_event_t *);
 static void dwnd_pos_event(void *, pos_event_t *);
+static void dwnd_resize_event(void *, gfx_rect_t *);
 static void dwnd_unfocus_event(void *);
 
@@ -66 +67 @@
         .kbd_event = dwnd_kbd_event,
         .pos_event = dwnd_pos_event,
+        .resize_event = dwnd_resize_event,
         .unfocus_event = dwnd_unfocus_event
 };
@@ -71 +73 @@
 static void wd_close(ui_wdecor_t *, void *);
 static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
+static void wd_resize(ui_wdecor_t *, void *, ui_wdecor_rsztype_t,
+    gfx_coord2_t *);
+static void wd_set_cursor(ui_wdecor_t *, void *, ui_stock_cursor_t);
 
 static ui_wdecor_cb_t wdecor_cb = {
         .close = wd_close,
-        .move = wd_move
+        .move = wd_move,
+        .resize = wd_resize,
+        .set_cursor = wd_set_cursor
 };
 
@@ -118 +125 @@
         display_wnd_params_init(&dparams);
         dparams.rect = params->rect;
+        /* Only allow making the window larger */
+        gfx_rect_dims(&params->rect, &dparams.min_size);
 
         if (ui->display != NULL) {
@@ -175 +184 @@
                 goto error;
 
-        rc = ui_wdecor_create(res, params->caption, &wdecor);
+        rc = ui_wdecor_create(res, params->caption, params->style, &wdecor);
         if (rc != EOK)
                 goto error;
@@ -185 +194 @@
         window->ui = ui;
         window->dwindow = dwindow;
+        window->rect = params->rect;
         window->gc = gc;
         window->res = res;
         window->wdecor = wdecor;
+        window->cursor = ui_curs_arrow;
         *rwindow = window;
         return EOK;
@@ -435 +446 @@
 }
 
+/** Handle window resize event */
+static void dwnd_resize_event(void *arg, gfx_rect_t *rect)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        /* Make sure we don't process events until fully initialized */
+        if (window->wdecor == NULL)
+                return;
+
+        if ((window->wdecor->style & ui_wds_resizable) == 0)
+                return;
+
+        (void) ui_window_resize(window, rect);
+        (void) ui_window_paint(window);
+}
+
 /** Handle window unfocus event. */
 static void dwnd_unfocus_event(void *arg)
@@ -451 +478 @@
  *
  * @param wdecor Window decoration
- * @param arg Argument (demo)
+ * @param arg Argument (window)
  */
 static void wd_close(ui_wdecor_t *wdecor, void *arg)
@@ -463 +490 @@
  *
  * @param wdecor Window decoration
- * @param arg Argument (demo)
+ * @param arg Argument (window)
  * @param pos Position where the title bar was pressed
  */
@@ -471 +498 @@
 
         (void) display_window_move_req(window->dwindow, pos);
+}
+
+/** Window decoration requested window resize.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param rsztype Resize type
+ * @param pos Position where the button was pressed
+ */
+static void wd_resize(ui_wdecor_t *wdecor, void *arg,
+    ui_wdecor_rsztype_t rsztype, gfx_coord2_t *pos)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        (void) display_window_resize_req(window->dwindow, rsztype, pos);
+}
+
+/** Window decoration requested changing cursor.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param cursor Cursor to set
+ */
+static void wd_set_cursor(ui_wdecor_t *wdecor, void *arg,
+    ui_stock_cursor_t cursor)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+        display_stock_cursor_t dcursor;
+
+        if (cursor == window->cursor)
+                return;
+
+        dcursor = dcurs_arrow;
+
+        switch (cursor) {
+        case ui_curs_arrow:
+                dcursor = dcurs_arrow;
+                break;
+        case ui_curs_size_ud:
+                dcursor = dcurs_size_ud;
+                break;
+        case ui_curs_size_lr:
+                dcursor = dcurs_size_lr;
+                break;
+        case ui_curs_size_uldr:
+                dcursor = dcurs_size_uldr;
+                break;
+        case ui_curs_size_urdl:
+                dcursor = dcurs_size_urdl;
+                break;
+        }
+
+        (void) display_window_set_cursor(window->dwindow, dcursor);
+        window->cursor = cursor;
 }