applied reject no match patch

[dmenu.git] / dmenu.1

diff --git a/dmenu.1 b/dmenu.1
index bbee17d..10d968f 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -3,13 +3,11 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu

-.RB [ \-b ]
-.RB [ \-f ]
-.RB [ \-i ]
+.RB [ \-bfirv ]

 .RB [ \-l
 .RB [ \-l

+.IR lines ]

 .RB [ \-m
 .IR monitor ]
 .RB [ \-m
 .IR monitor ]

-.IR lines ]

 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn
 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn


@@ -22,7 +20,8 @@ dmenu \- dynamic menu
 .IR color ]
 .RB [ \-sf
 .IR color ]
 .IR color ]
 .RB [ \-sf
 .IR color ]

-.RB [ \-v ]
+.RB [ \-w
+.IR windowid ]

 .P
 .BR dmenu_run " ..."
 .SH DESCRIPTION
 .P
 .BR dmenu_run " ..."
 .SH DESCRIPTION


@@ -41,18 +40,25 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
 .B \-b
 dmenu appears at the bottom of the screen.
 .TP
 .B \-b
 dmenu appears at the bottom of the screen.
 .TP

+.B \-c
+dmenu appears centered on the screen.
+.TP

 .B \-f
 .B \-f

-dmenu grabs the keyboard before reading stdin.  This is faster, but will lock up
-X until stdin reaches end\-of\-file.
+dmenu grabs the keyboard before reading stdin if not reading from a tty. This
+is faster, but will lock up X until stdin reaches end\-of\-file.

 .TP
 .B \-i
 dmenu matches menu items case insensitively.
 .TP
 .TP
 .B \-i
 dmenu matches menu items case insensitively.
 .TP

+.B \-r
+dmenu will reject any input which would result in no matching option left.
+.TP

 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP
 .BI \-m " monitor"
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP
 .BI \-m " monitor"

-dmenu is displayed on the monitor supplied.
+dmenu is displayed on the monitor number supplied. Monitor numbers are starting
+from 0.

 .TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.


@@ -77,6 +83,9 @@ defines the selected foreground color.
 .TP
 .B \-v
 prints version information to stdout, then exits.
 .TP
 .B \-v
 prints version information to stdout, then exits.

+.TP
+.BI \-w " windowid"
+embed into windowid.

 .SH USAGE
 dmenu is completely controlled by the keyboard.  Items are selected using the
 arrow keys, page up, page down, home, and end.
 .SH USAGE
 dmenu is completely controlled by the keyboard.  Items are selected using the
 arrow keys, page up, page down, home, and end.


@@ -97,79 +106,94 @@ Confirm input.  Prints the input text to stdout and exits, returning success.
 .B Escape
 Exit without selecting an item, returning failure.
 .TP
 .B Escape
 Exit without selecting an item, returning failure.
 .TP

-C\-a
+.B Ctrl-Left
+Move cursor to the start of the current word
+.TP
+.B Ctrl-Right
+Move cursor to the end of the current word
+.TP
+.B C\-a

 Home
 .TP
 Home
 .TP

-C\-b
+.B C\-b

 Left
 .TP
 Left
 .TP

-C\-c
+.B C\-c

 Escape
 .TP
 Escape
 .TP

-C\-d
+.B C\-d

 Delete
 .TP
 Delete
 .TP

-C\-e
+.B C\-e

 End
 .TP
 End
 .TP

-C\-f
+.B C\-f

 Right
 .TP
 Right
 .TP

-C\-g
+.B C\-g

 Escape
 .TP
 Escape
 .TP

-C\-h
+.B C\-h

 Backspace
 .TP
 Backspace
 .TP

-C\-i
+.B C\-i

 Tab
 .TP
 Tab
 .TP

-C\-j
+.B C\-j

 Return
 .TP
 Return
 .TP

-C\-J
+.B C\-J

 Shift-Return
 .TP
 Shift-Return
 .TP

-C\-k
+.B C\-k

 Delete line right
 .TP
 Delete line right
 .TP

-C\-m
+.B C\-m

 Return
 .TP
 Return
 .TP

-C\-n
+.B C\-M
+Shift-Return
+.TP
+.B C\-n

 Down
 .TP
 Down
 .TP

-C\-p
+.B C\-p

 Up
 .TP
 Up
 .TP

-C\-u
+.B C\-u

 Delete line left
 .TP
 Delete line left
 .TP

-C\-w
+.B C\-w

 Delete word left
 .TP
 Delete word left
 .TP

-C\-y
+.B C\-y

 Paste from primary X selection
 .TP
 Paste from primary X selection
 .TP

-C\-Y
+.B C\-Y

 Paste from X clipboard
 .TP
 Paste from X clipboard
 .TP

-M\-g
+.B M\-b
+Move cursor to the start of the current word
+.TP
+.B M\-f
+Move cursor to the end of the current word
+.TP
+.B M\-g

 Home
 .TP
 Home
 .TP

-M\-G
+.B M\-G

 End
 .TP
 End
 .TP

-M\-h
+.B M\-h

 Up
 .TP
 Up
 .TP

-M\-j
+.B M\-j

 Page down
 .TP
 Page down
 .TP

-M\-k
+.B M\-k

 Page up
 .TP
 Page up
 .TP

-M\-l
+.B M\-l

 Down
 .SH SEE ALSO
 .IR dwm (1),
 Down
 .SH SEE ALSO
 .IR dwm (1),