StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy over missing action structs from kbproto

master
Kristian Høgsberg 2010-06-30 15:48:39 -04:00
parent 9258cc3dca
commit 1723ef1bc7
2 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
include/X11/extensions/XKBcommon.h
View File

@ -133,21 +133,54 @@ struct xkb_switch_screen_action {
uint8_t screen;
};
struct xkb_redirect_key_action {
unsigned char type;
unsigned char new_key;
unsigned char mods_mask;
unsigned char mods;
unsigned char vmods_mask0;
unsigned char vmods_mask1;
unsigned char vmods0;
unsigned char vmods1;
};
struct xkb_pointer_action {
unsigned char type;
unsigned char flags;
unsigned char high_XXX;
unsigned char low_XXX;
unsigned char high_YYY;
unsigned char low_YYY;
};
struct xkb_message_action {
unsigned char type;
unsigned char flags;
unsigned char message[6];
};
struct xkb_pointer_button_action {
unsigned char type;
unsigned char flags;
unsigned char count;
unsigned char button;
};
union xkb_action {
struct xkb_any_action any;
struct xkb_mod_action mods;
struct xkb_group_action group;
struct xkb_iso_action iso;
struct xkb_controls_action ctrls;
struct xkb_device_button_action devbtn;
struct xkb_any_action any;
struct xkb_mod_action mods;
struct xkb_group_action group;
struct xkb_iso_action iso;
struct xkb_controls_action ctrls;
struct xkb_device_button_action devbtn;
struct xkb_device_valuator_action devval;
struct xkb_pointer_default_action dflt;
struct xkb_pointer_default_action dflt;
struct xkb_switch_screen_action screen;
XkbRedirectKeyAction redirect; /* XXX wholly unnecessary? */
XkbPtrAction ptr; /* XXX delete for DeviceValuator */
XkbPtrBtnAction btn; /* XXX delete for DeviceBtn */
XkbMessageAction msg; /* XXX just delete */
unsigned char type;
struct xkb_redirect_key_action redirect; /* XXX wholly unnecessary? */
struct xkb_pointer_action ptr; /* XXX delete for DeviceValuator */
struct xkb_pointer_button_action btn; /* XXX delete for DeviceBtn */
struct xkb_message_action msg; /* XXX just delete */
unsigned char type;
};
typedef struct _XkbcMods {

16
src/xkbcomp/action.c
View File

@ -587,10 +587,10 @@ HandleMovePtr(XkbcDescPtr xkb,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
ExprResult rtrn;
XkbPtrAction *act;
struct xkb_pointer_action *act;
Bool absolute;
act = (XkbPtrAction *) action;
act = (struct xkb_pointer_action *) action;
if ((array_ndx != NULL) && ((field == F_X) || (field == F_Y)))
return ReportActionNotArray(action->type, field);
@ -652,9 +652,9 @@ HandlePtrBtn(XkbcDescPtr xkb,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
ExprResult rtrn;
XkbPtrBtnAction *act;
struct xkb_pointer_button_action *act;
act = (XkbPtrBtnAction *) action;
act = (struct xkb_pointer_button_action *) action;
if (field == F_Button)
{
if (array_ndx != NULL)
@ -958,9 +958,9 @@ HandleActionMessage(XkbcDescPtr xkb,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
ExprResult rtrn;
XkbMessageAction *act;
struct xkb_message_action *act;
act = (XkbMessageAction *) action;
act = (struct xkb_message_action *) action;
switch (field)
{
case F_Report:
@ -1036,14 +1036,14 @@ HandleRedirectKey(XkbcDescPtr xkb,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
ExprResult rtrn;
XkbRedirectKeyAction *act;
struct xkb_redirect_key_action *act;
unsigned t1, t2;
unsigned long tmp;
if (array_ndx != NULL)
return ReportActionNotArray(action->type, field);
act = (XkbRedirectKeyAction *) action;
act = (struct xkb_redirect_key_action *) action;
switch (field)
{
case F_Keycode: