Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 92 insertions, 0 deletions

diff --git a/doc/asciidoc/fbrun.txt b/doc/asciidoc/fbrun.txt
new file mode 100644
index 0000000..fd27be8
--- /dev/null
+++ b/doc/asciidoc/fbrun.txt
@@ -0,0 +1,92 @@
+fbrun(1)
+========
+Jim Ramsay <i.am@jimramsay.com>
+v1.1.2, 18 February 2009
+:man source:   fbrun.txt
+:man version:  {revision}
+:man manual:   Fluxbox Manual  
+
+NAME
+----
+fbrun - display run dialog window
+
+SYNOPSIS
+--------
+*fbrun* ['options']
+
+DESCRIPTION
+-----------
+*fbrun(1)* is  basically equivalent to the ``Run...'' dialog in other desktop
+environments. This means that it is an easy way to start a program that isn't
+contained  in the menu (or needs a special set of parameters for this particular
+invocation).
+
+Pressing ``Enter'' will close the window and execute the command in your present
+*$SHELL*. Pressing ``Esc'' will close the window and does not execute anything.
+
+Another way fbrun can be useful is to be called from the  menu  with  a
+preloaded  command  line that you can edit and then execute. An example might be
+sshing to a very long host name with lots of options of  which one  changes  all
+the  time.  In this case, you could add an entry for fbrun to your menu that
+contains all the options  and  the  host  name.  When  you use said entry, you
+could edit the line as necessary and execute it.
+
+OPTIONS
+-------
+*-title* 'title'::
+        Set title
+
+*-text* 'text'::
+        Text input
+
+*-w* 'width'::
+        Window width in pixels
+
+*-h* 'height'::
+        Window height in pixels
+
+*-display* 'display'::
+        Display name, defaults to *$DISPLAY*
+
+*-pos* 'x' 'y'::
+        Window position in pixels
+
+*-nearmouse*::
+        Position the window under the mouse cursor
+
+*-fg* 'color'::
+        Foreground text color. The default is *black*
+
+*-bg* 'color'::
+        Background color. The default is *white*
+
+*-font* 'name'::
+        Text font name
+
+*-na*::
+        Disable font antialias
+
+*-hf* 'filename'::
+        History file to load. The default is *~/.fluxbox/fbrun_history*.
+
+*-help*::
+        Show this help
+
+EXAMPLE
+-------
+....
+fbrun -fg black -bg white -text xterm -title "run xterm"
+....
+
+AUTHORS
+-------
+This manpage was originally written by Bastian Kleineidam <calvin at
+debian.org> for the Debian distribution of fluxbox (but may be used by
+others).
+
+It was then converted to asciidoc format by Jim Ramsay <i.am at jimramsay.com>
+for fluxbox-1.1.2
+
+SEE ALSO
+--------
+fluxbox(1)