pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added patches from FreeBSD ports

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4076
This commit is contained in:
Sam Lantinga 2001-06-19 13:33:54 +00:00
parent 8840f4dbf5
commit 31059713d1
14 changed files with 1334 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

33
configure.in
View file

@ -749,6 +749,37 @@ CheckSVGA()
fi
}
dnl Find the VGL includes and libraries
CheckVGL()
{
AC_ARG_ENABLE(video-vgl,
[ --enable-video-vgl use VGL video driver [default=no]],
, enable_video_vgl=no)
if test x$enable_video = xyes -a x$enable_video_vgl = xyes; then
AC_MSG_CHECKING(for libVGL support)
video_vgl=no
AC_TRY_COMPILE([
#include <sys/fbio.h>
#include <sys/consio.h>
#include <sys/kbio.h>
#include <vgl.h>
],[
VGLBitmap bitmap;
exit(bitmap.PyxelBytes);
],[
video_vgl=yes
])
AC_MSG_RESULT($video_vgl)
if test x$video_vgl = xyes; then
CFLAGS="$CFLAGS -DENABLE_VGL"
SYSTEM_LIBS="$SYSTEM_LIBS -lvgl"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS vgl"
VIDEO_DRIVERS="$VIDEO_DRIVERS vgl/libvideo_vgl.la"
fi
fi
}
dnl Find the AAlib includes
CheckAAlib()
{
@ -1202,6 +1233,7 @@ case "$target" in
CheckX11
CheckDGA
CheckSVGA
CheckVGL
CheckAAlib
CheckOpenGL
CheckPTHREAD
@ -2044,6 +2076,7 @@ src/video/macdsp/Makefile
src/video/macrom/Makefile
src/video/quartz/Makefile
src/video/svga/Makefile
src/video/vgl/Makefile
src/video/aalib/Makefile
src/video/wincommon/Makefile
src/video/windib/Makefile

1
docs.html
View file

@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
Major changes since SDL 1.0.0:
</H2>
<UL>
<LI> 1.2.2: Added FreeBSD VGL video driver from FreeBSD ports
<LI> 1.2.1: Added Linux PlayStation 2 Graphics Synthesizer support
<LI> 1.2.1: Added an audio driver that writes to disk (thanks Ryan!)
<LI> 1.2.1: Mouse wheel sends mouse button (4/5) events on Windows

2
src/video/Makefile.am
View file

@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libvideo.la
# Define which subdirectories need to be built
SUBDIRS = @VIDEO_SUBDIRS@
DIST_SUBDIRS = dummy x11 dga nanox fbcon svga ggi aalib \
DIST_SUBDIRS = dummy x11 dga nanox fbcon vgl svga ggi aalib \
wincommon windib windx5 \
maccommon macdsp macrom quartz \
bwindow ps2gs photon cybergfx

3
src/video/SDL_sysvideo.h
View file

@ -343,6 +343,9 @@ extern VideoBootStrap PS2GS_bootstrap;
#ifdef ENABLE_GGI
extern VideoBootStrap GGI_bootstrap;
#endif
#ifdef ENABLE_VGL
extern VideoBootStrap VGL_bootstrap;
#endif
#ifdef ENABLE_SVGALIB
extern VideoBootStrap SVGALIB_bootstrap;
#endif

3
src/video/SDL_video.c
View file

@ -63,6 +63,9 @@ static VideoBootStrap *bootstrap[] = {
#ifdef ENABLE_GGI
&GGI_bootstrap,
#endif
#ifdef ENABLE_VGL
&VGL_bootstrap,
#endif
#ifdef ENABLE_SVGALIB
&SVGALIB_bootstrap,
#endif

1
src/video/svga/SDL_svgaevents.c
View file

@ -28,6 +28,7 @@ static char rcsid =
/* Handle the event stream, converting X11 events into SDL events */
#include <stdio.h>
#include <stdlib.h>
#include <vga.h>
#include <vgamouse.h>

15
src/video/vgl/Makefile.am Normal file
View file

@ -0,0 +1,15 @@
## Makefile.am for SDL using the libVGL video driver
noinst_LTLIBRARIES = libvideo_vgl.la
libvideo_vgl_la_SOURCES = $(VGL_SRCS)
# The SDL libVGL video driver sources
VGL_SRCS = \
SDL_vglvideo.h \
SDL_vglevents.c \
SDL_vglevents_c.h \
SDL_vglmouse.c \
SDL_vglmouse_c.h \
SDL_vglvideo.c

303
src/video/vgl/SDL_vglevents.c Normal file
View file

@ -0,0 +1,303 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000 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@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
/* Handle the event stream, converting X11 events into SDL events */
#include <stdio.h>
#include <sys/fbio.h>
#include <sys/consio.h>
#include <sys/kbio.h>
#include <vgl.h>
#include "SDL.h"
#include "SDL_thread.h"
#include "SDL_sysevents.h"
#include "SDL_events_c.h"
#include "SDL_vglvideo.h"
#include "SDL_vglevents_c.h"
/* The translation tables from a console scancode to a SDL keysym */
/* FIXME: Free the keymap when we shut down the video mode */
static keymap_t *vga_keymap = NULL;
static SDLKey keymap[128];
static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym);
static int posted = 0;
static int oldx = -1;
static int oldy = -1;
static struct mouse_info mouseinfo;
/* Ugh, we have to duplicate the kernel's keysym mapping code...
Oh, it's not so bad. :-)
FIXME: Add keyboard LED handling code
*/
int VGL_initkeymaps(int fd)
{
vga_keymap = malloc(sizeof(keymap_t));
if ( ! vga_keymap ) {
SDL_OutOfMemory();
return(-1);
}
if (ioctl(fd, GIO_KEYMAP, vga_keymap) == -1) {
free(vga_keymap);
vga_keymap = NULL;
SDL_SetError("Unable to get keyboard map");
return(-1);
}
return(0);
}
static void handle_keyboard(_THIS)
{
SDL_keysym keysym;
int c, pressed, scancode;
while ((c = VGLKeyboardGetCh()) != 0) {
scancode = c & 0x7F;
if (c & 0x80) {
pressed = SDL_RELEASED;
} else {
pressed = SDL_PRESSED;
}
posted += SDL_PrivateKeyboard(pressed,
TranslateKey(scancode, &keysym));
}
}
int VGL_initmouse(int fd)
{
mouseinfo.operation = MOUSE_GETINFO;
if (ioctl(fd, CONS_MOUSECTL, &mouseinfo) != 0)
return -1;
return 0;
}
static void handle_mouse(_THIS)
{
char buttons;
int x, y;
int button_state, state_changed, state;
int i;
ioctl(0, CONS_MOUSECTL, &mouseinfo);
x = mouseinfo.u.data.x;
y = mouseinfo.u.data.y;
buttons = mouseinfo.u.data.buttons;
if ((x != oldx) || (y != oldy)) {
posted += SDL_PrivateMouseMotion(0, 0, x, y);
oldx = x;
oldy = y;
}
/* See what's changed */
button_state = SDL_GetMouseState(NULL, NULL);
state_changed = button_state ^ buttons;
for (i = 0; i < 8; i++) {
if (state_changed & (1<<i)) {
if (buttons & (1<<i)) {
state = SDL_PRESSED;
} else {
state = SDL_RELEASED;
}
posted += SDL_PrivateMouseButton(state, i + 1, 0, 0);
}
}
}
void VGL_PumpEvents(_THIS)
{
do {
posted = 0;
handle_keyboard(this);
handle_mouse(this);
} while (posted != 0);
}
void VGL_InitOSKeymap(_THIS)
{
int i;
/* Initialize the BeOS key translation table */
for ( i=0; i<SDL_TABLESIZE(keymap); ++i )
keymap[i] = SDLK_UNKNOWN;
keymap[SCANCODE_ESCAPE] = SDLK_ESCAPE;
keymap[SCANCODE_1] = SDLK_1;
keymap[SCANCODE_2] = SDLK_2;
keymap[SCANCODE_3] = SDLK_3;
keymap[SCANCODE_4] = SDLK_4;
keymap[SCANCODE_5] = SDLK_5;
keymap[SCANCODE_6] = SDLK_6;
keymap[SCANCODE_7] = SDLK_7;
keymap[SCANCODE_8] = SDLK_8;
keymap[SCANCODE_9] = SDLK_9;
keymap[SCANCODE_0] = SDLK_0;
keymap[SCANCODE_MINUS] = SDLK_MINUS;
keymap[SCANCODE_EQUAL] = SDLK_EQUALS;
keymap[SCANCODE_BACKSPACE] = SDLK_BACKSPACE;
keymap[SCANCODE_TAB] = SDLK_TAB;
keymap[SCANCODE_Q] = SDLK_q;
keymap[SCANCODE_W] = SDLK_w;
keymap[SCANCODE_E] = SDLK_e;
keymap[SCANCODE_R] = SDLK_r;
keymap[SCANCODE_T] = SDLK_t;
keymap[SCANCODE_Y] = SDLK_y;
keymap[SCANCODE_U] = SDLK_u;
keymap[SCANCODE_I] = SDLK_i;
keymap[SCANCODE_O] = SDLK_o;
keymap[SCANCODE_P] = SDLK_p;
keymap[SCANCODE_BRACKET_LEFT] = SDLK_LEFTBRACKET;
keymap[SCANCODE_BRACKET_RIGHT] = SDLK_RIGHTBRACKET;
keymap[SCANCODE_ENTER] = SDLK_RETURN;
keymap[SCANCODE_LEFTCONTROL] = SDLK_LCTRL;
keymap[SCANCODE_A] = SDLK_a;
keymap[SCANCODE_S] = SDLK_s;
keymap[SCANCODE_D] = SDLK_d;
keymap[SCANCODE_F] = SDLK_f;
keymap[SCANCODE_G] = SDLK_g;
keymap[SCANCODE_H] = SDLK_h;
keymap[SCANCODE_J] = SDLK_j;
keymap[SCANCODE_K] = SDLK_k;
keymap[SCANCODE_L] = SDLK_l;
keymap[SCANCODE_SEMICOLON] = SDLK_SEMICOLON;
keymap[SCANCODE_APOSTROPHE] = SDLK_QUOTE;
keymap[SCANCODE_GRAVE] = SDLK_BACKQUOTE;
keymap[SCANCODE_LEFTSHIFT] = SDLK_LSHIFT;
keymap[SCANCODE_BACKSLASH] = SDLK_BACKSLASH;
keymap[SCANCODE_Z] = SDLK_z;
keymap[SCANCODE_X] = SDLK_x;
keymap[SCANCODE_C] = SDLK_c;
keymap[SCANCODE_V] = SDLK_v;
keymap[SCANCODE_B] = SDLK_b;
keymap[SCANCODE_N] = SDLK_n;
keymap[SCANCODE_M] = SDLK_m;
keymap[SCANCODE_COMMA] = SDLK_COMMA;
keymap[SCANCODE_PERIOD] = SDLK_PERIOD;
keymap[SCANCODE_SLASH] = SDLK_SLASH;
keymap[SCANCODE_RIGHTSHIFT] = SDLK_RSHIFT;
keymap[SCANCODE_KEYPADMULTIPLY] = SDLK_KP_MULTIPLY;
keymap[SCANCODE_LEFTALT] = SDLK_LALT;
keymap[SCANCODE_SPACE] = SDLK_SPACE;
keymap[SCANCODE_CAPSLOCK] = SDLK_CAPSLOCK;
keymap[SCANCODE_F1] = SDLK_F1;
keymap[SCANCODE_F2] = SDLK_F2;
keymap[SCANCODE_F3] = SDLK_F3;
keymap[SCANCODE_F4] = SDLK_F4;
keymap[SCANCODE_F5] = SDLK_F5;
keymap[SCANCODE_F6] = SDLK_F6;
keymap[SCANCODE_F7] = SDLK_F7;
keymap[SCANCODE_F8] = SDLK_F8;
keymap[SCANCODE_F9] = SDLK_F9;
keymap[SCANCODE_F10] = SDLK_F10;
keymap[SCANCODE_NUMLOCK] = SDLK_NUMLOCK;
keymap[SCANCODE_SCROLLLOCK] = SDLK_SCROLLOCK;
keymap[SCANCODE_KEYPAD7] = SDLK_KP7;
keymap[SCANCODE_CURSORUPLEFT] = SDLK_KP7;
keymap[SCANCODE_KEYPAD8] = SDLK_KP8;
keymap[SCANCODE_CURSORUP] = SDLK_KP8;
keymap[SCANCODE_KEYPAD9] = SDLK_KP9;
keymap[SCANCODE_CURSORUPRIGHT] = SDLK_KP9;
keymap[SCANCODE_KEYPADMINUS] = SDLK_KP_MINUS;
keymap[SCANCODE_KEYPAD4] = SDLK_KP4;
keymap[SCANCODE_CURSORLEFT] = SDLK_KP4;
keymap[SCANCODE_KEYPAD5] = SDLK_KP5;
keymap[SCANCODE_KEYPAD6] = SDLK_KP6;
keymap[SCANCODE_CURSORRIGHT] = SDLK_KP6;
keymap[SCANCODE_KEYPADPLUS] = SDLK_KP_PLUS;
keymap[SCANCODE_KEYPAD1] = SDLK_KP1;
keymap[SCANCODE_CURSORDOWNLEFT] = SDLK_KP1;
keymap[SCANCODE_KEYPAD2] = SDLK_KP2;
keymap[SCANCODE_CURSORDOWN] = SDLK_KP2;
keymap[SCANCODE_KEYPAD3] = SDLK_KP3;
keymap[SCANCODE_CURSORDOWNRIGHT] = SDLK_KP3;
keymap[SCANCODE_KEYPAD0] = SDLK_KP0;
keymap[SCANCODE_KEYPADPERIOD] = SDLK_KP_PERIOD;
keymap[SCANCODE_LESS] = SDLK_LESS;
keymap[SCANCODE_F11] = SDLK_F11;
keymap[SCANCODE_F12] = SDLK_F12;
keymap[SCANCODE_KEYPADENTER] = SDLK_KP_ENTER;
keymap[SCANCODE_RIGHTCONTROL] = SDLK_RCTRL;
keymap[SCANCODE_CONTROL] = SDLK_RCTRL;
keymap[SCANCODE_KEYPADDIVIDE] = SDLK_KP_DIVIDE;
keymap[SCANCODE_PRINTSCREEN] = SDLK_PRINT;
keymap[SCANCODE_RIGHTALT] = SDLK_RALT;
keymap[SCANCODE_BREAK] = SDLK_BREAK;
keymap[SCANCODE_BREAK_ALTERNATIVE] = SDLK_UNKNOWN;
keymap[SCANCODE_HOME] = SDLK_HOME;
keymap[SCANCODE_CURSORBLOCKUP] = SDLK_UP;
keymap[SCANCODE_PAGEUP] = SDLK_PAGEUP;
keymap[SCANCODE_CURSORBLOCKLEFT] = SDLK_LEFT;
keymap[SCANCODE_CURSORBLOCKRIGHT] = SDLK_RIGHT;
keymap[SCANCODE_END] = SDLK_END;
keymap[SCANCODE_CURSORBLOCKDOWN] = SDLK_DOWN;
keymap[SCANCODE_PAGEDOWN] = SDLK_PAGEDOWN;
keymap[SCANCODE_INSERT] = SDLK_INSERT;
keymap[SCANCODE_REMOVE] = SDLK_DELETE;
keymap[119] = SDLK_PAUSE;
keymap[SCANCODE_RIGHTWIN] = SDLK_RSUPER;
keymap[SCANCODE_LEFTWIN] = SDLK_LSUPER;
keymap[127] = SDLK_MENU;
}
static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
{
/* Set the keysym information */
keysym->scancode = scancode;
keysym->sym = keymap[scancode];
keysym->mod = KMOD_NONE;
/* If UNICODE is on, get the UNICODE value for the key */
keysym->unicode = 0;
if ( SDL_TranslateUNICODE && vga_keymap ) {
int map;
SDLMod modstate;
modstate = SDL_GetModState();
map = 0;
if ( modstate & KMOD_SHIFT ) {
map += 1;
}
if ( modstate & KMOD_CTRL ) {
map += 2;
}
if ( modstate & KMOD_ALT ) {
map += 4;
}
if ( !(vga_keymap->key[scancode].spcl & (0x80 >> map)) ) {
keysym->unicode = vga_keymap->key[scancode].map[map];
}
}
return(keysym);
}

159
src/video/vgl/SDL_vglevents_c.h Normal file
View file

@ -0,0 +1,159 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000 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@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
#include "SDL_vglvideo.h"
/* Variables and functions exported by SDL_sysevents.c to other parts
of the native video subsystem (SDL_sysvideo.c)
*/
extern int VGL_initkeymaps(int fd);
extern int VGL_initmouse(int fd);
extern void VGL_keyboardcallback(int scancode, int pressed);
extern void VGL_InitOSKeymap(_THIS);
extern void VGL_PumpEvents(_THIS);
/* Mouse buttons */
#define MOUSE_LEFTBUTTON 0x01
#define MOUSE_MIDDLEBUTTON 0x02
#define MOUSE_RIGHTBUTTON 0x04
/* Scancodes */
#define SCANCODE_ESCAPE 1
#define SCANCODE_1 2
#define SCANCODE_2 3
#define SCANCODE_3 4
#define SCANCODE_4 5
#define SCANCODE_5 6
#define SCANCODE_6 7
#define SCANCODE_7 8
#define SCANCODE_8 9
#define SCANCODE_9 10
#define SCANCODE_0 11
#define SCANCODE_MINUS 12
#define SCANCODE_EQUAL 13
#define SCANCODE_BACKSPACE 14
#define SCANCODE_TAB 15
#define SCANCODE_Q 16
#define SCANCODE_W 17
#define SCANCODE_E 18
#define SCANCODE_R 19
#define SCANCODE_T 20
#define SCANCODE_Y 21
#define SCANCODE_U 22
#define SCANCODE_I 23
#define SCANCODE_O 24
#define SCANCODE_P 25
#define SCANCODE_BRACKET_LEFT 26
#define SCANCODE_BRACKET_RIGHT 27
#define SCANCODE_ENTER 28
#define SCANCODE_LEFTCONTROL 29
#define SCANCODE_A 30
#define SCANCODE_S 31
#define SCANCODE_D 32
#define SCANCODE_F 33
#define SCANCODE_G 34
#define SCANCODE_H 35
#define SCANCODE_J 36
#define SCANCODE_K 37
#define SCANCODE_L 38
#define SCANCODE_SEMICOLON 39
#define SCANCODE_APOSTROPHE 40
#define SCANCODE_GRAVE 41
#define SCANCODE_LEFTSHIFT 42
#define SCANCODE_BACKSLASH 43
#define SCANCODE_Z 44
#define SCANCODE_X 45
#define SCANCODE_C 46
#define SCANCODE_V 47
#define SCANCODE_B 48
#define SCANCODE_N 49
#define SCANCODE_M 50
#define SCANCODE_COMMA 51
#define SCANCODE_PERIOD 52
#define SCANCODE_SLASH 53
#define SCANCODE_RIGHTSHIFT 54
#define SCANCODE_KEYPADMULTIPLY 55
#define SCANCODE_LEFTALT 56
#define SCANCODE_SPACE 57
#define SCANCODE_CAPSLOCK 58
#define SCANCODE_F1 59
#define SCANCODE_F2 60
#define SCANCODE_F3 61
#define SCANCODE_F4 62
#define SCANCODE_F5 63
#define SCANCODE_F6 64
#define SCANCODE_F7 65
#define SCANCODE_F8 66
#define SCANCODE_F9 67
#define SCANCODE_F10 68
#define SCANCODE_NUMLOCK 69
#define SCANCODE_SCROLLLOCK 70
#define SCANCODE_KEYPAD7 71
#define SCANCODE_CURSORUPLEFT 71
#define SCANCODE_KEYPAD8 72
#define SCANCODE_CURSORUP 72
#define SCANCODE_KEYPAD9 73
#define SCANCODE_CURSORUPRIGHT 73
#define SCANCODE_KEYPADMINUS 74
#define SCANCODE_KEYPAD4 75
#define SCANCODE_CURSORLEFT 75
#define SCANCODE_KEYPAD5 76
#define SCANCODE_KEYPAD6 77
#define SCANCODE_CURSORRIGHT 77
#define SCANCODE_KEYPADPLUS 78
#define SCANCODE_KEYPAD1 79
#define SCANCODE_CURSORDOWNLEFT 79
#define SCANCODE_KEYPAD2 80
#define SCANCODE_CURSORDOWN 80
#define SCANCODE_KEYPAD3 81
#define SCANCODE_CURSORDOWNRIGHT 81
#define SCANCODE_KEYPAD0 82
#define SCANCODE_KEYPADPERIOD 83
#define SCANCODE_LESS 86
#define SCANCODE_F11 87
#define SCANCODE_F12 88
#define SCANCODE_KEYPADENTER 89
#define SCANCODE_RIGHTCONTROL 90
#define SCANCODE_CONTROL 107
#define SCANCODE_KEYPADDIVIDE 91
#define SCANCODE_PRINTSCREEN 92
#define SCANCODE_RIGHTALT 93
#define SCANCODE_BREAK 104 /* Beware: is 119 */
#define SCANCODE_BREAK_ALTERNATIVE 104 /* on some keyboards! */
#define SCANCODE_HOME 94
#define SCANCODE_CURSORBLOCKUP 95 /* Cursor key block */
#define SCANCODE_PAGEUP 96
#define SCANCODE_CURSORBLOCKLEFT 97 /* Cursor key block */
#define SCANCODE_CURSORBLOCKRIGHT 98 /* Cursor key block */
#define SCANCODE_END 99
#define SCANCODE_CURSORBLOCKDOWN 100 /* Cursor key block */
#define SCANCODE_PAGEDOWN 101
#define SCANCODE_INSERT 102
#define SCANCODE_REMOVE 103
#define SCANCODE_RIGHTWIN 106
#define SCANCODE_LEFTWIN 105

66
src/video/vgl/SDL_vglmouse.c Normal file
View file

@ -0,0 +1,66 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000 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@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
#include <stdio.h>
#include "SDL_error.h"
#include "SDL_mouse.h"
#include "SDL_events_c.h"
#include "SDL_vglvideo.h"
#include "SDL_vglmouse_c.h"
/* The implementation dependent data for the window manager cursor */
struct WMcursor {
int unused;
};
void VGL_FreeWMCursor(_THIS, WMcursor *cursor)
{
return;
}
WMcursor *VGL_CreateWMCursor(_THIS,
Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y)
{
return(NULL);
}
int VGL_ShowWMCursor(_THIS, WMcursor *cursor)
{
return(0);
}
void VGL_WarpWMCursor(_THIS, Uint16 x, Uint16 y)
{
x += (this->screen->offset % this->screen->pitch) /
this->screen->format->BytesPerPixel;
y += (this->screen->offset / this->screen->pitch);
SDL_PrivateMouseMotion(0, 0, x, y);
}

36
src/video/vgl/SDL_vglmouse_c.h Normal file
View file

@ -0,0 +1,36 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000 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@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
#include "SDL_vglvideo.h"
/* Functions to be exported */
extern void VGL_FreeWMCursor(_THIS, WMcursor *cursor);
extern WMcursor *VGL_CreateWMCursor(_THIS,
Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);
extern int VGL_ShowWMCursor(_THIS, WMcursor *cursor);
extern void VGL_WarpWMCursor(_THIS, Uint16 x, Uint16 y);

642
src/video/vgl/SDL_vglvideo.c Normal file
View file

@ -0,0 +1,642 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000 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@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
/* libvga based SDL video driver implementation.
*/
#include <err.h>
#include <osreldate.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/fbio.h>
#include <sys/consio.h>
#include <sys/kbio.h>
#include <vgl.h>
#include "SDL.h"
#include "SDL_error.h"
#include "SDL_video.h"
#include "SDL_mouse.h"
#include "SDL_sysvideo.h"
#include "SDL_pixels_c.h"
#include "SDL_events_c.h"
#include "SDL_vglvideo.h"
#include "SDL_vglevents_c.h"
#include "SDL_vglmouse_c.h"
/* Initialization/Query functions */
static int VGL_VideoInit(_THIS, SDL_PixelFormat *vformat);
static SDL_Rect **VGL_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags);
static SDL_Surface *VGL_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags);
static int VGL_SetColors(_THIS, int firstcolor, int ncolors,
SDL_Color *colors);
static void VGL_VideoQuit(_THIS);
/* Hardware surface functions */
static int VGL_AllocHWSurface(_THIS, SDL_Surface *surface);
static int VGL_LockHWSurface(_THIS, SDL_Surface *surface);
static int VGL_FlipHWSurface(_THIS, SDL_Surface *surface);
static void VGL_UnlockHWSurface(_THIS, SDL_Surface *surface);
static void VGL_FreeHWSurface(_THIS, SDL_Surface *surface);
/* Misc function */
static VGLMode ** VGLListModes(int depth, int mem_model);
static void VGLWaitRetrace(void);
/* VGL driver bootstrap functions */
static int VGL_Available(void)
{
/*
* Check to see if we are root and stdin is a
* virtual console. Also try to ensure that
* modes other than 320x200 are available
*/
int console, hires_available, i;
VGLMode **modes;
console = STDIN_FILENO;
if ( console >= 0 ) {
struct stat sb;
struct vt_mode dummy;
if ( (fstat(console, &sb) < 0) ||
(ioctl(console, VT_GETMODE, &dummy) < 0) ) {
console = -1;
}
}
if (geteuid() != 0 && console == -1)
return 0;
modes = VGLListModes(8, V_INFO_MM_DIRECT | V_INFO_MM_PACKED);
hires_available = 0;
for (i = 0; modes[i] != NULL; i++) {
if ((modes[i]->ModeInfo.Xsize > 320) &&
(modes[i]->ModeInfo.Ysize > 200) &&
((modes[i]->ModeInfo.Type == VIDBUF8) ||
(modes[i]->ModeInfo.Type == VIDBUF16) ||
(modes[i]->ModeInfo.Type == VIDBUF32))) {
hires_available = 1;
break;
}
}
return hires_available;
}
static void VGL_DeleteDevice(SDL_VideoDevice *device)
{
free(device->hidden);
free(device);
}
static SDL_VideoDevice *VGL_CreateDevice(int devindex)
{
SDL_VideoDevice *device;
/* Initialize all variables that we clean on shutdown */
device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice));
if ( device ) {
memset(device, 0, (sizeof *device));
device->hidden = (struct SDL_PrivateVideoData *)
malloc((sizeof *device->hidden));
}
if ( (device == NULL) || (device->hidden == NULL) ) {
SDL_OutOfMemory();
if ( device ) {
free(device);
}
return(0);
}
memset(device->hidden, 0, (sizeof *device->hidden));
/* Set the function pointers */
device->VideoInit = VGL_VideoInit;
device->ListModes = VGL_ListModes;
device->SetVideoMode = VGL_SetVideoMode;
device->SetColors = VGL_SetColors;
device->UpdateRects = NULL;
device->VideoQuit = VGL_VideoQuit;
device->AllocHWSurface = VGL_AllocHWSurface;
device->CheckHWBlit = NULL;
device->FillHWRect = NULL;
device->SetHWColorKey = NULL;
device->SetHWAlpha = NULL;
device->LockHWSurface = VGL_LockHWSurface;
device->UnlockHWSurface = VGL_UnlockHWSurface;
device->FlipHWSurface = VGL_FlipHWSurface;
device->FreeHWSurface = VGL_FreeHWSurface;
device->SetIcon = NULL;
device->SetCaption = NULL;
device->GetWMInfo = NULL;
device->FreeWMCursor = VGL_FreeWMCursor;
device->CreateWMCursor = VGL_CreateWMCursor;
device->ShowWMCursor = VGL_ShowWMCursor;
device->WarpWMCursor = VGL_WarpWMCursor;
device->InitOSKeymap = VGL_InitOSKeymap;
device->PumpEvents = VGL_PumpEvents;
device->free = VGL_DeleteDevice;
return device;
}
VideoBootStrap VGL_bootstrap = {
"vgl", "FreeBSD libVGL",
VGL_Available, VGL_CreateDevice
};
static int VGL_AddMode(_THIS, VGLMode *inmode)
{
SDL_Rect *mode;
int i, index;
int next_mode;
/* Check to see if we already have this mode */
if (inmode->Depth < 8) { /* Not supported */
return 0;
}
index = ((inmode->Depth + 7) / 8) - 1;
for (i=0; i<SDL_nummodes[index]; ++i) {
mode = SDL_modelist[index][i];
if ((mode->w == inmode->ModeInfo.Xsize) &&
(mode->h == inmode->ModeInfo.Ysize))
return 0;
}
/* Set up the new video mode rectangle */
mode = (SDL_Rect *)malloc(sizeof *mode);
if (mode == NULL) {
SDL_OutOfMemory();
return -1;
}
mode->x = 0;
mode->y = 0;
mode->w = inmode->ModeInfo.Xsize;
mode->h = inmode->ModeInfo.Ysize;
/* Allocate the new list of modes, and fill in the new mode */
next_mode = SDL_nummodes[index];
SDL_modelist[index] = (SDL_Rect **)
realloc(SDL_modelist[index], (1+next_mode+1)*sizeof(SDL_Rect *));
if (SDL_modelist[index] == NULL) {
SDL_OutOfMemory();
SDL_nummodes[index] = 0;
free(mode);
return -1;
}
SDL_modelist[index][next_mode] = mode;
SDL_modelist[index][next_mode+1] = NULL;
SDL_nummodes[index]++;
return 0;
}
static void VGL_UpdateVideoInfo(_THIS)
{
this->info.wm_available = 0;
this->info.hw_available = 1;
this->info.video_mem = 0;
if (VGLCurMode == NULL) {
return;
}
if (VGLCurMode->ModeInfo.PixelBytes > 0) {
this->info.video_mem = VGLCurMode->ModeInfo.PixelBytes *
VGLCurMode->ModeInfo.Xsize *
VGLCurMode->ModeInfo.Ysize;
}
}
int VGL_VideoInit(_THIS, SDL_PixelFormat *vformat)
{
int i;
int total_modes;
VGLMode **modes;
/* Initialize all variables that we clean on shutdown */
for ( i=0; i<NUM_MODELISTS; ++i ) {
SDL_nummodes[i] = 0;
SDL_modelist[i] = NULL;
}
/* Enable mouse and keyboard support */
if (getenv("SDL_NO_RAWKBD") == NULL) {
if (VGLKeyboardInit(VGL_CODEKEYS) != 0) {
SDL_SetError("Unable to initialize keyboard");
return -1;
}
} else {
warnx("Requiest to put keyboard into a raw mode ignored");
}
if (VGL_initkeymaps(STDIN_FILENO) != 0) {
SDL_SetError("Unable to initialize keymap");
return -1;
}
if (VGL_initmouse(STDIN_FILENO) != 0) {
SDL_SetError("Unable to initialize mouse");
return -1;
}
/* Determine the screen depth */
if (VGLCurMode != NULL)
vformat->BitsPerPixel = VGLCurMode->Depth;
else
vformat->BitsPerPixel = 16; /* Good default */
/* Query for the list of available video modes */
total_modes = 0;
modes = VGLListModes(-1, V_INFO_MM_DIRECT | V_INFO_MM_PACKED);
for (i = 0; modes[i] != NULL; i++) {
if ((modes[i]->ModeInfo.Type == VIDBUF8) ||
(modes[i]->ModeInfo.Type == VIDBUF16) ||
(modes[i]->ModeInfo.Type == VIDBUF32)) {
VGL_AddMode(this, modes[i]);
total_modes++;
}
}
if (total_modes == 0) {
SDL_SetError("No linear video modes available");
return -1;
}
/* Fill in our hardware acceleration capabilities */
VGL_UpdateVideoInfo(this);
/* Create the hardware surface lock mutex */
hw_lock = SDL_CreateMutex();
if (hw_lock == NULL) {
SDL_SetError("Unable to create lock mutex");
VGL_VideoQuit(this);
return -1;
}
/* We're done! */
return 0;
}
SDL_Rect **VGL_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
{
return SDL_modelist[((format->BitsPerPixel+7)/8)-1];
}
/* Various screen update functions available */
static void VGL_DirectUpdate(_THIS, int numrects, SDL_Rect *rects);
static void VGL_BankedUpdate(_THIS, int numrects, SDL_Rect *rects);
SDL_Surface *VGL_SetVideoMode(_THIS, SDL_Surface *current,
int width, int height, int bpp, Uint32 flags)
{
int mode_found;
int i;
VGLMode **modes;
modes = VGLListModes(bpp, V_INFO_MM_DIRECT | V_INFO_MM_PACKED);
mode_found = 0;
for (i = 0; modes[i] != NULL; i++) {
if ((modes[i]->ModeInfo.Xsize == width) &&
(modes[i]->ModeInfo.Ysize == height) &&
((modes[i]->ModeInfo.Type == VIDBUF8) ||
(modes[i]->ModeInfo.Type == VIDBUF16) ||
(modes[i]->ModeInfo.Type == VIDBUF32))) {
mode_found = 1;
break;
}
}
if (mode_found == 0) {
SDL_SetError("No matching video mode found");
return NULL;
}
/* Shutdown previous videomode (if any) */
if (VGLCurMode != NULL)
VGLEnd();
/* Try to set the requested linear video mode */
if (VGLInit(modes[i]->ModeId) != 0) {
SDL_SetError("Unable to switch to requested mode");
return NULL;
}
VGLCurMode = realloc(VGLCurMode, sizeof(VGLMode));
VGLCurMode->ModeInfo = *VGLDisplay;
VGLCurMode->Depth = modes[i]->Depth;
VGLCurMode->ModeId = modes[i]->ModeId;
VGLCurMode->Rmask = modes[i]->Rmask;
VGLCurMode->Gmask = modes[i]->Gmask;
VGLCurMode->Bmask = modes[i]->Bmask;
/* Workaround a bug in libvgl */
if (VGLCurMode->ModeInfo.PixelBytes == 0)
(VGLCurMode->ModeInfo.PixelBytes = 1);
current->w = VGLCurMode->ModeInfo.Xsize;
current->h = VGLCurMode->ModeInfo.Ysize;
current->pixels = VGLCurMode->ModeInfo.Bitmap;
current->pitch = VGLCurMode->ModeInfo.Xsize *
VGLCurMode->ModeInfo.PixelBytes;
current->flags = (SDL_FULLSCREEN | SDL_HWSURFACE);
/* Check if we are in a pseudo-color mode */
if (VGLCurMode->ModeInfo.Type == VIDBUF8)
current->flags |= SDL_HWPALETTE;
/* Check if we can do doublebuffering */
if (flags & SDL_DOUBLEBUF) {
if (VGLCurMode->ModeInfo.Xsize * 2 <=
VGLCurMode->ModeInfo.VYsize) {
current->flags |= SDL_DOUBLEBUF;
flip_page = 0;
flip_address[0] = (byte *)current->pixels;
flip_address[1] = (byte *)current->pixels +
current->h * current->pitch;
VGL_FlipHWSurface(this, current);
}
}
if (! SDL_ReallocFormat(current, modes[i]->Depth, VGLCurMode->Rmask,
VGLCurMode->Gmask, VGLCurMode->Bmask, 0)) {
return NULL;
}
/* Update hardware acceleration info */
VGL_UpdateVideoInfo(this);
/* Set the blit function */
this->UpdateRects = VGL_DirectUpdate;
/* We're done */
return current;
}
/* We don't actually allow hardware surfaces other than the main one */
static int VGL_AllocHWSurface(_THIS, SDL_Surface *surface)
{
return -1;
}
static void VGL_FreeHWSurface(_THIS, SDL_Surface *surface)
{
return;
}
/* We need to wait for vertical retrace on page flipped displays */
static int VGL_LockHWSurface(_THIS, SDL_Surface *surface)
{
if (surface == SDL_VideoSurface) {
SDL_mutexP(hw_lock);
}
return 0;
}
static void VGL_UnlockHWSurface(_THIS, SDL_Surface *surface)
{
if (surface == SDL_VideoSurface) {
SDL_mutexV(hw_lock);
}
}
static int VGL_FlipHWSurface(_THIS, SDL_Surface *surface)
{
// VGLWaitRetrace();
if (VGLPanScreen(VGLDisplay, 0, flip_page * surface->h) < 0) {
SDL_SetError("VGLPanSreen() failed");
return -1;
}
flip_page = !flip_page;
surface->pixels = flip_address[flip_page];
return 0;
}
static void VGL_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
{
return;
}
static void VGL_BankedUpdate(_THIS, int numrects, SDL_Rect *rects)
{
return;
}
int VGL_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors)
{
int i;
for(i = 0; i < ncolors; i++) {
VGLSetPaletteIndex(firstcolor + i,
colors[i].r>>2,
colors[i].g>>2,
colors[i].b>>2);
}
return 1;
}
/* Note: If we are terminated, this could be called in the middle of
another SDL video routine -- notably UpdateRects.
*/
void VGL_VideoQuit(_THIS)
{
int i, j;
/* Return the keyboard to the normal state */
VGLKeyboardEnd();
/* Reset the console video mode if we actually initialised one */
if (VGLCurMode != NULL) {
VGLEnd();
free(VGLCurMode);
VGLCurMode = NULL;
}
/* Clear the lock mutex */
if (hw_lock != NULL) {
SDL_DestroyMutex(hw_lock);
hw_lock = NULL;
}
/* Free video mode lists */
for (i = 0; i < NUM_MODELISTS; i++) {
if (SDL_modelist[i] != NULL) {
for (j = 0; SDL_modelist[i][j] != NULL; ++j) {
free(SDL_modelist[i][j]);
}
free(SDL_modelist[i]);
SDL_modelist[i] = NULL;
}
}
if ( this->screen && (this->screen->flags & SDL_HWSURFACE) ) {
/* Direct screen access, not a memory buffer */
this->screen->pixels = NULL;
}
}
#define VGL_RED_INDEX 0
#define VGL_GREEN_INDEX 1
#define VGL_BLUE_INDEX 2
static VGLMode **
VGLListModes(int depth, int mem_model)
{
static VGLMode **modes = NULL;
VGLBitmap *vminfop;
VGLMode **modesp, *modescp;
video_info_t minfo;
int adptype, i, modenum;
if (modes == NULL) {
modes = malloc(sizeof(VGLMode *) * M_VESA_MODE_MAX);
bzero(modes, sizeof(VGLMode *) * M_VESA_MODE_MAX);
}
modesp = modes;
for (modenum = 0; modenum < M_VESA_MODE_MAX; modenum++) {
minfo.vi_mode = modenum;
if (ioctl(0, CONS_MODEINFO, &minfo) || ioctl(0, CONS_CURRENT, &adptype))
continue;
if (minfo.vi_mode != modenum)
continue;
if ((minfo.vi_flags & V_INFO_GRAPHICS) == 0)
continue;
if ((mem_model != -1) && ((minfo.vi_mem_model & mem_model) == 0))
continue;
if ((depth > 1) && (minfo.vi_depth != depth))
continue;
/* reallocf can fail */
if ((*modesp = reallocf(*modesp, sizeof(VGLMode))) == NULL)
return NULL;
modescp = *modesp;
vminfop = &(modescp->ModeInfo);
bzero(vminfop, sizeof(VGLBitmap));
vminfop->Type = NOBUF;
vminfop->PixelBytes = 1; /* Good default value */
switch (minfo.vi_mem_model) {
case V_INFO_MM_PLANAR:
/* we can handle EGA/VGA planar modes only */
if (!(minfo.vi_depth != 4 || minfo.vi_planes != 4
|| (adptype != KD_EGA && adptype != KD_VGA)))
vminfop->Type = VIDBUF4;
break;
case V_INFO_MM_PACKED:
/* we can do only 256 color packed modes */
if (minfo.vi_depth == 8)
vminfop->Type = VIDBUF8;
break;
case V_INFO_MM_VGAX:
vminfop->Type = VIDBUF8X;
break;
#if defined(__FreeBSD_version) && __FreeBSD_version >= 500000
case V_INFO_MM_DIRECT:
vminfop->PixelBytes = minfo.vi_pixel_size;
switch (vminfop->PixelBytes) {
case 2:
vminfop->Type = VIDBUF16;
break;
#if notyet
case 3:
vminfop->Type = VIDBUF24;
break;
#endif
case 4:
vminfop->Type = VIDBUF32;
break;
default:
break;
}
#endif
default:
break;
}
if (vminfop->Type == NOBUF)
continue;
switch (vminfop->Type) {
case VIDBUF16:
case VIDBUF32:
modescp->Rmask = ((1 << minfo.vi_pixel_fsizes[VGL_RED_INDEX]) - 1) <<
minfo.vi_pixel_fields[VGL_RED_INDEX];
modescp->Gmask = ((1 << minfo.vi_pixel_fsizes[VGL_GREEN_INDEX]) - 1) <<
minfo.vi_pixel_fields[VGL_GREEN_INDEX];
modescp->Bmask = ((1 << minfo.vi_pixel_fsizes[VGL_BLUE_INDEX]) - 1) <<
minfo.vi_pixel_fields[VGL_BLUE_INDEX];
break;
default:
break;
}
vminfop->Xsize = minfo.vi_width;
vminfop->Ysize = minfo.vi_height;
modescp->Depth = minfo.vi_depth;
/* XXX */
if (minfo.vi_mode >= M_VESA_BASE)
modescp->ModeId = _IO('V', minfo.vi_mode - M_VESA_BASE);
else
modescp->ModeId = _IO('S', minfo.vi_mode);
/* Sort list */
for (i = 0; modes + i < modesp ; i++) {
if (modes[i]->ModeInfo.Xsize * modes[i]->ModeInfo.Ysize >
vminfop->Xsize * modes[i]->ModeInfo.Ysize)
continue;
if ((modes[i]->ModeInfo.Xsize * modes[i]->ModeInfo.Ysize ==
vminfop->Xsize * vminfop->Ysize) &&
(modes[i]->Depth >= modescp->Depth))
continue;
*modesp = modes[i];
modes[i] = modescp;
modescp = *modesp;
vminfop = &(modescp->ModeInfo);
}
modesp++;
}
if (*modesp != NULL) {
free(*modesp);
*modesp = NULL;
}
return modes;
}
static void
VGLWaitRetrace(void)
{
while (!(inb(0x3DA) & 8));
while (inb(0x3DA) & 8);
}

