From 3b8253278ccfa01c18262a31b7e92181ad3ad345 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 27 Aug 2016 11:52:35 +0200 Subject: preparations for unified key/button bindings --- src/options.h | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'src/options.h') diff --git a/src/options.h b/src/options.h index bbf129f..7440749 100644 --- a/src/options.h +++ b/src/options.h @@ -129,8 +129,10 @@ struct __fehoptions { }; struct __fehkey { - int keysyms[3]; - int keystates[3]; + unsigned int keysyms[3]; + unsigned int keystates[3]; + unsigned int state; + unsigned int button; }; struct __fehkb { @@ -199,24 +201,14 @@ struct __fehkb { struct __fehkey reload_minus; struct __fehkey reload_plus; struct __fehkey toggle_keep_vp; -}; - -struct __fehbutton { - int modifier; - char button; -}; - -struct __fehbb { - struct __fehbutton pan; - struct __fehbutton zoom; - struct __fehbutton reload; - struct __fehbutton prev; - struct __fehbutton next; - struct __fehbutton menu; - struct __fehbutton blur; - struct __fehbutton rotate; - struct __fehbutton zoom_in; - struct __fehbutton zoom_out; + struct __fehkey pan; + struct __fehkey zoom; + struct __fehkey reload; + struct __fehkey prev; + struct __fehkey next; + struct __fehkey menu; + struct __fehkey blur; + struct __fehkey rotate; }; void init_parse_options(int argc, char **argv); -- cgit v1.2.3