Mercurial > sdl-ios-xcode
changeset 1947:180f563d72a8
Oh yeah, more DGA removal
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 26 Jul 2006 04:20:59 +0000 |
parents | 103760c3a5dc |
children | d646f6e1a439 |
files | src/video/x11/SDL_x11dga.c src/video/x11/SDL_x11dga_c.h |
diffstat | 2 files changed, 0 insertions(+), 129 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11dga.c Wed Jul 26 03:57:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2006 Sam Lantinga - - 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 - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* This is currently only used to enable DGA mouse. - The new fullscreen code makes it very difficult to handle DGA dynamically. - There will be a completely separate DGA driver that is fullscreen-only. -*/ - -#include "SDL_video.h" -#include "../SDL_cursor_c.h" -#include "SDL_x11dga_c.h" - -/* Global for the error handler */ -int dga_event, dga_error = -1; - -void -X11_EnableDGAMouse(_THIS) -{ -#if SDL_VIDEO_DRIVER_X11_DGAMOUSE - int dga_major, dga_minor; - int use_dgamouse; - const char *env_use_dgamouse; - - /* Check configuration to see if we should use DGA mouse */ - use_dgamouse = 1; - env_use_dgamouse = SDL_getenv("SDL_VIDEO_X11_DGAMOUSE"); - if (env_use_dgamouse) { - use_dgamouse = atoi(env_use_dgamouse); - } - /* Check for buggy X servers */ - if (use_dgamouse && BUGGY_XFREE86( ==, 4000)) { - use_dgamouse = 0; - } - /* Only use DGA mouse if the cursor is not showing (in relative mode) */ - if (use_dgamouse && local_X11 && !(using_dga & DGA_MOUSE) && - SDL_NAME(XF86DGAQueryExtension) (SDL_Display, &dga_event, &dga_error) - && SDL_NAME(XF86DGAQueryVersion) (SDL_Display, &dga_major, - &dga_minor)) { - if (SDL_NAME(XF86DGADirectVideo) - (SDL_Display, SDL_Screen, XF86DGADirectMouse)) { - using_dga |= DGA_MOUSE; - } - } -#endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */ -} - -/* Argh. Glide resets DGA mouse mode when it makes the context current! */ -void -X11_CheckDGAMouse(_THIS) -{ -#if SDL_VIDEO_DRIVER_X11_DGAMOUSE - int flags; - - if (using_dga & DGA_MOUSE) { - SDL_NAME(XF86DGAQueryDirectVideo) (SDL_Display, SDL_Screen, &flags); - if (!(flags & XF86DGADirectMouse)) { - SDL_NAME(XF86DGADirectVideo) (SDL_Display, SDL_Screen, - XF86DGADirectMouse); - } - } -#endif -} - -void -X11_DisableDGAMouse(_THIS) -{ -#if SDL_VIDEO_DRIVER_X11_DGAMOUSE - if (using_dga & DGA_MOUSE) { - SDL_NAME(XF86DGADirectVideo) (SDL_Display, SDL_Screen, 0); - using_dga &= ~DGA_MOUSE; - } -#endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */ -} - -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/x11/SDL_x11dga_c.h Wed Jul 26 03:57:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2006 Sam Lantinga - - 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 - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "SDL_x11video.h" - -/* Different DGA access states */ -#define DGA_GRAPHICS 0x01 -#define DGA_KEYBOARD 0x02 -#define DGA_MOUSE 0x04 - -extern void X11_EnableDGAMouse(_THIS); -extern void X11_CheckDGAMouse(_THIS); -extern void X11_DisableDGAMouse(_THIS); -/* vi: set ts=4 sw=4 expandtab: */