usim

Check-in [7bf9883f4f]
Login

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

Overview
Comment:ucfg.c: Handle setting modifiers in config file.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ams/sdl
Files: files | file ages | folders
SHA3-256: 7bf9883f4f786efd869751a01221388ddf4e2ce598a069bec5941d20ab43c365
User & Date: ams 2024-06-25 09:54:35
Context
2024-06-25
11:20
uch11: Split backend code to seperate files. check-in: 9e48bb8745 user: ams tags: ams/sdl
09:54
ucfg.c: Handle setting modifiers in config file. check-in: 7bf9883f4f user: ams tags: ams/sdl
09:39
Move send_accumulated_updates and accumulate_update to tv.c. check-in: 8f1f5f72ee user: ams tags: ams/sdl
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ucfg.c.

12
13
14
15
16
17
18




19
20
21
22
23
24
25
#include "kbd.h"
#include "lmch.h"
#include "misc.h"
#include "tv.h"
#include "ucfg.h"
#include "uch11.h"
#include "utrace.h"




#if WITH_X11
#include "x11.h"
#elif WITH_SDL1
#include "sdl1.h"
#elif WITH_SDL2
#include "sdl2.h"
#endif







>
>
>
>







12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
#include "kbd.h"
#include "lmch.h"
#include "misc.h"
#include "tv.h"
#include "ucfg.h"
#include "uch11.h"
#include "utrace.h"

#include <X11/keysym.h>		// for XK_FOO  meh
#include <X11/X.h>		// for FOOMapIndex  meh

#if WITH_X11
#include "x11.h"
#elif WITH_SDL1
#include "sdl1.h"
#elif WITH_SDL2
#include "sdl2.h"
#endif
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
249
250
251
252
253
254
255
				return 1;
			}
			sp = strtok(NULL, " ");
		}
		free(s);
	}

#ifdef WITH_X11
	if (streq(section, "kbd.modifiers") == true) {
		/*
		 * ---!!! We don't differentiate between left/right on
		 * ---!!!   the Lisp Machine side.
		 */
		if (streq(value, "")) {
			warnx("value for %s is empty", name);
			return 1;
		}
		     if (streq(name, "Shift"))   modifier_map[ShiftMapIndex]   = lmbucky(value);
		else if (streq(name, "Lock"))    modifier_map[LockMapIndex]    = lmbucky(value);
		else if (streq(name, "Control")) modifier_map[ControlMapIndex] = lmbucky(value);
		else if (streq(name, "Mod1"))    modifier_map[Mod1MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod2"))    modifier_map[Mod2MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod3"))    modifier_map[Mod3MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod4"))    modifier_map[Mod4MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod5"))    modifier_map[Mod5MapIndex]    = lmbucky(value);
		else {
			warnx("unknown x11 modifier: %s", name);
			return 1;
		}
	}
#elif WITH_SDL1
#endif

#ifdef WITH_X11
	if (streq(section, "kbd") == true) {
		int xk;
		int lmchar;

		xk = XStringToKeysym(name);







<


















|



<
<







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
249


250
251
252
253
254
255
256
				return 1;
			}
			sp = strtok(NULL, " ");
		}
		free(s);
	}


	if (streq(section, "kbd.modifiers") == true) {
		/*
		 * ---!!! We don't differentiate between left/right on
		 * ---!!!   the Lisp Machine side.
		 */
		if (streq(value, "")) {
			warnx("value for %s is empty", name);
			return 1;
		}
		     if (streq(name, "Shift"))   modifier_map[ShiftMapIndex]   = lmbucky(value);
		else if (streq(name, "Lock"))    modifier_map[LockMapIndex]    = lmbucky(value);
		else if (streq(name, "Control")) modifier_map[ControlMapIndex] = lmbucky(value);
		else if (streq(name, "Mod1"))    modifier_map[Mod1MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod2"))    modifier_map[Mod2MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod3"))    modifier_map[Mod3MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod4"))    modifier_map[Mod4MapIndex]    = lmbucky(value);
		else if (streq(name, "Mod5"))    modifier_map[Mod5MapIndex]    = lmbucky(value);
		else {
			warnx("unknown modifier: %s", name);
			return 1;
		}
	}



#ifdef WITH_X11
	if (streq(section, "kbd") == true) {
		int xk;
		int lmchar;

		xk = XStringToKeysym(name);