aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--doc/asciidoc/fluxbox.txt41
-rw-r--r--doc/asciidoc/fluxstyle.txt14
3 files changed, 35 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 44ece83..372f307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/08/03:
4 * Updated documentation (Mark)
5 fluxbox.txt fluxstyle.txt
3*06/08/02: 6*06/08/02:
4 * Rename session.screen*.iconbar.deiconifyMode to 7 * Rename session.screen*.iconbar.deiconifyMode to
5 session.screen*.userFollowModel (Mark) 8 session.screen*.userFollowModel (Mark)
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 681d445..2e143ca 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -796,10 +796,11 @@ session.screen0.toolbar.placement: <placement>
796 796
797session.screen0.slit.maxOver: <boolean> 797session.screen0.slit.maxOver: <boolean>
798session.screen0.toolbar.maxOver: <boolean> 798session.screen0.toolbar.maxOver: <boolean>
799session.screen0.tabs.maxOver: <boolean>
799 Setting these to True will allow application windows to maximize over the 800 Setting these to True will allow application windows to maximize over the
800 complete screen. Setting to False allows the slit and toolbar to hold 801 complete screen. Setting to False allows the slit, toolbar, and external
801 their territory and will always be visible when an application is 802 tabs to hold their territory and will always be visible when an
802 maximized. Default: False 803 application is maximized. Default: False
803 804
804session.screen0.toolbar.height: <integer> 805session.screen0.toolbar.height: <integer>
805 Set the height of the toolbar. If the value is set to 0, the style file 806 Set the height of the toolbar. If the value is set to 0, the style file
@@ -851,13 +852,6 @@ session.screen0.iconbar.iconTextPadding: <integer>
851 This specifies the space between the window title and the edge of the 852 This specifies the space between the window title and the edge of the
852 button. Default: 10 853 button. Default: 10
853 854
854session.screen0.iconbar.deiconifyMode: Current|Follow|Semifollow
855 This specifies what should happen when you click on an iconbar button for
856 a window in another workspace. `Current' moves the window to the current
857 workspace. `Follow' switches to the window's workspace. `Semifollow' acts
858 like `Current' for minimized windows and like `Follow' for the rest.
859 Default: Current
860
861session.screen0.iconbar.wheelMode: Screen|On|Off 855session.screen0.iconbar.wheelMode: Screen|On|Off
862 This defines the behavior for scrolling on the iconbar. `Screen' uses the 856 This defines the behavior for scrolling on the iconbar. `Screen' uses the
863 value set in session.screen0.desktopWheeling . `On' means scrolling on the 857 value set in session.screen0.desktopWheeling . `On' means scrolling on the
@@ -903,11 +897,16 @@ session.screen0.tab.placement: <placement>
903session.screen0.tab.width: <integer> 897session.screen0.tab.width: <integer>
904 This specifies the width of external tabs in pixels. Default: 64 898 This specifies the width of external tabs in pixels. Default: 64
905 899
906session.screen0.followModel: Ignore|Follow|Current 900session.screen0.followModel: <model>
907 This specifies the behavior when a window on another workspace requests to 901session.screen0.userFollowModel: <model>
908 become the active window. `Ignore' does nothing. `Follow' moves to the 902 This specifies the behavior when a window on another workspace becomes the
909 window's workspace. `Current' moves the window to the current workspace. 903 active window. The former is used when an application asks to focus the
910 Default: Ignore 904 window, and the latter is used when the window is activated due to user
905 actions, such as clicking in the iconbar, menu, or pager. `Ignore' does
906 nothing. `Follow' moves to the window's workspace. `Current' moves the
907 window to the current workspace. `SemiFollow' acts like `Current' for
908 iconified windows and like `Follow' otherwise. Defaults: Ignore and
909 Follow, respectively.
911 910
912session.screen0.resizeMode: Bottom|Quadrant|Center 911session.screen0.resizeMode: Bottom|Quadrant|Center
913 Setting this resource to `Quadrant' makes resizing by ALT + Right 912 Setting this resource to `Quadrant' makes resizing by ALT + Right
@@ -1024,6 +1023,7 @@ session.keyFile: <location>
1024session.menuFile: <location> 1023session.menuFile: <location>
1025session.slitlistFile: <location> 1024session.slitlistFile: <location>
1026session.styleFile: <location> 1025session.styleFile: <location>
1026session.styleOverlay: <location>
1027 All of these resources require a pathname to their specific files. This is 1027 All of these resources require a pathname to their specific files. This is
1028 where you can specify different files. Most of the defaults will be 1028 where you can specify different files. Most of the defaults will be
1029 located in the user's ~/.fluxbox directory. 1029 located in the user's ~/.fluxbox directory.
@@ -1238,10 +1238,11 @@ Couple of things
1238 press the NextWindow key, you will walk through all windows in the, 1238 press the NextWindow key, you will walk through all windows in the,
1239 order that they were opened, instead of switching back and forth 1239 order that they were opened, instead of switching back and forth
1240 between the most recently focused windows. 1240 between the most recently focused windows.
1241 16 = Skip iconified windows
1241 1242
1242 To combine any of these effects, add the corresponding numbers. 1243 To combine any of these effects, add the corresponding numbers.
1243 For instance, 14 means switch linearly, skipping stuck and shaded 1244 For instance, 14 means switch linearly, skipping stuck and shaded
1244 windows. 1245 windows, since 14 = 8 + 4 + 2.
1245 1246
1246- Bindkey will append key string and action to your keys file and bind the key. 1247- Bindkey will append key string and action to your keys file and bind the key.
1247 1248
@@ -1376,6 +1377,10 @@ tabs. Inside of it there are three main options:
1376 When this option is on, tabs are fixed in window titlebar and the width 1377 When this option is on, tabs are fixed in window titlebar and the width
1377 varies according to the amount of windows grouped. 1378 varies according to the amount of windows grouped.
1378 1379
1380- *Maximize Over*:
1381 When this option is on, maximizing a window will disregard the size and
1382 location of external tabs.
1383
1379- *External Tab Width*: 1384- *External Tab Width*:
1380 This specifies in pixels the width of external tabs. 1385 This specifies in pixels the width of external tabs.
1381 1386
@@ -1395,6 +1400,10 @@ window borders, menus and the toolbar.
1395The default installation of fluxbox provides some of these style files. See 1400The default installation of fluxbox provides some of these style files. See
1396fluxstyle(1) to accommodate the growing number of style components. 1401fluxstyle(1) to accommodate the growing number of style components.
1397 1402
1403In addition to the style file, the overlay file, whose location is specified by
1404session.screen0.styleOverlay can be used to set style resources that override
1405the current style.
1406
1398APPLICATIONS 1407APPLICATIONS
1399------------ 1408------------
1400It is possible to force an application to always have the same dimensions, 1409It is possible to force an application to always have the same dimensions,
diff --git a/doc/asciidoc/fluxstyle.txt b/doc/asciidoc/fluxstyle.txt
index 39418c3..596c148 100644
--- a/doc/asciidoc/fluxstyle.txt
+++ b/doc/asciidoc/fluxstyle.txt
@@ -24,10 +24,10 @@ installation of fluxbox is shipped with many classic examples that show a
24great deal of what one could do. To use one of the standard styles navigate to 24great deal of what one could do. To use one of the standard styles navigate to
25the 'System Styles' menu under your main fluxbox menu. 25the 'System Styles' menu under your main fluxbox menu.
26 26
27fluxbox uses it's own graphics class to render its images on the fly. By using 27fluxbox uses its own graphics class to render its images on the fly. By using
28styles you can determine, at a great level, of configurability what your 28styles you can determine, at a great level of configurability, what your
29desktop will look like. Since fluxbox was derived from flackbox many often 29desktop will look like. Since fluxbox was derived from blackbox many often
30wonder if old themes will work on the latest releases of flackbox. Well they 30wonder if old themes will work on the latest releases of fluxbox. Well they
31basically do, but you will have to tune them since the fluxbox code has 31basically do, but you will have to tune them since the fluxbox code has
32changed quite a bit since the initial grab. 32changed quite a bit since the initial grab.
33 33
@@ -116,7 +116,7 @@ information about the fonts installed on your system, you can use a
116program like xfontsel(1), gtkfontsel, or xlsfonts(1).) 116program like xfontsel(1), gtkfontsel, or xlsfonts(1).)
117 117
118In the last example you will notice the wildcard (\*) before font. In a Fluxbox 118In the last example you will notice the wildcard (\*) before font. In a Fluxbox
119style you can set a value with a wild card. The example means that every font 119style you can set a value with a wildcard. The example means that every font
120in the style will be what is specified. You can do this with any 120in the style will be what is specified. You can do this with any
121component/value. For example if you wanted all of the text to be one color you 121component/value. For example if you wanted all of the text to be one color you
122would do: 122would do:
@@ -157,8 +157,8 @@ Select one of these texture types. They only work when *Gradient* is specified.
157 157
158.Interlaced 158.Interlaced
159tells fluxbox to interlace the texture (darken every other line). This option 159tells fluxbox to interlace the texture (darken every other line). This option
160is most commonly used with gradiented textures, but from fluxbox version 160is most commonly used with gradiented textures, but it also works in solid
1610.60.3 on, it also works in solid textures. 161textures.
162 162
163.Bevel1 | Bevel2 163.Bevel1 | Bevel2
164tells fluxbox which type of bevel to use. Bevel1 is the default bevel. The 164tells fluxbox which type of bevel to use. Bevel1 is the default bevel. The