diff options
| -rw-r--r-- | doc/MBWM2-Overview.xml | 6 | ||||
| -rw-r--r-- | matchbox/mb-wm-manager.c | 4 | ||||
| -rw-r--r-- | matchbox/mb-wm-theme.c | 26 | ||||
| -rw-r--r-- | matchbox/mb-wm-theme.h | 4 |
4 files changed, 1 insertions, 39 deletions
diff --git a/doc/MBWM2-Overview.xml b/doc/MBWM2-Overview.xml index afcab2e..b586633 100644 --- a/doc/MBWM2-Overview.xml +++ b/doc/MBWM2-Overview.xml @@ -469,12 +469,6 @@ </listitem> <listitem> - <para>compositing: whether composting should be enabled for this - theme; "yes" or "no", default "no". - </para> - </listitem> - - <listitem> <para>shaped: whether this theme uses shaped windows; "yes" or "no", default "no" (only available for PNG themes; see the "client" element for more information). diff --git a/matchbox/mb-wm-manager.c b/matchbox/mb-wm-manager.c index 082bfcf..ad58ac6 100644 --- a/matchbox/mb-wm-manager.c +++ b/matchbox/mb-wm-manager.c @@ -2233,9 +2233,7 @@ _mb_wm_manager_start (MBWMManager * wm, MBWMCompMgr *compositor) if (compositor) { wm->comp_mgr = mb_wm_object_ref (MB_WM_OBJECT (compositor)); - - if (mb_wm_theme_use_compositing_mgr (wm->theme)) - mb_wm_manager_set_compositing_on (wm); + mb_wm_manager_set_compositing_on (wm); } #endif diff --git a/matchbox/mb-wm-theme.c b/matchbox/mb-wm-theme.c index c7a8921..f80a669 100644 --- a/matchbox/mb-wm-theme.c +++ b/matchbox/mb-wm-theme.c @@ -137,9 +137,6 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap) case MBWMObjectPropThemeShadowType: theme->shadow_type = va_arg(vap, int); break; - case MBWMObjectPropThemeCompositing: - theme->compositing = va_arg(vap, int); - break; case MBWMObjectPropThemeShaped: theme->shaped = va_arg(vap, int); break; @@ -376,7 +373,6 @@ struct expat_data MBWMColor color_lowlight; MBWMColor color_shadow; MBWMCompMgrShadowType shadow_type; - Bool compositing; Bool shaped; }; @@ -394,7 +390,6 @@ mb_wm_theme_new (MBWMManager * wm, const char * theme_path) MBWMColor clr_lowlight; MBWMColor clr_shadow; MBWMCompMgrShadowType shadow_type; - Bool compositing; Bool shaped; struct stat st; @@ -458,7 +453,6 @@ mb_wm_theme_new (MBWMManager * wm, const char * theme_path) } memset (&udata, 0, sizeof (struct expat_data)); - udata.compositing = True; udata.par = par; XML_SetElementHandler (par, @@ -527,7 +521,6 @@ mb_wm_theme_new (MBWMManager * wm, const char * theme_path) clr_shadow.set = udata.color_shadow.set; shadow_type = udata.shadow_type; - compositing = udata.compositing; shaped = udata.shaped; xml_stack_free (udata.stack); @@ -544,7 +537,6 @@ mb_wm_theme_new (MBWMManager * wm, const char * theme_path) MBWMObjectPropThemeColorLowlight, &clr_lowlight, MBWMObjectPropThemeColorShadow, &clr_shadow, MBWMObjectPropThemeShadowType, shadow_type, - MBWMObjectPropThemeCompositing, compositing, MBWMObjectPropThemeShaped, shaped, NULL); } @@ -559,7 +551,6 @@ mb_wm_theme_new (MBWMManager * wm, const char * theme_path) MBWMObjectPropThemeColorLowlight, &clr_lowlight, MBWMObjectPropThemeColorShadow, &clr_shadow, MBWMObjectPropThemeShadowType, shadow_type, - MBWMObjectPropThemeCompositing, compositing, MBWMObjectPropThemeShaped, shaped, NULL)); } @@ -575,7 +566,6 @@ mb_wm_theme_new (MBWMManager * wm, const char * theme_path) MBWMObjectPropThemeColorLowlight, &clr_lowlight, MBWMObjectPropThemeColorShadow, &clr_shadow, MBWMObjectPropThemeShadowType, shadow_type, - MBWMObjectPropThemeCompositing, compositing, MBWMObjectPropThemeShaped, shaped, NULL)); } @@ -794,15 +784,6 @@ mb_wm_theme_get_shadow_type (MBWMTheme * theme) return theme->shadow_type; } -Bool -mb_wm_theme_use_compositing_mgr (MBWMTheme * theme) -{ - if (!theme) - return False; - - return theme->compositing; -} - /* * Expat callback stuff */ @@ -935,13 +916,6 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr) else if (!strcmp (*(p+1), "gaussian")) exd->shadow_type = MBWM_COMP_MGR_SHADOW_GAUSSIAN; } - else if (!strcmp (*p, "compositing")) - { - if (!strcmp (*(p+1), "yes") || !strcmp (*(p+1), "1")) - exd->compositing = True; - else - exd->compositing = False; - } p += 2; } diff --git a/matchbox/mb-wm-theme.h b/matchbox/mb-wm-theme.h index 574c8c6..a6d7930 100644 --- a/matchbox/mb-wm-theme.h +++ b/matchbox/mb-wm-theme.h @@ -96,7 +96,6 @@ struct MBWMTheme char *path; GList *xml_clients; - Bool compositing; Bool shaped; MBWMColor color_lowlight; MBWMColor color_shadow; @@ -188,9 +187,6 @@ mb_wm_theme_get_shadow_color (MBWMTheme * theme, MBWMCompMgrShadowType mb_wm_theme_get_shadow_type (MBWMTheme * theme); -Bool -mb_wm_theme_use_compositing_mgr (MBWMTheme * theme); - typedef unsigned int (*MBWMThemeCustomClientTypeFunc) (const char *type_name, void *user_data); |