Commit 474b79de authored by Ryan C. Gordon's avatar Ryan C. Gordon

Properly restore vidmode when switching back to SDL's virtual terminal with

 the fbcon driver: Fixes Bugzilla #37.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401244
parent 958cb54a
......@@ -882,6 +882,7 @@ static void handle_mouse(_THIS)
*/
static void switch_vt(_THIS, unsigned short which)
{
struct fb_var_screeninfo vinfo;
struct vt_stat vtstate;
unsigned short v_active;
SDL_Surface *screen;
......@@ -906,6 +907,7 @@ static void switch_vt(_THIS, unsigned short which)
memcpy(screen_contents, screen->pixels, screen_arealen);
}
FB_SavePaletteTo(this, 256, saved_pal);
ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo);
ioctl(keyboard_fd, KDSETMODE, KD_TEXT);
/* New console, switch to it */
......@@ -923,6 +925,7 @@ static void switch_vt(_THIS, unsigned short which)
/* Restore graphics mode and the contents of the screen */
ioctl(keyboard_fd, KDSETMODE, KD_GRAPHICS);
ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo);
FB_RestorePaletteFrom(this, 256, saved_pal);
if ( screen_contents ) {
memcpy(screen->pixels, screen_contents, screen_arealen);
......
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