On Tue, Feb 10, 2009 at 9:17 PM, Sam Spilsbury <[email protected]> wrote: > On Mon, Feb 9, 2009 at 10:52 PM, Sam Spilsbury <[email protected]> wrote: >> And it turns out after all that fiasco, I forgot to attach the patch ><: >> >> Attached, for real, all the rationale is below: >> >> Cheers, >> >> Sam >> > > Hi, > > Danny wanted me to do some other stuff in the patch: > * Whitespace -> Tab in virtualModMask > * Remove usage of 'this->foo' > * Make the XModifierMap return a const & > > Attached is the revised patch. > > Cheers, > > Sam > > (If two patches end up being attached, this might be a problem with my > mail client, use the one where 'class' is truncated to 'cla') >
That last patch had an error. On an unrelated note, I found a bunch of unnecessary \newlines between the copyright header and the top of the file. That is fixed in the second patch. Cheers, Sam > >> On Sun, Feb 8, 2009 at 8:48 PM, Sam Spilsbury <[email protected]> wrote: >>> On Sat, Feb 7, 2009 at 9:30 PM, Danny Baumann <[email protected]> wrote: >>>> Hi, >>>> >>>>> > Attached are some revised patched. They add the modifierhandler.cpp >>>>> > and modifierhandler.h files. >>>>> > >>>>> > Danny suggested that the modHandler object did not belong in the >>>>> > PrivateScreen class (and have a getter in CompScreen). I evaluated the >>>>> > code and do not think this makes sense because modHandler depends the >>>>> > CompScreen *screen variable to be initialized and also uses some of >>>>> > it's internal methods. >>>> >>>> While it's debatable whether putting the ModifierHandler instance inside >>>> or outside the screen class makes more sense (you already mentioned my >>>> personal opinion on that matter), your two arguments for putting it >>>> inside the class are no problem at all: >>>> - Instantiating ModifierHandler after CompScreen makes sure the order of >>>> initialization is correct. >>> >>> Ok, I've done that. I was worried about having it outside CompScreen >>> because it depends on it, but I have just initialized it like >>> CompScreen is initialized, after CompScreen has been initialized and >>> that seems to make sense. Personally, I don't see the point of having >>> another top-level object outside of CompScreen; isn't CompScreen >>> supposed to be the parent of all objects? >>> >>>> - Surely ModifierHandler calls some CompScreen methods, but so does any >>>> plugin around there. CompScreen is the central object of compiz++, after >>>> all. >>> >>> Yeah. While I have made it a separate object, I disagree on purely >>> design grounds, see above. >>> >>>> >>>> Regards, >>>> >>>> Danny >>>> >>> >>> Another added bonus of this patch is that it doesn't change stuff in >>> plugin.cpp that I had for debugging purposes. Can we backport the >>> error detection and file-not-found stuff from master into compiz++? >>> >>> I haven't the time to update the vpswitch plugin to account for this, >>> however it is just a matter of find and replacing screen->modHandler >>> () with modHandler ;-) >>> >>> Regards, >>> >>> Sam >>> >>>> _______________________________________________ >>>> Dev mailing list >>>> [email protected] >>>> http://lists.compiz-fusion.org/mailman/listinfo/dev >>>> >>> >>> >>> >>> -- >>> Sam Spilsbury >>> >> >> >> >> -- >> Sam Spilsbury >> > > > > -- > Sam Spilsbury > -- Sam Spilsbury
From 2b29587ca6ab311c90d145c29b9a9ba51cd3a082 Mon Sep 17 00:00:00 2001 From: Sam Spilsbury <[email protected]> Date: Tue, 10 Feb 2009 21:25:25 +0900 Subject: [PATCH] Move modifier handling to separate top level class --- include/core/modifierhandler.h | 89 +++++++++++++++++ include/core/screen.h | 3 + src/CMakeLists.txt | 3 +- src/event.cpp | 33 ++++--- src/main.cpp | 10 ++- src/modifierhandler.cpp | 204 ++++++++++++++++++++++++++++++++++++++++ src/privatescreen.h | 10 -- src/screen.cpp | 182 +++--------------------------------- 8 files changed, 336 insertions(+), 198 deletions(-) create mode 100644 include/core/modifierhandler.h create mode 100644 src/modifierhandler.cpp diff --git a/include/core/modifierhandler.h b/include/core/modifierhandler.h new file mode 100644 index 0000000..5620ce8 --- /dev/null +++ b/include/core/modifierhandler.h @@ -0,0 +1,89 @@ +/* + * Copyright © 2008 Dennis Kasprzyk + * Copyright © 2007 Novell, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Dennis Kasprzyk not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior permission. + * Dennis Kasprzyk makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + * + * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Authors: Dennis Kasprzyk <[email protected]> + * David Reveman <[email protected]> + * Sam Spilsbury <[email protected]> + */ + +#include <core/core.h> + +class ModifierHandler +{ + public: + + ModifierHandler (); + ~ModifierHandler (); + + typedef enum + { + Alt = 1, + Meta, + Super, + Hyper, + ModeSwitch, + NumLock, + ScrollLock, + ModNum + } Modifier; + + typedef enum + { + AltMask = (1 << 16), + MetaMask = (1 << 17), + SuperMask = (1 << 18), + HyperMask = (1 << 19), + ModeSwitchMask = (1 << 20), + NumLockMask = (1 << 21), + ScrollLockMask = (1 << 22), + NoMask = (1 << 25), + } ModMask; + + public: + + unsigned int keycodeToModifiers (int keycode); + + void updateModifierMappings (); + + unsigned int virtualToRealModMask (unsigned int modMask); + + unsigned int modMask (Modifier); + + unsigned int ignoredModMask (); + + const XModifierKeymap * modMap (); + + friend class CompScreen; + + private: + + static const unsigned int virtualModMask[7]; + + static const int maskTable[8]; + + static const int maskTableSize = 8; + + ModMask mModMask[ModNum]; + unsigned int mIgnoredModMask; + XModifierKeymap *mModMap; +}; diff --git a/include/core/screen.h b/include/core/screen.h index c30da1f..afc4b53 100644 --- a/include/core/screen.h +++ b/include/core/screen.h @@ -36,6 +36,7 @@ #include <core/match.h> #include <core/privates.h> #include <core/region.h> +#include <core/modifierhandler.h> class CompScreen; class PrivateScreen; @@ -48,6 +49,7 @@ extern bool noDetection; extern CompScreen *screen; extern CompMetadata *coreMetadata; +extern ModifierHandler *modHandler; extern int lastPointerX; extern int lastPointerY; @@ -359,6 +361,7 @@ class CompScreen : friend class CompTimer; friend class CompWindow; friend class PrivateWindow; + friend class ModifierHandler; private: PrivateScreen *priv; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2bf2db4..32c48b5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,6 +39,7 @@ add_executable (compiz point.cpp windowgeometry.cpp icon.cpp + modifierhandler.cpp ) target_link_libraries ( @@ -48,4 +49,4 @@ target_link_libraries ( install ( TARGETS compiz DESTINATION ${exec_prefix} -) \ No newline at end of file +) diff --git a/src/event.cpp b/src/event.cpp index 1aab5ac..9e7148a 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -146,7 +146,8 @@ PrivateScreen::triggerButtonPressBindings (CompOption::Vector &options, { CompAction::State state = CompAction::StateInitButton; CompAction *action; - unsigned int modMask = REAL_MOD_MASK & ~ignoredModMask; + unsigned int ignored = modHandler->ignoredModMask (); + unsigned int modMask = REAL_MOD_MASK & ~ignored; unsigned int bindMods; unsigned int edge = 0; @@ -181,7 +182,7 @@ PrivateScreen::triggerButtonPressBindings (CompOption::Vector &options, { if (action->button ().button () == (int) event->button) { - bindMods = virtualToRealModMask ( + bindMods = modHandler->virtualToRealModMask ( action->button ().modifiers ()); if ((bindMods & modMask) == (event->state & modMask)) @@ -198,7 +199,7 @@ PrivateScreen::triggerButtonPressBindings (CompOption::Vector &options, if ((action->button ().button () == (int) event->button) && (action->edgeMask () & edge)) { - bindMods = virtualToRealModMask ( + bindMods = modHandler->virtualToRealModMask ( action->button ().modifiers ()); if ((bindMods & modMask) == (event->state & modMask)) @@ -246,7 +247,7 @@ PrivateScreen::triggerKeyPressBindings (CompOption::Vector &options, { CompAction::State state = 0; CompAction *action; - unsigned int modMask = REAL_MOD_MASK & ~ignoredModMask; + unsigned int modMask = REAL_MOD_MASK & ~modHandler->ignoredModMask (); unsigned int bindMods; if (event->keycode == escapeKeyCode) @@ -276,7 +277,7 @@ PrivateScreen::triggerKeyPressBindings (CompOption::Vector &options, if (isInitiateBinding (option, CompAction::BindingTypeKey, state, &action)) { - bindMods = virtualToRealModMask ( + bindMods = modHandler->virtualToRealModMask ( action->key ().modifiers ()); if (action->key ().keycode () == (int) event->keycode) @@ -302,13 +303,13 @@ PrivateScreen::triggerKeyReleaseBindings (CompOption::Vector &options, XKeyEvent *event, CompOption::Vector &arguments) { - CompAction::State state = CompAction::StateTermKey; - CompAction *action; - unsigned int modMask = REAL_MOD_MASK & ~ignoredModMask; - unsigned int bindMods; - unsigned int mods; + CompAction::State state = CompAction::StateTermKey; + CompAction *action; + unsigned int modMask = REAL_MOD_MASK & ~modHandler->ignoredModMask (); + unsigned int bindMods; + unsigned int mods; - mods = keycodeToModifiers (event->keycode); + mods = modHandler->keycodeToModifiers (event->keycode); if (!xkbEvent && !mods) return false; @@ -317,7 +318,7 @@ PrivateScreen::triggerKeyReleaseBindings (CompOption::Vector &options, if (isTerminateBinding (option, CompAction::BindingTypeKey, state, &action)) { - bindMods = virtualToRealModMask (action->key ().modifiers ()); + bindMods = modHandler->virtualToRealModMask (action->key ().modifiers ()); if ((bindMods & modMask) == 0) { @@ -345,7 +346,7 @@ PrivateScreen::triggerStateNotifyBindings (CompOption::Vector &options, { CompAction::State state; CompAction *action; - unsigned int modMask = REAL_MOD_MASK & ~ignoredModMask; + unsigned int modMask = REAL_MOD_MASK & ~modHandler->ignoredModMask (); unsigned int bindMods; if (event->event_type == KeyPress) @@ -360,7 +361,7 @@ PrivateScreen::triggerStateNotifyBindings (CompOption::Vector &options, if (action->key ().keycode () == 0) { bindMods = - virtualToRealModMask (action->key ().modifiers ()); + modHandler->virtualToRealModMask (action->key ().modifiers ()); if ((event->mods & modMask & bindMods) == bindMods) { @@ -380,7 +381,7 @@ PrivateScreen::triggerStateNotifyBindings (CompOption::Vector &options, if (isTerminateBinding (option, CompAction::BindingTypeKey, state, &action)) { - bindMods = virtualToRealModMask (action->key ().modifiers ()); + bindMods = modHandler->virtualToRealModMask (action->key ().modifiers ()); if ((event->mods & modMask & bindMods) != bindMods) { @@ -1477,7 +1478,7 @@ CompScreen::handleEvent (XEvent *event) } break; case MappingNotify: - priv->updateModifierMappings (); + modHandler->updateModifierMappings (); break; case MapRequest: w = findWindow (event->xmaprequest.window); diff --git a/src/main.cpp b/src/main.cpp index b9ba1c5..ac2ffd7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -265,14 +265,21 @@ main (int argc, char **argv) coreMetadata->addFromFile ("core"); - screen = new CompScreen(); + screen = new CompScreen (); if (!screen) return 1; + modHandler = new ModifierHandler (); + + if (!modHandler) + return 1; + if (!screen->init (displayName)) return 1; + modHandler->updateModifierMappings (); + if (!disableSm) CompSession::initSession (clientId); @@ -282,6 +289,7 @@ main (int argc, char **argv) CompSession::closeSession (); delete screen; + delete modHandler; delete coreMetadata; xmlCleanupParser (); diff --git a/src/modifierhandler.cpp b/src/modifierhandler.cpp new file mode 100644 index 0000000..3e7c480 --- /dev/null +++ b/src/modifierhandler.cpp @@ -0,0 +1,204 @@ +/* + * Copyright © 2008 Dennis Kasprzyk + * Copyright © 2007 Novell, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Dennis Kasprzyk not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior permission. + * Dennis Kasprzyk makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + * + * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Authors: Dennis Kasprzyk <[email protected]> + * David Reveman <[email protected]> + * Sam Spilsbury <[email protected]> + */ + +#include <core/screen.h> +#include "privatescreen.h" + +const unsigned int ModifierHandler::virtualModMask[7] = { + CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask, + CompModeSwitchMask, CompNumLockMask, CompScrollLockMask +}; + +const int ModifierHandler::maskTable[8] = { + ShiftMask, LockMask, ControlMask, Mod1Mask, + Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask +}; + +unsigned int +ModifierHandler::ignoredModMask () +{ + return mIgnoredModMask; +} + +const XModifierKeymap * +ModifierHandler::modMap () +{ + return mModMap; +} + +void +ModifierHandler::updateModifierMappings () +{ + unsigned int modMask[CompModNum]; + int i, minKeycode, maxKeycode, keysymsPerKeycode = 0; + KeySym* key; + + for (i = 0; i < CompModNum; i++) + modMask[i] = 0; + + XDisplayKeycodes (screen->dpy (), &minKeycode, &maxKeycode); + key = XGetKeyboardMapping (screen->dpy (), + minKeycode, (maxKeycode - minKeycode + 1), + &keysymsPerKeycode); + + if (mModMap) + XFreeModifiermap (mModMap); + + mModMap = XGetModifierMapping (screen->dpy ()); + if (mModMap && mModMap->max_keypermod > 0) + { + KeySym keysym; + int index, size, mask; + + size = maskTableSize * mModMap->max_keypermod; + + for (i = 0; i < size; i++) + { + if (!mModMap->modifiermap[i]) + continue; + + index = 0; + do + { + keysym = XKeycodeToKeysym (screen->dpy (), + mModMap->modifiermap[i], + index++); + } while (!keysym && index < keysymsPerKeycode); + + if (keysym) + { + mask = maskTable[i / mModMap->max_keypermod]; + + if (keysym == XK_Alt_L || + keysym == XK_Alt_R) + { + modMask[CompModAlt] |= mask; + } + else if (keysym == XK_Meta_L || + keysym == XK_Meta_R) + { + modMask[CompModMeta] |= mask; + } + else if (keysym == XK_Super_L || + keysym == XK_Super_R) + { + modMask[CompModSuper] |= mask; + } + else if (keysym == XK_Hyper_L || + keysym == XK_Hyper_R) + { + modMask[CompModHyper] |= mask; + } + else if (keysym == XK_Mode_switch) + { + modMask[CompModModeSwitch] |= mask; + } + else if (keysym == XK_Scroll_Lock) + { + modMask[CompModScrollLock] |= mask; + } + else if (keysym == XK_Num_Lock) + { + modMask[CompModNumLock] |= mask; + } + } + } + + for (i = 0; i < CompModNum; i++) + { + if (!modMask[i]) + modMask[i] = CompNoMask; + } + + if (memcmp (modMask, mModMask, sizeof (modMask))) + { + memcpy (mModMask, modMask, sizeof (modMask)); + + mIgnoredModMask = LockMask | + (modMask[CompModNumLock] & ~CompNoMask) | + (modMask[CompModScrollLock] & ~CompNoMask); + + screen->priv->updatePassiveKeyGrabs (); + } + } + + if (key) + XFree (key); +} + +unsigned int +ModifierHandler::virtualToRealModMask (unsigned int modMask) +{ + int i; + + for (i = 0; i < CompModNum; i++) + { + if (modMask & virtualModMask[i]) + { + modMask &= ~virtualModMask[i]; + modMask |= mModMask[i]; + } + } + + return modMask; +} + +unsigned int +ModifierHandler::keycodeToModifiers (int keycode) +{ + unsigned int mods = 0; + int mod, k; + + for (mod = 0; mod < maskTableSize; mod++) + { + for (k = 0; k < mModMap->max_keypermod; k++) + { + if (mModMap->modifiermap[mod * + mModMap->max_keypermod + k] == keycode) + mods |= maskTable[mod]; + } + } + + return mods; +} + +ModifierHandler::ModifierHandler () : + mIgnoredModMask (LockMask), + mModMap (0) +{ + for (int i = 0; i < ModNum; i++) + mModMask[i] = NoMask; +} + +ModifierHandler::~ModifierHandler () +{ + if (mModMap) + XFreeModifiermap (mModMap); + + mModMap = NULL; +} diff --git a/src/privatescreen.h b/src/privatescreen.h index f5699b1..ac75616 100644 --- a/src/privatescreen.h +++ b/src/privatescreen.h @@ -319,12 +319,6 @@ class PrivateScreen { void updateScreenInfo (); - void updateModifierMappings (); - - unsigned int virtualToRealModMask (unsigned int modMask); - - unsigned int keycodeToModifiers (int keycode); - Window getActiveWindow (Window root); int getWmState (Window id); @@ -433,10 +427,6 @@ class PrivateScreen { Window below; char displayString[256]; - XModifierKeymap *modMap; - unsigned int modMask[CompModNum]; - unsigned int ignoredModMask; - KeyCode escapeKeyCode; KeyCode returnKeyCode; diff --git a/src/screen.cpp b/src/screen.cpp index 642cf10..e083632 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -61,11 +61,6 @@ #include "privatescreen.h" #include "privatewindow.h" -static unsigned int virtualModMask[] = { - CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask, - CompModeSwitchMask, CompNumLockMask, CompScrollLockMask -}; - bool inHandleEvent = false; CompScreen *targetScreen = NULL; @@ -86,10 +81,9 @@ typedef struct { unsigned long decorations; } MwmHints; +CompScreen *screen; - -CompScreen *screen; - +ModifierHandler *modHandler; #define NUM_OPTIONS(s) (sizeof ((s)->priv->opt) / sizeof (CompOption)) CompPrivateStorage::Indices screenPrivateIndices (0); @@ -586,12 +580,6 @@ const CompMetadata::OptionInfo coreOptionInfo[COMP_OPTION_NUM] = { { "focus_prevention_match", "match", 0, 0, 0 } }; -static const int maskTable[] = { - ShiftMask, LockMask, ControlMask, Mod1Mask, - Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask -}; -static const int maskTableSize = sizeof (maskTable) / sizeof (int); - static int errors = 0; static int @@ -692,7 +680,6 @@ CompScreen::syncEvent () return priv->syncEvent; } - SnDisplay * CompScreen::snDisplay () { @@ -891,142 +878,6 @@ CompScreen::setOption (const char *name, } void -PrivateScreen::updateModifierMappings () -{ - unsigned int modMask[CompModNum]; - int i, minKeycode, maxKeycode, keysymsPerKeycode = 0; - KeySym* key; - - for (i = 0; i < CompModNum; i++) - modMask[i] = 0; - - XDisplayKeycodes (this->dpy, &minKeycode, &maxKeycode); - key = XGetKeyboardMapping (this->dpy, - minKeycode, (maxKeycode - minKeycode + 1), - &keysymsPerKeycode); - - if (this->modMap) - XFreeModifiermap (this->modMap); - - this->modMap = XGetModifierMapping (this->dpy); - if (this->modMap && this->modMap->max_keypermod > 0) - { - KeySym keysym; - int index, size, mask; - - size = maskTableSize * this->modMap->max_keypermod; - - for (i = 0; i < size; i++) - { - if (!this->modMap->modifiermap[i]) - continue; - - index = 0; - do - { - keysym = XKeycodeToKeysym (this->dpy, - this->modMap->modifiermap[i], - index++); - } while (!keysym && index < keysymsPerKeycode); - - if (keysym) - { - mask = maskTable[i / this->modMap->max_keypermod]; - - if (keysym == XK_Alt_L || - keysym == XK_Alt_R) - { - modMask[CompModAlt] |= mask; - } - else if (keysym == XK_Meta_L || - keysym == XK_Meta_R) - { - modMask[CompModMeta] |= mask; - } - else if (keysym == XK_Super_L || - keysym == XK_Super_R) - { - modMask[CompModSuper] |= mask; - } - else if (keysym == XK_Hyper_L || - keysym == XK_Hyper_R) - { - modMask[CompModHyper] |= mask; - } - else if (keysym == XK_Mode_switch) - { - modMask[CompModModeSwitch] |= mask; - } - else if (keysym == XK_Scroll_Lock) - { - modMask[CompModScrollLock] |= mask; - } - else if (keysym == XK_Num_Lock) - { - modMask[CompModNumLock] |= mask; - } - } - } - - for (i = 0; i < CompModNum; i++) - { - if (!modMask[i]) - modMask[i] = CompNoMask; - } - - if (memcmp (modMask, this->modMask, sizeof (modMask))) - { - memcpy (this->modMask, modMask, sizeof (modMask)); - - this->ignoredModMask = LockMask | - (modMask[CompModNumLock] & ~CompNoMask) | - (modMask[CompModScrollLock] & ~CompNoMask); - - this->updatePassiveKeyGrabs (); - } - } - - if (key) - XFree (key); -} - -unsigned int -PrivateScreen::virtualToRealModMask (unsigned int modMask) -{ - int i; - - for (i = 0; i < CompModNum; i++) - { - if (modMask & virtualModMask[i]) - { - modMask &= ~virtualModMask[i]; - modMask |= this->modMask[i]; - } - } - - return modMask; -} - -unsigned int -PrivateScreen::keycodeToModifiers (int keycode) -{ - unsigned int mods = 0; - int mod, k; - - for (mod = 0; mod < maskTableSize; mod++) - { - for (k = 0; k < modMap->max_keypermod; k++) - { - if (modMap->modifiermap[mod * - modMap->max_keypermod + k] == keycode) - mods |= maskTable[mod]; - } - } - - return mods; -} - -void PrivateScreen::processEvents () { XEvent event; @@ -3000,14 +2851,14 @@ PrivateScreen::grabUngrabKeys (unsigned int modifiers, int keycode, bool grab) { - int mod, k; - unsigned int ignore; + int mod, k; + unsigned int ignore; CompScreen::checkForError (dpy); - for (ignore = 0; ignore <= ignoredModMask; ignore++) + for (ignore = 0; ignore <= modHandler->ignoredModMask (); ignore++) { - if (ignore & ~ignoredModMask) + if (ignore & ~modHandler->ignoredModMask ()) continue; if (keycode != 0) @@ -3020,15 +2871,15 @@ PrivateScreen::grabUngrabKeys (unsigned int modifiers, { if (modifiers & (1 << mod)) { - for (k = mod * modMap->max_keypermod; - k < (mod + 1) * modMap->max_keypermod; + for (k = mod * modHandler->modMap ()->max_keypermod; + k < (mod + 1) * modHandler->modMap ()->max_keypermod; k++) { - if (modMap->modifiermap[k]) + if (modHandler->modMap ()->modifiermap[k]) { grabUngrabOneKey ((modifiers & ~(1 << mod)) | ignore, - modMap->modifiermap[k], + modHandler->modMap ()->modifiermap[k], grab); } } @@ -3050,7 +2901,7 @@ PrivateScreen::addPassiveKeyGrab (CompAction::KeyBinding &key) unsigned int mask; std::list<KeyGrab>::iterator it; - mask = virtualToRealModMask (key.modifiers ()); + mask = modHandler->virtualToRealModMask (key.modifiers ()); for (it = keyGrabs.begin (); it != keyGrabs.end (); it++) { @@ -3085,7 +2936,7 @@ PrivateScreen::removePassiveKeyGrab (CompAction::KeyBinding &key) unsigned int mask; std::list<KeyGrab>::iterator it; - mask = virtualToRealModMask (key.modifiers ()); + mask = modHandler->virtualToRealModMask (key.modifiers ()); for (it = keyGrabs.begin (); it != keyGrabs.end (); it++) { @@ -4408,8 +4259,6 @@ CompScreen::init (const char *name) XSetErrorHandler (errorHandler); - priv->updateModifierMappings (); - priv->snDisplay = sn_display_new (dpy, NULL, NULL); if (!priv->snDisplay) return true; @@ -4792,9 +4641,6 @@ CompScreen::~CompScreen () XSync (priv->dpy, False); XCloseDisplay (priv->dpy); - if (priv->modMap) - XFreeModifiermap (priv->modMap); - if (priv->watchPollFds) free (priv->watchPollFds); @@ -4816,8 +4662,6 @@ PrivateScreen::PrivateScreen (CompScreen *screen) : screenInfo (0), activeWindow (0), below (None), - modMap (0), - ignoredModMask (LockMask), autoRaiseTimer (), autoRaiseWindow (0), edgeDelayTimer (), @@ -4855,8 +4699,6 @@ PrivateScreen::PrivateScreen (CompScreen *screen) : initialized (false), opt (COMP_OPTION_NUM) { - for (int i = 0; i < CompModNum; i++) - modMask[i] = CompNoMask; memset (history, 0, sizeof (history)); gettimeofday (&lastTimeout, 0); } -- 1.5.6
From 035008338779c80ce4f31571c3b4ca28702d55b5 Mon Sep 17 00:00:00 2001 From: Sam Spilsbury <[email protected]> Date: Tue, 10 Feb 2009 21:26:11 +0900 Subject: [PATCH] \newline fix --- include/composite/composite.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/include/composite/composite.h b/include/composite/composite.h index dc6a597..3f15364 100644 --- a/include/composite/composite.h +++ b/include/composite/composite.h @@ -1,6 +1,3 @@ - - - /* * Copyright © 2008 Dennis Kasprzyk * Copyright © 2007 Novell, Inc. -- 1.5.6
_______________________________________________ Dev mailing list [email protected] http://lists.compiz-fusion.org/mailman/listinfo/dev
