rip out the VIDMODE extension stuff. this was only used to size fullscreen windows...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index a5d983c3b64ddda26ceb0b70a10a7a01a2ca64a9..a38a331fce77b3a16001d92284acf81268eb8516 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1,19 +1,20 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
-event.c for the Openbox window manager
-Copyright (c) 2003        Ben Jansens
+   event.c for the Openbox window manager
+   Copyright (c) 2004        Mikael Magnusson
+   Copyright (c) 2003        Ben Jansens
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-See the COPYING file for a copy of the GNU General Public License.
+   See the COPYING file for a copy of the GNU General Public License.
 */
 
 #include "event.h"
@@ -50,6 +51,9 @@ See the COPYING file for a copy of the GNU General Public License.
 #ifdef HAVE_SIGNAL_H
 #  include <signal.h>
 #endif
+#ifdef XKB
+#  include <X11/XKBlib.h>
+#endif
 
 #ifdef USE_SM
 #include <X11/ICE/ICElib.h>
@@ -141,10 +145,10 @@ void event_startup(gboolean reconfig)
         const KeyCode num_lock = XKeysymToKeycode(ob_display, XK_Num_Lock);
         const KeyCode scroll_lock = XKeysymToKeycode(ob_display,
                                                      XK_Scroll_Lock);
-         
+
         for (cnt = 0; cnt < size; ++cnt) {
             if (! modmap->modifiermap[cnt]) continue;
-              
+
             if (num_lock == modmap->modifiermap[cnt])
                 NumLockMask = mask_table[cnt / modmap->max_keypermod];
             if (scroll_lock == modmap->modifiermap[cnt])
@@ -251,13 +255,16 @@ static void event_set_lasttime(XEvent *e)
 }
 
 #define STRIP_MODS(s) \
-       s &= ~(LockMask | NumLockMask | ScrollLockMask), \
-       /* kill off the Button1Mask etc, only want the modifiers */ \
-       s &= (ControlMask | ShiftMask | Mod1Mask | \
+        s &= ~(LockMask | NumLockMask | ScrollLockMask), \
+        /* kill off the Button1Mask etc, only want the modifiers */ \
+        s &= (ControlMask | ShiftMask | Mod1Mask | \
               Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask) \
 
 static void event_hack_mods(XEvent *e)
 {
+#ifdef XKB
+    XkbStateRec xkb_state;
+#endif
     KeyCode *kp;
     gint i, k;
 
@@ -273,6 +280,12 @@ static void event_hack_mods(XEvent *e)
         STRIP_MODS(e->xkey.state);
         /* remove from the state the mask of the modifier being released, if
            it is a modifier key being released (this is a little ugly..) */
+#ifdef XKB
+        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success) {
+            e->xkey.state = xkb_state.compat_state;
+            break;
+        }
+#endif
         kp = modmap->modifiermap;
         for (i = 0; i < mask_table_size; ++i) {
             for (k = 0; k < modmap->max_keypermod; ++k) {
@@ -317,7 +330,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
            want will be of type NotifyAncestor. This situation does not occur
            for FocusOut, so it is safely ignored there.
         */
-       if (INVALID_FOCUSIN(e) ||
+        if (INVALID_FOCUSIN(e) ||
             client == NULL) {
 #ifdef DEBUG_FOCUS
             ob_debug("FocusIn on %lx mode %d detail %d IGNORED\n",
@@ -336,7 +349,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 #endif
         break;
     case FocusOut:
-       if (INVALID_FOCUSOUT(e)) {
+        if (INVALID_FOCUSOUT(e)) {
 #ifdef DEBUG_FOCUS
         ob_debug("FocusOut on %lx mode %d detail %d IGNORED\n",
                  e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
@@ -495,7 +508,7 @@ static void event_process(const XEvent *ec, gpointer data)
         /* unhandled configure requests must be used to configure the
            window directly */
         XWindowChanges xwc;
-              
+
         xwc.x = e->xconfigurerequest.x;
         xwc.y = e->xconfigurerequest.y;
         xwc.width = e->xconfigurerequest.width;
@@ -531,7 +544,7 @@ static void event_process(const XEvent *ec, gpointer data)
 
                 menu_can_hide = FALSE;
                 ob_main_loop_timeout_add(ob_main_loop,
-                                         G_USEC_PER_SEC / 4,
+                                         config_menu_hide_delay * 1000,
                                          menu_hide_delay_func,
                                          NULL, NULL);
 
@@ -587,11 +600,6 @@ static void event_handle_root(XEvent *e)
         break;
     default:
         ;
-#ifdef VIDMODE
-        if (extensions_vidmode && e->type == extensions_vidmode_event_basep) {
-            ob_debug("VIDMODE EVENT\n");
-        }
-#endif
     }
 }
 
@@ -840,7 +848,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 if (e->xconfigurerequest.value_mask & CWY)
                     y = newy;
             }
-              
+
             switch (client->gravity) {
             case NorthEastGravity:
             case EastGravity:
@@ -1038,7 +1046,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 if (e->xclient.data.l[0] & 1 << 9)
                     y = newy;
             }
-              
+
             client_configure(client, OB_CORNER_TOPLEFT,
                              x, y, w, h, FALSE, TRUE);
 
@@ -1133,7 +1141,10 @@ static void event_handle_dock(ObDock *s, XEvent *e)
 {
     switch (e->type) {
     case ButtonPress:
-        stacking_raise(DOCK_AS_WINDOW(s));
+        if (e->xbutton.button == 1)
+            stacking_raise(DOCK_AS_WINDOW(s), FALSE);
+        else if (e->xbutton.button == 2)
+            stacking_lower(DOCK_AS_WINDOW(s), FALSE);
         break;
     case EnterNotify:
         dock_hide(FALSE);