Merge remote-tracking branch 'vanilla/next' into gaps-next

.clang-format

@@ -10,3 +10,4 @@ ColumnLimit: 0
 SpaceBeforeParens: ControlStatements
 SortIncludes: false
 ForEachMacros: [ TAILQ_FOREACH, TAILQ_FOREACH_REVERSE, SLIST_FOREACH, CIRCLEQ_FOREACH, CIRCLEQ_FOREACH_REVERSE, NODES_FOREACH, NODES_FOREACH_REVERSE, FOREACH_NONINTERNAL]
+TypenameMacros: [ SLIST_HEAD, SLIST_ENTRY, LIST_HEAD, LIST_ENTRY, SIMPLEQ_HEAD, SIMPLEQ_ENTRY, TAILQ_HEAD, TAILQ_ENTRY, CIRCLEQ_HEAD, CIRCLEQ_ENTRY ]

I3_VERSION

@@ -1 +1 @@
-4.18.2-non-git
+4.18.3-non-git

Makefile.am

@@ -126,7 +126,7 @@ EXTRA_DIST = \
 	I3_VERSION \
 	LICENSE \
 	PACKAGE-MAINTAINER \
-	RELEASE-NOTES-4.18.2 \
+	RELEASE-NOTES-4.18.3 \
 	generate-command-parser.pl \
 	parser-specs/commands.spec \
 	parser-specs/config.spec \

RELEASE-NOTES-4.18.2 → RELEASE-NOTES-4.18.3

@@ -1,9 +1,9 @@
 
  ┌──────────────────────────────┐
- │ Release notes for i3 v4.18.2 │
+ │ Release notes for i3 v4.18.3 │
  └──────────────────────────────┘
 
-This is i3 v4.18.2. This version is considered stable. All users of i3 are
+This is i3 v4.18.3. This version is considered stable. All users of i3 are
 strongly encouraged to upgrade.
 
 This is a bugfix release for v4.18.
@@ -12,17 +12,14 @@ This is a bugfix release for v4.18.
  │ Bugfixes                   │
  └────────────────────────────┘
 
-  • floating_maybe_reassign_ws: only re-focus if previously focused
-    (fixes a focus issue with KDE notifications)
-  • get_output_by_name: guard output->primary with require_active
-  • i3bar: fix Xorg memory leak
+  • Bugfix: kick tray clients before destroying the bar
 
  ┌────────────────────────────┐
  │ Thanks!                    │
  └────────────────────────────┘
 
 Thanks for testing, bugfixes, discussions and everything I forgot go out to:
 
-  Orestis Floros
+  Mark Guptill, Orestis Floros
 
--- Michael Stapelberg, 2020-07-26
+-- Michael Stapelberg, 2020-10-19

RELEASE-NOTES-next

@@ -26,6 +26,7 @@ working. Please reach out to us in that case!
     to their definition order in the config file
   • update i3bar config when necessary (reduces redraws on bar mode changes)
   • mention rofi in default config file
+  • i3-input: add different exit codes for when i3-input fails
 
  ┌────────────────────────────┐
  │ Bugfixes                   │

configure.ac

@@ -2,7 +2,7 @@
 # Run autoreconf -fi to generate a configure script from this file.
 
 AC_PREREQ([2.69])
