aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-25 18:28:55 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-18 21:04:24 (GMT)
commit69306982fbf1b66be52c3c784dedef1be77cd2d2 (patch)
tree8d0b5496375aeb2f70ea27a03ac21b815f7e0503
parentf10cee52e7877d0f015580781d6894a5459390b4 (diff)
downloadfluxbox_pavel-69306982fbf1b66be52c3c784dedef1be77cd2d2.zip
fluxbox_pavel-69306982fbf1b66be52c3c784dedef1be77cd2d2.tar.bz2
Add a new default keys file and rename config files to foo.lua
hopefully, i have now updated all files that contain config file names.
-rw-r--r--data/Makefile.am24
-rw-r--r--data/init.lua.in (renamed from data/init.in)4
-rw-r--r--data/keys137
-rw-r--r--data/keys.lua137
-rw-r--r--data/windowmenu.lua (renamed from data/windowmenu)0
-rw-r--r--src/main.cc6
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@
12DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@ 12DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
13 13
14SUBDIRS= styles 14SUBDIRS= styles
15CLEANFILES= menu menu.in menu.pre menu.bak init apps 15CLEANFILES= menu.lua init.lua apps
16MAINTAINERCLEANFILES= Makefile.in 16MAINTAINERCLEANFILES= Makefile.in
17pkgdata_DATA= keys menu init apps overlay windowmenu 17pkgdata_DATA= keys.lua menu.lua init.lua apps overlay windowmenu.lua
18EXTRA_DIST= keys init.in apps.in overlay windowmenu 18EXTRA_DIST= keys.lua init.lua.in apps.in overlay windowmenu.lua
19all-local: menu init apps 19all-local: menu.lua init.lua apps
20install-pkgdataDATA: 20install-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
40distclean-local: 40distclean-local:
41 rm -f *\~ 41 rm -f *\~
42init: init.in 42init.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
48apps: apps.in 48apps: 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
53menu: ../util/fluxbox-generate_menu 53menu.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
4session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu2' 4session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu.lua'
5session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys' 5session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys.lua'
6session.styleFile = '@default_style@' 6session.styleFile = '@default_style@'
7session.configVersion = 14 7session.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
2OnDesktop Mouse1 :HideMenus
3OnDesktop Mouse2 :WorkspaceMenu
4OnDesktop Mouse3 :RootMenu
5
6# scroll on the desktop to change workspaces
7OnDesktop Mouse4 :PrevWorkspace
8OnDesktop Mouse5 :NextWorkspace
9
10# scroll on the toolbar to change current window
11OnToolbar Mouse4 :PrevWindow {static groups} (iconhidden=no)
12OnToolbar Mouse5 :NextWindow {static groups} (iconhidden=no)
13
14# alt + left/right click to move/resize a window
15OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
16OnWindowBorder Move1 :StartMoving
17
18OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner}
19OnLeftGrip Move1 :StartResizing bottomleft
20OnRightGrip Move1 :StartResizing bottomright
21
22# alt + middle click to lower the window
23OnWindow Mod1 Mouse2 :Lower
24
25# control-click a window's titlebar and drag to attach windows
26OnTitlebar Control Mouse1 :StartTabbing
27
28# double click on the titlebar to shade
29OnTitlebar Double Mouse1 :Shade
30
31# left click on the titlebar to move the window
32OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab}
33OnTitlebar Move1 :StartMoving
34
35# middle click on the titlebar to lower
36OnTitlebar Mouse2 :Lower
37
38# right click on the titlebar for a menu of options
39OnTitlebar Mouse3 :WindowMenu
40
41# alt-tab
42Mod1 Tab :NextWindow {groups} (workspace=[current])
43Mod1 Shift Tab :PrevWindow {groups} (workspace=[current])
44
45# cycle through tabs in the current window
46Mod4 Tab :NextTab
47Mod4 Shift Tab :PrevTab
48
49# go to a specific tab in the current window
50Mod4 1 :Tab 1
51Mod4 2 :Tab 2
52Mod4 3 :Tab 3
53Mod4 4 :Tab 4
54Mod4 5 :Tab 5
55Mod4 6 :Tab 6
56Mod4 7 :Tab 7
57Mod4 8 :Tab 8
58Mod4 9 :Tab 9
59
60# open a terminal
61Mod1 F1 :Exec xterm
62
63# open a dialog to run programs
64Mod1 F2 :Exec fbrun
65
66# volume settings, using common keycodes
67# if these don't work, use xev to find out your real keycodes
68176 :Exec amixer sset Master,0 1+
69174 :Exec amixer sset Master,0 1-
70160 :Exec amixer sset Master,0 toggle
71
72# current window commands
73Mod1 F4 :Close
74Mod1 F5 :Kill
75Mod1 F9 :Minimize
76Mod1 F10 :Maximize
77Mod1 F11 :Fullscreen
78
79# open the window menu
80Mod1 space :WindowMenu
81
82# exit fluxbox
83Control Mod1 Delete :Exit
84
85# change to previous/next workspace
86Control Mod1 Left :PrevWorkspace
87Control Mod1 Right :NextWorkspace
88
89# send the current window to previous/next workspace
90Mod4 Left :SendToPrevWorkspace
91Mod4 Right :SendToNextWorkspace
92
93# send the current window and follow it to previous/next workspace
94Control Mod4 Left :TakeToPrevWorkspace
95Control Mod4 Right :TakeToNextWorkspace
96
97# change to a specific workspace
98Control F1 :Workspace 1
99Control F2 :Workspace 2
100Control F3 :Workspace 3
101Control F4 :Workspace 4
102Control F5 :Workspace 5
103Control F6 :Workspace 6
104Control F7 :Workspace 7
105Control F8 :Workspace 8
106Control F9 :Workspace 9
107Control F10 :Workspace 10
108Control F11 :Workspace 11
109Control F12 :Workspace 12
110
111# send the current window to a specific workspace
112Mod4 F1 :SendToWorkspace 1
113Mod4 F2 :SendToWorkspace 2
114Mod4 F3 :SendToWorkspace 3
115Mod4 F4 :SendToWorkspace 4
116Mod4 F5 :SendToWorkspace 5
117Mod4 F6 :SendToWorkspace 6
118Mod4 F7 :SendToWorkspace 7
119Mod4 F8 :SendToWorkspace 8
120Mod4 F9 :SendToWorkspace 9
121Mod4 F10 :SendToWorkspace 10
122Mod4 F11 :SendToWorkspace 11
123Mod4 F12 :SendToWorkspace 12
124
125# send the current window and change to a specific workspace
126Control Mod4 F1 :TakeToWorkspace 1
127Control Mod4 F2 :TakeToWorkspace 2
128Control Mod4 F3 :TakeToWorkspace 3
129Control Mod4 F4 :TakeToWorkspace 4
130Control Mod4 F5 :TakeToWorkspace 5
131Control Mod4 F6 :TakeToWorkspace 6
132Control Mod4 F7 :TakeToWorkspace 7
133Control Mod4 F8 :TakeToWorkspace 8
134Control Mod4 F9 :TakeToWorkspace 9
135Control Mod4 F10 :TakeToWorkspace 10
136Control Mod4 F11 :TakeToWorkspace 11
137Control 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
2default_keymode:addBinding('OnDesktop Mouse1', 'HideMenus')
3default_keymode:addBinding('OnDesktop Mouse2', 'WorkspaceMenu')
4default_keymode:addBinding('OnDesktop Mouse3', 'RootMenu')
5
6-- scroll on the desktop to change workspaces
7default_keymode:addBinding('OnDesktop Mouse4', 'PrevWorkspace')
8default_keymode:addBinding('OnDesktop Mouse5', 'NextWorkspace')
9
10-- scroll on the toolbar to change current window
11default_keymode:addBinding('OnToolbar Mouse4', 'PrevWindow {static groups} (iconhidden=no)')
12default_keymode:addBinding('OnToolbar Mouse5', 'NextWindow {static groups} (iconhidden=no)')
13
14-- alt + left/right click to move/resize a window
15default_keymode:addBinding('OnWindow Mod1 Mouse1', 'MacroCmd {Raise} {Focus} {StartMoving}')
16default_keymode:addBinding('OnWindowBorder Move1', 'StartMoving')
17
18default_keymode:addBinding('OnWindow Mod1 Mouse3', 'MacroCmd {Raise} {Focus} {StartResizing NearestCorner}')
19default_keymode:addBinding('OnLeftGrip Move1', 'StartResizing bottomleft')
20default_keymode:addBinding('OnRightGrip Move1', 'StartResizing bottomright')
21
22-- alt + middle click to lower the window
23default_keymode:addBinding('OnWindow Mod1 Mouse2', 'Lower')
24
25-- control-click a window's titlebar and drag to attach windows
26default_keymode:addBinding('OnTitlebar Control Mouse1', 'StartTabbing')
27
28-- double click on the titlebar to shade
29default_keymode:addBinding('OnTitlebar Double Mouse1', 'Shade')
30
31-- left click on the titlebar to move the window
32default_keymode:addBinding('OnTitlebar Mouse1', 'MacroCmd {Raise} {Focus} {ActivateTab}')
33default_keymode:addBinding('OnTitlebar Move1 ', 'StartMoving')
34
35-- middle click on the titlebar to lower
36default_keymode:addBinding('OnTitlebar Mouse2', 'Lower')
37
38-- right click on the titlebar for a menu of options
39default_keymode:addBinding('OnTitlebar Mouse3', 'WindowMenu')
40
41-- alt-tab
42default_keymode:addBinding('Mod1 Tab', 'NextWindow {groups} (workspace=[current])')
43default_keymode:addBinding('Mod1 Shift Tab', 'PrevWindow {groups} (workspace=[current])')
44
45-- cycle through tabs in the current window
46default_keymode:addBinding('Mod4 Tab', 'NextTab')
47default_keymode:addBinding('Mod4 Shift Tab', 'PrevTab')
48
49-- go to a specific tab in the current window
50default_keymode:addBinding('Mod4 1', 'Tab 1')
51default_keymode:addBinding('Mod4 2', 'Tab 2')
52default_keymode:addBinding('Mod4 3', 'Tab 3')
53default_keymode:addBinding('Mod4 4', 'Tab 4')
54default_keymode:addBinding('Mod4 5', 'Tab 5')
55default_keymode:addBinding('Mod4 6', 'Tab 6')
56default_keymode:addBinding('Mod4 7', 'Tab 7')
57default_keymode:addBinding('Mod4 8', 'Tab 8')
58default_keymode:addBinding('Mod4 9', 'Tab 9')
59
60-- open a terminal
61default_keymode:addBinding('Mod1 F1', 'Exec xterm')
62
63-- open a dialog to run programs
64default_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
68default_keymode:addBinding('176', 'Exec amixer sset Master,0 1+')
69default_keymode:addBinding('174', 'Exec amixer sset Master,0 1-')
70default_keymode:addBinding('160', 'Exec amixer sset Master,0 toggle')
71
72-- current window commands
73default_keymode:addBinding('Mod1 F4', 'Close')
74default_keymode:addBinding('Mod1 F5', 'Kill')
75default_keymode:addBinding('Mod1 F9', 'Minimize')
76default_keymode:addBinding('Mod1 F10', 'Maximize')
77default_keymode:addBinding('Mod1 F11', 'Fullscreen')
78
79-- open the window menu
80default_keymode:addBinding('Mod1 space', 'WindowMenu')
81
82-- exit fluxbox
83default_keymode:addBinding('Control Mod1 Delete', 'Exit')
84
85-- change to previous/next workspace
86default_keymode:addBinding('Control Mod1 Left', 'PrevWorkspace')
87default_keymode:addBinding('Control Mod1 Right', 'NextWorkspace')
88
89-- send the current window to previous/next workspace
90default_keymode:addBinding('Mod4 Left', 'SendToPrevWorkspace')
91default_keymode:addBinding('Mod4 Right', 'SendToNextWorkspace')
92
93-- send the current window and follow it to previous/next workspace
94default_keymode:addBinding('Control Mod4 Left', 'TakeToPrevWorkspace')
95default_keymode:addBinding('Control Mod4 Right', 'TakeToNextWorkspace')
96
97-- change to a specific workspace
98default_keymode:addBinding('Control F1', 'Workspace 1')
99default_keymode:addBinding('Control F2', 'Workspace 2')
100default_keymode:addBinding('Control F3', 'Workspace 3')
101default_keymode:addBinding('Control F4', 'Workspace 4')
102default_keymode:addBinding('Control F5', 'Workspace 5')
103default_keymode:addBinding('Control F6', 'Workspace 6')
104default_keymode:addBinding('Control F7', 'Workspace 7')
105default_keymode:addBinding('Control F8', 'Workspace 8')
106default_keymode:addBinding('Control F9', 'Workspace 9')
107default_keymode:addBinding('Control F10', 'Workspace 10')
108default_keymode:addBinding('Control F11', 'Workspace 11')
109default_keymode:addBinding('Control F12', 'Workspace 12')
110
111-- send the current window to a specific workspace
112default_keymode:addBinding('Mod4 F1', 'SendToWorkspace 1')
113default_keymode:addBinding('Mod4 F2', 'SendToWorkspace 2')
114default_keymode:addBinding('Mod4 F3', 'SendToWorkspace 3')
115default_keymode:addBinding('Mod4 F4', 'SendToWorkspace 4')
116default_keymode:addBinding('Mod4 F5', 'SendToWorkspace 5')
117default_keymode:addBinding('Mod4 F6', 'SendToWorkspace 6')
118default_keymode:addBinding('Mod4 F7', 'SendToWorkspace 7')
119default_keymode:addBinding('Mod4 F8', 'SendToWorkspace 8')
120default_keymode:addBinding('Mod4 F9', 'SendToWorkspace 9')
121default_keymode:addBinding('Mod4 F10', 'SendToWorkspace 10')
122default_keymode:addBinding('Mod4 F11', 'SendToWorkspace 11')
123default_keymode:addBinding('Mod4 F12', 'SendToWorkspace 12')
124
125-- send the current window and change to a specific workspace
126default_keymode:addBinding('Control Mod4 F1', 'TakeToWorkspace 1')
127default_keymode:addBinding('Control Mod4 F2', 'TakeToWorkspace 2')
128default_keymode:addBinding('Control Mod4 F3', 'TakeToWorkspace 3')
129default_keymode:addBinding('Control Mod4 F4', 'TakeToWorkspace 4')
130default_keymode:addBinding('Control Mod4 F5', 'TakeToWorkspace 5')
131default_keymode:addBinding('Control Mod4 F6', 'TakeToWorkspace 6')
132default_keymode:addBinding('Control Mod4 F7', 'TakeToWorkspace 7')
133default_keymode:addBinding('Control Mod4 F8', 'TakeToWorkspace 8')
134default_keymode:addBinding('Control Mod4 F9', 'TakeToWorkspace 9')
135default_keymode:addBinding('Control Mod4 F10', 'TakeToWorkspace 10')
136default_keymode:addBinding('Control Mod4 F11', 'TakeToWorkspace 11')
137default_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