Merge branch 'master' into to_push

6 files changed, 66 insertions, 15 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 80fed6a..e921afa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,24 +6,36 @@ PROGRAM_SUFFIX=@program_suffix@
 DEFAULT_MENU = @DEFAULT_MENU@
 DEFAULT_STYLE = @DEFAULT_STYLE@
 DEFAULT_KEYS = @DEFAULT_KEYS@
+DEFAULT_APPS = @DEFAULT_APPS@
+DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
 DEFAULT_INIT = @DEFAULT_INIT@
+DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
 
 SUBDIRS=                styles
-CLEANFILES=             menu menu.in menu.pre menu.bak init
+CLEANFILES=             menu menu.in menu.pre menu.bak init apps
 MAINTAINERCLEANFILES=   Makefile.in
-pkgdata_DATA=           keys menu init
-EXTRA_DIST=             keys init.in
-all-local:              menu init
+pkgdata_DATA=           keys menu init apps overlay
+EXTRA_DIST=             keys init.in apps.in overlay
+all-local:              menu init apps
 install-pkgdataDATA:
         @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
         $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
-        $(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
+        $(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU)
         @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
         $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
         $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+        @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
+        $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
+        $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
+        @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
+        $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
+        $(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) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT)
+        @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
+        $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
+        $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
 
 distclean-local:
                 rm -f *\~
@@ -33,6 +45,11 @@ init: 			init.in
                         -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
                         -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
 
+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 \
                 PREFIX="${prefix}" \
diff --git a/data/apps.in b/data/apps.in
new file mode 100644
index 0000000..48db0ac
--- /dev/null
+++ b/data/apps.in
@@ -0,0 +1,4 @@
+[app] (name=@pkgprefix@fbrun@pkgsuffix@)
+  [Position]    (WINCENTER)     {0 0}
+  [Layer]       {2}
+[end]
diff --git a/data/init.in b/data/init.in
index 86cfa08..ef83d41 100644
--- a/data/init.in
+++ b/data/init.in
@@ -1,5 +1,4 @@
-session.screen0.slit.placement: BottomRight
-session.screen0.slit.direction: Vertical
+session.screen0.slit.placement: RightBottom
 session.screen0.slit.onTop:     False
 session.screen0.slit.autoHide:  False
 session.screen0.tab.placement:  Top
@@ -30,4 +29,4 @@ session.colorsPerChannel:	4
 session.doubleClickInterval:    250
 session.cacheMax:       200
 session.imageDither:    True
-session.configVersion:  7
+session.configVersion:  9
diff --git a/data/keys b/data/keys
index 8b2a234..f2de94a 100644
--- a/data/keys
+++ b/data/keys
@@ -4,16 +4,16 @@ OnDesktop Mouse2 :WorkspaceMenu
 OnDesktop Mouse3 :RootMenu
 
 # scroll on the desktop to change workspaces
-OnDesktop Mouse4 :NextWorkspace
-OnDesktop Mouse5 :PrevWorkspace
+OnDesktop Mouse4 :PrevWorkspace
+OnDesktop Mouse5 :NextWorkspace
 
 # scroll on the toolbar to change workspaces
-OnToolbar Mouse4 :NextWorkspace
-OnToolbar Mouse5 :PrevWorkspace
+OnToolbar Mouse4 :PrevWorkspace
+OnToolbar Mouse5 :NextWorkspace
 
 # alt + left/right click to move/resize a window
 OnWindow Mod1 Mouse1 :StartMoving
-OnWindow Mod1 Mouse3 :StartResizing
+OnWindow Mod1 Mouse3 :StartResizing NearestCorner
 
 # middle click a window's titlebar and drag to attach windows
 OnTitlebar Mouse2 :StartTabbing
@@ -43,11 +43,26 @@ 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
 
-# close the current window
+# 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 F9 :Minimize
+Mod1 F10 :Maximize
+Mod1 F11 :Fullscreen
+
+# open the window menu
+Mod1 space :WindowMenu
 
 # exit fluxbox
 Control Mod1 Delete :Exit
diff --git a/data/overlay b/data/overlay
new file mode 100644
index 0000000..bb4e91c
--- /dev/null
+++ b/data/overlay
@@ -0,0 +1,2 @@
+! The following line will prevent styles from setting the background.
+! background: none
diff --git a/data/windowmenu b/data/windowmenu
new file mode 100644
index 0000000..9e52651
--- /dev/null
+++ b/data/windowmenu
@@ -0,0 +1,14 @@
+[begin]
+  [shade]
+  [stick]
+  [maximize]
+  [iconify]
+  [raise]
+  [lower]
+  [sendto]
+  [layer]
+  [alpha]
+  [extramenus]
+  [separator]
+  [close]
+[end]