isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-12 21:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta_display_list_windows: Exclude override-redirect

Browse Source 
Don't include override-redirect windows in the list return by
meta_display_list_windows(), since we almost never want to handle
them when considering "all window" for the display. Add a separate
meta_display_list_all_windows() that includes override-redirect
windows.

http://bugzilla.gnome.org/show_bug.cgi?id=582639
This commit is contained in:
Owen W. Taylor 2009-06-15 15:32:23 -04:00
parent fd27647440
commit 00d955eb40
10 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.c
View File

@ -766,7 +766,7 @@ meta_invalidate_default_icons (void)
if (display == NULL) if (display == NULL)
return; /* We can validly be called before the display is opened. */ return; /* We can validly be called before the display is opened. */
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display, META_LIST_DEFAULT);
for (l = windows; l != NULL; l = l->next) for (l = windows; l != NULL; l = l->next)
{ {
MetaWindow *window = (MetaWindow*)l->data; MetaWindow *window = (MetaWindow*)l->data;

2
src/core/delete.c
View File

@ -253,7 +253,7 @@ meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)
* mutter-dialog * mutter-dialog
*/ */
windows = meta_display_list_windows (window->display); windows = meta_display_list_windows (window->display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)
{ {

7
src/core/display-private.h
View File

@ -61,6 +61,10 @@ typedef void (* MetaWindowPingFunc) (MetaDisplay *display,
guint32 timestamp, guint32 timestamp,
gpointer user_data); gpointer user_data);
typedef enum {
META_LIST_DEFAULT = 0, /* normal windows */
META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */
} MetaListWindowsFlags;
#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
#define _NET_WM_STATE_ADD 1 /* add/set property */ #define _NET_WM_STATE_ADD 1 /* add/set property */
@ -366,7 +370,8 @@ void meta_display_unregister_x_window (MetaDisplay *display,
gboolean meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display, gboolean meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display,
Window xwindow); Window xwindow);
GSList* meta_display_list_windows (MetaDisplay *display); GSList* meta_display_list_windows (MetaDisplay *display,
MetaListWindowsFlags flags);
MetaDisplay* meta_display_for_x_display (Display *xdisplay); MetaDisplay* meta_display_for_x_display (Display *xdisplay);
MetaDisplay* meta_get_display (void); MetaDisplay* meta_get_display (void);

51
src/core/display.c
View File

@ -812,15 +812,6 @@ meta_display_open (void)
return TRUE; return TRUE;
} }
static void
listify_func (gpointer key, gpointer value, gpointer data)
{
GSList **listp;
listp = data;
*listp = g_slist_prepend (*listp, value);
}
static gint static gint
ptrcmp (gconstpointer a, gconstpointer b) ptrcmp (gconstpointer a, gconstpointer b)
{ {
@ -832,17 +823,38 @@ ptrcmp (gconstpointer a, gconstpointer b)
return 0; return 0;
} }
/**
* meta_display_list_windows:
* @display: a #MetaDisplay
* @flags: options for listing
*
* Lists windows for the display, the @flags parameter for
* now determines whether override-redirect windows will be
* included.
*
* Return value: (transfer container): the list of windows.
*/
GSList* GSList*
meta_display_list_windows (MetaDisplay *display) meta_display_list_windows (MetaDisplay *display,
MetaListWindowsFlags flags)
{ {
GSList *winlist; GSList *winlist;
GSList *tmp; GSList *tmp;
GSList *prev; GSList *prev;
GHashTableIter iter;
gpointer key, value;
winlist = NULL; winlist = NULL;
g_hash_table_foreach (display->window_ids,
listify_func, g_hash_table_iter_init (&iter, display->window_ids);
&winlist); while (g_hash_table_iter_next (&iter, &key, &value))
{
MetaWindow *window = value;
if (!window->override_redirect ||
(flags & META_LIST_INCLUDE_OVERRIDE_REDIRECT) != 0)
winlist = g_slist_prepend (winlist, window);
}
/* Uniquify the list, since both frame windows and plain /* Uniquify the list, since both frame windows and plain
* windows are in the hash * windows are in the hash
@ -3931,7 +3943,7 @@ meta_display_queue_retheme_all_windows (MetaDisplay *display)
GSList* windows; GSList* windows;
GSList *tmp; GSList *tmp;
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)
{ {
@ -4441,7 +4453,7 @@ meta_display_get_tab_list (MetaDisplay *display,
GSList *tmp; GSList *tmp;
MetaWindow *l_window; MetaWindow *l_window;
tmp = meta_display_list_windows (display); tmp = meta_display_list_windows (display, META_LIST_DEFAULT);
/* Go through all windows */ /* Go through all windows */
while (tmp != NULL) while (tmp != NULL)
@ -4824,7 +4836,8 @@ meta_display_unmanage_windows_for_screen (MetaDisplay *display,
GSList *tmp; GSList *tmp;
GSList *winlist; GSList *winlist;
winlist = meta_display_list_windows (display); winlist = meta_display_list_windows (display,
META_LIST_INCLUDE_OVERRIDE_REDIRECT);
winlist = g_slist_sort (winlist, meta_display_stack_cmp); winlist = g_slist_sort (winlist, meta_display_stack_cmp);
/* Unmanage all windows */ /* Unmanage all windows */
@ -4916,7 +4929,7 @@ prefs_changed_callback (MetaPreference pref,
GSList *windows; GSList *windows;
GSList *tmp; GSList *tmp;
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display, META_LIST_DEFAULT);
/* Ungrab all */ /* Ungrab all */
tmp = windows; tmp = windows;
@ -5018,7 +5031,7 @@ sanity_check_timestamps (MetaDisplay *display,
display->last_user_time, timestamp); display->last_user_time, timestamp);
display->last_user_time = timestamp; display->last_user_time = timestamp;
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)
{ {

2
src/core/keybindings.c
View File

@ -460,7 +460,7 @@ regrab_key_bindings (MetaDisplay *display)
tmp = tmp->next; tmp = tmp->next;
} }
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)
{ {

2
src/core/place.c
View File

@ -839,7 +839,7 @@ meta_window_place (MetaWindow *window,
GSList *all_windows; GSList *all_windows;
GSList *tmp; GSList *tmp;
all_windows = meta_display_list_windows (window->display); all_windows = meta_display_list_windows (window->display, META_LIST_DEFAULT);
tmp = all_windows; tmp = all_windows;
while (tmp != NULL) while (tmp != NULL)

5
src/core/screen.c
View File

@ -934,7 +934,8 @@ meta_screen_composite_all_windows (MetaScreen *screen)
if (!display->compositor) if (!display->compositor)
return; return;
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display,
META_LIST_INCLUDE_OVERRIDE_REDIRECT);
for (tmp = windows; tmp != NULL; tmp = tmp->next) for (tmp = windows; tmp != NULL; tmp = tmp->next)
meta_compositor_add_window (display->compositor, tmp->data); meta_compositor_add_window (display->compositor, tmp->data);
g_slist_free (windows); g_slist_free (windows);
@ -2476,7 +2477,7 @@ queue_windows_showing (MetaScreen *screen)
* active_workspace's window list, because the active_workspace's * active_workspace's window list, because the active_workspace's
* window list may not contain the on_all_workspace windows. * window list may not contain the on_all_workspace windows.
*/ */
windows = meta_display_list_windows (screen->display); windows = meta_display_list_windows (screen->display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)

4
src/core/session.c
View File

@ -889,7 +889,7 @@ save_state (void)
fprintf (outfile, "<mutter_session id=\"%s\">\n", fprintf (outfile, "<mutter_session id=\"%s\">\n",
client_id); client_id);
windows = meta_display_list_windows (meta_get_display ()); windows = meta_display_list_windows (meta_get_display (), META_LIST_DEFAULT);
stack_position = 0; stack_position = 0;
windows = g_slist_sort (windows, meta_display_stack_cmp); windows = g_slist_sort (windows, meta_display_stack_cmp);
@ -1768,7 +1768,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
GSList *tmp; GSList *tmp;
GSList *columns = NULL; GSList *columns = NULL;
windows = meta_display_list_windows (meta_get_display ()); windows = meta_display_list_windows (meta_get_display (), META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)
{ {

4
src/core/window.c
View File

@ -4440,7 +4440,7 @@ get_modal_transient (MetaWindow *window)
*/ */
modal_transient = window; modal_transient = window;
windows = meta_display_list_windows (window->display); windows = meta_display_list_windows (window->display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)
{ {
@ -8157,7 +8157,7 @@ meta_window_foreach_transient (MetaWindow *window,
GSList *windows; GSList *windows;
GSList *tmp; GSList *tmp;
windows = meta_display_list_windows (window->display); windows = meta_display_list_windows (window->display, META_LIST_DEFAULT);
tmp = windows; tmp = windows;
while (tmp != NULL) while (tmp != NULL)

13
src/core/workspace.c
View File

@ -620,8 +620,14 @@ meta_workspace_update_window_hints (MetaWorkspace *workspace)
} }
} }
/* get windows contained on workspace, including workspace->windows /**
* and also sticky windows. * meta_workspace_list_windows:
* @display: a #MetaDisplay
*
* Gets windows contained on the workspace, including workspace->windows
* and also sticky windows. Override-redirect windows are not included.
*
* Return value: (transfer container): the list of windows.
*/ */
GList* GList*
meta_workspace_list_windows (MetaWorkspace *workspace) meta_workspace_list_windows (MetaWorkspace *workspace)
@ -630,7 +636,8 @@ meta_workspace_list_windows (MetaWorkspace *workspace)
GSList *tmp; GSList *tmp;
GList *workspace_windows; GList *workspace_windows;
display_windows = meta_display_list_windows (workspace->screen->display); display_windows = meta_display_list_windows (workspace->screen->display,
META_LIST_DEFAULT);
workspace_windows = NULL; workspace_windows = NULL;
tmp = display_windows; tmp = display_windows;