summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/X11/extensions/XInput2.h28
-rw-r--r--src/XChDevHier.c18
-rw-r--r--src/XDefDevCur.c10
-rw-r--r--src/XExtInt.c14
-rw-r--r--src/XIFreeEvent.c8
-rw-r--r--src/XIGetDevFocus.c10
-rw-r--r--src/XIGrabDevice.c2
-rw-r--r--src/XIPassiveGrab.c6
-rw-r--r--src/XISelEv.c8
-rw-r--r--src/XISetDevFocus.c8
-rw-r--r--src/XQueryDvPtr.c30
-rw-r--r--src/XUndefDevCur.c4
-rw-r--r--src/XWarpDvPtr.c28
13 files changed, 87 insertions, 87 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index 54755cd..bd53417 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -73,7 +73,7 @@ typedef struct
int deviceid;
int mask_len;
unsigned char* mask;
-} XIDeviceEventMask;
+} XIEventMask;
typedef struct
{
@@ -155,7 +155,7 @@ typedef struct {
int flags;
int num_devices;
XIHierarchyInfo *info;
-} XIDeviceHierarchyEvent;
+} XIHierarchyEvent;
/*
* Notifies the client that the classes have been changed. This happens when
@@ -234,7 +234,7 @@ typedef struct {
int eventtype;
XIValuatorState *valuators;
double *raw_values;
-} XIRawDeviceEvent;
+} XIRawEvent;
typedef struct {
int type; /* GenericEvent */
@@ -279,7 +279,7 @@ typedef struct {
_XFUNCPROTOBEGIN
-extern Bool XIQueryDevicePointer(
+extern Bool XIQueryPointer(
Display* display,
int deviceid,
Window win,
@@ -292,7 +292,7 @@ extern Bool XIQueryDevicePointer(
unsigned int* mask
);
-extern Bool XIWarpDevicePointer(
+extern Bool XIWarpPointer(
Display* display,
int deviceid,
Window src_win,
@@ -305,20 +305,20 @@ extern Bool XIWarpDevicePointer(
int dst_y
);
-extern Status XIDefineDeviceCursor(
+extern Status XIDefineCursor(
Display* display,
int deviceid,
Window win,
Cursor cursor
);
-extern Status XIUndefineDeviceCursor(
+extern Status XIUndefineCursor(
Display* display,
int deviceid,
Window win
);
-extern Status XIChangeDeviceHierarchy(
+extern Status XIChangeHierarchy(
Display* display,
XIAnyHierarchyChangeInfo* changes,
int num_changes
@@ -339,7 +339,7 @@ extern Bool XIGetClientPointer(
extern int XISelectEvents(
Display* dpy,
Window win,
- XIDeviceEventMask* masks,
+ XIEventMask *masks,
int nmasks
);
@@ -355,14 +355,14 @@ extern XIDeviceInfo* XIQueryDevice(
int* ndevices_return
);
-extern Status XISetDeviceFocus(
+extern Status XISetFocus(
Display* dpy,
int deviceid,
Window focus,
Time time
);
-extern Status XIGetDeviceFocus(
+extern Status XIGetFocus(
Display* dpy,
int deviceid,
Window *focus_return);
@@ -376,7 +376,7 @@ extern Status XIGrabDevice(
int grab_mode,
int paired_device_mode,
Bool owner_events,
- XIDeviceEventMask *mask
+ XIEventMask *mask
);
extern Status XIUngrabDevice(
@@ -401,7 +401,7 @@ extern int XIGrabButton(
int grab_mode,
int paired_device_mode,
int owner_events,
- XIDeviceEventMask *mask,
+ XIEventMask *mask,
int num_modifiers,
int *modifiers_inout
);
@@ -414,7 +414,7 @@ extern int XIGrabKeysym(
int grab_mode,
int paired_device_mode,
int owner_events,
- XIDeviceEventMask *mask,
+ XIEventMask *mask,
int num_modifiers,
int *modifiers_inout
);
diff --git a/src/XChDevHier.c b/src/XChDevHier.c
index d6688cd..30eb615 100644
--- a/src/XChDevHier.c
+++ b/src/XChDevHier.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
/***********************************************************************
*
- * XIChangeDeviceHierarchy - change the device hierarchy, i.e. which slave
+ * XIChangeHierarchy - change the device hierarchy, i.e. which slave
* device is attached to which master, etc.
*/
@@ -39,12 +39,12 @@ in this Software without prior written authorization from The Open Group.
#include "XIint.h"
int
-XIChangeDeviceHierarchy(Display* dpy,
+XIChangeHierarchy(Display* dpy,
XIAnyHierarchyChangeInfo* changes,
int num_changes)
{
XIAnyHierarchyChangeInfo* any;
- xXIChangeDeviceHierarchyReq *req;
+ xXIChangeHierarchyReq *req;
XExtDisplayInfo *info = XInput_find_display(dpy);
char *data = NULL, *dptr;
int dlen = 0, i;
@@ -53,9 +53,9 @@ XIChangeDeviceHierarchy(Display* dpy,
if (_XiCheckExtInit(dpy, XInput_2, info) == -1)
return (NoSuchExtension);
- GetReq(XIChangeDeviceHierarchy, req);
+ GetReq(XIChangeHierarchy, req);
req->reqType = info->codes->major_opcode;
- req->ReqType = X_XIChangeDeviceHierarchy;
+ req->ReqType = X_XIChangeHierarchy;
req->num_changes = num_changes;
/* alloc required memory */
@@ -63,14 +63,14 @@ XIChangeDeviceHierarchy(Display* dpy,
{
switch(any->type)
{
- case XICreateMasterDevice:
+ case XICreateMaster:
{
int slen = (strlen(any->create.name));
dlen += sizeof(xXICreateMasterInfo) +
slen + (4 - (slen % 4));
}
break;
- case XIRemoveMasterDevice:
+ case XIRemoveMaster:
dlen += sizeof(xXIRemoveMasterInfo);
break;
case XIAttachSlave:
@@ -94,7 +94,7 @@ XIChangeDeviceHierarchy(Display* dpy,
{
switch(any->type)
{
- case XICreateMasterDevice:
+ case XICreateMaster:
{
XICreateMasterInfo* C = &any->create;
xXICreateMasterInfo* c = (xXICreateMasterInfo*)dptr;
@@ -107,7 +107,7 @@ XIChangeDeviceHierarchy(Display* dpy,
dptr += c->length;
}
break;
- case XIRemoveMasterDevice:
+ case XIRemoveMaster:
{
XIRemoveMasterInfo* R = &any->remove;
xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)dptr;
diff --git a/src/XDefDevCur.c b/src/XDefDevCur.c
index 4826021..b8de706 100644
--- a/src/XDefDevCur.c
+++ b/src/XDefDevCur.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
/***********************************************************************
*
- * XIDefineDeviceCursor - Change the cursor of an extension input device.
+ * XIDefineCursor - Change the cursor of an extension input device.
*
*/
#include <stdint.h>
@@ -38,9 +38,9 @@ in this Software without prior written authorization from The Open Group.
#include "XIint.h"
-int XIDefineDeviceCursor(Display *dpy, int deviceid, Window w, Cursor cursor)
+int XIDefineCursor(Display *dpy, int deviceid, Window w, Cursor cursor)
{
- xXIChangeDeviceCursorReq *req;
+ xXIChangeCursorReq *req;
XExtDisplayInfo *info = XInput_find_display(dpy);
LockDisplay(dpy);
@@ -48,9 +48,9 @@ int XIDefineDeviceCursor(Display *dpy, int deviceid, Window w, Cursor cursor)
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
return (NoSuchExtension);
- GetReq(XIChangeDeviceCursor, req);
+ GetReq(XIChangeCursor, req);
req->reqType = info->codes->major_opcode;
- req->ReqType = X_XIChangeDeviceCursor;
+ req->ReqType = X_XIChangeCursor;
req->deviceid = deviceid;
req->win = w;
req->cursor = cursor;
diff --git a/src/XExtInt.c b/src/XExtInt.c
index beb8127..a0cc3b0 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -130,9 +130,9 @@ wireToDeviceEvent(xXIDeviceEvent *in, XIDeviceEvent* out);
static int
wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XIDeviceChangedEvent* out);
static int
-wireToHierarchyChangedEvent(xXIDeviceHierarchyEvent *in, XIDeviceHierarchyEvent* out);
+wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XIHierarchyEvent* out);
static int
-wireToRawEvent(xXIRawDeviceEvent *in, XIRawDeviceEvent *out);
+wireToRawEvent(xXIRawEvent *in, XIRawEvent *out);
static int
wireToEnterLeave(xXIEnterEvent *in, XIEnterEvent *out);
static int
@@ -818,8 +818,8 @@ XInputWireToEvent(
return ENQUEUE_EVENT;
case XI_HierarchyChanged:
*re = *save;
- if (!wireToHierarchyChangedEvent((xXIDeviceHierarchyEvent*)event,
- (XIDeviceHierarchyEvent*)re))
+ if (!wireToHierarchyChangedEvent((xXIHierarchyEvent*)event,
+ (XIHierarchyEvent*)re))
{
printf("XInputWireToEvent: CONVERSION FAILURE! evtype=%d\n",
ge->evtype);
@@ -829,7 +829,7 @@ XInputWireToEvent(
case XI_RawEvent:
*re = *save;
- if (!wireToRawEvent((xXIRawDeviceEvent*)event, (XIRawDeviceEvent*)re))
+ if (!wireToRawEvent((xXIRawEvent*)event, (XIRawEvent*)re))
{
printf("XInputWireToEvent: CONVERSION FAILURE! evtype=%d\n",
ge->evtype);
@@ -971,7 +971,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XIDeviceChangedEvent* out)
}
static int
-wireToHierarchyChangedEvent(xXIDeviceHierarchyEvent *in, XIDeviceHierarchyEvent* out)
+wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XIHierarchyEvent* out)
{
int i;
XIHierarchyInfo *info_out;
@@ -1001,7 +1001,7 @@ wireToHierarchyChangedEvent(xXIDeviceHierarchyEvent *in, XIDeviceHierarchyEvent*
}
static int
-wireToRawEvent(xXIRawDeviceEvent *in, XIRawDeviceEvent *out)
+wireToRawEvent(xXIRawEvent *in, XIRawEvent *out)
{
int len, i;
FP3232 *values;
diff --git a/src/XIFreeEvent.c b/src/XIFreeEvent.c
index e7ff229..6b39755 100644
--- a/src/XIFreeEvent.c
+++ b/src/XIFreeEvent.c
@@ -53,12 +53,12 @@ XIFreeEventData(XIEvent *event)
free(((XIDeviceChangedEvent*)event)->classes);
break;
case XI_HierarchyChanged:
- free(((XIDeviceHierarchyEvent*)event)->info);
+ free(((XIHierarchyEvent*)event)->info);
break;
case XI_RawEvent:
- free(((XIRawDeviceEvent*)event)->valuators->values);
- free(((XIRawDeviceEvent*)event)->valuators);
- free(((XIRawDeviceEvent*)event)->raw_values);
+ free(((XIRawEvent*)event)->valuators->values);
+ free(((XIRawEvent*)event)->valuators);
+ free(((XIRawEvent*)event)->raw_values);
break;
case XI_Enter:
case XI_Leave:
diff --git a/src/XIGetDevFocus.c b/src/XIGetDevFocus.c
index 1381066..1d2a9bf 100644
--- a/src/XIGetDevFocus.c
+++ b/src/XIGetDevFocus.c
@@ -30,10 +30,10 @@
#include "XIint.h"
Status
-XIGetDeviceFocus(Display *dpy, int deviceid, Window *focus_return)
+XIGetFocus(Display *dpy, int deviceid, Window *focus_return)
{
- xXIGetDeviceFocusReq *req;
- xXIGetDeviceFocusReply reply;
+ xXIGetFocusReq *req;
+ xXIGetFocusReply reply;
XExtDisplayInfo *extinfo = XInput_find_display(dpy);
@@ -41,9 +41,9 @@ XIGetDeviceFocus(Display *dpy, int deviceid, Window *focus_return)
if (_XiCheckExtInit(dpy, Dont_Check, extinfo) == -1)
return (NoSuchExtension);
- GetReq(XIGetDeviceFocus, req);
+ GetReq(XIGetFocus, req);
req->reqType = extinfo->codes->major_opcode;
- req->ReqType = X_XIGetDeviceFocus;
+ req->ReqType = X_XIGetFocus;
req->deviceid = deviceid;
if (!_XReply(dpy, (xReply*) &reply, 0, xFalse)) {
diff --git a/src/XIGrabDevice.c b/src/XIGrabDevice.c
index bb668ee..c466c20 100644
--- a/src/XIGrabDevice.c
+++ b/src/XIGrabDevice.c
@@ -33,7 +33,7 @@
Status
XIGrabDevice(Display* dpy, int deviceid, Window grab_window, Time time,
Cursor cursor, int grab_mode, int paired_device_mode,
- Bool owner_events, XIDeviceEventMask *mask)
+ Bool owner_events, XIEventMask *mask)
{
xXIGrabDeviceReq *req;
xXIGrabDeviceReply reply;
diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c
index 949287d..ea33a15 100644
--- a/src/XIPassiveGrab.c
+++ b/src/XIPassiveGrab.c
@@ -33,7 +33,7 @@ static int
_XIPassiveGrabDevice(Display* dpy, int deviceid, int grabtype, int detail,
Window grab_window, Cursor cursor,
int grab_mode, int paired_device_mode,
- Bool owner_events, XIDeviceEventMask *mask,
+ Bool owner_events, XIEventMask *mask,
int num_modifiers, int *modifiers_inout)
{
xXIPassiveGrabDeviceReq *req;
@@ -89,7 +89,7 @@ int
XIGrabButton(Display* dpy, int deviceid, int button,
Window grab_window, Cursor cursor,
int grab_mode, int paired_device_mode,
- Bool owner_events, XIDeviceEventMask *mask,
+ Bool owner_events, XIEventMask *mask,
int num_modifiers, int *modifiers_inout)
{
return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeButton, button,
@@ -101,7 +101,7 @@ XIGrabButton(Display* dpy, int deviceid, int button,
int
XIGrabKeysym(Display* dpy, int deviceid, int keysym,
Window grab_window, int grab_mode, int paired_device_mode,
- Bool owner_events, XIDeviceEventMask *mask,
+ Bool owner_events, XIEventMask *mask,
int num_modifiers, int *modifiers_inout)
{
return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeKeysym, keysym,
diff --git a/src/XISelEv.c b/src/XISelEv.c
index aef32d1..fc9f2a2 100644
--- a/src/XISelEv.c
+++ b/src/XISelEv.c
@@ -42,11 +42,11 @@ in this Software without prior written authorization from the author.
#include "XIint.h"
int
-XISelectEvents(Display* dpy, Window win, XIDeviceEventMask* masks, int num_masks)
+XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks)
{
- XIDeviceEventMask *current;
+ XIEventMask *current;
xXISelectEventsReq *req;
- xXIDeviceEventMask mask;
+ xXIEventMask mask;
int i;
int len = 0;
@@ -81,7 +81,7 @@ XISelectEvents(Display* dpy, Window win, XIDeviceEventMask* masks, int num_masks
* and they need to be padded with 0 */
buff = calloc(1, mask.mask_len * 4);
memcpy(buff, current->mask, current->mask_len);
- Data32(dpy, &mask, sizeof(xXIDeviceEventMask));
+ Data32(dpy, &mask, sizeof(xXIEventMask));
Data(dpy, buff, mask.mask_len * 4);
free(buff);
}
diff --git a/src/XISetDevFocus.c b/src/XISetDevFocus.c
index c394c02..e1567bd 100644
--- a/src/XISetDevFocus.c
+++ b/src/XISetDevFocus.c
@@ -30,9 +30,9 @@
#include "XIint.h"
Status
-XISetDeviceFocus(Display *dpy, int deviceid, Window focus, Time time)
+XISetFocus(Display *dpy, int deviceid, Window focus, Time time)
{
- xXISetDeviceFocusReq *req;
+ xXISetFocusReq *req;
XExtDisplayInfo *extinfo = XInput_find_display(dpy);
@@ -40,9 +40,9 @@ XISetDeviceFocus(Display *dpy, int deviceid, Window focus, Time time)
if (_XiCheckExtInit(dpy, Dont_Check, extinfo) == -1)
return (NoSuchExtension);
- GetReq(XISetDeviceFocus, req);
+ GetReq(XISetFocus, req);
req->reqType = extinfo->codes->major_opcode;
- req->ReqType = X_XISetDeviceFocus;
+ req->ReqType = X_XISetFocus;
req->deviceid = deviceid;
req->focus = focus;
req->time = time;
diff --git a/src/XQueryDvPtr.c b/src/XQueryDvPtr.c
index 42715ad..9d51db0 100644
--- a/src/XQueryDvPtr.c
+++ b/src/XQueryDvPtr.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
/***********************************************************************
*
- * XIQueryDevicePointer - Query the pointer of an extension input device.
+ * XIQueryPointer - Query the pointer of an extension input device.
*
*/
@@ -41,19 +41,19 @@ in this Software without prior written authorization from The Open Group.
#define FP1616toDBL(x) ((x) * 1.0 / (1 << 16))
Bool
-XIQueryDevicePointer(Display *dpy,
- int deviceid,
- Window w,
- Window *root,
- Window *child,
- int *root_x,
- int *root_y,
- int *win_x,
- int *win_y,
- unsigned int *mask)
+XIQueryPointer(Display *dpy,
+ int deviceid,
+ Window w,
+ Window *root,
+ Window *child,
+ int *root_x,
+ int *root_y,
+ int *win_x,
+ int *win_y,
+ unsigned int *mask)
{
- xXIQueryDevicePointerReq *req;
- xXIQueryDevicePointerReply rep;
+ xXIQueryPointerReq *req;
+ xXIQueryPointerReply rep;
XExtDisplayInfo *info = XInput_find_display(dpy);
@@ -61,9 +61,9 @@ XIQueryDevicePointer(Display *dpy,
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
return False;
- GetReq(XIQueryDevicePointer, req);
+ GetReq(XIQueryPointer, req);
req->reqType = info->codes->major_opcode;
- req->ReqType = X_XIQueryDevicePointer;
+ req->ReqType = X_XIQueryPointer;
req->deviceid = deviceid;
req->win = w;
diff --git a/src/XUndefDevCur.c b/src/XUndefDevCur.c
index ef358e2..1144625 100644
--- a/src/XUndefDevCur.c
+++ b/src/XUndefDevCur.c
@@ -37,8 +37,8 @@ in this Software without prior written authorization from The Open Group.
#include "XIint.h"
-int XIUndefineDeviceCursor(Display *dpy, int deviceid, Window w)
+int XIUndefineCursor(Display *dpy, int deviceid, Window w)
{
- return XIDefineDeviceCursor(dpy, deviceid, w, None);
+ return XIDefineCursor(dpy, deviceid, w, None);
}
diff --git a/src/XWarpDvPtr.c b/src/XWarpDvPtr.c
index 85ce5ab..c13fc20 100644
--- a/src/XWarpDvPtr.c
+++ b/src/XWarpDvPtr.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
/***********************************************************************
*
- * XIWarpDevicePointer - Warp the pointer of an extension input device.
+ * XIWarpPointer - Warp the pointer of an extension input device.
*
*/
@@ -39,18 +39,18 @@ in this Software without prior written authorization from The Open Group.
#include "XIint.h"
int
-XIWarpDevicePointer(Display *dpy,
- int deviceid,
- Window src_win,
- Window dst_win,
- int src_x,
- int src_y,
- unsigned int src_width,
- unsigned int src_height,
- int dst_x,
- int dst_y)
+XIWarpPointer(Display *dpy,
+ int deviceid,
+ Window src_win,
+ Window dst_win,
+ int src_x,
+ int src_y,
+ unsigned int src_width,
+ unsigned int src_height,
+ int dst_x,
+ int dst_y)
{
- xXIWarpDevicePointerReq *req;
+ xXIWarpPointerReq *req;
XExtDisplayInfo *info = XInput_find_display(dpy);
@@ -58,9 +58,9 @@ XIWarpDevicePointer(Display *dpy,
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
return (NoSuchExtension);
- GetReq(XIWarpDevicePointer, req);
+ GetReq(XIWarpPointer, req);
req->reqType = info->codes->major_opcode;
- req->ReqType = X_XIWarpDevicePointer;
+ req->ReqType = X_XIWarpPointer;
req->deviceid = deviceid;
req->src_win = src_win;
req->dst_win = dst_win;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:51:55 +0000