From 90c24c3a2862534d583b4d7a03326f1df22e8bf4 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Jun 2017 17:55:56 +0200 Subject: [PATCH 1/4] update I3LOCK_VERSION (forgotten at release time) --- I3LOCK_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION index 4d97839..5ed7db2 100644 --- a/I3LOCK_VERSION +++ b/I3LOCK_VERSION @@ -1 +1 @@ -2.8-non-git +2.9-non-git From a0abccf8f362c864b4e46251684bf9c2c33ce168 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Jun 2017 17:56:05 +0200 Subject: [PATCH 2/4] Makefile: fix I3LOCK_VERSION replacement fixes #129 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3acb272..0173ea7 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ FILES:=$(FILES:.c=.o) ifeq ($(wildcard .git),) # not in git repository VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1) - I3LOCK_VERSION := '$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)' + I3LOCK_VERSION:='$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)' else VERSION:=$(shell git describe --tags --abbrev=0) I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" @@ -62,6 +62,6 @@ dist: clean [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2 mkdir i3lock-${VERSION} cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} - sed -e 's/^I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile + sed -e 's/^\s*I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION} rm -rf i3lock-${VERSION} From 10416e270bc258886dfe403198802fb455df35b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Tue, 20 Jun 2017 09:53:42 +0200 Subject: [PATCH 3/4] Revert "Fix covering of composited notifications (#96)" (#133) This reverts commit 80d4452ec680bcb0e57418f69d44d88ded82047c. fixes #130 --- .travis.yml | 1 - Makefile | 5 +++-- README.md | 1 - xcb.c | 28 ++-------------------------- 4 files changed, 5 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67f7558..5129c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ addons: - libev-dev - libxcb-xinerama0-dev - libxcb-xkb-dev - - libxcb-composite0-dev before_install: - "echo 'APT::Default-Release \"trusty\";' | sudo tee /etc/apt/apt.conf.d/default-release" - "echo 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' | sudo tee /etc/apt/sources.list.d/wily.list" diff --git a/Makefile b/Makefile index 0173ea7..8470e09 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,9 @@ CFLAGS += -std=c99 CFLAGS += -pipe CFLAGS += -Wall CPPFLAGS += -D_GNU_SOURCE -CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) -LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) +CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) +LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) +LIBS += -lpam LIBS += -lev LIBS += -lm diff --git a/README.md b/README.md index fc486b2..352f460 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ Requirements - libxcb-util - libpam-dev - libcairo-dev -- libxcb-composite0 - libxcb-xinerama - libev - libx11-dev diff --git a/xcb.c b/xcb.c index 078ddb9..d842310 100644 --- a/xcb.c +++ b/xcb.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -107,29 +106,6 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c uint32_t mask = 0; uint32_t values[3]; xcb_window_t win = xcb_generate_id(conn); - xcb_window_t parent_win = scr->root; - - /* Check whether the composite extension is available */ - const xcb_query_extension_reply_t *extension_query = NULL; - xcb_generic_error_t *error = NULL; - xcb_composite_get_overlay_window_cookie_t cookie; - xcb_composite_get_overlay_window_reply_t *composite_reply = NULL; - - extension_query = xcb_get_extension_data(conn, &xcb_composite_id); - if (extension_query && extension_query->present) { - /* When composition is used, we need to use the composite overlay - * window instead of the normal root window to be able to cover - * composited windows */ - cookie = xcb_composite_get_overlay_window(conn, scr->root); - composite_reply = xcb_composite_get_overlay_window_reply(conn, cookie, &error); - - if (!error && composite_reply) { - parent_win = composite_reply->overlay_win; - } - - free(composite_reply); - free(error); - } if (pixmap == XCB_NONE) { mask |= XCB_CW_BACK_PIXEL; @@ -151,8 +127,8 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c xcb_create_window(conn, XCB_COPY_FROM_PARENT, - win, /* the window id */ - parent_win, + win, /* the window id */ + scr->root, /* parent == root */ 0, 0, scr->width_in_pixels, scr->height_in_pixels, /* dimensions */ From 8e6e47fe0ad80b32fbf81cb69774191adb69e862 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 21 Jun 2017 18:18:05 +0200 Subject: [PATCH 4/4] update CHANGELOG and I3LOCK_VERSION --- CHANGELOG | 8 ++++++++ I3LOCK_VERSION | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 827ea00..d2bac95 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +2017-06-21 i3lock 2.9.1 + + • Fix version number mechanism (for --version) + • Revert the fix for composited notifications, as it causes more issues than + it solves: + https://github.com/i3/i3lock/issues/130 + https://github.com/i3/i3lock/issues/128 + 2017-05-26 i3lock 2.9 • i3lock.1: use signal names without SIG prefix diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION index 5ed7db2..913b3d7 100644 --- a/I3LOCK_VERSION +++ b/I3LOCK_VERSION @@ -1 +1 @@ -2.9-non-git +2.9.1-non-git