Merge tag '1.7.2' into wayland

.github/actions/autotools/action.yml

@@ -5,6 +5,9 @@ inputs:
   cc:
     description: Compiler to use
     required: true
+  windowmode:
+    description: Enable window mode
+    required: true
 
 runs:
   using: composite
@@ -18,7 +21,7 @@ runs:
 
         mkdir builddir && cd builddir
 
-        ../configure CC=${{ inputs.cc }}
+        ../configure CC=${{ inputs.cc }} --${{ inputs.windowmode }}-windowmode
       shell: bash
     - id: build
       run: cd builddir && make

Changelog

@@ -1,3 +1,9 @@
+v1.7.2: Shellebrations!
+   - [Build] Fix building without window mode enabled.
+   - [Config] Do not print out the 'theme' field in configuration on dump.
+   - [CI] test window mode less build.
+   - Allow configuration block in theme again.
+
 v1.7.1: Turtley amazing!
    - [Theme] Fix highlight with only theme.
    - Updated documentation and landing page (Thanks to RaZ0rr-Two)

Makefile.am

@@ -184,7 +184,8 @@ EXTRA_DIST += \
 	doc/rofi-script.5.markdown \
 	doc/rofi-theme-selector.1.markdown \
 	doc/rofi-sensible-terminal.1.markdown \
-	doc/rofi.1.markdown
+	doc/rofi.1.markdown\
+	README.md
 
 ###
 # Themes

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([rofi], [1.7.1], [https://github.com/davatorium/rofi/],[],[https://reddit.com/r/qtools/])
+AC_INIT([rofi], [1.7.2], [https://github.com/davatorium/rofi/],[],[https://reddit.com/r/qtools/])
 
 AC_CONFIG_SRCDIR([source/rofi.c])
 AC_CONFIG_HEADER([config.h])

lexer/theme-lexer.l

@@ -808,7 +808,6 @@ if ( queue == NULL ) {
 }
 <INITIAL>. {
     yytext[yyleng-1] = '\0';
-    fprintf(stderr,"initial found: |%s|\n", yytext);
     return T_ERROR;
 }
 <SECTION>. {

lexer/theme-parser.y

@@ -313,31 +313,21 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b )
  * First have the configuration blocks, then the theme.
  */
 t_main
-: t_configuration_list t_entry_list_included {
+: t_entry_list_included {
     // Dummy at this point.
     if ( rofi_theme == NULL ) {
       rofi_theme_reset();
     }
 
-    rofi_theme_widget_add_properties ( rofi_theme, $2->properties );
-    for ( unsigned int i = 0; i < $2->num_widgets; i++ ) {
-        ThemeWidget *d = $2->widgets[i];
+    rofi_theme_widget_add_properties ( rofi_theme, $1->properties );
+    for ( unsigned int i = 0; i < $1->num_widgets; i++ ) {
+        ThemeWidget *d = $1->widgets[i];
         rofi_theme_parse_merge_widgets(rofi_theme, d);
     }
-    rofi_theme_free ( $2 );
+    rofi_theme_free ( $1 );
 }
 ;
 
-t_configuration_list:
- %empty {
-    if ( rofi_configuration == NULL ) {
-      rofi_configuration       = g_slice_new0 ( ThemeWidget );
-      rofi_configuration->name = g_strdup ( "Root" );
-    }
-}
-| t_configuration_list T_CONFIGURATION T_BOPEN t_config_property_list_optional T_BCLOSE {};
-
-
 /**
  * Small dummy object to make the prefix optional.
  */
@@ -359,8 +349,15 @@ t_entry_list {
 
 
 t_entry_list:
-  %empty {
+t_entry_list T_CONFIGURATION T_BOPEN t_config_property_list_optional T_BCLOSE {
+  $$ = $1;
+}
+|%empty {
     $$ = g_slice_new0 ( ThemeWidget );
+    if ( rofi_configuration == NULL ) {
+      rofi_configuration       = g_slice_new0 ( ThemeWidget );
+      rofi_configuration->name = g_strdup ( "Root" );
+    }
   }
 |  t_entry_list t_name_prefix_optional t_entry_name_path_selectors T_BOPEN t_property_list_optional T_BCLOSE
 {

meson.build

@@ -1,5 +1,5 @@
 project('rofi', 'c',
-    version: '1.7.1+wayland1-dev',
+    version: '1.7.2+wayland1',
     meson_version: '>=0.47.0',
     license: [ 'MIT' ],
     default_options: [

releasenotes/1.7.2/release-1.7.2.markdown

@@ -0,0 +1,23 @@
+# 1.7.2: Shellebrations! 
+
+A quick in between release, a bug got fixed that caused configurations not working any more in theme files.
+While this is the desired behaviour, this release reverts it to avoid breaking to many setups.
+
+# Changelog
+
+v1.7.2:
+   - [Build] Fix building without window mode enabled.
+   - [Config] Do not print out the 'theme' field in configuration on dump.
+   - [CI] test window mode less build.
+   - Allow configuration block in theme again.
+
+# Thanks
+
+Big thanks to everybody reporting issues.
+Special thanks goes to:
+
+* Iggy
+* Quentin Glidic
+* Danny Colin
+
+Apologies if I mistyped or missed anybody.

source/rofi.c

@@ -976,7 +976,11 @@ int main(int argc, char *argv[]) {
     TICK_N("Parsed theme");
   }
   // Parse command line for settings, independent of other -no-config.
-  config_parse_cmd_options();
+  if (list_of_error_msgs == NULL) {
+    // Only call this when there are no errors.
+    // This might clear existing errors.
+    config_parse_cmd_options();
+  }
   TICK_N("Load cmd config ");
 
   parse_keys_abe(bindings);

source/xcb.c

@@ -1089,7 +1089,9 @@ static void main_loop_x11_event_handler_view(xcb_generic_event_t *event) {
   case XCB_DESTROY_NOTIFY: {
     xcb_window_t win = ((xcb_destroy_notify_event_t *)event)->window;
     if (win != rofi_view_get_window()) {
+#ifdef WINDOW_MODE
       window_client_handle_signal(win, FALSE);
+#endif
     } else {
       g_main_loop_quit(xcb->main_loop);
     }
@@ -1098,7 +1100,9 @@ static void main_loop_x11_event_handler_view(xcb_generic_event_t *event) {
   case XCB_CREATE_NOTIFY: {
     xcb_window_t win = ((xcb_create_notify_event_t *)event)->window;
     if (win != rofi_view_get_window()) {
+#ifdef WINDOW_MODE
       window_client_handle_signal(win, TRUE);
+#endif
     }
     break;
   }