upstream stuff

.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"

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

I3LOCK_VERSION

@@ -1 +1 @@
-2.8-non-git
+2.9.1-non-git

Makefile

@@ -1,4 +1,5 @@
 TOPDIR=$(shell pwd)
+UNAME=$(shell uname)
 
 INSTALL=install
 PREFIX=/usr
@@ -36,7 +37,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))"
@@ -75,6 +76,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}

README.md

@@ -36,7 +36,7 @@ Many little improvements have been made to i3lock over time:
      - `-S, --screen` -- specifies which display to draw the unlock indicator on
      - `-k, --clock` -- enables the clock display.
 		 - `--indicator` -- forces the indicator to always show, even if there's no activity.
-		 - `--no-composite` -- disables checking for compositors and trying to grab the compositor window, since that causes issues with some compositors.
+		 - `--composite` -- enables checking for compositors and trying to grab the compositor window, since that causes issues with some compositors.
 		    - **NOTE**: This can potentially allow sensitive information to display over the screen locker, so take care when you use this option.
      - `-B=sigma, --blur` -- enables Gaussian blur. Sigma is the blur radius.
 	      - Note: You can still composite images over the blur (but still under the indicator) with -i.

i3lock.1

@@ -126,8 +126,8 @@ Images may still be overlaid over the blurred screenshot.
 Forces the indicator to always be visible, instead of only showing on activity.
 
 .TP
-.B \-\-no\-composite
+.B \-\-composite
-Some compositors have problems with i3lock trying to render over them. If you're having graphical problems, try this arg.
+Some compositors have problems with i3lock trying to render over them, so this argument is disabled by default. However, some will work properly with it, so it's been left enabled.
 
 .TP
 .B \-\-insidevercolor=rrggbbaa

i3lock.c

@@ -81,8 +81,8 @@ bool show_clock = false;
 bool show_indicator = false;
 float refresh_rate = 1.0;
 
-/* there's some issues with compositing currently. Let's supply an arg to disable it. */
+/* there's some issues with compositing - upstream removed support for this, but we'll allow people to supply an arg to enable it */ 
-bool composite = true;
+bool composite = false;
 /* time formatter strings for date/time
     I picked 32-length char arrays because some people might want really funky time formatters.
     Who am I to judge?
@@ -927,7 +927,7 @@ int main(int argc, char *argv[]) {
         {"clock", no_argument, NULL, 'k'},
         {"indicator", no_argument, NULL, 0},
         {"refresh-rate", required_argument, NULL, 0},
-        {"no-composite", no_argument, NULL, 0},
+        {"composite", no_argument, NULL, 0},
         
         {"timestr", required_argument, NULL, 0},
         {"datestr", required_argument, NULL, 0},
@@ -1236,8 +1236,8 @@ int main(int argc, char *argv[]) {
                         refresh_rate = 1.0;
                     }
                 }
-                else if (strcmp(longopts[optind].name, "no-composite") == 0) {
+                else if (strcmp(longopts[optind].name, "composite") == 0) {
-                    composite = false;
+                    composite = true;
                 }
                 else if (strcmp(longopts[optind].name, "veriftext") == 0) {
                     verif_text = optarg;