frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inputstr: _DeviceIntRec decreased size from 880 to 848 bytes

This commit is contained in:
Herman Semenov 2025-06-23 00:39:04 +03:00
parent 1c9fef965e
commit acc7ee6bab
No known key found for this signature in database
GPG Key ID: D3AB1D2A4576D55E
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/inputstr.h
View File

@ -527,11 +527,11 @@ typedef struct _SpriteInfoRec {
typedef struct _DeviceIntRec { typedef struct _DeviceIntRec {
DeviceRec public; DeviceRec public;
DeviceIntPtr next; DeviceIntPtr next;
DeviceProc deviceProc; /* proc(DevicePtr, DEVICE_xx). It is
used to initialize, turn on, or
turn off the device */
Bool startup; /* true if needs to be turned on at Bool startup; /* true if needs to be turned on at
server initialization time */ server initialization time */
DeviceProc deviceProc; /* proc(DevicePtr, DEVICE_xx). It is
used to initialize, turn on, or
turn off the device */
Bool inited; /* TRUE if INIT returns Success */ Bool inited; /* TRUE if INIT returns Success */
Bool enabled; /* TRUE if ON returns Success */ Bool enabled; /* TRUE if ON returns Success */
Bool coreEvents; /* TRUE if device also sends core */ Bool coreEvents; /* TRUE if device also sends core */
@ -539,7 +539,6 @@ typedef struct _DeviceIntRec {
int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */ int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */
Atom xinput_type; Atom xinput_type;
char *name; char *name;
int id;
KeyClassPtr key; KeyClassPtr key;
ValuatorClassPtr valuator; ValuatorClassPtr valuator;
TouchClassPtr touch; TouchClassPtr touch;
@ -553,10 +552,11 @@ typedef struct _DeviceIntRec {
StringFeedbackPtr stringfeed; StringFeedbackPtr stringfeed;
BellFeedbackPtr bell; BellFeedbackPtr bell;
LedFeedbackPtr leds; LedFeedbackPtr leds;
int id;
int saved_master_id; /* for slaves while grabbed */
struct _XkbInterest *xkb_interest; struct _XkbInterest *xkb_interest;
char *config_info; /* used by the hotplug layer */ char *config_info; /* used by the hotplug layer */
ClassesPtr unused_classes; /* for master devices */ ClassesPtr unused_classes; /* for master devices */
int saved_master_id; /* for slaves while grabbed */
PrivateRec *devPrivates; PrivateRec *devPrivates;
DeviceUnwrapProc unwrapProc; DeviceUnwrapProc unwrapProc;
SpriteInfoPtr spriteInfo; SpriteInfoPtr spriteInfo;
@ -573,9 +573,9 @@ typedef struct _DeviceIntRec {
struct { struct {
double valuators[MAX_VALUATORS]; double valuators[MAX_VALUATORS];
int numValuators; int numValuators;
int num_touches; /* size of the touches array */
DeviceIntPtr slave; DeviceIntPtr slave;
ValuatorMask *scroll; ValuatorMask *scroll;
int num_touches; /* size of the touches array */
DDXTouchPointInfoPtr touches; DDXTouchPointInfoPtr touches;
} last; } last;
@ -592,12 +592,12 @@ typedef struct _DeviceIntRec {
[1/scale] . [transform] . [scale]. See DeviceSetTransform */ [1/scale] . [transform] . [scale]. See DeviceSetTransform */
struct pixman_f_transform scale_and_transform; struct pixman_f_transform scale_and_transform;
/* XTest related master device id */
int xtest_master_id;
DeviceSendEventsProc sendEventsProc;
struct _SyncCounter *idle_counter; struct _SyncCounter *idle_counter;
/* XTest related master device id */
DeviceSendEventsProc sendEventsProc;
int xtest_master_id;
Bool ignoreXkbActionsBehaviors; /* TRUE if keys don't trigger behaviors and actions */ Bool ignoreXkbActionsBehaviors; /* TRUE if keys don't trigger behaviors and actions */
} DeviceIntRec; } DeviceIntRec;