From 6de693a24dc10b73be777813ceb8e4d837c5a245 Mon Sep 17 00:00:00 2001 From: kojima Date: Thu, 21 Oct 2004 00:59:52 +0000 Subject: [PATCH] fixed flickering when switching windows --- src/cycling.c | 2 +- src/winmenu.c | 30 ++++++++---------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/cycling.c b/src/cycling.c index bd00cb87..f7d76199 100644 --- a/src/cycling.c +++ b/src/cycling.c @@ -227,11 +227,11 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next) } if (newFocused) { + wRaiseFrame(newFocused->frame->core); CommitStacking(scr); if (!newFocused->flags.mapped) wMakeWindowVisible(newFocused); wSetFocusTo(scr, newFocused); - wRaiseFrame(newFocused->frame->core); } if (swpanel) diff --git a/src/winmenu.c b/src/winmenu.c index ec700d59..5430461d 100644 --- a/src/winmenu.c +++ b/src/winmenu.c @@ -50,16 +50,15 @@ #define MC_MINIATURIZE 1 #define MC_SHADE 2 #define MC_HIDE 3 -#define MC_HIDE_OTHERS 4 -#define MC_MOVERESIZE 5 -#define MC_SELECT 6 -#define MC_DUMMY_MOVETO 7 -#define MC_PROPERTIES 8 -#define MC_OPTIONS 9 -#define MC_SHORTCUT 9 +#define MC_MOVERESIZE 4 +#define MC_SELECT 5 +#define MC_DUMMY_MOVETO 6 +#define MC_PROPERTIES 7 +#define MC_OPTIONS 8 +#define MC_SHORTCUT 8 -#define MC_CLOSE 10 -#define MC_KILL 11 +#define MC_CLOSE 9 +#define MC_KILL 10 #define WO_KEEP_ON_TOP 0 @@ -177,11 +176,6 @@ execMenuCommand(WMenu *menu, WMenuEntry *entry) wapp = wApplicationOf(wwin->main_window); wHideApplication(wapp); break; - - case MC_HIDE_OTHERS: - wHideOtherApplications(wwin); - break; - } } @@ -472,14 +466,6 @@ createWindowMenu(WScreen *scr) entry->rtext = wstrdup(tmp); } - entry = wMenuAddCallback(menu, _("Hide Others"), execMenuCommand, NULL); - if (wKeyBindings[WKBD_HIDE_OTHERS].keycode!=0) { - kcode = wKeyBindings[WKBD_HIDE_OTHERS].keycode; - - if (kcode && (tmp = XKeysymToString(XKeycodeToKeysym(dpy, kcode, 0)))) - entry->rtext = wstrdup(tmp); - } - entry = wMenuAddCallback(menu, _("Resize/Move"), execMenuCommand, NULL); if (wKeyBindings[WKBD_MOVERESIZE].keycode!=0) { kcode = wKeyBindings[WKBD_MOVERESIZE].keycode;