Changes in uspace/srv/hid/display/window.c [ededdc4:5877de74] in mainline

File:

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

uspace/srv/hid/display/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +44 @@
 #include <memgfx/memgc.h>
 #include <stdlib.h>
-#include <str.h>
-#include <wndmgt.h>
 #include "client.h"
 #include "display.h"
 #include "seat.h"
 #include "window.h"
-#include "wmclient.h"
 
 static void ds_window_invalidate_cb(void *, gfx_rect_t *);
@@ -67 +64 @@
  * @param client Client owning the window
  * @param params Window parameters
- * @param rwnd Place to store pointer to new window.
+ * @param rgc Place to store pointer to new GC.
  *
  * @return EOK on success or an error code
  */
 errno_t ds_window_create(ds_client_t *client, display_wnd_params_t *params,
-    ds_window_t **rwnd)
+    ds_window_t **rgc)
 {
         ds_window_t *wnd = NULL;
@@ -84 +81 @@
         wnd = calloc(1, sizeof(ds_window_t));
         if (wnd == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        wnd->caption = str_dup(params->caption);
-        if (wnd->caption == NULL) {
                 rc = ENOMEM;
                 goto error;
@@ -142 +133 @@
         }
 
-        // TODO Multi-seat: which seat should own the new window?
         seat = ds_display_first_seat(client->display);
 
@@ -150 +140 @@
                 ds_seat_set_focus(seat, wnd);
 
-        if ((params->flags & wndf_avoid) != 0)
-                ds_display_update_max_rect(wnd->display);
-
         (void) ds_display_paint(wnd->display, NULL);
 
-        *rwnd = wnd;
+        *rgc = wnd;
         return EOK;
 error:
@@ -165 +152 @@
                 if (wnd->bitmap != NULL)
                         gfx_bitmap_destroy(wnd->bitmap);
-                if (wnd->caption != NULL)
-                        free(wnd->caption);
                 free(wnd);
         }
@@ -182 +167 @@
 
         disp = wnd->display;
-
-        ds_window_unfocus(wnd);
 
         ds_client_remove_window(wnd);
         ds_display_remove_window(wnd);
 
-        if ((wnd->flags & wndf_avoid) != 0)
-                ds_display_update_max_rect(disp);
-
         mem_gc_delete(wnd->mgc);
 
@@ -196 +176 @@
                 gfx_bitmap_destroy(wnd->bitmap);
 
-        free(wnd->caption);
         free(wnd);
 
@@ -208 +187 @@
 void ds_window_bring_to_top(ds_window_t *wnd)
 {
-        ds_display_window_to_top(wnd);
+        ds_display_t *disp = wnd->display;
+
+        ds_display_remove_window(wnd);
+        ds_display_add_window(disp, wnd);
         (void) ds_display_paint(wnd->display, NULL);
 }
@@ -220 +202 @@
 {
         return wnd->gc;
-}
-
-/** Determine if window is visible.
- *
- * @param wnd Window
- * @return @c true iff window is visible
- */
-bool ds_window_is_visible(ds_window_t *wnd)
-{
-        return (wnd->flags & wndf_minimized) == 0;
 }
 
@@ -244 +216 @@
         gfx_rect_t crect;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "ds_window_paint");
-
-        /* Skip painting the window if not visible */
-        if (!ds_window_is_visible(wnd))
-                return EOK;
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_paint");
 
         if (rect != NULL) {
@@ -393 +361 @@
         bool newr;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "ds_window_repaint_preview");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_repaint_preview");
 
         /*
@@ -491 +459 @@
         gfx_rect_t old_rect;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "ds_window_update_move (%d, %d)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_update_move (%d, %d)",
             (int) pos->x, (int) pos->y);
 
@@ -528 +496 @@
         wnd->preview_rect = wnd->rect;
 
-        // TODO Multi-seat: need client to tell us which seat started the resize!
+        // XXX Need client to tell us which seat started the resize!
         seat = ds_display_first_seat(wnd->display);
         ctype = display_cursor_from_wrsz(rsztype);
@@ -559 +527 @@
         ds_client_post_resize_event(wnd->client, wnd, &nrect);
 
-        // TODO Multi-seat: Need to know which seat started the resize!
+        // XXX Need to know which seat started the resize!
         seat = ds_display_first_seat(wnd->display);
         ds_seat_set_wm_cursor(seat, NULL);
@@ -577 +545 @@
         gfx_rect_t old_rect;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "ds_window_update_resize (%d, %d)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_update_resize (%d, %d)",
             (int) pos->x, (int) pos->y);
 
@@ -626 +594 @@
         bool inside;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG2,
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
             "ds_window_post_pos_event type=%d pos=%d,%d", event->type,
             (int) event->hpos, (int) event->vpos);
@@ -680 +648 @@
 errno_t ds_window_post_focus_event(ds_window_t *wnd)
 {
-        errno_t rc;
-        ds_wmclient_t *wmclient;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_post_focus_event");
 
-        rc = ds_client_post_focus_event(wnd->client, wnd);
-        if (rc != EOK)
-                return rc;
-
-        /* Increase focus counter */
-        ++wnd->nfocus;
-
-        /* Notify window managers about window information change */
-        wmclient = ds_display_first_wmclient(wnd->display);
-        while (wmclient != NULL) {
-                ds_wmclient_post_wnd_changed_event(wmclient, wnd->id);
-                wmclient = ds_display_next_wmclient(wmclient);
-        }
-
-        return EOK;
+        return ds_client_post_focus_event(wnd->client, wnd);
 }
 
