-FuncRequest::FuncRequest(kb_action act, int ax, int ay,
- mouse_button::state but, Origin o)
- : action(act), origin(o), x(ax), y(ay), button_(but)
+FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
+ mouse_button::state button, KeyModifier modifier, Origin o)
+ : action_(act), origin_(o),
+ x_(ax), y_(ay), button_(button), modifier_(modifier)