automatic sync 31-07-2020:00:00

AnyEvent-I3/lib/AnyEvent/I3.pm

@@ -101,11 +101,13 @@ use constant TYPE_GET_BINDING_MODES => 8;
 use constant TYPE_GET_CONFIG => 9;
 use constant TYPE_SEND_TICK => 10;
 use constant TYPE_SYNC => 11;
+use constant TYPE_GET_BINDING_STATE => 12;
 
 our %EXPORT_TAGS = ( 'all' => [
     qw(i3 TYPE_RUN_COMMAND TYPE_COMMAND TYPE_GET_WORKSPACES TYPE_SUBSCRIBE TYPE_GET_OUTPUTS
        TYPE_GET_TREE TYPE_GET_MARKS TYPE_GET_BAR_CONFIG TYPE_GET_VERSION
-       TYPE_GET_BINDING_MODES TYPE_GET_CONFIG TYPE_SEND_TICK TYPE_SYNC)
+       TYPE_GET_BINDING_MODES TYPE_GET_CONFIG TYPE_SEND_TICK TYPE_SYNC
+       TYPE_GET_BINDING_STATE)
 ] );
 
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{all} } );

I3_VERSION

@@ -1 +1 @@
-4.18.1-2-gdae37a9 (2020-04-22, branch \"master\")
+4.18-343-g15e51ca (2020-07-26, branch \"next\")

Makefile.am

@@ -5,12 +5,12 @@ echo-version:
 
 bin_PROGRAMS = \
 	i3 \
-	i3bar/i3bar \
-	i3-config-wizard/i3-config-wizard \
-	i3-dump-log/i3-dump-log \
-	i3-input/i3-input \
-	i3-msg/i3-msg \
-	i3-nagbar/i3-nagbar
+	i3bar \
+	i3-config-wizard \
+	i3-dump-log \
+	i3-input \
+	i3-msg \
+	i3-nagbar
 
 install-exec-hook:
 	$(LN_S) -f i3 $(DESTDIR)$(bindir)/i3-with-shmlog
@@ -35,6 +35,14 @@ dist_i3conf_DATA = \
 	etc/config \
 	etc/config.keycodes
 
+I3STATUS_INSTALL_NAME = $(shell echo i3status | sed '@program_transform_name@')
+
+etc/config: etc/$(dirstamp)
+	$(AM_V_GEN) sed "s,status_command i3status,status_command $(I3STATUS_INSTALL_NAME),g" $(top_srcdir)/etc/config > etc/config
+
+etc/config.keycodes: etc/$(dirstamp)
+	$(AM_V_GEN) sed "s,status_command i3status,status_command $(I3STATUS_INSTALL_NAME),g" $(top_srcdir)/etc/config.keycodes > etc/config.keycodes
+
 applicationsdir = $(datarootdir)/applications
 xsessionsdir = $(datarootdir)/xsessions
 dist_applications_DATA = \
@@ -118,7 +126,7 @@ EXTRA_DIST = \
 	I3_VERSION \
 	LICENSE \
 	PACKAGE-MAINTAINER \
-	RELEASE-NOTES-4.18.1 \
+	RELEASE-NOTES-4.18.2 \
 	generate-command-parser.pl \
 	parser-specs/commands.spec \
 	parser-specs/config.spec \
@@ -146,7 +154,8 @@ dirstamp = .dirstamp
 dirstamps = \
 	docs/$(dirstamp) \
 	man/$(dirstamp) \
-	parser/$(dirstamp)
+	parser/$(dirstamp) \
+	etc/$(dirstamp)
 DISTCLEANFILES = $(dirstamps)
 
 $(dirstamps):
@@ -322,78 +331,77 @@ libi3_a_SOURCES = \
 	libi3/strndup.c \
 	libi3/ucs2_conversion.c
 
-i3_dump_log_i3_dump_log_CFLAGS = \
+i3_dump_log_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(libi3_CFLAGS)
 
-i3_dump_log_i3_dump_log_LDADD = \
+i3_dump_log_LDADD = \
 	$(PTHREAD_LIBS) \
 	$(libi3_LIBS)
 
-i3_dump_log_i3_dump_log_SOURCES = \
+i3_dump_log_SOURCES = \
 	i3-dump-log/main.c
 
-i3_input_i3_input_CFLAGS = \
+i3_input_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(libi3_CFLAGS)
 
-i3_input_i3_input_LDADD = \
+i3_input_LDADD = \
 	$(libi3_LIBS) \
 	$(XCB_UTIL_KEYSYMS_LIBS)
 
-i3_input_i3_input_SOURCES = \
+i3_input_SOURCES = \
 	i3-input/i3-input.h \
 	i3-input/keysym2ucs.c \
 	i3-input/keysym2ucs.h \
 	i3-input/main.c
 
-i3_msg_i3_msg_CFLAGS = \
+i3_msg_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(libi3_CFLAGS)
 
-i3_msg_i3_msg_LDADD = \
+i3_msg_LDADD = \
 	$(libi3_LIBS)
 
-i3_msg_i3_msg_SOURCES = \
+i3_msg_SOURCES = \
 	i3-msg/main.c
 
-i3_nagbar_i3_nagbar_CFLAGS = \
+i3_nagbar_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(libi3_CFLAGS)
 
-i3_nagbar_i3_nagbar_LDADD = \
+i3_nagbar_LDADD = \
 	$(libi3_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XCB_UTIL_CURSOR_LIBS)
 
-i3_nagbar_i3_nagbar_SOURCES = \
-	i3-nagbar/atoms.xmacro \
-	i3-nagbar/i3-nagbar.h \
+i3_nagbar_SOURCES = \
+	i3-nagbar/i3-nagbar-atoms.xmacro.h \
 	i3-nagbar/main.c
 
-i3bar_i3bar_CPPFLAGS = \
+i3bar_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/i3bar/include
 
-i3bar_i3bar_CFLAGS = \
+i3bar_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(libi3_CFLAGS) \
 	$(XCB_CFLAGS) \
 	$(XKBCOMMON_CFLAGS) \
 	$(PANGOCAIRO_CFLAGS) \
 	$(YAJL_CFLAGS)
 
-i3bar_i3bar_LDADD = \
+i3bar_LDADD = \
 	$(libi3_LIBS) \
 	$(XCB_LIBS) \
 	$(XCB_UTIL_CURSOR_LIBS) \
 	$(XKBCOMMON_LIBS) \
 	$(PANGOCAIRO_LIBS) \
 	$(YAJL_LIBS)
 
-i3bar_i3bar_SOURCES = \
+i3bar_SOURCES = \
 	i3bar/include/child.h \
 	i3bar/include/common.h \
 	i3bar/include/configuration.h \
@@ -416,23 +424,26 @@ i3bar_i3bar_SOURCES = \
 	i3bar/src/workspaces.c \
 	i3bar/src/xcb.c
 
-i3_config_wizard_i3_config_wizard_CFLAGS = \
+i3_config_wizard_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(libi3_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XKBCOMMON_CFLAGS)
 
-i3_config_wizard_i3_config_wizard_LDADD = \
+i3_config_wizard_LDADD = \
 	$(libi3_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XCB_UTIL_KEYSYMS_LIBS) \
 	$(XKBCOMMON_LIBS)
 
-i3_config_wizard_i3_config_wizard_SOURCES = \
-	i3-config-wizard/atoms.xmacro \
+i3_config_wizard_SOURCES = \
+	i3-config-wizard/i3-config-wizard-atoms.xmacro.h \
 	i3-config-wizard/main.c \
 	i3-config-wizard/xcb.h
 
+i3_config_wizard_DEPENDENCIES = \
+	$(top_builddir)/libi3.a
+
 test_inject_randr15_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
@@ -484,14 +495,13 @@ config_parser_SOURCES = \
 	parser/GENERATED_config_tokens.h \
 	parser/GENERATED_config_call.h
 
+BUILT_SOURCES = $(command_parser_SOURCES) $(config_parser_SOURCES)
+
 i3_SOURCES = \
-	$(command_parser_SOURCES) \
-	$(config_parser_SOURCES) \
 	include/all.h \
 	include/assignments.h \
-	include/atoms_NET_SUPPORTED.xmacro \
-	include/atoms_rest.xmacro \
-	include/atoms.xmacro \
+	include/i3-atoms_NET_SUPPORTED.xmacro.h \
+	include/i3-atoms_rest.xmacro.h \
 	include/bindings.h \
 	include/click.h \
 	include/cmdparse.h \
@@ -610,10 +620,23 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-command-parser.pl parser-spe
 ################################################################################
 
 anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
-	$(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL && make)
+	$(AM_V_BUILD) (cp -r $(top_srcdir)/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL && make)
 	$(AM_V_at) touch $@
 
 CLEANFILES = \
 	i3-command-parser.stamp \
 	i3-config-parser.stamp \
 	anyevent-i3.stamp
+
+################################################################################
+# Language Server support
+################################################################################
+
+# Recursively run make through https://github.com/rizsotto/Bear,
+# which generates a compile_commands.json file in the source directory.
+# This is useful for running e.g. the clangd or ccls language servers:
+# https://clang.llvm.org/extra/clangd/
+# https://github.com/MaskRay/ccls/wiki
+.PHONY: bear
+bear: clean
+	bear -o $(top_srcdir)/compile_commands.json $(MAKE) $(MAKEFLAGS)

RELEASE-NOTES-4.18.1 → RELEASE-NOTES-4.18.2

@@ -1,9 +1,9 @@
 
  ┌──────────────────────────────┐
- │ Release notes for i3 v4.18.1 │
+ │ Release notes for i3 v4.18.2 │
  └──────────────────────────────┘
 
-This is i3 v4.18.1. This version is considered stable. All users of i3 are
+This is i3 v4.18.2. This version is considered stable. All users of i3 are
 strongly encouraged to upgrade.
 
 This is a bugfix release for v4.18.
@@ -12,21 +12,17 @@ This is a bugfix release for v4.18.
  │ Bugfixes                   │
  └────────────────────────────┘
 
-  • Move parent nodes in scratchpad correctly
-  • i3bar: Call cont_child() more liberally
-  • Fix load_layout crash when floating node doesn't have CT_FLOATING_CON parent
-  • Fix SEGFAULT when i3bar receives invalid input
-  • Revert "floating_reposition: avoid extra tree_render"
-  • Call tree_render if floating move changes workspace
-  • Update EWMH properties on workspace move
-  • cmd_focus_sibling: Fix crash on workspace level
+  • 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
 
  ┌────────────────────────────┐
  │ Thanks!                    │
  └────────────────────────────┘
 
 Thanks for testing, bugfixes, discussions and everything I forgot go out to:
 
-  Heman Gandhi, Orestis Floros
+  Orestis Floros
 
--- Michael Stapelberg, 2020-04-22
+-- Michael Stapelberg, 2020-07-26