summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2006-09-21 14:06:21 +0000
committerMatthew Allum <mallum@openedhand.com>2006-09-21 14:06:21 +0000
commit2b9b7684a6059ecfc31b125509bf779f7dda7109 (patch)
tree99a8853e8e538504a4fd99e10c73397d138f815e /meta
parent234159862e3500c9861de3aa22a80a9b6979b838 (diff)
downloadpoky-2b9b7684a6059ecfc31b125509bf779f7dda7109.tar.gz
removed uneeded per machine key setups and merge in single kbdconfig file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@737 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig54
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm/kbdconfig21
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch12
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig48
4 files changed, 8 insertions, 127 deletions
diff --git a/meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
deleted file mode 100644
index d56625f394..0000000000
--- a/meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
+++ /dev/null
@@ -1,54 +0,0 @@
1#
2# This is an example keyboard config file for matchbox
3#
4# You can edit this file or change per user by copying to
5# ~/.matchbox/kbdconfig
6#
7# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
8
9### Window operation short cuts
10
11<Alt>n=next
12<Alt>p=prev
13<Alt>c=close
14<Alt>d=desktop
15<Alt>m=!matchbox-remote -mbmenu
16
17### App launching.
18
19<ctrl><alt>x=!xterm
20<ctrl><alt>r=!rxvt
21
22### App launching with startup notify
23
24<ctrl><alt>e=!!gpe-calender
25
26### windows style key shortcuts
27
28<alt>Tab=next
29<alt><shift>Tab=prev
30
31<alt>space=taskmenu
32<alt>escape=!matchbox-remote -mbmenu
33<alt>f4=close
34
35f11=fullscreen
36
37### super should be a 'window' key, uncomment '#' if you have one.
38
39#<super>d=desktop
40#<super>r=!xterm
41#<super>e=!!nautilus
42
43### Special keys, likely probably only available on extended keyboards.
44
45#App=!matchbox-remote -mbmenu
46#Menu=!matchbox-remote -mbmenu
47
48# Shortcut keys for collie
49XF86Calendar=!$gpe-calendar
50telephone=!$gpe-contacts
51XF86Start=!matchbox-remote -desktop
52F2=!matchbox-remote -mbmenu
53XF86Mail=!$gpe-taskmanager
54Escape=close
diff --git a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
index 633d3672a3..239da8f57c 100644
--- a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
+++ b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
@@ -19,9 +19,15 @@
19<ctrl><alt>x=!xterm 19<ctrl><alt>x=!xterm
20<ctrl><alt>r=!rxvt 20<ctrl><alt>r=!rxvt
21 21
22### App launching with startup notify 22### poky additions
23 23
24<ctrl><alt>e=!!gpe-calender 24XF86Calendar=!$contacts
25telephone=!$dates
26XF86Start=!matchbox-remote -desktop
27F2=!matchbox-remote -mbmenu
28
29#XF86Mail=!$tasks
30#Escape=close
25 31
26### windows style key shortcuts 32### windows style key shortcuts
27 33
@@ -34,14 +40,3 @@
34 40
35f11=fullscreen 41f11=fullscreen
36 42
37### super should be a 'window' key, uncomment '#' if you have one.
38
39#<super>d=desktop
40#<super>r=!xterm
41#<super>e=!!nautilus
42
43### Special keys, likely probably only available on extended keyboards.
44
45#App=!matchbox-remote -mbmenu
46#Menu=!matchbox-remote -mbmenu
47
diff --git a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch
deleted file mode 100644
index 8fd1dc3f4b..0000000000
--- a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- data/kbdconfig~ 2004-07-11 00:59:25.000000000 +0200
2+++ data/kbdconfig 2004-07-11 00:59:25.000000000 +0200
3@@ -28,7 +28,8 @@
4 <alt>escape=!mbcontrol -mbmenu
5 <alt>f4=close
6
7-f11=fullscreen
8+#Please don't do this, it breaks suspending on SimPad
9+#f11=fullscreen
10
11 ### super should be windows keys
12
diff --git a/meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
deleted file mode 100644
index 4c2d949e43..0000000000
--- a/meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
+++ /dev/null
@@ -1,48 +0,0 @@
1#
2# This is an example keyboard config file for matchbox
3#
4# You can edit this file or change per user by copying to
5# ~/.matchbox/kbdconfig
6#
7# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
8
9### Window operation short cuts
10
11<Alt>n=next
12<Alt>p=prev
13<Alt>c=close
14<Alt>d=desktop
15<Alt>m=!matchbox-remote -mbmenu
16
17### App launching.
18
19<ctrl><alt>x=!xterm
20<ctrl><alt>r=!rxvt
21
22### App launching with startup notify
23
24<ctrl><alt>e=!!gpe-calender
25
26### windows style key shortcuts
27
28<alt>Tab=next
29<alt><shift>Tab=prev
30
31<alt>space=taskmenu
32<alt>escape=!matchbox-remote -mbmenu
33<alt>f4=close
34
35#Please don't do this, it breaks suspending on SimPad
36#f11=fullscreen
37
38### super should be a 'window' key, uncomment '#' if you have one.
39
40#<super>d=desktop
41#<super>r=!xterm
42#<super>e=!!nautilus
43
44### Special keys, likely probably only available on extended keyboards.
45
46#App=!matchbox-remote -mbmenu
47#Menu=!matchbox-remote -mbmenu
48