Merge branch 'davatorium:next' into next

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -13,7 +13,7 @@ body:
         consider you’re wrong and still fill the full report. Any report
         missing required informations will be labeled as “Incomplete Report -
         Please follow the guidelines” and will be closed. If you ask a
-        question, enter dummy information in required fields to get passed the
+        question, enter dummy information in required fields to get past the
         checks or in general completely ignore the guidelines, the issue will
         be closed and locked as spam.
 
@@ -37,21 +37,26 @@ body:
   - type: input
     attributes:
       label: "Configuration"
-      description: "Please use https://gist.github.com and include output of `rofi -dump-config`."
+      description: |
+        Please use https://gist.github.com and include output of `rofi -dump-config`.
+        n/a is not a valid config.
       placeholder: "Gist URL"
     validations:
       required: true
   - type: input
     attributes:
       label: "Theme"
-      description: "Please use https://gist.github.com and include output of `rofi -dump-theme`."
+      description: |
+        Please use https://gist.github.com and include output of `rofi -dump-theme`.
+        n/a is not a valid theme.
       placeholder: "Gist URL"
     validations:
       required: true
   - type: input
     attributes:
       label: "Timing report"
-      description: "Please use https://gist.github.com and include output of your command with G_MESSAGES_DEBUG=Timings set."
+      description: |
+        Please use https://gist.github.com and include output of your command with G_MESSAGES_DEBUG=Timings set.
       placeholder: "Gist URL"
     validations:
       required: false

.github/workflows/lock.yml

@@ -1,32 +1,41 @@
-name: 'Lock threads'
+name: 'Lock Threads'
 
 on:
   schedule:
     - cron: '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write
+
+concurrency:
+  group: lock-threads
 
 jobs:
-  lock:
+  action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v5
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-lock-inactive-days: '31'
-          issue-exclude-created-before: ''
-          issue-exclude-labels: ''
-          issue-lock-labels: ''
-          issue-lock-reason: 'resolved'
-          issue-lock-comment: >
-            This issue has been automatically locked since there
-            has not been any recent activity after it was closed.
-            Please open a new issue for related bugs.
-          pr-lock-inactive-days: '31'
-          pr-exclude-created-before: ''
-          pr-exclude-labels: ''
-          pr-lock-labels: ''
-          pr-lock-reason: 'resolved'
-          pr-lock-comment: >
+          process-only: 'issues'
+          github-token: ${{ github.token }}
+          issue-inactive-days: '31'
+          exclude-issue-created-before: ''
+          exclude-issue-created-after: ''
+          exclude-issue-created-between: ''
+          exclude-issue-closed-before: ''
+          exclude-issue-closed-after: ''
+          exclude-issue-closed-between: ''
+          include-any-issue-labels: ''
+          include-all-issue-labels: ''
+          exclude-any-issue-labels: ''
+          add-issue-labels: ''
+          remove-issue-labels: ''
+          issue-comment: >
             This pull request has been automatically locked since there
             has not been any recent activity after it was closed.
             Please open a new issue for related bugs.
-          process-only: ''
+          issue-lock-reason: 'resolved'
+          log-output: false

doc/rofi-script.5.markdown

@@ -109,6 +109,8 @@ The following extra options exists:
 -   **keep-selection**: If set, the selection is not moved to the first entry,
     but the current position is maintained. The filter is cleared.
 
+-   **keep-filter**: If set, the filter is not cleared. 
+
 -   **new-selection**: If `keep-selection` is set, this allows you to override
     the selected entry (absolute position).
 
@@ -143,7 +145,7 @@ The following options are supported:
 
 -   **nonselectable**: If true the row cannot activated.
 
--   **permantent**: If true the row always shows, independent of filter.
+-   **permanent**: If true the row always shows, independent of filter.
 
 -   **info**: Info that, on selection, gets placed in the `ROFI_INFO`
     environment variable. This entry does not get searched for filtering.

include/xcb.h

@@ -209,8 +209,6 @@ typedef enum {
   WM_DO_NOT_CHANGE_CURRENT_DESKTOP = 1,
   /** PANGO WORKSPACE NAMES */
   WM_PANGO_WORKSPACE_NAMES = 2,
-  /** Root window offset (for bspwm) */
-  WM_ROOT_WINDOW_OFFSET = 4,
 } WindowManagerQuirk;
 
 /**

source/modes/filebrowser.c

@@ -473,13 +473,7 @@ static ModeMode file_browser_mode_result(Mode *sw, int mretv, char **input,
   }
   gboolean special_command =
       ((mretv & MENU_CUSTOM_ACTION) == MENU_CUSTOM_ACTION);
-  if (mretv & MENU_NEXT) {
-    retv = NEXT_DIALOG;
-  } else if (mretv & MENU_PREVIOUS) {
-    retv = PREVIOUS_DIALOG;
-  } else if (mretv & MENU_QUICK_SWITCH) {
-    retv = (mretv & MENU_LOWER_MASK);
-  } else if (mretv & MENU_CUSTOM_COMMAND) {
+  if (mretv & MENU_CUSTOM_COMMAND) {
     retv = (mretv & MENU_LOWER_MASK);
   } else if ((mretv & MENU_OK)) {
     if (selected_line < pd->array_length) {
@@ -658,13 +652,7 @@ ModeMode file_browser_mode_completer(Mode *sw, int mretv, char **input,
   ModeMode retv = MODE_EXIT;
   FileBrowserModePrivateData *pd =
       (FileBrowserModePrivateData *)mode_get_private_data(sw);
-  if (mretv & MENU_NEXT) {
-    retv = NEXT_DIALOG;
-  } else if (mretv & MENU_PREVIOUS) {
-    retv = PREVIOUS_DIALOG;
-  } else if (mretv & MENU_QUICK_SWITCH) {
-    retv = (mretv & MENU_LOWER_MASK);
-  } else if ((mretv & MENU_OK)) {
+  if ((mretv & MENU_OK)) {
     if (selected_line < pd->array_length) {
       if (pd->array[selected_line].type == UP) {
         GFile *new = g_file_get_parent(pd->current_dir);