Merge c19b0003e7 into fab01c9906

zwlr_layer_shell_v1_destroy is not available in version 2 of the
interface.

VERSION

@@ -1 +1 @@
-0.6.19
+0.6.20

client/bemenu-run.c

@@ -5,13 +5,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <assert.h>
-#include "common/common.h"
-
-static struct client client = {
-    .filter_mode = BM_FILTER_MODE_DMENU,
-    .title = "bemenu-run",
-    .monitor = -1,
-};
+#include "../lib/config.h"
 
 struct paths {
    char *path;
@@ -177,14 +171,14 @@ main(int argc, char **argv)
     if (!bm_init())
         return EXIT_FAILURE;
 
-    parse_args(&client, &argc, &argv);
+    parse_args(&default_bmenu_run_client, &argc, &argv);
 
     struct bm_menu *menu;
-    if (!(menu = menu_with_options(&client)))
+    if (!(menu = menu_with_options(&default_bmenu_run_client)))
         return EXIT_FAILURE;
 
     read_items_to_menu_from_path(menu);
-    const enum bm_run_result status = run_menu(&client, menu, item_cb);
+    const enum bm_run_result status = run_menu(&default_bmenu_run_client, menu, item_cb);
     bm_menu_free(menu);
     return (status == BM_RUN_RESULT_SELECTED ? EXIT_SUCCESS : EXIT_FAILURE);
 }

client/bemenu.c

@@ -4,11 +4,6 @@
 #include <assert.h>
 #include "common/common.h"
 
-static struct client client = {
-    .filter_mode = BM_FILTER_MODE_DMENU,
-    .title = "bemenu",
-    .monitor = -1,
-};
 
 static void
 read_items_to_menu_from_stdin(struct bm_menu *menu)
@@ -46,20 +41,23 @@ item_cb(const struct client *client, struct bm_item *item)
     printf("%s\n", (text ? text : ""));
 }
 
+#include "../lib/config.h"
+
 int
 main(int argc, char **argv)
 {
+
     if (!bm_init())
         return EXIT_FAILURE;
 
-    parse_args(&client, &argc, &argv);
+    parse_args(&default_bmenu_client, &argc, &argv);
 
     struct bm_menu *menu;
-    if (!(menu = menu_with_options(&client)))
+    if (!(menu = menu_with_options(&default_bmenu_client)))
         return EXIT_FAILURE;
 
     read_items_to_menu_from_stdin(menu);
-    const enum bm_run_result status = run_menu(&client, menu, item_cb);
+    const enum bm_run_result status = run_menu(&default_bmenu_client, menu, item_cb);
     bm_menu_free(menu);
     switch (status) {
         case BM_RUN_RESULT_SELECTED:

lib/config.h

@@ -0,0 +1,49 @@
+#include "../client/common/common.h"
+
+/**
+ * Default font.
+ */
+static const char *default_font = "monospace 10";
+
+/**
+ * Default hexadecimal colors.
+ */
+static const char *default_colors[BM_COLOR_LAST] = {
+    "#121212FF", // BM_COLOR_TITLE_BG
+    "#D81860FF", // BM_COLOR_TITLE_FG
+    "#121212FF", // BM_COLOR_FILTER_BG
+    "#CACACAFF", // BM_COLOR_FILTER_FG
+    "#121212FF", // BM_COLOR_CURSOR_BG
+    "#CACACAFF", // BM_COLOR_CURSOR_FG
+    "#121212FF", // BM_COLOR_ITEM_BG
+    "#CACACAFF", // BM_COLOR_ITEM_FG
+    "#121212FF", // BM_COLOR_HIGHLIGHTED_BG
+    "#D81860FF", // BM_COLOR_HIGHLIGHTED_FG
+    "#D81860FF", // BM_COLOR_FEEDBACK_BG
+    "#121212FF", // BM_COLOR_FEEDBACK_FG
+    "#121212FF", // BM_COLOR_SELECTED_BG
+    "#D81860FF", // BM_COLOR_SELECTED_FG
+    "#121212FF", // BM_COLOR_ALTERNATE_BG
+    "#CACACAFF", // BM_COLOR_ALTERNATE_FG
+    "#121212FF", // BM_COLOR_SCROLLBAR_BG
+    "#D81860FF", // BM_COLOR_SCROLLBAR_FG
+    "#D81860FF", // BM_COLOR_BORDER
+};
+
+/**
+ * Default title/prompt for the bmenu client (Can be changed with `-p` option).
+ */
+static struct client default_bmenu_client = {
+        .filter_mode = BM_FILTER_MODE_DMENU,
+        .title = "bemenu",
+        .monitor = -1,
+};
+
+/**
+ * Default title/prompt for the bmenu-run client (Can be changed with `-p` option).
+ */
+static struct client default_bmenu_run_client = {
+        .filter_mode = BM_FILTER_MODE_DMENU,
+        .title = "bemenu-run",
+        .monitor = -1,
+};

lib/menu.c

@@ -8,35 +8,7 @@
 
 #include "vim.h"
 
-/**
- * Default font.
- */
-static const char *default_font = "monospace 10";
-
-/**
- * Default hexadecimal colors.
- */
-static const char *default_colors[BM_COLOR_LAST] = {
-    "#121212FF", // BM_COLOR_TITLE_BG
-    "#D81860FF", // BM_COLOR_TITLE_FG
-    "#121212FF", // BM_COLOR_FILTER_BG
-    "#CACACAFF", // BM_COLOR_FILTER_FG
-    "#121212FF", // BM_COLOR_CURSOR_BG
-    "#CACACAFF", // BM_COLOR_CURSOR_FG
-    "#121212FF", // BM_COLOR_ITEM_BG
-    "#CACACAFF", // BM_COLOR_ITEM_FG
-    "#121212FF", // BM_COLOR_HIGHLIGHTED_BG
-    "#D81860FF", // BM_COLOR_HIGHLIGHTED_FG
-    "#D81860FF", // BM_COLOR_FEEDBACK_BG
-    "#121212FF", // BM_COLOR_FEEDBACK_FG
-    "#121212FF", // BM_COLOR_SELECTED_BG
-    "#D81860FF", // BM_COLOR_SELECTED_FG
-    "#121212FF", // BM_COLOR_ALTERNATE_BG
-    "#CACACAFF", // BM_COLOR_ALTERNATE_FG
-    "#121212FF", // BM_COLOR_SCROLLBAR_BG
-    "#D81860FF", // BM_COLOR_SCROLLBAR_FG
-    "#D81860FF", // BM_COLOR_BORDER
-};
+#include "config.h"
 
 /**
  * Filter function map.

lib/renderers/wayland/registry.c

@@ -582,7 +582,7 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t id, co
     if (strcmp(interface, "wl_compositor") == 0) {
         wayland->compositor = wl_registry_bind(registry, id, &wl_compositor_interface, 4);
     } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
-        wayland->layer_shell = wl_registry_bind(registry, id, &zwlr_layer_shell_v1_interface, 2);
+        wayland->layer_shell = wl_registry_bind(registry, id, &zwlr_layer_shell_v1_interface, 3);
     } else if (strcmp(interface, "wl_seat") == 0) {
         wayland->seat = wl_registry_bind(registry, id, &wl_seat_interface, 7);
         wl_seat_add_listener(wayland->seat, &seat_listener, &wayland->input);