diff --git a/doc/rofi-script.5 b/doc/rofi-script.5 index bc6b98bc..96aef1e2 100644 --- a/doc/rofi-script.5 +++ b/doc/rofi-script.5 @@ -64,8 +64,6 @@ Rofi sets the following environment variable when executing the script: .SS \fB\fCROFI\_RETV\fR .PP An integer number with the current state: - -.RS .IP \(bu 2 \fB0\fP: Initial call of script. .IP \(bu 2 @@ -75,8 +73,6 @@ An integer number with the current state: .IP \(bu 2 \fB10\-28\fP: Custom keybinding 1\-19 ( need to be explicitely enabled by script ). -.RE - .SS \fB\fCROFI\_INFO\fR .PP Environment get set when selected entry get set with the property value of the 'info' row option, if set. @@ -100,8 +96,6 @@ For example to set the prompt: .PP The following extra options exists: - -.RS .IP \(bu 2 \fBprompt\fP: Update the prompt text. .IP \(bu 2 @@ -119,8 +113,6 @@ The following extra options exists: .IP \(bu 2 \fBuse\-hot\-keys\fP: If set to true, it enabled the Custom keybindings for script. Warning this breaks the normal rofi flow. -.RE - .SH Parsing row options .PP Extra options for individual rows can be set. @@ -140,8 +132,6 @@ For example: .PP The following options are supported: - -.RS .IP \(bu 2 \fBicon\fP: Set the icon for that row. .IP \(bu 2 @@ -151,8 +141,6 @@ The following options are supported: .IP \(bu 2 \fBinfo\fP: Info that, on selection, gets placed in the \fB\fCROFI\_INFO\fR environment variable. This entry does not get searched. -.RE - .PP multiple entries can be passed using the \fB\fC\\x1f\fR separator. diff --git a/doc/rofi-sensible-terminal.1 b/doc/rofi-sensible-terminal.1 index 30d4a15d..6d10df97 100644 --- a/doc/rofi-sensible-terminal.1 +++ b/doc/rofi-sensible-terminal.1 @@ -16,8 +16,6 @@ shipping this script in a way which is appropriate for the distribution. .PP It tries to start one of the following (in that order): - -.RS .IP \(bu 2 \fB\fC$TERMINAL\fR (this is a non\-standard variable) .IP \(bu 2 @@ -55,8 +53,6 @@ alacritty .IP \(bu 2 kitty -.RE - .SH SEE ALSO .PP rofi(1) diff --git a/doc/rofi-theme-selector.1 b/doc/rofi-theme-selector.1 index de076ff4..99525093 100644 --- a/doc/rofi-theme-selector.1 +++ b/doc/rofi-theme-selector.1 @@ -18,8 +18,6 @@ It lets you preview each theme with the Enter key and apply the theme to your .SH Theme directories .PP \fBrofi\-theme\-selector\fP searches the following directories for themes: - -.RS .IP \(bu 2 ${PREFIX}/share/rofi/themes .IP \(bu 2 @@ -27,8 +25,6 @@ $XDG\_CONFIG\_HOME/rofi/themes .IP \(bu 2 $XDG\_DATA\_HOME/share/rofi/themes -.RE - .PP ${PREFIX} reflects the install location of rofi. In most cases this will be "/usr".
$XDG\_CONFIG\_HOME is normally unset. Default path is "$HOME/.config".
diff --git a/doc/rofi-theme.5 b/doc/rofi-theme.5 index efa96e8a..ec5d49ce 100644 --- a/doc/rofi-theme.5 +++ b/doc/rofi-theme.5 @@ -19,15 +19,11 @@ preferred. .SH Comments .PP C and C++ file comments are supported. - -.RS .IP \(bu 2 Anything after \fB\fC//\fR and before a newline is considered a comment. .IP \(bu 2 Everything between \fB\fC/*\fR and \fB\fC*/\fR is a comment. -.RE - .PP Comments can be nested and the C comments can be inline. @@ -246,8 +242,6 @@ When used, values with the wrong type that cannot be converted are ignored. .PP The current theme format supports different types: - -.RS .IP \(bu 2 a string .IP \(bu 2 @@ -285,18 +279,12 @@ an environment variable .IP \(bu 2 Inherit -.RE - .PP Some of these types are a combination of other types. -.SH String -.RS -.IP \(bu 2 +.SH String.IP \(bu 2 Format: \fB\fC"[:print:]+"\fR -.RE - .PP A string is always surrounded by double quotes (\fB\fC"\fR). Between the quotes there can be any printable character. @@ -315,13 +303,9 @@ font: "Awasome 12"; .PP The string must be valid UTF\-8. -.SH Integer -.RS -.IP \(bu 2 +.SH Integer.IP \(bu 2 Format: \fB\fC[\-+]?[:digit:]+\fR -.RE - .PP An integer may contain any number. @@ -337,13 +321,9 @@ lines: 12; .fi .RE -.SH Real -.RS -.IP \(bu 2 +.SH Real.IP \(bu 2 Format: \fB\fC[\-+]?[:digit:]+(\\.[:digit:]+)?\fR -.RE - .PP A real is an integer with an optional fraction. @@ -362,13 +342,9 @@ real: 3.4; .PP The following is not valid: \fB\fC\&.3\fR, \fB\fC3.\fR or scientific notation: \fB\fC3.4e\-3\fR\&. -.SH Boolean -.RS -.IP \(bu 2 +.SH Boolean.IP \(bu 2 Format: \fB\fC(true|false)\fR -.RE - .PP Boolean value is either \fB\fCtrue\fR or \fB\fCfalse\fR\&. This is case\-\&sensitive. @@ -387,14 +363,13 @@ dynamic: false; .SH Image .PP \fBrofi\fP support a very limited set of image formats. - -.RS .IP \(bu 2 Format: url("path to image"); .IP \(bu 2 Format: linear\-gradient(stop color,stop1, color, stop2 color, ...); - -.RE +.IP \(bu 2 +Format: linear\-gradient(to direction, stop color,stop1, color, stop2 color, ...); +where direction is: top,left,right,bottom. .PP Where the path is a string, and stop color is of type color. @@ -402,8 +377,6 @@ Where the path is a string, and stop color is of type color. .SH Color .PP \fBrofi\fP supports the color formats as specified in the CSS standard (1,2,3 and some of CSS 4) - -.RS .IP \(bu 2 Format: \fB\fC#{HEX}{3}\fR (rgb) .IP \(bu 2 @@ -425,15 +398,11 @@ Format: \fB\fCcmyk( {PERCENTAGE}, {PERCENTAGE}, {PERCENTAGE}, {PERCENTAGE} [, {P .IP \(bu 2 Format: \fB\fC{named\-color} [ / {PERCENTAGE} ]\fR -.RE - .PP The white\-space format proposed in CSS4 is also supported. .PP The different values are: - -.RS .IP \(bu 2 \fB\fC{HEX}\fR is a hexadecimal number ('0\-9a\-f' case insensitive). .IP \(bu 2 @@ -462,8 +431,6 @@ PapayaWhip, PeachPuff, Peru, Pink, Plum, PowderBlue, Purple, RebeccaPurple, Red, Salmon, SandyBrown, SeaGreen, SeaShell, Sienna, Silver, SkyBlue, SlateBlue, SlateGray, SlateGrey, Snow, SpringGreen, SteelBlue, Tan, Teal, Thistle, Tomato, Turquoise, Violet, Wheat, White, WhiteSmoke, Yellow, YellowGreen,transparent -.RE - .PP For example: @@ -491,18 +458,12 @@ text\-color: Black; .fi .RE -.SH Text style -.RS -.IP \(bu 2 +.SH Text style.IP \(bu 2 Format: \fB\fC(bold|italic|underline|strikethrough|none)\fR -.RE - .PP Text style indicates how the highlighted text is emphasized. \fB\fCNone\fR indicates that no emphasis should be applied. - -.RS .IP \(bu 2 \fB\fCbold\fR: make the text thicker then the surrounding text. .IP \(bu 2 @@ -512,24 +473,16 @@ should be applied. .IP \(bu 2 \fB\fCstrikethrough\fR: put a line through the highlighted text. -.RE - -.SH Line style -.RS -.IP \(bu 2 +.SH Line style.IP \(bu 2 Format: \fB\fC(dash|solid)\fR -.RE - .PP Indicates how a line should be drawn. It currently supports: * \fB\fCdash\fR: a dashed line, where the gap is the same width as the dash * \fB\fCsolid\fR: a solid line -.SH Distance -.RS -.IP \(bu 2 +.SH Distance.IP \(bu 2 Format: \fB\fC{Integer}px\fR .IP \(bu 2 Format: \fB\fC{Real}em\fR @@ -540,12 +493,8 @@ Format: \fB\fC{Real}%\fR .IP \(bu 2 Format: \fB\fC{Integer}mm\fR -.RE - .PP A distance can be specified in 3 different units: - -.RS .IP \(bu 2 \fB\fCpx\fR: Screen pixels. .IP \(bu 2 @@ -557,8 +506,6 @@ A distance can be specified in 3 different units: .IP \(bu 2 \fB\fC%\fR: Percentage of the \fBmonitor\fP size. -.RE - .PP Distances used in the horizontal direction use the monitor width. Distances in the vertical direction use the monitor height. @@ -592,8 +539,6 @@ width: calc( 100% \- 37px ); .PP It supports the following operations: - -.RS .IP \(bu 2 \fB\fC+\fR : Add .IP \(bu 2 @@ -609,14 +554,10 @@ It supports the following operations: .IP \(bu 2 \fB\fCmax\fR : Maximum of l or rvalue; -.RE - .PP It uses the C precedence ordering. -.SH Padding -.RS -.IP \(bu 2 +.SH Padding.IP \(bu 2 Format: \fB\fC{Integer}\fR .IP \(bu 2 Format: \fB\fC{Distance}\fR @@ -627,15 +568,11 @@ Format: \fB\fC{Distance} {Distance} {Distance}\fR .IP \(bu 2 Format: \fB\fC{Distance} {Distance} {Distance} {Distance}\fR -.RE - .PP If no unit is specified, pixels are assumed. .PP The different number of fields in the formats are parsed like: - -.RS .IP \(bu 2 1 field: \fB\fCall\fR .IP \(bu 2 @@ -645,11 +582,7 @@ The different number of fields in the formats are parsed like: .IP \(bu 2 4 fields: \fB\fCtop\fR, \fB\fCright\fR, \fB\fCbottom\fR, \fB\fCleft\fR -.RE - -.SH Border -.RS -.IP \(bu 2 +.SH Border.IP \(bu 2 Format: \fB\fC{Integer}\fR .IP \(bu 2 Format: \fB\fC{Distance}\fR @@ -668,8 +601,6 @@ Format: \fB\fC{Distance} {Line style} {Distance} {Line style} {Distance} {Line s .IP \(bu 2 Format: \fB\fC{Distance} {Line style} {Distance} {Line style} {Distance} {Line style} {Distance} {Line style}\fR -.RE - .PP Borders are identical to padding, except that each distance field has a line style property. @@ -684,12 +615,9 @@ When no unit is specified, pixels are assumed. .SH Position .PP Indicate a place on the window/monitor. - -.RS .IP \(bu 2 - -.PP Format: \fB\fC(center|east|north|west|south|north east|north west|south west|south east)\fR + .PP .RS @@ -697,15 +625,13 @@ Format: \fB\fC(center|east|north|west|south|north east|north west|south west|sou north west | north | north east \-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\- - west | center | east + west | center | east \-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\- south west | south | south east .fi .RE -.RE - .SH Visibility .PP It is possible to hide widgets: @@ -715,13 +641,9 @@ inputbar { enabled: false; } -.SH Reference -.RS -.IP \(bu 2 +.SH Reference.IP \(bu 2 Format: \fB\fC@{PROPERTY NAME}\fR -.RE - .PP A reference can point to another reference. Currently, the maximum number of redirects is 20. A property always refers to another property. It cannot be used for a subpart of the property. @@ -754,44 +676,28 @@ window { .fi .RE -.SH Orientation -.RS -.IP \(bu 2 +.SH Orientation.IP \(bu 2 Format: \fB\fC(horizontal|vertical)\fR -.RE - .PP Specify the orientation of the widget. -.SH Cursor -.RS -.IP \(bu 2 +.SH Cursor.IP \(bu 2 Format: \fB\fC(default|pointer|text)\fR -.RE - .PP Specify the type of mouse cursor that is set when the mouse pointer is over the widget. -.SH List of keywords -.RS -.IP \(bu 2 +.SH List of keywords.IP \(bu 2 Format: \fB\fC[ keyword, keyword ]\fR -.RE - .PP A list starts with a '[' and ends with a ']'. The entries in the list are comma\-separated. The \fB\fCkeyword\fR in the list refers to an widget name. -.SH Environment variable -.RS -.IP \(bu 2 +.SH Environment variable.IP \(bu 2 Format: \fB\fC${:alnum:}\fR -.RE - .PP This will parse the environment variable as the property value. (that then can be any of the above types). The environment variable should be an alphanumeric string without white\-space. @@ -807,13 +713,9 @@ The environment variable should be an alphanumeric string without white\-space. .fi .RE -.SH Inherit -.RS -.IP \(bu 2 +.SH Inherit.IP \(bu 2 Format: \fB\fCinherit\fR -.RE - .PP Inherits the property from its parent widget. @@ -870,20 +772,14 @@ element selected { .SH Name .PP The current widgets available in \fBrofi\fP: - -.RS .IP \(bu 2 \fB\fCwindow\fR - -.RS .IP \(bu 2 \fB\fCoverlay\fR: the overlay widget. .IP \(bu 2 \fB\fCmainbox\fR: The mainbox box. .IP \(bu 2 \fB\fCinputbar\fR: The input bar box. - -.RS .IP \(bu 2 \fB\fCbox\fR: the horizontal @box packing the widgets .IP \(bu 2 @@ -896,49 +792,27 @@ The current widgets available in \fBrofi\fP: \fB\fCnum\-rows\fR: Shows the total number of rows. .IP \(bu 2 \fB\fCnum\-filtered\-rows\fR: Shows the total number of rows after filtering. - -.RE .IP \(bu 2 \fB\fClistview\fR: The listview. - -.RS .IP \(bu 2 \fB\fCscrollbar\fR: the listview scrollbar .IP \(bu 2 \fB\fCelement\fR: a box in the listview holding the entries - -.RS .IP \(bu 2 \fB\fCelement\-icon\fR: the widget in the listview's entry showing the (optional) icon .IP \(bu 2 \fB\fCelement\-index\fR: the widget in the listview's entry keybindable index (1,2,3..0) .IP \(bu 2 \fB\fCelement\-text\fR: the widget in the listview's entry showing the text. - -.RE - -.RE .IP \(bu 2 \fB\fCmode\-switcher\fR: the main horizontal @box packing the buttons. - -.RS .IP \(bu 2 \fB\fCbutton\fR: the buttons @textbox for each mode - -.RE .IP \(bu 2 \fB\fCmessage\fR: The container holding the textbox. - -.RS .IP \(bu 2 \fB\fCtextbox\fR: the message textbox -.RE - -.RE - -.RE - .PP Note that these path names match the default theme. Themes that provide a custom layout will have different elements, and structure. @@ -1010,9 +884,7 @@ This allows the colors used for drawing the handle to be set independently. .PP The following properties are currently supported: -.SS all widgets: -.RS -.IP \(bu 2 +.SS all widgets:.IP \(bu 2 \fBenabled\fP: enable/disable the widget .IP \(bu 2 \fBpadding\fP: padding @@ -1039,11 +911,7 @@ Color of the border \fBcursor\fP: cursor Type of mouse cursor that is set when the mouse pointer is hovered over the widget. -.RE - -.SS window: -.RS -.IP \(bu 2 +.SS window:.IP \(bu 2 .PP \fBfont\fP: string @@ -1087,11 +955,7 @@ The width of the window \fBy\-offset\fP: distance The offset of the window to the anchor point, allowing you to push the window left/right/up/down -.RE - -.SS scrollbar: -.RS -.IP \(bu 2 +.SS scrollbar:.IP \(bu 2 \fBbackground\-color\fP: color .IP \(bu 2 \fBhandle\-width\fP: distance @@ -1100,22 +964,14 @@ The offset of the window to the anchor point, allowing you to push the window le .IP \(bu 2 \fBborder\-color\fP: color -.RE - -.SS box: -.RS -.IP \(bu 2 +.SS box:.IP \(bu 2 \fBorientation\fP: orientation Set the direction the elements are packed. .IP \(bu 2 \fBspacing\fP: distance Distance between the packed elements. -.RE - -.SS textbox: -.RS -.IP \(bu 2 +.SS textbox:.IP \(bu 2 \fBbackground\-color\fP: color .IP \(bu 2 \fBborder\-color\fP: the color used for the border around the widget. @@ -1145,11 +1001,7 @@ color is optional, multiple highlight styles can be added like: bold underline i .IP \(bu 2 \fBmarkup\fP: Force markup on, beware that only valid pango markup strings are shown. -.RE - -.SS listview: -.RS -.IP \(bu 2 +.SS listview:.IP \(bu 2 \fBcolumns\fP: integer Number of columns to show (at least 1) .IP \(bu 2 @@ -1183,8 +1035,6 @@ Reverse the ordering (top down to bottom up). \fBfixed\-columns\fP: boolean Do not reduce the number of columns shown when number of visible elements is not enough to fill them all. -.RE - .PP Each element is a \fB\fCbox\fR called \fB\fCelement\fR\&. Each \fB\fCelement\fR can contain an \fB\fCelement\-icon\fR and \fB\fCelement\-text\fR\&. @@ -1311,8 +1161,6 @@ The layout of \fBrofi\fP can be tweaked by packing the 'fixed' widgets in a cust .PP The following widgets are fixed, as they provide core \fBrofi\fP functionality: - -.RS .IP \(bu 2 prompt .IP \(bu 2 @@ -1332,13 +1180,9 @@ num\-rows .IP \(bu 2 num\-filtered\-rows -.RE - .PP The following keywords are defined and can be used to automatically pack a subset of the widgets. These are used in the default theme as depicted in the figure above. - -.RS .IP \(bu 2 mainbox Packs: \fB\fCinputbar, message, listview, mode\-switcher\fR @@ -1346,15 +1190,11 @@ Packs: \fB\fCinputbar, message, listview, mode\-switcher\fR inputbar Packs: \fB\fCprompt,entry,case\-indicator\fR -.RE - .PP Any widget name starting with \fB\fCtextbox\fR is a textbox widget, others are box widgets and can pack other widgets. .PP There are several special widgets that can be used by prefixing the name of the widget: - -.RS .IP \(bu 2 \fB\fCtextbox\fR: This is a textbox widget. The displayed string can be set with \fB\fCstr\fR\&. @@ -1370,8 +1210,6 @@ The \fB\fCaction\fR can be set to: \fB\fCok|alternate\fR: accept entry and launch alternate action (for run launch in terminal). \fB\fCcustom|alternate\fR: accept custom input and launch alternate action. -.RE - .PP To specify children, set the \fB\fCchildren\fR property (this always happens on the \fB\fCbox\fR child, see example below): @@ -1462,8 +1300,6 @@ Just like CSS, \fBrofi\fP uses the box model for each widget. .PP Explanation of the different parts: - -.RS .IP \(bu 2 Content \- The content of the widget. .IP \(bu 2 @@ -1476,8 +1312,6 @@ The border use the border\-color of the widget. Margin \- Clears an area outside the border. The margin is transparent. -.RE - .PP The box model allows us to add a border around elements, and to define space between elements. @@ -1602,8 +1436,6 @@ Parts of the theme can be conditionally loaded, like the CSS \fB\fC@media\fR opt .PP It supports the following keys as constraint: - -.RS .IP \(bu 2 \fB\fCmin\-width\fR: load when width is bigger or equal then value. .IP \(bu 2 @@ -1619,8 +1451,6 @@ It supports the following keys as constraint: .IP \(bu 2 \fB\fCmonitor\-id\fR: The monitor id, see rofi \-help for id's. -.RE - .PP @media takes an integer number or a fraction, for integer number \fB\fCpx\fR can be added. @@ -1667,15 +1497,11 @@ FontAwesome 22 .PP The rasi file format offers two methods of including other files. This can be used to modify existing themes, or have multiple variations on a theme. - -.RS .IP \(bu 2 import: Import and parse a second file. .IP \(bu 2 theme: Discard theme, and load file as a fresh theme. -.RE - .PP Syntax: @@ -1694,8 +1520,6 @@ The specified file can either by \fIname\fP, \fIfilename\fP,\fIfull path\fP\&. .PP If a filename is provided, it will try to resolve it in the following order: - -.RS .IP \(bu 2 \fB\fC${XDG\_CONFIG\_HOME}/rofi/themes/\fR .IP \(bu 2 @@ -1705,8 +1529,6 @@ If a filename is provided, it will try to resolve it in the following order: .IP \(bu 2 \fB\fC${INSTALL PREFIX}/share/rofi/themes/\fR -.RE - .PP A name is resolved as a filename by appending the \fB\fC\&.rasi\fR extension. diff --git a/doc/rofi-theme.5.markdown b/doc/rofi-theme.5.markdown index f27e4720..5dc72de9 100644 --- a/doc/rofi-theme.5.markdown +++ b/doc/rofi-theme.5.markdown @@ -256,6 +256,8 @@ dynamic: false; * Format: url("path to image"); * Format: linear-gradient(stop color,stop1, color, stop2 color, ...); +* Format: linear-gradient(to direction, stop color,stop1, color, stop2 color, ...); + where direction is: top,left,right,bottom. Where the path is a string, and stop color is of type color. diff --git a/doc/rofi.1 b/doc/rofi.1 index f69b3d30..b95af90a 100644 --- a/doc/rofi.1 +++ b/doc/rofi.1 @@ -68,8 +68,6 @@ Markup support can be enabled, see CONFIGURATION options. .SH CONFIGURATION .PP There are currently three methods of setting configuration options (evaluated in order below): - -.RS .IP \(bu 2 System configuration file (for example \fB\fC/etc/rofi.rasi\fR). It first checks XDG\_CONFIG\_DIRS and then SYSCONFDIR (that is passed at compile time). @@ -79,8 +77,6 @@ Rasi theme file: The new \fItheme\fP format can be used to set configuration val .IP \(bu 2 Command\-line options: Arguments passed to \fBrofi\fP\&. -.RE - .PP To get a template config file run: \fB\fCrofi \-dump\-config > config.rasi\fR @@ -89,8 +85,6 @@ This will contain (commented) all current configuration options, modified option .PP The configuration system supports the following types: - -.RS .IP \(bu 2 string .IP \(bu 2 @@ -102,8 +96,6 @@ boolean .IP \(bu 2 lists -.RE - .PP For the syntax of these options see the \fBrofi\-theme(5)\fP manpage. @@ -173,8 +165,6 @@ Try to parse the file and return 0 when succesful, non\-zero when failed. .PP Specify the number of threads \fBrofi\fP should use: - -.RS .IP \(bu 2 0: Autodetect the number of supported hardware threads. .IP \(bu 2 @@ -186,8 +176,6 @@ Specify the number of threads \fBrofi\fP should use: .PP Default: Autodetect -.RE - .PP \fB\fC\-display\fR \fIdisplay\fP @@ -412,8 +400,6 @@ Make rofi steal focus on launch and restore close to window that held it when la .PP Specify the matching algorithm used. Current the following methods are supported. - -.RS .IP \(bu 2 \fBnormal\fP: match the int string .IP \(bu 2 @@ -425,8 +411,6 @@ Current the following methods are supported. .IP \(bu 2 \fBprefix\fP: match prefix -.RE - .PP Default: \fInormal\fP @@ -451,8 +435,6 @@ Only show desktop files that are present in the listed categories. .PP When using \fB\fCdrun\fR, match only with the specified Desktop entry fields. The different fields are: - -.RS .IP \(bu 2 \fBname\fP: the application's name .IP \(bu 2 @@ -470,15 +452,11 @@ The different fields are: .PP Default: \fIname,generic,exec,categories,keywords\fP -.RE - .PP \fB\fC\-drun\-display\-format\fR .PP The format string for the \fB\fCdrun\fR dialog: - -.RS .IP \(bu 2 \fBname\fP: the application's name .IP \(bu 2 @@ -490,8 +468,6 @@ The format string for the \fB\fCdrun\fR dialog: .IP \(bu 2 \fBcomment\fP: the application comment -.RE - .PP Pango markup can be used to formatting the output. @@ -528,8 +504,6 @@ Default: false .PP When using window mode, match only with the specified fields. The different fields are: - -.RS .IP \(bu 2 \fBtitle\fP: window's title .IP \(bu 2 @@ -547,8 +521,6 @@ The different fields are: .PP Default: \fIall\fP -.RE - .PP \fB\fC\-matching\-negate\-char\fR \fIchar\fP @@ -666,8 +638,6 @@ When one entry is left, automatically select it. Select monitor to display \fBrofi\fP on. It accepts as input: \fIprimary\fP (if primary output is set), the \fIxrandr\fP output name, or integer number (in order of detection). Negative numbers are handled differently: - -.RS .IP \(bu 2 \fB\-1\fP: the currently focused monitor. .IP \(bu 2 @@ -684,8 +654,6 @@ behavior.) .PP Default: \fI\-5\fP -.RE - .PP See \fB\fCrofi \-h\fR output for the detected monitors, their position, and size. @@ -722,15 +690,11 @@ This is now the method to tweak the theme via the commandline. .PP Override the default DPI setting. - -.RS .IP \(bu 2 If set to \fB\fC0\fR, it tries to auto\-detect based on X11 screen size (similar to i3 and GTK). .IP \(bu 2 If set to \fB\fC1\fR, it tries to auto\-detect based on the size of the monitor that \fBrofi\fP is displayed on (similar to latest Qt 5). -.RE - .PP \fB\fC\-selected\-row\fR \fIselected row\fP @@ -849,8 +813,6 @@ Format what is being displayed for windows. .PP \fIfield\fP: - -.RS .IP \(bu 2 \fBw\fP: desktop name .IP \(bu 2 @@ -862,8 +824,6 @@ Format what is being displayed for windows. .IP \(bu 2 \fBc\fP: class -.RE - .PP \fIlen\fP: maximum field length (0 for auto\-size). If length and window \fIwidth\fP are negative, field length is \fIwidth \- len\fP\&. if length is positive, the entry will be truncated or padded to fill that length. @@ -930,15 +890,11 @@ This setting can be changed at runtime (see \fB\fC\-kb\-toggle\-sort\fR). .PP There are 2 sorting method: - -.RS .IP \(bu 2 levenshtein (Default) .IP \(bu 2 fzf sorting. -.RE - .PP \fB\fC\-max\-history\-size\fR \fInumber\fP @@ -1008,8 +964,6 @@ Makes \fB\fCdmenu\fR searches case\-insensitive .PP Active row, mark \fIX\fP as active. Where \fIX\fP is a comma\-separated list of python(1)\-style indices and ranges, e.g. indices start at 0, \-1 refers to the last row with \-2 preceding it, ranges are left\-open and right\-close, and so on. You can specify: - -.RS .IP \(bu 2 A single row: '5' .IP \(bu 2 @@ -1021,8 +975,6 @@ A set of rows: '2,0,\-9' .IP \(bu 2 Or any combination: '5,\-3:,7:11,2,0,\-9' -.RE - .PP \fB\fC\-u\fR \fIX\fP @@ -1049,8 +1001,6 @@ This mode returns directly when no entries given. .PP Allows the output of dmenu to be customized (N is the total number of input entries): - -.RS .IP \(bu 2 \&'s' selected string .IP \(bu 2 @@ -1066,8 +1016,6 @@ Allows the output of dmenu to be customized (N is the total number of input entr .IP \(bu 2 \&'F' quoted filter string (user input) -.RE - .PP Default: 's' @@ -1216,8 +1164,6 @@ Default: \fIenabled\fP .SH PATTERN .PP To launch commands (for example, when using the ssh launcher), the user can enter the used command\-line. The following keys can be used that will be replaced at runtime: - -.RS .IP \(bu 2 \fB\fC{host}\fR: the host to connect to .IP \(bu 2 @@ -1229,8 +1175,6 @@ To launch commands (for example, when using the ssh launcher), the user can ente .IP \(bu 2 \fB\fC{window}\fR: the window ID of the selected window (in \fB\fCwindow\-command\fR) -.RE - .SH DMENU REPLACEMENT .PP If \fB\fCargv[0]\fR (calling command) is dmenu, \fBrofi\fP will start in dmenu mode. @@ -1252,8 +1196,6 @@ Please see \fBrofi\-theme(5)\fP manpage for more information on theming. .SH KEY BINDINGS .PP \fBrofi\fP has the following key bindings: - -.RS .IP \(bu 2 \fB\fCCtrl\-v, Insert\fR: Paste from clipboard .IP \(bu 2 @@ -1321,8 +1263,6 @@ Please see \fBrofi\-theme(5)\fP manpage for more information on theming. .IP \(bu 2 \fB\fCCtrl\-l\fR: File complete for run dialog. -.RE - .PP To get a full list of key bindings on the commandline, see \fB\fCrofi \-h\fR\&. The options starting with \fB\fC\-kb\fR are keybindings. @@ -1610,8 +1550,6 @@ Disables the loading of plugins. To further debug the plugin, you can get a trace with (lots of) debug information. This debug output can be enabled for multiple parts in rofi using the glib debug framework. Debug domains can be enabled by setting the G\_MESSAGES\_DEBUG environment variable. At creation of this page the following debug domains exists: - -.RS .IP \(bu 2 all: Show debug information from all domains. .IP \(bu 2 @@ -1651,8 +1589,6 @@ Widgets.Window: The window widget. .IP \(bu 2 Helpers.IconFetcher: Information about icon lookup. -.RE - .PP The output of this can provide useful information when writing an issue. @@ -1674,9 +1610,7 @@ first. .PP \fBrofi\-sensible\-terminal(1)\fP, \fBdmenu(1)\fP, \fBrofi\-theme(5)\fP, \fBrofi\-script(5)\fP, \fBrofi\-theme\-selector(1)\fP -.SH AUTHOR -.RS -.IP \(bu 2 +.SH AUTHOR.IP \(bu 2 Qball Cow \[la]qball@blame.services\[ra] .IP \(bu 2 @@ -1686,8 +1620,6 @@ Rasmus Steinke Quentin Glidic \[la]sardemff7+rofi@sardemff7.net\[ra] -.RE - .PP Original code based on work by: Sean Pringle \[la]https://github.com/seanpringle/simpleswitcher\[ra] diff --git a/include/rofi-types.h b/include/rofi-types.h index 7ee648d8..b7d57898 100644 --- a/include/rofi-types.h +++ b/include/rofi-types.h @@ -178,10 +178,22 @@ typedef enum ROFI_IMAGE_URL, ROFI_IMAGE_LINEAR_GRADIENT } RofiImageType; + +typedef enum +{ + ROFI_DIRECTION_LEFT, + ROFI_DIRECTION_RIGHT, + ROFI_DIRECTION_TOP, + ROFI_DIRECTION_BOTTOM, +} RofiDirection; + + typedef struct { RofiImageType type; char *url; + + RofiDirection dir; /** colors */ GList *colors; diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index d0a05f8e..6a291a00 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -243,6 +243,12 @@ HSL (?i:hsl[a]?) URL (?i:url?) LINEAR_GRADIENT (?i:linear-gradient?) +TO (?i:to?) +RIGHT (?i:right?) +LEFT (?i:left?) +TOP (?i:top?) +BOTTOM (?i:bottom?) + COLOR_TRANSPARENT (?i:transparent) S_T_PARENT_LEFT \( @@ -551,6 +557,12 @@ if ( queue == NULL ){ {URL} { return T_URL; } {LINEAR_GRADIENT} { return T_LINEAR_GRADIENT; } +{TO} { return T_TO; } +{LEFT} { return T_LEFT; } +{RIGHT} { return T_RIGHT; } +{TOP} { return T_TOP; } +{BOTTOM} { return T_BOTTOM; } + /* Color schemes */ {RGBA} { return T_COL_RGBA; } {HSL} { return T_COL_HSL; } diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y index d43ad2d9..5fb304c7 100644 --- a/lexer/theme-parser.y +++ b/lexer/theme-parser.y @@ -210,6 +210,13 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b) %token T_COL_CMYK "cmyk colorscheme" %token T_URL "an URL" +%token T_TO "an TO" +%token T_LEFT "an LEFT" +%token T_RIGHT "an RIGHT" +%token T_TOP "an TOP" +%token T_BOTTOM "an BOTTOM" + +%type t_property_direction %token T_LINEAR_GRADIENT "a linear gradient" %token T_PARENT_LEFT "Parent left ('(')" @@ -540,8 +547,22 @@ t_property_element | T_LINEAR_GRADIENT T_PARENT_LEFT t_color_list T_PARENT_RIGHT { $$ = rofi_theme_property_create ( P_IMAGE ); $$->value.image.type = ROFI_IMAGE_LINEAR_GRADIENT; + $$->value.image.dir = ROFI_DIRECTION_RIGHT; $$->value.image.colors = $3; } +| T_LINEAR_GRADIENT T_PARENT_LEFT T_TO t_property_direction T_COMMA t_color_list T_PARENT_RIGHT { + $$ = rofi_theme_property_create ( P_IMAGE ); + $$->value.image.type = ROFI_IMAGE_LINEAR_GRADIENT; + $$->value.image.dir = $4; + $$->value.image.colors = $6; +} +; + +t_property_direction +: T_RIGHT { $$ = ROFI_DIRECTION_RIGHT; } +| T_LEFT { $$ = ROFI_DIRECTION_LEFT; } +| T_TOP { $$ = ROFI_DIRECTION_TOP; } +| T_BOTTOM { $$ = ROFI_DIRECTION_BOTTOM; } ; t_color_list diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector index 8dba9530..ff7ea174 100755 --- a/script/rofi-theme-selector +++ b/script/rofi-theme-selector @@ -174,24 +174,9 @@ function set_theme() then mkdir -p ${CDIR} fi - if [ -f "${CDIR}/config.rasi" ] - then - get_link=$(readlink -f "${CDIR}/config.rasi") - ${SED} -i "/@import.*/d" "${get_link}" - echo "@import \"${1}\"" >> "${get_link}" - else - if [ ! -e "${CDIR}/config" ] - then - # No file. - echo "rofi.theme: ${1}" >> "${CDIR}/config" - elif [ -f "${CDIR}/config" ] - then - # Regular file - get_link=$(readlink -f "${CDIR}/config") - ${SED} -i "/rofi\.theme: .*\.rasi$/d" "${get_link}" - echo "rofi.theme: ${1}" >> "${get_link}" - fi - fi + get_link=$(readlink -f "${CDIR}/config.rasi") + ${SED} -i "/@import.*/d" "${get_link}" + echo "@import \"${1}\"" >> "${get_link}" } ############################################################################################################ diff --git a/source/dialogs/run.c b/source/dialogs/run.c index f9cacfef..23a8124f 100644 --- a/source/dialogs/run.c +++ b/source/dialogs/run.c @@ -259,6 +259,10 @@ static RunEntry * get_apps ( unsigned int *length ) gchar *homedir = g_locale_to_utf8 ( g_get_home_dir (), -1, NULL, &l, &error ); if ( error != NULL ) { g_debug ( "Failed to convert homedir to UTF-8: %s", error->message ); + for ( unsigned int i = 0; retv[i].entry != NULL ; i++ ) { + g_free ( retv[i].entry ); + } + g_free(retv); g_clear_error ( &error ); g_free ( homedir ); return NULL; diff --git a/source/theme.c b/source/theme.c index 46047337..219daf4f 100644 --- a/source/theme.c +++ b/source/theme.c @@ -1001,7 +1001,21 @@ gboolean rofi_theme_get_image ( const widget *widget, const char *property, cair return TRUE; } } else if ( p->value.image.type == ROFI_IMAGE_LINEAR_GRADIENT ) { - cairo_pattern_t * pat = cairo_pattern_create_linear (0.0,0.0, widget->w, 0.0); + cairo_pattern_t * pat = NULL; + switch ( p->value.image.dir ) { + case ROFI_DIRECTION_RIGHT: + pat = cairo_pattern_create_linear (0.0,0.0, widget->w, 0.0); + break; + case ROFI_DIRECTION_LEFT: + pat = cairo_pattern_create_linear (widget->w,0.0, 0.0, 0.0); + break; + case ROFI_DIRECTION_BOTTOM: + pat = cairo_pattern_create_linear (0.0,0.0, 0.0, widget->h); + break; + case ROFI_DIRECTION_TOP: + pat = cairo_pattern_create_linear (0.0,widget->h, 0.0, 0.0); + break; + }; guint length = g_list_length ( p->value.image.colors ); if ( length > 1 ){ length--;