murrine r25 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Fri Mar  7 02:22:11 2008
New Revision: 25
URL: http://svn.gnome.org/viewvc/murrine?rev=25&view=rev

Log:
2008-03-07  Andrea Cimitan  <andrea cimitan gmail com>

	* configure.ac:
	* src/config.h.in:
	* src/murrine_style.c: (murrine_widget_is_rgba),
	(murrine_style_draw_box):
	Added --disable-rgba at the configure,
	renamed --enable-animationtoleft to --enable-animationrtl


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/config.h.in
   trunk/src/murrine_style.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar  7 02:22:11 2008
@@ -16,12 +16,25 @@
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AC_ARG_ENABLE(animation, [  --enable-animation      compile murrine with animation support], [animation=$enableval], 	[animation="no"], )
-AC_ARG_ENABLE(macmenu, [  --enable-macmenu        compile murrine with mac menubar patches], [macmenu=$enableval], 	[macmenu="no"], )
-AC_ARG_ENABLE(animationtoleft, [  --enable-animationtoleft        compile murrine with progressbar animation from right to left], [animationtoleft=$enableval], 	[animationtoleft="no"], )
+AC_ARG_ENABLE(animation,
+              [  --enable-animation      compile murrine with animation support],
+              [animation=$enableval],
+              [animation="no"], )
+AC_ARG_ENABLE(macmenu,
+              [  --enable-macmenu        compile murrine with mac menubar patches],
+              [macmenu=$enableval],
+              [macmenu="no"], )
+AC_ARG_ENABLE(animationrtl,
+              [  --enable-animationrtl   compile murrine with progressbar animation from right to left],
+              [animationrtl=$enableval],
+              [animationrtl="no"], )
+AC_ARG_ENABLE(rgba,
+              [  --disable-rgba          compile murrine without rgba support],
+              [rgba=$enableval],
+              [rgba="yes"], )
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
-                  AC_MSG_ERROR([GTK+-2.8 is required to compile murrine]))
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0,,
+                  AC_MSG_ERROR([GTK+-2.10 is required to compile murrine]))
 
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
@@ -40,8 +53,12 @@
 	AC_DEFINE_UNQUOTED(HAVE_MACMENU, 1, [Defines whether to compile with mac menubar patches])
 fi
 
-if test $animationtoleft = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_ANIMATIONTOLEFT, 1, [Defines whether to compile with progressbar animation from right to left])
+if test $animationrtl = "yes"; then
+	AC_DEFINE_UNQUOTED(HAVE_ANIMATIONRTL, 1, [Defines whether to compile with progressbar animation from right to left])
+fi
+
+if test $rgba = "yes"; then
+	AC_DEFINE_UNQUOTED(HAVE_RGBA, 1, [Defines whether to compile with rgba support])
 fi
 
 AM_CONFIG_HEADER([src/config.h])

Modified: trunk/src/config.h.in
==============================================================================
--- trunk/src/config.h.in	(original)
+++ trunk/src/config.h.in	Fri Mar  7 02:22:11 2008
@@ -4,7 +4,7 @@
 #undef HAVE_ANIMATION
 
 /* Defines whether to compile with progressbar animation from right to left */
-#undef HAVE_ANIMATIONTOLEFT
+#undef HAVE_ANIMATIONRTL
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
@@ -18,6 +18,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Defines whether to compile with rgba support */
+#undef HAVE_RGBA
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -39,6 +42,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Fri Mar  7 02:22:11 2008
@@ -99,9 +99,11 @@
 	GdkScreen *screen = gtk_widget_get_screen (widget);
 	boolean use_rgba = FALSE;
 
+#ifdef HAVE_RGBA
 	if (gdk_screen_is_composited(screen) && gdk_screen_get_rgba_colormap (screen))
 		use_rgba = (gtk_widget_get_colormap (widget) ==
 		            gdk_screen_get_rgba_colormap (screen));
+#endif
 
 	return use_rgba;
 }
@@ -972,7 +974,7 @@
 		/* The x-1 and width+2 are to make the fill cover the left and
 		 * right-hand sides of the trough box */
 
-#ifndef HAVE_ANIMATIONTOLEFT
+#ifndef HAVE_ANIMATIONRTL
 		STYLE_FUNCTION(draw_progressbar_fill) (cr, colors, &params, &progressbar,
 		                                       x-1, y, width+2, height,
 		                                       10 - (int)(elapsed * 10.0) % 10);