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

more dnd changes

Browse Source 
window cycling stuff
finnish pot files
This commit is contained in:
kojima
2000-04-07 22:47:04 +00:00
parent 6b93946309
commit caa86529a9
21 changed files with 1327 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
src/event.c
View File

@@ -1303,131 +1303,6 @@ windowUnderPointer(WScreen *scr)
static void
doWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
{
WScreen *scr = wScreenForRootWindow(event->xkey.root);
Bool done = False;
Bool openedSwitchMenu = False;
WWindow *newFocused;
WWindow *oldFocused;
int modifiers;
XModifierKeymap *keymap;
Bool somethingElse = False;
XEvent ev;
if (!wwin)
return;
keymap = XGetModifierMapping(dpy);
XGrabKeyboard(dpy, scr->root_win, False, GrabModeAsync, GrabModeAsync,
CurrentTime);
if (next) {
newFocused = NextToFocusAfter(wwin);
} else {
newFocused = NextToFocusBefore(wwin);
}
scr->flags.doing_alt_tab = 1;
if (wPreferences.circ_raise)
XRaiseWindow(dpy, newFocused->frame->core->window);
wWindowFocus(newFocused, scr->focused_window);
oldFocused = newFocused;
#if 0
if (wPreferences.popup_switchmenu &&
(!scr->switch_menu || !scr->switch_menu->flags.mapped)) {
OpenSwitchMenu(scr, scr->scr_width/2, scr->scr_height/2, False);
openedSwitchMenu = True;
}
#endif
while (!done) {
WMMaskEvent(dpy,KeyPressMask|KeyReleaseMask|ExposureMask, &ev);
if (ev.type != KeyRelease && ev.type != KeyPress) {
WMHandleEvent(&ev);
continue;
}
/* ignore CapsLock */
modifiers = ev.xkey.state & ValidModMask;
if (ev.type == KeyPress) {
if (wKeyBindings[WKBD_FOCUSNEXT].keycode == ev.xkey.keycode
&& wKeyBindings[WKBD_FOCUSNEXT].modifier == modifiers) {
UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE);
newFocused = NextToFocusAfter(newFocused);
wWindowFocus(newFocused, oldFocused);
oldFocused = newFocused;
if (wPreferences.circ_raise) {
/* restore order */
CommitStacking(scr);
XRaiseWindow(dpy, newFocused->frame->core->window);
}
UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE);
} else if (wKeyBindings[WKBD_FOCUSPREV].keycode == ev.xkey.keycode
&& wKeyBindings[WKBD_FOCUSPREV].modifier == modifiers) {
UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE);
newFocused = NextToFocusBefore(newFocused);
wWindowFocus(newFocused, oldFocused);
oldFocused = newFocused;
if (wPreferences.circ_raise) {
/* restore order */
CommitStacking(scr);
XRaiseWindow(dpy, newFocused->frame->core->window);
}
UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE);
} else {
somethingElse = True;
done = True;
}
} else if (ev.type == KeyRelease) {
int i;
for (i = 0; i < 8 * keymap->max_keypermod; i++) {
if (keymap->modifiermap[i] == ev.xkey.keycode &&
wKeyBindings[WKBD_FOCUSNEXT].modifier
& 1<<(i/keymap->max_keypermod)) {
done = True;
break;
}
}
}
}
XFreeModifiermap(keymap);
XUngrabKeyboard(dpy, CurrentTime);
wSetFocusTo(scr, newFocused);
if (wPreferences.circ_raise) {
wRaiseFrame(newFocused->frame->core);
CommitStacking(scr);
}
scr->flags.doing_alt_tab = 0;
if (openedSwitchMenu)
OpenSwitchMenu(scr, scr->scr_width/2, scr->scr_height/2, False);
if (somethingElse) {
handleKeyPress(&ev);
}
}
static void
handleKeyPress(XEvent *event)
{
@@ -1598,17 +1473,19 @@ handleKeyPress(XEvent *event)
}
break;
case WKBD_FOCUSNEXT:
if (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0)
doWindozeCycle(wwin, event, True);
if (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0
&& wPreferences.windows_cycling)
StartWindozeCycle(wwin, event, True);
else
puts("NEXT");
CycleWindow(scr, True);
break;
case WKBD_FOCUSPREV:
if (wKeyBindings[WKBD_FOCUSPREV].modifier != 0)
doWindozeCycle(wwin, event, False);
if (wKeyBindings[WKBD_FOCUSPREV].modifier != 0
&& wPreferences.windows_cycling)
StartWindozeCycle(wwin, event, False);
else
puts("PREV");
CycleWindow(scr, False);
break;
#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)