PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

Remove deprecated option, fix typo in manpage.

Browse source
This commit is contained in:
Dave Davenport 2021-06-08 22:02:29 +02:00
parent d18a887f03
commit b478de3d7d
6 changed files with 33 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.c
View file

@ -40,8 +40,6 @@ Settings config = {
#else
.modi = "run,ssh",
#endif
/** Border width around the window. */
.menu_bw = 1,
/** The width of the switcher. (0100 in % > 100 in pixels) */
.menu_width = 50,
/** Maximum number of options to show. */
@ -81,8 +79,6 @@ Settings config = {
*
*/
.location = WL_CENTER,
/** Padding between elements */
.padding = 5,
/** Y offset */
.y_offset = 0,
/** X offset */

57
doc/rofi.1
View file

@ -1,7 +1,7 @@
.TH ROFI 1 rofi
.SH NAME
.PP
\fBrofi\fP \- A window switcher, application launcher, ssh dialog and dmenu replacement
\fBrofi\fP \- A window switcher, application launcher, ssh dialog, dmenu replacement and more
.SH SYNOPSIS
.PP
@ -82,22 +82,10 @@ Command\-line options: Arguments passed to \fBrofi\fP\&.
.RE
.PP
\fBTIP\fP: To get a template config file run: \fB\fCrofi \-dump\-config > config.rasi\fR
To get a template config file run: \fB\fCrofi \-dump\-config > config.rasi\fR
.PP
To get a list of available options formatted in reasi format, run:
.PP
.RS
.nf
rofi \-dump\-config
.fi
.RE
.PP
This will contain (commented) all current configuration options.
This will contain (commented) all current configuration options, modified options are uncommented.
.PP
The configuration system supports the following types:
@ -251,6 +239,9 @@ rofi \-show run
.fi
.RE
.PP
If \fB\fC\-show\fR is the last option passed to rofi, the first enabled modi is shown.
.PP
\fB\fC\-modi\fR \fImode1,mode2\fP
@ -297,6 +288,18 @@ rofi \-modi "window,run,ssh,Workspaces:i3\_switch\_workspaces.sh" \-show Workspa
Notes: The i3 window manager does not like commas in the command when specifying an exec command.
For that case '#' can be used as an separator.
.PP
\fBTIP\fP: The name is allowed to contain spaces:
.PP
.RS
.nf
rofi \-modi "My File Browser:fb.sh" \-show "My File Browser"
.fi
.RE
.PP
\fB\fC\-case\-sensitive\fR
@ -670,15 +673,6 @@ Default: \fI0\fP
.PP
Keep a fixed number of visible lines (See the \fB\fC\-lines\fR option.)
.PP
\fB\fC\-padding\fR
.PP
Define the inner margin of the window.
.PP
Default: \fI5\fP
.PP
\fB\fC\-sidebar\-mode\fR
@ -1572,18 +1566,6 @@ rofi \-modi combi,window \-show combi \-combi\-modi run,drun
.fi
.RE
.PP
Run \fBrofi\fP full monitor width at the top of the monitor like a dropdown menu:
.PP
.RS
.nf
rofi \-show run \-width 100 \-location 1 \-lines 5 \-bw 2 \-yoffset \-2
.fi
.RE
.PP
Pop up a text message claiming that this is the end:
@ -1777,7 +1759,7 @@ first.
.RS
.IP \(bu 2
Qball Cow
\[la]qball@gmpclient.org\[ra]
\[la]qball@blame.services\[ra]
.IP \(bu 2
Rasmus Steinke
\[la]rasi@xssn.at\[ra]
@ -1789,6 +1771,7 @@ Quentin Glidic
.PP
Original code based on work by: Sean Pringle
\[la]https://github.com/seanpringle/simpleswitcher\[ra]
\[la]sean.pringle@gmail.com\[ra]
.PP

31
doc/rofi.1.markdown
View file

@ -2,7 +2,7 @@
## NAME
**rofi** - A window switcher, application launcher, ssh dialog and dmenu replacement
**rofi** - A window switcher, application launcher, ssh dialog, dmenu replacement and more
## SYNOPSIS
@ -59,13 +59,9 @@ There are currently three methods of setting configuration options (evaluated in
* Rasi theme file: The new *theme* format can be used to set configuration values.
* Command-line options: Arguments passed to **rofi**.
**TIP**: To get a template config file run: `rofi -dump-config > config.rasi`
To get a template config file run: `rofi -dump-config > config.rasi`
To get a list of available options formatted in reasi format, run:
rofi -dump-config
This will contain (commented) all current configuration options.
This will contain (commented) all current configuration options, modified options are uncommented.
The configuration system supports the following types:
@ -146,6 +142,8 @@ To show the run-dialog:
rofi -show run
If `-show` is the last option passed to rofi, the first enabled modi is shown.
`-modi` *mode1,mode2*
Specify an ordered, comma-separated list of modes to enable.
@ -166,6 +164,10 @@ Example: Have a mode called 'Workspaces' using the `i3_switch_workspaces.sh` scr
Notes: The i3 window manager does not like commas in the command when specifying an exec command.
For that case '#' can be used as an separator.
**TIP**: The name is allowed to contain spaces:
rofi -modi "My File Browser:fb.sh" -show "My File Browser"
`-case-sensitive`
Start in case sensitive mode.
@ -187,7 +189,6 @@ Load an alternative configuration file.
Directory that is used to place temporary files, like history.
`-scroll-method` *method*
Select the scrolling method. 0: Per page, 1: continuous.
@ -372,12 +373,6 @@ Default: *0*
Keep a fixed number of visible lines (See the `-lines` option.)
`-padding`
Define the inner margin of the window.
Default: *5*
`-sidebar-mode`
Open in sidebar-mode. In this mode a list of all enabled modes is shown at the bottom.
@ -944,10 +939,6 @@ Combine the run and Desktop File run dialog (`drun`), and allow switching to win
rofi -modi combi,window -show combi -combi-modi run,drun
Run **rofi** full monitor width at the top of the monitor like a dropdown menu:
rofi -show run -width 100 -location 1 -lines 5 -bw 2 -yoffset -2
Pop up a text message claiming that this is the end:
rofi -e "This is the end"
@ -1061,10 +1052,10 @@ first.
## AUTHOR
* Qball Cow <qball@gmpclient.org>
* Qball Cow <qball@blame.services>
* Rasmus Steinke <rasi@xssn.at>
* Quentin Glidic <sardemff7+rofi@sardemff7.net>
Original code based on work by: Sean Pringle <sean.pringle@gmail.com>
Original code based on work by: [Sean Pringle](https://github.com/seanpringle/simpleswitcher) <sean.pringle@gmail.com>
For a full list of authors, check the `AUTHORS` file.

4
include/settings.h
View file

@ -61,8 +61,6 @@ typedef struct
{
/** List of enabled modi */
char *modi;
/** Border width */
unsigned int menu_bw;
/** Width (0-100 in %, > 100 in pixels, < 0 in char width.) */
int menu_width;
/** # lines */
@ -102,8 +100,6 @@ typedef struct
/** Windows location/gravity */
WindowLocation location;
/** Padding between elements */
unsigned int padding;
/** Y offset */
int y_offset;
/** X offset */

5
source/theme.c
View file

@ -1108,11 +1108,6 @@ static char * rofi_theme_convert_color ( char *col )
}
void rofi_theme_convert_old ( void )
{
{
char *str = g_strdup_printf ( "#window { border: %d; padding: %d;}", config.menu_bw, config.padding );
rofi_theme_parse_string ( str );
g_free ( str );
}
if ( config.color_window ) {
char **retv = g_strsplit ( config.color_window, ",", -1 );
const char * const conf[] = {

10
source/xrmoptions.c
View file

@ -95,16 +95,8 @@ static XrmOption xrmOptions[] = {
{ xrm_String, "font", { .str = &config.menu_font }, NULL,
"Font to use", CONFIG_DEFAULT },
{ xrm_Number, "borderwidth", { .num = &config.menu_bw }, NULL,
"", CONFIG_DEFAULT },
{ xrm_Number, "bw", { .num = &config.menu_bw }, NULL,
"Border width", CONFIG_DEFAULT },
{ xrm_Number, "location", { .num = &config.location }, NULL,
"Location on screen", CONFIG_DEFAULT },
{ xrm_Number, "padding", { .num = &config.padding }, NULL,
"Padding", CONFIG_DEFAULT },
{ xrm_SNumber, "yoffset", { .snum = &config.y_offset }, NULL,
"Y-offset relative to location", CONFIG_DEFAULT },
{ xrm_SNumber, "xoffset", { .snum = &config.x_offset }, NULL,
@ -233,7 +225,7 @@ static XrmOption xrmOptions[] = {
"Normalize string when matching (disables match highlighting).", CONFIG_DEFAULT },
{ xrm_Boolean, "steal-focus", { .snum = &config.steal_focus }, NULL,
"Steal focus on launch and restore to window that had it on rofi start on close .", CONFIG_DEFAULT },
{ xrm_String, "application-fallback-icon", { .snum = &(config.application_fallback_icon) }, NULL,
{ xrm_String, "application-fallback-icon", { .str = &(config.application_fallback_icon) }, NULL,
"Fallback icon to use when the application icon is not found in run/drun.", CONFIG_DEFAULT },
};