Skip to content

W
wine-winehq
Commit 98179f06 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard
Browse files
Options

winex11.drv: Kill DGA support.

parent 385247b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 232 deletions
configure
View file @ 98179f06
......@@ -9273,7 +9273,6 @@ then
for ac_header in X11/Xlib.h \
X11/XKBlib.h \
X11/Xutil.h \
......@@ -9282,7 +9281,6 @@ for ac_header in X11/Xlib.h \
X11/extensions/XShm.h \
X11/extensions/Xrandr.h \
X11/extensions/Xrender.h \
X11/extensions/xf86dga.h \
X11/extensions/xf86vmode.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
......@@ -9630,97 +9628,6 @@ fi
fi
if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
then
{ echo "$as_me:$LINENO: checking for XDGAQueryExtension in -lXxf86dga" >&5
echo $ECHO_N "checking for XDGAQueryExtension in -lXxf86dga... $ECHO_C" >&6; }
if test "${ac_cv_lib_Xxf86dga_XDGAQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char XDGAQueryExtension ();
int
main ()
{
return XDGAQueryExtension ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xxf86dga_XDGAQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xxf86dga_XDGAQueryExtension=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XDGAQueryExtension" >&5
echo "${ECHO_T}$ac_cv_lib_Xxf86dga_XDGAQueryExtension" >&6; }
if test $ac_cv_lib_Xxf86dga_XDGAQueryExtension = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBXXF86DGA2 1
_ACEOF
X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
fi
fi
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
then
{ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
......
configure.ac
View file @ 98179f06
......@@ -326,7 +326,6 @@ then
X11/extensions/XShm.h \
X11/extensions/Xrandr.h \
X11/extensions/Xrender.h \
X11/extensions/xf86dga.h \
X11/extensions/xf86vmode.h],,,
[#ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>
......@@ -359,17 +358,6 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
fi
dnl *** Check for XFree86 DGA / DGA 2.0 extension
if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
then
AC_CHECK_LIB(Xxf86dga, XDGAQueryExtension,
[ AC_DEFINE(HAVE_LIBXXF86DGA2, 1,
[Define if you have the Xxf86dga library version 2])
X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
],,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
fi
dnl *** Check for XFree86 VMODE extension
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
then
......
dlls/winex11.drv/Makefile.in
View file @ 98179f06
......@@ -16,7 +16,6 @@ C_SRCS = \
codepage.c \
dce.c \
desktop.c \
dga2.c \
dib.c \
dib_convert.c \
dib_dst_swap.c \
......
dlls/winex11.drv/dga2.h deleted 100644 → 0
View file @ 385247b3
/*
* DirectDraw HAL XVidMode interface
*
* Copyright 2001 TransGaming Technologies, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_DGA2_H
#define __WINE_DGA2_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_LIBXXF86DGA2
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "ddrawi.h"
extern LPDDHALMODEINFO xf86dga2_modes;
extern unsigned xf86dga2_mode_count;
void X11DRV_XF86DGA2_Init(void);
void X11DRV_XF86DGA2_Cleanup(void);
int X11DRV_XF86DGA2_CreateDriver(LPDDHALINFO info);
#endif /* HAVE_LIBXXF86DGA2 */
#endif /* __WINE_DGA2_H */
dlls/winex11.drv/event.c
View file @ 98179f06
......@@ -27,9 +27,6 @@
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
#ifdef HAVE_LIBXXF86DGA2
#include <X11/extensions/xf86dga.h>
#endif
#include <assert.h>
#include <stdarg.h>
......
dlls/winex11.drv/mouse.c
View file @ 98179f06
......@@ -21,9 +21,6 @@
#include "config.h"
#include <X11/Xlib.h>
#ifdef HAVE_LIBXXF86DGA2
#include <X11/extensions/xf86dga.h>
#endif
#include <stdarg.h>
#define NONAMELESSUNION
......@@ -834,49 +831,3 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev )
X11DRV_send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
pt.x, pt.y, 0, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
#ifdef HAVE_LIBXXF86DGA2
extern HWND DGAhwnd;
/**********************************************************************
* X11DRV_DGAMotionEvent
*/
void X11DRV_DGAMotionEvent( HWND hwnd, XEvent *xev )
{
XDGAMotionEvent *event = (XDGAMotionEvent *)xev;
update_key_state( event->state );
X11DRV_send_mouse_input( DGAhwnd, MOUSEEVENTF_MOVE, event->dx, event->dy,
0, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
/**********************************************************************
* X11DRV_DGAButtonPressEvent
*/
void X11DRV_DGAButtonPressEvent( HWND hwnd, XEvent *xev )
{
XDGAButtonEvent *event = (XDGAButtonEvent *)xev;
int buttonNum = event->button - 1;
if (buttonNum >= NB_BUTTONS) return;
update_key_state( event->state );
X11DRV_send_mouse_input( DGAhwnd, button_down_flags[buttonNum], 0, 0,
0, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
/**********************************************************************
* X11DRV_DGAButtonReleaseEvent
*/
void X11DRV_DGAButtonReleaseEvent( HWND hwnd, XEvent *xev )
{
XDGAButtonEvent *event = (XDGAButtonEvent *)xev;
int buttonNum = event->button - 1;
if (buttonNum >= NB_BUTTONS) return;
update_key_state( event->state );
X11DRV_send_mouse_input( DGAhwnd, button_up_flags[buttonNum], 0, 0,
0, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
#endif /* HAVE_LIBXXF86DGA2 */
dlls/winex11.drv/x11ddraw.c
View file @ 98179f06
......@@ -27,7 +27,6 @@
#define NONAMELESSSTRUCT
#include "x11drv.h"
#include "x11ddraw.h"
#include "dga2.h"
#include "windef.h"
#include "gdi.h"
......@@ -385,12 +384,7 @@ INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData)
LPDWORD lpInstance = (LPDWORD)lpOutData;
/* FIXME: get x11drv's hInstance */
#ifdef HAVE_LIBXXF86DGA2
if (!X11DRV_XF86DGA2_CreateDriver(&hal_info))
#endif
{
X11DRV_Settings_CreateDriver(&hal_info);
}
X11DRV_Settings_CreateDriver(&hal_info);
#ifdef HAVE_OPENGL
/*X11DRV_GLX_CreateDriver(&hal_info);*/
#endif
......
dlls/winex11.drv/x11drv.h
View file @ 98179f06
......@@ -34,9 +34,6 @@
#ifdef HAVE_LIBXXSHM
# include <X11/extensions/XShm.h>
#endif /* defined(HAVE_LIBXXSHM) */
#ifdef HAVE_LIBXXF86DGA2
#include <X11/extensions/xf86dga.h>
#endif
#define BOOL X_BOOL
#define BYTE X_BYTE
......@@ -620,9 +617,6 @@ extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event );
extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event );
extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );
extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event );
extern void X11DRV_DGAMotionEvent( HWND hwnd, XEvent *event );
extern void X11DRV_DGAButtonPressEvent( HWND hwnd, XEvent *event );
extern void X11DRV_DGAButtonReleaseEvent( HWND hwnd, XEvent *event );
extern DWORD EVENT_x11_time_to_win32_time(Time time);
......
dlls/winex11.drv/x11drv_main.c
View file @ 98179f06
......@@ -49,7 +49,6 @@
#include "x11drv.h"
#include "xvidmode.h"
#include "xrandr.h"
#include "dga2.h"
#include "wine/server.h"
#include "wine/debug.h"
......@@ -72,7 +71,6 @@ unsigned int screen_height;
unsigned int screen_depth;
Window root_window;
int dxgrab = 0;
int usedga = 0;
int usexvidmode = 1;
int usexrandr = 1;
int use_xkb = 1;
......@@ -318,9 +316,6 @@ static void setup_options(void)
if (!get_config_key( hkey, appkey, "DXGrab", buffer, sizeof(buffer) ))
dxgrab = IS_OPTION_TRUE( buffer[0] );
if (!get_config_key( hkey, appkey, "UseDGA", buffer, sizeof(buffer) ))
usedga = IS_OPTION_TRUE( buffer[0] );
if (!get_config_key( hkey, appkey, "UseXVidMode", buffer, sizeof(buffer) ))
usexvidmode = IS_OPTION_TRUE( buffer[0] );
......@@ -437,10 +432,6 @@ static BOOL process_attach(void)
/* initialize XRandR */
X11DRV_XRandR_Init();
#endif
#ifdef HAVE_LIBXXF86DGA2
/* initialize DGA2 */
X11DRV_XF86DGA2_Init();
#endif
X11DRV_InitKeyboard();
X11DRV_InitClipboard();
......@@ -474,10 +465,6 @@ static void thread_detach(void)
*/
static void process_detach(void)
{
#ifdef HAVE_LIBXXF86DGA2
/* cleanup DGA2 */
X11DRV_XF86DGA2_Cleanup();
#endif
#ifdef HAVE_LIBXXF86VM
/* cleanup XVidMode */
X11DRV_XF86VM_Cleanup();
......
include/config.h.in
View file @ 98179f06
......@@ -350,9 +350,6 @@
/* Define to 1 if you have the <libxslt/transform.h> header file. */
#undef HAVE_LIBXSLT_TRANSFORM_H
/* Define if you have the Xxf86dga library version 2 */
#undef HAVE_LIBXXF86DGA2
/* Define if you have the Xxf86vm library */
#undef HAVE_LIBXXF86VM
......@@ -890,9 +887,6 @@
/* Define to 1 if you have the <X11/extensions/shape.h> header file. */
#undef HAVE_X11_EXTENSIONS_SHAPE_H
/* Define to 1 if you have the <X11/extensions/xf86dga.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86DGA_H
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment