diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c | 12 | ||||
| -rw-r--r-- | matchbox/core/mb-window-manager.c | 6 |
3 files changed, 13 insertions, 11 deletions
@@ -1,3 +1,9 @@ +2008-05-16 Tomas Frydrych <tf@o-hand.com> + + * matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c + * matchbox/core/mb-window-manager.c: + Sync up with changes to clutter API. + 2008-04-18 Ross Burton <ross@openedhand.com> * matchbox/core/mb-window-manager.c: diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c index c160c70..a782135 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c +++ b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c @@ -25,9 +25,8 @@ #include "mb-wm-theme.h" #include <clutter/clutter.h> -#include <clutter/clutter-x11.h> -#include <clutter/clutter-x11-texture-pixmap.h> -#include <clutter/clutter-glx-texture-pixmap.h> +#include <clutter/x11/clutter-x11.h> +#include <clutter/glx/clutter-glx-texture-pixmap.h> #include <X11/Xresource.h> #include <X11/extensions/shape.h> @@ -179,8 +178,7 @@ mb_wm_comp_mgr_clutter_fetch_texture (MBWMCompMgrClient *client) clutter_x11_texture_pixmap_set_pixmap ( CLUTTER_X11_TEXTURE_PIXMAP (cclient->priv->texture), - cclient->priv->pixmap, - w, h, depth); + cclient->priv->pixmap); #ifdef HAVE_XEXT /* @@ -1660,7 +1658,7 @@ mb_wm_comp_mgr_clutter_shadow_gaussian_make_tile () /* * TidyTextureFrame copied from tidy */ -#include <clutter/cogl.h> +#include <cogl/cogl.h> #define TIDY_PARAM_READWRITE \ (G_PARAM_READABLE | G_PARAM_WRITABLE | \ @@ -1774,12 +1772,10 @@ tidy_texture_frame_paint (ClutterActor *self) if (clutter_feature_available (CLUTTER_FEATURE_TEXTURE_RECTANGLE)) { target_type = CGL_TEXTURE_RECTANGLE_ARB; - cogl_enable (CGL_ENABLE_TEXTURE_RECT|CGL_ENABLE_BLEND); } else { target_type = CGL_TEXTURE_2D; - cogl_enable (CGL_ENABLE_TEXTURE_2D|CGL_ENABLE_BLEND); tw = clutter_util_next_p2 (pwidth); th = clutter_util_next_p2 (pheight); diff --git a/matchbox/core/mb-window-manager.c b/matchbox/core/mb-window-manager.c index 2b18a20..6226632 100644 --- a/matchbox/core/mb-window-manager.c +++ b/matchbox/core/mb-window-manager.c @@ -31,7 +31,7 @@ #if ENABLE_COMPOSITE # include "mb-wm-comp-mgr.h" # if ENABLE_CLUTTER_COMPOSITE_MANAGER -# include <clutter/clutter-x11.h> +# include <clutter/x11/clutter-x11.h> # include "mb-wm-comp-mgr-clutter.h" # else # include "mb-wm-comp-mgr-xrender.h" @@ -595,10 +595,10 @@ mb_wm_handle_root_config_notify (XConfigureEvent *xev, void *userdata) { MBWindowManager * wm = (MBWindowManager*)userdata; - + wm->xdpy_width = xev->width; wm->xdpy_height = xev->height; - + mb_wm_display_sync_queue (wm, MBWMSyncGeometry); } |