diff options
-rw-r--r-- | data/Makefile.am | 24 | ||||
-rw-r--r-- | data/init.lua.in (renamed from data/init.in) | 4 | ||||
-rw-r--r-- | data/keys | 137 | ||||
-rw-r--r-- | data/keys.lua | 137 | ||||
-rw-r--r-- | data/windowmenu.lua (renamed from data/windowmenu) | 0 | ||||
-rw-r--r-- | src/main.cc | 6 |
6 files changed, 154 insertions, 154 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c71f820..75dd18a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am | |||
@@ -12,18 +12,18 @@ DEFAULT_INIT = @DEFAULT_INIT@ | |||
12 | DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@ | 12 | DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@ |
13 | 13 | ||
14 | SUBDIRS= styles | 14 | SUBDIRS= styles |
15 | CLEANFILES= menu menu.in menu.pre menu.bak init apps | 15 | CLEANFILES= menu.lua init.lua apps |
16 | MAINTAINERCLEANFILES= Makefile.in | 16 | MAINTAINERCLEANFILES= Makefile.in |
17 | pkgdata_DATA= keys menu init apps overlay windowmenu | 17 | pkgdata_DATA= keys.lua menu.lua init.lua apps overlay windowmenu.lua |
18 | EXTRA_DIST= keys init.in apps.in overlay windowmenu | 18 | EXTRA_DIST= keys.lua init.lua.in apps.in overlay windowmenu.lua |
19 | all-local: menu init apps | 19 | all-local: menu.lua init.lua apps |
20 | install-pkgdataDATA: | 20 | install-pkgdataDATA: |
21 | @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" | 21 | @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" |
22 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU)) | 22 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU)) |
23 | $(INSTALL_DATA) ./menu $(DESTDIR)$(DEFAULT_MENU) | 23 | $(INSTALL_DATA) ./menu.lua $(DESTDIR)$(DEFAULT_MENU) |
24 | @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)" | 24 | @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)" |
25 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS)) | 25 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS)) |
26 | $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS) | 26 | $(INSTALL_DATA) $(srcdir)/keys.lua $(DESTDIR)$(DEFAULT_KEYS) |
27 | @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)" | 27 | @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)" |
28 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS)) | 28 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS)) |
29 | $(INSTALL_DATA) ./apps $(DESTDIR)$(DEFAULT_APPS) | 29 | $(INSTALL_DATA) ./apps $(DESTDIR)$(DEFAULT_APPS) |
@@ -32,26 +32,26 @@ install-pkgdataDATA: | |||
32 | $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY) | 32 | $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY) |
33 | @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" | 33 | @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" |
34 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) | 34 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) |
35 | $(INSTALL_DATA) ./init $(DESTDIR)$(DEFAULT_INIT) | 35 | $(INSTALL_DATA) ./init.lua $(DESTDIR)$(DEFAULT_INIT) |
36 | @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)" | 36 | @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)" |
37 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU)) | 37 | $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU)) |
38 | $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU) | 38 | $(INSTALL_DATA) $(srcdir)/windowmenu.lua $(DESTDIR)$(DEFAULT_WINDOWMENU) |
39 | 39 | ||
40 | distclean-local: | 40 | distclean-local: |
41 | rm -f *\~ | 41 | rm -f *\~ |
42 | init: init.in | 42 | init.lua: init.lua.in |
43 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ | 43 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ |
44 | -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ | 44 | -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ |
45 | -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ | 45 | -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ |
46 | -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init | 46 | -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.lua.in > init.lua |
47 | 47 | ||
48 | apps: apps.in | 48 | apps: apps.in |
49 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ | 49 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ |
50 | -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ | 50 | -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ |
51 | -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps | 51 | -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps |
52 | 52 | ||
53 | menu: ../util/fluxbox-generate_menu | 53 | menu.lua: ../util/fluxbox-generate_menu |
54 | env MENUFILENAME=menu \ | 54 | env MENUFILENAME=menu.lua \ |
55 | PREFIX="${prefix}" \ | 55 | PREFIX="${prefix}" \ |
56 | MENUTITLE="Fluxbox-${VERSION}" \ | 56 | MENUTITLE="Fluxbox-${VERSION}" \ |
57 | INSTALL=Yes \ | 57 | INSTALL=Yes \ |
diff --git a/data/init.in b/data/init.lua.in index e98d3b0..0416593 100644 --- a/data/init.in +++ b/data/init.lua.in | |||
@@ -1,7 +1,7 @@ | |||
1 | -- If you're looking for settings to configure, they won't be saved here until | 1 | -- If you're looking for settings to configure, they won't be saved here until |
2 | -- you change something in the fluxbox configuration menu. | 2 | -- you change something in the fluxbox configuration menu. |
3 | 3 | ||
4 | session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu2' | 4 | session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu.lua' |
5 | session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys' | 5 | session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys.lua' |
6 | session.styleFile = '@default_style@' | 6 | session.styleFile = '@default_style@' |
7 | session.configVersion = 14 | 7 | session.configVersion = 14 |
diff --git a/data/keys b/data/keys deleted file mode 100644 index 0567d04..0000000 --- a/data/keys +++ /dev/null | |||
@@ -1,137 +0,0 @@ | |||
1 | # click on the desktop to get menus | ||
2 | OnDesktop Mouse1 :HideMenus | ||
3 | OnDesktop Mouse2 :WorkspaceMenu | ||
4 | OnDesktop Mouse3 :RootMenu | ||
5 | |||
6 | # scroll on the desktop to change workspaces | ||
7 | OnDesktop Mouse4 :PrevWorkspace | ||
8 | OnDesktop Mouse5 :NextWorkspace | ||
9 | |||
10 | # scroll on the toolbar to change current window | ||
11 | OnToolbar Mouse4 :PrevWindow {static groups} (iconhidden=no) | ||
12 | OnToolbar Mouse5 :NextWindow {static groups} (iconhidden=no) | ||
13 | |||
14 | # alt + left/right click to move/resize a window | ||
15 | OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving} | ||
16 | OnWindowBorder Move1 :StartMoving | ||
17 | |||
18 | OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner} | ||
19 | OnLeftGrip Move1 :StartResizing bottomleft | ||
20 | OnRightGrip Move1 :StartResizing bottomright | ||
21 | |||
22 | # alt + middle click to lower the window | ||
23 | OnWindow Mod1 Mouse2 :Lower | ||
24 | |||
25 | # control-click a window's titlebar and drag to attach windows | ||
26 | OnTitlebar Control Mouse1 :StartTabbing | ||
27 | |||
28 | # double click on the titlebar to shade | ||
29 | OnTitlebar Double Mouse1 :Shade | ||
30 | |||
31 | # left click on the titlebar to move the window | ||
32 | OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab} | ||
33 | OnTitlebar Move1 :StartMoving | ||
34 | |||
35 | # middle click on the titlebar to lower | ||
36 | OnTitlebar Mouse2 :Lower | ||
37 | |||
38 | # right click on the titlebar for a menu of options | ||
39 | OnTitlebar Mouse3 :WindowMenu | ||
40 | |||
41 | # alt-tab | ||
42 | Mod1 Tab :NextWindow {groups} (workspace=[current]) | ||
43 | Mod1 Shift Tab :PrevWindow {groups} (workspace=[current]) | ||
44 | |||
45 | # cycle through tabs in the current window | ||
46 | Mod4 Tab :NextTab | ||
47 | Mod4 Shift Tab :PrevTab | ||
48 | |||
49 | # go to a specific tab in the current window | ||
50 | Mod4 1 :Tab 1 | ||
51 | Mod4 2 :Tab 2 | ||
52 | Mod4 3 :Tab 3 | ||
53 | Mod4 4 :Tab 4 | ||
54 | Mod4 5 :Tab 5 | ||
55 | Mod4 6 :Tab 6 | ||
56 | Mod4 7 :Tab 7 | ||
57 | Mod4 8 :Tab 8 | ||
58 | Mod4 9 :Tab 9 | ||
59 | |||
60 | # open a terminal | ||
61 | Mod1 F1 :Exec xterm | ||
62 | |||
63 | # open a dialog to run programs | ||
64 | Mod1 F2 :Exec fbrun | ||
65 | |||
66 | # volume settings, using common keycodes | ||
67 | # if these don't work, use xev to find out your real keycodes | ||
68 | 176 :Exec amixer sset Master,0 1+ | ||
69 | 174 :Exec amixer sset Master,0 1- | ||
70 | 160 :Exec amixer sset Master,0 toggle | ||
71 | |||
72 | # current window commands | ||
73 | Mod1 F4 :Close | ||
74 | Mod1 F5 :Kill | ||
75 | Mod1 F9 :Minimize | ||
76 | Mod1 F10 :Maximize | ||
77 | Mod1 F11 :Fullscreen | ||
78 | |||
79 | # open the window menu | ||
80 | Mod1 space :WindowMenu | ||
81 | |||
82 | # exit fluxbox | ||
83 | Control Mod1 Delete :Exit | ||
84 | |||
85 | # change to previous/next workspace | ||
86 | Control Mod1 Left :PrevWorkspace | ||
87 | Control Mod1 Right :NextWorkspace | ||
88 | |||
89 | # send the current window to previous/next workspace | ||
90 | Mod4 Left :SendToPrevWorkspace | ||
91 | Mod4 Right :SendToNextWorkspace | ||
92 | |||
93 | # send the current window and follow it to previous/next workspace | ||
94 | Control Mod4 Left :TakeToPrevWorkspace | ||
95 | Control Mod4 Right :TakeToNextWorkspace | ||
96 | |||
97 | # change to a specific workspace | ||
98 | Control F1 :Workspace 1 | ||
99 | Control F2 :Workspace 2 | ||
100 | Control F3 :Workspace 3 | ||
101 | Control F4 :Workspace 4 | ||
102 | Control F5 :Workspace 5 | ||
103 | Control F6 :Workspace 6 | ||
104 | Control F7 :Workspace 7 | ||
105 | Control F8 :Workspace 8 | ||
106 | Control F9 :Workspace 9 | ||
107 | Control F10 :Workspace 10 | ||
108 | Control F11 :Workspace 11 | ||
109 | Control F12 :Workspace 12 | ||
110 | |||
111 | # send the current window to a specific workspace | ||
112 | Mod4 F1 :SendToWorkspace 1 | ||
113 | Mod4 F2 :SendToWorkspace 2 | ||
114 | Mod4 F3 :SendToWorkspace 3 | ||
115 | Mod4 F4 :SendToWorkspace 4 | ||
116 | Mod4 F5 :SendToWorkspace 5 | ||
117 | Mod4 F6 :SendToWorkspace 6 | ||
118 | Mod4 F7 :SendToWorkspace 7 | ||
119 | Mod4 F8 :SendToWorkspace 8 | ||
120 | Mod4 F9 :SendToWorkspace 9 | ||
121 | Mod4 F10 :SendToWorkspace 10 | ||
122 | Mod4 F11 :SendToWorkspace 11 | ||
123 | Mod4 F12 :SendToWorkspace 12 | ||
124 | |||
125 | # send the current window and change to a specific workspace | ||
126 | Control Mod4 F1 :TakeToWorkspace 1 | ||
127 | Control Mod4 F2 :TakeToWorkspace 2 | ||
128 | Control Mod4 F3 :TakeToWorkspace 3 | ||
129 | Control Mod4 F4 :TakeToWorkspace 4 | ||
130 | Control Mod4 F5 :TakeToWorkspace 5 | ||
131 | Control Mod4 F6 :TakeToWorkspace 6 | ||
132 | Control Mod4 F7 :TakeToWorkspace 7 | ||
133 | Control Mod4 F8 :TakeToWorkspace 8 | ||
134 | Control Mod4 F9 :TakeToWorkspace 9 | ||
135 | Control Mod4 F10 :TakeToWorkspace 10 | ||
136 | Control Mod4 F11 :TakeToWorkspace 11 | ||
137 | Control Mod4 F12 :TakeToWorkspace 12 | ||
diff --git a/data/keys.lua b/data/keys.lua new file mode 100644 index 0000000..aa21145 --- /dev/null +++ b/data/keys.lua | |||
@@ -0,0 +1,137 @@ | |||
1 | -- click on the desktop to get menus | ||
2 | default_keymode:addBinding('OnDesktop Mouse1', 'HideMenus') | ||
3 | default_keymode:addBinding('OnDesktop Mouse2', 'WorkspaceMenu') | ||
4 | default_keymode:addBinding('OnDesktop Mouse3', 'RootMenu') | ||
5 | |||
6 | -- scroll on the desktop to change workspaces | ||
7 | default_keymode:addBinding('OnDesktop Mouse4', 'PrevWorkspace') | ||
8 | default_keymode:addBinding('OnDesktop Mouse5', 'NextWorkspace') | ||
9 | |||
10 | -- scroll on the toolbar to change current window | ||
11 | default_keymode:addBinding('OnToolbar Mouse4', 'PrevWindow {static groups} (iconhidden=no)') | ||
12 | default_keymode:addBinding('OnToolbar Mouse5', 'NextWindow {static groups} (iconhidden=no)') | ||
13 | |||
14 | -- alt + left/right click to move/resize a window | ||
15 | default_keymode:addBinding('OnWindow Mod1 Mouse1', 'MacroCmd {Raise} {Focus} {StartMoving}') | ||
16 | default_keymode:addBinding('OnWindowBorder Move1', 'StartMoving') | ||
17 | |||
18 | default_keymode:addBinding('OnWindow Mod1 Mouse3', 'MacroCmd {Raise} {Focus} {StartResizing NearestCorner}') | ||
19 | default_keymode:addBinding('OnLeftGrip Move1', 'StartResizing bottomleft') | ||
20 | default_keymode:addBinding('OnRightGrip Move1', 'StartResizing bottomright') | ||
21 | |||
22 | -- alt + middle click to lower the window | ||
23 | default_keymode:addBinding('OnWindow Mod1 Mouse2', 'Lower') | ||
24 | |||
25 | -- control-click a window's titlebar and drag to attach windows | ||
26 | default_keymode:addBinding('OnTitlebar Control Mouse1', 'StartTabbing') | ||
27 | |||
28 | -- double click on the titlebar to shade | ||
29 | default_keymode:addBinding('OnTitlebar Double Mouse1', 'Shade') | ||
30 | |||
31 | -- left click on the titlebar to move the window | ||
32 | default_keymode:addBinding('OnTitlebar Mouse1', 'MacroCmd {Raise} {Focus} {ActivateTab}') | ||
33 | default_keymode:addBinding('OnTitlebar Move1 ', 'StartMoving') | ||
34 | |||
35 | -- middle click on the titlebar to lower | ||
36 | default_keymode:addBinding('OnTitlebar Mouse2', 'Lower') | ||
37 | |||
38 | -- right click on the titlebar for a menu of options | ||
39 | default_keymode:addBinding('OnTitlebar Mouse3', 'WindowMenu') | ||
40 | |||
41 | -- alt-tab | ||
42 | default_keymode:addBinding('Mod1 Tab', 'NextWindow {groups} (workspace=[current])') | ||
43 | default_keymode:addBinding('Mod1 Shift Tab', 'PrevWindow {groups} (workspace=[current])') | ||
44 | |||
45 | -- cycle through tabs in the current window | ||
46 | default_keymode:addBinding('Mod4 Tab', 'NextTab') | ||
47 | default_keymode:addBinding('Mod4 Shift Tab', 'PrevTab') | ||
48 | |||
49 | -- go to a specific tab in the current window | ||
50 | default_keymode:addBinding('Mod4 1', 'Tab 1') | ||
51 | default_keymode:addBinding('Mod4 2', 'Tab 2') | ||
52 | default_keymode:addBinding('Mod4 3', 'Tab 3') | ||
53 | default_keymode:addBinding('Mod4 4', 'Tab 4') | ||
54 | default_keymode:addBinding('Mod4 5', 'Tab 5') | ||
55 | default_keymode:addBinding('Mod4 6', 'Tab 6') | ||
56 | default_keymode:addBinding('Mod4 7', 'Tab 7') | ||
57 | default_keymode:addBinding('Mod4 8', 'Tab 8') | ||
58 | default_keymode:addBinding('Mod4 9', 'Tab 9') | ||
59 | |||
60 | -- open a terminal | ||
61 | default_keymode:addBinding('Mod1 F1', 'Exec xterm') | ||
62 | |||
63 | -- open a dialog to run programs | ||
64 | default_keymode:addBinding('Mod1 F2', 'Exec fbrun') | ||
65 | |||
66 | -- volume settings, using common keycodes | ||
67 | -- if these don't work, use xev to find out your real keycodes | ||
68 | default_keymode:addBinding('176', 'Exec amixer sset Master,0 1+') | ||
69 | default_keymode:addBinding('174', 'Exec amixer sset Master,0 1-') | ||
70 | default_keymode:addBinding('160', 'Exec amixer sset Master,0 toggle') | ||
71 | |||
72 | -- current window commands | ||
73 | default_keymode:addBinding('Mod1 F4', 'Close') | ||
74 | default_keymode:addBinding('Mod1 F5', 'Kill') | ||
75 | default_keymode:addBinding('Mod1 F9', 'Minimize') | ||
76 | default_keymode:addBinding('Mod1 F10', 'Maximize') | ||
77 | default_keymode:addBinding('Mod1 F11', 'Fullscreen') | ||
78 | |||
79 | -- open the window menu | ||
80 | default_keymode:addBinding('Mod1 space', 'WindowMenu') | ||
81 | |||
82 | -- exit fluxbox | ||
83 | default_keymode:addBinding('Control Mod1 Delete', 'Exit') | ||
84 | |||
85 | -- change to previous/next workspace | ||
86 | default_keymode:addBinding('Control Mod1 Left', 'PrevWorkspace') | ||
87 | default_keymode:addBinding('Control Mod1 Right', 'NextWorkspace') | ||
88 | |||
89 | -- send the current window to previous/next workspace | ||
90 | default_keymode:addBinding('Mod4 Left', 'SendToPrevWorkspace') | ||
91 | default_keymode:addBinding('Mod4 Right', 'SendToNextWorkspace') | ||
92 | |||
93 | -- send the current window and follow it to previous/next workspace | ||
94 | default_keymode:addBinding('Control Mod4 Left', 'TakeToPrevWorkspace') | ||
95 | default_keymode:addBinding('Control Mod4 Right', 'TakeToNextWorkspace') | ||
96 | |||
97 | -- change to a specific workspace | ||
98 | default_keymode:addBinding('Control F1', 'Workspace 1') | ||
99 | default_keymode:addBinding('Control F2', 'Workspace 2') | ||
100 | default_keymode:addBinding('Control F3', 'Workspace 3') | ||
101 | default_keymode:addBinding('Control F4', 'Workspace 4') | ||
102 | default_keymode:addBinding('Control F5', 'Workspace 5') | ||
103 | default_keymode:addBinding('Control F6', 'Workspace 6') | ||
104 | default_keymode:addBinding('Control F7', 'Workspace 7') | ||
105 | default_keymode:addBinding('Control F8', 'Workspace 8') | ||
106 | default_keymode:addBinding('Control F9', 'Workspace 9') | ||
107 | default_keymode:addBinding('Control F10', 'Workspace 10') | ||
108 | default_keymode:addBinding('Control F11', 'Workspace 11') | ||
109 | default_keymode:addBinding('Control F12', 'Workspace 12') | ||
110 | |||
111 | -- send the current window to a specific workspace | ||
112 | default_keymode:addBinding('Mod4 F1', 'SendToWorkspace 1') | ||
113 | default_keymode:addBinding('Mod4 F2', 'SendToWorkspace 2') | ||
114 | default_keymode:addBinding('Mod4 F3', 'SendToWorkspace 3') | ||
115 | default_keymode:addBinding('Mod4 F4', 'SendToWorkspace 4') | ||
116 | default_keymode:addBinding('Mod4 F5', 'SendToWorkspace 5') | ||
117 | default_keymode:addBinding('Mod4 F6', 'SendToWorkspace 6') | ||
118 | default_keymode:addBinding('Mod4 F7', 'SendToWorkspace 7') | ||
119 | default_keymode:addBinding('Mod4 F8', 'SendToWorkspace 8') | ||
120 | default_keymode:addBinding('Mod4 F9', 'SendToWorkspace 9') | ||
121 | default_keymode:addBinding('Mod4 F10', 'SendToWorkspace 10') | ||
122 | default_keymode:addBinding('Mod4 F11', 'SendToWorkspace 11') | ||
123 | default_keymode:addBinding('Mod4 F12', 'SendToWorkspace 12') | ||
124 | |||
125 | -- send the current window and change to a specific workspace | ||
126 | default_keymode:addBinding('Control Mod4 F1', 'TakeToWorkspace 1') | ||
127 | default_keymode:addBinding('Control Mod4 F2', 'TakeToWorkspace 2') | ||
128 | default_keymode:addBinding('Control Mod4 F3', 'TakeToWorkspace 3') | ||
129 | default_keymode:addBinding('Control Mod4 F4', 'TakeToWorkspace 4') | ||
130 | default_keymode:addBinding('Control Mod4 F5', 'TakeToWorkspace 5') | ||
131 | default_keymode:addBinding('Control Mod4 F6', 'TakeToWorkspace 6') | ||
132 | default_keymode:addBinding('Control Mod4 F7', 'TakeToWorkspace 7') | ||
133 | default_keymode:addBinding('Control Mod4 F8', 'TakeToWorkspace 8') | ||
134 | default_keymode:addBinding('Control Mod4 F9', 'TakeToWorkspace 9') | ||
135 | default_keymode:addBinding('Control Mod4 F10', 'TakeToWorkspace 10') | ||
136 | default_keymode:addBinding('Control Mod4 F11', 'TakeToWorkspace 11') | ||
137 | default_keymode:addBinding('Control Mod4 F12', 'TakeToWorkspace 12') | ||
diff --git a/data/windowmenu b/data/windowmenu.lua index fd779f6..fd779f6 100644 --- a/data/windowmenu +++ b/data/windowmenu.lua | |||
diff --git a/src/main.cc b/src/main.cc index 2d1a2f3..938c5bf 100644 --- a/src/main.cc +++ b/src/main.cc | |||
@@ -365,11 +365,11 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) { | |||
365 | const std::string filename; | 365 | const std::string filename; |
366 | } cfiles[] = { | 366 | } cfiles[] = { |
367 | { !has_dir, DEFAULT_INITFILE, rc }, | 367 | { !has_dir, DEFAULT_INITFILE, rc }, |
368 | { !has_dir, DEFAULTKEYSFILE, dirname + "/keys" }, | 368 | { !has_dir, DEFAULTKEYSFILE, dirname + "/keys.lua" }, |
369 | { !has_dir, DEFAULTMENU, dirname + "/menu" }, | 369 | { !has_dir, DEFAULTMENU, dirname + "/menu.lua" }, |
370 | { !has_dir, DEFAULT_APPSFILE, dirname + "/apps" }, | 370 | { !has_dir, DEFAULT_APPSFILE, dirname + "/apps" }, |
371 | { !has_dir, DEFAULT_OVERLAY, dirname + "/overlay" }, | 371 | { !has_dir, DEFAULT_OVERLAY, dirname + "/overlay" }, |
372 | { !has_dir, DEFAULT_WINDOWMENU, dirname + "/windowmenu" } | 372 | { !has_dir, DEFAULT_WINDOWMENU, dirname + "/windowmenu.lua" } |
373 | }; | 373 | }; |
374 | const size_t nr_of_cfiles = sizeof(cfiles)/sizeof(CFInfo); | 374 | const size_t nr_of_cfiles = sizeof(cfiles)/sizeof(CFInfo); |
375 | 375 | ||