From 400ca5f8196c0b3af0479c06d202b04aa6f010d5 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Mon, 25 Jul 2011 20:28:55 +0200 Subject: 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. --- configure.in | 8 +-- data/Makefile.am | 24 ++++----- data/init.in | 7 --- data/init.lua.in | 7 +++ data/keys | 137 ---------------------------------------------------- data/keys.lua | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++ data/windowmenu | 17 ------- data/windowmenu.lua | 17 +++++++ src/main.cc | 6 +-- 9 files changed, 180 insertions(+), 180 deletions(-) delete mode 100644 data/init.in create mode 100644 data/init.lua.in delete mode 100644 data/keys create mode 100644 data/keys.lua delete mode 100644 data/windowmenu create mode 100644 data/windowmenu.lua diff --git a/configure.in b/configure.in index c54833b..66c3f69 100644 --- a/configure.in +++ b/configure.in @@ -631,7 +631,7 @@ AC_ARG_WITH( menu, [ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)], DEFAULT_MENU=$with_menu, - DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu + DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu.lua ) AC_SUBST(DEFAULT_MENU) @@ -639,7 +639,7 @@ AC_ARG_WITH( windowmenu, [ --with-windowmenu=path location windowmenu file (PREFIX/share/fluxbox/windowmenu)], DEFAULT_WINDOWMENU=$with_windowmenu, - DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu + DEFAULT_WINDOWMENU=\$\(prefix\)/share/fluxbox/windowmenu.lua ) AC_SUBST(DEFAULT_WINDOWMENU) @@ -655,7 +655,7 @@ AC_ARG_WITH( keys, [ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)], DEFAULT_KEYS=$with_keys, - DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys + DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys.lua ) AC_SUBST(DEFAULT_KEYS) @@ -679,7 +679,7 @@ AC_ARG_WITH( init, [ --with-init=path location init file (PREFIX/share/fluxbox/init)], DEFAULT_INIT=$with_init, - DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init + DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init.lua ) AC_SUBST(DEFAULT_INIT) 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@ DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@ SUBDIRS= styles -CLEANFILES= menu menu.in menu.pre menu.bak init apps +CLEANFILES= menu.lua init.lua apps MAINTAINERCLEANFILES= Makefile.in -pkgdata_DATA= keys menu init apps overlay windowmenu -EXTRA_DIST= keys init.in apps.in overlay windowmenu -all-local: menu init apps +pkgdata_DATA= keys.lua menu.lua init.lua apps overlay windowmenu.lua +EXTRA_DIST= keys.lua init.lua.in apps.in overlay windowmenu.lua +all-local: menu.lua init.lua apps install-pkgdataDATA: @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU)) - $(INSTALL_DATA) ./menu $(DESTDIR)$(DEFAULT_MENU) + $(INSTALL_DATA) ./menu.lua $(DESTDIR)$(DEFAULT_MENU) @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)" $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS)) - $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS) + $(INSTALL_DATA) $(srcdir)/keys.lua $(DESTDIR)$(DEFAULT_KEYS) @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)" $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS)) $(INSTALL_DATA) ./apps $(DESTDIR)$(DEFAULT_APPS) @@ -32,26 +32,26 @@ install-pkgdataDATA: $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY) @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) - $(INSTALL_DATA) ./init $(DESTDIR)$(DEFAULT_INIT) + $(INSTALL_DATA) ./init.lua $(DESTDIR)$(DEFAULT_INIT) @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)" $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU)) - $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU) + $(INSTALL_DATA) $(srcdir)/windowmenu.lua $(DESTDIR)$(DEFAULT_WINDOWMENU) distclean-local: rm -f *\~ -init: init.in +init.lua: init.lua.in @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ - -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init + -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.lua.in > init.lua apps: apps.in @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps -menu: ../util/fluxbox-generate_menu - env MENUFILENAME=menu \ +menu.lua: ../util/fluxbox-generate_menu + env MENUFILENAME=menu.lua \ PREFIX="${prefix}" \ MENUTITLE="Fluxbox-${VERSION}" \ INSTALL=Yes \ diff --git a/data/init.in b/data/init.in deleted file mode 100644 index e98d3b0..0000000 --- a/data/init.in +++ /dev/null @@ -1,7 +0,0 @@ --- If you're looking for settings to configure, they won't be saved here until --- you change something in the fluxbox configuration menu. - -session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu2' -session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys' -session.styleFile = '@default_style@' -session.configVersion = 14 diff --git a/data/init.lua.in b/data/init.lua.in new file mode 100644 index 0000000..0416593 --- /dev/null +++ b/data/init.lua.in @@ -0,0 +1,7 @@ +-- If you're looking for settings to configure, they won't be saved here until +-- you change something in the fluxbox configuration menu. + +session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu.lua' +session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys.lua' +session.styleFile = '@default_style@' +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 @@ -# click on the desktop to get menus -OnDesktop Mouse1 :HideMenus -OnDesktop Mouse2 :WorkspaceMenu -OnDesktop Mouse3 :RootMenu - -# scroll on the desktop to change workspaces -OnDesktop Mouse4 :PrevWorkspace -OnDesktop Mouse5 :NextWorkspace - -# scroll on the toolbar to change current window -OnToolbar Mouse4 :PrevWindow {static groups} (iconhidden=no) -OnToolbar Mouse5 :NextWindow {static groups} (iconhidden=no) - -# alt + left/right click to move/resize a window -OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving} -OnWindowBorder Move1 :StartMoving - -OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner} -OnLeftGrip Move1 :StartResizing bottomleft -OnRightGrip Move1 :StartResizing bottomright - -# alt + middle click to lower the window -OnWindow Mod1 Mouse2 :Lower - -# control-click a window's titlebar and drag to attach windows -OnTitlebar Control Mouse1 :StartTabbing - -# double click on the titlebar to shade -OnTitlebar Double Mouse1 :Shade - -# left click on the titlebar to move the window -OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab} -OnTitlebar Move1 :StartMoving - -# middle click on the titlebar to lower -OnTitlebar Mouse2 :Lower - -# right click on the titlebar for a menu of options -OnTitlebar Mouse3 :WindowMenu - -# alt-tab -Mod1 Tab :NextWindow {groups} (workspace=[current]) -Mod1 Shift Tab :PrevWindow {groups} (workspace=[current]) - -# cycle through tabs in the current window -Mod4 Tab :NextTab -Mod4 Shift Tab :PrevTab - -# go to a specific tab in the current window -Mod4 1 :Tab 1 -Mod4 2 :Tab 2 -Mod4 3 :Tab 3 -Mod4 4 :Tab 4 -Mod4 5 :Tab 5 -Mod4 6 :Tab 6 -Mod4 7 :Tab 7 -Mod4 8 :Tab 8 -Mod4 9 :Tab 9 - -# open a terminal -Mod1 F1 :Exec xterm - -# open a dialog to run programs -Mod1 F2 :Exec fbrun - -# volume settings, using common keycodes -# if these don't work, use xev to find out your real keycodes -176 :Exec amixer sset Master,0 1+ -174 :Exec amixer sset Master,0 1- -160 :Exec amixer sset Master,0 toggle - -# current window commands -Mod1 F4 :Close -Mod1 F5 :Kill -Mod1 F9 :Minimize -Mod1 F10 :Maximize -Mod1 F11 :Fullscreen - -# open the window menu -Mod1 space :WindowMenu - -# exit fluxbox -Control Mod1 Delete :Exit - -# change to previous/next workspace -Control Mod1 Left :PrevWorkspace -Control Mod1 Right :NextWorkspace - -# send the current window to previous/next workspace -Mod4 Left :SendToPrevWorkspace -Mod4 Right :SendToNextWorkspace - -# send the current window and follow it to previous/next workspace -Control Mod4 Left :TakeToPrevWorkspace -Control Mod4 Right :TakeToNextWorkspace - -# change to a specific workspace -Control F1 :Workspace 1 -Control F2 :Workspace 2 -Control F3 :Workspace 3 -Control F4 :Workspace 4 -Control F5 :Workspace 5 -Control F6 :Workspace 6 -Control F7 :Workspace 7 -Control F8 :Workspace 8 -Control F9 :Workspace 9 -Control F10 :Workspace 10 -Control F11 :Workspace 11 -Control F12 :Workspace 12 - -# send the current window to a specific workspace -Mod4 F1 :SendToWorkspace 1 -Mod4 F2 :SendToWorkspace 2 -Mod4 F3 :SendToWorkspace 3 -Mod4 F4 :SendToWorkspace 4 -Mod4 F5 :SendToWorkspace 5 -Mod4 F6 :SendToWorkspace 6 -Mod4 F7 :SendToWorkspace 7 -Mod4 F8 :SendToWorkspace 8 -Mod4 F9 :SendToWorkspace 9 -Mod4 F10 :SendToWorkspace 10 -Mod4 F11 :SendToWorkspace 11 -Mod4 F12 :SendToWorkspace 12 - -# send the current window and change to a specific workspace -Control Mod4 F1 :TakeToWorkspace 1 -Control Mod4 F2 :TakeToWorkspace 2 -Control Mod4 F3 :TakeToWorkspace 3 -Control Mod4 F4 :TakeToWorkspace 4 -Control Mod4 F5 :TakeToWorkspace 5 -Control Mod4 F6 :TakeToWorkspace 6 -Control Mod4 F7 :TakeToWorkspace 7 -Control Mod4 F8 :TakeToWorkspace 8 -Control Mod4 F9 :TakeToWorkspace 9 -Control Mod4 F10 :TakeToWorkspace 10 -Control Mod4 F11 :TakeToWorkspace 11 -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 @@ +-- click on the desktop to get menus +default_keymode:addBinding('OnDesktop Mouse1', 'HideMenus') +default_keymode:addBinding('OnDesktop Mouse2', 'WorkspaceMenu') +default_keymode:addBinding('OnDesktop Mouse3', 'RootMenu') + +-- scroll on the desktop to change workspaces +default_keymode:addBinding('OnDesktop Mouse4', 'PrevWorkspace') +default_keymode:addBinding('OnDesktop Mouse5', 'NextWorkspace') + +-- scroll on the toolbar to change current window +default_keymode:addBinding('OnToolbar Mouse4', 'PrevWindow {static groups} (iconhidden=no)') +default_keymode:addBinding('OnToolbar Mouse5', 'NextWindow {static groups} (iconhidden=no)') + +-- alt + left/right click to move/resize a window +default_keymode:addBinding('OnWindow Mod1 Mouse1', 'MacroCmd {Raise} {Focus} {StartMoving}') +default_keymode:addBinding('OnWindowBorder Move1', 'StartMoving') + +default_keymode:addBinding('OnWindow Mod1 Mouse3', 'MacroCmd {Raise} {Focus} {StartResizing NearestCorner}') +default_keymode:addBinding('OnLeftGrip Move1', 'StartResizing bottomleft') +default_keymode:addBinding('OnRightGrip Move1', 'StartResizing bottomright') + +-- alt + middle click to lower the window +default_keymode:addBinding('OnWindow Mod1 Mouse2', 'Lower') + +-- control-click a window's titlebar and drag to attach windows +default_keymode:addBinding('OnTitlebar Control Mouse1', 'StartTabbing') + +-- double click on the titlebar to shade +default_keymode:addBinding('OnTitlebar Double Mouse1', 'Shade') + +-- left click on the titlebar to move the window +default_keymode:addBinding('OnTitlebar Mouse1', 'MacroCmd {Raise} {Focus} {ActivateTab}') +default_keymode:addBinding('OnTitlebar Move1 ', 'StartMoving') + +-- middle click on the titlebar to lower +default_keymode:addBinding('OnTitlebar Mouse2', 'Lower') + +-- right click on the titlebar for a menu of options +default_keymode:addBinding('OnTitlebar Mouse3', 'WindowMenu') + +-- alt-tab +default_keymode:addBinding('Mod1 Tab', 'NextWindow {groups} (workspace=[current])') +default_keymode:addBinding('Mod1 Shift Tab', 'PrevWindow {groups} (workspace=[current])') + +-- cycle through tabs in the current window +default_keymode:addBinding('Mod4 Tab', 'NextTab') +default_keymode:addBinding('Mod4 Shift Tab', 'PrevTab') + +-- go to a specific tab in the current window +default_keymode:addBinding('Mod4 1', 'Tab 1') +default_keymode:addBinding('Mod4 2', 'Tab 2') +default_keymode:addBinding('Mod4 3', 'Tab 3') +default_keymode:addBinding('Mod4 4', 'Tab 4') +default_keymode:addBinding('Mod4 5', 'Tab 5') +default_keymode:addBinding('Mod4 6', 'Tab 6') +default_keymode:addBinding('Mod4 7', 'Tab 7') +default_keymode:addBinding('Mod4 8', 'Tab 8') +default_keymode:addBinding('Mod4 9', 'Tab 9') + +-- open a terminal +default_keymode:addBinding('Mod1 F1', 'Exec xterm') + +-- open a dialog to run programs +default_keymode:addBinding('Mod1 F2', 'Exec fbrun') + +-- volume settings, using common keycodes +-- if these don't work, use xev to find out your real keycodes +default_keymode:addBinding('176', 'Exec amixer sset Master,0 1+') +default_keymode:addBinding('174', 'Exec amixer sset Master,0 1-') +default_keymode:addBinding('160', 'Exec amixer sset Master,0 toggle') + +-- current window commands +default_keymode:addBinding('Mod1 F4', 'Close') +default_keymode:addBinding('Mod1 F5', 'Kill') +default_keymode:addBinding('Mod1 F9', 'Minimize') +default_keymode:addBinding('Mod1 F10', 'Maximize') +default_keymode:addBinding('Mod1 F11', 'Fullscreen') + +-- open the window menu +default_keymode:addBinding('Mod1 space', 'WindowMenu') + +-- exit fluxbox +default_keymode:addBinding('Control Mod1 Delete', 'Exit') + +-- change to previous/next workspace +default_keymode:addBinding('Control Mod1 Left', 'PrevWorkspace') +default_keymode:addBinding('Control Mod1 Right', 'NextWorkspace') + +-- send the current window to previous/next workspace +default_keymode:addBinding('Mod4 Left', 'SendToPrevWorkspace') +default_keymode:addBinding('Mod4 Right', 'SendToNextWorkspace') + +-- send the current window and follow it to previous/next workspace +default_keymode:addBinding('Control Mod4 Left', 'TakeToPrevWorkspace') +default_keymode:addBinding('Control Mod4 Right', 'TakeToNextWorkspace') + +-- change to a specific workspace +default_keymode:addBinding('Control F1', 'Workspace 1') +default_keymode:addBinding('Control F2', 'Workspace 2') +default_keymode:addBinding('Control F3', 'Workspace 3') +default_keymode:addBinding('Control F4', 'Workspace 4') +default_keymode:addBinding('Control F5', 'Workspace 5') +default_keymode:addBinding('Control F6', 'Workspace 6') +default_keymode:addBinding('Control F7', 'Workspace 7') +default_keymode:addBinding('Control F8', 'Workspace 8') +default_keymode:addBinding('Control F9', 'Workspace 9') +default_keymode:addBinding('Control F10', 'Workspace 10') +default_keymode:addBinding('Control F11', 'Workspace 11') +default_keymode:addBinding('Control F12', 'Workspace 12') + +-- send the current window to a specific workspace +default_keymode:addBinding('Mod4 F1', 'SendToWorkspace 1') +default_keymode:addBinding('Mod4 F2', 'SendToWorkspace 2') +default_keymode:addBinding('Mod4 F3', 'SendToWorkspace 3') +default_keymode:addBinding('Mod4 F4', 'SendToWorkspace 4') +default_keymode:addBinding('Mod4 F5', 'SendToWorkspace 5') +default_keymode:addBinding('Mod4 F6', 'SendToWorkspace 6') +default_keymode:addBinding('Mod4 F7', 'SendToWorkspace 7') +default_keymode:addBinding('Mod4 F8', 'SendToWorkspace 8') +default_keymode:addBinding('Mod4 F9', 'SendToWorkspace 9') +default_keymode:addBinding('Mod4 F10', 'SendToWorkspace 10') +default_keymode:addBinding('Mod4 F11', 'SendToWorkspace 11') +default_keymode:addBinding('Mod4 F12', 'SendToWorkspace 12') + +-- send the current window and change to a specific workspace +default_keymode:addBinding('Control Mod4 F1', 'TakeToWorkspace 1') +default_keymode:addBinding('Control Mod4 F2', 'TakeToWorkspace 2') +default_keymode:addBinding('Control Mod4 F3', 'TakeToWorkspace 3') +default_keymode:addBinding('Control Mod4 F4', 'TakeToWorkspace 4') +default_keymode:addBinding('Control Mod4 F5', 'TakeToWorkspace 5') +default_keymode:addBinding('Control Mod4 F6', 'TakeToWorkspace 6') +default_keymode:addBinding('Control Mod4 F7', 'TakeToWorkspace 7') +default_keymode:addBinding('Control Mod4 F8', 'TakeToWorkspace 8') +default_keymode:addBinding('Control Mod4 F9', 'TakeToWorkspace 9') +default_keymode:addBinding('Control Mod4 F10', 'TakeToWorkspace 10') +default_keymode:addBinding('Control Mod4 F11', 'TakeToWorkspace 11') +default_keymode:addBinding('Control Mod4 F12', 'TakeToWorkspace 12') diff --git a/data/windowmenu b/data/windowmenu deleted file mode 100644 index fd779f6..0000000 --- a/data/windowmenu +++ /dev/null @@ -1,17 +0,0 @@ -return { - type = "menu"; - - { type = "shade" }; - { type = "stick" }; - { type = "maximize" }; - { type = "iconify" }; - { type = "raise" }; - { type = "lower" }; - { type = "settitledialog" }; - { type = "sendto" }; - { type = "layer" }; - { type = "alpha" }; - { type = "extramenus" }; - { type = "separator" }; - { type = "close" }; -} diff --git a/data/windowmenu.lua b/data/windowmenu.lua new file mode 100644 index 0000000..fd779f6 --- /dev/null +++ b/data/windowmenu.lua @@ -0,0 +1,17 @@ +return { + type = "menu"; + + { type = "shade" }; + { type = "stick" }; + { type = "maximize" }; + { type = "iconify" }; + { type = "raise" }; + { type = "lower" }; + { type = "settitledialog" }; + { type = "sendto" }; + { type = "layer" }; + { type = "alpha" }; + { type = "extramenus" }; + { type = "separator" }; + { type = "close" }; +} diff --git a/src/main.cc b/src/main.cc index c49487f..bf8d1ae 100644 --- a/src/main.cc +++ b/src/main.cc @@ -350,11 +350,11 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) { const std::string filename; } cfiles[] = { { !has_dir, DEFAULT_INITFILE, rc }, - { !has_dir, DEFAULTKEYSFILE, dirname + "/keys" }, - { !has_dir, DEFAULTMENU, dirname + "/menu" }, + { !has_dir, DEFAULTKEYSFILE, dirname + "/keys.lua" }, + { !has_dir, DEFAULTMENU, dirname + "/menu.lua" }, { !has_dir, DEFAULT_APPSFILE, dirname + "/apps" }, { !has_dir, DEFAULT_OVERLAY, dirname + "/overlay" }, - { !has_dir, DEFAULT_WINDOWMENU, dirname + "/windowmenu" } + { !has_dir, DEFAULT_WINDOWMENU, dirname + "/windowmenu.lua" } }; const size_t nr_of_cfiles = sizeof(cfiles)/sizeof(CFInfo); -- cgit v0.11.2