1 files changed, 10 insertions, 312 deletions

diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
index 560fef1..94bd2e4 100644
--- a/doc/fluxbox.1.in
+++ b/doc/fluxbox.1.in
@@ -159,6 +159,10 @@ Clicking the workspace name brings up the toolbar menu.
 Using the wheel on workspace name or the clock switches the workspace, this
 could also be enabled for the whole desktop in the fluxbox menu.
 .PP
+When 
+.B desktop warping
+is enabled, dragging a window outside the desktop will change to the next desktop.
+.PP
 Using the toolbar menu you can enter a name for the current workspace (when finished,
 press Enter).
 One can choose the toolbar's position, in which layer it should be see LAYERs below
@@ -464,314 +468,7 @@ resources to specify colors, textures, pixmaps and fonts, and thus
 the overall look of your window borders, menus and the toolbar.
 .PP
 The default installation of Fluxbox provides some of these style files.
-Usually they are put in
-.IR @pkgdatadir@/styles .
-You can study or edit these files to grasp how the Fluxbox style mechanism
-works.
-You can use the
-.BR [style] ", " [stylesdir] " and " [stylesmenu]
-menu commands in your menu file to be able to select and change between styles
-on the fly.
-.PP
-But you can also create a directory named
-.I ~/.fluxbox/styles
-in your homedirectory and put your own style files here.
-Of course you may choose any name for this directory, but many downloadable
-themes will rely on the name
-.I styles
-(following the bb.themes.org naming scheme).
-.PP
-To understand how the style mechanism works, you should have a little knowledge
-of how X resources work.
-.PP
-X resources consist of a key and a value.
-The key is constructed of several smaller keys (sometimes referred to as
-children), delimited by a period (`.').
-Keys may also contain a star (`*') to serve as a wildcard, which means that one
-line of typed text will match several keys.
-This is useful for styles that are based on one or two colors.
-.PP
-Fluxbox allows you to configure it's three main components: the toolbar, the
-menus and the window decorations.
-.PP
-The little window that shows the x-y position while dragging windows, borrows
-it's style from the window's titlebar.
-.PP
-Here are some quick examples:
-.EX
-toolbar.clock.color:    green
-.EE
-This sets the color resource of the toolbar clock to `green.' Another example:
-.EX
-menu*color:     rgb:3/4/5
-.EE
-This sets the color resource of the menu
-.I and all of its `children'
-to `rgb:3/4/5'.
-(For a description of color names, see
-.IR X (1).)
-So this one also applies to
-.IR menu.title.color " and " menu.frame.color .
-And with
-.EX
-*font:  -b&h-lucida-medium-r-normal-*-*-140-*
-.EE
-you set the font resource for all keys to this font name all at once.
-(For information about the fonts installed on your system, you can use a program like
-.IR xfontsel "(1), " gtkfontsel ", or " xlsfonts "(1).)"
-.PP
-Now, what makes Fluxbox just so spectacular, is its ability to render textures
-on the fly.
-Texture descriptions are specified directly to the key that they
-should apply to, e.g.:
-.ta \w'toolbar.clock.colorTo:\ 'u
-.EX
-toolbar.clock:  Raised Gradient Diagonal Bevel1
-toolbar.clock.color:    rgb:8/6/4
-toolbar.clock.colorTo:  rgb:4/3/2
-.EE
-Don't worry, we will explain right now!
-A texture description consists of up to five fields, which are as follows:
-.TP
-.B Flat / Raised / Sunken
-gives the component either a flat, raised or sunken appearance.
-.TP
-.B Gradient / Solid
-tells Fluxbox to draw either a solid color or a gradient texture.
-.TP
-.B Horizontal / Vertical / Diagonal / Crossdiagonal / Pipecross / Elliptic / Rectangle / Pyramid
-Select one of these texture types. They only work when also
-.B Gradient
-is specified!
-.TP
-.B Interlaced
-tells Fluxbox to interlace the texture (darken every other line).
-This option is most commonly used with gradiented textures, but from Fluxbox
-version 0.60.3 on, it also works in solid textures.
-.TP
-.B Bevel1 / Bevel2
-tells Fluxbox which type of bevel to use.
-Bevel1 is the default bevel.
-The shading is placed on the edge of the image.
-Bevel2 is an alternative.
-The shading is placed one pixel in from the edge of the image.
-.PP
-Instead of a texture description, also the option
-.B ParentRelative
-is available, which makes the component appear as a part of its parent, e.g.
-totally transparent.
-.PP
-Or for even more possibilities
-.B Pixmap .
-If pixmap texture is specified (it might not be necessary on every occasion)
-the pixmap file is specified in a separate pixmap resource.
-.EX
-toolbar.clock: pixmap
-toolbar.clock.pixmap: .fluxbox/styles/mine/clock_background.xpm
-.EE
-This feature might need some investigations, reports say that sometimes
-the resources color and colorTo must be set and then they may not be set.
-.PP
-All gradiented textures are composed of two color values: the
-.IR color " and " colorTo " resources."
-When
-.B Interlaced
-is used in
-.B Solid
-mode, the
-.I colorTo
-resource is used to find the interlacing color.
-.PP
-Well, here is the complete component list, also all components together with
-which kind of value they can contain.
-Comments are preceded with an exclamation sign (!), which is also used for
-comments in Fluxbox style c.q. X resource files.
-.PP
-.ta \w'window.button.unfocus.picColor:\ 'u
-.nf
-.\"
-.\" The comments also to be translated!
-.\"
-! The toolbar itself
-toolbar:        Texture
-toolbar.color:  Color
-toolbar.colorTo:        Color
-
-! The buttons on the toolbar
-toolbar.button: Texture or \fIParentRelative\fR
-toolbar.button.color:   Color
-toolbar.button.colorTo: Color
-
-! Color of the button arrows
-toolbar.button.picColor:        Color
-
-! Buttons in pressed state
-toolbar.button.pressed: Texture \fI(e.g. Sunken)\fR or \fIParentRelative\fR
-toolbar.button.pressed.color:   Color
-toolbar.button.pressed.colorTo: Color
-
-! Color of pressed button arrows
-toolbar.button.pressed.picColor:        Color
-
-! The toolbar workspace label
-toolbar.label:  Texture or \fIParentRelative\fR
-toolbar.label.color:    Color
-toolbar.label.colorTo:  Color
-toolbar.label.textColor:        Color
-
-! The toolbar window label
-toolbar.windowLabel:    Texture or \fIParentRelative\fR
-toolbar.windowLabel.color:      Color
-toolbar.windowLabel.colorTo:    Color
-toolbar.windowLabel.textColor:  Color
-
-! The toolbar clock
-toolbar.clock:  Texture or \fIParentRelative\fR
-toolbar.clock.color:    Color
-toolbar.clock.colorTo:  Color
-toolbar.clock.textColor:        Color
-
-! How the toolbar's text should be justified.
-toolbar.justify:        \fIcenter\fR, \fIleft\fR, or \fIright\fR
-
-! Font to be used for all toolbar components
-toolbar.font:   Font \fI(e.g. -*-helvetica-medium-r-normal-*-*-100-*)\fR
-
-! The menu titlebar
-menu.title:     Texture
-menu.title.color:       Color
-menu.title.colorTo:     Color
-menu.title.textColor:   Color
-menu.title.font:        Font
-menu.title.justify:     \fIcenter\fR, \fIleft\fR, or \fIright\fR
-
-! The menu frame
-menu.frame:     Texture
-menu.frame.color:       Color
-menu.frame.colorTo:     Color
-menu.frame.textColor:   Color
-menu.frame.disableColor:        Color
-menu.frame.font:        Font
-! Font can have a shadow. e.g. menu.frame.font: Verdana-8:shadow 
-menu.frame.justify:     \fIcenter\fR, \fIleft\fR, or \fIright\fR
-
-! Bullets for submenu items
-menu.bullet:    \fIempty\fR, \fItriangle\fR, \fIsquare\fR, or \fIdiamond\fR
-menu.bullet.position:   \fIright\fR or \fIleft\fR
-
-! The highlighted menu item
-menu.hilite:    Texture (e.g. \fIRaised\fR)
-menu.hilite.color:      Color
-menu.hilite.colorTo:    Color
-menu.hilite.textColor:  Color
-
-! A focused window
-window.title.focus:     Texture
-window.title.focus.color:       Color
-window.title.focus.colorTo:     Color
-
-! An unfocused window
-window.title.unfocus:   Texture
-window.title.unfocus.color:     Color
-window.title.unfocus.colorTo:   Color
-
-! Window label in window.title
-window.label.focus:     Texture or \fIParentRelative\fR
-window.label.focus.color:       Color
-window.label.focus.colorTo:     Color
-window.label.focus.textColor:   Color
-
-window.label.unfocus:   Texture or \fIParentRelative\fR
-window.label.unfocus.color:     Color
-window.label.unfocus.colorTo:   Color
-window.label.unfocus.textColor: Color
-
-! window label for active tab if window is not focussed
-window.label.active:   Texture
-window.label.active.textColor:  Color
-
-! Handlebar
-window.handle.focus:    Texture
-window.handle.focus.color:      Color
-window.handle.focus.colorTo:    Color
-
-window.handle.unfocus:  Texture
-window.handle.unfocus.color:    Color
-window.handle.unfocus.colorTo:  Color
-
-! Resize grips
-window.grip.focus:      Texture
-window.grip.focus.color:        Color
-window.grip.focus.colorTo:      Color
-
-window.grip.unfocus:    Texture
-window.grip.unfocus.color:      Color
-window.grip.unfocus.colorTo:    Color
-
-! Window buttons
-window.button.focus:    Texture or \fIParentRelative\fR
-window.button.focus.color:      Color
-window.button.focus.colorTo:    Color
-window.button.focus.picColor:   Color
-
-window.button.unfocus:  Texture or \fIParentRelative\fR
-window.button.unfocus.color:    Color
-window.button.unfocus.colorTo:  Color
-window.button.unfocus.picColor: Color
-
-window.button.pressed:  Texture (e.g. \fISunken\fR)
-window.button.pressed.color:    Color
-window.button.pressed.colorTo:  Color
-
-! Frame around window
-window.frame.focusColor:        Color
-window.frame.unfocusColor:      Color
-
-! Font and justification for window labels
-window.font:    Font
-window.justify: \fIcenter\fR, \fIleft\fR, or \fIright\fR
-
-! Slit resources
-slit:
-slit.color:                     Color
-slit.colorTo:                   Color
-
-! Miscellaneous resources
-
-! A border can be drawn round all components
-borderWidth:    a number of pixels, e.g. \fI1\fR
-borderColor:    Color
-
-bevelWidth:     a number of pixels > 0
-handleWidth:    a number of pixels > 0
-
-! Width of the window frame
-! When not specified, frameWidth defaults to the value of bevelWidth
-frameWidth:     a number of pixels >= 0
-
-
-! This command is executed whenever this style is selected.
-! Typically it sets the root window to a nice picture.
-rootCommand:    Shell command, e.g. \fIbsetroot -mod 4 4 -fg rgb:       5/6/6 -bg grey20\fR
-
-! Some of the bbtools read these old 0.51 resources
-menuFont:       Font
-titleFont:      Font
-.fi
-.PP
-Now, this seems a long list, but remember, when you create your own style, you
-can easily set lots of keys with a single command, e.g.
-.EX
-.ta \w'*unfocus.textColor:\ 'u
-*color: slategrey
-*colorTo:       darkslategrey
-*unfocus.color: darkslategrey
-*unfocus.colorTo:       black
-*textColor:     white
-*unfocus.textColor:     lightgrey
-*font:  lucidasans-10
-.EE
-This sets already nice defaults for many components.
+See fluxstyle(1) to accomodate the growing number of style components.
 .\" --- keys ---
 .SH KEYS FILE
 You can customise Fluxbox' key handling through the
@@ -1266,11 +963,12 @@ from the original Blackbox man page by Wilbert Berendsen
 and subsequently hacked upon by Tobias Klausmann
 .nh
 <klausman@users.sourceforge.net>
-.nh
-and
+,
+<grubert@users.sourceforge.net>
+,
+<asenchi@asenchi.com>
 .hy
-<grubert@users.sourceforge.net>.
-.nh
+.PP
 Numerous other languages could be available if someone jumps in.
 .SH SEE ALSO
 .IR bsetroot (1)