-AC_INIT([i3], [4.18.2], [https://github.com/i3/i3/issues])
+AC_INIT([i3], [4.18.3], [https://github.com/i3/i3/issues])
 # For AX_EXTEND_SRCDIR
 AX_ENABLE_BUILDDIR
 AM_INIT_AUTOMAKE([foreign -Wall no-dist-gzip dist-bzip2])

debian/changelog

@@ -1,8 +1,14 @@
+i3-wm (4.19-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Mon, 19 Oct 2020 22:48:30 +0200
+
 i3-wm (4.18.3-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Michael Stapelberg <stapelberg@debian.org>  Sun, 26 Jul 2020 10:24:46 +0200
+ -- Michael Stapelberg <stapelberg@debian.org>  Mon, 19 Oct 2020 22:48:30 +0200
 
 i3-wm (4.18.2-1) unstable; urgency=medium
 

i3-input/main.c

@@ -32,6 +32,14 @@ xcb_visualtype_t *visual_type = NULL;
 #define BORDER logical_px(2)
 #define PADDING logical_px(2)
 
+/* Exit codes for i3-input:
+ * 0 if i3-input exited successfully and the command was run
+ * 1 if the user canceled input
+ * 2 if i3-input fails for any other reason */
+const int EXIT_OK = 0;
+const int EXIT_CANCEL = 1;
+const int EXIT_ERROR = 2;
+
 /* IPC format string. %s will be replaced with what the user entered, then
  * the command will be sent to i3 */
 static char *format;
@@ -186,11 +194,11 @@ static void finish_input(void) {
     /* prefix the command if a prefix was specified on commandline */
     printf("command = %s\n", full);
 
-    ipc_send_message(sockfd, strlen(full), 0, (uint8_t *)full);
+    int ret = ipc_send_message(sockfd, strlen(full), 0, (uint8_t *)full);
 
     free(full);
 
-    exit(0);
+    exit(ret == 0 ? EXIT_OK : EXIT_ERROR);
 }
 
 /*
@@ -239,7 +247,7 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press
         return 1;
     }
     if (sym == XK_Escape) {
-        exit(0);
+        exit(EXIT_CANCEL);
     }
 
     /* TODO: handle all of these? */
@@ -297,7 +305,7 @@ static xcb_rectangle_t get_window_position(void) {
     xcb_intern_atom_reply_t *nswc_reply = xcb_intern_atom_reply(conn, nswc_cookie, NULL);
     if (nswc_reply == NULL) {
         ELOG("Could not intern atom _NET_SUPPORTING_WM_CHECK\n");
-        exit(-1);
+        exit(EXIT_ERROR);
     }
     A__NET_SUPPORTING_WM_CHECK = nswc_reply->atom;
     free(nswc_reply);
@@ -392,7 +400,7 @@ int main(int argc, char *argv[]) {
                 break;
             case 'v':
                 printf("i3-input " I3_VERSION);
-                return 0;
+                return EXIT_OK;
             case 'p':
                 /* This option is deprecated, but will still work in i3 v4.1, 4.2 and 4.3 */
                 fprintf(stderr, "i3-input: WARNING: the -p option is DEPRECATED in favor of the -F (format) option\n");
@@ -420,7 +428,7 @@ int main(int argc, char *argv[]) {
                 printf("\n");
                 printf("Example:\n");
                 printf("    i3-input -F 'workspace \"%%s\"' -P 'Switch to workspace: '\n");
-                return 0;
+                return EXIT_OK;
         }
     }
     if (!format) {
@@ -491,7 +499,7 @@ int main(int argc, char *argv[]) {
 
     if (reply->status != XCB_GRAB_STATUS_SUCCESS) {
         fprintf(stderr, "Could not grab keyboard, status = %d\n", reply->status);
-        exit(-1);
+        exit(EXIT_ERROR);
     }
 
     xcb_flush(conn);
@@ -527,5 +535,5 @@ int main(int argc, char *argv[]) {
     }
 
     draw_util_surface_free(conn, &surface);
-    return 0;
+    return EXIT_OK;
 }

i3bar/include/common.h

@@ -77,12 +77,10 @@ struct status_block {
     char *name;
     char *instance;
 
-    TAILQ_ENTRY(status_block)
-    blocks;
+    TAILQ_ENTRY(status_block) blocks;
 };
 
-extern TAILQ_HEAD(statusline_head, status_block)
-    statusline_head;
+extern TAILQ_HEAD(statusline_head, status_block) statusline_head;
 
 #include "child.h"
 #include "ipc.h"

i3bar/include/configuration.h

@@ -29,23 +29,18 @@ typedef struct binding_t {
     char *command;
     bool release;
 
-    TAILQ_ENTRY(binding_t)
-    bindings;
+    TAILQ_ENTRY(binding_t) bindings;
 } binding_t;
 
 typedef struct tray_output_t {
     char *output;
 
-    TAILQ_ENTRY(tray_output_t)
-    tray_outputs;
+    TAILQ_ENTRY(tray_output_t) tray_outputs;
 } tray_output_t;
 
 typedef struct config_t {
     uint32_t modifier;
-
-    TAILQ_HEAD(bindings_head, binding_t)
-    bindings;
-
+    TAILQ_HEAD(bindings_head, binding_t) bindings;
     position_t position;
     bool verbose;
     uint32_t bar_height;
@@ -60,10 +55,7 @@ typedef struct config_t {
     char *command;
     char *fontname;
     i3String *separator_symbol;
-
-    TAILQ_HEAD(tray_outputs_head, tray_output_t)
-    tray_outputs;
-
+    TAILQ_HEAD(tray_outputs_head, tray_output_t) tray_outputs;
     int tray_padding;
     int num_outputs;
     char **outputs;

i3bar/include/outputs.h

@@ -73,6 +73,5 @@ struct i3_output {
     struct ws_head* workspaces;  /* The workspaces on this output */
     struct tc_head* trayclients; /* The tray clients on this output */
 
-    SLIST_ENTRY(i3_output)
-    slist; /* Pointer for the SLIST-Macro */
+    SLIST_ENTRY(i3_output) slist; /* Pointer for the SLIST-Macro */
 };

i3bar/include/trayclients.h

@@ -21,6 +21,5 @@ struct trayclient {
     char *class_class;
     char *class_instance;
 
-    TAILQ_ENTRY(trayclient)
-    tailq; /* Pointer for the TAILQ-Macro */
+    TAILQ_ENTRY(trayclient) tailq; /* Pointer for the TAILQ-Macro */
 };

i3bar/include/workspaces.h

@@ -41,6 +41,5 @@ struct i3_ws {
     rect rect;                /* The rect of the ws (not used (yet)) */
     struct i3_output *output; /* The current output of the ws */
 
-    TAILQ_ENTRY(i3_ws)
-    tailq; /* Pointer for the TAILQ-Macro */
+    TAILQ_ENTRY(i3_ws) tailq; /* Pointer for the TAILQ-Macro */
 };

include/configuration.h

@@ -66,8 +66,7 @@ struct Variable {
     char *value;
     char *next_match;
 
-    SLIST_ENTRY(Variable)
-    variables;
+    SLIST_ENTRY(Variable) variables;
 };
 
 /**
@@ -81,8 +80,7 @@ struct Mode {
     bool pango_markup;
     struct bindings_head *bindings;
 
-    SLIST_ENTRY(Mode)
-    modes;
+    SLIST_ENTRY(Mode) modes;
 };
 
 /**
@@ -281,8 +279,7 @@ struct Barconfig {
     /* List of outputs on which the tray is allowed to be shown, in order.
      * The special value "none" disables it (per default, it will be shown) and
      * the special value "primary" enabled it on the primary output. */
-    TAILQ_HEAD(tray_outputs_head, tray_output_t)
-    tray_outputs;
+    TAILQ_HEAD(tray_outputs_head, tray_output_t) tray_outputs;
 
     /* Padding around the tray icons. */
     int tray_padding;
@@ -304,8 +301,7 @@ struct Barconfig {
     /** Bar modifier (to show bar when in hide mode). */
     uint32_t modifier;
 
-    TAILQ_HEAD(bar_bindings_head, Barbinding)
-    bar_bindings;
+    TAILQ_HEAD(bar_bindings_head, Barbinding) bar_bindings;
 
     /** Bar position (bottom by default). */
     enum { P_BOTTOM = 0,
@@ -382,8 +378,7 @@ struct Barconfig {
         char *binding_mode_text;
     } colors;
 
-    TAILQ_ENTRY(Barconfig)
-    configs;
+    TAILQ_ENTRY(Barconfig) configs;
 };
 
 /**
@@ -401,15 +396,13 @@ struct Barbinding {
     /** If true, the command will be executed after the button is released. */
     bool release;
 
-    TAILQ_ENTRY(Barbinding)
-    bindings;
+    TAILQ_ENTRY(Barbinding) bindings;
 };
 
 struct tray_output_t {
     char *output;
 
-    TAILQ_ENTRY(tray_output_t)
-    tray_outputs;
+    TAILQ_ENTRY(tray_output_t) tray_outputs;
 };
 
 typedef enum {