69
src/video/vgl/SDL_vglvideo.h Normal file
View file

@ -0,0 +1,69 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000 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@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
#ifndef _SDL_vglvideo_h
#define _SDL_vglvideo_h
#include <sys/fbio.h>
#include <sys/consio.h>
#include <vgl.h>
#include "SDL_mouse.h"
#include "SDL_mutex.h"
#include "SDL_sysvideo.h"
/* Hidden "this" pointer for the video functions */
#define _THIS SDL_VideoDevice *this
typedef struct {
int ModeId;
int Depth;
int Rmask;
int Gmask;
int Bmask;
VGLBitmap ModeInfo;
} VGLMode;
/* Private display data */
struct SDL_PrivateVideoData {
#define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */
int SDL_nummodes[NUM_MODELISTS];
SDL_Rect **SDL_modelist[NUM_MODELISTS];
SDL_mutex *hw_lock;
VGLMode *VGLCurMode;
int flip_page;
byte *flip_address[2];
};
/* Old variable names */
#define SDL_nummodes (this->hidden->SDL_nummodes)
#define SDL_modelist (this->hidden->SDL_modelist)
#define hw_lock (this->hidden->hw_lock)
#define VGLCurMode (this->hidden->VGLCurMode)
#define flip_page (this->hidden->flip_page)
#define flip_address (this->hidden->flip_address)
#endif /* _SDL_vglvideo_h */

2
src/video/x11/SDL_x11events.c
View file

@ -37,7 +37,9 @@ static char rcsid =
#ifdef __SVR4
#include <X11/Sunkeysym.h>
#endif
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#include "SDL.h"
#include "SDL_syswm.h"