aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--configure.ac20
-rw-r--r--doc/MBWM2-Overview.xml32
-rw-r--r--matchbox/core/mb-wm-types.h2
-rw-r--r--matchbox/mb-wm-config.h.in4
-rw-r--r--matchbox/theme-engines/Makefile.am7
-rw-r--r--matchbox/theme-engines/mb-wm-theme.c12
-rw-r--r--matchbox/theme-engines/mb-wm-theme.h4
8 files changed, 46 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ae7191..7c687b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,36 @@
+2008-03-06 Robert Bragg <bob@o-hand.com>
+
+ * configure.ac
+ * doc/MBWM2-Overview.xml
+ * matchbox/core/mb-wm-types.h
+ * matchbox/mb-wm-config.h.in
+ * matchbox/theme-engines/Makefile.am
+ * matchbox/theme-engines/mb-wm-theme-cairo.c
+ * matchbox/theme-engines/mb-wm-theme-cairo.h
+ * matchbox/theme-engines/mb-wm-theme.c
+ * matchbox/theme-engines/mb-wm-theme.h
+ Removes all references to the cairo theme engine
+
2008-03-06 Tomas Frydrych <tf@o-hand.com>
* matchbox/theme-engines/mb-wm-theme-png.c:
* matchbox/theme-engines/mb-wm-theme-png.h:
Optionally, use Pango to render text.
+2008-03-06 Robert Bragg <bob@o-hand.com>
+
+ * Changelog
+ Adds missing changelog entries
+
+2008-03-06 Robert Bragg <bob@o-hand.com>
+
+ * configure.ac
+ makes a start on tidying up configure.ac:
+ - some bits disabled by default
+ - adds a new --enable-pango option that will be optionally used by the
+ png theme engine
+ - adds a new --enable-matchbox-remote option
+
2008-03-05 Tomas Frydrych <tf@o-hand.com>
* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:
diff --git a/configure.ac b/configure.ac
index 93b53bd..9283612 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,6 @@ AC_CHECK_FUNCS([memset strdup strncasecmp])
needed_pkgs="x11 "
-AC_ARG_ENABLE(cairo-theme,
- [ --enable-cairo-theme Disable Cairo graphics rendering support],
- [use_cairo=$enableval], [use_cairo=no])
AC_ARG_ENABLE(png-theme,
[ --enable-png-theme Enable PNG-based theme],
@@ -79,9 +76,6 @@ AC_ARG_ENABLE(matchbox-remote,
[ --enable-matchbox-remote Enable matchbox remote control utility],
[matchbox_remote=$enableval], [matchbox_remote=no])
-if test "x$use_cairo" = "xyes"; then
- needed_pkgs="$needed_pkgs pangocairo "
-fi
if test "x$use_pango" = "xyes"; then
needed_pkgs="$needed_pkgs pangoxft "
@@ -124,13 +118,6 @@ PKG_CHECK_MODULES(MBWM, $needed_pkgs)
MBWM2_PKGREQUIRES="$needed_pkgs"
AC_SUBST(MBWM2_PKGREQUIRES)
-USE_CAIRO=0
-AM_CONDITIONAL(THEME_CAIRO, [test "x$use_cairo" = "xyes"])
-if test "$use_cairo" = yes; then
- USE_CAIRO=1
-fi
-AC_SUBST(USE_CAIRO)
-
USE_PANGO=0
if test "$use_pango" = yes; then
USE_PANGO=1
@@ -145,10 +132,10 @@ if test "$png_theme" = yes; then
fi
AC_SUBST(THEME_PNG)
-# only build simple theme if cairo theme disabled
+# only build simple theme if png theme disabled
THEME_SIMPLE=0
-AM_CONDITIONAL(THEME_SIMPLE, [test "x$use_cairo" != "xyes"])
-if test "$use_cairo" != yes; then
+AM_CONDITIONAL(THEME_SIMPLE, [test "x$use_png" != "xyes"])
+if test "$use_png" != yes; then
THEME_SIMPLE=1
fi
AC_SUBST(THEME_SIMPLE)
@@ -279,7 +266,6 @@ echo "
Xcursor : ${have_xcursor}
Themes:
- Cairo theme : ${use_cairo}
PNG theme : ${png_theme}
GTK integration : ${use_gtk}
Pango integration : ${use_pango}
diff --git a/doc/MBWM2-Overview.xml b/doc/MBWM2-Overview.xml
index 808beec..16756c9 100644
--- a/doc/MBWM2-Overview.xml
+++ b/doc/MBWM2-Overview.xml
@@ -283,18 +283,10 @@
<itemizedlist>
<listitem>
- <para>MBWMThemeCairo; this is the default engine that uses the <ulink
- url='http://cairographics.org/'>Cairo</ulink> graphics library to draw
- window decorations. It allows for simple effects, such as gradients on
- the decors.
- </para>
- </listitem>
-
- <listitem>
- <para>MBWMThemeSimple; this is an alternative default engine that uses
- only basic Xlib API for drawing the window decors. It is build when
- the Cairo theme engine is disabled with --disable-cairo-theme
- configure option.
+ <para>MBWMThemeSimple; this is the default engine that uses
+ only basic Xlib API for drawing the window decors. It is built if
+ the PNG theme engine is not enabled via the --enable-png-theme
+ configure option.
</para>
</listitem>
@@ -425,13 +417,13 @@
<title>Theming Matchbox Window Manager II</title>
<para>The MBWM II theme consists of an XML description and, in case of a
- PNG-based theme, the theme image. There are three distinct theme engines
- provided: a simple engine, using back Xlib drawing primites, an engine
- using cairo library, and PNG-based engine.
+ PNG-based theme, the theme image. There are two distinct theme engines
+ provided: a simple engine, using back Xlib drawing primites, and a PNG-based
+ engine.
</para>
- <para>The simple and cairo engines are suitable for simple themes with
- minimal frills. The PNG engine, on the other hand, facilitates the creation
+ <para>The simple engine is suitable for simple themes with minimal frills.
+ The PNG engine, on the other hand, facilitates the creation
of visually impressive and complex themes; it is based on single template
image, which contains all the elements the theme consists of, with the
location of each element is described in the xml description file.
@@ -646,9 +638,9 @@
</listitem>
<listitem>
- <para>clr-bg2: secondary background colour. This is used by the
- cairo-based theme engine to create gradiented background; ignored
- by other theme engines.
+ <para>clr-bg2: secondary background colour. This could be used by
+ a theme engine to create gradiented background; ignored by current
+ theme engines.
</para>
</listitem>
diff --git a/matchbox/core/mb-wm-types.h b/matchbox/core/mb-wm-types.h
index 5231e3d..68f4980 100644
--- a/matchbox/core/mb-wm-types.h
+++ b/matchbox/core/mb-wm-types.h
@@ -91,8 +91,6 @@ typedef struct MBWMClientWindow MBWMClientWindow;
typedef struct MBWMClientWindowClass MBWMClientWindowClass;
typedef struct MBWMTheme MBWMTheme;
typedef struct MBWMThemeClass MBWMThemeClass;
-typedef struct MBWMThemeCairo MBWMThemeCairo;
-typedef struct MBWMThemeCairoClass MBWMThemeCairoClass;
typedef struct MBWMThemePng MBWMThemePng;
typedef struct MBWMThemePngClass MBWMThemePngClass;
typedef struct MBWMThemeSimple MBWMThemeSimple;
diff --git a/matchbox/mb-wm-config.h.in b/matchbox/mb-wm-config.h.in
index 89cc34c..1ca5593 100644
--- a/matchbox/mb-wm-config.h.in
+++ b/matchbox/mb-wm-config.h.in
@@ -8,8 +8,8 @@
/* Build PNG-image based theme engine */
#define THEME_PNG @THEME_PNG@
-/* Use cairo for theme rendering */
-#define USE_CAIRO @USE_CAIRO@
+/* Use pango for text layout */
+#define USE_PANGO @USE_PANGO@
/* Use pango for text layout */
#define USE_PANGO @USE_PANGO@
diff --git a/matchbox/theme-engines/Makefile.am b/matchbox/theme-engines/Makefile.am
index 2fe0dac..8c340ec 100644
--- a/matchbox/theme-engines/Makefile.am
+++ b/matchbox/theme-engines/Makefile.am
@@ -1,6 +1,3 @@
-if THEME_CAIRO
-CAIRO_SRC = mb-wm-theme-cairo.c mb-wm-theme-cairo.h
-endif
if THEME_SIMPLE
SIMPLE_SRC = mb-wm-theme-simple.c mb-wm-theme-simple.h
@@ -17,11 +14,11 @@ pkgincludedir = $(includedir)/@MBWM2_INCDIR@/theme-engines
if ENABLE_LIBMATCHBOX
pkginclude_HEADERS = *.h
noinst_LTLIBRARIES = libmb-theme.la
-libmb_theme_la_SOURCES = $(COMMON_SRC) $(CAIRO_SRC) $(SIMPLE_SRC) $(PNG_SRC)
+libmb_theme_la_SOURCES = $(COMMON_SRC) $(SIMPLE_SRC) $(PNG_SRC)
libmb_theme_la_CFLAGS =
else
noinst_LIBRARIES = libmb-theme.a
-libmb_theme_a_SOURCES = $(COMMON_SRC) $(CAIRO_SRC) $(SIMPLE_SRC) $(PNG_SRC)
+libmb_theme_a_SOURCES = $(COMMON_SRC) $(SIMPLE_SRC) $(PNG_SRC)
endif
INCLUDES = @MBWM_INCS@ @MBWM_CFLAGS@ -DDATADIR=\"$(datadir)\"
diff --git a/matchbox/theme-engines/mb-wm-theme.c b/matchbox/theme-engines/mb-wm-theme.c
index 4753c29..76ac219 100644
--- a/matchbox/theme-engines/mb-wm-theme.c
+++ b/matchbox/theme-engines/mb-wm-theme.c
@@ -21,11 +21,7 @@
#include "mb-wm-theme.h"
#include "mb-wm-theme-xml.h"
-#if USE_CAIRO
-#include "mb-wm-theme-cairo.h"
-#else
#include "mb-wm-theme-simple.h"
-#endif
#include <sys/stat.h>
#include <expat.h>
@@ -503,11 +499,7 @@ mb_wm_theme_new (MBWindowManager * wm, const char * theme_path)
if (!theme)
{
theme = MB_WM_THEME (mb_wm_object_new (
-#if USE_CAIRO
- MB_WM_TYPE_THEME_CAIRO,
-#else
MB_WM_TYPE_THEME_SIMPLE,
-#endif
MBWMObjectPropWm, wm,
MBWMObjectPropThemeXmlClients, xml_clients,
MBWMObjectPropThemeColorLowlight, &clr_lowlight,
@@ -824,11 +816,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr)
else if (!strcmp (*p, "engine-type"))
{
if (!strcmp (*(p+1), "default"))
-#if USE_CAIRO
- exd->theme_type = MB_WM_TYPE_THEME_CAIRO;
-#else
exd->theme_type = MB_WM_TYPE_THEME_SIMPLE;
-#endif
#if THEME_PNG
else if (!strcmp (*(p+1), "png"))
exd->theme_type = MB_WM_TYPE_THEME_PNG;
diff --git a/matchbox/theme-engines/mb-wm-theme.h b/matchbox/theme-engines/mb-wm-theme.h
index fc9b03a..66fb625 100644
--- a/matchbox/theme-engines/mb-wm-theme.h
+++ b/matchbox/theme-engines/mb-wm-theme.h
@@ -32,10 +32,6 @@
#define MB_WM_THEME_SIMPLE_CLASS(c) ((MBWMThemeSimpleClass*)(c))
#define MB_WM_TYPE_THEME_SIMPLE (mb_wm_theme_simple_class_type ())
-#define MB_WM_THEME_CAIRO(c) ((MBWMThemeCairo*)(c))
-#define MB_WM_THEME_CAIRO_CLASS(c) ((MBWMThemeCairoClass*)(c))
-#define MB_WM_TYPE_THEME_CAIRO (mb_wm_theme_cairo_class_type ())
-
#define MB_WM_THEME_PNG(c) ((MBWMThemePng*)(c))
#define MB_WM_THEME_PNG_CLASS(c) ((MBWMThemePngClass*)(c))
#define MB_WM_TYPE_THEME_PNG (mb_wm_theme_png_class_type ())
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-25 15:30:33 +0000