Revert "Make sym/code distinction implicit"

This reverts commit 668e2386729cd253ab2c68837af976add8772888.

malc committed 5 years ago

Commit 2c8e6cc1 parent 668e2384 files · +7 −7Browse files

Unified · Split

4 files

@@ -4957,7 +4957,7 @@ let () = · 4956 unmodified lines
4957	method pmotion x y =	4957	method pmotion x y =
4958	state.mpos <- (x, y);	4958	state.mpos <- (x, y);
4959	state.uioh <- state.uioh#pmotion x y	4959	state.uioh <- state.uioh#pmotion x y
4960	method keysym k m =	4960	method key k m =
4961	vlog "k=%#x m=%#x" k m;	4961	vlog "k=%#x m=%#x" k m;
4962	let mascm = m land (	4962	let mascm = m land (
4963	Wsi.altmask + Wsi.shiftmask + Wsi.ctrlmask + Wsi.metamask	4963	Wsi.altmask + Wsi.shiftmask + Wsi.ctrlmask + Wsi.metamask

@@ -28,7 +28,7 @@ class type t = · 27 unmodified lines
28	method mouse : int -> bool -> int -> int -> int -> unit	28	method mouse : int -> bool -> int -> int -> int -> unit
29	method motion : int -> int -> unit	29	method motion : int -> int -> unit
30	method pmotion : int -> int -> unit	30	method pmotion : int -> int -> unit
31	method keysym : int -> int -> unit	31	method key : int -> int -> unit
32	method enter : int -> int -> unit	32	method enter : int -> int -> unit
33	method leave : unit	33	method leave : unit
34	method winstate : winstate list -> unit	34	method winstate : winstate list -> unit

@@ -26,7 +26,7 @@ let onot = object · 25 unmodified lines
26	method mouse _ _ _ _ _ = ()	26	method mouse _ _ _ _ _ = ()
27	method motion _ _ = ()	27	method motion _ _ = ()
28	method pmotion _ _ = ()	28	method pmotion _ _ = ()
29	method keysym _ _ = ()	29	method key _ _ = ()
30	method enter _ _ = ()	30	method enter _ _ = ()
31	method leave = ()	31	method leave = ()
32	method winstate _ = ()	32	method winstate _ = ()
@@ -45,7 +45,7 @@ class type t = object · 12 unmodified lines
45	method mouse : int -> bool -> int -> int -> int -> unit	45	method mouse : int -> bool -> int -> int -> int -> unit
46	method motion : int -> int -> unit	46	method motion : int -> int -> unit
47	method pmotion : int -> int -> unit	47	method pmotion : int -> int -> unit
48	method keysym : int -> int -> unit	48	method key : int -> int -> unit
49	method enter : int -> int -> unit	49	method enter : int -> int -> unit
50	method leave : unit	50	method leave : unit
51	method winstate : winstate list -> unit	51	method winstate : winstate list -> unit

@@ -38,7 +38,7 @@ let onot = object · 37 unmodified lines
38	method mouse _ _ _ _ _ = ()	38	method mouse _ _ _ _ _ = ()
39	method motion _ _ = ()	39	method motion _ _ = ()
40	method pmotion _ _ = ()	40	method pmotion _ _ = ()
41	method keysym _ _ = ()	41	method key _ _ = ()
42	method enter _ _ = ()	42	method enter _ _ = ()
43	method leave = ()	43	method leave = ()
44	method winstate _ = ()	44	method winstate _ = ()
@@ -58,7 +58,7 @@ class type t = · 13 unmodified lines
58	method mouse : int -> bool -> int -> int -> int -> unit	58	method mouse : int -> bool -> int -> int -> int -> unit
59	method motion : int -> int -> unit	59	method motion : int -> int -> unit
60	method pmotion : int -> int -> unit	60	method pmotion : int -> int -> unit
61	method keysym : int -> int -> unit	61	method key : int -> int -> unit
62	method enter : int -> int -> unit	62	method enter : int -> int -> unit
63	method leave : unit	63	method leave : unit
64	method winstate : winstate list -> unit	64	method winstate : winstate list -> unit
@@ -490,7 +490,7 @@ let readresp sock = · 425 unmodified lines
490	vlog "keysym = %x %c mask %#x code %d"	490	vlog "keysym = %x %c mask %#x code %d"
491	keysym (Char.unsafe_chr keysym) mask code;	491	keysym (Char.unsafe_chr keysym) mask code;
492	if keysym != 0	492	if keysym != 0
493	then state.t#keysym keysym mask	493	then state.t#key keysym mask
494		494
495	\| 3 -> (* key release *)	495	\| 3 -> (* key release *)
496	if Array.length state.keymap > 0	496	if Array.length state.keymap > 0

Keyboard shortcuts