Attachment #87529 for bug #115243




++ configure.in

            AC_ARG_ENABLE(dga,
AC_HELP_STRING([--enable-dga], [allow use of X11 DGA code [[default=yes]]]),
                          , enable_dga=yes)
            if test x$enable_dga = xyes; then
                SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86dga/*.c"
            fi
            AC_ARG_ENABLE(video-dga,
AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
                  , enable_video_dga=yes)

                          , enable_video_x11_vm=yes)
            if test x$enable_video_x11_vm = xyes; then
                AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)
                SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
            fi
            AC_ARG_ENABLE(video-x11-xv,
AC_HELP_STRING([--enable-video-x11-xv], [use X11 XvImage extension for video [[default=yes]]]),
                          , enable_video_x11_xv=yes)
            if test x$enable_video_x11_xv = xyes; then
                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XV)
                SOURCES="$SOURCES $srcdir/src/video/Xext/Xv/*.c"
            fi
            AC_ARG_ENABLE(video-x11-xinerama,
AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
                            , enable_video_x11_xinerama=yes)
            if test x$enable_video_x11_xinerama = xyes; then
                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)
                SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
            fi
            AC_ARG_ENABLE(video-x11-xme,
AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),
                            , enable_video_x11_xme=yes)
            if test x$enable_video_x11_xme = xyes; then
                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME)
                SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
            fi
            AC_ARG_ENABLE(video-x11-xrandr,
AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]),
++ src/video/dga/SDL_dgaevents.c


#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>

#include "../SDL_sysvideo.h"
#include "../../events/SDL_events_c.h"
++ src/video/dga/SDL_dgavideo.c

#include <stdio.h>

#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>

#include "SDL_video.h"
#include "SDL_mouse.h"
++ src/video/x11/SDL_x11dyn.h

#include <X11/Xlibint.h>
#include <X11/Xproto.h>

#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>

#ifndef NO_SHARED_MEMORY
#include <sys/ipc.h>
++ src/video/x11/SDL_x11video.h

#include "../SDL_sysvideo.h"

#if SDL_VIDEO_DRIVER_X11_DGAMOUSE
#include <X11/extensions/xf86dga.h>
#endif
#if SDL_VIDEO_DRIVER_X11_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif 
#if SDL_VIDEO_DRIVER_X11_XRANDR
#include <X11/extensions/Xrandr.h>
#endif
#if SDL_VIDEO_DRIVER_X11_VIDMODE
#include <X11/extensions/xf86vmode.h>
#endif
#if SDL_VIDEO_DRIVER_X11_XME
#include <X11/extensions/xme.h>
#endif
#if SDL_VIDEO_DRIVER_X11_DPMS
#include <X11/extensions/dpms.h>
++ src/video/x11/SDL_x11yuv.c

#include <sys/shm.h>
#include <X11/extensions/XShm.h>
#endif
#include <X11/extensions/Xvlib.h>

#include "SDL_x11yuv_c.h"
#include "../SDL_yuvfuncs.h"
++ src/video/x11/SDL_x11video.h


#include "SDL_x11dyn.h"

#define SDL_NAME(X) X

/* Hidden "this" pointer for the video functions */
#define _THIS	SDL_VideoDevice *this

++ src/video/x11/SDL_x11sym.h

SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)

#if NeedWidePrototypes
SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)

Return to bug 115243

Line Link Here

