Mercurial > mplayer.hg
comparison libvo/vo_sdl.c @ 31025:f3897eb85625
Remove code to work around bugs in ancient libSDL versions, the code has been
accidentally disabled since some time and there were no complaints.
author | reimar |
---|---|
date | Sat, 24 Apr 2010 17:15:28 +0000 |
parents | dc1d66a20ec2 |
children | 362425fe3de8 |
comparison
equal
deleted
inserted
replaced
31024:0e862bb517b0 | 31025:f3897eb85625 |
---|---|
45 /* define to force software-surface (video surface stored in system memory)*/ | 45 /* define to force software-surface (video surface stored in system memory)*/ |
46 #undef SDL_NOHWSURFACE | 46 #undef SDL_NOHWSURFACE |
47 | 47 |
48 /* define to enable surface locks, this might be needed on SMP machines */ | 48 /* define to enable surface locks, this might be needed on SMP machines */ |
49 #undef SDL_ENABLE_LOCKS | 49 #undef SDL_ENABLE_LOCKS |
50 | |
51 //#define BUGGY_SDL //defined by configure | |
52 | 50 |
53 /* MONITOR_ASPECT MUST BE FLOAT */ | 51 /* MONITOR_ASPECT MUST BE FLOAT */ |
54 #define MONITOR_ASPECT 4.0/3.0 | 52 #define MONITOR_ASPECT 4.0/3.0 |
55 | 53 |
56 #include <stdio.h> | 54 #include <stdio.h> |
455 | 453 |
456 /* We don't want those in our event queue. | 454 /* We don't want those in our event queue. |
457 * We use SDL_KEYUP cause SDL_KEYDOWN seems to cause problems | 455 * We use SDL_KEYUP cause SDL_KEYDOWN seems to cause problems |
458 * with keys need to be pressed twice, to be recognized. | 456 * with keys need to be pressed twice, to be recognized. |
459 */ | 457 */ |
460 #ifndef BUGGY_SDL | |
461 SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE); | 458 SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE); |
462 SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE); | 459 SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE); |
463 // SDL_EventState(SDL_QUIT, SDL_IGNORE); | 460 // SDL_EventState(SDL_QUIT, SDL_IGNORE); |
464 SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); | 461 SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); |
465 SDL_EventState(SDL_USEREVENT, SDL_IGNORE); | 462 SDL_EventState(SDL_USEREVENT, SDL_IGNORE); |
466 #endif | |
467 | 463 |
468 /* Success! */ | 464 /* Success! */ |
469 return 0; | 465 return 0; |
470 } | 466 } |
471 | 467 |
1139 break; | 1135 break; |
1140 mplayer_put_key(MOUSE_BTN0+event.button.button-1); | 1136 mplayer_put_key(MOUSE_BTN0+event.button.button-1); |
1141 break; | 1137 break; |
1142 | 1138 |
1143 /* graphics mode selection shortcuts */ | 1139 /* graphics mode selection shortcuts */ |
1144 #ifdef BUGGY_SDL | |
1145 case SDL_KEYDOWN: | 1140 case SDL_KEYDOWN: |
1146 switch(event.key.keysym.sym) { | |
1147 case SDLK_UP: mplayer_put_key(KEY_UP); break; | |
1148 case SDLK_DOWN: mplayer_put_key(KEY_DOWN); break; | |
1149 case SDLK_LEFT: mplayer_put_key(KEY_LEFT); break; | |
1150 case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT); break; | |
1151 case SDLK_LESS: mplayer_put_key(shift_key?'>':'<'); break; | |
1152 case SDLK_GREATER: mplayer_put_key('>'); break; | |
1153 case SDLK_ASTERISK: | |
1154 case SDLK_KP_MULTIPLY: | |
1155 case SDLK_SLASH: | |
1156 case SDLK_KP_DIVIDE: | |
1157 default: break; | |
1158 } | |
1159 break; | |
1160 case SDL_KEYUP: | |
1161 #else | |
1162 case SDL_KEYDOWN: | |
1163 #endif | |
1164 keypressed = event.key.keysym.sym; | 1141 keypressed = event.key.keysym.sym; |
1165 mp_msg(MSGT_VO,MSGL_DBG2, "SDL: Key pressed: '%i'\n", keypressed); | 1142 mp_msg(MSGT_VO,MSGL_DBG2, "SDL: Key pressed: '%i'\n", keypressed); |
1166 | 1143 |
1167 /* c key pressed. c cycles through available fullscreenmodes, if we have some */ | 1144 /* c key pressed. c cycles through available fullscreenmodes, if we have some */ |
1168 if ( ((keypressed == SDLK_c)) && (priv->fullmodes) ) { | 1145 if ( ((keypressed == SDLK_c)) && (priv->fullmodes) ) { |
1217 case SDLK_MINUS: | 1194 case SDLK_MINUS: |
1218 case SDLK_KP_MINUS: mplayer_put_key('-');break; | 1195 case SDLK_KP_MINUS: mplayer_put_key('-');break; |
1219 case SDLK_TAB: mplayer_put_key('\t');break; | 1196 case SDLK_TAB: mplayer_put_key('\t');break; |
1220 case SDLK_PAGEUP: mplayer_put_key(KEY_PAGE_UP);break; | 1197 case SDLK_PAGEUP: mplayer_put_key(KEY_PAGE_UP);break; |
1221 case SDLK_PAGEDOWN: mplayer_put_key(KEY_PAGE_DOWN);break; | 1198 case SDLK_PAGEDOWN: mplayer_put_key(KEY_PAGE_DOWN);break; |
1222 #ifdef BUGGY_SDL | |
1223 case SDLK_UP: | |
1224 case SDLK_DOWN: | |
1225 case SDLK_LEFT: | |
1226 case SDLK_RIGHT: | |
1227 case SDLK_ASTERISK: | |
1228 case SDLK_KP_MULTIPLY: | |
1229 case SDLK_SLASH: | |
1230 case SDLK_KP_DIVIDE: | |
1231 break; | |
1232 #else | |
1233 case SDLK_UP: mplayer_put_key(KEY_UP);break; | 1199 case SDLK_UP: mplayer_put_key(KEY_UP);break; |
1234 case SDLK_DOWN: mplayer_put_key(KEY_DOWN);break; | 1200 case SDLK_DOWN: mplayer_put_key(KEY_DOWN);break; |
1235 case SDLK_LEFT: mplayer_put_key(KEY_LEFT);break; | 1201 case SDLK_LEFT: mplayer_put_key(KEY_LEFT);break; |
1236 case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT);break; | 1202 case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT);break; |
1237 case SDLK_LESS: mplayer_put_key(shift_key?'>':'<'); break; | 1203 case SDLK_LESS: mplayer_put_key(shift_key?'>':'<'); break; |
1238 case SDLK_GREATER: mplayer_put_key('>'); break; | 1204 case SDLK_GREATER: mplayer_put_key('>'); break; |
1239 case SDLK_ASTERISK: | 1205 case SDLK_ASTERISK: |
1240 case SDLK_KP_MULTIPLY: mplayer_put_key('*'); break; | 1206 case SDLK_KP_MULTIPLY: mplayer_put_key('*'); break; |
1241 case SDLK_SLASH: | 1207 case SDLK_SLASH: |
1242 case SDLK_KP_DIVIDE: mplayer_put_key('/'); break; | 1208 case SDLK_KP_DIVIDE: mplayer_put_key('/'); break; |
1243 #endif | |
1244 case SDLK_KP0: mplayer_put_key(KEY_KP0); break; | 1209 case SDLK_KP0: mplayer_put_key(KEY_KP0); break; |
1245 case SDLK_KP1: mplayer_put_key(KEY_KP1); break; | 1210 case SDLK_KP1: mplayer_put_key(KEY_KP1); break; |
1246 case SDLK_KP2: mplayer_put_key(KEY_KP2); break; | 1211 case SDLK_KP2: mplayer_put_key(KEY_KP2); break; |
1247 case SDLK_KP3: mplayer_put_key(KEY_KP3); break; | 1212 case SDLK_KP3: mplayer_put_key(KEY_KP3); break; |
1248 case SDLK_KP4: mplayer_put_key(KEY_KP4); break; | 1213 case SDLK_KP4: mplayer_put_key(KEY_KP4); break; |