diff options
36 files changed, 118 insertions, 60 deletions
@@ -1,6 +1,53 @@ 2008-03-11 Tomas Frydrych <tf@o-hand.com> * configure.ac: + * matchbox/mb-wm-config.h.in: + Added missing MBWM_WANT_DEBUG to mb-wm-config.h. + + * matchbox/core/mb-wm.h: + Ensure mb-wm-config.h is included before all other mbwm includes. + + * matchbox/client-types/mb-wm-client-app.c: + * matchbox/client-types/mb-wm-client-desktop.c: + * matchbox/client-types/mb-wm-client-dialog.c: + * matchbox/client-types/mb-wm-client-input.c: + * matchbox/client-types/mb-wm-client-menu.c: + * matchbox/client-types/mb-wm-client-note.c: + * matchbox/client-types/mb-wm-client-override.c: + * matchbox/client-types/mb-wm-client-panel.c: + * matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: + * matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c: + * matchbox/comp-mgr/mb-wm-comp-mgr.c: + * matchbox/core/mb-window-manager.c: + * matchbox/core/mb-wm-client-base.c: + * matchbox/core/mb-wm-debug.c: + * matchbox/core/mb-wm-debug.h: + * matchbox/core/mb-wm-decor.c: + * matchbox/core/mb-wm-layout.c: + * matchbox/core/mb-wm-macros.h: + * matchbox/core/mb-wm-main-context.c: + * matchbox/core/mb-wm-object.c: + * matchbox/core/mb-wm-object.h: + * matchbox/core/mb-wm-root-window.c: + * matchbox/core/xas.c: + * matchbox/managers/maemo/Makefile.am: + * matchbox/managers/maemo/maemo-input.c: + * matchbox/managers/maemo/maemo-window-manager.c: + * matchbox/managers/maemo/maemo-toolbar.c: + * matchbox/managers/maemo/maemo-window-manager.h: + * matchbox/managers/maemo/matchbox-window-manager-2-maemo.c: + * matchbox/managers/simple/matchbox-window-manager-2-simple.c: + * matchbox/theme-engines/mb-wm-theme-png.c: + * matchbox/theme-engines/mb-wm-theme.c: + Replaced #ifdef MBWM_WANT_DEBUG with #if MBWM_WANT_DEBUG. + + * matchbox/managers/maemo/maemo-window-manager.c: + (maemo_window_manager_class_type): + Fixed incorrect object initialization. + +2008-03-11 Tomas Frydrych <tf@o-hand.com> + + * configure.ac: Added libpng to the required packages for libmatchbox2 when building png theme. diff --git a/configure.ac b/configure.ac index e86909f..3280c94 100644 --- a/configure.ac +++ b/configure.ac @@ -148,10 +148,13 @@ IFS="$save_ifs" AC_SUBST(COMPOSITE_MANAGER_DEFINE) +MBWM_WANT_DEBUG=0 if test "x$want_debug" = "xyes"; then - MBWM_DEBUG_CFLAGS="-O0 $MBWM_DEBUG_CFLAGS -DMBWM_WANT_DEBUG" + MBWM_WANT_DEBUG=1 + MBWM_DEBUG_CFLAGS="-O0 $MBWM_DEBUG_CFLAGS" MBWM_DEBUG_LDFLAGS="$MBWM_DEBUG_LDFLAGS -rdynamic" fi +AC_SUBST(MBWM_WANT_DEBUG) USE_GLIB_MAINLOOP=0 if test "x$gmloop" = "xyes"; then diff --git a/matchbox/client-types/mb-wm-client-app.c b/matchbox/client-types/mb-wm-client-app.c index 73e9594..bfd008d 100644 --- a/matchbox/client-types/mb-wm-client-app.c +++ b/matchbox/client-types/mb-wm-client-app.c @@ -31,7 +31,7 @@ mb_wm_client_app_class_init (MBWMObjectClass *klass) client->theme_change = mb_wm_client_app_theme_change; client->stacking_layer = mb_wm_client_app_stacking_layer; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientApp"; #endif } diff --git a/matchbox/client-types/mb-wm-client-desktop.c b/matchbox/client-types/mb-wm-client-desktop.c index 2004831..23e0e0c 100644 --- a/matchbox/client-types/mb-wm-client-desktop.c +++ b/matchbox/client-types/mb-wm-client-desktop.c @@ -30,7 +30,7 @@ mb_wm_client_desktop_class_init (MBWMObjectClass *klass) client->stacking_layer = mb_wm_client_desktop_stacking_layer; client->theme_change = mb_wm_client_desktop_theme_change; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientDesktop"; #endif } diff --git a/matchbox/client-types/mb-wm-client-dialog.c b/matchbox/client-types/mb-wm-client-dialog.c index 903324a..f1852ad 100644 --- a/matchbox/client-types/mb-wm-client-dialog.c +++ b/matchbox/client-types/mb-wm-client-dialog.c @@ -76,7 +76,7 @@ mb_wm_client_dialog_class_init (MBWMObjectClass *klass) client->show = mb_wm_client_dialog_show; client->theme_change = mb_wm_client_dialog_theme_change; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientDialog"; #endif } diff --git a/matchbox/client-types/mb-wm-client-input.c b/matchbox/client-types/mb-wm-client-input.c index 24e871c..521f890 100644 --- a/matchbox/client-types/mb-wm-client-input.c +++ b/matchbox/client-types/mb-wm-client-input.c @@ -36,7 +36,7 @@ mb_wm_client_input_class_init (MBWMObjectClass *klass) client->realize = mb_wm_client_input_realize; client->detransitise = mb_wm_client_input_detransitise; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientInput"; #endif } diff --git a/matchbox/client-types/mb-wm-client-menu.c b/matchbox/client-types/mb-wm-client-menu.c index a6cd20f..7488936 100644 --- a/matchbox/client-types/mb-wm-client-menu.c +++ b/matchbox/client-types/mb-wm-client-menu.c @@ -31,7 +31,7 @@ mb_wm_client_menu_class_init (MBWMObjectClass *klass) client->geometry = mb_wm_client_menu_request_geometry; client->realize = mb_wm_client_menu_realize; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientMenu"; #endif } diff --git a/matchbox/client-types/mb-wm-client-note.c b/matchbox/client-types/mb-wm-client-note.c index f9e3bd7..d0bb770 100644 --- a/matchbox/client-types/mb-wm-client-note.c +++ b/matchbox/client-types/mb-wm-client-note.c @@ -33,7 +33,7 @@ mb_wm_client_note_class_init (MBWMObjectClass *klass) client->client_type = MBWMClientTypeNote; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientNote"; #endif } diff --git a/matchbox/client-types/mb-wm-client-override.c b/matchbox/client-types/mb-wm-client-override.c index ae70823..238ce73 100644 --- a/matchbox/client-types/mb-wm-client-override.c +++ b/matchbox/client-types/mb-wm-client-override.c @@ -48,7 +48,7 @@ mb_wm_client_override_class_init (MBWMObjectClass *klass) client->client_type = MBWMClientTypeOverride; client->stack = mb_wm_client_override_stack; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientOverride"; #endif } diff --git a/matchbox/client-types/mb-wm-client-panel.c b/matchbox/client-types/mb-wm-client-panel.c index 46117ee..af9b7b8 100644 --- a/matchbox/client-types/mb-wm-client-panel.c +++ b/matchbox/client-types/mb-wm-client-panel.c @@ -28,7 +28,7 @@ mb_wm_client_panel_class_init (MBWMObjectClass *klass) client->stacking_layer = mb_wm_client_panel_stacking_layer; client->stack = mb_wm_client_panel_stack; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientPanel"; #endif } diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c index 883d7ef..c539219 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c +++ b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c @@ -106,7 +106,7 @@ mb_wm_comp_mgr_clutter_client_class_init (MBWMObjectClass *klass) c_klass->repair = mb_wm_comp_mgr_clutter_client_repair_real; c_klass->configure = mb_wm_comp_mgr_clutter_client_configure_real; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMCompMgrClutterClient"; #endif } @@ -522,7 +522,7 @@ mb_wm_comp_mgr_clutter_class_init (MBWMObjectClass *klass) { MBWMCompMgrClass *cm_klass = MB_WM_COMP_MGR_CLASS (klass); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMCompMgrClutter"; #endif diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c b/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c index beacf47..63e9506 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c +++ b/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c @@ -72,7 +72,7 @@ mb_wm_comp_mgr_xrender_client_class_init (MBWMObjectClass *klass) c_klass->repair = mb_wm_comp_mgr_xrender_client_repair_real; c_klass->configure = mb_wm_comp_mgr_xrender_client_configure_real; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMCompMgrDefaultClient"; #endif } @@ -391,7 +391,7 @@ mb_wm_comp_mgr_xrender_class_init (MBWMObjectClass *klass) { MBWMCompMgrClass *cm_klass = MB_WM_COMP_MGR_CLASS (klass); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMCompMgrDefault"; #endif diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr.c b/matchbox/comp-mgr/mb-wm-comp-mgr.c index ddc0091..a5a8554 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr.c +++ b/matchbox/comp-mgr/mb-wm-comp-mgr.c @@ -33,7 +33,7 @@ mb_wm_comp_mgr_client_class_init (MBWMObjectClass *klass) { MBWMCompMgrClientClass *c_klass = MB_WM_COMP_MGR_CLIENT_CLASS (klass); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMCompMgrClient"; #endif } @@ -166,7 +166,7 @@ mb_wm_comp_mgr_client_repair (MBWMCompMgrClient * client) static void mb_wm_comp_mgr_class_init (MBWMObjectClass *klass) { -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMCompMgr"; #endif } diff --git a/matchbox/core/mb-window-manager.c b/matchbox/core/mb-window-manager.c index 434d3d8..645b221 100644 --- a/matchbox/core/mb-window-manager.c +++ b/matchbox/core/mb-window-manager.c @@ -130,7 +130,7 @@ mb_wm_client_new_func (MBWindowManager *wm, MBWMClientWindow *win) } else { -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG char * name = XGetAtomName (wm->xdpy, win->net_type); printf("### unhandled window type %s (%x) ###\n", name, win->xwindow); XFree (name); @@ -265,7 +265,7 @@ mb_wm_class_init (MBWMObjectClass *klass) wm_class->comp_mgr_new = mb_wm_real_comp_mgr_new; #endif -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWindowManager"; #endif } diff --git a/matchbox/core/mb-wm-client-base.c b/matchbox/core/mb-wm-client-base.c index 3196adc..18ab286 100644 --- a/matchbox/core/mb-wm-client-base.c +++ b/matchbox/core/mb-wm-client-base.c @@ -71,7 +71,7 @@ mb_wm_client_base_class_init (MBWMObjectClass *klass) client->sync = mb_wm_client_base_display_sync; client->focus = mb_wm_client_base_focus; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMClientBase"; #endif } diff --git a/matchbox/core/mb-wm-debug.c b/matchbox/core/mb-wm-debug.c index cdd282d..7c4e6bd 100644 --- a/matchbox/core/mb-wm-debug.c +++ b/matchbox/core/mb-wm-debug.c @@ -22,7 +22,7 @@ #include "mb-wm-debug.h" -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG int mbwm_debug_flags = 0; static const struct { const char *key; MBWMDebugFlag flag; } debug_keys[] = { @@ -43,7 +43,7 @@ static const struct { const char *key; MBWMDebugFlag flag; } debug_keys[] = { void mb_wm_debug_init (const char *debug_string) { -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG char *end; int len, n, i; diff --git a/matchbox/core/mb-wm-debug.h b/matchbox/core/mb-wm-debug.h index f502a42..4c10be4 100644 --- a/matchbox/core/mb-wm-debug.h +++ b/matchbox/core/mb-wm-debug.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_DEBUG_H #define _HAVE_MB_DEBUG_H -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG typedef enum { MBWM_DEBUG_MISC = 1 << 0, diff --git a/matchbox/core/mb-wm-decor.c b/matchbox/core/mb-wm-decor.c index 17c7a52..01be59f 100644 --- a/matchbox/core/mb-wm-decor.c +++ b/matchbox/core/mb-wm-decor.c @@ -30,7 +30,7 @@ mb_wm_decor_button_sync_window (MBWMDecorButton *button); static void mb_wm_decor_class_init (MBWMObjectClass *klass) { -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMDecor"; #endif } @@ -777,7 +777,7 @@ mb_wm_decor_button_press_handler (XButtonEvent *xev, static void mb_wm_decor_button_class_init (MBWMObjectClass *klass) { -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMDecorButton"; #endif } diff --git a/matchbox/core/mb-wm-layout.c b/matchbox/core/mb-wm-layout.c index 7b00f48..889ae1d 100644 --- a/matchbox/core/mb-wm-layout.c +++ b/matchbox/core/mb-wm-layout.c @@ -17,7 +17,7 @@ mb_wm_layout_class_init (MBWMObjectClass *klass) layout_class->update = mb_wm_layout_real_update; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMLayout"; #endif } diff --git a/matchbox/core/mb-wm-macros.h b/matchbox/core/mb-wm-macros.h index a46be08..4675bed 100644 --- a/matchbox/core/mb-wm-macros.h +++ b/matchbox/core/mb-wm-macros.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_MACROS_H #define _HAVE_MB_MACROS_H -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG #define MBWM_NOTE(type,x,a...) do { \ if (mbwm_debug_flags & MBWM_DEBUG_##type) \ { fprintf (stderr, "[" #type "] " __FILE__ ":%d,%s() " ": " x "\n", __LINE__, __func__, ##a); } \ diff --git a/matchbox/core/mb-wm-main-context.c b/matchbox/core/mb-wm-main-context.c index fdf77a4..2f61d01 100644 --- a/matchbox/core/mb-wm-main-context.c +++ b/matchbox/core/mb-wm-main-context.c @@ -7,7 +7,7 @@ #define MBWM_CTX_MAX_TIMEOUT 100 -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG static const char *MBWMDEBUGEvents[] = { "error", @@ -79,7 +79,7 @@ struct MBWMFdWatchInfo{ static void mb_wm_main_context_class_init (MBWMObjectClass *klass) { -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMMainContext"; #endif } diff --git a/matchbox/core/mb-wm-object.c b/matchbox/core/mb-wm-object.c index 6b8ad4b..09a6ad4 100644 --- a/matchbox/core/mb-wm-object.c +++ b/matchbox/core/mb-wm-object.c @@ -20,7 +20,7 @@ #include "mb-wm.h" -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG #include <execinfo.h> #endif @@ -29,7 +29,7 @@ static MBWMObjectClass **ObjectClasses = NULL; static int ObjectClassesAllocated = 0; static int NObjectClasses = 0; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG #define MBWM_OBJECT_TRACE_DEPTH 3 /* * Increased for each ref call and decreased for each unref call @@ -210,7 +210,7 @@ mb_wm_object_unref (MBWMObject *this) free (this); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG alloc_objects = mb_wm_util_list_remove (alloc_objects, this); #endif } @@ -284,7 +284,7 @@ mb_wm_object_new (int type, ...) va_end(vap); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG { void * trace[MBWM_OBJECT_TRACE_DEPTH]; diff --git a/matchbox/core/mb-wm-object.h b/matchbox/core/mb-wm-object.h index f9e598f..2df9ea5 100644 --- a/matchbox/core/mb-wm-object.h +++ b/matchbox/core/mb-wm-object.h @@ -65,7 +65,7 @@ struct MBWMObjectClass MBWMObjFunc destroy; MBWMClassFunc class_init; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG const char *klass_name; #endif }; @@ -77,7 +77,7 @@ struct MBWMObject MBWMList *callbacks; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG char **trace_strings; int trace_depth; #endif @@ -122,7 +122,7 @@ mb_wm_object_signal_disconnect (MBWMObject *obj, void mb_wm_object_signal_emit (MBWMObject *obj, unsigned long signal); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG void mb_wm_object_dump (); #endif diff --git a/matchbox/core/mb-wm-root-window.c b/matchbox/core/mb-wm-root-window.c index b0862b3..f3c96df 100644 --- a/matchbox/core/mb-wm-root-window.c +++ b/matchbox/core/mb-wm-root-window.c @@ -35,7 +35,7 @@ mb_wm_root_window_class_init (MBWMObjectClass *klass) rw_class = (MBWMRootWindowClass *)klass; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMRootWindow"; #endif } diff --git a/matchbox/core/mb-wm.h b/matchbox/core/mb-wm.h index 8d422a3..0edbb04 100644 --- a/matchbox/core/mb-wm.h +++ b/matchbox/core/mb-wm.h @@ -31,6 +31,7 @@ #include <X11/Xatom.h> /* for XA_ATOM etc */ #include <X11/keysym.h> /* key mask defines */ +#include <matchbox/mb-wm-config.h> #include <matchbox/core/xas.h> /* async stuff not needed for xlib on xcb */ #ifndef TRUE diff --git a/matchbox/core/xas.c b/matchbox/core/xas.c index d0b8f8b..47329dc 100644 --- a/matchbox/core/xas.c +++ b/matchbox/core/xas.c @@ -31,7 +31,7 @@ #include "xas.h" -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG #include "mb-wm-debug.h" #include <stdio.h> #define XAS_DBG(x, a...) \ diff --git a/matchbox/managers/maemo/Makefile.am b/matchbox/managers/maemo/Makefile.am index a3a031a..55d65e8 100644 --- a/matchbox/managers/maemo/Makefile.am +++ b/matchbox/managers/maemo/Makefile.am @@ -5,20 +5,19 @@ INCLUDES = \ @MBWM_CFLAGS@ CLIENT_LIBS = \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-panel.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-dialog.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-note.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-app.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-input.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-desktop.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-menu.a + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-panel.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-dialog.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-note.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-app.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-input.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-desktop.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-menu.a - -THEME_LIBS = @MBWM_THEME_LIBS@/libmb-theme.a +THEME_LIBS = @MBWM_THEME_BUILDDIR@/libmb-theme.a if ENABLE_COMPOSITE -COMPMGR_LIBS=@MBWM_COMPMGR_LIBS@/libmatchbox-window-manager-2-compmgr.a \ - @MBWM_CLIENT_LIBS@/libmb-wm-client-override.a +COMPMGR_LIBS=@MBWM_COMPMGR_BUILDDIR@/libmatchbox-window-manager-2-compmgr.a \ + @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-override.a endif bin_PROGRAMS = matchbox-window-manager-2-maemo diff --git a/matchbox/managers/maemo/maemo-input.c b/matchbox/managers/maemo/maemo-input.c index 91bd14b..52e1940 100644 --- a/matchbox/managers/maemo/maemo-input.c +++ b/matchbox/managers/maemo/maemo-input.c @@ -15,7 +15,7 @@ maemo_input_class_init (MBWMObjectClass *klass) client->client_type = MBWMClientTypeInput; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MaemoInput"; #endif } diff --git a/matchbox/managers/maemo/maemo-toolbar.c b/matchbox/managers/maemo/maemo-toolbar.c index ae14502..a13a4b1 100644 --- a/matchbox/managers/maemo/maemo-toolbar.c +++ b/matchbox/managers/maemo/maemo-toolbar.c @@ -44,7 +44,7 @@ maemo_toolbar_class_init (MBWMObjectClass *klass) client->stack = maemo_toolbar_stack; client->stacking_layer = maemo_toolbar_stacking_layer; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MaemoToolbar"; #endif } diff --git a/matchbox/managers/maemo/maemo-window-manager.c b/matchbox/managers/maemo/maemo-window-manager.c index a455710..656a1ae 100644 --- a/matchbox/managers/maemo/maemo-window-manager.c +++ b/matchbox/managers/maemo/maemo-window-manager.c @@ -28,10 +28,14 @@ #include "mb-wm-client-input.h" #include "mb-window-manager.h" +#if ENABLE_COMPOSITE +#include "mb-wm-client-override.h" +#endif + #include <stdarg.h> static void -maemo_window_manager_process_cmdline (MBWindowManager *); +maemo_window_manager_process_cmdline (MBWindowManager *, int, char **); static Bool maemo_window_manager_client_activate (MBWindowManager * wm, @@ -119,7 +123,7 @@ maemo_window_manager_class_init (MBWMObjectClass *klass) wm_class->client_new = maemo_window_manager_client_new_func; wm_class->client_activate = maemo_window_manager_client_activate; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MaemoWindowManager"; #endif } @@ -146,8 +150,8 @@ maemo_window_manager_class_type () if (UNLIKELY(type == 0)) { static MBWMObjectClassInfo info = { - sizeof (MBWindowManagerClass), - sizeof (MBWindowManager), + sizeof (MaemoWindowManagerClass), + sizeof (MaemoWindowManager), maemo_window_manager_init, maemo_window_manager_destroy, maemo_window_manager_class_init diff --git a/matchbox/managers/maemo/maemo-window-manager.h b/matchbox/managers/maemo/maemo-window-manager.h index 099bf79..1492991 100644 --- a/matchbox/managers/maemo/maemo-window-manager.h +++ b/matchbox/managers/maemo/maemo-window-manager.h @@ -23,6 +23,7 @@ #include <matchbox/core/mb-wm.h> +typedef struct MaemoWindowManager MaemoWindowManager; typedef struct MaemoWindowManagerClass MaemoWindowManagerClass; typedef struct MaemoWindowManagerPriv MaemoWindowManagerPriv; diff --git a/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c b/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c index 7d7e807..ba0d10e 100644 --- a/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c +++ b/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c @@ -30,7 +30,7 @@ enum { static MBWindowManager *wm = NULL; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG /* * The Idea behind this is quite simple: when all managed windows are closed * and the WM exits, there should have been an unref call for each ref call. To @@ -128,7 +128,7 @@ main(int argc, char **argv) mb_wm_object_unref (MB_WM_OBJECT (wm)); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG mb_wm_object_dump (); #endif diff --git a/matchbox/managers/simple/matchbox-window-manager-2-simple.c b/matchbox/managers/simple/matchbox-window-manager-2-simple.c index 9982cd7..0cf80ed 100644 --- a/matchbox/managers/simple/matchbox-window-manager-2-simple.c +++ b/matchbox/managers/simple/matchbox-window-manager-2-simple.c @@ -21,7 +21,7 @@ enum { static MBWindowManager *wm = NULL; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG /* * The Idea behind this is quite simple: when all managed windows are closed * and the WM exits, there should have been an unref call for each ref call. To @@ -85,7 +85,7 @@ main(int argc, char **argv) { Display * dpy = NULL; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG struct sigaction sa; sigfillset(&sa.sa_mask); sa.sa_handler = signal_handler; @@ -150,7 +150,7 @@ main(int argc, char **argv) mb_wm_object_unref (MB_WM_OBJECT (wm)); -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG mb_wm_object_dump (); #endif diff --git a/matchbox/mb-wm-config.h.in b/matchbox/mb-wm-config.h.in index 32e761a..8c8de50 100644 --- a/matchbox/mb-wm-config.h.in +++ b/matchbox/mb-wm-config.h.in @@ -29,4 +29,7 @@ /* GTK Integration */ #define USE_GTK @USE_GTK@ +/* Debugging stuff */ +#define MBWM_WANT_DEBUG @MBWM_WANT_DEBUG@ + #endif diff --git a/matchbox/theme-engines/mb-wm-theme-png.c b/matchbox/theme-engines/mb-wm-theme-png.c index c612320..6daa0da 100644 --- a/matchbox/theme-engines/mb-wm-theme-png.c +++ b/matchbox/theme-engines/mb-wm-theme-png.c @@ -55,7 +55,7 @@ mb_wm_theme_png_class_init (MBWMObjectClass *klass) t_class->create_decor = mb_wm_theme_png_create_decor; t_class->resize_decor = mb_wm_theme_png_resize_decor; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMThemePng"; #endif } diff --git a/matchbox/theme-engines/mb-wm-theme.c b/matchbox/theme-engines/mb-wm-theme.c index bc6b26f..c9c819b 100644 --- a/matchbox/theme-engines/mb-wm-theme.c +++ b/matchbox/theme-engines/mb-wm-theme.c @@ -66,7 +66,7 @@ mb_wm_theme_class_init (MBWMObjectClass *klass) t_class->button_position = mb_wm_theme_simple_get_button_position; t_class->create_decor = mb_wm_theme_simple_create_decor; -#ifdef MBWM_WANT_DEBUG +#if MBWM_WANT_DEBUG klass->klass_name = "MBWMTheme"; #endif } |