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

- Fixed incorrect focusing of application's windows after an unhide (sometimes

Browse Source 
the incorrect window got focus instead of the apps's last focused window)
- Unshade application's shaded windows when Dbl-MiddleClick-ing its appicon.
  (this is to be consistent with deminiaturizing application's miniwindows
  which also happens in this case, since shading is a form of miniaturization)
- misc fixes
This commit is contained in:
dan
2003-02-11 00:32:17 +00:00
parent e54a0954e6
commit b381674375
6 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/actions.c
View File

@@ -1362,42 +1362,53 @@ wUnhideApplication(WApplication *wapp, Bool miniwindows, Bool bringToCurrentWS)
WWindow *wlist, *next;
WWindow *focused=NULL;
if (!wapp) {
if (!wapp)
return;
}
scr = wapp->main_window_desc->screen_ptr;
wlist = scr->focused_window;
if (!wlist) return;
if (!wlist)
return;
/* goto beginning of list */
while (wlist->prev)
wlist = wlist->prev;
while (wlist) {
next = wlist->next;
if (wlist->main_window == wapp->main_window) {
if (wlist->flags.focused)
focused = wlist;
focused = wlist;
else if (!focused || !focused->flags.focused)
focused = wlist;
if (wlist->flags.miniaturized && wlist->icon) {
if (bringToCurrentWS || wPreferences.sticky_icons
|| wlist->frame->workspace == scr->current_workspace) {
if (!wlist->icon->mapped) {
XMapWindow(dpy, wlist->icon->core->window);
wlist->icon->mapped = 1;
}
wlist->flags.hidden = 0;
focused = wlist;
WMPostNotificationName(WMNChangedState, wlist, "hide");
if (wlist->frame->workspace != scr->current_workspace)
wWindowChangeWorkspace(wlist, scr->current_workspace);
}
if (miniwindows) {
wDeiconifyWindow(wlist);
}
if (wlist->flags.miniaturized) {
if (bringToCurrentWS || wPreferences.sticky_icons ||
wlist->frame->workspace == scr->current_workspace) {
if (wlist->icon && !wlist->icon->mapped) {
XMapWindow(dpy, wlist->icon->core->window);
wlist->icon->mapped = 1;
}
}
if (bringToCurrentWS)
wWindowChangeWorkspace(wlist, scr->current_workspace);
wlist->flags.hidden = 0;
if (miniwindows &&
wlist->frame->workspace == scr->current_workspace) {
wDeiconifyWindow(wlist);
}
WMPostNotificationName(WMNChangedState, wlist, "hide");
} else if (wlist->flags.shaded) {
if (bringToCurrentWS)
wWindowChangeWorkspace(wlist, scr->current_workspace);
wlist->flags.hidden = 0;
if (miniwindows &&
wlist->frame->workspace == scr->current_workspace) {
wUnshadeWindow(wlist);
wRaiseFrame(wlist->frame->core);
}
WMPostNotificationName(WMNChangedState, wlist, "hide");
} else if (wlist->flags.hidden) {
unhideWindow(wapp->app_icon->icon, wapp->app_icon->x_pos,
wapp->app_icon->y_pos, wlist,
@@ -1417,10 +1428,12 @@ wUnhideApplication(WApplication *wapp, Bool miniwindows, Bool bringToCurrentWS)
wapp->flags.skip_next_animation = 0;
wapp->flags.hidden = 0;
if (focused)
wSetFocusTo(scr, focused);
else if (wapp->last_focused && wapp->last_focused->flags.mapped)
wSetFocusTo(scr, wapp->last_focused);
if (wapp->last_focused && wapp->last_focused->flags.mapped) {
wRaiseFrame(wapp->last_focused->frame->core);
wSetFocusTo(scr, wapp->last_focused);
} else if (focused) {
wSetFocusTo(scr, focused);
}
wapp->last_focused = NULL;
if (wPreferences.auto_arrange_icons) {
wArrangeIcons(scr, True);
@@ -1678,8 +1691,11 @@ wMakeWindowVisible(WWindow *wwin)
WApplication *app;
app = wApplicationOf(wwin->main_window);
if (app)
wUnhideApplication(app, False, False);
if (app) {
/* trick to get focus to this window */
app->last_focused = wwin;
wUnhideApplication(app, False, False);
}
} else if (wwin->flags.miniaturized) {
wDeiconifyWindow(wwin);
} else {