Changeset e022819 in mainline for uspace/lib

Timestamp:

2020-03-14T00:30:53Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

03c8081

Parents:

1e4a937

Message:

Resizing windows

Location:

uspace/lib

Files:

• display/include/types/display.h (modified) (1 diff)
• display/include/types/display/event.h (modified) (3 diffs)
• display/src/display.c (modified) (1 diff)
• gui/window.c (modified) (5 diffs)

uspace/lib/display/include/types/display.h

@@ -70 +70 @@
         /** Position event */
         void (*pos_event)(void *, pos_event_t *);
+        /** Resize event */
+        void (*resize_event)(void *, gfx_rect_t *);
         /** Unfocus event */
         void (*unfocus_event)(void *);

uspace/lib/display/include/types/display/event.h

@@ -36 +36 @@
 #define _LIBDISPLAY_TYPES_DISPLAY_EVENT_H_
 
+#include <gfx/coord.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
@@ -49 +50 @@
         /** Position event */
         wev_pos,
+        /** Resize event */
+        wev_resize,
         /** Window lost focus */
         wev_unfocus
 } display_wnd_ev_type_t;
+
+/** Display window resize event */
+typedef struct {
+        gfx_rect_t rect;
+} display_wnd_resize_ev_t;
 
 /** Display window event */
@@ -62 +70 @@
                 /** Position event data */
                 pos_event_t pos;
+                /** Resize event data */
+                display_wnd_resize_ev_t resize;
         } ev;
 } display_wnd_ev_t;

uspace/lib/display/src/display.c

@@ -460 +460 @@
                         }
                         break;
+                case wev_resize:
+                        if (window->cb != NULL && window->cb->resize_event != NULL) {
+                                window->cb->resize_event(window->cb_arg,
+                                    &event.ev.resize.rect);
+                        }
+                        break;
                 case wev_unfocus:
                         if (window->cb != NULL && window->cb->unfocus_event != NULL) {

uspace/lib/gui/window.c

@@ -87 +87 @@
 static void window_kbd_event(void *, kbd_event_t *);
 static void window_pos_event(void *, pos_event_t *);
+static void window_resize_event(void *, gfx_rect_t *);
 static void window_unfocus_event(void *);
 
@@ -94 +95 @@
         .kbd_event = window_kbd_event,
         .pos_event = window_pos_event,
+        .resize_event = window_resize_event,
         .unfocus_event = window_unfocus_event
 };
@@ -313 +315 @@
                 } else if (left && btn_left) {
                         (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_bottom, &pos);
+                            display_wr_left, &pos);
                 } else if (bottom && btn_left) {
                         (void) display_window_resize_req(widget->window->dwindow,
@@ -319 +321 @@
                 } else if (right && btn_left) {
                         (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_bottom, &pos);
+                            display_wr_right, &pos);
                 } else if (close && btn_left) {
                         window_close(widget->window);
@@ -815 +817 @@
 }
 
+static void window_resize_event(void *arg, gfx_rect_t *nrect)
+{
+        window_t *win = (window_t *) arg;
+        window_event_t *event;
+
+        event = (window_event_t *) calloc(1, sizeof(window_event_t));
+        if (event == NULL)
+                return;
+
+        link_initialize(&event->link);
+        event->type = ET_WINDOW_RESIZE;
+        event->data.resize.offset_x = nrect->p0.x;
+        event->data.resize.offset_y = nrect->p0.y;
+        event->data.resize.width = nrect->p1.x - nrect->p0.x;
+        event->data.resize.height = nrect->p1.y - nrect->p0.y;
+        event->data.resize.placement_flags = WINDOW_PLACEMENT_ANY;
+        prodcons_produce(&win->events, &event->link);
+}
+
 static void window_unfocus_event(void *arg)
 {