gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Removed dup function wScreenSearchForRootWindow

Browse Source 
The function wScreenSearchForRootWindow is exactly like wScreenForRootWindow
so can be removed swapping the function call.
This commit is contained in:
Rodolfo García Peñas (kix)
2013-04-03 20:01:45 +02:00
committed by Carlos R. Mafra
parent a401dcbdf6
commit 052efedd93
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/event.c
View File

@@ -944,7 +944,7 @@ static void handleClientMessage(XEvent * event)
if (!wwin->flags.miniaturized)
wIconifyWindow(wwin);
} else if (event->xclient.message_type == _XA_WM_COLORMAP_NOTIFY && event->xclient.format == 32) {
WScreen *scr = wScreenSearchForRootWindow(event->xclient.window);
WScreen *scr = wScreenForRootWindow(event->xclient.window);
if (!scr)
return;
@@ -1034,7 +1034,7 @@ static void handleClientMessage(XEvent * event)
break;
}
} else if (event->xclient.message_type == _XA_WM_IGNORE_FOCUS_EVENTS) {
WScreen *scr = wScreenSearchForRootWindow(event->xclient.window);
WScreen *scr = wScreenForRootWindow(event->xclient.window);
if (!scr)
return;
scr->flags.ignore_focus_events = event->xclient.data.l[0] ? 1 : 0;

1
src/screen.h
View File

@@ -313,7 +313,6 @@ int wScreenKeepInside(WScreen *scr, int *x, int *y, int width, int height);
/* in startup.c */
WScreen *wScreenWithNumber(int i);
WScreen *wScreenForRootWindow(Window window); /* window must be valid */
WScreen *wScreenSearchForRootWindow(Window window);
WScreen *wScreenForWindow(Window window); /* slower than above functions */
void wScreenFinish(WScreen *scr);

21
src/startup.c
View File

@@ -429,27 +429,6 @@ WScreen *wScreenForRootWindow(Window window)
return wScreenForWindow(window);
}
WScreen *wScreenSearchForRootWindow(Window window)
{
int i;
if (wScreenCount == 1)
return wScreen[0];
/*
* Since the number of heads will probably be small (normally 2),
* it should be faster to use this than a hash table, because
* of the overhead.
*/
for (i = 0; i < wScreenCount; i++) {
if (wScreen[i]->root_win == window) {
return wScreen[i];
}
}
return wScreenForWindow(window);
}
WScreen *wScreenForWindow(Window window)
{
XWindowAttributes attr;