This repository has been archived by the owner on Feb 11, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Started work on the new X11 driver.
- Loading branch information
Showing
11 changed files
with
1,398 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,184 @@ | ||
/* | ||
SDL - Simple DirectMedia Layer | ||
Copyright (C) 1997-2004 Sam Lantinga | ||
This library is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU Library General Public | ||
License as published by the Free Software Foundation; either | ||
version 2 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 | ||
Library General Public License for more details. | ||
You should have received a copy of the GNU Library General Public | ||
License along with this library; if not, write to the Free | ||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
Sam Lantinga | ||
slouken@libsdl.org | ||
*/ | ||
#include "SDL_config.h" | ||
|
||
#define DEBUG_DYNAMIC_X11 0 | ||
|
||
#include "SDL_x11dyn.h" | ||
|
||
#if DEBUG_DYNAMIC_X11 | ||
#include <stdio.h> | ||
#endif | ||
|
||
#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC | ||
|
||
#include "SDL_name.h" | ||
#include "SDL_loadso.h" | ||
|
||
typedef struct | ||
{ | ||
void *lib; | ||
const char *libname; | ||
} x11dynlib; | ||
|
||
#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC | ||
#define SDL_VIDEO_DRIVER_X11_DYNAMIC NULL | ||
#endif | ||
#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT | ||
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT NULL | ||
#endif | ||
#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER | ||
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER NULL | ||
#endif | ||
#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR | ||
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR NULL | ||
#endif | ||
|
||
static x11dynlib x11libs[] = { | ||
{NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC}, | ||
{NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT}, | ||
{NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER}, | ||
{NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR}, | ||
}; | ||
|
||
static void | ||
X11_GetSym(const char *fnname, int *rc, void **fn) | ||
{ | ||
int i; | ||
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) { | ||
if (x11libs[i].lib != NULL) { | ||
*fn = SDL_LoadFunction(x11libs[i].lib, fnname); | ||
if (*fn != NULL) | ||
break; | ||
} | ||
} | ||
|
||
#if DEBUG_DYNAMIC_X11 | ||
if (*fn != NULL) | ||
printf("X11: Found '%s' in %s (%p)\n", fnname, x11libs[i].libname, | ||
*fn); | ||
else | ||
printf("X11: Symbol '%s' NOT FOUND!\n", fnname); | ||
#endif | ||
|
||
if (*fn == NULL) | ||
*rc = 0; /* kill this module. */ | ||
} | ||
|
||
|
||
/* Define all the function pointers and wrappers... */ | ||
#define SDL_X11_MODULE(modname) | ||
#define SDL_X11_SYM(rc,fn,params,args,ret) \ | ||
static rc (*p##fn) params = NULL; \ | ||
rc fn params { ret p##fn args ; } | ||
#include "SDL_x11sym.h" | ||
#undef SDL_X11_MODULE | ||
#undef SDL_X11_SYM | ||
#endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */ | ||
|
||
/* Annoying varargs entry point... */ | ||
#ifdef X_HAVE_UTF8_STRING | ||
XIC(*pXCreateIC) (XIM,...) = NULL; | ||
#endif | ||
|
||
/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */ | ||
#define SDL_X11_MODULE(modname) int SDL_X11_HAVE_##modname = 1; | ||
#define SDL_X11_SYM(rc,fn,params,args,ret) | ||
#include "SDL_x11sym.h" | ||
#undef SDL_X11_MODULE | ||
#undef SDL_X11_SYM | ||
|
||
|
||
static int x11_load_refcount = 0; | ||
|
||
void | ||
SDL_X11_UnloadSymbols(void) | ||
{ | ||
#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC | ||
/* Don't actually unload if more than one module is using the libs... */ | ||
if (x11_load_refcount > 0) { | ||
if (--x11_load_refcount == 0) { | ||
int i; | ||
|
||
/* set all the function pointers to NULL. */ | ||
#define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 1; | ||
#define SDL_X11_SYM(rc,fn,params,args,ret) p##fn = NULL; | ||
#include "SDL_x11sym.h" | ||
#undef SDL_X11_MODULE | ||
#undef SDL_X11_SYM | ||
|
||
#ifdef X_HAVE_UTF8_STRING | ||
pXCreateIC = NULL; | ||
#endif | ||
|
||
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) { | ||
if (x11libs[i].lib != NULL) { | ||
SDL_UnloadObject(x11libs[i].lib); | ||
x11libs[i].lib = NULL; | ||
} | ||
} | ||
} | ||
} | ||
#endif | ||
} | ||
|
||
/* returns non-zero if all needed symbols were loaded. */ | ||
int | ||
SDL_X11_LoadSymbols(void) | ||
{ | ||
int rc = 1; /* always succeed if not using Dynamic X11 stuff. */ | ||
|
||
#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC | ||
/* deal with multiple modules (dga, x11, etc) needing these symbols... */ | ||
if (x11_load_refcount++ == 0) { | ||
int i; | ||
int *thismod = NULL; | ||
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) { | ||
if (x11libs[i].libname != NULL) { | ||
x11libs[i].lib = SDL_LoadObject(x11libs[i].libname); | ||
} | ||
} | ||
#define SDL_X11_MODULE(modname) thismod = &SDL_X11_HAVE_##modname; | ||
#define SDL_X11_SYM(a,fn,x,y,z) X11_GetSym(#fn,thismod,(void**)&p##fn); | ||
#include "SDL_x11sym.h" | ||
#undef SDL_X11_MODULE | ||
#undef SDL_X11_SYM | ||
|
||
#ifdef X_HAVE_UTF8_STRING | ||
X11_GetSym("XCreateIC", &SDL_X11_HAVE_UTF8, (void **) &pXCreateIC); | ||
#endif | ||
|
||
if (!SDL_X11_HAVE_BASEXLIB) { /* some required symbol didn't load. */ | ||
SDL_X11_UnloadSymbols(); /* in case something got loaded... */ | ||
rc = 0; | ||
} | ||
} | ||
#else | ||
#ifdef X_HAVE_UTF8_STRING | ||
pXCreateIC = XCreateIC; | ||
#endif | ||
#endif | ||
|
||
return rc; | ||
} | ||
|
||
/* vi: set ts=4 sw=4 expandtab: */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
/* | ||
SDL - Simple DirectMedia Layer | ||
Copyright (C) 1997-2004 Sam Lantinga | ||
This library is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU Library General Public | ||
License as published by the Free Software Foundation; either | ||
version 2 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 | ||
Library General Public License for more details. | ||
You should have received a copy of the GNU Library General Public | ||
License along with this library; if not, write to the Free | ||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
Sam Lantinga | ||
slouken@libsdl.org | ||
*/ | ||
#include "SDL_config.h" | ||
|
||
#ifndef _SDL_x11dyn_h | ||
#define _SDL_x11dyn_h | ||
|
||
#include <X11/Xlib.h> | ||
#include <X11/Xutil.h> | ||
#include <X11/Xatom.h> | ||
#include <X11/Xlibint.h> | ||
#include <X11/Xproto.h> | ||
|
||
#include "../Xext/extensions/Xext.h" | ||
#include "../Xext/extensions/extutil.h" | ||
|
||
#ifndef NO_SHARED_MEMORY | ||
#include <sys/ipc.h> | ||
#include <sys/shm.h> | ||
#include <X11/extensions/XShm.h> | ||
#endif | ||
|
||
#if SDL_VIDEO_DRIVER_X11_XRANDR | ||
#include <X11/extensions/Xrandr.h> | ||
#endif | ||
|
||
/* | ||
* When using the "dynamic X11" functionality, we duplicate all the Xlib | ||
* symbols that would be referenced by SDL inside of SDL itself. | ||
* These duplicated symbols just serve as passthroughs to the functions | ||
* in Xlib, that was dynamically loaded. | ||
* | ||
* This allows us to use Xlib as-is when linking against it directly, but | ||
* also handles all the strange cases where there was code in the Xlib | ||
* headers that may or may not exist or vary on a given platform. | ||
*/ | ||
#ifdef __cplusplus | ||
extern "C" | ||
{ | ||
#endif | ||
|
||
/* evil function signatures... */ | ||
typedef Bool(*SDL_X11_XESetWireToEventRetType) (Display *, XEvent *, | ||
xEvent *); | ||
typedef int (*SDL_X11_XSynchronizeRetType) (Display *); | ||
typedef Status(*SDL_X11_XESetEventToWireRetType) (Display *, XEvent *, | ||
xEvent *); | ||
|
||
int SDL_X11_LoadSymbols(void); | ||
void SDL_X11_UnloadSymbols(void); | ||
|
||
/* That's really annoying...make this a function pointer no matter what. */ | ||
#ifdef X_HAVE_UTF8_STRING | ||
extern XIC(*pXCreateIC) (XIM, ...); | ||
#endif | ||
|
||
/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */ | ||
#define SDL_X11_MODULE(modname) extern int SDL_X11_HAVE_##modname; | ||
#define SDL_X11_SYM(rc,fn,params,args,ret) | ||
#include "SDL_x11sym.h" | ||
#undef SDL_X11_MODULE | ||
#undef SDL_X11_SYM | ||
|
||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif /* !defined _SDL_x11dyn_h */ | ||
/* vi: set ts=4 sw=4 expandtab: */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
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" | ||
|
||
#include "../../events/SDL_keyboard_c.h" | ||
|
||
void | ||
X11_InitKeyboard(_THIS) | ||
{ | ||
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; | ||
SDL_Keyboard keyboard; | ||
|
||
SDL_zero(keyboard); | ||
data->keyboard = SDL_AddKeyboard(&keyboard, -1); | ||
} | ||
|
||
void | ||
X11_QuitKeyboard(_THIS) | ||
{ | ||
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; | ||
|
||
SDL_DelKeyboard(data->keyboard); | ||
} | ||
|
||
/* vi: set ts=4 sw=4 expandtab: */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/* | ||
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" | ||
|
||
#ifndef _SDL_x11keyboard_h | ||
#define _SDL_x11keyboard_h | ||
|
||
extern void X11_InitKeyboard(_THIS); | ||
extern void X11_QuitKeyboard(_THIS); | ||
|
||
#endif /* _SDL_x11keyboard_h */ | ||
|
||
/* vi: set ts=4 sw=4 expandtab: */ |
Oops, something went wrong.