@@ -15,6 +15,7 @@ help() { echo -e " --ugly enable ugly verbose mode" echo -e " --with-ev implement event loop with libev" echo -e " --with-event implement event loop with libevent" + echo -e " --with-composite enable compositing mode (EXPERIMENTAL)" } TIMERFDMSG="\n***************************************************************************\nWARNING! Probably you have an old glibc library and/or an old linux kernel,\nyou need glibc >= 2.8 and the linux kernel >= 2.6.22 to compile this panel.\n***************************************************************************\n" @@ -126,6 +127,7 @@ OPTIMIZE=0 UGLY=0 WITH_EV=0 WITH_EVENT=0 +WITH_COMPOSITE=0 while [ $# -gt 0 ]; do case $1 in @@ -154,6 +156,9 @@ while [ $# -gt 0 ]; do --with-event) WITH_EVENT=1 ;; + --with-composite) + WITH_COMPOSITE=1 + ;; *) echo "unknown option $1" help @@ -176,8 +181,13 @@ else fi check_pkg_version imlib2 1.4.0 check_pkg x11 -check_pkg xrender -check_pkg xcomposite + +if [ $WITH_COMPOSITE -eq 1 ]; then + check_pkg xrender + check_pkg xcomposite + CFLAGS="$CFLAGS -DWITH_COMPOSITE" +fi + check_pkg fontconfig append_libs_and_cflags @@ -185,6 +195,7 @@ if [ $MEMDEBUG -eq 1 ]; then CFLAGS="$CFLAGS -DMEMDEBUG" fi + if [ $WITH_EV -eq 1 ]; then CFLAGS="$CFLAGS -DWITH_EV" LIBS="$LIBS -lev" configure @@ -13,7 +13,13 @@ #include <fcntl.h> #include <dirent.h> #include <X11/Xutil.h> -#include <X11/extensions/Xcomposite.h> + +/* composite */ +#if defined(WITH_COMPOSITE) + #include <X11/extensions/Xcomposite.h> +#endif + +/* event loop */ #if defined(WITH_EV) #include <ev.h> #elif defined(WITH_EVENT) @@ -21,6 +27,7 @@ #else #include <sys/timerfd.h> #endif + #include "logger.h" #include "theme.h" #include "render.h" @@ -324,6 +331,7 @@ static char *alloc_window_name(Window win) creating panel window **************************************************************************/ +#ifdef WITH_COMPOSITE static Visual *find_argb_visual() { XVisualInfo *xvi; @@ -387,6 +395,7 @@ static void setup_composite() X.amask = CWBackPixel | CWColormap | CWOverrideRedirect | CWBorderPixel; X.depth = 32; } +#endif static Window create_panel_window(uint placement, int alignment, int h, int w, int hover) { @@ -1229,8 +1238,10 @@ validation: LOG_ERROR("invalid theme: %s", theme); /* setup composite if necessary */ +#ifdef WITH_COMPOSITE if (P.theme->use_composite) setup_composite(); +#endif /* create panel window */ P.width = X.wa_w; @@ -1244,6 +1255,7 @@ validation: P.width, P.theme->height_override); +#ifdef WITH_COMPOSITE if (P.theme->use_composite) XCompositeRedirectSubwindows(X.display, P.win, CompositeRedirectAutomatic); @@ -1251,6 +1263,7 @@ validation: LOG_WARNING("tray cannot be used with composite mode enabled"); theme_remove_element(P.theme, 't'); } +#endif /* init tray if needed */ if (is_element_in_theme(P.theme, 't')) src/bmpanel.c @@ -7,7 +7,12 @@ #include <X11/Xlib.h> #include <X11/Xatom.h> -#include <X11/extensions/Xrender.h> + +/* composite */ +#if defined(WITH_COMPOSITE) + #include <X11/extensions/Xrender.h> +#endif + #include <Imlib2.h> #include "common.h" src/bmpanel.h @@ -25,15 +25,17 @@ static Imlib_Image bg; static Pixmap *rootpmap; static Pixmap currootpmap; -/* composite */ static Imlib_Image bbcolor; + +/* composite */ +#ifdef WITH_COMPOSITE static Imlib_Image bbalpha; static Pixmap pixcolor; static Pixmap pixalpha; static Picture piccolor; static Picture picalpha; - static Picture rootpic; +#endif static Display *bbdpy; static Visual *bbvis; @@ -624,6 +626,7 @@ void init_render(struct xinfo *X, struct panel *P) imlib_context_set_visual(bbvis); imlib_context_set_colormap(bbcm); +#ifdef WITH_COMPOSITE if (P->theme->use_composite) { XRenderPictFormat *fmt = XRenderFindStandardFormat(bbdpy, PictStandardARGB32); bbalpha = imlib_create_image(bbwidth, bbheight); @@ -638,7 +641,9 @@ void init_render(struct xinfo *X, struct panel *P) pwin.subwindow_mode = IncludeInferiors; rootpic = XRenderCreatePicture(bbdpy, bbwin, XRenderFindVisualFormat(bbdpy, bbvis), CPSubwindowMode, &pwin); - } else if (*rootpmap) { + } else +#endif + if (*rootpmap) { update_bg(); } else { set_bg(); @@ -655,6 +660,7 @@ void shutdown_render() imlib_context_set_image(bbcolor); imlib_free_image(); +#ifdef WITH_COMPOSITE if (theme->use_composite) { imlib_context_set_image(bbalpha); imlib_free_image(); @@ -664,7 +670,9 @@ void shutdown_render() XRenderFreePicture(bbdpy, picalpha); XFreePixmap(bbdpy, pixcolor); XFreePixmap(bbdpy, pixalpha); - } else if (bg) { + } else +#endif + if (bg) { imlib_context_set_image(bg); imlib_free_image(); } @@ -780,6 +788,7 @@ void render_panel(struct panel *p) void render_present() { update_bg(); +#ifdef WITH_COMPOSITE if (theme->use_composite) { /* * Because XRender can't do directly SRCc * SRCa + DSTc * (1 - SRCa) blending, @@ -814,7 +823,9 @@ void render_present() rootpic, 0, 0, 0, 0, 0, 0, bbwidth, bbheight); - } else if (*rootpmap) { + } else +#endif + if (*rootpmap) { imlib_context_set_image(bbcolor); imlib_blend_image_onto_image(bg,0,0,0,bbwidth,bbheight,0,0,bbwidth,bbheight); imlib_context_set_blend(1); src/render.c 04aecde13ebbdb5f3d896c6d723201a55d566585 nsf no.smile.face@gmail.com http://github.com/nsf/bmpanel/commit/65542fa5afb8ab224a3a8c60a15bc2d830220879 65542fa5afb8ab224a3a8c60a15bc2d830220879 2008-10-24T01:42:54-07:00 2008-10-24T01:42:54-07:00 Make composite non-default experimental feature. ./configure --with-composite - to enable compositing features. Let's face it. The reasons are: - Tray doesn't work with composite mode. - Composite does true transparency, but xshape isn't here, so, this feature is useless. A good screenshot for making impressions on your friends can't be a reason. - Composite requires compositing manager. And personally I think that it's not the age of compositing yet. Maybe it's about eye-candy. But after rethink of my philosophy for bmpanel, it's definitely about usability and KISS. Panel should be pretty enough and usable enough. Running on bleeding edge was my mistake. Also I have to say, that compositing probably will be removed in future versions. 9d39fed9fe23df68c3ace0b3ce15016d94ea4ef1 nsf no.smile.face@gmail.com