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

Xnest: replace XGetPointerMapping() by xcb_get_pointer_mapping() 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-13 18:51:11 +02:00
parent 949bdc209c
commit 3157b2e1dc
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/xnest/Pointer.c
View File

@ -50,18 +50,13 @@ xnestChangePointerControl(DeviceIntPtr pDev, PtrCtrl * ctrl)
int
xnestPointerProc(DeviceIntPtr pDev, int onoff)
{
CARD8 map[MAXBUTTONS];
Atom btn_labels[MAXBUTTONS] = { 0 };
Atom axes_labels[2] = { 0 };
int nmap;
int i;
switch (onoff) {
case DEVICE_INIT:
nmap = XGetPointerMapping(xnestDisplay, map, MAXBUTTONS);
for (i = 0; i <= nmap; i++)
map[i] = i; /* buttons are already mapped */
{
btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
@ -78,10 +73,37 @@ xnestPointerProc(DeviceIntPtr pDev, int onoff)
&defaultPointerControl.den,
&defaultPointerControl.threshold);
InitPointerDeviceStruct(&pDev->public, map, nmap, btn_labels,
xcb_generic_error_t *pm_err = NULL;
xcb_get_pointer_mapping_reply_t *pm_reply =
xcb_get_pointer_mapping_reply(
xnestUpstreamInfo.conn,
xcb_get_pointer_mapping(xnestUpstreamInfo.conn),
&pm_err);
if (pm_err) {
ErrorF("failed getting pointer mapping %d\n", pm_err->error_code);
free(pm_err);
break;
}
if (!pm_reply) {
ErrorF("failed getting pointer mapping: no reply\n");
break;
}
const int nmap = xcb_get_pointer_mapping_map_length(pm_reply);
uint8_t *map = xcb_get_pointer_mapping_map(pm_reply);
for (i=0; i<nmap; i++)
map[i] = i; /* buttons are already mapped */
InitPointerDeviceStruct(&pDev->public,
map,
nmap,
btn_labels,
xnestChangePointerControl,
GetMotionHistorySize(), 2, axes_labels);
free(pm_reply);
break;
}
case DEVICE_ON:
xnestEventMask |= XNEST_POINTER_EVENT_MASK;
for (i = 0; i < xnestNumScreens; i++)