usim

Check-in [4da23cb0f0]
Login
☰Home Timeline Branches Tags ForumTickets Wiki

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:sdl1.c: Half working keyboard support.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ams/sdl
Files: files | file ages | folders
SHA3-256: 4da23cb0f00bfaa07dfafe6e22f4cf0c61d4bb05b3b90a7f5c8501fc444f0190
User & Date: ams 2024-06-18 07:53:34
Context
2024-06-18
08:40
Minor cleanups. check-in: 303b8a6283 user: ams tags: ams/sdl
07:53
sdl1.c: Half working keyboard support. check-in: 4da23cb0f0 user: ams tags: ams/sdl
07:35
sdl2.c: Use keysyms instead of scancodes; SDL2 input now works. check-in: 19e882e080 user: ams tags: ams/sdl
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to sdl1.c.

︙︙
9
10
11
12
13
14
15



16
17
18
19
20
21
22

#include "kbd.h"
#include "mouse.h"
#include "utrace.h"
#include "idle.h"

SDL_Surface *screen;




/*
 * This is shared between x11.c, and sdl1.c ... the only difference is
 * the hook in send_accumulated_updates.
 */

unsigned long Background;
unsigned long Foreground;








>
>
>








9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

#include "kbd.h"
#include "mouse.h"
#include "utrace.h"
#include "idle.h"

SDL_Surface *screen;

#include <X11/keysym.h> // for XK_FOO  meh
#include <X11/X.h> // for FOOMapIndex  meh

/*
 * This is shared between x11.c, and sdl1.c ... the only difference is
 * the hook in send_accumulated_updates.
 */

unsigned long Background;
unsigned long Foreground;
︙︙
62
63
64
65
66
67
68
69
70
71
72
73


74
75
76
77
78
79

80
81
82
83
84


85


























































































86
87
88
89
90
91
92
93
94

95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161

	SDL_Quit();
}

/*
 * Returns the X11 modifier index of KEYCODE, or -1 if not found.
 */
int
sdl1_bucky(SDLKey keycode)
{
//	XModifierKeymap *modmap;
//
//	modmap = XGetModifierMapping(display);


//	for (int modifier = 0; modifier < 8; modifier++) {
//		for (int i = 0; i < modmap->max_keypermod; i++) {
//			if (keycode == modmap->modifiermap[modifier * modmap->max_keypermod + i]) {
//				XFreeModifiermap(modmap);
//				return modifier;
//			}

//		}
//	}
//	XFreeModifiermap(modmap);
	return -1;
}





























































































/*
 * Takes E, converts it into a LM (hardware) keycode and sends it to
 * the IOB KBD.
 */
static void
process_key(SDL_KeyboardEvent *e, int keydown)
{
//	KeySym keysym;
//	SDLKey keycode;


	int bi;
	unsigned char buf[5];

	idle_keyboard_activity();

//	keycode = SDL_KeysymToKeycode(e->keysym.sym);
//if (event->key.code == key) ...

//	XLookupString(&e->xkey, (char *)buf, sizeof(buf), &keysym, &status);
//	keycode = x11_keysym_to_keycode(keysym);
//	if (keycode == NoSymbol || keysym > NELEM(kbd_map)) {
//		NOTICE(TRACE_USIM, "kbd (cadet): unable to translate to sdl1 keycode (keysym = 0%o)\n", keysym);
//		return;
//	}

	if (kbd_type == 0) {
		if (!keydown)
			return;
		bi = 0;
//		if (e->xkey.state & ShiftMask)
//			knight_process_bucky(ShiftMapIndex, &bi);
//		if (e->xkey.state & LockMask)
//			knight_process_bucky(LockMapIndex, &bi);
//		if (e->xkey.state & ControlMask)
//			knight_process_bucky(ControlMapIndex, &bi);
//		if (e->xkey.state & Mod1Mask)
//			knight_process_bucky(Mod1MapIndex, &bi);
//		if (e->xkey.state & Mod2Mask)
//			knight_process_bucky(Mod2MapIndex, &bi);
//		if (e->xkey.state & Mod3Mask)
//			knight_process_bucky(Mod3MapIndex, &bi);
//		if (e->xkey.state & Mod4Mask)
//			knight_process_bucky(Mod4MapIndex, &bi);
//		if (e->xkey.state & Mod5Mask)
//			knight_process_bucky(Mod5MapIndex, &bi);
		knight_process_key(e->keysym.sym, bi, keydown);
	} else {
		bi = sdl1_bucky(e->keysym.sym);
		cadet_process_key(e->keysym.sym, bi, keydown);
	}
}