(-)file_not_specified_in_diff (-25 / +19 lines)
0	-- configure.in	0	++ configure.in
Lines 892-900 Link Here
892	AC_ARG_ENABLE(dga,	892	AC_ARG_ENABLE(dga,
893	AC_HELP_STRING([--enable-dga], [allow use of X11 DGA code [[default=yes]]]),	893	AC_HELP_STRING([--enable-dga], [allow use of X11 DGA code [[default=yes]]]),
894	, enable_dga=yes)	894	, enable_dga=yes)
895	if test x$enable_dga = xyes; then
896	SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86dga/*.c"
897	fi
898	AC_ARG_ENABLE(video-dga,	895	AC_ARG_ENABLE(video-dga,
899	AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),	896	AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
900	, enable_video_dga=yes)	897	, enable_video_dga=yes)
Lines 913-940 Link Here
913	, enable_video_x11_vm=yes)	910	, enable_video_x11_vm=yes)
914	if test x$enable_video_x11_vm = xyes; then	911	if test x$enable_video_x11_vm = xyes; then
915	AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)	912	AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)
916	SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
917	fi	913	fi
918	AC_ARG_ENABLE(video-x11-xv,	914	AC_ARG_ENABLE(video-x11-xv,
919	AC_HELP_STRING([--enable-video-x11-xv], [use X11 XvImage extension for video [[default=yes]]]),	915	AC_HELP_STRING([--enable-video-x11-xv], [use X11 XvImage extension for video [[default=yes]]]),
920	, enable_video_x11_xv=yes)	916	, enable_video_x11_xv=yes)
921	if test x$enable_video_x11_xv = xyes; then	917	if test x$enable_video_x11_xv = xyes; then
922	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XV)	918	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XV)
923	SOURCES="$SOURCES $srcdir/src/video/Xext/Xv/*.c"
924	fi	919	fi
925	AC_ARG_ENABLE(video-x11-xinerama,	920	AC_ARG_ENABLE(video-x11-xinerama,
926	AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),	921	AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
927	, enable_video_x11_xinerama=yes)	922	, enable_video_x11_xinerama=yes)
928	if test x$enable_video_x11_xinerama = xyes; then	923	if test x$enable_video_x11_xinerama = xyes; then
929	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)	924	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)
930	SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
931	fi	925	fi
932	AC_ARG_ENABLE(video-x11-xme,	926	AC_ARG_ENABLE(video-x11-xme,
933	AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),	927	AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),
934	, enable_video_x11_xme=yes)	928	, enable_video_x11_xme=yes)
935	if test x$enable_video_x11_xme = xyes; then	929	if test x$enable_video_x11_xme = xyes; then
936	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME)	930	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME)
937	SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
938	fi	931	fi
939	AC_ARG_ENABLE(video-x11-xrandr,	932	AC_ARG_ENABLE(video-x11-xrandr,
940	AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]),	933	AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]),
941	-- src/video/dga/SDL_dgaevents.c	934	++ src/video/dga/SDL_dgaevents.c
Lines 25-31 Link Here
25		25
26	#include <stdio.h>	26	#include <stdio.h>
27	#include <X11/Xlib.h>	27	#include <X11/Xlib.h>
28	#include "../Xext/extensions/xf86dga.h"	28	#include <X11/extensions/xf86dga.h>
29		29
30	#include "../SDL_sysvideo.h"	30	#include "../SDL_sysvideo.h"
31	#include "../../events/SDL_events_c.h"	31	#include "../../events/SDL_events_c.h"
32	-- src/video/dga/SDL_dgavideo.c	32	++ src/video/dga/SDL_dgavideo.c
Lines 27-33 Link Here
27	#include <stdio.h>	27	#include <stdio.h>
28		28
29	#include <X11/Xlib.h>	29	#include <X11/Xlib.h>
30	#include "../Xext/extensions/xf86dga.h"	30	#include <X11/extensions/xf86dga.h>
31		31
32	#include "SDL_video.h"	32	#include "SDL_video.h"
33	#include "SDL_mouse.h"	33	#include "SDL_mouse.h"
34	-- src/video/x11/SDL_x11dyn.h	34	++ src/video/x11/SDL_x11dyn.h
Lines 30-37 Link Here
30	#include <X11/Xlibint.h>	30	#include <X11/Xlibint.h>
31	#include <X11/Xproto.h>	31	#include <X11/Xproto.h>
32		32
33	#include "../Xext/extensions/Xext.h"	33	#include <X11/extensions/Xext.h>
34	#include "../Xext/extensions/extutil.h"	34	#include <X11/extensions/extutil.h>
35		35
36	#ifndef NO_SHARED_MEMORY	36	#ifndef NO_SHARED_MEMORY
37	#include <sys/ipc.h>	37	#include <sys/ipc.h>
38	-- src/video/x11/SDL_x11video.h	38	++ src/video/x11/SDL_x11video.h
Lines 32-50 Link Here
32	#include "../SDL_sysvideo.h"	32	#include "../SDL_sysvideo.h"
33		33
34	#if SDL_VIDEO_DRIVER_X11_DGAMOUSE	34	#if SDL_VIDEO_DRIVER_X11_DGAMOUSE
35	#include "../Xext/extensions/xf86dga.h"	35	#include <X11/extensions/xf86dga.h>
36	#endif	36	#endif
37	#if SDL_VIDEO_DRIVER_X11_XINERAMA	37	#if SDL_VIDEO_DRIVER_X11_XINERAMA
38	#include "../Xext/extensions/Xinerama.h"	38	#include <X11/extensions/Xinerama.h>
39	#endif	39	#endif
40	#if SDL_VIDEO_DRIVER_X11_XRANDR	40	#if SDL_VIDEO_DRIVER_X11_XRANDR
41	#include <X11/extensions/Xrandr.h>	41	#include <X11/extensions/Xrandr.h>
42	#endif	42	#endif
43	#if SDL_VIDEO_DRIVER_X11_VIDMODE	43	#if SDL_VIDEO_DRIVER_X11_VIDMODE
44	#include "../Xext/extensions/xf86vmode.h"	44	#include <X11/extensions/xf86vmode.h>
45	#endif	45	#endif
46	#if SDL_VIDEO_DRIVER_X11_XME	46	#if SDL_VIDEO_DRIVER_X11_XME
47	#include "../Xext/extensions/xme.h"	47	#include <X11/extensions/xme.h>
48	#endif	48	#endif
49	#if SDL_VIDEO_DRIVER_X11_DPMS	49	#if SDL_VIDEO_DRIVER_X11_DPMS
50	#include <X11/extensions/dpms.h>	50	#include <X11/extensions/dpms.h>
51	-- src/video/x11/SDL_x11yuv.c	51	++ src/video/x11/SDL_x11yuv.c
Lines 31-37 Link Here
31	#include <sys/shm.h>	31	#include <sys/shm.h>
32	#include <X11/extensions/XShm.h>	32	#include <X11/extensions/XShm.h>
33	#endif	33	#endif
34	#include "../Xext/extensions/Xvlib.h"	34	#include <X11/extensions/Xvlib.h>
35		35
36	#include "SDL_x11yuv_c.h"	36	#include "SDL_x11yuv_c.h"
37	#include "../SDL_yuvfuncs.h"	37	#include "../SDL_yuvfuncs.h"
38	-- src/video/x11/SDL_x11video.h	38	++ src/video/x11/SDL_x11video.h
Lines 52-57 Link Here
52		52
53	#include "SDL_x11dyn.h"	53	#include "SDL_x11dyn.h"
54		54
		55	#define SDL_NAME(X) X
		56
55	/* Hidden "this" pointer for the video functions */	57	/* Hidden "this" pointer for the video functions */
56	#define _THIS SDL_VideoDevice *this	58	#define _THIS SDL_VideoDevice *this
57		59
58	-- src/video/x11/SDL_x11sym.h	60	++ src/video/x11/SDL_x11sym.h
Lines 127-133 Link Here
127	SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)	127	SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
128	SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)	128	SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
129	SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)	129	SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
130	SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)
131		130
132	#if NeedWidePrototypes	131	#if NeedWidePrototypes
133	SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)	132	SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)