Changeset 68704ab in mainline

Timestamp:

2022-11-09T20:40:57Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c48192e

Parents:

88d828e

Message:

Do not list popup windows in task bar

Location:

uspace

Files:

• app/taskbar/wndlist.c (modified) (2 diffs)
• lib/wndmgt/include/types/wndmgt.h (modified) (1 diff)
• lib/wndmgt/src/wndmgt.c (modified) (1 diff)
• lib/wndmgt/src/wndmgt_srv.c (modified) (1 diff)
• lib/wndmgt/test/wndmgt.c (modified) (2 diffs)
• srv/hid/display/wmops.c (modified) (1 diff)

uspace/app/taskbar/wndlist.c

@@ -121 +121 @@
                         goto error;
 
-                rc = wndlist_append(wndlist, wlist->windows[i], winfo->caption,
-                    false);
-                if (rc != EOK) {
-                        wndmgt_free_window_info(winfo);
-                        goto error;
+                if ((winfo->flags & wndf_popup) == 0) {
+                        rc = wndlist_append(wndlist, wlist->windows[i],
+                            winfo->caption, false);
+                        if (rc != EOK) {
+                                wndmgt_free_window_info(winfo);
+                                goto error;
+                        }
                 }
 
@@ -328 +330 @@
                 goto error;
 
-        rc = wndlist_append(wndlist, wnd_id, winfo->caption, true);
-        if (rc != EOK) {
-                wndmgt_free_window_info(winfo);
-                goto error;
+        if ((winfo->flags & wndf_popup) == 0) {
+                rc = wndlist_append(wndlist, wnd_id, winfo->caption, true);
+                if (rc != EOK) {
+                        wndmgt_free_window_info(winfo);
+                        goto error;
+                }
         }
 

uspace/lib/wndmgt/include/types/wndmgt.h

@@ -87 +87 @@
         /** Window caption */
         char *caption;
+        /** Window flags */
+        unsigned flags;
 } wndmgt_window_info_t;
 

uspace/lib/wndmgt/src/wndmgt.c

@@ -270 +270 @@
 
         info->caption = caption;
+        info->flags = ipc_get_arg1(&answer);
         *rinfo = info;
         return EOK;

uspace/lib/wndmgt/src/wndmgt_srv.c

@@ -198 +198 @@
         }
 
-        async_answer_0(icall, EOK);
+        async_answer_1(icall, EOK, info->flags);
         wndmgt_free_window_info(info);
 }

uspace/lib/wndmgt/test/wndmgt.c

@@ -281 +281 @@
         PCUT_ASSERT_NOT_NULL(resp.get_window_info_rinfo);
         resp.get_window_info_rinfo->caption = str_dup("Hello");
+        resp.get_window_info_rinfo->flags = 42;
         PCUT_ASSERT_NOT_NULL(resp.get_window_info_rinfo->caption);
         wnd_id = 1;
@@ -290 +291 @@
 
         PCUT_ASSERT_STR_EQUALS("Hello", info->caption);
+        PCUT_ASSERT_INT_EQUALS(42, info->flags);
 
         wndmgt_free_window_info(info);

uspace/srv/hid/display/wmops.c

@@ -143 +143 @@
         }
 
+        info->flags = wnd->flags;
+
         ds_display_unlock(wmclient->display);
         *rinfo = info;