From 723682024dcd39e5814eb240d3cd8d1a92b71e0f Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 30 Jan 2015 21:15:47 -0700 Subject: [PATCH] Remove setctrl No longer need setctrl. New xkb option added to swap windows and control keys, which is added to the external keyboard via /usr/share/xorg.conf.d file. This in the cmstorm repository. --- dispcfg | 4 ---- setctrl | 42 ------------------------------------------ 2 files changed, 46 deletions(-) delete mode 100755 setctrl diff --git a/dispcfg b/dispcfg index f0cc4a2..9c99611 100755 --- a/dispcfg +++ b/dispcfg @@ -231,10 +231,6 @@ if __name__ == '__main__': enabled_count -= disable_an_entry(outputs) enabled_count += enable_an_entry(outputs, enabled_count < 2) - # A hack to set Control/Win key mapping - if not dry_run: - subprocess.call('/usr/local/bin/setctrl') - out.outTime('completed') out.fout('') diff --git a/setctrl b/setctrl deleted file mode 100755 index 77d5ae3..0000000 --- a/setctrl +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Set the Control/Win key swap state. This is a hack of a script. -# If the CM Storm keyboard is present, swap Control and Win (Super) keys. If -# this keyboard is not present, unswap. Steve's CM Storm keyboard has had its -# Control and Win keycaps swapped, as the proper Control key locations are, on -# this keyboard, where the Windows keys are by default. - -swapctrl() -{ -xmodmap -e "clear Control" -xmodmap -e "clear Mod4" -xmodmap -e "keycode 133 = Control_L NoSymbol Control_L" -xmodmap -e "keycode 37 = Super_L NoSymbol Super_L" -xmodmap -e "keycode 134 = Control_R NoSymbol Control_R" -xmodmap -e "keycode 105 = Super_R NoSymbol Super_R" -xmodmap -e "keycode 206 =" -xmodmap -e "add Control = Control_L Control_R" -xmodmap -e "add Mod4 = Super_L Super_R" -} - -unswapctrl() -{ -xmodmap -e "clear Control" -xmodmap -e "clear Mod4" -xmodmap -e "keycode 37 = Control_L NoSymbol Control_L" -xmodmap -e "keycode 133 = Super_L NoSymbol Super_L" -xmodmap -e "keycode 206 = NoSymbol Super_L NoSymbol Super_L" -xmodmap -e "keycode 105 = Control_R NoSymbol Control_R" -xmodmap -e "keycode 134 = Super_R NoSymbol Super_R" -xmodmap -e "add Control = Control_L Control_R" -xmodmap -e "add Mod4 = Super_L Super_R" -} - - -if xinput --list --name-only | grep -q "CM Storm"; then - echo 'Swapping Control and Windows/Super keys' - swapctrl -else - echo 'Restoring Control and Windows/Super keys' - unswapctrl -fi -exit 0 -- 2.39.2