Mercurial > sdl-ios-xcode
annotate src/video/fbcon/SDL_fbvideo.h @ 1201:718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
From: Alberto Mardegan <mardy@users.sourceforge.net>
To: sdl@libsdl.org
Subject: [SDL] [PATCH] Touchscreen support to fbcon via tslib
Hi all!
I'm new to this list, I just subscribed. I've attached to this e-mail
a patch I've written in order to add Touchscreen support to SDL's fbcon
module via the tslib library.
Since it introduces a new dependency, I've also edited the the
configure.in file and added it as a compile-time option.
This patch is especially useful for handhelds (I've tested it in my
Zaurus).
Please consider applying it. :-)
--
Saluti,
Mardy
http://interlingua.altervista.org
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 12 Dec 2005 09:26:32 +0000 |
| parents | b8d311d90021 |
| children | c9b51268668f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
106
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #ifndef _SDL_fbvideo_h | |
| 29 #define _SDL_fbvideo_h | |
| 30 | |
| 31 #include <sys/types.h> | |
| 32 #include <termios.h> | |
| 33 #include <linux/fb.h> | |
| 34 | |
| 35 #include "SDL_mouse.h" | |
| 36 #include "SDL_mutex.h" | |
| 37 #include "SDL_sysvideo.h" | |
|
1201
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
38 #ifdef HAVE_TSLIB |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
39 #include "tslib.h" |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
40 #endif |
| 0 | 41 |
| 42 /* Hidden "this" pointer for the video functions */ | |
| 43 #define _THIS SDL_VideoDevice *this | |
| 44 | |
| 45 | |
| 46 /* This is the structure we use to keep track of video memory */ | |
| 47 typedef struct vidmem_bucket { | |
| 48 struct vidmem_bucket *prev; | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
49 int used; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
50 int dirty; |
| 0 | 51 char *base; |
| 52 unsigned int size; | |
| 53 struct vidmem_bucket *next; | |
| 54 } vidmem_bucket; | |
| 55 | |
| 56 /* Private display data */ | |
| 57 struct SDL_PrivateVideoData { | |
| 58 int console_fd; | |
| 59 struct fb_var_screeninfo cache_vinfo; | |
| 60 struct fb_var_screeninfo saved_vinfo; | |
| 61 int saved_cmaplen; | |
| 62 __u16 *saved_cmap; | |
| 63 | |
| 64 int current_vt; | |
| 65 int saved_vt; | |
| 66 int keyboard_fd; | |
| 67 int saved_kbd_mode; | |
| 68 struct termios saved_kbd_termios; | |
| 69 | |
| 70 int mouse_fd; | |
|
1201
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
71 #ifdef HAVE_TSLIB |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
72 struct tsdev *ts_dev; |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
73 #endif |
| 0 | 74 |
| 75 char *mapped_mem; | |
| 76 int mapped_memlen; | |
| 77 int mapped_offset; | |
| 78 char *mapped_io; | |
| 79 long mapped_iolen; | |
| 80 int flip_page; | |
| 81 char *flip_address[2]; | |
| 82 | |
| 83 #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ | |
| 84 int SDL_nummodes[NUM_MODELISTS]; | |
| 85 SDL_Rect **SDL_modelist[NUM_MODELISTS]; | |
| 86 | |
| 87 vidmem_bucket surfaces; | |
| 88 int surfaces_memtotal; | |
| 89 int surfaces_memleft; | |
| 90 | |
| 91 SDL_mutex *hw_lock; | |
| 92 | |
| 93 void (*wait_vbl)(_THIS); | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
94 void (*wait_idle)(_THIS); |
| 0 | 95 }; |
| 96 /* Old variable names */ | |
| 97 #define console_fd (this->hidden->console_fd) | |
| 98 #define current_vt (this->hidden->current_vt) | |
| 99 #define saved_vt (this->hidden->saved_vt) | |
| 100 #define keyboard_fd (this->hidden->keyboard_fd) | |
| 101 #define saved_kbd_mode (this->hidden->saved_kbd_mode) | |
| 102 #define saved_kbd_termios (this->hidden->saved_kbd_termios) | |
| 103 #define mouse_fd (this->hidden->mouse_fd) | |
|
1201
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
104 #ifdef HAVE_TSLIB |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
105 #define ts_dev (this->hidden->ts_dev) |
|
718d00094f82
Date: Sat, 10 Dec 2005 18:29:41 +0100
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
106 #endif /* HAVE_TSLIB */ |
| 0 | 107 #define cache_vinfo (this->hidden->cache_vinfo) |
| 108 #define saved_vinfo (this->hidden->saved_vinfo) | |
| 109 #define saved_cmaplen (this->hidden->saved_cmaplen) | |
| 110 #define saved_cmap (this->hidden->saved_cmap) | |
| 111 #define mapped_mem (this->hidden->mapped_mem) | |
| 112 #define mapped_memlen (this->hidden->mapped_memlen) | |
| 113 #define mapped_offset (this->hidden->mapped_offset) | |
| 114 #define mapped_io (this->hidden->mapped_io) | |
| 115 #define mapped_iolen (this->hidden->mapped_iolen) | |
| 116 #define flip_page (this->hidden->flip_page) | |
| 117 #define flip_address (this->hidden->flip_address) | |
| 118 #define SDL_nummodes (this->hidden->SDL_nummodes) | |
| 119 #define SDL_modelist (this->hidden->SDL_modelist) | |
| 120 #define surfaces (this->hidden->surfaces) | |
| 121 #define surfaces_memtotal (this->hidden->surfaces_memtotal) | |
| 122 #define surfaces_memleft (this->hidden->surfaces_memleft) | |
| 123 #define hw_lock (this->hidden->hw_lock) | |
| 124 #define wait_vbl (this->hidden->wait_vbl) | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
125 #define wait_idle (this->hidden->wait_idle) |
| 0 | 126 |
| 127 /* Accelerator types that are supported by the driver, but are not | |
| 128 necessarily in the kernel headers on the system we compile on. | |
| 129 */ | |
| 130 #ifndef FB_ACCEL_MATROX_MGAG400 | |
| 131 #define FB_ACCEL_MATROX_MGAG400 26 /* Matrox G400 */ | |
| 132 #endif | |
| 133 #ifndef FB_ACCEL_3DFX_BANSHEE | |
| 134 #define FB_ACCEL_3DFX_BANSHEE 31 /* 3Dfx Banshee */ | |
| 135 #endif | |
| 136 | |
| 137 /* These functions are defined in SDL_fbvideo.c */ | |
| 138 extern void FB_SavePaletteTo(_THIS, int palette_len, __u16 *area); | |
| 139 extern void FB_RestorePaletteFrom(_THIS, int palette_len, __u16 *area); | |
| 140 | |
|
106
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
141 /* These are utility functions for working with video surfaces */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
142 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
143 static __inline__ void FB_AddBusySurface(SDL_Surface *surface) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
144 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
145 ((vidmem_bucket *)surface->hwdata)->dirty = 1; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
146 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
147 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
148 static __inline__ int FB_IsSurfaceBusy(SDL_Surface *surface) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
149 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
150 return ((vidmem_bucket *)surface->hwdata)->dirty; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
151 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
152 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
153 static __inline__ void FB_WaitBusySurfaces(_THIS) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
154 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
155 vidmem_bucket *bucket; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
156 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
157 /* Wait for graphic operations to complete */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
158 wait_idle(this); |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
159 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
160 /* Clear all surface dirty bits */ |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
161 for ( bucket=&surfaces; bucket; bucket=bucket->next ) { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
162 bucket->dirty = 0; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
163 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
164 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
165 |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
166 static __inline__ void FB_dst_to_xy(_THIS, SDL_Surface *dst, int *x, int *y) |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
167 { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
168 *x = (long)((char *)dst->pixels - mapped_mem)%this->screen->pitch; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
169 *y = (long)((char *)dst->pixels - mapped_mem)/this->screen->pitch; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
170 if ( dst == this->screen ) { |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
171 *x += this->offset_x; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
172 *y += this->offset_y; |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
173 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
174 } |
|
63ec24e0575f
Merged DGA video surface handling improvements, unified locking code.
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
175 |
| 0 | 176 #endif /* _SDL_fbvideo_h */ |