diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2011-05-08 01:18:30 +0400 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-15 01:05:26 +0200 |
commit | 1de9756b97daec3c15f8048631af866e9cb58562 (patch) | |
tree | 86ddbf7907e406725b4ca5332742d2cb4f314809 /ui | |
parent | 60e0df25e415b00cf35c4d214eaba9dc19aaa9e6 (diff) |
set $SDL_VIDEODRIVER=x11 on Linux to prevent sudo kvm from fighting for video card
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/sdl.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -831,6 +831,18 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) if (!full_screen) { setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0); } +#ifdef __linux__ + /* on Linux, SDL may use fbcon|directfb|svgalib when run without + * accessible $DISPLAY to open X11 window. This is often the case + * when qemu is run using sudo. But in this case, and when actually + * run in X11 environment, SDL fights with X11 for the video card, + * making current display unavailable, often until reboot. + * So make x11 the default SDL video driver if this variable is unset. + * This is a bit hackish but saves us from bigger problem. + * Maybe it's a good idea to fix this in SDL instead. + */ + setenv("SDL_VIDEODRIVER", "x11", 0); +#endif /* Enable normal up/down events for Caps-Lock and Num-Lock keys. * This requires SDL >= 1.2.14. */ |