brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'clutter' of ssh://gitserver@git.o-hand.com/metacity-clutter into clutter

Browse Source
This commit is contained in:
Matthew Allum 2008-10-28 11:34:05 +00:00
commit c283fbe9b3
7 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -299,8 +299,9 @@ if test x$have_xrender = xyes; then
AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
fi
CLUTTER_PACKAGE=clutter-0.8
AC_SUBST(CLUTTER_PACKAGE)
if test x$have_clutter = xyes; then
CLUTTER_PACKAGE=clutter-0.8
METACITY_PC_MODULES="$METACITY_PC_MODULES $CLUTTER_PACKAGE "
PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
@ -533,6 +534,7 @@ doc/man/Makefile
src/Makefile
src/wm-tester/Makefile
src/libmetacity-private.pc
src/metacity-plugins.pc
src/tools/Makefile
src/themes/Makefile
src/compositor/mutter/plugins/Makefile

16
src/Makefile.am
View File

@ -147,7 +147,16 @@ libmetacityinclude_HEADERS = \
include/common.h \
ui/preview-widget.h \
ui/theme-parser.h \
ui/theme.h
ui/theme.h \
include/prefs.h \
include/window.h \
include/workspace.h \
include/compositor.h \
include/compositor-mutter.h \
include/types.h \
include/screen.h \
include/display.h \
include/mutter-plugin.h
metacity_theme_viewer_SOURCES= \
ui/theme-viewer.c
@ -218,7 +227,7 @@ inlinepixbufs.h: $(IMAGES)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmetacity-private.pc
pkgconfig_DATA = libmetacity-private.pc metacity-plugins.pc
EXTRA_DIST=$(desktopfiles_files) \
$(wmproperties_files) \
@ -227,5 +236,6 @@ EXTRA_DIST=$(desktopfiles_files) \
$(wmproperties_in_files) \
$(schema_in_files) \
$(xml_in_files) \
libmetacity-private.pc.in
libmetacity-private.pc.in \
metacity-plugins.pc.in

10
src/compositor/mutter/compositor-mutter.c
View File

@ -1353,9 +1353,12 @@ add_win (MetaScreen *screen, MetaWindow *window, Window xwindow)
* If Metacity has decided not to manage this window then the input events
* won't have been set on the window
*/
events_needed = PropertyChangeMask | SubstructureNotifyMask;
events_needed = PropertyChangeMask |
SubstructureNotifyMask |
StructureNotifyMask;
if (!(attrs.your_event_mask & PropertyChangeMask) ||
!(attrs.your_event_mask & StructureNotifyMask) ||
!(attrs.your_event_mask & SubstructureNotifyMask))
{
gulong event_mask;
@ -1376,6 +1379,11 @@ add_win (MetaScreen *screen, MetaWindow *window, Window xwindow)
clutter_actor_set_position (CLUTTER_ACTOR (cw),
priv->attrs.x, priv->attrs.y);
if (!window)
printf ("!!! override 0x%x at %d, %d\n",
(guint)xwindow, priv->attrs.x, priv->attrs.y);
clutter_container_add_actor (CLUTTER_CONTAINER (info->window_group),
CLUTTER_ACTOR (cw));
clutter_actor_hide (CLUTTER_ACTOR (cw));

1
src/compositor/mutter/mutter-plugin-manager.c
View File

@ -21,6 +21,7 @@
* 02111-1307, USA.
*/
#include "config.h"
#include "mutter-plugin-manager.h"
#include "prefs.h"
#include "errors.h"

2
src/compositor/mutter/plugins/Makefile.am
View File

@ -5,8 +5,6 @@ if WITH_CLUTTER
INCLUDES=@METACITY_CFLAGS@ -I $(top_srcdir)/src/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\"
pkglib_LTLIBRARIES = default.la
default_la_CFLAGS = -fPIC
default_la_SOURCES = default.c
default_la_LDFLAGS = -module -avoid-version -no-undefined

1
src/include/mutter-plugin.h
View File

@ -25,7 +25,6 @@
#define MUTTER_PLUGIN_H_
#include "types.h"
#include "config.h"
#include "compositor.h"
#include "compositor-mutter.h"

17
src/metacity-plugins.pc.in Normal file
View File

@ -0,0 +1,17 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
pkglibdir=@pkglibdir@
libgnome_serverdir=@libexecdir@
metacity_major_version=@METACITY_MAJOR_VERSION@
metacity_minor_version=@METACITY_MINOR_VERSION@
metacity_micro_version=@METACITY_MICRO_VERSION@
metacity_clutter_plugin_api_version=@METACITY_CLUTTER_PLUGIN_API_VERSION@
Name: metacity-plugins
Description: Dev parameters for mutter plugins
Requires: @CLUTTER_PACKAGE@
Version: @VERSION@
Libs: @CLUTTER_LIBS@
Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMETACITY_PKGLIBDIR=\"${pkglibdir}\"