Mercurial > mplayer.hg
annotate libvo/sdl_common.c @ 34494:fede902a408c
Fix per-file ASS options like -ass-force-style.
Previously the per-file settings were (sometimes at least)
completely ignored and only the global ones used.
author | reimar |
---|---|
date | Thu, 19 Jan 2012 23:20:37 +0000 |
parents | 3c51a42da09c |
children | 4f7637d076a4 |
rev | line source |
---|---|
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
1 /* |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
2 * common SDL routines |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
3 * |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
4 * This file is part of MPlayer. |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
5 * |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
6 * MPlayer is free software; you can redistribute it and/or modify |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
9 * (at your option) any later version. |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
10 * |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
11 * MPlayer is distributed in the hope that it will be useful, |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
14 * GNU General Public License for more details. |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
15 * |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
16 * You should have received a copy of the GNU General Public License along |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
19 */ |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
20 |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
21 #include "sdl_common.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
22 #include "mp_msg.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
23 #include "mp_fifo.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
24 #include "osdep/keycodes.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
25 #include "input/input.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
26 #include "input/mouse.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
27 #include "video_out.h" |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
28 |
31035 | 29 static int old_w; |
30 static int old_h; | |
31 static int mode_flags; | |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
32 static int reinit; |
31035 | 33 |
34482
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
34 /** |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
35 * Update vo_screenwidth and vo_screenheight. |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
36 * |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
37 * This function only works with SDL since 1.2.10 and |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
38 * even then only when called before the first |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
39 * SDL_SetVideoMode. |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
40 * Once there's a better way available implement an |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
41 * update_xinerama_info function. |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
42 */ |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
43 static void get_screensize(void) { |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
44 const SDL_VideoInfo *vi; |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
45 // TODO: better to use a check that gets the runtime version instead? |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
46 if (!SDL_VERSION_ATLEAST(1, 2, 10)) return; |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
47 // Keep user-provided settings |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
48 if (vo_screenwidth > 0 || vo_screenheight > 0) return; |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
49 vi = SDL_GetVideoInfo(); |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
50 vo_screenwidth = vi->current_w; |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
51 vo_screenheight = vi->current_h; |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
52 } |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
53 |
31037 | 54 int vo_sdl_init(void) |
55 { | |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
56 reinit = 0; |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
57 |
31037 | 58 if (!SDL_WasInit(SDL_INIT_VIDEO) && |
59 SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) < 0) | |
60 return 0; | |
61 | |
62 // Setup Keyrepeats (500/30 are defaults) | |
63 SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, 100 /*SDL_DEFAULT_REPEAT_INTERVAL*/); | |
64 | |
31038
3e67417271d7
Make uppercase characters and in general all ASCII characters work
reimar
parents:
31037
diff
changeset
|
65 // Easiest way to get uppercase characters |
3e67417271d7
Make uppercase characters and in general all ASCII characters work
reimar
parents:
31037
diff
changeset
|
66 SDL_EnableUNICODE(1); |
3e67417271d7
Make uppercase characters and in general all ASCII characters work
reimar
parents:
31037
diff
changeset
|
67 |
31037 | 68 // We don't want those in our event queue. |
69 SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE); | |
70 SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); | |
71 SDL_EventState(SDL_USEREVENT, SDL_IGNORE); | |
72 | |
34482
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
73 // Try to get a sensible default for fullscreen. |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
74 get_screensize(); |
3c51a42da09c
SDL: Try to select a fullscreen mode that does not require resolution changes by default.
reimar
parents:
31318
diff
changeset
|
75 |
31037 | 76 return 1; |
77 } | |
78 | |
79 void vo_sdl_uninit(void) | |
80 { | |
81 if (SDL_WasInit(SDL_INIT_VIDEO)) | |
82 SDL_QuitSubSystem(SDL_INIT_VIDEO); | |
83 } | |
84 | |
31035 | 85 void vo_sdl_fullscreen(void) |
86 { | |
87 if (vo_fs) { | |
88 vo_dwidth = old_w; | |
89 vo_dheight = old_h; | |
90 } else { | |
91 old_w = vo_dwidth; | |
92 old_h = vo_dheight; | |
93 vo_dwidth = vo_screenwidth; | |
94 vo_dheight = vo_screenheight; | |
95 } | |
96 vo_fs = !vo_fs; | |
97 sdl_set_mode(0, mode_flags); | |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
98 // on OSX at least we now need to do a full reinit. |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
99 // TODO: this should only be set if really necessary. |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
100 reinit = 1; |
31035 | 101 } |
102 | |
31033
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
103 int sdl_set_mode(int bpp, uint32_t flags) |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
104 { |
31035 | 105 SDL_Surface *s; |
106 mode_flags = flags; | |
107 if (vo_fs) flags |= SDL_FULLSCREEN; | |
108 // doublebuf with opengl creates flickering | |
109 if (vo_doublebuffering && !(flags & SDL_OPENGL)) | |
110 flags |= SDL_DOUBLEBUF; | |
111 s = SDL_SetVideoMode(vo_dwidth, vo_dheight, bpp, flags); | |
31033
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
112 if (!s) { |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
113 mp_msg(MSGT_VO, MSGL_FATAL, "SDL SetVideoMode failed: %s\n", SDL_GetError()); |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
114 return -1; |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
115 } |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
116 vo_dwidth = s->w; |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
117 vo_dheight = s->h; |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
118 return 0; |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
119 } |
8d1080e9c92d
Window resizing support for -vo gl with SDL backend.
reimar
parents:
31032
diff
changeset
|
120 |
31040 | 121 static const struct mp_keymap keysym_map[] = { |
122 {SDLK_RETURN, KEY_ENTER}, {SDLK_ESCAPE, KEY_ESC}, | |
123 {SDLK_F1, KEY_F+1}, {SDLK_F2, KEY_F+2}, {SDLK_F3, KEY_F+3}, | |
124 {SDLK_F4, KEY_F+4}, {SDLK_F5, KEY_F+5}, {SDLK_F6, KEY_F+6}, | |
125 {SDLK_F7, KEY_F+7}, {SDLK_F8, KEY_F+8}, {SDLK_F9, KEY_F+9}, | |
126 {SDLK_F10, KEY_F+10}, {SDLK_F11, KEY_F+11}, {SDLK_F12, KEY_F+12}, | |
127 {SDLK_KP_PLUS, '+'}, {SDLK_KP_MINUS, '-'}, {SDLK_TAB, KEY_TAB}, | |
128 {SDLK_PAGEUP, KEY_PAGE_UP}, {SDLK_PAGEDOWN, KEY_PAGE_DOWN}, | |
129 {SDLK_UP, KEY_UP}, {SDLK_DOWN, KEY_DOWN}, | |
130 {SDLK_LEFT, KEY_LEFT}, {SDLK_RIGHT, KEY_RIGHT}, | |
131 {SDLK_KP_MULTIPLY, '*'}, {SDLK_KP_DIVIDE, '/'}, | |
132 {SDLK_KP0, KEY_KP0}, {SDLK_KP1, KEY_KP1}, {SDLK_KP2, KEY_KP2}, | |
133 {SDLK_KP3, KEY_KP3}, {SDLK_KP4, KEY_KP4}, {SDLK_KP5, KEY_KP5}, | |
134 {SDLK_KP6, KEY_KP6}, {SDLK_KP7, KEY_KP7}, {SDLK_KP8, KEY_KP8}, | |
135 {SDLK_KP9, KEY_KP9}, | |
136 {SDLK_KP_PERIOD, KEY_KPDEC}, {SDLK_KP_ENTER, KEY_KPENTER}, | |
31318 | 137 {0, 0} |
31040 | 138 }; |
139 | |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
140 int sdl_default_handle_event(SDL_Event *event) |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
141 { |
31040 | 142 int mpkey; |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
143 if (!event) { |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
144 int res = reinit ? VO_EVENT_REINIT : 0; |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
145 reinit = 0; |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
146 return res; |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31042
diff
changeset
|
147 } |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
148 switch (event->type) { |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
149 case SDL_VIDEORESIZE: |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
150 vo_dwidth = event->resize.w; |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
151 vo_dheight = event->resize.h; |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
152 return VO_EVENT_RESIZE; |
31046 | 153 |
31042 | 154 case SDL_VIDEOEXPOSE: |
155 return VO_EVENT_EXPOSE; | |
31046 | 156 |
31050 | 157 case SDL_MOUSEMOTION: |
158 vo_mouse_movement(event->motion.x, event->motion.y); | |
159 break; | |
160 | |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
161 case SDL_MOUSEBUTTONDOWN: |
31046 | 162 if (!vo_nomouse_input) |
163 mplayer_put_key((MOUSE_BTN0 + event->button.button - 1) | MP_KEY_DOWN); | |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
164 break; |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
165 |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
166 case SDL_MOUSEBUTTONUP: |
31051 | 167 if (!vo_nomouse_input) |
31046 | 168 mplayer_put_key(MOUSE_BTN0 + event->button.button - 1); |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
169 break; |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
170 |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
171 case SDL_KEYDOWN: |
31040 | 172 mpkey = lookup_keymap_table(keysym_map, event->key.keysym.sym); |
173 if (!mpkey && | |
174 event->key.keysym.unicode > 0 && | |
175 event->key.keysym.unicode < 128) | |
176 mpkey = event->key.keysym.unicode; | |
177 if (mpkey) | |
178 mplayer_put_key(mpkey); | |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
179 break; |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
180 |
31046 | 181 case SDL_QUIT: |
182 mplayer_put_key(KEY_CLOSE_WIN); | |
183 break; | |
31032
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
184 } |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
185 return 0; |
362425fe3de8
Add sdl_common file and use it to share the input handling between -vo gl
reimar
parents:
diff
changeset
|
186 } |