Skip to content

Commit

Permalink
Merge branch 'richardgv-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
chjj committed Oct 1, 2012
2 parents 7c1838c + 2f0417c commit c7ca345
Show file tree
Hide file tree
Showing 4 changed files with 325 additions and 128 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ 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

Expand Down
24 changes: 13 additions & 11 deletions compton.sample.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ shadow = true;
no-dnd-shadow = true;
no-dock-shadow = true;
clear-shadow = true;
shadow-radius = 7
shadow-offset-x = -7
shadow-offset-y = -7
# shadow-opacity = 0.7
# shadow-red = 0.0
# shadow-green = 0.0
# shadow-blue = 0.0
shadow-radius = 7;
shadow-offset-x = -7;
shadow-offset-y = -7;
# shadow-opacity = 0.7;
# shadow-red = 0.0;
# shadow-green = 0.0;
# shadow-blue = 0.0;
shadow-exclude = [ "n:e:Notification" ];
# shadow-exclude = "n:e:Notification";
shadow-ignore-shaped = true;

# Opacity
menu-opacity = 0.8;
Expand All @@ -21,17 +22,18 @@ inactive-opacity-override = true;

# Fading
fading = true;
# fade-delta = 30
fade-in-step = 0.03
fade-out-step = 0.03
# fade-delta = 30;
fade-in-step = 0.03;
fade-out-step = 0.03;
# no-fading-openclose = true;

# Other
mark-wmwin-focused = true;
mark-ovredir-focused = true;
detect-rounded-corners = true;

# Window type settings
wintypes:
{
tooltip = { fade = true; shadow = false; opacity = 0.75; };
}
};
Loading

0 comments on commit c7ca345

Please sign in to comment.