more configurability - thanks to David Pittman

svn path=/trunk/kdebase/kwin/; revision=68922

options.cpp

@@ -162,6 +162,9 @@ void Options::reload()
     if ( val == "CDE" )
 	altTabStyle = CDE;
 
+    // Enable the grab of control-TAB?
+    useControlTab = config->readBoolEntry ("ControlTab", TRUE);
+
     val = config->readEntry("Placement","Smart");
     if (val == "Smart") placement = Smart;
     else if (val == "Random") placement = Random;

options.h

@@ -94,6 +94,12 @@ public:
     AltTabStyle altTabStyle;
 
 
+    /**
+       Control-TAB shortcut to switch virtual desktop.
+    */
+    bool useControlTab;
+
+
     /**
        MoveResizeMode, either Tranparent or Opaque.
      */
@@ -155,13 +161,13 @@ public:
      * the number of animation steps (would this be general?)
      */
     int windowSnapZone;
-    
-    
+
+
     /**
      * whether we animate the minimization of windows or not
      */
     bool  animateMinimize;
-    
+
     /**
      * Animation speed (0 .. 10 )
     */

workspace.cpp

@@ -262,8 +262,13 @@ Workspace::Workspace( bool restore )
 
     grabKey(XK_Tab, Mod1Mask);
     grabKey(XK_Tab, Mod1Mask | ShiftMask);
-    grabKey(XK_Tab, ControlMask);
-    grabKey(XK_Tab, ControlMask | ShiftMask);
+
+    // Do this unless the user disabled it...
+    if (options->useControlTab) {
+	grabKey(XK_Tab, ControlMask);
+	grabKey(XK_Tab, ControlMask | ShiftMask);
+    }
+
     createKeybindings();
     tab_box = new TabBox( this );