revert to c7ca345

.gitignore

@@ -1,5 +1,6 @@
-# Build files
 .deps
+Makefile
+Makefile.in
 aclocal.m4
 autom4te.cache
 config.h
@@ -13,26 +14,14 @@ missing
 stamp-h1
 compton
 *.o
-build/
-
-# CMake files
-compton-*.deb
-compton-*.rpm
-compton-*.tar.bz2
-release/
-_CPack_Packages/
-CMakeCache.txt
-CMakeFiles/
-*.cmake
-install_manifest.txt
-
+*~
+core
 
 # Vim files
 .*.sw[a-z]
-*~
 
-# Misc files
-core
+# oprofile files
 oprofile_data
+
+# clang files
 compton.plist
-callgrind.out.*

Makefile

@@ -4,48 +4,20 @@ PREFIX ?= /usr
 BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/share/man/man1
 
-PACKAGES = x11 xcomposite xfixes xdamage xrender xext xrandr
-LIBS = -lm -lrt
-INCS =
-
-# Parse configuration flags
-CFG =
-
-ifeq "$(NO_LIBCONFIG)" ""
-	CFG += -DCONFIG_LIBCONFIG
-	PACKAGES += libconfig
-
-	# libconfig-1.3* does not define LIBCONFIG_VER* macros, so we use
-	# pkg-config to determine its version here
-	CFG += $(shell pkg-config --atleast-version=1.4 libconfig || echo '-DCONFIG_LIBCONFIG_LEGACY')
-endif
-
-ifeq "$(NO_REGEX_PCRE)" ""
-	CFG += -DCONFIG_REGEX_PCRE
-	LIBS += $(shell pcre-config --libs)
-	INCS += $(shell pcre-config --cflags)
-	ifeq "$(NO_REGEX_PCRE_JIT)" ""
-		CFG += -DCONFIG_REGEX_PCRE_JIT
-	endif
-endif
-
-ifeq "$(NO_VSYNC_DRM)" ""
-	CFG += -DCONFIG_VSYNC_DRM
-endif
-
-ifeq "$(NO_VSYNC_OPENGL)" ""
-	CFG += -DCONFIG_VSYNC_OPENGL
-	LIBS += -lGL
-endif
-
-CFLAGS ?= -DNDEBUG
-CFLAGS += $(CFG)
-
-LIBS += $(shell pkg-config --libs $(PACKAGES))
-INCS += $(shell pkg-config --cflags $(PACKAGES))
+PACKAGES = x11 xcomposite xfixes xdamage xrender xext libconfig
+LIBS = $(shell pkg-config --libs $(PACKAGES)) -lm
+LIBS += $(shell pcre-config --libs)
+INCS = $(shell pkg-config --cflags $(PACKAGES))
+INCS += $(shell pcre-config --cflags)
 CFLAGS += -Wall -std=c99
 OBJS = compton.o
 
+CFG ?= -DCONFIG_LIBCONFIG -DCONFIG_REGEX_PCRE -DCONFIG_REGEX_PCRE_JIT
+# libconfig-1.3* does not define LIBCONFIG_VER* macros, so we use pkg-config
+# to determine its version here
+CFG += $(shell pkg-config --atleast-version=1.4 libconfig || echo '-DCONFIG_LIBCONFIG_LEGACY')
+CFLAGS += $(CFG)
+
 %.o: src/%.c src/%.h
 	$(CC) $(CFLAGS) $(INCS) -c src/$*.c
 

README.md

@@ -45,16 +45,13 @@ __R__ for runtime
 * libxfixes (B,R)
 * libXext (B,R)
 * libxrender (B,R)
-* libXrandr (B,R)
 * pkg-config (B)
 * make (B)
 * xproto / x11proto (B)
 * bash (R)
 * xprop,xwininfo / x11-utils (R)
 * libpcre (B,R) (Will probably be made optional soon)
 * libconfig (B,R) (Will probably be made optional soon)
-* libdrm (B) (Will probably be made optional soon)
-* libGL (B,R) (Will probably be made optional soon)
 
 To build, make sure you have the above dependencies:
 

compton.sample.conf

@@ -18,8 +18,7 @@ shadow-ignore-shaped = true;
 menu-opacity = 0.8;
 inactive-opacity = 0.8;
 frame-opacity = 0.7;
-inactive-opacity-override = false;
-alpha-step = 0.06;
+inactive-opacity-override = true;
 
 # Fading
 fading = true;
@@ -32,8 +31,6 @@ fade-out-step = 0.03;
 mark-wmwin-focused = true;
 mark-ovredir-focused = true;
 detect-rounded-corners = true;
-detect-client-opacity = false;
-refresh-rate = 0;
 
 # Window type settings
 wintypes: