Skip to content

L
libSDL
Commit 9e856712 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Added support for DirectFB video on Linux (thanks Denis!) 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40168
parent ee5429fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1262 additions and 1 deletion
configure.in
View file @ 9e856712
...@@ -695,6 +695,46 @@ CheckFBCON() ...@@ -695,6 +695,46 @@ CheckFBCON()
fi fi
} }
dnl Find DirectFB
CheckDirectFB()
{
AC_ARG_ENABLE(video-directfb,
[ --enable-video-directfb use DirectFB video driver [default=yes]],
, enable_video_directfb=yes)
if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then
video_directfb=no
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG = xno ; then
AC_MSG_WARN([*** pkg-config is required to build the DirectFB video driver.])
else
AC_MSG_CHECKING(for DirectFB support)
if ! pkg-config --atleast-pkgconfig-version 0.5 ; then
AC_MSG_ERROR([*** pkg-config too old; version 0.5 or better required.])
fi
DIRECTFB_REQUIRED_VERSION=0.9.5
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb`
DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb`
video_directfb=yes
fi
fi
AC_MSG_RESULT($video_directfb)
if test x$video_directfb = xyes; then
CFLAGS="$CFLAGS -DENABLE_DIRECTFB"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS directfb"
VIDEO_DRIVERS="$VIDEO_DRIVERS directfb/libvideo_directfb.la"
AC_SUBST(DIRECTFB_CFLAGS)
AC_SUBST(DIRECTFB_LIBS)
fi
fi
}
dnl See if we're running on PlayStation 2 hardware dnl See if we're running on PlayStation 2 hardware
CheckPS2GS() CheckPS2GS()
{ {
...@@ -1219,6 +1259,7 @@ case "$target" in ...@@ -1219,6 +1259,7 @@ case "$target" in
CheckNANOX CheckNANOX
CheckDGA CheckDGA
CheckFBCON CheckFBCON
CheckDirectFB
CheckPS2GS CheckPS2GS
CheckGGI CheckGGI
CheckSVGA CheckSVGA
...@@ -2174,6 +2215,7 @@ src/video/x11/Makefile ...@@ -2174,6 +2215,7 @@ src/video/x11/Makefile
src/video/dga/Makefile src/video/dga/Makefile
src/video/nanox/Makefile src/video/nanox/Makefile
src/video/fbcon/Makefile src/video/fbcon/Makefile
src/video/directfb/Makefile
src/video/ps2gs/Makefile src/video/ps2gs/Makefile
src/video/ggi/Makefile src/video/ggi/Makefile
src/video/maccommon/Makefile src/video/maccommon/Makefile
......
docs.html
View file @ 9e856712
...@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>. ...@@ -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: Major changes since SDL 1.0.0:
</H2> </H2>
<UL> <UL>
<LI> 1.2.3: Added support for DirectFB video on Linux (thanks Denis!)
<LI> 1.2.3: Fixed IDE and SCSI CD-ROM detection on BeOS (thanks Caz!) <LI> 1.2.3: Fixed IDE and SCSI CD-ROM detection on BeOS (thanks Caz!)
<LI> 1.2.3: Fixed the system dependent SDL_WINDOWID hack on Windows <LI> 1.2.3: Fixed the system dependent SDL_WINDOWID hack on Windows
<LI> 1.2.3: Added 640x480 as a scaled resolution for NTSC/PAL output <LI> 1.2.3: Added 640x480 as a scaled resolution for NTSC/PAL output
......
src/video/Makefile.am
View file @ 9e856712
...@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libvideo.la ...@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libvideo.la
# Define which subdirectories need to be built # Define which subdirectories need to be built
SUBDIRS = @VIDEO_SUBDIRS@ SUBDIRS = @VIDEO_SUBDIRS@
DIST_SUBDIRS = dummy x11 dga nanox fbcon vgl svga ggi aalib \ DIST_SUBDIRS = dummy x11 dga nanox fbcon directfb vgl svga ggi aalib \
wincommon windib windx5 \ wincommon windib windx5 \
maccommon macdsp macrom quartz \ maccommon macdsp macrom quartz \
bwindow ps2gs photon cybergfx bwindow ps2gs photon cybergfx
......
src/video/SDL_sysvideo.h
View file @ 9e856712
...@@ -337,6 +337,9 @@ extern VideoBootStrap NX_bootstrap; ...@@ -337,6 +337,9 @@ extern VideoBootStrap NX_bootstrap;
#ifdef ENABLE_FBCON #ifdef ENABLE_FBCON
extern VideoBootStrap FBCON_bootstrap; extern VideoBootStrap FBCON_bootstrap;
#endif #endif
#ifdef ENABLE_DIRECTFB
extern VideoBootStrap DirectFB_bootstrap;
#endif
#ifdef ENABLE_PS2GS #ifdef ENABLE_PS2GS
extern VideoBootStrap PS2GS_bootstrap; extern VideoBootStrap PS2GS_bootstrap;
#endif #endif
......
src/video/SDL_video.c
View file @ 9e856712
...@@ -57,6 +57,9 @@ static VideoBootStrap *bootstrap[] = { ...@@ -57,6 +57,9 @@ static VideoBootStrap *bootstrap[] = {
#ifdef ENABLE_FBCON #ifdef ENABLE_FBCON
&FBCON_bootstrap, &FBCON_bootstrap,
#endif #endif
#ifdef ENABLE_DIRECTFB
&DirectFB_bootstrap,
#endif
#ifdef ENABLE_PS2GS #ifdef ENABLE_PS2GS
&PS2GS_bootstrap, &PS2GS_bootstrap,
#endif #endif
......
src/video/directfb/.cvsignore 0 → 100644
View file @ 9e856712
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
src/video/directfb/Makefile.am 0 → 100644
View file @ 9e856712
## Makefile.am for SDL using the DirectFB video driver
CFLAGS = @CFLAGS@ $(DIRECTFB_CFLAGS)
noinst_LTLIBRARIES = libvideo_directfb.la
libvideo_directfb_la_SOURCES = $(DIRECTFB_SRCS)
libvideo_directfb_la_LIBADD = $(DIRECTFB_LIBS)
# The SDL DirectFB video driver sources
DIRECTFB_SRCS = \
SDL_DirectFB_events.c \
SDL_DirectFB_events.h \
SDL_DirectFB_video.c \
SDL_DirectFB_video.h
src/video/directfb/SDL_DirectFB_events.c 0 → 100644
View file @ 9e856712
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 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 DirectFB input events into SDL events */
#include <sys/types.h>
#include <sys/time.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include <termios.h>
#include <directfb.h>
#include "SDL.h"
#include "SDL_sysevents.h"
#include "SDL_sysvideo.h"
#include "SDL_events_c.h"
#include "SDL_DirectFB_video.h"
#include "SDL_DirectFB_events.h"
/* The translation tables from a DirectFB keycode to a SDL keysym */
static SDLKey keymap[256];
static SDL_keysym *DirectFB_TranslateKey (DFBInputEvent *ev, SDL_keysym *keysym);
static int DirectFB_TranslateButton (DFBInputEvent *ev);
static int posted = 0;
void DirectFB_PumpEvents (_THIS)
{
DFBInputEvent evt;
while (HIDDEN->inputbuffer->GetEvent (HIDDEN->inputbuffer, &evt) == DFB_OK)
{
SDL_keysym keysym;
switch (evt.type)
{
case DIET_BUTTONPRESS:
posted += SDL_PrivateMouseButton(SDL_PRESSED,
DirectFB_TranslateButton (&evt), 0, 0);
break;
case DIET_BUTTONRELEASE:
posted += SDL_PrivateMouseButton(SDL_RELEASED,
DirectFB_TranslateButton (&evt), 0, 0);
break;
case DIET_KEYPRESS:
posted += SDL_PrivateKeyboard(SDL_PRESSED, DirectFB_TranslateKey(&evt, &keysym));
break;
case DIET_KEYRELEASE:
posted += SDL_PrivateKeyboard(SDL_RELEASED, DirectFB_TranslateKey(&evt, &keysym));
break;
case DIET_AXISMOTION:
if (evt.flags & DIEF_AXISREL)
{
if (evt.axis == DIAI_X)
posted += SDL_PrivateMouseMotion(0, 1, evt.axisrel, 0);
else if (evt.axis == DIAI_Y)
posted += SDL_PrivateMouseMotion(0, 1, 0, evt.axisrel);
}
break;
default:
;
}
}
}
void DirectFB_InitOSKeymap (_THIS)
{
int i;
/* Initialize the DirectFB key translation table */
for (i=0; i<SDL_TABLESIZE(keymap); ++i)
keymap[i] = SDLK_UNKNOWN;
keymap[DIKC_A] = SDLK_a;
keymap[DIKC_B] = SDLK_b;
keymap[DIKC_C] = SDLK_c;
keymap[DIKC_D] = SDLK_d;
keymap[DIKC_E] = SDLK_e;
keymap[DIKC_F] = SDLK_f;
keymap[DIKC_G] = SDLK_g;
keymap[DIKC_H] = SDLK_h;
keymap[DIKC_I] = SDLK_i;
keymap[DIKC_J] = SDLK_j;
keymap[DIKC_K] = SDLK_k;
keymap[DIKC_L] = SDLK_l;
keymap[DIKC_M] = SDLK_m;
keymap[DIKC_N] = SDLK_n;
keymap[DIKC_O] = SDLK_o;
keymap[DIKC_P] = SDLK_p;
keymap[DIKC_Q] = SDLK_q;
keymap[DIKC_R] = SDLK_r;
keymap[DIKC_S] = SDLK_s;
keymap[DIKC_T] = SDLK_t;
keymap[DIKC_U] = SDLK_u;
keymap[DIKC_V] = SDLK_v;
keymap[DIKC_W] = SDLK_w;
keymap[DIKC_X] = SDLK_x;
keymap[DIKC_Y] = SDLK_y;
keymap[DIKC_Z] = SDLK_z;
keymap[DIKC_0] = SDLK_0;
keymap[DIKC_1] = SDLK_1;
keymap[DIKC_2] = SDLK_2;
keymap[DIKC_3] = SDLK_3;
keymap[DIKC_4] = SDLK_4;
keymap[DIKC_5] = SDLK_5;
keymap[DIKC_6] = SDLK_6;
keymap[DIKC_7] = SDLK_7;
keymap[DIKC_8] = SDLK_8;
keymap[DIKC_9] = SDLK_9;
keymap[DIKC_F1] = SDLK_F1;
keymap[DIKC_F2] = SDLK_F2;
keymap[DIKC_F3] = SDLK_F3;
keymap[DIKC_F4] = SDLK_F4;
keymap[DIKC_F5] = SDLK_F5;
keymap[DIKC_F6] = SDLK_F6;
keymap[DIKC_F7] = SDLK_F7;
keymap[DIKC_F8] = SDLK_F8;
keymap[DIKC_F9] = SDLK_F9;
keymap[DIKC_F10] = SDLK_F10;
keymap[DIKC_F11] = SDLK_F11;
keymap[DIKC_F12] = SDLK_F12;
keymap[DIKC_ESCAPE] = SDLK_ESCAPE;
keymap[DIKC_LEFT] = SDLK_LEFT;
keymap[DIKC_RIGHT] = SDLK_RIGHT;
keymap[DIKC_UP] = SDLK_UP;
keymap[DIKC_DOWN] = SDLK_DOWN;
keymap[DIKC_CTRL] = SDLK_LCTRL;
keymap[DIKC_SHIFT] = SDLK_LSHIFT;
keymap[DIKC_ALT] = SDLK_LALT;
keymap[DIKC_ALTGR] = SDLK_RALT;
keymap[DIKC_TAB] = SDLK_TAB;
keymap[DIKC_ENTER] = SDLK_RETURN;
keymap[DIKC_SPACE] = SDLK_SPACE;
keymap[DIKC_BACKSPACE] = SDLK_BACKSPACE;
keymap[DIKC_INSERT] = SDLK_INSERT;
keymap[DIKC_DELETE] = SDLK_DELETE;
keymap[DIKC_HOME] = SDLK_HOME;
keymap[DIKC_END] = SDLK_END;
keymap[DIKC_PAGEUP] = SDLK_PAGEUP;
keymap[DIKC_PAGEDOWN] = SDLK_PAGEDOWN;
keymap[DIKC_CAPSLOCK] = SDLK_CAPSLOCK;
keymap[DIKC_NUMLOCK] = SDLK_NUMLOCK;
keymap[DIKC_SCRLOCK] = SDLK_SCROLLOCK;
keymap[DIKC_PRINT] = SDLK_PRINT;
keymap[DIKC_PAUSE] = SDLK_PAUSE;
keymap[DIKC_KP_DIV] = SDLK_KP_DIVIDE;
keymap[DIKC_KP_MULT] = SDLK_KP_MULTIPLY;
keymap[DIKC_KP_MINUS] = SDLK_KP_MINUS;
keymap[DIKC_KP_PLUS] = SDLK_KP_PLUS;
keymap[DIKC_KP_ENTER] = SDLK_KP_ENTER;
keymap[DIKC_OK] = SDLK_RETURN;
keymap[DIKC_CANCEL] = SDLK_BREAK;
keymap[DIKC_CLEAR] = SDLK_DELETE;
keymap[DIKC_POWER] = SDLK_POWER;
keymap[DIKC_POWER2] = SDLK_POWER;
keymap[DIKC_MENU] = SDLK_MENU;
keymap[DIKC_HELP] = SDLK_HELP;
keymap[DIKC_BACK] = SDLK_ESCAPE;
}
static SDL_keysym *DirectFB_TranslateKey (DFBInputEvent *ev, SDL_keysym *keysym)
{
/* Set the keysym information */
keysym->scancode = ev->keycode;
keysym->mod = KMOD_NONE;
keysym->unicode = 0;
if (ev->key_ascii > 0 && ev->key_ascii < 128)
keysym->sym = ev->key_ascii;
else
keysym->sym = keymap[ev->keycode];
return keysym;
}
static int DirectFB_TranslateButton (DFBInputEvent *ev)
{
switch (ev->button)
{
case DIBI_LEFT:
return 1;
case DIBI_MIDDLE:
return 2;
case DIBI_RIGHT:
return 3;
default:
return 0;
}
}
src/video/directfb/SDL_DirectFB_events.h 0 → 100644
View file @ 9e856712
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 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_DirectFB_video.h"
/* Functions to be exported */
extern void DirectFB_InitOSKeymap(_THIS);
extern void DirectFB_PumpEvents(_THIS);
src/video/directfb/SDL_DirectFB_keys.h 0 → 100644
View file @ 9e856712
#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 96
#define SCANCODE_RIGHTCONTROL 97
#define SCANCODE_CONTROL 97
#define SCANCODE_KEYPADDIVIDE 98
#define SCANCODE_PRINTSCREEN 99
#define SCANCODE_RIGHTALT 100
#define SCANCODE_BREAK 101 /* Beware: is 119 */
#define SCANCODE_BREAK_ALTERNATIVE 119 /* on some keyboards! */
#define SCANCODE_HOME 102
#define SCANCODE_CURSORBLOCKUP 90 /* Cursor key block */
#define SCANCODE_PAGEUP 104
#define SCANCODE_CURSORBLOCKLEFT 92 /* Cursor key block */
#define SCANCODE_CURSORBLOCKRIGHT 94 /* Cursor key block */
#define SCANCODE_END 107
#define SCANCODE_CURSORBLOCKDOWN 108 /* Cursor key block */
#define SCANCODE_PAGEDOWN 109
#define SCANCODE_INSERT 110
#define SCANCODE_REMOVE 111
#define SCANCODE_RIGHTWIN 126
#define SCANCODE_LEFTWIN 125
src/video/directfb/SDL_DirectFB_video.c 0 → 100644
View file @ 9e856712
This diff is collapsed.
src/video/directfb/SDL_DirectFB_video.h 0 → 100644
View file @ 9e856712
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 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_DirectFB_video_h
#define _SDL_DirectFB_video_h
#include <directfb.h>
#include "SDL_mouse.h"
#include "SDL_sysvideo.h"
#define _THIS SDL_VideoDevice *this
/* Private display data */
struct SDL_PrivateVideoData
{
int initialized;
IDirectFB *dfb;
IDirectFBDisplayLayer *layer;
IDirectFBInputBuffer *inputbuffer;
#define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */
int SDL_nummodes[NUM_MODELISTS];
SDL_Rect **SDL_modelist[NUM_MODELISTS];
};
#define HIDDEN (this->hidden)
#endif /* _SDL_DirectFB_video_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