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

Move code that removes icons from a dock to new removeIcons function

Browse Source 
Code taken from removeIconsCallback.
This commit is contained in:
Daniel Déchelotte
2013-04-12 01:42:37 +02:00
committed by Carlos R. Mafra
parent f93f847b33
commit 8b6ff01d39
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/dock.c
View File

@@ -446,14 +446,35 @@ static void omnipresentCallback(WMenu *menu, WMenuEntry *entry)
} }
} }
static void removeIcons(WMArray *icons, WDock *dock)
{
WAppIcon *aicon;
int keepit;
WMArrayIterator it;
WM_ITERATE_ARRAY(icons, aicon, it) {
keepit = aicon->running && wApplicationOf(aicon->main_window);
wDockDetach(dock, aicon);
if (keepit) {
/* XXX: can: aicon->icon == NULL ? */
PlaceIcon(dock->screen_ptr, &aicon->x_pos, &aicon->y_pos,
wGetHeadForWindow(aicon->icon->owner));
XMoveWindow(dpy, aicon->icon->core->window, aicon->x_pos, aicon->y_pos);
if (!dock->mapped || dock->collapsed)
XMapWindow(dpy, aicon->icon->core->window);
}
}
WMFreeArray(icons);
if (wPreferences.auto_arrange_icons)
wArrangeIcons(dock->screen_ptr, True);
}
static void removeIconsCallback(WMenu *menu, WMenuEntry *entry) static void removeIconsCallback(WMenu *menu, WMenuEntry *entry)
{ {
WAppIcon *clickedIcon = (WAppIcon *) entry->clientdata; WAppIcon *clickedIcon = (WAppIcon *) entry->clientdata;
WDock *dock; WDock *dock;
WAppIcon *aicon;
WMArray *selectedIcons; WMArray *selectedIcons;
int keepit;
WMArrayIterator it;
assert(clickedIcon != NULL); assert(clickedIcon != NULL);
@@ -476,22 +497,7 @@ static void removeIconsCallback(WMenu *menu, WMenuEntry *entry)
WMAddToArray(selectedIcons, clickedIcon); WMAddToArray(selectedIcons, clickedIcon);
} }
WM_ITERATE_ARRAY(selectedIcons, aicon, it) { removeIcons(selectedIcons, dock);
keepit = aicon->running && wApplicationOf(aicon->main_window);
wDockDetach(dock, aicon);
if (keepit) {
/* XXX: can: aicon->icon == NULL ? */
PlaceIcon(dock->screen_ptr, &aicon->x_pos, &aicon->y_pos,
wGetHeadForWindow(aicon->icon->owner));
XMoveWindow(dpy, aicon->icon->core->window, aicon->x_pos, aicon->y_pos);
if (!dock->mapped || dock->collapsed)
XMapWindow(dpy, aicon->icon->core->window);
}
}
WMFreeArray(selectedIcons);
if (wPreferences.auto_arrange_icons)
wArrangeIcons(dock->screen_ptr, True);
} }
static void keepIconsCallback(WMenu *menu, WMenuEntry *entry) static void keepIconsCallback(WMenu *menu, WMenuEntry *entry)