Mercurial > sdl-ios-xcode
annotate src/video/bwindow/SDL_sysmouse.cc @ 3978:b966761fef6c SDL-1.2
Significantly improved XIM support.
Fixes Bugzilla #429.
Selected notes from the patch's README:
= FIXES =
This patch fixes the above issues as follows.
== X11 events ==
Moved XFilterEvent just after XNextEvent so that all events are passed
to it. Also, XFilterEvent will receive masks indicated by IM through
XNFilterEvents IC value as well as masks surpplied by SDL.
X11_KeyRepeat is called between XNextEvent and XFilterEvent, after
testing an event is a KeyRelease. I'm not 100% comfortable to do so,
but I couldn't find a better timing to call it, and use of the
function is inevitable.
== Xutf8LookupString ==
Used a longer buffer to receive UTF-8 string. If it is insufficient,
a dynamic storage of the requested size will be allocated. The
initial size of the buffer is set to 32, because the Japanese text
converted from the most widely used benchmark key sequence for
Japanese IM, "WATASHINONAMAEHANAKANODESU." has ten Japanese characters
in it, that occupies 30 bytes when encoded in UTF-8.
== SDL_keysym.unicode ==
On Windows version of SDL implementation, SDL_keysym.unicode stores
UTF-16 encoded unicode characters, one UTF-16 encoding unit per an SDL
event. A Unicode supplementary characters are sent to an application
as two events. (One with a high surrogate and another with a low
surrogate.) The behavior seems reasonable since it is upward
compatible with existing handling of BMP characters.
I wrote a UTF-8 to UTF-16 conversion function for the purpose. It is
designed with the execution speed in mind, having a minimum set of
features that my patch requires.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 25 Jun 2007 19:58:32 +0000 |
| parents | c82c1870c77a |
| children | 4e29535b821b |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
3 Copyright (C) 1997-2006 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:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1403
376665398b25
Catch the C++ and Objective C sources too...
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 #include <AppKit.h> | |
| 25 #include <GameKit.h> | |
| 26 | |
| 27 #include "SDL_BWin.h" | |
| 28 | |
| 29 extern "C" { | |
| 3879 | 30 #include "../SDL_cursor_c.h" |
| 0 | 31 #include "SDL_sysmouse_c.h" |
| 32 | |
| 33 /* Convert bits to padded bytes */ | |
| 34 #define PADDED_BITS(bits) ((bits+7)/8) | |
| 35 | |
| 36 /* The implementation dependent data for the window manager cursor */ | |
| 37 struct WMcursor { | |
| 38 char *bits; | |
| 39 }; | |
| 40 | |
| 41 /* Can this be done in the BeOS? */ | |
| 42 WMcursor *BE_CreateWMCursor(_THIS, | |
| 43 Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y) | |
| 44 { | |
| 45 WMcursor *cursor; | |
| 46 int allowed_x; | |
| 47 int allowed_y; | |
| 48 int run, pad, i; | |
| 49 char *cptr; | |
| 50 | |
| 51 allowed_x = 16; /* BeOS limitation */ | |
| 52 allowed_y = 16; /* BeOS limitation */ | |
| 53 if ( (w > allowed_x) || (h > allowed_y) ) { | |
| 54 SDL_SetError("Only cursors of dimension (%dx%d) are allowed", | |
| 55 allowed_x, allowed_y); | |
| 56 return(NULL); | |
| 57 } | |
| 58 | |
| 59 /* Allocate the cursor */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
60 cursor = (WMcursor *)SDL_malloc(sizeof(WMcursor)); |
| 0 | 61 if ( cursor == NULL ) { |
| 62 SDL_OutOfMemory(); | |
| 63 return(NULL); | |
| 64 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
65 cursor->bits = (char *)SDL_malloc(4+2*((allowed_x/8)*allowed_y)); |
| 0 | 66 if ( cursor->bits == NULL ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
67 SDL_free(cursor); |
| 0 | 68 SDL_OutOfMemory(); |
| 69 return(NULL); | |
| 70 } | |
| 71 cursor->bits[0] = allowed_y; /* Size of the cursor */ | |
| 72 cursor->bits[1] = 1; /* Bit depth of cursor */ | |
| 73 cursor->bits[2] = hot_y; | |
| 74 cursor->bits[3] = hot_x; | |
| 75 cptr = &cursor->bits[4]; | |
| 76 | |
| 77 /* Pad out to the normal cursor size */ | |
| 78 run = PADDED_BITS(w); | |
| 79 pad = PADDED_BITS(allowed_x)-run; | |
| 80 for ( i=0; i<h; ++i ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
81 SDL_memcpy(cptr, data, run); |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
82 SDL_memset(cptr+run, 0, pad); |
| 0 | 83 data += run; |
| 84 cptr += (run+pad); | |
| 85 } | |
| 86 for ( ; i<allowed_y; ++i ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
87 SDL_memset(cptr, 0, run+pad); |
| 0 | 88 cptr += (run+pad); |
| 89 } | |
| 90 for ( i=0; i<h; ++i ) { | |
| 91 /* FIXME: The mask should be OR'd with the data to turn | |
| 92 inverted color pixels black, since inverted color pixels | |
| 93 aren't supported under BeOS. | |
| 94 */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
95 SDL_memcpy(cptr, mask, run); |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
96 SDL_memset(cptr+run, 0, pad); |
| 0 | 97 mask += run; |
| 98 cptr += (run+pad); | |
| 99 } | |
| 100 for ( ; i<allowed_y; ++i ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
101 SDL_memset(cptr, 0, run+pad); |
| 0 | 102 cptr += (run+pad); |
| 103 } | |
| 104 return(cursor); | |
| 105 } | |
| 106 | |
| 107 int BE_ShowWMCursor(_THIS, WMcursor *cursor) | |
| 108 { | |
| 109 if ( be_app->Lock() ) { | |
| 110 if ( cursor == NULL ) { | |
| 111 if ( SDL_BlankCursor != NULL ) { | |
| 112 be_app->SetCursor(SDL_BlankCursor->bits); | |
| 113 } | |
| 114 } else { | |
| 115 be_app->SetCursor(cursor->bits); | |
| 116 } | |
| 117 be_app->Unlock(); | |
| 118 } | |
| 119 return(1); | |
| 120 } | |
| 121 | |
| 122 void BE_FreeWMCursor(_THIS, WMcursor *cursor) | |
| 123 { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
124 SDL_free(cursor->bits); |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
125 SDL_free(cursor); |
| 0 | 126 } |
| 127 | |
| 128 /* Implementation by Christian Bauer <cbauer@student.physik.uni-mainz.de> */ | |
| 129 void BE_WarpWMCursor(_THIS, Uint16 x, Uint16 y) | |
| 130 { | |
| 3879 | 131 if (_this->screen && (_this->screen->flags & SDL_FULLSCREEN)) { |
| 3878 | 132 SDL_PrivateMouseMotion(0, 0, x, y); |
| 133 } else { | |
| 3879 | 134 BPoint pt(x, y); |
| 135 SDL_Win->Lock(); | |
| 136 SDL_Win->ConvertToScreen(&pt); | |
| 137 SDL_Win->Unlock(); | |
| 138 set_mouse_position((int32)pt.x, (int32)pt.y); | |
| 3878 | 139 } |
| 140 } | |
| 3879 | 141 |
| 3878 | 142 /* Check to see if we need to enter or leave mouse relative mode */ |
| 143 void BE_CheckMouseMode(_THIS) | |
| 144 { | |
| 145 /* If the mouse is hidden and input is grabbed, we use relative mode */ | |
| 146 if ( !(SDL_cursorstate & CURSOR_VISIBLE) && | |
| 147 (_this->input_grab != SDL_GRAB_OFF) ) { | |
| 148 mouse_relative = 1; | |
| 149 } else { | |
| 150 mouse_relative = 0; | |
| 151 } | |
| 0 | 152 } |
| 153 | |
| 154 }; /* Extern C */ |