diff options
Diffstat (limited to 'xorg-server/include')
-rw-r--r-- | xorg-server/include/callback.h | 1 | ||||
-rw-r--r-- | xorg-server/include/cursor.h | 4 | ||||
-rw-r--r-- | xorg-server/include/dixgrabs.h | 2 | ||||
-rw-r--r-- | xorg-server/include/dixstruct.h | 2 | ||||
-rw-r--r-- | xorg-server/include/eventstr.h | 2 | ||||
-rw-r--r-- | xorg-server/include/hotplug.h | 1 | ||||
-rw-r--r-- | xorg-server/include/input.h | 2 | ||||
-rw-r--r-- | xorg-server/include/inputstr.h | 2 | ||||
-rw-r--r-- | xorg-server/include/registry.h | 1 | ||||
-rw-r--r-- | xorg-server/include/xkbsrv.h | 3 |
10 files changed, 17 insertions, 3 deletions
diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h index a2ea1faf7..b4249e8a5 100644 --- a/xorg-server/include/callback.h +++ b/xorg-server/include/callback.h @@ -90,5 +90,6 @@ CallCallbacks(CallbackListPtr *pcbl, pointer call_data) extern _X_EXPORT void DeleteCallbackList(CallbackListPtr * /*pcbl */ ); extern _X_EXPORT void InitCallbackManager(void); +extern _X_EXPORT void DeleteCallbackManager(void); #endif /* CALLBACK_H */ diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h index 082325123..89a650fc5 100644 --- a/xorg-server/include/cursor.h +++ b/xorg-server/include/cursor.h @@ -71,6 +71,10 @@ extern _X_EXPORT CursorPtr rootCursor; extern _X_EXPORT int FreeCursor(pointer /*pCurs */ , XID /*cid */ ); +extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */); +extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */); +extern _X_EXPORT int CursorRefCount(const CursorPtr /* cursor */); + extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ , unsigned char * /*pmaskbits */ , CARD32 * /*argb */ , diff --git a/xorg-server/include/dixgrabs.h b/xorg-server/include/dixgrabs.h index eccec77f8..ca3c95be7 100644 --- a/xorg-server/include/dixgrabs.h +++ b/xorg-server/include/dixgrabs.h @@ -31,7 +31,7 @@ struct _GrabParameters; extern void PrintDeviceGrabInfo(DeviceIntPtr dev); extern void UngrabAllDevices(Bool kill_client); -extern GrabPtr AllocGrab(void); +extern GrabPtr AllocGrab(const GrabPtr src); extern void FreeGrab(GrabPtr grab); extern Bool CopyGrab(GrabPtr dst, const GrabPtr src); diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index ffdfaa4b2..132521673 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -96,7 +96,7 @@ typedef struct _Client { unsigned int clientGone:1; unsigned int closeDownMode:2; unsigned int clientState:2; - char smart_priority; + signed char smart_priority; short noClientException; /* this client died or needs to be killed */ int priority; ReplySwapPtr pSwapReplyFunc; diff --git a/xorg-server/include/eventstr.h b/xorg-server/include/eventstr.h index 38fab4f3c..3950584d5 100644 --- a/xorg-server/include/eventstr.h +++ b/xorg-server/include/eventstr.h @@ -123,6 +123,7 @@ struct _DeviceEvent { int corestate; /**< Core key/button state BEFORE the event */ 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 */ }; /** @@ -175,6 +176,7 @@ struct _DeviceChangedEvent { struct { uint32_t min; /**< Minimum value */ uint32_t max; /**< Maximum value */ + double value; /**< Current value */; /* FIXME: frac parts of min/max */ uint32_t resolution; /**< Resolution counts/m */ uint8_t mode; /**< Relative or Absolute */ diff --git a/xorg-server/include/hotplug.h b/xorg-server/include/hotplug.h index 2a95b4524..29a22c4da 100644 --- a/xorg-server/include/hotplug.h +++ b/xorg-server/include/hotplug.h @@ -40,6 +40,7 @@ struct OdevAttribute { struct OdevAttributes { struct xorg_list list; + Bool unowned; }; struct OdevAttributes * diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 304895ffc..1745e9ade 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -590,6 +590,8 @@ extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev); extern void TouchDeliverDeviceClassesChangedEvent(TouchPointInfoPtr ti, Time time, XID resource); +extern void TouchEmitTouchEnd(DeviceIntPtr dev, TouchPointInfoPtr ti, int flags, XID resource); +extern void TouchAcceptAndEnd(DeviceIntPtr dev, int touchid); /* misc event helpers */ extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients); diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index de96faeda..85be885a0 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -485,7 +485,7 @@ typedef struct _GrabInfoRec { TimeStamp grabTime; Bool fromPassiveGrab; /* true if from passive grab */ Bool implicitGrab; /* implicit from ButtonPress */ - GrabPtr activeGrab; + GrabPtr unused; /* Kept for ABI stability, remove soon */ GrabPtr grab; CARD8 activatingKey; void (*ActivateGrab) (DeviceIntPtr /*device */ , diff --git a/xorg-server/include/registry.h b/xorg-server/include/registry.h index f471b899f..e298ab6fc 100644 --- a/xorg-server/include/registry.h +++ b/xorg-server/include/registry.h @@ -44,6 +44,7 @@ extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype); * Setup and teardown */ extern _X_EXPORT void dixResetRegistry(void); +extern _X_EXPORT void dixFreeRegistry(void); #else /* XREGISTRY */ diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index 45e2e8c47..346ebccf0 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -751,6 +751,9 @@ extern _X_EXPORT void XkbSetRulesDflts(XkbRMLVOSet * /* rmlvo */ extern _X_EXPORT void XkbDeleteRulesDflts(void ); +extern _X_EXPORT void XkbDeleteRulesUsed(void + ); + extern _X_EXPORT int SProcXkbDispatch(ClientPtr /* client */ ); |