From 8262d71138246a7563861af15a241675a7c3bd57 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Tue, 26 Sep 2017 21:47:36 +0200 Subject: [PATCH 01/11] Bump to v1.4.1 --- configure.ac | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index bb76465e..661ef460 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rofi], [1.4.0], [https://github.com/DaveDavenport/rofi/],[],[https://reddit.com/r/qtools/]) +AC_INIT([rofi], [1.4.1], [https://github.com/DaveDavenport/rofi/],[],[https://reddit.com/r/qtools/]) AC_CONFIG_SRCDIR([source/rofi.c]) AC_CONFIG_HEADER([config.h]) diff --git a/meson.build b/meson.build index c8187a68..55deb283 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('rofi', 'c', - version: '1.3.1', + version: '1.4.1', meson_version: '>=0.39.1', license: [ 'MIT' ], default_options: [ From 2d9a4fd4aa339dd1e4631994695bee725f5074c7 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Wed, 27 Sep 2017 11:21:33 +0200 Subject: [PATCH 02/11] autotools: Include subprojects meson_options.txt too Signed-off-by: Quentin Glidic --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index e458a11d..adf4d94c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -594,6 +594,7 @@ coverage-clean: EXTRA_DIST += \ doc/meson.build \ subprojects/libnkutils/meson.build \ + subprojects/libnkutils/meson_options.txt \ subprojects/libgwater/xcb/meson.build \ meson_options.txt \ meson.build From 7b872191e7cc7bdf0c02a364db7874e51adce720 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sun, 1 Oct 2017 12:55:42 +0200 Subject: [PATCH 03/11] Fix licenses in theme. --- themes/Adapta-Nokto.rasi | 7 +++++++ themes/Arc.rasi | 6 ++++++ themes/DarkBlue.rasi | 6 ++++++ themes/Indego.rasi | 6 ++++++ themes/Monokai.rasi | 6 ++++++ themes/Paper.rasi | 5 +++++ themes/android_notification.rasi | 6 ++++++ themes/arthur.rasi | 5 +++++ themes/blue.rasi | 6 ++++++ themes/c64.rasi | 6 ++++++ themes/dmenu.rasi | 9 +++++++-- themes/glue_pro_blue.rasi | 5 +++++ themes/gruvbox-dark-hard.rasi | 13 +++++++++++++ themes/gruvbox-dark-soft.rasi | 12 ++++++++++++ themes/gruvbox-dark.rasi | 12 ++++++++++++ themes/gruvbox-light-hard.rasi | 13 +++++++++++++ themes/gruvbox-light-soft.rasi | 12 ++++++++++++ themes/gruvbox-light.rasi | 12 ++++++++++++ themes/lb.rasi | 6 ++++++ themes/purple.rasi | 5 +++++ themes/solarized.rasi | 5 +++++ themes/solarized_alternate.rasi | 5 +++++ 22 files changed, 166 insertions(+), 2 deletions(-) diff --git a/themes/Adapta-Nokto.rasi b/themes/Adapta-Nokto.rasi index 11ad6a68..fdbe95b8 100644 --- a/themes/Adapta-Nokto.rasi +++ b/themes/Adapta-Nokto.rasi @@ -1,3 +1,10 @@ +/******************************************************************************* + * ROFI Color theme + * Based on Adapta-Nokto GTK theme (https://github.com/adapta-project/adapta-gtk-theme) + * User: PyGeek03 + * Copyright: PyGeek03 + ********************************************************************************/ + * { selected-normal-foreground: rgba ( 250, 251, 252, 100 % ); foreground: rgba ( 250, 251, 252, 100 % ); diff --git a/themes/Arc.rasi b/themes/Arc.rasi index 7ff3f40c..48d83ec5 100644 --- a/themes/Arc.rasi +++ b/themes/Arc.rasi @@ -1,3 +1,9 @@ +/******************************************************************************* + * ROFI Color theme + * User: Sergio Morales + * Copyright: Sergio Morales + *******************************************************************************/ + * { selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); foreground: rgba ( 82, 93, 118, 100 % ); diff --git a/themes/DarkBlue.rasi b/themes/DarkBlue.rasi index 76d02982..12158a9d 100644 --- a/themes/DarkBlue.rasi +++ b/themes/DarkBlue.rasi @@ -1,3 +1,9 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ + * { selected-normal-foreground: rgba ( 2, 20, 63, 100 % ); foreground: rgba ( 219, 223, 188, 100 % ); diff --git a/themes/Indego.rasi b/themes/Indego.rasi index 713399f8..3fa8ea3b 100644 --- a/themes/Indego.rasi +++ b/themes/Indego.rasi @@ -1,3 +1,9 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ + * { selected-normal-foreground: rgba ( 232, 234, 246, 100 % ); foreground: rgba ( 232, 234, 246, 100 % ); diff --git a/themes/Monokai.rasi b/themes/Monokai.rasi index 64cbd375..37f47b5e 100644 --- a/themes/Monokai.rasi +++ b/themes/Monokai.rasi @@ -1,3 +1,9 @@ +/** + * ROFI Color theme + * User: milouse + * Copyright: Étienne Deparis + */ + * { selected-normal-foreground: rgba ( 248, 248, 242, 100 % ); foreground: rgba ( 248, 248, 242, 100 % ); diff --git a/themes/Paper.rasi b/themes/Paper.rasi index 114a2cb7..3d58ce9a 100644 --- a/themes/Paper.rasi +++ b/themes/Paper.rasi @@ -1,3 +1,8 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ * { selected-normal-foreground: rgba ( 245, 245, 245, 100 % ); foreground: rgba ( 0, 43, 54, 100 % ); diff --git a/themes/android_notification.rasi b/themes/android_notification.rasi index 94b637c2..957c1912 100644 --- a/themes/android_notification.rasi +++ b/themes/android_notification.rasi @@ -1,3 +1,9 @@ +/******************************************************************************* + * ROFI Color theme + * User: Rasi + * Copyright: Rasmus Steinke + *******************************************************************************/ + * { selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); foreground: rgba ( 193, 193, 193, 100 % ); diff --git a/themes/arthur.rasi b/themes/arthur.rasi index dfeb688d..061b33ec 100644 --- a/themes/arthur.rasi +++ b/themes/arthur.rasi @@ -1,3 +1,8 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ configuration { diff --git a/themes/blue.rasi b/themes/blue.rasi index 202b0622..49e8d1a8 100644 --- a/themes/blue.rasi +++ b/themes/blue.rasi @@ -1,3 +1,9 @@ +/****************************************************************************** + * ROFI Color theme + * User: qball + * Copyright: Dave Davenport + ******************************************************************************/ + * { selected-normal-foreground: rgba ( 0, 96, 160, 100 % ); foreground: rgba ( 0, 176, 239, 100 % ); diff --git a/themes/c64.rasi b/themes/c64.rasi index 67de7b98..e5d14c65 100644 --- a/themes/c64.rasi +++ b/themes/c64.rasi @@ -1,3 +1,9 @@ +/****************************************************************************** + * ROFI Color theme + * User: Rasi + * Copyright: Rasmus Steinke + ******************************************************************************/ + * { selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); foreground: rgba ( 79, 128, 255, 100 % ); diff --git a/themes/dmenu.rasi b/themes/dmenu.rasi index 7c6867a7..40f3bdac 100644 --- a/themes/dmenu.rasi +++ b/themes/dmenu.rasi @@ -1,3 +1,8 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ * { background-color: Black; border-color: White; @@ -12,13 +17,13 @@ configuration { anchor: north; location: north; width: 100%; - padding: 4px; + padding: 4px; children: [ horibox ]; } #horibox { orientation: horizontal; - children: [ prompt, entry, listview ]; + children: [ prompt, entry, listview ]; } #listview { diff --git a/themes/glue_pro_blue.rasi b/themes/glue_pro_blue.rasi index ca740803..46e0a405 100644 --- a/themes/glue_pro_blue.rasi +++ b/themes/glue_pro_blue.rasi @@ -1,3 +1,8 @@ +/****************************************************************************** + * ROFI Color theme + * User: Rasi + * Copyright: Rasmus Steinke + ******************************************************************************/ * { selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); foreground: rgba ( 255, 255, 255, 100 % ); diff --git a/themes/gruvbox-dark-hard.rasi b/themes/gruvbox-dark-hard.rasi index 744ce1ad..a2b0ea66 100644 --- a/themes/gruvbox-dark-hard.rasi +++ b/themes/gruvbox-dark-hard.rasi @@ -1,3 +1,16 @@ +/********************************************************* + * Rofi color theme + * + * Based on the Gruvbox color scheme for Vim by morhetz + * https://github.com/morhetz/gruvbox + * + * File: gruvbox*dark*hard.theme + * Desc: Gruvbox dark (hard contrast) color theme for Rofi + * Author: bardisty + * Source: https://github.com/bardisty/gruvbox*rofi + * Modified: Sat Oct 22 2016 03:12:10 PDT *0700 + **********************************************************/ + * { selected-normal-foreground: rgba ( 251, 241, 199, 100 % ); foreground: rgba ( 235, 219, 178, 100 % ); diff --git a/themes/gruvbox-dark-soft.rasi b/themes/gruvbox-dark-soft.rasi index 6611b931..91bdff69 100644 --- a/themes/gruvbox-dark-soft.rasi +++ b/themes/gruvbox-dark-soft.rasi @@ -1,3 +1,15 @@ +/********************************************************* + * Rofi color theme + * + * Based on the Gruvbox color scheme for Vim by morhetz + * https://github.com/morhetz/gruvbox + * + * File: gruvbox*dark*soft.theme + * Desc: Gruvbox dark (soft contrast) color theme for Rofi + * Author: bardisty + * Source: https://github.com/bardisty/gruvbox*rofi + * Modified: Sat Oct 22 2016 03:12:10 PDT *0700 + **********************************************************/ * { selected-normal-foreground: rgba ( 251, 241, 199, 100 % ); foreground: rgba ( 235, 219, 178, 100 % ); diff --git a/themes/gruvbox-dark.rasi b/themes/gruvbox-dark.rasi index 581b5e56..90e4f0b7 100644 --- a/themes/gruvbox-dark.rasi +++ b/themes/gruvbox-dark.rasi @@ -1,3 +1,15 @@ +/********************************************************* + * Rofi color theme + * + * Based on the Gruvbox color scheme for Vim by morhetz + * https://github.com/morhetz/gruvbox + * + * File: gruvbox*dark.theme + * Desc: Gruvbox dark color theme for Rofi + * Author: bardisty + * Source: https://github.com/bardisty/gruvbox*rofi + * Modified: Sat Oct 22 2016 03:12:10 PDT *0700 + **********************************************************/ * { selected-normal-foreground: rgba ( 251, 241, 199, 100 % ); foreground: rgba ( 235, 219, 178, 100 % ); diff --git a/themes/gruvbox-light-hard.rasi b/themes/gruvbox-light-hard.rasi index 56213540..2db85cb9 100644 --- a/themes/gruvbox-light-hard.rasi +++ b/themes/gruvbox-light-hard.rasi @@ -1,3 +1,16 @@ +/******************* + * Rofi color theme + * + * Based on the Gruvbox color scheme for Vim by morhetz + * https://github.com/morhetz/gruvbox + * + * File: gruvbox-light-hard.theme + * Desc: Gruvbox light (hard contrast) color theme for Rofi + * Author: bardisty + * Source: https://github.com/bardisty/gruvbox-rofi + * Modified: Sat Oct 22 2016 03:11:32 PDT -0700 + */ + * { selected-normal-foreground: rgba ( 40, 40, 40, 100 % ); foreground: rgba ( 60, 56, 54, 100 % ); diff --git a/themes/gruvbox-light-soft.rasi b/themes/gruvbox-light-soft.rasi index 780f7dff..bfb083cb 100644 --- a/themes/gruvbox-light-soft.rasi +++ b/themes/gruvbox-light-soft.rasi @@ -1,3 +1,15 @@ +/******************* + * Rofi color theme + * + * Based on the Gruvbox color scheme for Vim by morhetz + * https://github.com/morhetz/gruvbox + * + * File: gruvbox-light-soft.theme + * Desc: Gruvbox light (soft contrast) color theme for Rofi + * Author: bardisty + * Source: https://github.com/bardisty/gruvbox-rofi + * Modified: Sat Oct 22 2016 03:11:32 PDT -0700 + */ * { selected-normal-foreground: rgba ( 40, 40, 40, 100 % ); foreground: rgba ( 60, 56, 54, 100 % ); diff --git a/themes/gruvbox-light.rasi b/themes/gruvbox-light.rasi index 26e1bd7e..deb3a57f 100644 --- a/themes/gruvbox-light.rasi +++ b/themes/gruvbox-light.rasi @@ -1,3 +1,15 @@ +/******************* + * Rofi color theme + * + * Based on the Gruvbox color scheme for Vim by morhetz + * https://github.com/morhetz/gruvbox + * + * File: gruvbox-light.theme + * Desc: Gruvbox light color theme for Rofi + * Author: bardisty + * Source: https://github.com/bardisty/gruvbox-rofi + * Modified: Sat Oct 22 2016 03:11:32 PDT -0700 + */ * { selected-normal-foreground: rgba ( 40, 40, 40, 100 % ); foreground: rgba ( 60, 56, 54, 100 % ); diff --git a/themes/lb.rasi b/themes/lb.rasi index bb1aa23e..39a9032a 100644 --- a/themes/lb.rasi +++ b/themes/lb.rasi @@ -1,3 +1,9 @@ +/** + * ROFI Color theme + * User: Qball + * Copyright: Dave Davenport + */ + * { selected-normal-foreground: rgba ( 51, 51, 51, 100 % ); foreground: rgba ( 17, 170, 170, 100 % ); diff --git a/themes/purple.rasi b/themes/purple.rasi index d2cf371e..b0d334f4 100644 --- a/themes/purple.rasi +++ b/themes/purple.rasi @@ -1,3 +1,8 @@ +/****************************************************************************** + * ROFI Color theme + * User: Rasi + * Copyright: Rasmus Steinke + ******************************************************************************/ * { selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); foreground: rgba ( 180, 180, 180, 100 % ); diff --git a/themes/solarized.rasi b/themes/solarized.rasi index c6c7d9b7..5356c509 100644 --- a/themes/solarized.rasi +++ b/themes/solarized.rasi @@ -1,3 +1,8 @@ +/****************************************************************************** + * ROFI Color theme + * User: Rasi + * Copyright: Rasmus Steinke + ******************************************************************************/ * { selected-normal-foreground: rgba ( 129, 147, 150, 100 % ); foreground: rgba ( 129, 147, 150, 100 % ); diff --git a/themes/solarized_alternate.rasi b/themes/solarized_alternate.rasi index a2109400..6c6fa7a7 100644 --- a/themes/solarized_alternate.rasi +++ b/themes/solarized_alternate.rasi @@ -1,3 +1,8 @@ +/****************************************************************************** + * ROFI Color theme + * User: Rasi + * Copyright: Rasmus Steinke + ******************************************************************************/ * { selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); foreground: rgba ( 129, 147, 150, 100 % ); From 5f9a668f25b6363e4e07c3fb271fd5f3df2578a7 Mon Sep 17 00:00:00 2001 From: azarus Date: Mon, 2 Oct 2017 13:13:04 +0200 Subject: [PATCH 04/11] Add gentoo install instructions. --- INSTALL.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index 3f031c24..3286fbbf 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -205,3 +205,22 @@ and also ``` pacman -S rofi ``` + +### Gentoo + +An ebuild is available, `x11-misc/rofi`. It's up to date, but you may need to +enable ~arch to get the latest release: + +``` +echo 'x11-misc/rofi ~amd64' >> /etc/portage/package.accept_keywords +``` + +for amd64 or: + +``` +echo 'x11-misc/rofi ~x86' >> /etc/portage/package.accept_keywords +``` + +for i386. + +To install it, simply issue `emerge rofi`. From 858462415a4ee3029f798dec47ab279b006bdd1b Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Mon, 2 Oct 2017 19:45:06 +0200 Subject: [PATCH 05/11] config: Only default-enable window mode if built Signed-off-by: Quentin Glidic --- config/config.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/config.c b/config/config.c index 67342346..501ea008 100644 --- a/config/config.c +++ b/config/config.c @@ -35,7 +35,11 @@ Settings config = { /** List of enabled modi. */ /** -modi */ +#ifdef WINDOW_MODE .modi = "window,run,ssh", +#else + .modi = "run,ssh", +#endif /** Border width around the window. */ .menu_bw = 1, /** The width of the switcher. (0100 in % > 100 in pixels) */ From 84d661bdf76b469429c54a4ab00193039e00434b Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Mon, 2 Oct 2017 23:09:34 +0200 Subject: [PATCH 06/11] bindindgs: Fix bindings with Super Signed-off-by: Quentin Glidic --- subprojects/libnkutils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/libnkutils b/subprojects/libnkutils index 2c5f1b26..8a8ab0a5 160000 --- a/subprojects/libnkutils +++ b/subprojects/libnkutils @@ -1 +1 @@ -Subproject commit 2c5f1b2654a9b4480b857cd8395af127a6c55199 +Subproject commit 8a8ab0a50d7c1f20da81a11b9b22295ef9aa8e0d From 76bc6111857a3436f01354b635f759d0d22ce005 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Mon, 2 Oct 2017 23:45:53 +0200 Subject: [PATCH 07/11] gitmodules: Update libnkutils Signed-off-by: Quentin Glidic --- subprojects/libnkutils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/libnkutils b/subprojects/libnkutils index 8a8ab0a5..f017c954 160000 --- a/subprojects/libnkutils +++ b/subprojects/libnkutils @@ -1 +1 @@ -Subproject commit 8a8ab0a50d7c1f20da81a11b9b22295ef9aa8e0d +Subproject commit f017c95434d6ab678478076e43683ce7681c498d From 627d0687118de2cc9ec09740cc5747cdad981c00 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Tue, 3 Oct 2017 19:51:27 +0200 Subject: [PATCH 08/11] Add -sort to manpage. Fixes: #682 --- doc/rofi.1 | 13 +++++++++++-- doc/rofi.1.markdown | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/rofi.1 b/doc/rofi.1 index f75d912f..e4dc59ac 100644 --- a/doc/rofi.1 +++ b/doc/rofi.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ROFI" "1" "September 2017" "" "" +.TH "ROFI" "1" "October 2017" "" "" . .SH "NAME" \fBrofi\fR \- A window switcher, application launcher, ssh dialog and dmenu replacement @@ -749,10 +749,19 @@ Notes: The I3 Window manager does not like commas in the command when specifying Disable history . .P +\fB\-sort\fR to enable \fB\-no\-sort\fR to disable +. +.P +Enable, disable sorting\. This setting can be changed at runtime (see \fB\-kb\-toggle\-sort\fR)\. +. +.P \fB\-levenshtein\-sort\fR to enable \fB\-no\-levenshtein\-sort\fR to disable . .P -When searching, sort the result based on levenshtein distance\. This setting can be changed at runtime (see \fB\-kb\-toggle\-sort\fR)\. +When searching, always sort the result based on levenshtein distance\. If disabled, fzf sorting is used when fuzzy matching is used\. If enabled, levenshtein sorting is used event fuzzy matching is used\. +. +.P +For other matching modes sorting is always done via levenshtein\-sort\. . .SS "Dmenu specific" \fB\-sep\fR \fIseparator\fR diff --git a/doc/rofi.1.markdown b/doc/rofi.1.markdown index d28231f6..7fafaa30 100644 --- a/doc/rofi.1.markdown +++ b/doc/rofi.1.markdown @@ -332,7 +332,7 @@ This option can be specified multiple times. Override the default DPI setting. If set to `0`, it tries to auto-detect based on X11 screen size (similar to i3 and GTK). -If set to `1`, it tries to auto-detect based on the size of the monitor that rofi is displayed on (similar to latest Qt 5). +If set to `1`, it tries to auto-detect based on the size of the monitor that rofi is displayed on (similar to latest Qt 5). ### PATTERN setting @@ -446,11 +446,20 @@ For that case '#' can be used as a separator. Disable history +`-sort` to enable +`-no-sort` to disable + +Enable, disable sorting. +This setting can be changed at runtime (see `-kb-toggle-sort`). + `-levenshtein-sort` to enable `-no-levenshtein-sort` to disable -When searching, sort the result based on levenshtein distance. -This setting can be changed at runtime (see `-kb-toggle-sort`). +When searching, always sort the result based on levenshtein distance. +If disabled, fzf sorting is used when fuzzy matching is used. +If enabled, levenshtein sorting is used event fuzzy matching is used. + +For other matching modes sorting is always done via levenshtein-sort. ### Dmenu specific From e2eaa2cee8fed328fb51d138a8ec8e5abc942448 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Tue, 3 Oct 2017 20:38:15 +0200 Subject: [PATCH 09/11] Fix several mistakes in theme manpage. Fixes: #688 --- doc/rofi-theme.5 | 35 +++++++++++++++++++++++++---------- doc/rofi-theme.5.markdown | 26 +++++++++++++++++--------- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/doc/rofi-theme.5 b/doc/rofi-theme.5 index b2b93c2a..747f532d 100644 --- a/doc/rofi-theme.5 +++ b/doc/rofi-theme.5 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ROFI\-THEME" "5" "September 2017" "" "" +.TH "ROFI\-THEME" "5" "October 2017" "" "" . .SH "NAME" \fBrofi\-theme\fR \- Rofi theme format files @@ -434,7 +434,7 @@ The different values are: \fB{named\-color}\fR is one of the following colors: . .IP -AliceBlue, AntiqueWhite, Aqua, Aquamarine, Azure, Beige, Bisque, Black, BlanchedAlmond, Blue, BlueViolet, Brown, BurlyWood, CadetBlue, Chartreuse, Chocolate, Coral, CornflowerBlue, Cornsilk, Crimson, Cyan, DarkBlue, DarkCyan, DarkGoldenRod, DarkGray, DarkGrey, DarkGreen, DarkKhaki, DarkMagenta, DarkOliveGreen, DarkOrange, DarkOrchid, DarkRed, DarkSalmon, DarkSeaGreen, DarkSlateBlue, DarkSlateGray, DarkSlateGrey, DarkTurquoise, DarkViolet, DeepPink, DeepSkyBlue, DimGray, DimGrey, DodgerBlue, FireBrick, FloralWhite, ForestGreen, Fuchsia, Gainsboro, GhostWhite, Gold, GoldenRod, Gray, Grey, Green, GreenYellow, HoneyDew, HotPink, IndianRed, Indigo, Ivory, Khaki, Lavender, LavenderBlush, LawnGreen, LemonChiffon, LightBlue, LightCoral, LightCyan, LightGoldenRodYellow, LightGray, LightGrey, LightGreen, LightPink, LightSalmon, LightSeaGreen, LightSkyBlue, LightSlateGray, LightSlateGrey, LightSteelBlue, LightYellow, Lime, LimeGreen, Linen, Magenta, Maroon, MediumAquaMarine, MediumBlue, MediumOrchid, MediumPurple, MediumSeaGreen, MediumSlateBlue, MediumSpringGreen, MediumTurquoise, MediumVioletRed, MidnightBlue, MintCream, MistyRose, Moccasin, NavajoWhite, Navy, OldLace, Olive, OliveDrab, Orange, OrangeRed, Orchid, PaleGoldenRod, PaleGreen, PaleTurquoise, PaleVioletRed, PapayaWhip, PeachPuff, Peru, Pink, Plum, PowderBlue, Purple, RebeccaPurple, Red, RosyBrown, RoyalBlue, SaddleBrown, Salmon, SandyBrown, SeaGreen, SeaShell, Sienna, Silver, SkyBlue, SlateBlue, SlateGray, SlateGrey, Snow, SpringGreen, SteelBlue, Tan, Teal, Thistle, Tomato, Turquoise, Violet, Wheat, White, WhiteSmoke, Yellow, YellowGreen +AliceBlue, AntiqueWhite, Aqua, Aquamarine, Azure, Beige, Bisque, Black, BlanchedAlmond, Blue, BlueViolet, Brown, BurlyWood, CadetBlue, Chartreuse, Chocolate, Coral, CornflowerBlue, Cornsilk, Crimson, Cyan, DarkBlue, DarkCyan, DarkGoldenRod, DarkGray, DarkGrey, DarkGreen, DarkKhaki, DarkMagenta, DarkOliveGreen, DarkOrange, DarkOrchid, DarkRed, DarkSalmon, DarkSeaGreen, DarkSlateBlue, DarkSlateGray, DarkSlateGrey, DarkTurquoise, DarkViolet, DeepPink, DeepSkyBlue, DimGray, DimGrey, DodgerBlue, FireBrick, FloralWhite, ForestGreen, Fuchsia, Gainsboro, GhostWhite, Gold, GoldenRod, Gray, Grey, Green, GreenYellow, HoneyDew, HotPink, IndianRed, Indigo, Ivory, Khaki, Lavender, LavenderBlush, LawnGreen, LemonChiffon, LightBlue, LightCoral, LightCyan, LightGoldenRodYellow, LightGray, LightGrey, LightGreen, LightPink, LightSalmon, LightSeaGreen, LightSkyBlue, LightSlateGray, LightSlateGrey, LightSteelBlue, LightYellow, Lime, LimeGreen, Linen, Magenta, Maroon, MediumAquaMarine, MediumBlue, MediumOrchid, MediumPurple, MediumSeaGreen, MediumSlateBlue, MediumSpringGreen, MediumTurquoise, MediumVioletRed, MidnightBlue, MintCream, MistyRose, Moccasin, NavajoWhite, Navy, OldLace, Olive, OliveDrab, Orange, OrangeRed, Orchid, PaleGoldenRod, PaleGreen, PaleTurquoise, PaleVioletRed, PapayaWhip, PeachPuff, Peru, Pink, Plum, PowderBlue, Purple, RebeccaPurple, Red, RosyBrown, RoyalBlue, SaddleBrown, 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 . .IP "" 0 . @@ -445,9 +445,23 @@ For example: . .nf -background: #FF0000; -foreground: rgba(0,0,1, 0\.5); -text: SeaGreen; +background\-color: #FF0000; +border\-color: rgba(0,0,1, 0\.5); +text\-color: SeaGreen; +. +.fi +. +.IP "" 0 +. +.P +or +. +.IP "" 4 +. +.nf + +background\-color: transparent; +text\-color: Black; . .fi . @@ -859,8 +873,8 @@ Example: .nf #nametotextbox selected\.active { - background: #003642; - foreground: #008ed4; + background\-color: #003642; + text\-color: #008ed4; } . .fi @@ -1126,8 +1140,9 @@ Below is an example of a theme emulating dmenu: .nf * { - background: Black; - foreground: White; + background\-color: Black; + text\-color: White; + border\-color: White; font: "Times New Roman 12"; } @@ -1159,7 +1174,7 @@ Below is an example of a theme emulating dmenu: padding: 0px 2px; } #element selected { - background: SteelBlue; + background\-color: SteelBlue; } . .fi diff --git a/doc/rofi-theme.5.markdown b/doc/rofi-theme.5.markdown index 6bf94337..aa0ed0e6 100644 --- a/doc/rofi-theme.5.markdown +++ b/doc/rofi-theme.5.markdown @@ -284,15 +284,22 @@ The different values are: OldLace, Olive, OliveDrab, Orange, OrangeRed, Orchid, PaleGoldenRod, PaleGreen, PaleTurquoise, PaleVioletRed, PapayaWhip, PeachPuff, Peru, Pink, Plum, PowderBlue, Purple, RebeccaPurple, Red, RosyBrown, RoyalBlue, SaddleBrown, Salmon, SandyBrown, SeaGreen, SeaShell, Sienna, Silver, SkyBlue, SlateBlue, SlateGray, SlateGrey, Snow, SpringGreen, - SteelBlue, Tan, Teal, Thistle, Tomato, Turquoise, Violet, Wheat, White, WhiteSmoke, Yellow, YellowGreen + SteelBlue, Tan, Teal, Thistle, Tomato, Turquoise, Violet, Wheat, White, WhiteSmoke, Yellow, YellowGreen,transparent + For example: ``` -background: #FF0000; -foreground: rgba(0,0,1, 0.5); -text: SeaGreen; +background-color: #FF0000; +border-color: rgba(0,0,1, 0.5); +text-color: SeaGreen; +``` +or + +``` +background-color: transparent; +text-color: Black; ``` ## Text style @@ -528,8 +535,8 @@ Example: ``` #nametotextbox selected.active { - background: #003642; - foreground: #008ed4; + background-color: #003642; + text-color: #008ed4; } ``` @@ -718,8 +725,9 @@ Below is an example of a theme emulating dmenu: ```css * { - background: Black; - foreground: White; + background-color: Black; + text-color: White; + border-color: White; font: "Times New Roman 12"; } @@ -751,7 +759,7 @@ Below is an example of a theme emulating dmenu: padding: 0px 2px; } #element selected { - background: SteelBlue; + background-color: SteelBlue; } ``` From ca855190c82b0b358454281975bf4fcd53adc801 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sun, 15 Oct 2017 10:51:24 +0200 Subject: [PATCH 10/11] Update Changelog. --- Changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Changelog b/Changelog index 86401539..dbeedb14 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,15 @@ +v1.4.2: + - Add sort to manpage. (#682) + - Add tranaparent to theme manpage. (#688) + - Re-add theme headers. (#679) + - Fix super key. (#684) + - Unknown option libnkutils:uuid. (#677) + - Mode window is not found. (#686) + - Fix meson build in dist file. + +v1.4.1: All Hail Rasi + - Bump meson release version + v1.4.0: I reject your truth and substitute my own (unreleased) New Features: - FZF style sorting for fuzzy matching (thanks to MaskRay) (#533) From 1ab3e571eca1768d437246ca6ec09f44432b0e20 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sun, 15 Oct 2017 10:59:38 +0200 Subject: [PATCH 11/11] V1.4.2 Release --- configure.ac | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 661ef460..4591e668 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rofi], [1.4.1], [https://github.com/DaveDavenport/rofi/],[],[https://reddit.com/r/qtools/]) +AC_INIT([rofi], [1.4.2], [https://github.com/DaveDavenport/rofi/],[],[https://reddit.com/r/qtools/]) AC_CONFIG_SRCDIR([source/rofi.c]) AC_CONFIG_HEADER([config.h]) diff --git a/meson.build b/meson.build index 55deb283..bb763336 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('rofi', 'c', - version: '1.4.1', + version: '1.4.2', meson_version: '>=0.39.1', license: [ 'MIT' ], default_options: [