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

window: Cache _NET_WM_ICON_GEOMETRY

Browse Source 
Rather than doing a server round trip each time when retrieving the
icon geometry, use the existing property mechanism to cache it.

https://bugzilla.gnome.org/show_bug.cgi?id=692997
This commit is contained in:
Florian Müllner
2013-02-01 11:32:53 +01:00
parent c388ccf477
commit 30bdadb519
3 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/window.c
View File

@@ -7151,9 +7151,7 @@ send_configure_notify (MetaWindow *window)
*
* Gets the location of the icon corresponding to the window. The location
* will be provided set by the task bar or other user interface element
* displaying the icon, and is relative to the root window. This currently
* retrieves the icon geometry from the X server as a round trip on every
* call.
* displaying the icon, and is relative to the root window.
*
* Return value: %TRUE if the icon geometry was succesfully retrieved.
*/
@@ -7161,33 +7159,12 @@ gboolean
meta_window_get_icon_geometry (MetaWindow *window,
MetaRectangle *rect)
{
gulong *geometry = NULL;
int nitems;
g_return_val_if_fail (!window->override_redirect, FALSE);
if (meta_prop_get_cardinal_list (window->display,
window->xwindow,
window->display->atom__NET_WM_ICON_GEOMETRY,
&geometry, &nitems))
if (window->icon_geometry_set)
{
if (nitems != 4)
{
meta_verbose ("_NET_WM_ICON_GEOMETRY on %s has %d values instead of 4\n",
window->desc, nitems);
meta_XFree (geometry);
return FALSE;
}
if (rect)
{
rect->x = geometry[0];
rect->y = geometry[1];
rect->width = geometry[2];
rect->height = geometry[3];
}
meta_XFree (geometry);
*rect = window->icon_geometry;
return TRUE;
}