Merge tag '1.7.3' into wayland

Changelog

@@ -1,3 +1,18 @@
+v1.7.3: Sturtled!
+   - [Help] Print out the parsed config/theme files in -help output.
+   - [Keybindings] Fix keybindings being modified by -theme-str
+   - [Doc] Add rofi-dmenu manpage.
+   - [XCB] Cache lookup of monitor.
+   - Add -replace option (#568)
+   - Fix memory leak.
+   - [1566] Add extra debug for resolving monitors.
+   - [Theme] Add round,floor,ceil function in @calc (#1569)
+   - [Doc] Explain icon lookup.
+   - [Combi] Add -combi-display-format (#1570) (thanks to Jakub)
+   - [Theme] Expand list type ([]) for more data types.
+   - [Theme] Add support for tab-stops on textbox. (#1571) (thanks to Jakub)
+   - [Theme] Testing direct access to widgets via cmdline option (-theme+widget+property value)
+
 v1.7.2: Shellebrations!
    - [Build] Fix building without window mode enabled.
    - [Config] Do not print out the 'theme' field in configuration on dump.

Makefile.am

@@ -177,11 +177,15 @@ dist_man1_MANS=\
 
 dist_man5_MANS=\
 	doc/rofi-theme.5\
+	doc/rofi-keys.5\
+	doc/rofi-dmenu.5\
 	doc/rofi-script.5
 
 EXTRA_DIST += \
 	doc/rofi-theme.5.markdown \
 	doc/rofi-script.5.markdown \
+	doc/rofi-keys.5.markdown \
+	doc/rofi-dmenu.5.markdown \
 	doc/rofi-theme-selector.1.markdown \
 	doc/rofi-sensible-terminal.1.markdown \
 	doc/rofi.1.markdown\
@@ -245,11 +249,13 @@ EXTRA_DIST+=\
 # Indent
 ##
 
-update-manpage: $(top_srcdir)/doc/rofi-theme-selector.1.markdown $(top_srcdir)/doc/rofi.1.markdown $(top_srcdir)/doc/rofi-theme.5.markdown $(top_srcdir)/doc/rofi-script.5.markdown ${top_srcdir}/doc/rofi-sensible-terminal.1.markdown
+update-manpage: $(top_srcdir)/doc/rofi-theme-selector.1.markdown $(top_srcdir)/doc/rofi.1.markdown $(top_srcdir)/doc/rofi-theme.5.markdown $(top_srcdir)/doc/rofi-script.5.markdown ${top_srcdir}/doc/rofi-sensible-terminal.1.markdown ${top_srcdir}/doc/rofi-keys.5.markdown ${top_srcdir}/doc/rofi-dmenu.5.markdown
 	go-md2man -in $(top_srcdir)/doc/rofi.1.markdown -out $(top_srcdir)/doc/rofi.1
 	go-md2man -in $(top_srcdir)/doc/rofi-theme-selector.1.markdown -out $(top_srcdir)/doc/rofi-theme-selector.1
 	go-md2man -in $(top_srcdir)/doc/rofi-theme.5.markdown -out $(top_srcdir)/doc/rofi-theme.5
+	go-md2man -in $(top_srcdir)/doc/rofi-keys.5.markdown -out $(top_srcdir)/doc/rofi-keys.5
 	go-md2man -in $(top_srcdir)/doc/rofi-script.5.markdown -out $(top_srcdir)/doc/rofi-script.5
+	go-md2man -in $(top_srcdir)/doc/rofi-dmenu.5.markdown -out $(top_srcdir)/doc/rofi-dmenu.5
 	go-md2man -in $(top_srcdir)/doc/rofi-sensible-terminal.1.markdown -out $(top_srcdir)/doc/rofi-sensible-terminal.1
 
 ##

README.md

@@ -188,7 +188,8 @@ Please see the [configuration guide](https://github.com/davatorium/rofi/blob/nex
 
 ## Themes
 
-Please see the [themes](https://github.com/davatorium/rofi/wiki/themes) section from the [wiki](https://github.com/davatorium/rofi/wiki) for brief reference. More detailed options are provided in the [themes manpages](https://github.com/davatorium/rofi/blob/next/doc/rofi-theme.5.markdown).
+Please see the [themes manpages](https://github.com/davatorium/rofi/blob/next/doc/rofi-theme.5.markdown) for a detailed description.
+
 
 The latest bundled themes can be found [here](https://github.com/davatorium/rofi/tree/next/themes).
 
@@ -233,3 +234,8 @@ for discussions.
   * [GitHub Discussions](https://github.com/davatorium/rofi/discussions)
   * IRC (#rofi on irc.libera.chat)
   * [Reddit](https://reddit.com/r/qtools/)
+
+
+## Stargazers over time
+
+[![Stargazers over time](https://starchart.cc/davatorium/rofi.svg)](https://starchart.cc/davatorium/rofi)

config/config.c

@@ -139,6 +139,7 @@ Settings config = {
     .plugin_path               = PLUGIN_PATH,
     .max_history_size          = 25,
     .combi_hide_mode_prefix    = FALSE,
+    .combi_display_format      = "{mode} {text}",
 
     .matching_negate_char      = '-',
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([rofi], [1.7.2], [https://github.com/davatorium/rofi/],[],[https://reddit.com/r/qtools/])
+AC_INIT([rofi], [1.7.3], [https://github.com/davatorium/rofi/],[],[https://reddit.com/r/qtools/])
 
 AC_CONFIG_SRCDIR([source/rofi.c])
 AC_CONFIG_HEADER([config.h])
@@ -124,6 +124,7 @@ AC_CHECK_FUNC([readdir],,  AC_MSG_ERROR("Could not find readdir in c library"))
 AC_CHECK_HEADER([math.h],, AC_MSG_ERROR("Could not find math.h header file"))
 AC_SEARCH_LIBS([floor],[m],,      AC_MSG_ERROR("Could not find floor in math library"))
 AC_SEARCH_LIBS([ceil], [m],,      AC_MSG_ERROR("Could not find ceil in math library"))
+AC_SEARCH_LIBS([round], [m],,      AC_MSG_ERROR("Could not find round in math library"))
 
 AC_CHECK_HEADER([sysexits.h],, AC_MSG_ERROR("Could not find the sysexists.h header file"))
 AC_CHECK_HEADER([setjmp.h],,   AC_MSG_ERROR("Could not find the setjmp.h header file"))

doc/meson.build

@@ -5,6 +5,8 @@ if gomd2man.found()
             'rofi.1.markdown',
             'rofi-theme-selector.1.markdown',
             'rofi-theme.5.markdown',
+            'rofi-dmenu.5.markdown',
+            'rofi-keys.5.markdown',
             'rofi-script.5.markdown',
             'rofi-sensible-terminal.1.markdown'
         )]