diff --git a/composite/compint.h b/composite/compint.h index 3a91914f9..774b94a43 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -157,12 +157,13 @@ typedef struct _CompScreen { Bool pendingScreenUpdate; int numAlternateVisuals; + CloseScreenProcPtr CloseScreen; VisualID *alternateVisuals; - int numImplicitRedirectExceptions; CompImplicitRedirectException *implicitRedirectExceptions; + int numImplicitRedirectExceptions; - WindowPtr pOverlayWin; Window overlayWid; + WindowPtr pOverlayWin; CompOverlayClientPtr pOverlayClients; SourceValidateProcPtr SourceValidate; diff --git a/include/eventstr.h b/include/eventstr.h index a9926eaee..7f7425ff2 100644 --- a/include/eventstr.h +++ b/include/eventstr.h @@ -101,6 +101,7 @@ enum DeviceEventSource { */ struct _DeviceEvent { unsigned char header; /**< Always ET_Internal */ + int16_t root_x; /**< Pos relative to root window in integral data */ enum EventType type; /**< One of EventType */ int length; /**< Length in bytes */ Time time; /**< Time in ms */ @@ -112,10 +113,10 @@ struct _DeviceEvent { uint32_t key; /**< Key code */ } detail; uint32_t touchid; /**< Touch ID (client_id) */ - int16_t root_x; /**< Pos relative to root window in integral data */ - float root_x_frac; /**< Pos relative to root window in frac part */ int16_t root_y; /**< Pos relative to root window in integral part */ + float root_x_frac; /**< Pos relative to root window in frac part */ float root_y_frac; /**< Pos relative to root window in frac part */ + enum DeviceEventSource source_type; /**< How this event was provoked */ uint8_t buttons[(MAX_BUTTONS + 7) / 8]; /**< Button mask */ struct { uint8_t mask[(MAX_VALUATORS + 7) / 8];/**< Valuator mask */ @@ -139,7 +140,6 @@ struct _DeviceEvent { int key_repeat; /**< Internally-generated key repeat event */ uint32_t flags; /**< Flags to be copied into the generated event */ uint32_t resource; /**< Touch event resource, only for TOUCH_REPLAYING */ - enum DeviceEventSource source_type; /**< How this event was provoked */ }; /** @@ -239,12 +239,12 @@ struct _RawDeviceEvent { uint32_t button; /**< Button number */ uint32_t key; /**< Key code */ } detail; + uint32_t flags; /**< Flags to be copied into the generated event */ struct { uint8_t mask[(MAX_VALUATORS + 7) / 8];/**< Valuator mask */ double data[MAX_VALUATORS]; /**< Valuator data */ double data_raw[MAX_VALUATORS]; /**< Valuator data as posted */ } valuators; - uint32_t flags; /**< Flags to be copied into the generated event */ }; struct _BarrierEvent { diff --git a/include/extnsionst.h b/include/extnsionst.h index 80c542339..bf5b5666d 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -55,10 +55,10 @@ SOFTWARE. #include "privates.h" typedef struct _ExtensionEntry { - int index; void (*CloseDown) ( /* called at server shutdown */ struct _ExtensionEntry * /* extension */ ); const char *name; /* extension name */ + int index; int base; /* base request number */ int eventBase; int eventLast; diff --git a/include/inputstr.h b/include/inputstr.h index e62e4731e..30f38b598 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -179,9 +179,9 @@ union _GrabMask { */ typedef struct _GrabRec { GrabPtr next; /* for chain of passive grabs */ - XID resource; DeviceIntPtr device; WindowPtr window; + XID resource; unsigned ownerEvents:1; unsigned keyboardMode:1; unsigned pointerMode:1; @@ -248,8 +248,8 @@ typedef struct _KeyClassRec { } KeyClassRec, *KeyClassPtr; typedef struct _ScrollInfo { - enum ScrollType type; double increment; + enum ScrollType type; int flags; } ScrollInfo, *ScrollInfoPtr; @@ -319,8 +319,8 @@ typedef struct _TouchPointInfo { } TouchPointInfoRec; typedef struct _TouchClassRec { - int sourceid; TouchPointInfoPtr touches; + int sourceid; unsigned short num_touches; /* number of allocated touches */ unsigned short max_touches; /* maximum number of touches, may be 0 */ CARD8 mode; /* ::XIDirectTouch, XIDependentTouch */ @@ -342,18 +342,18 @@ typedef struct _GestureListener { typedef struct _GestureInfo { int sourceid; /* Source device's ID for this gesture */ Bool active; /* whether or not the gesture is active */ + uint8_t num_touches; /* The number of touches in the gesture */ uint8_t type; /* Gesture type: either ET_GesturePinchBegin or - ET_GestureSwipeBegin. Valid if active == TRUE */ - int num_touches; /* The number of touches in the gesture */ + ET_GestureSwipeBegin. Valid if active == TRUE */ + Bool has_listener; /* true if listener has been setup already */ SpriteRec sprite; /* window trace for delivery */ GestureListener listener; /* the listener that will receive events */ - Bool has_listener; /* true if listener has been setup already */ } GestureInfoRec; typedef struct _GestureClassRec { int sourceid; - GestureInfoRec gesture; unsigned short max_touches; /* maximum number of touches, may be 0 */ + GestureInfoRec gesture; } GestureClassRec; typedef struct _ButtonClassRec { @@ -374,8 +374,8 @@ typedef struct _ButtonClassRec { } ButtonClassRec, *ButtonClassPtr; typedef struct _FocusClassRec { - int sourceid; WindowPtr win; /* May be set to a int constant (e.g. PointerRootWin)! */ + int sourceid; int revert; TimeStamp time; WindowPtr *trace; @@ -527,11 +527,11 @@ typedef struct _SpriteInfoRec { typedef struct _DeviceIntRec { DeviceRec public; 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 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 enabled; /* TRUE if ON returns Success */ Bool coreEvents; /* TRUE if device also sends core */ @@ -539,7 +539,6 @@ typedef struct _DeviceIntRec { int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */ Atom xinput_type; char *name; - int id; KeyClassPtr key; ValuatorClassPtr valuator; TouchClassPtr touch; @@ -553,10 +552,11 @@ typedef struct _DeviceIntRec { StringFeedbackPtr stringfeed; BellFeedbackPtr bell; LedFeedbackPtr leds; + int id; + int saved_master_id; /* for slaves while grabbed */ struct _XkbInterest *xkb_interest; char *config_info; /* used by the hotplug layer */ ClassesPtr unused_classes; /* for master devices */ - int saved_master_id; /* for slaves while grabbed */ PrivateRec *devPrivates; DeviceUnwrapProc unwrapProc; SpriteInfoPtr spriteInfo; @@ -573,9 +573,9 @@ typedef struct _DeviceIntRec { struct { double valuators[MAX_VALUATORS]; int numValuators; + int num_touches; /* size of the touches array */ DeviceIntPtr slave; ValuatorMask *scroll; - int num_touches; /* size of the touches array */ DDXTouchPointInfoPtr touches; } last; @@ -592,12 +592,12 @@ typedef struct _DeviceIntRec { [1/scale] . [transform] . [scale]. See DeviceSetTransform */ struct pixman_f_transform scale_and_transform; - /* XTest related master device id */ - int xtest_master_id; - DeviceSendEventsProc sendEventsProc; - 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 */ } DeviceIntRec; diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 71ef762ea..acd69ed98 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -71,8 +71,8 @@ typedef struct _Visual { short nplanes; /* = log2 (ColormapEntries). This does not * imply that the screen has this many planes. * it may have more or fewer */ - unsigned long redMask, greenMask, blueMask; int offsetRed, offsetGreen, offsetBlue; + unsigned long redMask, greenMask, blueMask; } VisualRec; typedef struct _Depth { @@ -514,12 +514,13 @@ typedef struct _Screen { short x, y, width, height; short mmWidth, mmHeight; short numDepths; - unsigned char rootDepth; + short numVisuals; DepthPtr allowedDepths; unsigned long rootVisual; unsigned long defColormap; - short minInstalledCmaps, maxInstalledCmaps; + unsigned char rootDepth; char backingStoreSupport, saveUnderSupport; + short minInstalledCmaps, maxInstalledCmaps; unsigned long whitePixel, blackPixel; GCPtr GCperDepth[MAXFORMATS + 1]; /* next field is a stipple to use as default in a GC. we don't build @@ -529,7 +530,6 @@ typedef struct _Screen { */ PixmapPtr defaultStipple; void *devPrivate; - short numVisuals; VisualPtr visuals; WindowPtr root; ScreenSaverStuffRec screensaver; @@ -621,6 +621,7 @@ typedef struct _Screen { NameWindowPixmapProcPtr NameWindowPixmap; unsigned int totalPixmapSize; + int output_secondarys; MarkWindowProcPtr MarkWindow; MarkOverlappedWindowsProcPtr MarkOverlappedWindows; @@ -651,7 +652,6 @@ typedef struct _Screen { /* Info on this screen's secondarys (if any) */ struct xorg_list secondary_list; struct xorg_list secondary_head; - int output_secondarys; /* Info for when this screen is a secondary */ ScreenPtr current_primary; Bool is_output_secondary; @@ -713,12 +713,12 @@ typedef struct _ScreenInfo { int bitmapScanlineUnit; int bitmapScanlinePad; int bitmapBitOrder; - int numPixmapFormats; - PixmapFormatRec formats[MAXFORMATS]; - int numScreens; ScreenPtr screens[MAXSCREENS]; - int numGPUScreens; ScreenPtr gpuscreens[MAXGPUSCREENS]; + PixmapFormatRec formats[MAXFORMATS]; + uint16_t numScreens; + uint16_t numGPUScreens; + uint8_t numPixmapFormats; int x; /* origin */ int y; /* origin */ int width; /* total width of all screens together */ diff --git a/render/picturestr.h b/render/picturestr.h index 3117b6185..ae58673d7 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -39,8 +39,8 @@ typedef struct _DirectFormat { typedef struct _IndexFormat { VisualID vid; - ColormapPtr pColormap; int nvalues; + ColormapPtr pColormap; xIndexValue *pValues; void *devPrivate; } IndexFormatRec;