trjp_sawfish
Fork

提交

(find_meta): fixed meta-keysyms and alt-keysyms; now works when alt
and meta keysyms are mapped to the same keycode

--- a/src/keys.c

+++ b/src/keys.c

		@@ -987,6 +987,7 @@ find_meta(void)
987	987	KeySym *syms;
988	988	int syms_per_code;
989	989	XModifierKeymap *mods;
	990	+ repv meta_syms = Qnil, alt_syms = Qnil;
990	991
991	992	#if defined (XlibSpecificationRelease) && XlibSpecificationRelease >= 4
992	993	XDisplayKeycodes(dpy, &min_code, &max_code);

		@@ -1019,10 +1020,14 @@ find_meta(void)
1019	1020	{
1020	1021	case XK_Meta_L: case XK_Meta_R:
1021	1022	meta_mod = 1 << row;
	1023	+ meta_syms = Fcons (sym == XK_Meta_L ? rep_VAL(&meta_l)
	1024	+ : rep_VAL(&meta_r), meta_syms);
1022	1025	break;
1023	1026
1024	1027	case XK_Alt_L: case XK_Alt_R:
1025	1028	alt_mod = 1 << row;
	1029	+ alt_syms = Fcons (sym == XK_Alt_L ? rep_VAL(&alt_l)
	1030	+ : rep_VAL(&alt_r), alt_syms);
1026	1031	break;
1027	1032
1028	1033	case XK_Num_Lock:

		@@ -1041,20 +1046,19 @@ find_meta(void)
1041	1046	return;
1042	1047
1043	1048	if (meta_mod == 0)
1044		- {
1045	1049	meta_mod = alt_mod;
1046		- Fset (Qmeta_keysyms, rep_list_2 (rep_VAL(&alt_l), rep_VAL(&alt_r)));
1047		- }
1048		- else
1049		- Fset (Qmeta_keysyms, rep_list_2 (rep_VAL(&meta_l), rep_VAL(&meta_r)));
1050	1050
1051	1051	if (alt_mod == 0)
1052		- {
1053	1052	alt_mod = meta_mod;
1054		- Fset (Qalt_keysyms, rep_list_2 (rep_VAL(&meta_l), rep_VAL(&meta_r)));
	1053	+
	1054	+ if (meta_mod == alt_mod)
	1055	+ {
	1056	+ meta_syms = Fnconc (rep_list_2 (meta_syms, alt_syms));
	1057	+ alt_syms = meta_syms;
1055	1058	}
1056		- else
1057		- Fset (Qalt_keysyms, rep_list_2 (rep_VAL(&alt_l), rep_VAL(&alt_r)));
	1059	+
	1060	+ Fset (Qmeta_keysyms, meta_syms);
	1061	+ Fset (Qalt_keysyms, alt_syms);
1058	1062	}
1059	1063
1060	1064