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

fix warning

Browse Source 
2003-11-15  Havoc Pennington  <hp@redhat.com>

	* src/main.c (main): fix warning

	* src/compositor.c: add a new file to contain compositing manager
	functionality; not yet implemented at all.
This commit is contained in:
Havoc Pennington 2003-11-16 04:20:17 +00:00 committed by Havoc Pennington
parent 6ac67f80a6
commit 901ad18a67
4 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-11-15 Havoc Pennington <hp@redhat.com>
* src/main.c (main): fix warning
* src/compositor.c: add a new file to contain compositing manager
functionality; not yet implemented at all.
2003-11-15 Rob Adams <readams@readams.net> 2003-11-15 Rob Adams <readams@readams.net>
Inherit visual from frame window so that metacity will work with Inherit visual from frame window so that metacity will work with

29
configure.in
View File

@ -125,6 +125,8 @@ AC_ARG_ENABLE(sm, [ --disable-sm disable metacity's session m
AC_ARG_ENABLE(startup-notification, [ --disable-startup-notification disable metacity's startup notification support, for embedded/size-sensitive custom non-GNOME builds],,enable_startup_notification=auto) AC_ARG_ENABLE(startup-notification, [ --disable-startup-notification disable metacity's startup notification support, for embedded/size-sensitive custom non-GNOME builds],,enable_startup_notification=auto)
AC_ARG_ENABLE(compositor, [ --disable-compositor disable metacity's compositing manager],,enable_compositor=auto)
AC_ARG_ENABLE(xsync, [ --disable-xsync disable metacity's use of the XSync extension],,enable_xsync=auto) AC_ARG_ENABLE(xsync, [ --disable-xsync disable metacity's use of the XSync extension],,enable_xsync=auto)
AC_ARG_ENABLE(shape, [ --disable-shape disable metacity's use of the shaped window extension],,enable_shape=auto) AC_ARG_ENABLE(shape, [ --disable-shape disable metacity's use of the shaped window extension],,enable_shape=auto)
@ -175,6 +177,32 @@ else
echo "Building without libstartup-notification" echo "Building without libstartup-notification"
fi fi
XCOMPOSITE_VERSION=1.0
AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
have_xcomposite=yes
else
have_xcomposite=no
fi
AC_MSG_RESULT($have_xcomposite)
if test x$enable_compositor = xyes; then
have_xcomposite=yes
echo "CompositeExt support forced on"
elif test x$enable_compositor = xauto; then
true
else
have_xcomposite=no
fi
if test x$have_xcomposite = xyes; then
echo "Building with CompositeExt"
METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender"
AC_DEFINE(HAVE_XCOMPOSITEENSIONS, , [Building with compositing manager support])
else
echo "Building without compositing manager"
fi
PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES) PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
AC_PATH_XTRA AC_PATH_XTRA
@ -399,6 +427,7 @@ metacity-$VERSION:
XFree86 Xinerama: ${use_xfree_xinerama} XFree86 Xinerama: ${use_xfree_xinerama}
Solaris Xinerama: ${use_solaris_xinerama} Solaris Xinerama: ${use_solaris_xinerama}
Startup notification: ${have_startup_notification} Startup notification: ${have_startup_notification}
Compositing manager: ${have_xcomposite}
Session management: ${found_sm} Session management: ${found_sm}
Shape extension: ${found_shape} Shape extension: ${found_shape}
Resize-and-rotate: ${found_randr} Resize-and-rotate: ${found_randr}

2
src/Makefile.am
View File

@ -14,6 +14,8 @@ metacity_SOURCES= \
bell.h \ bell.h \
bell.c \ bell.c \
common.h \ common.h \
compositor.c \
compositor.h \
constraints.c \ constraints.c \
constraints.h \ constraints.h \
core.c \ core.c \

2
src/main.c
View File

@ -430,7 +430,7 @@ main (int argc, char **argv)
if (!meta_ui_have_a_theme ()) if (!meta_ui_have_a_theme ())
{ {
gchar *dir_entry = NULL; const char *dir_entry = NULL;
GError *err = NULL; GError *err = NULL;
GDir *themes_dir = NULL; GDir *themes_dir = NULL;