void
sdl1_event(void)
{
	SDL_Event ev1, *ev = &ev1;

	send_accumulated_updates();
	kbd_dequeue_key_event();
	while (SDL_PollEvent(ev)) {
		switch (ev->type) {
		case SDL_VIDEOEXPOSE:
			SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
			break;
		case SDL_KEYDOWN:
			process_key(&ev->key, 1);
			break;
		case SDL_KEYUP:
			process_key(&ev->key, 0);
			break;
		case SDL_MOUSEMOTION:
		case SDL_MOUSEBUTTONDOWN:
		case SDL_MOUSEBUTTONUP: {
			int x;
			int y;
			int dx, dy;








|

<
<
|
>
>
|
|
<
<
|
|
>
|
<
<


>
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>





|



>
|




|
<
<
<
<
<
|
|
|
<
|




















|

|
|






|



|
|




|


|








65
66
67
68
69
70
71
72
73


74
75
76
77
78


79
80
81
82


83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193





194
195
196

197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248

	SDL_Quit();
}

/*
 * Returns the X11 modifier index of KEYCODE, or -1 if not found.
 */
int
sdl1_bucky(SDL_KeyboardEvent e)
{


	int mod = SDL_GetModState();
	printf("e.keysym.sym = %d, mod = %d\n", e.keysym.sym, mod);
	if (mod & KMOD_CTRL && (e.keysym.sym == SDLK_LCTRL || e.keysym.sym == SDLK_RCTRL)) return ControlMapIndex;
	if (mod & KMOD_SHIFT && (e.keysym.sym == SDLK_LSHIFT || e.keysym.sym == SDLK_RSHIFT)) return ShiftMapIndex;
	if (mod & KMOD_ALT  && (e.keysym.sym == SDLK_LALT || e.keysym.sym == SDLK_RALT)) return Mod1MapIndex;


//	if (mod & KMOD_NUM) return Mod2MapIndex;
//	if (mod & KMOD_MODE) return Mod3MapIndex;
//	if (mod & KMOD_GUI && (e.keysym.sym == SDLK_LGUI || e.keysym.sym == SDLK_RGUI)) return Mod4MapIndex;
//	if (mod & KMOD_SCROLL) return Mod5MapIndex;


	return -1;
}
int
sdl1_keysym_to_xk(SDL_KeyboardEvent e)
{
	switch (e.keysym.sym) {
	case SDLK_ESCAPE: return XK_Escape;
	case SDLK_F1: return XK_F1;
	case SDLK_F2: return XK_F2;
	case SDLK_F3: return XK_F3;
	case SDLK_F4: return XK_F4;
	case SDLK_F5: return XK_F5;
	case SDLK_F6: return XK_F6;
	case SDLK_F7: return XK_F7;
	case SDLK_PAGEUP: return XK_Page_Up;
	case SDLK_PAGEDOWN: return XK_Page_Down;
	case SDLK_HOME: return XK_Home;
	case SDLK_END: return XK_End;
	case SDLK_LEFT: return XK_Left;
	case SDLK_RIGHT: return XK_Right;
	case SDLK_UP: return XK_Up;
	case SDLK_DOWN: return XK_Down;
	case SDLK_BACKQUOTE: return e.keysym.mod & KMOD_SHIFT ? XK_asciitilde : XK_grave;
	case SDLK_1: return e.keysym.mod & KMOD_SHIFT ? XK_exclam : XK_1;
	case SDLK_2: return e.keysym.mod & KMOD_SHIFT ? XK_at : XK_2;
	case SDLK_3: return e.keysym.mod & KMOD_SHIFT ? XK_numbersign : XK_3;
	case SDLK_4: return e.keysym.mod & KMOD_SHIFT ? XK_dollar : XK_4;
	case SDLK_5: return e.keysym.mod & KMOD_SHIFT ? XK_percent : XK_5;
	case SDLK_6: return e.keysym.mod & KMOD_SHIFT ? XK_asciicircum : XK_6;
	case SDLK_7: return e.keysym.mod & KMOD_SHIFT ? XK_ampersand : XK_7;
	case SDLK_8: return e.keysym.mod & KMOD_SHIFT ? XK_asterisk : XK_8;
	case SDLK_9: return e.keysym.mod & KMOD_SHIFT ? XK_parenleft : XK_9;
	case SDLK_0: return e.keysym.mod & KMOD_SHIFT ? XK_parenright : XK_0;
	case SDLK_MINUS: return e.keysym.mod & KMOD_SHIFT ? XK_underscore : XK_minus;
	case SDLK_EQUALS: return e.keysym.mod & KMOD_SHIFT ? XK_plus : XK_equal;
	case SDLK_TAB: return XK_Tab;
	case SDLK_q: return e.keysym.mod & KMOD_SHIFT ? XK_Q : XK_q;
	case SDLK_w: return e.keysym.mod & KMOD_SHIFT ? XK_W : XK_w;
	case SDLK_e: return e.keysym.mod & KMOD_SHIFT ? XK_E : XK_e;
	case SDLK_r: return e.keysym.mod & KMOD_SHIFT ? XK_R : XK_r;
	case SDLK_t: return e.keysym.mod & KMOD_SHIFT ? XK_T : XK_t;
	case SDLK_y: return e.keysym.mod & KMOD_SHIFT ? XK_Y : XK_y;
	case SDLK_u: return e.keysym.mod & KMOD_SHIFT ? XK_U : XK_u;
	case SDLK_i: return e.keysym.mod & KMOD_SHIFT ? XK_I : XK_i;
	case SDLK_o: return e.keysym.mod & KMOD_SHIFT ? XK_O : XK_o;
	case SDLK_p: return e.keysym.mod & KMOD_SHIFT ? XK_P : XK_p;
	case SDLK_LEFTBRACKET: return e.keysym.mod & KMOD_SHIFT ? XK_braceleft : XK_bracketleft;
	case SDLK_RIGHTBRACKET: return e.keysym.mod & KMOD_SHIFT ? XK_braceright : XK_bracketright;
	case SDLK_BACKSLASH: return e.keysym.mod & KMOD_SHIFT ? XK_bar : XK_backslash;
	case SDLK_BACKSPACE: return XK_BackSpace;
	case SDLK_a: return e.keysym.mod & KMOD_SHIFT ? XK_A : XK_a;
	case SDLK_s: return e.keysym.mod & KMOD_SHIFT ? XK_S : XK_s;
	case SDLK_d: return e.keysym.mod & KMOD_SHIFT ? XK_D : XK_d;
	case SDLK_f: return e.keysym.mod & KMOD_SHIFT ? XK_F : XK_f;
	case SDLK_g: return e.keysym.mod & KMOD_SHIFT ? XK_G : XK_g;
	case SDLK_h: return e.keysym.mod & KMOD_SHIFT ? XK_H : XK_h;
	case SDLK_j: return e.keysym.mod & KMOD_SHIFT ? XK_J : XK_j;
	case SDLK_k: return e.keysym.mod & KMOD_SHIFT ? XK_K : XK_k;
	case SDLK_l: return e.keysym.mod & KMOD_SHIFT ? XK_L : XK_l;
	case SDLK_SEMICOLON: return e.keysym.mod & KMOD_SHIFT ? XK_colon : XK_semicolon;
	case SDLK_QUOTE: return e.keysym.mod & KMOD_SHIFT ? XK_quotedbl : XK_apostrophe;
	case SDLK_RETURN: return XK_Return;
	case SDLK_z: return e.keysym.mod & KMOD_SHIFT ? XK_Z : XK_z;
	case SDLK_x: return e.keysym.mod & KMOD_SHIFT ? XK_X : XK_x;
	case SDLK_c: return e.keysym.mod & KMOD_SHIFT ? XK_C : XK_c;
	case SDLK_v: return e.keysym.mod & KMOD_SHIFT ? XK_V : XK_v;
	case SDLK_b: return e.keysym.mod & KMOD_SHIFT ? XK_B : XK_b;
	case SDLK_n: return e.keysym.mod & KMOD_SHIFT ? XK_N : XK_n;
	case SDLK_m: return e.keysym.mod & KMOD_SHIFT ? XK_M : XK_m;
	case SDLK_COMMA: return e.keysym.mod & KMOD_SHIFT ? XK_less : XK_comma;
	case SDLK_PERIOD: return e.keysym.mod & KMOD_SHIFT ? XK_greater : XK_period;
	case SDLK_SLASH: return e.keysym.mod & KMOD_SHIFT ? XK_question : XK_slash;
	case SDLK_SPACE: return XK_space;

// case SDLK_MODE: return ???;
	case SDLK_LSHIFT: return XK_Shift_L;
	case SDLK_RSHIFT: return XK_Shift_R;
	case SDLK_LCTRL: return XK_Control_L;
	case SDLK_RCTRL: return XK_Control_R;
	case SDLK_CAPSLOCK: return XK_Caps_Lock;
// case ???: return XK_Shift_Lock;
		
//	case SDLK_LGUI: return XK_Meta_L;
//	case SDLK_RGUI: return XK_Meta_R;
	case SDLK_LALT: return XK_Alt_L;
	case SDLK_RALT: return XK_Alt_R;
//	case SDLK_LSUPER: return XK_Super_L;
//	case SDLK_RSUPER: return XK_Super_R;
//	case SDLK_LHYPER: return XK_Hyper_L;
//	case SDLK_RHYPER: return XK_Hyper_R;

	default: return XK_VoidSymbol;
	}
}

/*
 * Takes E, converts it into a LM (hardware) keycode and sends it to
 * the IOB KBD.
 */
static void
process_key(SDL_KeyboardEvent e, int keydown)
{
//	KeySym keysym;
//	SDLKey keycode;
	int keysym;
	
	int bi;
	unsigned char buf[5];

	idle_keyboard_activity();
	keysym = sdl1_keysym_to_xk(e);





	if (keysym == XK_VoidSymbol || keysym > NELEM(kbd_map)) {
		printf("kbd (cadet@sdl1): unable to translate to keysym (keysym = 0%o)\n", keysym);
		return;

	}
	if (kbd_type == 0) {
		if (!keydown)
			return;
		bi = 0;
//		if (e->xkey.state & ShiftMask)
//			knight_process_bucky(ShiftMapIndex, &bi);
//		if (e->xkey.state & LockMask)
//			knight_process_bucky(LockMapIndex, &bi);
//		if (e->xkey.state & ControlMask)
//			knight_process_bucky(ControlMapIndex, &bi);
//		if (e->xkey.state & Mod1Mask)
//			knight_process_bucky(Mod1MapIndex, &bi);
//		if (e->xkey.state & Mod2Mask)
//			knight_process_bucky(Mod2MapIndex, &bi);
//		if (e->xkey.state & Mod3Mask)
//			knight_process_bucky(Mod3MapIndex, &bi);
//		if (e->xkey.state & Mod4Mask)
//			knight_process_bucky(Mod4MapIndex, &bi);
//		if (e->xkey.state & Mod5Mask)
//			knight_process_bucky(Mod5MapIndex, &bi);
		knight_process_key(e.keysym.sym, bi, keydown);
	} else {
		bi = sdl1_bucky(e);
		cadet_process_key(keysym, bi, keydown);
	}
}

void
sdl1_event(void)
{
	SDL_Event ev;

	send_accumulated_updates();
	kbd_dequeue_key_event();
	while (SDL_PollEvent(&ev)) {
		switch (ev.type) {
		case SDL_VIDEOEXPOSE:
			SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
			break;
		case SDL_KEYDOWN:
			process_key(ev.key, 1);
			break;
		case SDL_KEYUP:
			process_key(ev.key, 0);
			break;
		case SDL_MOUSEMOTION:
		case SDL_MOUSEBUTTONDOWN:
		case SDL_MOUSEBUTTONUP: {
			int x;
			int y;
			int dx, dy;
︙︙

This page was generated in about 0.016s by Fossil 2.22 [66ee0beb9b] 2023-05-31 15:26:08