Mercurial > sdl-ios-xcode
annotate src/video/gem/SDL_gemevents.c @ 3914:4fd12011d8d6 SDL-1.2
Quartz code should use F13, F14, and F15 keys instead of PrintScreen,
ScrollLock, and Pause, since that's what's on the standard Apple keyboards
(minus the laptops, which have neither set). Ideally we'll find a better way
to distinguish this...the keys being replaced would be correct on a USB
keyboard for Windows. Sigh.
Fixes Bugzilla #301.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Wed, 14 Feb 2007 10:23:23 +0000 |
parents | c3625a895caf |
children | 57b017e6aebf |
rev | line source |
---|---|
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 /* |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
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:
1310
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
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:
1310
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
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:
1310
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
9 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
10 This library is distributed in the hope that it will be useful, |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 but WITHOUT ANY WARRANTY; without even the implied warranty of |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
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:
1310
diff
changeset
|
13 Lesser General Public License for more details. |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
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:
1310
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:
1310
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:
1310
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
18 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
19 Sam Lantinga |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 slouken@libsdl.org |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
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" |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
23 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
24 /* |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
25 * GEM SDL video driver implementation |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
26 * inspired from the Dummy SDL driver |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
27 * |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
28 * Patrice Mandin |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
29 * and work from |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
30 * Olivier Landemarre, Johan Klockars, Xavier Joubert, Claude Attard |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
31 */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
32 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
33 #include <gem.h> |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
34 |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
35 #include "../../events/SDL_sysevents.h" |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
36 #include "../../events/SDL_events_c.h" |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
37 #include "SDL_gemvideo.h" |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
38 #include "SDL_gemevents_c.h" |
1412 | 39 #include "../ataricommon/SDL_atarikeys.h" /* for keyboard scancodes */ |
40 #include "../ataricommon/SDL_atarievents_c.h" | |
41 #include "../ataricommon/SDL_xbiosevents_c.h" | |
1420
2405517b5eab
Added preliminary support for MiNT /dev/mouse driver (disabled atm)
Patrice Mandin <patmandin@gmail.com>
parents:
1412
diff
changeset
|
42 #include "../ataricommon/SDL_ataridevmouse_c.h" |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
43 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
44 /* Variables */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
45 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
46 static unsigned char gem_currentkeyboard[ATARIBIOS_MAXKEYS]; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
47 static unsigned char gem_previouskeyboard[ATARIBIOS_MAXKEYS]; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
48 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
49 /* Functions prototypes */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
50 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
51 static int do_messages(_THIS, short *message); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
52 static void do_keyboard(short kc, short ks); |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
53 static void do_mouse(_THIS, short mx, short my, short mb, short ks); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
54 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
55 /* Functions */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
56 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
57 void GEM_InitOSKeymap(_THIS) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
58 { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
59 SDL_memset(gem_currentkeyboard, 0, sizeof(gem_currentkeyboard)); |
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
60 SDL_memset(gem_previouskeyboard, 0, sizeof(gem_previouskeyboard)); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
61 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
62 /* Mouse init */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
63 GEM_mouse_relative = SDL_FALSE; |
3861
c3625a895caf
Use new keyboard mapping routines
Patrice Mandin <patmandin@gmail.com>
parents:
3854
diff
changeset
|
64 |
c3625a895caf
Use new keyboard mapping routines
Patrice Mandin <patmandin@gmail.com>
parents:
3854
diff
changeset
|
65 SDL_Atari_InitInternalKeymap(this); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
66 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
67 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
68 void GEM_PumpEvents(_THIS) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
69 { |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
70 short mousex, mousey, mouseb, dummy; |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
71 short kstate, prevkc, prevks; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
72 int i; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
73 SDL_keysym keysym; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
74 |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
75 SDL_memset(gem_currentkeyboard,0,sizeof(gem_currentkeyboard)); |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
76 prevkc = prevks = 0; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
77 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
78 for (;;) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
79 { |
1092
1f37386ef508
Forgot variable declaration
Patrice Mandin <patmandin@gmail.com>
parents:
1091
diff
changeset
|
80 int quit, resultat, event_mask, mouse_event; |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
81 short buffer[8], kc; |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
82 short x2,y2,w2,h2; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
83 |
1089
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
84 quit = |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
85 mouse_event = |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
86 x2=y2=w2=h2 = 0; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
87 |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
88 event_mask = MU_MESAG|MU_TIMER|MU_KEYBD; |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
89 if (!GEM_fullscreen && (GEM_handle>=0)) { |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
90 wind_get (GEM_handle, WF_WORKXYWH, &x2, &y2, &w2, &h2); |
1089
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
91 event_mask |= MU_M1; |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
92 if ( (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
93 mouse_event = MO_LEAVE; |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
94 } else { |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
95 mouse_event = MO_ENTER; |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
96 } |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
97 } |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
98 |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
99 resultat = evnt_multi( |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
100 event_mask, |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
101 0,0,0, |
1089
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
102 mouse_event,x2,y2,w2,h2, |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
103 0,0,0,0,0, |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
104 buffer, |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
105 10, |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
106 &dummy,&dummy,&dummy,&kstate,&kc,&dummy |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
107 ); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
108 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
109 /* Message event ? */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
110 if (resultat & MU_MESAG) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
111 quit = do_messages(this, buffer); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
112 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
113 /* Keyboard event ? */ |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
114 if (resultat & MU_KEYBD) { |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
115 if ((prevkc != kc) || (prevks != kstate)) { |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
116 do_keyboard(kc,kstate); |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
117 } else { |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
118 /* Avoid looping, if repeating same key */ |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
119 break; |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
120 } |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
121 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
122 |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
123 /* Mouse entering/leaving window */ |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
124 if (resultat & MU_M1) { |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
125 if (this->input_grab == SDL_GRAB_OFF) { |
1089
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
126 if (SDL_GetAppState() & SDL_APPMOUSEFOCUS) { |
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
127 SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); |
1857
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
128 if (SDL_GetAppState() & SDL_APPINPUTFOCUS) { |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
129 graf_mouse(ARROW, NULL); |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
130 } |
1089
b3f7c4af00e0
Don't use both mouse events for the same task
Patrice Mandin <patmandin@gmail.com>
parents:
1088
diff
changeset
|
131 } else { |
1088
6091b9ca1a97
Don't generate multiple mouse focus events
Patrice Mandin <patmandin@gmail.com>
parents:
1074
diff
changeset
|
132 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); |
1857
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
133 if (SDL_GetAppState() & SDL_APPINPUTFOCUS) { |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
134 if (GEM_cursor == (void *) -1) { |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
135 graf_mouse(M_OFF, NULL); |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
136 } else if (GEM_cursor) { |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
137 graf_mouse(USER_DEF, GEM_cursor->mform_p); |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
138 } |
417f2af2bd52
Fix mouse cursor change
Patrice Mandin <patmandin@gmail.com>
parents:
1420
diff
changeset
|
139 } |
1088
6091b9ca1a97
Don't generate multiple mouse focus events
Patrice Mandin <patmandin@gmail.com>
parents:
1074
diff
changeset
|
140 } |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
141 } |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
142 } |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
143 |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
144 /* Timer event ? */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
145 if ((resultat & MU_TIMER) || quit) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
146 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
147 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
148 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
149 /* Update mouse */ |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
150 graf_mkstate(&mousex, &mousey, &mouseb, &kstate); |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
151 do_mouse(this, mousex, mousey, mouseb, kstate); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
152 |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
153 /* Now generate keyboard events */ |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
154 for (i=0; i<ATARIBIOS_MAXKEYS; i++) { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
155 /* Key pressed ? */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
156 if (gem_currentkeyboard[i] && !gem_previouskeyboard[i]) |
1209
a55ac374271c
Added preliminary missingtranslation from Atari to Unicode charset
Patrice Mandin <patmandin@gmail.com>
parents:
1092
diff
changeset
|
157 SDL_PrivateKeyboard(SDL_PRESSED, |
3861
c3625a895caf
Use new keyboard mapping routines
Patrice Mandin <patmandin@gmail.com>
parents:
3854
diff
changeset
|
158 SDL_Atari_TranslateKey(i, &keysym, SDL_TRUE)); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
159 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
160 /* Key unpressed ? */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
161 if (gem_previouskeyboard[i] && !gem_currentkeyboard[i]) |
1209
a55ac374271c
Added preliminary missingtranslation from Atari to Unicode charset
Patrice Mandin <patmandin@gmail.com>
parents:
1092
diff
changeset
|
162 SDL_PrivateKeyboard(SDL_RELEASED, |
3861
c3625a895caf
Use new keyboard mapping routines
Patrice Mandin <patmandin@gmail.com>
parents:
3854
diff
changeset
|
163 SDL_Atari_TranslateKey(i, &keysym, SDL_FALSE)); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
164 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
165 |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
166 SDL_memcpy(gem_previouskeyboard,gem_currentkeyboard,sizeof(gem_previouskeyboard)); |
996
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
167 |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
168 /* Refresh window name ? */ |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
169 if (GEM_refresh_name) { |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
170 if ( SDL_GetAppState() & SDL_APPACTIVE ) { |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
171 /* Fullscreen/windowed */ |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
172 if (GEM_title_name) { |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
173 wind_set(GEM_handle,WF_NAME,(short)(((unsigned long)GEM_title_name)>>16),(short)(((unsigned long)GEM_title_name) & 0xffff),0,0); |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
174 } |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
175 } else { |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
176 /* Iconified */ |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
177 if (GEM_icon_name) { |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
178 wind_set(GEM_handle,WF_NAME,(short)(((unsigned long)GEM_icon_name)>>16),(short)(((unsigned long)GEM_icon_name) & 0xffff),0,0); |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
179 } |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
180 } |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
181 GEM_refresh_name = SDL_FALSE; |
54bb19455081
Forgot to change window title in the normal case
Patrice Mandin <patmandin@gmail.com>
parents:
964
diff
changeset
|
182 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
183 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
184 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
185 static int do_messages(_THIS, short *message) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
186 { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
187 int quit, posted; |
922
7b920743ce57
Correctly set window size if resized or maximized
Patrice Mandin <patmandin@gmail.com>
parents:
919
diff
changeset
|
188 short x2,y2,w2,h2; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
189 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
190 quit=0; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
191 switch (message[0]) { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
192 case WM_CLOSED: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
193 case AP_TERM: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
194 posted = SDL_PrivateQuit(); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
195 quit=1; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
196 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
197 case WM_MOVED: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
198 wind_set(message[3],WF_CURRXYWH,message[4],message[5],message[6],message[7]); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
199 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
200 case WM_TOPPED: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
201 wind_set(message[3],WF_TOP,message[4],0,0,0); |
1091
67b7f0f410a2
Correctly process top/bottom event messages
Patrice Mandin <patmandin@gmail.com>
parents:
1090
diff
changeset
|
202 /* Continue with TOP event processing */ |
67b7f0f410a2
Correctly process top/bottom event messages
Patrice Mandin <patmandin@gmail.com>
parents:
1090
diff
changeset
|
203 case WM_ONTOP: |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
204 SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS); |
1074
936da0056ed3
Save/restore system palette when application topped/untopped
Patrice Mandin <patmandin@gmail.com>
parents:
1073
diff
changeset
|
205 if (VDI_setpalette) { |
936da0056ed3
Save/restore system palette when application topped/untopped
Patrice Mandin <patmandin@gmail.com>
parents:
1073
diff
changeset
|
206 VDI_setpalette(this, VDI_curpalette); |
936da0056ed3
Save/restore system palette when application topped/untopped
Patrice Mandin <patmandin@gmail.com>
parents:
1073
diff
changeset
|
207 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
208 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
209 case WM_REDRAW: |
964
d9209754ebee
Prevent redraws till internal buffers are correctly setup
Patrice Mandin <patmandin@gmail.com>
parents:
928
diff
changeset
|
210 if (!GEM_lock_redraw) { |
d9209754ebee
Prevent redraws till internal buffers are correctly setup
Patrice Mandin <patmandin@gmail.com>
parents:
928
diff
changeset
|
211 GEM_wind_redraw(this, message[3],&message[4]); |
d9209754ebee
Prevent redraws till internal buffers are correctly setup
Patrice Mandin <patmandin@gmail.com>
parents:
928
diff
changeset
|
212 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
213 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
214 case WM_ICONIFY: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
215 case WM_ALLICONIFY: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
216 wind_set(message[3],WF_ICONIFY,message[4],message[5],message[6],message[7]); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
217 /* If we're active, make ourselves inactive */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
218 if ( SDL_GetAppState() & SDL_APPACTIVE ) { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
219 /* Send an internal deactivate event */ |
1088
6091b9ca1a97
Don't generate multiple mouse focus events
Patrice Mandin <patmandin@gmail.com>
parents:
1074
diff
changeset
|
220 SDL_PrivateAppActive(0, SDL_APPACTIVE); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
221 } |
736
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
222 /* Update window title */ |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
223 if (GEM_refresh_name && GEM_icon_name) { |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
224 wind_set(GEM_handle,WF_NAME,(short)(((unsigned long)GEM_icon_name)>>16),(short)(((unsigned long)GEM_icon_name) & 0xffff),0,0); |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
225 GEM_refresh_name = SDL_FALSE; |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
226 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
227 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
228 case WM_UNICONIFY: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
229 wind_set(message[3],WF_UNICONIFY,message[4],message[5],message[6],message[7]); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
230 /* If we're not active, make ourselves active */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
231 if ( !(SDL_GetAppState() & SDL_APPACTIVE) ) { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
232 /* Send an internal activate event */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
233 SDL_PrivateAppActive(1, SDL_APPACTIVE); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
234 } |
736
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
235 if (GEM_refresh_name && GEM_title_name) { |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
236 wind_set(GEM_handle,WF_NAME,(short)(((unsigned long)GEM_title_name)>>16),(short)(((unsigned long)GEM_title_name) & 0xffff),0,0); |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
237 GEM_refresh_name = SDL_FALSE; |
028e03e273c8
Use new C2P routine + corrections for iconification window
Patrice Mandin <patmandin@gmail.com>
parents:
319
diff
changeset
|
238 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
239 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
240 case WM_SIZED: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
241 wind_set (message[3], WF_CURRXYWH, message[4], message[5], message[6], message[7]); |
964
d9209754ebee
Prevent redraws till internal buffers are correctly setup
Patrice Mandin <patmandin@gmail.com>
parents:
928
diff
changeset
|
242 wind_get (message[3], WF_WORKXYWH, &x2, &y2, &w2, &h2); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
243 GEM_win_fulled = SDL_FALSE; /* Cancel maximized flag */ |
964
d9209754ebee
Prevent redraws till internal buffers are correctly setup
Patrice Mandin <patmandin@gmail.com>
parents:
928
diff
changeset
|
244 GEM_lock_redraw = SDL_TRUE; /* Prevent redraw till buffers resized */ |
922
7b920743ce57
Correctly set window size if resized or maximized
Patrice Mandin <patmandin@gmail.com>
parents:
919
diff
changeset
|
245 SDL_PrivateResize(w2, h2); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
246 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
247 case WM_FULLED: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
248 { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
249 short x,y,w,h; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
250 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
251 if (GEM_win_fulled) { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
252 wind_get (message[3], WF_PREVXYWH, &x, &y, &w, &h); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
253 GEM_win_fulled = SDL_FALSE; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
254 } else { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
255 x = GEM_desk_x; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
256 y = GEM_desk_y; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
257 w = GEM_desk_w; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
258 h = GEM_desk_h; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
259 GEM_win_fulled = SDL_TRUE; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
260 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
261 wind_set (message[3], WF_CURRXYWH, x, y, w, h); |
922
7b920743ce57
Correctly set window size if resized or maximized
Patrice Mandin <patmandin@gmail.com>
parents:
919
diff
changeset
|
262 wind_get (message[3], WF_WORKXYWH, &x2, &y2, &w2, &h2); |
964
d9209754ebee
Prevent redraws till internal buffers are correctly setup
Patrice Mandin <patmandin@gmail.com>
parents:
928
diff
changeset
|
263 GEM_lock_redraw = SDL_TRUE; /* Prevent redraw till buffers resized */ |
922
7b920743ce57
Correctly set window size if resized or maximized
Patrice Mandin <patmandin@gmail.com>
parents:
919
diff
changeset
|
264 SDL_PrivateResize(w2, h2); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
265 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
266 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
267 case WM_BOTTOMED: |
1091
67b7f0f410a2
Correctly process top/bottom event messages
Patrice Mandin <patmandin@gmail.com>
parents:
1090
diff
changeset
|
268 wind_set(message[3],WF_BOTTOM,0,0,0,0); |
67b7f0f410a2
Correctly process top/bottom event messages
Patrice Mandin <patmandin@gmail.com>
parents:
1090
diff
changeset
|
269 /* Continue with BOTTOM event processing */ |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
270 case WM_UNTOPPED: |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
271 SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS); |
1074
936da0056ed3
Save/restore system palette when application topped/untopped
Patrice Mandin <patmandin@gmail.com>
parents:
1073
diff
changeset
|
272 if (VDI_setpalette) { |
936da0056ed3
Save/restore system palette when application topped/untopped
Patrice Mandin <patmandin@gmail.com>
parents:
1073
diff
changeset
|
273 VDI_setpalette(this, VDI_oldpalette); |
936da0056ed3
Save/restore system palette when application topped/untopped
Patrice Mandin <patmandin@gmail.com>
parents:
1073
diff
changeset
|
274 } |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
275 break; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
276 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
277 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
278 return quit; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
279 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
280 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
281 static void do_keyboard(short kc, short ks) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
282 { |
3861
c3625a895caf
Use new keyboard mapping routines
Patrice Mandin <patmandin@gmail.com>
parents:
3854
diff
changeset
|
283 int scancode; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
284 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
285 if (kc) { |
3861
c3625a895caf
Use new keyboard mapping routines
Patrice Mandin <patmandin@gmail.com>
parents:
3854
diff
changeset
|
286 scancode=(kc>>8) & (ATARIBIOS_MAXKEYS-1); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
287 gem_currentkeyboard[scancode]=0xFF; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
288 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
289 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
290 /* Read special keys */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
291 if (ks & K_RSHIFT) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
292 gem_currentkeyboard[SCANCODE_RIGHTSHIFT]=0xFF; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
293 if (ks & K_LSHIFT) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
294 gem_currentkeyboard[SCANCODE_LEFTSHIFT]=0xFF; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
295 if (ks & K_CTRL) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
296 gem_currentkeyboard[SCANCODE_LEFTCONTROL]=0xFF; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
297 if (ks & K_ALT) |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
298 gem_currentkeyboard[SCANCODE_LEFTALT]=0xFF; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
299 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
300 |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
301 static void do_mouse(_THIS, short mx, short my, short mb, short ks) |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
302 { |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
303 static short prevmousex=0, prevmousey=0, prevmouseb=0; |
926
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
304 short x2, y2, w2, h2; |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
305 |
1067
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
306 /* Don't return mouse events if out of window */ |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
307 if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS)==0) { |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
308 return; |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
309 } |
f73b199bcd75
Better mouse lose/gain focus
Patrice Mandin <patmandin@gmail.com>
parents:
1065
diff
changeset
|
310 |
926
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
311 /* Retrieve window coords, and generate mouse events accordingly */ |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
312 x2 = y2 = 0; |
928
6c87754f324c
Forgot to initialize maximum position for mouse
Patrice Mandin <patmandin@gmail.com>
parents:
927
diff
changeset
|
313 w2 = VDI_w; |
6c87754f324c
Forgot to initialize maximum position for mouse
Patrice Mandin <patmandin@gmail.com>
parents:
927
diff
changeset
|
314 h2 = VDI_h; |
926
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
315 if ((!GEM_fullscreen) && (GEM_handle>=0)) { |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
316 wind_get (GEM_handle, WF_WORKXYWH, &x2, &y2, &w2, &h2); |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
317 |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
318 /* Do not generate mouse button event if out of window working area */ |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
319 if ((mx<x2) || (mx>=x2+w2) || (my<y2) || (my>=y2+h2)) { |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
320 mb=prevmouseb; |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
321 } |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
322 } |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
323 |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
324 /* Mouse motion ? */ |
1267
fdc7ef6ecab4
Correctly manage mouse relative motion
Patrice Mandin <patmandin@gmail.com>
parents:
1237
diff
changeset
|
325 if (GEM_mouse_relative) { |
1420
2405517b5eab
Added preliminary support for MiNT /dev/mouse driver (disabled atm)
Patrice Mandin <patmandin@gmail.com>
parents:
1412
diff
changeset
|
326 if (GEM_usedevmouse) { |
2405517b5eab
Added preliminary support for MiNT /dev/mouse driver (disabled atm)
Patrice Mandin <patmandin@gmail.com>
parents:
1412
diff
changeset
|
327 SDL_AtariDevMouse_PostMouseEvents(this, SDL_FALSE); |
2405517b5eab
Added preliminary support for MiNT /dev/mouse driver (disabled atm)
Patrice Mandin <patmandin@gmail.com>
parents:
1412
diff
changeset
|
328 } else { |
2405517b5eab
Added preliminary support for MiNT /dev/mouse driver (disabled atm)
Patrice Mandin <patmandin@gmail.com>
parents:
1412
diff
changeset
|
329 SDL_AtariXbios_PostMouseEvents(this, SDL_FALSE); |
2405517b5eab
Added preliminary support for MiNT /dev/mouse driver (disabled atm)
Patrice Mandin <patmandin@gmail.com>
parents:
1412
diff
changeset
|
330 } |
1267
fdc7ef6ecab4
Correctly manage mouse relative motion
Patrice Mandin <patmandin@gmail.com>
parents:
1237
diff
changeset
|
331 } else { |
fdc7ef6ecab4
Correctly manage mouse relative motion
Patrice Mandin <patmandin@gmail.com>
parents:
1237
diff
changeset
|
332 if ((prevmousex!=mx) || (prevmousey!=my)) { |
926
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
333 int posx, posy; |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
334 |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
335 /* Give mouse position relative to window position */ |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
336 posx = mx - x2; |
927
c5689bd09eaa
Wrong check for minimum mouse position
Patrice Mandin <patmandin@gmail.com>
parents:
926
diff
changeset
|
337 if (posx<0) posx = 0; |
926
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
338 if (posx>w2) posx = w2-1; |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
339 posy = my - y2; |
927
c5689bd09eaa
Wrong check for minimum mouse position
Patrice Mandin <patmandin@gmail.com>
parents:
926
diff
changeset
|
340 if (posy<0) posy = 0; |
926
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
341 if (posy>h2) posy = h2-1; |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
342 |
83db694556eb
Give mouse position relative to window position, and do not generate mouse button event if outside of the window
Patrice Mandin <patmandin@gmail.com>
parents:
922
diff
changeset
|
343 SDL_PrivateMouseMotion(0, 0, posx, posy); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
344 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
345 prevmousex = mx; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
346 prevmousey = my; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
347 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
348 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
349 /* Mouse button ? */ |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
350 if (prevmouseb!=mb) { |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
351 int i; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
352 |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
353 for (i=0;i<2;i++) { |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
354 int curbutton, prevbutton; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
355 |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
356 curbutton = mb & (1<<i); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
357 prevbutton = prevmouseb & (1<<i); |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
358 |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
359 if (curbutton && !prevbutton) { |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
360 SDL_PrivateMouseButton(SDL_PRESSED, i+1, 0, 0); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
361 } |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
362 if (!curbutton && prevbutton) { |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
363 SDL_PrivateMouseButton(SDL_RELEASED, i+1, 0, 0); |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
364 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
365 } |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
366 prevmouseb = mb; |
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
367 } |
319
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
368 |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
369 /* Read special keys */ |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
370 if (ks & K_RSHIFT) |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
371 gem_currentkeyboard[SCANCODE_RIGHTSHIFT]=0xFF; |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
372 if (ks & K_LSHIFT) |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
373 gem_currentkeyboard[SCANCODE_LEFTSHIFT]=0xFF; |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
374 if (ks & K_CTRL) |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
375 gem_currentkeyboard[SCANCODE_LEFTCONTROL]=0xFF; |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
376 if (ks & K_ALT) |
189a6a3416c7
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
377 gem_currentkeyboard[SCANCODE_LEFTALT]=0xFF; |
281
c5010ab8ba35
Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
378 } |