Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals. Restore the old link order for the Xorg and Xdmx binaries.
This commit is contained in:
Fredrik Höglund
parent
383c2e1e9e
commit
e1fc15a85f
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
2006-04-05 Fredrik Höglund <fredrik@kde.org>
|
||||
|
||||
* Xext/Makefile.am:
|
||||
Put the screensaver extension back in the Xext module.
|
||||
|
||||
* Xext/saver.c:
|
||||
* dix/globals.c:
|
||||
* include/globals.h:
|
||||
* os/WaitFor.c:
|
||||
Move the screenSaverSuspended variable to DIX globals.
|
||||
|
||||
* configure.ac:
|
||||
Restore the old link order for the Xorg and Xdmx binaries.
|
||||
|
||||
2006-04-05 Ian Romanick <idr@us.ibm.com>
|
||||
|
||||
* fb/fbwindow.c:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ endif
|
|||
# MIT ScreenSaver extension
|
||||
SCREENSAVER_SRCS = saver.c
|
||||
if SCREENSAVER
|
||||
BUILTIN_SRCS += $(SCREENSAVER_SRCS)
|
||||
MODULE_SRCS += $(SCREENSAVER_SRCS)
|
||||
endif
|
||||
|
||||
# Xinerama extension: making multiple video devices act as one virtual screen
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.11 2006/02/10 22:00:20 anholt Exp $ */
|
||||
/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.12 2006/03/31 18:49:38 fredrik Exp $ */
|
||||
/*
|
||||
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
|
||||
*
|
||||
|
|
@ -121,8 +121,6 @@ static void ScreenSaverResetProc (
|
|||
|
||||
static RESTYPE SuspendType; /* resource type for suspension records */
|
||||
|
||||
_X_EXPORT Bool screenSaverSuspended = FALSE; /* used in os/WaitFor.c */
|
||||
|
||||
typedef struct _ScreenSaverSuspension *ScreenSaverSuspensionPtr;
|
||||
|
||||
/* List of clients that are suspending the screensaver. */
|
||||
|
|
|
|||
|
|
@ -897,7 +897,7 @@ if test "x$DMX" = xyes; then
|
|||
modules not found.])
|
||||
fi
|
||||
DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
|
||||
XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $XEXT_LIB $CWRAP_LIB"
|
||||
XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB"
|
||||
AC_SUBST([XDMX_LIBS])
|
||||
|
||||
dnl USB sources in DMX require <linux/input.h>
|
||||
|
|
@ -1039,7 +1039,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
|
|||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
|
||||
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
|
||||
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
|
||||
XORG_LIBS="$MI_LIB $FIXES_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB $XEXTXORG_LIB"
|
||||
XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
|
||||
|
||||
AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xserver/xorg/dix/globals.c,v 1.7 2005/07/03 08:53:38 daniels Exp $ */
|
||||
/* $XdotOrg: xserver/xorg/dix/globals.c,v 1.8 2006/02/15 20:44:12 ajax Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */
|
||||
/************************************************************
|
||||
|
||||
|
|
@ -132,6 +132,10 @@ int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES;
|
|||
int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER;
|
||||
#endif
|
||||
|
||||
#ifdef SCREENSAVER
|
||||
Bool screenSaverSuspended = FALSE;
|
||||
#endif
|
||||
|
||||
char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
|
||||
char *defaultTextFont = COMPILEDDEFAULTFONT;
|
||||
char *defaultCursorFont = COMPILEDCURSORFONT;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.6 2005/05/19 18:53:49 ajax Exp $ */
|
||||
/* $XdotOrg: xserver/xorg/include/globals.h,v 1.10 2006/01/08 23:43:54 ajax Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
|
||||
|
||||
#ifndef _XSERV_GLOBAL_H_
|
||||
|
|
@ -13,6 +13,10 @@ extern CARD32 defaultScreenSaverInterval;
|
|||
extern CARD32 ScreenSaverTime;
|
||||
extern CARD32 ScreenSaverInterval;
|
||||
|
||||
#ifdef SCREENSAVER
|
||||
extern Bool screenSaverSuspended;
|
||||
#endif
|
||||
|
||||
extern char *defaultFontPath;
|
||||
extern char *rgbPath;
|
||||
extern int monitorResolution;
|
||||
|
|
|
|||
10
os/WaitFor.c
10
os/WaitFor.c
|
|
@ -669,16 +669,6 @@ FreeScreenSaverTimer(void)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef SCREENSAVER
|
||||
/*
|
||||
* When this variable is set a client has temporarily suspended the
|
||||
* screensaver and DPMS, so SetScreenSaverTimer should be a noop.
|
||||
* The screensaver extension is responsible for stopping and
|
||||
* restarting the timer when suspension is enabled/disabled.
|
||||
*/
|
||||
extern Bool screenSaverSuspended; /* declared in Xext/saver.c */
|
||||
#endif /* SCREENSAVER */
|
||||
|
||||
void
|
||||
SetScreenSaverTimer(void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user