aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
commite169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch)
treeae9e92c7e885791c7f47645184070cbcd441ab94 /data
parentc82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff)
parent91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff)
downloadfluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip
fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2
Merge branch 'master' into to_push
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am29
-rw-r--r--data/apps.in4
-rw-r--r--data/init.in5
-rw-r--r--data/keys27
-rw-r--r--data/overlay2
-rw-r--r--data/windowmenu14
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@
6DEFAULT_MENU = @DEFAULT_MENU@ 6DEFAULT_MENU = @DEFAULT_MENU@
7DEFAULT_STYLE = @DEFAULT_STYLE@ 7DEFAULT_STYLE = @DEFAULT_STYLE@
8DEFAULT_KEYS = @DEFAULT_KEYS@ 8DEFAULT_KEYS = @DEFAULT_KEYS@
9DEFAULT_APPS = @DEFAULT_APPS@
10DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
9DEFAULT_INIT = @DEFAULT_INIT@ 11DEFAULT_INIT = @DEFAULT_INIT@
12DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
10 13
11SUBDIRS= styles 14SUBDIRS= styles
12CLEANFILES= menu menu.in menu.pre menu.bak init 15CLEANFILES= menu menu.in menu.pre menu.bak init apps
13MAINTAINERCLEANFILES= Makefile.in 16MAINTAINERCLEANFILES= Makefile.in
14pkgdata_DATA= keys menu init 17pkgdata_DATA= keys menu init apps overlay
15EXTRA_DIST= keys init.in 18EXTRA_DIST= keys init.in apps.in overlay
16all-local: menu init 19all-local: menu init apps
17install-pkgdataDATA: 20install-pkgdataDATA:
18 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" 21 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
19 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU)) 22 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
20 $(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU) 23 $(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU)
21 @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)" 24 @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
22 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS)) 25 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
23 $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS) 26 $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
27 @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
28 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
29 $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
30 @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
31 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
32 $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
24 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" 33 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
25 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) 34 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
26 $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT) 35 $(INSTALL_DATA) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT)
36 @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
37 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
38 $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
27 39
28distclean-local: 40distclean-local:
29 rm -f *\~ 41 rm -f *\~
@@ -33,6 +45,11 @@ init: init.in
33 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ 45 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
34 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init 46 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
35 47
48apps: apps.in
49 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
50 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
51 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
52
36menu: ../util/fluxbox-generate_menu 53menu: ../util/fluxbox-generate_menu
37 env MENUFILENAME=menu \ 54 env MENUFILENAME=menu \
38 PREFIX="${prefix}" \ 55 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 @@
1[app] (name=@pkgprefix@fbrun@pkgsuffix@)
2 [Position] (WINCENTER) {0 0}
3 [Layer] {2}
4[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 @@
1session.screen0.slit.placement: BottomRight 1session.screen0.slit.placement: RightBottom
2session.screen0.slit.direction: Vertical
3session.screen0.slit.onTop: False 2session.screen0.slit.onTop: False
4session.screen0.slit.autoHide: False 3session.screen0.slit.autoHide: False
5session.screen0.tab.placement: Top 4session.screen0.tab.placement: Top
@@ -30,4 +29,4 @@ session.colorsPerChannel: 4
30session.doubleClickInterval: 250 29session.doubleClickInterval: 250
31session.cacheMax: 200 30session.cacheMax: 200
32session.imageDither: True 31session.imageDither: True
33session.configVersion: 7 32session.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
4OnDesktop Mouse3 :RootMenu 4OnDesktop Mouse3 :RootMenu
5 5
6# scroll on the desktop to change workspaces 6# scroll on the desktop to change workspaces
7OnDesktop Mouse4 :NextWorkspace 7OnDesktop Mouse4 :PrevWorkspace
8OnDesktop Mouse5 :PrevWorkspace 8OnDesktop Mouse5 :NextWorkspace
9 9
10# scroll on the toolbar to change workspaces 10# scroll on the toolbar to change workspaces
11OnToolbar Mouse4 :NextWorkspace 11OnToolbar Mouse4 :PrevWorkspace
12OnToolbar Mouse5 :PrevWorkspace 12OnToolbar Mouse5 :NextWorkspace
13 13
14# alt + left/right click to move/resize a window 14# alt + left/right click to move/resize a window
15OnWindow Mod1 Mouse1 :StartMoving 15OnWindow Mod1 Mouse1 :StartMoving
16OnWindow Mod1 Mouse3 :StartResizing 16OnWindow Mod1 Mouse3 :StartResizing NearestCorner
17 17
18# middle click a window's titlebar and drag to attach windows 18# middle click a window's titlebar and drag to attach windows
19OnTitlebar Mouse2 :StartTabbing 19OnTitlebar Mouse2 :StartTabbing
@@ -43,11 +43,26 @@ Mod4 7 :Tab 7
43Mod4 8 :Tab 8 43Mod4 8 :Tab 8
44Mod4 9 :Tab 9 44Mod4 9 :Tab 9
45 45
46# open a terminal
47Mod1 F1 :Exec xterm
48
46# open a dialog to run programs 49# open a dialog to run programs
47Mod1 F2 :Exec fbrun 50Mod1 F2 :Exec fbrun
48 51
49# close the current window 52# volume settings, using common keycodes
53# if these don't work, use xev to find out your real keycodes
54176 :Exec amixer sset Master,0 1+
55174 :Exec amixer sset Master,0 1-
56160 :Exec amixer sset Master,0 toggle
57
58# current window commands
50Mod1 F4 :Close 59Mod1 F4 :Close
60Mod1 F9 :Minimize
61Mod1 F10 :Maximize
62Mod1 F11 :Fullscreen
63
64# open the window menu
65Mod1 space :WindowMenu
51 66
52# exit fluxbox 67# exit fluxbox
53Control Mod1 Delete :Exit 68Control 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 @@
1! The following line will prevent styles from setting the background.
2! 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 @@
1[begin]
2 [shade]
3 [stick]
4 [maximize]
5 [iconify]
6 [raise]
7 [lower]
8 [sendto]
9 [layer]
10 [alpha]
11 [extramenus]
12 [separator]
13 [close]
14[end]