Mercurial > sdl-ios-xcode
annotate src/video/SDL_yuv.c @ 4384:6800e2560310 SDL-1.2
Fixed bugs #882 and 865, re-opening bug #634
Ronald Lamprecht to SDL
Hi,
Sam Lantinga wrote:
The problem with that fix is that it breaks IME events again. Maybe
we can handle keyboard events differently to prevent this issue?
Spending an hour reading MSDN, analysing SDL and another hour testing the reality on XP I am really wondering how patch r4990 could have ever worked in any situation. It's main effect is to break the unicode translation and causing spurious activation events!
Why does TranslateMessage(&msg) nothing useful? Simply because it does not affect "msg" at all! All keyboard events are dispatched without the slightest change (see MSDN). TranslateMessage() just appends additional WM_CHAR, WM_DEADCHAR, WM_SYSCHAR, WM_SYSDEADCHAR event messages to the queue. But I could not find any SDL event handling routine that catches these events and transforms them to proper SDL keyevents while eliminating the corresponding WM_KEYDOWN, etc. events. Thus any IME input like the '@' generated by "Alt + 6(Numpad) + 4(Numpad)" is simply lost.
But the situation is even worse! Up to r4990 the TranslateKey()/ToUnicode() calls did evaluate dead keys and did deliver proper key events for subsequent key strokes like '´' + 'e' resulting in 'é'. ToUnicode() needs proper key state informations to be able to handle these substitutions. But unfortunatly TranslateMessage() needs the same state information and eats it up while generating the WM_CHAR messages :-( Thus the current 1.2.14 breakes the partial IME support of previous releases, too.
The key state race condition between ToUnicode() and TranslateMessage() requires to avoid any ToUnicode() usage for receiving proper WM_CHAR, etc. messages generated by TranslateMessage(). (Yes - the '@' and 'é' appear as WM_CHAR messages when unicode is switched off).
The spurious SDL activation events are *not* caused by additional WM_ACTIVATE Windows messages! Besides DIB_HandleMessage() SDL_PrivateAppActive() is called by another source which I am not yet aware of - any hints?
Thus I do strongly recommend the deletion of the TranslateMessage(&msg) call as a quick fix.
A proper support of unicode and IME requires a clean SDL keyboard input concept first. Which SDL keyboards events should be transmitted to the app when the user presses '´' + 'e' ? Within the current unicode handling the first key stroke is hidden. Even though ToUnicode() delivers the proper key SDL does ignore it in TranslateKey(). Just the composed key event is transmitted to the app. That is what you expect for text input, but the app can no longer use keys like '^' as a key button because it will never receive a key event for it!
With a given concept it seems to be necessary to regenerate SDL key events out of the WM_CHAR, etc. events and to drop all related direct WM_KEYDOWN, etc. events while the remaining basic WM_KEYDOWN, etc. events would still have to result in SDL key events.
Anyway the source of the spurious WM_ACTIVATE should be located to avoid future trouble.
Greets,
Ronald
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 17 Nov 2009 04:59:13 +0000 |
parents | a1b03ba2fcd0 |
children |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
0 | 4 |
5 This library is free software; you can redistribute it and/or | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
0 | 7 License as published by the Free Software Foundation; either |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
0 | 9 |
10 This library is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
0 | 14 |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 |
19 Sam Lantinga | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
81
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
22 #include "SDL_config.h" |
0 | 23 |
24 /* This is the implementation of the YUV video surface support */ | |
25 | |
26 #include "SDL_video.h" | |
27 #include "SDL_sysvideo.h" | |
28 #include "SDL_yuvfuncs.h" | |
29 #include "SDL_yuv_sw_c.h" | |
30 | |
31 | |
32 SDL_Overlay *SDL_CreateYUVOverlay(int w, int h, Uint32 format, | |
33 SDL_Surface *display) | |
34 { | |
35 SDL_VideoDevice *video = current_video; | |
36 SDL_VideoDevice *this = current_video; | |
37 const char *yuv_hwaccel; | |
38 SDL_Overlay *overlay; | |
39 | |
760
cf9dd3aa6756
Oops, we only want to fail creation if the display surface is an OpenGL surface.
Sam Lantinga <slouken@libsdl.org>
parents:
660
diff
changeset
|
40 if ( (display->flags & SDL_OPENGL) == SDL_OPENGL ) { |
660
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
41 SDL_SetError("YUV overlays are not supported in OpenGL mode"); |
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
42 return NULL; |
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
43 } |
0 | 44 |
45 /* Display directly on video surface, if possible */ | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
46 if ( SDL_getenv("SDL_VIDEO_YUV_DIRECT") ) { |
81
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
47 if ( (display == SDL_PublicSurface) && |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
48 ((SDL_VideoSurface->format->BytesPerPixel == 2) || |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
49 (SDL_VideoSurface->format->BytesPerPixel == 4)) ) { |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
50 display = SDL_VideoSurface; |
1a2723474f12
Added the SDL_VIDEO_YUV_DIRECT hack for better performance when the
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
51 } |
0 | 52 } |
660
73440ac574a2
You can't create a YUV overlay in OpenGL mode
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
53 overlay = NULL; |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
54 yuv_hwaccel = SDL_getenv("SDL_VIDEO_YUV_HWACCEL"); |
0 | 55 if ( ((display == SDL_VideoSurface) && video->CreateYUVOverlay) && |
1341
d02b552e5304
Configure dynamically generates SDL_config.h
Sam Lantinga <slouken@libsdl.org>
parents:
1338
diff
changeset
|
56 (!yuv_hwaccel || (SDL_atoi(yuv_hwaccel) > 0)) ) { |
0 | 57 overlay = video->CreateYUVOverlay(this, w, h, format, display); |
58 } | |
59 /* If hardware YUV overlay failed ... */ | |
60 if ( overlay == NULL ) { | |
61 overlay = SDL_CreateYUV_SW(this, w, h, format, display); | |
62 } | |
63 return overlay; | |
64 } | |
65 | |
66 int SDL_LockYUVOverlay(SDL_Overlay *overlay) | |
67 { | |
4076 | 68 if ( overlay == NULL ) { |
69 SDL_SetError("Passed NULL overlay"); | |
70 return -1; | |
71 } | |
0 | 72 return overlay->hwfuncs->Lock(current_video, overlay); |
73 } | |
74 | |
75 void SDL_UnlockYUVOverlay(SDL_Overlay *overlay) | |
76 { | |
4076 | 77 if ( overlay == NULL ) { |
78 return; | |
79 } | |
0 | 80 overlay->hwfuncs->Unlock(current_video, overlay); |
81 } | |
82 | |
83 int SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect) | |
84 { | |
1643
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
85 SDL_Rect src, dst; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
86 int srcx, srcy, srcw, srch; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
87 int dstx, dsty, dstw, dsth; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
88 |
4076 | 89 if ( overlay == NULL || dstrect == NULL ) { |
90 SDL_SetError("Passed NULL overlay or dstrect"); | |
91 return -1; | |
92 } | |
93 | |
1643
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
94 /* Clip the rectangle to the screen area */ |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
95 srcx = 0; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
96 srcy = 0; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
97 srcw = overlay->w; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
98 srch = overlay->h; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
99 dstx = dstrect->x; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
100 dsty = dstrect->y; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
101 dstw = dstrect->w; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
102 dsth = dstrect->h; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
103 if ( dstx < 0 ) { |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
104 srcw += (dstx * overlay->w) / dstrect->w; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
105 dstw += dstx; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
106 srcx -= (dstx * overlay->w) / dstrect->w; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
107 dstx = 0; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
108 } |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
109 if ( (dstx+dstw) > current_video->screen->w ) { |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
110 int extra = (dstx+dstw - current_video->screen->w); |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
111 srcw -= (extra * overlay->w) / dstrect->w; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
112 dstw -= extra; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
113 } |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
114 if ( dsty < 0 ) { |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
115 srch += (dsty * overlay->h) / dstrect->h; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
116 dsth += dsty; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
117 srcy -= (dsty * overlay->h) / dstrect->h; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
118 dsty = 0; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
119 } |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
120 if ( (dsty+dsth) > current_video->screen->h ) { |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
121 int extra = (dsty+dsth - current_video->screen->h); |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
122 srch -= (extra * overlay->h) / dstrect->h; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
123 dsth -= extra; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
124 } |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
125 if ( srcw <= 0 || srch <= 0 || |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
126 srch <= 0 || dsth <= 0 ) { |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
127 return 0; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
128 } |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
129 /* Ugh, I can't wait for SDL_Rect to be int values */ |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
130 src.x = srcx; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
131 src.y = srcy; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
132 src.w = srcw; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
133 src.h = srch; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
134 dst.x = dstx; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
135 dst.y = dsty; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
136 dst.w = dstw; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
137 dst.h = dsth; |
51038e80ae59
More general fix for bug #189
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
138 return overlay->hwfuncs->Display(current_video, overlay, &src, &dst); |
0 | 139 } |
140 | |
141 void SDL_FreeYUVOverlay(SDL_Overlay *overlay) | |
142 { | |
4076 | 143 if ( overlay == NULL ) { |
144 return; | |
0 | 145 } |
4076 | 146 if ( overlay->hwfuncs ) { |
147 overlay->hwfuncs->FreeHW(current_video, overlay); | |
148 } | |
149 SDL_free(overlay); | |
0 | 150 } |