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

*** empty log message ***

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401023
This commit is contained in:
Sam Lantinga 2005-01-04 19:04:14 +00:00
parent c731082579
commit bef6a4f3cc
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video/fbcon/SDL_fbevents.c
View file

@ -835,7 +835,7 @@ static void handle_mouse(_THIS)
static void switch_vt(_THIS, unsigned short which) static void switch_vt(_THIS, unsigned short which)
{ {
struct vt_stat vtstate; struct vt_stat vtstate;
unsigned short current; unsigned short v_active;
SDL_Surface *screen; SDL_Surface *screen;
__u16 saved_pal[3*256]; __u16 saved_pal[3*256];
Uint32 screen_arealen; Uint32 screen_arealen;
@ -846,7 +846,7 @@ static void switch_vt(_THIS, unsigned short which)
(which == vtstate.v_active) ) { (which == vtstate.v_active) ) {
return; return;
} }
current = vtstate.v_active; v_active = vtstate.v_active;
/* Save the contents of the screen, and go to text mode */ /* Save the contents of the screen, and go to text mode */
SDL_mutexP(hw_lock); SDL_mutexP(hw_lock);
@ -864,7 +864,7 @@ static void switch_vt(_THIS, unsigned short which)
if ( ioctl(keyboard_fd, VT_ACTIVATE, which) == 0 ) { if ( ioctl(keyboard_fd, VT_ACTIVATE, which) == 0 ) {
/* Wait for our console to be activated again */ /* Wait for our console to be activated again */
ioctl(keyboard_fd, VT_WAITACTIVE, which); ioctl(keyboard_fd, VT_WAITACTIVE, which);
while ( ioctl(keyboard_fd, VT_WAITACTIVE, current) < 0 ) { while ( ioctl(keyboard_fd, VT_WAITACTIVE, v_active) < 0 ) {
if ( (errno != EINTR) && (errno != EAGAIN) ) { if ( (errno != EINTR) && (errno != EAGAIN) ) {
/* Unknown VT error - cancel this */ /* Unknown VT error - cancel this */
break; break;

2
src/video/fbcon/SDL_fbriva.c
View file

@ -61,6 +61,7 @@ static void NV4WaitIdle(_THIS)
; ;
} }
#if 0 /* Not yet implemented? */
/* Sets video mem colorkey and accelerated blit function */ /* Sets video mem colorkey and accelerated blit function */
static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key) static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key)
{ {
@ -72,6 +73,7 @@ static int SetHWAlpha(_THIS, SDL_Surface *surface, Uint8 value)
{ {
return(0); return(0);
} }
#endif /* Not yet implemented */
static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
{ {