Changeset 29a5a99 in mainline for uspace/srv/hid/display/display.c

Timestamp:

2022-12-04T10:42:48Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

14b4577

Parents:

795c6f7

Message:

Maximized windows should avoid task bar

File:

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

uspace/srv/hid/display/display.c

@@ -665 +665 @@
         }
 
+        ds_display_update_max_rect(disp);
+
         return EOK;
 error:
@@ -739 +741 @@
 }
 
+/** Update display maximize rectangle.
+ *
+ * Recalculate the maximize rectangle (the rectangle used for maximized
+ * windows).
+ *
+ * @param display Display
+ */
+void ds_display_update_max_rect(ds_display_t *display)
+{
+        ds_window_t *wnd;
+        gfx_rect_t max_rect;
+        gfx_rect_t drect;
+
+        /* Start with the entire display */
+        max_rect = display->rect;
+
+        wnd = ds_display_first_window(display);
+        while (wnd != NULL) {
+                /* Should maximized windows avoid this window? */
+                if ((wnd->flags & wndf_avoid) != 0) {
+                        /* Window bounding rectangle on display */
+                        gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
+
+                        /* Crop maximized rectangle */
+                        ds_display_crop_max_rect(&drect, &max_rect);
+                }
+
+                wnd = ds_display_next_window(wnd);
+        }
+
+        /* Update the maximize rectangle */
+        display->max_rect = max_rect;
+}
+
+/** Crop maximize rectangle.
+ *
+ * Use the avoid rectangle @a arect to crop off maximization rectangle
+ * @a mrect. If @a arect covers the top, bottom, left or right part
+ * of @a mrect, it will be cropped off. Otherwise there will be
+ * no effect.
+ *
+ * @param arect Avoid rectangle
+ * @param mrect Maximize rectangle to be modified
+ */
+void ds_display_crop_max_rect(gfx_rect_t *arect, gfx_rect_t *mrect)
+{
+        if (arect->p0.x == mrect->p0.x && arect->p0.y == mrect->p0.y &&
+            arect->p1.x == mrect->p1.x) {
+                /* Cropp off top part */
+                mrect->p0.y = arect->p1.y;
+        } else if (arect->p0.x == mrect->p0.x && arect->p1.x == mrect->p1.x &&
+            arect->p1.y == mrect->p1.y) {
+                /* Cropp off bottom part */
+                mrect->p1.y = arect->p0.y;
+        } else if (arect->p0.x == mrect->p0.x && arect->p0.y == mrect->p0.y &&
+            arect->p1.y == mrect->p1.y) {
+                /* Cropp off left part */
+                mrect->p0.x = arect->p1.x;
+        } else if (arect->p0.y == mrect->p0.y && arect->p1.x == mrect->p1.x &&
+            arect->p1.y == mrect->p1.y) {
+                /* Cropp off right part */
+                mrect->p1.x = arect->p0.x;
+        }
+}
+
 /** Get unbuffered GC.
  *