theme: don't determine use of compositing in theme

This removes the option of overriding the use of compositing in a theme.

doc/MBWM2-Overview.xml

@@ -468,12 +468,6 @@
           </para>
 	</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"

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));
-
+      mb_wm_manager_set_compositing_on (wm);
-      if (mb_wm_theme_use_compositing_mgr (wm->theme))
-        mb_wm_manager_set_compositing_on (wm);
     }
 #endif
 

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;
 	}

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);