Mercurial > sdl-ios-xcode

annotate src/thread/pth/SDL_systhread.c @ 2268:4baee598306d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Thu, 05 Jul 2007 14:02:33 -0700 From: Sam Lantinga Subject: SDL 1.3 keyboard plan After lots of discussion with Christian, this is what we came up with: > So, to sum up... > SDLK_* become the physical keys, starting at > (1<<21) > We create a macro SDLK_INDEX(X) > We have two functions SDL_GetLayoutKey(SDLKey) and SDL_GetKeyName() > SDL_GetLayoutKey maps to UCS4 for printable characters, and SDLK* for non-printable characters > and does so based on the OS's current keyboard layout > SDL_GetKeyName() handles both SDLK_* and UCS4, converting UCS4 to UTF-8 and converting SDLK_* into our names, which are UTF-8 for printable characters. > WASD folks use SDLK_*, and 'I' folks use SDL_GetLayoutKey(SDLK_*) Here is the patch he came up with, and his e-mail about it: Date: Fri, 17 Aug 2007 19:50:28 +0200 From: Christian Walther Subject: Re: SDL 1.3 keyboard plan > Sounds great, go ahead and send me a patch. Here goes! Thanks for having a look. Don't hesitate to comment if anything does not conform to your ideas. One caveat: Committing this now may break compilability of some video drivers - specifically, if they use any of the SDLK_* codes that were obsoleted and moved into SDL_compat.h. I only tried Cocoa (which did break, but is already fixed) and X11 (which didn't, but then its key handling is #iffed out). If that's a problem, it may need to go into a branch. -Christian
author Sam Lantinga <slouken@libsdl.org>
date Sun, 19 Aug 2007 14:52:52 +0000
parents c121d94672cb
children 4436464c4f51
rev   line source
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
1 /*
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
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
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
4
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
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
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
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.
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
9
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
10 This library is distributed in the hope that it will be useful,
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
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.
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
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
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
18
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
19 Sam Lantinga
252
e8157fcb3114 Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents: 185
diff changeset
20 slouken@libsdl.org
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
21 */
1402
d910939febfa Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
22 #include "SDL_config.h"
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
23
329
1d74ddc90cb2 Patrice's fixes for GNU Pthread support
Sam Lantinga <slouken@libsdl.org>
parents: 321
diff changeset
24 /*
1d74ddc90cb2 Patrice's fixes for GNU Pthread support
Sam Lantinga <slouken@libsdl.org>
parents: 321
diff changeset
25 * GNU pth threads
1d74ddc90cb2 Patrice's fixes for GNU Pthread support
Sam Lantinga <slouken@libsdl.org>
parents: 321
diff changeset
26 *
1d74ddc90cb2 Patrice's fixes for GNU Pthread support
Sam Lantinga <slouken@libsdl.org>
parents: 321
diff changeset
27 * Patrice Mandin
1d74ddc90cb2 Patrice's fixes for GNU Pthread support
Sam Lantinga <slouken@libsdl.org>
parents: 321
diff changeset
28 */
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
29
1361
19418e4422cb New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents: 1358
diff changeset
30 #include <pth.h>
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
31 #include <signal.h>
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
32
1826
cf7528eded83 Add missing include file
Patrice Mandin <patmandin@gmail.com>
parents: 1402
diff changeset
33 #include "SDL_thread.h"
cf7528eded83 Add missing include file
Patrice Mandin <patmandin@gmail.com>
parents: 1402
diff changeset
34 #include "../SDL_thread_c.h"
cf7528eded83 Add missing include file
Patrice Mandin <patmandin@gmail.com>
parents: 1402
diff changeset
35 #include "../SDL_systhread.h"
cf7528eded83 Add missing include file
Patrice Mandin <patmandin@gmail.com>
parents: 1402
diff changeset
36
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
37 /* List of signals to mask in the subthreads */
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
38 static int sig_list[] = {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
39 SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
40 SIGVTALRM, SIGPROF, 0
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
41 };
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
42
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
43 static void *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
44 RunThread(void *data)
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
45 {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
46 SDL_RunThread(data);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
47 pth_exit((void *) 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
48 return ((void *) 0); /* Prevent compiler warning */
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
49 }
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
50
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
51 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
52 SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
53 {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
54 pth_attr_t type;
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
55
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
56 /* Create a new attribute */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
57 type = pth_attr_new();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
58 if (type == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
59 SDL_SetError("Couldn't initialize pth attributes");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
60 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
61 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
62 pth_attr_set(type, PTH_ATTR_JOINABLE, TRUE);
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
63
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
64 /* Create the thread and go! */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
65 thread->handle = pth_spawn(type, RunThread, args);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
66 if (thread->handle == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
67 SDL_SetError("Not enough resources to create thread");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
68 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
69 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
70 return (0);
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
71 }
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
72
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
73 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
74 SDL_SYS_SetupThread(void)
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
75 {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
76 int i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
77 sigset_t mask;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
78 int oldstate;
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
79
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
80 /* Mask asynchronous signals for this thread */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
81 sigemptyset(&mask);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
82 for (i = 0; sig_list[i]; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
83 sigaddset(&mask, sig_list[i]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
84 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
85 pth_sigmask(SIG_BLOCK, &mask, 0);
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
86
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
87 /* Allow ourselves to be asynchronously cancelled */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
88 pth_cancel_state(PTH_CANCEL_ASYNCHRONOUS, &oldstate);
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
89 }
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
90
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
91 /* WARNING: This may not work for systems with 64-bit pid_t */
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
92 Uint32
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
93 SDL_ThreadID(void)
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
94 {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
95 return ((Uint32) pth_self());
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
96 }
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
97
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
98 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
99 SDL_SYS_WaitThread(SDL_Thread * thread)
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
100 {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
101 pth_join(thread->handle, NULL);
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
102 }
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
103
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
104 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
105 SDL_SYS_KillThread(SDL_Thread * thread)
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
106 {
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
107 pth_cancel(thread->handle);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
108 pth_join(thread->handle, NULL);
185
34d316d5e744 Added support for the GNU Pth thread lib (thanks Mandin!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
109 }
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
110
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1826
diff changeset
111 /* vi: set ts=4 sw=4 expandtab: */