@@ -709 +660 @@
 errno_t ds_window_post_unfocus_event(ds_window_t *wnd)
 {
-        errno_t rc;
-        ds_wmclient_t *wmclient;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_post_unfocus_event");
 
-        rc = ds_client_post_unfocus_event(wnd->client, wnd);
-        if (rc != EOK)
-                return rc;
-
-        /* Decrease focus counter */
-        --wnd->nfocus;
-
-        /* Notify window managers about window information change */
-        wmclient = ds_display_first_wmclient(wnd->display);
-        while (wmclient != NULL) {
-                ds_wmclient_post_wnd_changed_event(wmclient, wnd->id);
-                wmclient = ds_display_next_wmclient(wmclient);
-        }
-
-        return EOK;
+        return ds_client_post_unfocus_event(wnd->client, wnd);
 }
 
@@ -774 +708 @@
 void ds_window_get_max_rect(ds_window_t *wnd, gfx_rect_t *rect)
 {
-        *rect = wnd->display->max_rect;
+        *rect = wnd->display->rect;
 }
 
@@ -851 +785 @@
         wnd->rect = *nrect;
 
-        if ((wnd->flags & wndf_avoid) != 0)
-                ds_display_update_max_rect(wnd->display);
-
-        (void) ds_display_paint(wnd->display, NULL);
-        return EOK;
-}
-
-/** Minimize window.
- *
- * @param wnd Window
- * @return EOK on success or an error code
- */
-errno_t ds_window_minimize(ds_window_t *wnd)
-{
-        /* If already minimized, do nothing and return success. */
-        if ((wnd->flags & wndf_minimized) != 0)
-                return EOK;
-
-        ds_window_unfocus(wnd);
-
-        wnd->flags |= wndf_minimized;
-        (void) ds_display_paint(wnd->display, NULL);
-        return EOK;
-}
-
-/** Unminimize window.
- *
- * @param wnd Window
- * @return EOK on success or an error code
- */
-errno_t ds_window_unminimize(ds_window_t *wnd)
-{
-        /* If not minimized, do nothing and return success. */
-        if ((wnd->flags & wndf_minimized) == 0)
-                return EOK;
-
-        wnd->flags &= ~wndf_minimized;
         (void) ds_display_paint(wnd->display, NULL);
         return EOK;
@@ -1005 +902 @@
  *
  * @param wnd Window
- * @param cursor New cursor
  * @return EOK on success, EINVAL if @a cursor is invalid
  */
@@ -1019 +915 @@
 }
 
-/** Set window caption.
- *
- * @param wnd Window
- * @param caption New caption
- *
- * @return EOK on success, EINVAL if @a cursor is invalid
- */
-errno_t ds_window_set_caption(ds_window_t *wnd, const char *caption)
-{
-        char *dcaption;
-        ds_wmclient_t *wmclient;
-
-        dcaption = str_dup(caption);
-        if (dcaption == NULL)
-                return ENOMEM;
-
-        free(wnd->caption);
-        wnd->caption = dcaption;
-
-        /* Notify window managers about window information change */
-        wmclient = ds_display_first_wmclient(wnd->display);
-        while (wmclient != NULL) {
-                ds_wmclient_post_wnd_changed_event(wmclient, wnd->id);
-                wmclient = ds_display_next_wmclient(wmclient);
-        }
-
-        return EOK;
-}
-
-/** Find alternate window with the allowed flags.
- *
- * An alternate window is a *different* window that is preferably previous
- * in the display order and only has the @a allowed flags.
- *
- * @param wnd Window
- * @param allowed_flags Bitmask of flags that the window is allowed to have
- *
- * @return Alternate window matching the criteria or @c NULL if there is none
- */
-ds_window_t *ds_window_find_alt(ds_window_t *wnd,
-    display_wnd_flags_t allowed_flags)
-{
-        ds_window_t *nwnd;
-
-        /* Try preceding windows in display order */
-        nwnd = ds_display_prev_window(wnd);
-        while (nwnd != NULL && (nwnd->flags & ~allowed_flags) != 0) {
-                nwnd = ds_display_prev_window(nwnd);
-        }
-
-        /* Do we already have a matching window? */
-        if (nwnd != NULL && (nwnd->flags & ~allowed_flags) == 0) {
-                return nwnd;
-        }
-
-        /* Try succeeding windows in display order */
-        nwnd = ds_display_last_window(wnd->display);
-        while (nwnd != NULL && nwnd != wnd &&
-            (nwnd->flags & ~allowed_flags) != 0) {
-                nwnd = ds_display_prev_window(nwnd);
-        }
-
-        if (nwnd == wnd)
-                return NULL;
-
-        return nwnd;
-}
-
-/** Remove focus from window.
- *
- * Used to switch focus to another window when closing or minimizing window.
- *
- * @param wnd Window
- */
-void ds_window_unfocus(ds_window_t *wnd)
-{
-        ds_seat_t *seat;
-
-        /* Make sure window is no longer focused in any seat */
-        seat = ds_display_first_seat(wnd->display);
-        while (seat != NULL) {
-                ds_seat_unfocus_wnd(seat, wnd);
-                seat = ds_display_next_seat(seat);
-        }
-}
-
 /** Window memory GC invalidate callback.
  *