From e46aaf758dc97cc56b5bd21aa314781fc6c92d33 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 2 Jun 2007 05:45:58 +0000
Subject: [PATCH] update configure to produce a working Makefile, fix clicking
 tasks not activating (lol?)

---
 configure | 72 +++++++++++++++++++++++++++----------------------------
 rspanel.c |  4 +++-
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/configure b/configure
index 9f5b290..5cd8921 100755
--- a/configure
+++ b/configure
@@ -2,63 +2,54 @@
 
 PROGNAME=rspanel
 
-echo -n "checking for X11 path... "
-if test "`uname`" = "SunOS"; then
-	X11_PATH="/usr/X11"
-	LDFLAGS="$LDFLAGS -L/usr/X/lib"
-	CFLAGS="$CFLAGS I/usr/include/X11"
+echo -n "checking for libX11"
+if pkg-config --exists x11; then
+  echo yes
+  CFLAGS="$CFLAGS `pkg-config --cflags x11`"
+  LDFLAGS="$LDFLAGS `pkg-config --libs x11`"
 else
-	X11_PATH="/usr/X11R6"
-fi
-if test -e "$X11_PATH"; then
-	echo $X11_PATH
-else
-	echo failed.
-	echo
-	echo I can\'t find $X11_PATH :\(
-	exit 1
+  echo no
+  echo Cannot find libX11, aborting.
+  exit 1
 fi
 
-CFLAGS="$CFLAGS -I$X11_PATH/include"
-LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
-
 if test "_$CC" = "_"; then
 	CC="cc"
 fi
 
-echo -n "checking for X11/Xlib.h... "
-if test -e "$X11_PATH/include/X11/Xlib.h"; then
-	echo yes
-else
-	echo no
-	echo
-	echo Cannot find Xlib header\, aborting.
-	echo You might need to install XFree86-devel.
-	exit 1
-fi
-
-echo -n "checking for X11/xpm.h... "
+echo -n "checking for libXpm... "
 xpm=no
-if test -e "$X11_PATH/include/X11/xpm.h"; then
+if pkg-config --exists xpm; then
 	echo yes
-	LDFLAGS="$LDFLAGS -lXpm"
-	CFLAGS="$CFLAGS -DHAVE_XPM"
+	LDFLAGS="$LDFLAGS `pkg-config --libs xpm`"
+	CFLAGS="$CFLAGS -DHAVE_XPM `pkg-config --cflags xpm`"
 	xpm=yes
 else
 	echo no
 fi
 
-echo -n "checking for X11/Xft/Xft.h... "
+echo -n "checking for libXft "
 xft=no
-if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
+if pkg-config --exists xft; then
 	echo yes
-	LDFLAGS="$LDFLAGS -lXft"
-	CFLAGS="$CFLAGS -DXFT"
+	LDFLAGS="$LDFLAGS `pkg-config --libs xft`"
+	CFLAGS="$CFLAGS -DXFT `pkg-config --cflags xft`"
 	xft=yes
 else
 	echo no
 fi
 
+echo -n "checking for Pango..."
+pango=no
+if pkg-config --exists pango pangoxft; then
+  echo yes
+  LDFLAGS="$LDFLAGS `pkg-config --libs pango pangoxft`"
+  CFLAGS="$CFLAGS -DPANGO `pkg-config --cflags pango pangoxft`"
+  pango=yes
+else
+  echo no
+fi
+
 echo -n "checking for Linux... "
 if test "`uname`" = "Linux"; then
 	CFLAGS="$CFLAGS -DNOSTDLIB -nostdlib"
@@ -67,6 +58,14 @@ else
 	echo no
 fi
 
+echo -n "checking for Mikachu... "
+if test "_`hostname`" = "_fartmonstret" -a "_`id -nu`" = "_mikaelh"; then
+  echo yes
+  CFLAGS="$CFLAGS -DMIKACHU"
+else
+  echo no
+fi
+
 echo -n "creating Makefile... "
 
 echo CC="$CC" > Makefile
@@ -85,6 +84,7 @@ echo \	install $\(PROGNAME\) /usr/local/bin >> Makefile
 
 echo done
 echo
+echo Pango ................... : $pango
 echo AntiAliased XFT text .... : $xft
 echo LibXpm default icon ..... : $xpm
 echo
diff --git a/rspanel.c b/rspanel.c
index 5f68506..b90ac3b 100644
--- a/rspanel.c
+++ b/rspanel.c
@@ -493,6 +493,8 @@ Window gui_create_taskbar(void)
 #ifdef XFT
     xftdraw = XftDrawCreate(dd, win, DefaultVisual(dd, scr_screen),
                             DefaultColormap(dd, scr_screen));
+#endif
+#ifdef PANGO
     g_type_init();
 #endif
 
@@ -1023,7 +1025,7 @@ void handle_press(int x, int y, int button, Time time)
             if (x > tk->pos_x && x < tk->pos_x + tk->width) {
                 switch (button) {
                     case 1:
-                        if (tk->iconified && tk->shaded)
+//                        if (tk->iconified && tk->shaded)
 //                            ob_action(tk->win, "unshade");
 // probably not needed        netwm_action(tk->win, _NET_WM_STATE_SHADED, time, REMOVE);
                         //ob_action(tk->win, "activate");
-- 
2.39.2