Changes in uspace/srv/hid/display/window.c [2e0a2e7:1215db9] in mainline

File:

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

uspace/srv/hid/display/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 #include "window.h"
 
-static void ds_window_update_cb(void *, gfx_rect_t *);
+static void ds_window_invalidate_cb(void *, gfx_rect_t *);
+static void ds_window_update_cb(void *);
 static void ds_window_get_preview_rect(ds_window_t *, gfx_rect_t *);
+
+static mem_gc_cb_t ds_window_mem_gc_cb = {
+        .invalidate = ds_window_invalidate_cb,
+        .update = ds_window_update_cb
+};
 
 /** Create window.
@@ -66 +72 @@
 {
         ds_window_t *wnd = NULL;
+        ds_seat_t *seat;
         gfx_context_t *dgc;
         gfx_coord2_t dims;
@@ -106 +113 @@
         }
 
-        rc = mem_gc_create(&params->rect, &alloc, ds_window_update_cb,
+        rc = mem_gc_create(&params->rect, &alloc, &ds_window_mem_gc_cb,
             (void *)wnd, &wnd->mgc);
         if (rc != EOK)
@@ -115 +122 @@
         wnd->gc = mem_gc_get_ctx(wnd->mgc);
         wnd->cursor = wnd->display->cursor[dcurs_arrow];
+        wnd->flags = params->flags;
+
+        if ((params->flags & wndf_setpos) != 0) {
+                /* Specific window position */
+                wnd->dpos = params->pos;
+        } else {
+                /* Automatic window placement */
+                wnd->dpos.x = ((wnd->id - 1) & 1) * 400;
+                wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300;
+        }
+
+        seat = ds_display_first_seat(client->display);
+
+        if ((params->flags & wndf_popup) != 0)
+                ds_seat_set_popup(seat, wnd);
+        else
+                ds_seat_set_focus(seat, wnd);
+
+        (void) ds_display_paint(wnd->display, NULL);
+
         *rgc = wnd;
         return EOK;
@@ -657 +684 @@
 }
 
+/** Get window position.
+ *
+ * @param wnd Window
+ */
+void ds_window_get_pos(ds_window_t *wnd, gfx_coord2_t *dpos)
+{
+        *dpos = wnd->dpos;
+}
+
 /** Start resizing a window, detected by client.
  *
@@ -789 +825 @@
 }
 
-/** Window memory GC update callback.
- *
- * This is called by the window's memory GC when a rectangle us updated.
- */
-static void ds_window_update_cb(void *arg, gfx_rect_t *rect)
+/** Window memory GC invalidate callback.
+ *
+ * This is called by the window's memory GC when a rectangle is modified.
+ */
+static void ds_window_invalidate_cb(void *arg, gfx_rect_t *rect)
 {
         ds_window_t *wnd = (ds_window_t *)arg;
@@ -806 +842 @@
 }
 
+/** Window memory GC update callback.
+ *
+ * This is called by the window's memory GC when it is to be updated.
+ */
+static void ds_window_update_cb(void *arg)
+{
+        ds_window_t *wnd = (ds_window_t *)arg;
+
+        (void) wnd;
+}
+
 /** @}
  */