Mercurial > sdl-ios-xcode
annotate src/main/beos/SDL_BeApp.cc @ 4170:092c0bc69155 SDL-1.2
Fixed bug #618
Description From Tim Angus 2008-08-30 12:23:56 (-) [reply]
As we all know SDL 1.2 doesn't handle dead keys well since one key press
potentially equals two (or more) characters. For example, on many layouts,
keying <backquote>,<space> results in <no character>,<backquote><space>. Since
the unicode member of the SDL_keysym struct only has room for one character,
only one can be returned.
On Linux, the first character is returned. On Windows however, unless the exact
number of characters generated by the keypress is 1, nothing is returned. The
following patch addresses this inconsistency.
Updated patch which includes a further fix to the handling of the numpad when
numlock is on. This further fix is courtesy Amanieu d'Antras.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 13 Apr 2009 08:42:09 +0000 |
| parents | a1b03ba2fcd0 |
| children | 46fb637777ed |
| 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:
855
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:
855
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:
855
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:
855
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:
855
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:
855
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:
1338
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* Handle the BeApp specific portions of the application */ | |
| 25 | |
| 26 #include <AppKit.h> | |
| 27 #include <storage/Path.h> | |
| 28 #include <storage/Entry.h> | |
| 29 #include <unistd.h> | |
| 30 | |
| 31 #include "SDL_BeApp.h" | |
| 32 #include "SDL_thread.h" | |
| 33 #include "SDL_timer.h" | |
| 34 #include "SDL_error.h" | |
| 35 | |
| 36 /* Flag to tell whether or not the Be application is active or not */ | |
| 37 int SDL_BeAppActive = 0; | |
| 38 static SDL_Thread *SDL_AppThread = NULL; | |
| 39 | |
| 40 static int StartBeApp(void *unused) | |
| 41 { | |
| 42 BApplication *App; | |
| 43 | |
| 44 App = new BApplication("application/x-SDL-executable"); | |
| 45 | |
| 46 App->Run(); | |
| 47 delete App; | |
| 48 return(0); | |
| 49 } | |
| 50 | |
| 51 /* Initialize the Be Application, if it's not already started */ | |
| 52 int SDL_InitBeApp(void) | |
| 53 { | |
| 54 /* Create the BApplication that handles appserver interaction */ | |
| 55 if ( SDL_BeAppActive <= 0 ) { | |
| 56 SDL_AppThread = SDL_CreateThread(StartBeApp, NULL); | |
| 57 if ( SDL_AppThread == NULL ) { | |
| 58 SDL_SetError("Couldn't create BApplication thread"); | |
| 59 return(-1); | |
| 60 } | |
| 61 | |
|
855
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
62 /* Change working to directory to that of executable */ |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
63 app_info info; |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
64 if (B_OK == be_app->GetAppInfo(&info)) { |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
65 entry_ref ref = info.ref; |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
66 BEntry entry; |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
67 if (B_OK == entry.SetTo(&ref)) { |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
68 BPath path; |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
69 if (B_OK == path.SetTo(&entry)) { |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
70 if (B_OK == path.GetParent(&path)) { |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
71 chdir(path.Path()); |
| 0 | 72 } |
| 73 } | |
|
855
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
74 } |
|
aa4ac9e65d92
I noticed MacOSX SDL sets up working directory to parent of executable.
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
75 } |
| 0 | 76 |
| 77 do { | |
| 78 SDL_Delay(10); | |
| 79 } while ( (be_app == NULL) || be_app->IsLaunching() ); | |
| 80 | |
| 81 /* Mark the application active */ | |
| 82 SDL_BeAppActive = 0; | |
| 83 } | |
| 84 | |
| 85 /* Increment the application reference count */ | |
| 86 ++SDL_BeAppActive; | |
| 87 | |
| 88 /* The app is running, and we're ready to go */ | |
| 89 return(0); | |
| 90 } | |
| 91 | |
| 92 /* Quit the Be Application, if there's nothing left to do */ | |
| 93 void SDL_QuitBeApp(void) | |
| 94 { | |
| 95 /* Decrement the application reference count */ | |
| 96 --SDL_BeAppActive; | |
| 97 | |
| 98 /* If the reference count reached zero, clean up the app */ | |
| 99 if ( SDL_BeAppActive == 0 ) { | |
| 100 if ( SDL_AppThread != NULL ) { | |
| 101 if ( be_app != NULL ) { /* Not tested */ | |
| 102 be_app->PostMessage(B_QUIT_REQUESTED); | |
| 103 } | |
| 104 SDL_WaitThread(SDL_AppThread, NULL); | |
| 105 SDL_AppThread = NULL; | |
| 106 } | |
| 107 /* be_app should now be NULL since be_app has quit */ | |
| 108 } | |
| 109 } |