char * options;
};
-#define XkbcAnyActionDataSize 18
struct xkb_any_action {
unsigned char type;
- unsigned char pad[XkbcAnyActionDataSize];
+ unsigned char pad[18];
};
struct xkb_mod_action {
short x1,y1;
short x2,y2;
};
-#define XkbBoundsWidth(b) (((b)->x2)-((b)->x1))
-#define XkbBoundsHeight(b) (((b)->y2)-((b)->y1))
struct xkb_outline {
unsigned short num_points;
struct xkb_outline * primary;
struct xkb_bounds bounds;
};
-#define XkbOutlineIndex(s,o) ((int)((o)-&(s)->outlines[0]))
struct xkb_shape_doodad {
uint32_t name;
ACTION("Extra %d bytes ignored\n", len - 6);
return False;
}
- strncpy((char *) action->pad, rtrn.str, XkbcAnyActionDataSize);
+ strncpy((char *) action->pad, rtrn.str, sizeof action->pad);
}
free(rtrn.str);
return True;
return False;
}
ndx = rtrn.uval;
- if (ndx >= XkbcAnyActionDataSize)
+ if (ndx >= sizeof action->pad)
{
ERROR("The data for a private action is 18 bytes long\n");
ACTION("Attempt to use data[%d] ignored\n", ndx);
info->dflt.interp.flags = 0;
info->dflt.interp.virtual_mod = XkbNoModifier;
info->dflt.interp.act.type = XkbSA_NoAction;
- for (i = 0; i < XkbcAnyActionDataSize; i++)
+ for (i = 0; i < sizeof info->dflt.interp.act.pad; i++)
{
info->dflt.interp.act.pad[i] = 0;
}
info->dflt.interp.flags = 0;
info->dflt.interp.virtual_mod = XkbNoModifier;
info->dflt.interp.act.type = XkbSA_NoAction;
- for (i = 0; i < XkbcAnyActionDataSize; i++)
+ for (i = 0; i < sizeof info->dflt.interp.act.pad; i++)
{
info->dflt.interp.act.pad[i] = 0;
}