Changeset 7bf29e5 in mainline for uspace/lib/ui/src/window.c

Timestamp:

2025-01-09T11:29:38Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a5c2960e

Parents:

bc3d695 (diff), 4e1221c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/lib/ui/src/window.c (modified) (13 diffs)

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -189 +189 @@
         switch (params->placement) {
         case ui_wnd_place_default:
-                assert(ui_is_fullscreen(window->ui));
+        case ui_wnd_place_center:
+                assert(params->placement != ui_wnd_place_default ||
+                    ui_is_fullscreen(window->ui));
                 /* Center window */
                 gfx_rect_dims(&params->rect, &dims);
@@ -343 +345 @@
         dparams.rect = params->rect;
         dparams.caption = params->caption;
-        /* Only allow making the window larger */
-        gfx_rect_dims(&params->rect, &dparams.min_size);
+        dparams.min_size = params->min_size;
 
         /*
@@ -358 +359 @@
         if ((params->flags & ui_wndf_popup) != 0)
                 dparams.flags |= wndf_popup;
+        if ((params->flags & ui_wndf_nofocus) != 0)
+                dparams.flags |= wndf_nofocus;
         if ((params->flags & ui_wndf_topmost) != 0)
                 dparams.flags |= wndf_topmost;
@@ -975 +978 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         ui_window_send_close(window);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -986 +989 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         (void)nfocus;
 
@@ -995 +998 @@
 
         ui_window_send_focus(window, nfocus);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1004 +1007 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         ui_window_send_kbd(window, kbd_event);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1020 +1023 @@
                 return;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
 
         claim = ui_wdecor_pos_event(window->wdecor, event);
         if (claim == ui_claimed) {
-                ui_unlock(ui);
+                fibril_mutex_unlock(&ui->lock);
                 return;
         }
 
         ui_window_send_pos(window, event);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1045 +1048 @@
                 return;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         (void) ui_window_resize(window, rect);
         ui_window_send_resize(window);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1057 +1060 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
 
         if (window->wdecor != NULL && nfocus == 0) {
@@ -1065 +1068 @@
 
         ui_window_send_unfocus(window, nfocus);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1295 +1298 @@
 void ui_window_send_minimize(ui_window_t *window)
 {
-        if (window->cb != NULL && window->cb->maximize != NULL)
+        if (window->cb != NULL && window->cb->minimize != NULL)
                 window->cb->minimize(window, window->arg);
         else