Changes in / [4e1221c:64c8132] in mainline

Location:

uspace/lib

Files:

• display/include/display.h (modified) (2 diffs)
• display/src/display.c (modified) (4 diffs)
• ui/src/ui.c (modified) (3 diffs)
• ui/src/window.c (modified) (9 diffs)

uspace/lib/display/include/display.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 extern errno_t display_open(const char *, display_t **);
 extern void display_close(display_t *);
-extern void display_lock(display_t *);
-extern void display_unlock(display_t *);
 extern errno_t display_get_info(display_t *, display_info_t *);
 

uspace/lib/display/src/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -138 +138 @@
 }
 
-/*
- * Lock display.
- *
- * While display is locked, display event handlers will not be called.
- *
- * @param display Display
- */
-void display_lock(display_t *display)
-{
-        fibril_mutex_lock(&display->lock);
-}
-
-/*
- * Unlock display.
- *
- * @param display Display
- */
-void display_unlock(display_t *display)
-{
-        fibril_mutex_unlock(&display->lock);
-}
-
 /** Initialize window parameters structure.
  *
@@ -722 +700 @@
         display_wnd_ev_t event;
 
-        display_lock(display);
-
         while (true) {
+                fibril_mutex_lock(&display->lock);
+
                 if (display->sess != NULL)
                         rc = display_get_event(display, &window, &event);
                 else
                         rc = ENOENT;
+
+                fibril_mutex_unlock(&display->lock);
 
                 if (rc != EOK)
@@ -772 +752 @@
         }
 
-        display_unlock(display);
         async_answer_0(icall, EOK);
 }

uspace/lib/ui/src/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -568 +568 @@
 void ui_lock(ui_t *ui)
 {
-        if (ui->display != NULL)
-                display_lock(ui->display);
         fibril_mutex_lock(&ui->lock);
 }
@@ -584 +582 @@
 {
         fibril_mutex_unlock(&ui->lock);
-        if (ui->display != NULL)
-                display_unlock(ui->display);
 }
 

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -978 +978 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         ui_window_send_close(window);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -989 +989 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         (void)nfocus;
 
@@ -998 +998 @@
 
         ui_window_send_focus(window, nfocus);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1007 +1007 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         ui_window_send_kbd(window, kbd_event);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1023 +1023 @@
                 return;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
 
         claim = ui_wdecor_pos_event(window->wdecor, event);
         if (claim == ui_claimed) {
-                fibril_mutex_unlock(&ui->lock);
+                ui_unlock(ui);
                 return;
         }
 
         ui_window_send_pos(window, event);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1048 +1048 @@
                 return;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         (void) ui_window_resize(window, rect);
         ui_window_send_resize(window);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1060 +1060 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
 
         if (window->wdecor != NULL && nfocus == 0) {
@@ -1068 +1068 @@
 
         ui_window_send_unfocus(window, nfocus);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }