Attachment 1669 Details for Bug 1583 – Use current X11 mouse button mappings to decide which mouse button to emulate

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Use current X11 mouse button mappings to decide which mouse button to emulate

krfb_mouse_fix.diff (text/plain), 1.73 KB, created by Timothy Pearson on 2013-11-24 16:56:31 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Pearson

Created: 2013-11-24 16:56:31 CST

Size: 1.73 KB

patch

obsolete

>diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
>index 0db5751..e7609f8 100644
>--- a/krfb/krfb/rfbcontroller.cc
>+++ b/krfb/krfb/rfbcontroller.cc
>@@ -286,6 +286,12 @@ PointerEvent::PointerEvent(int b, int _x, int _y) :
> 		initialized = true;
> 		dpy = tqt_xdisplay();
> 		buttonMask = 0;
>+
>+		// Set up default map in case XGetPointerMapping fails
>+		for (int i=0; i<MAX_BUTTONS; i++) {
>+			map[i] = i+1;
>+		}
>+		XGetPointerMapping(dpy, map, MAX_BUTTONS);
> 	}
> }
> 
>@@ -293,15 +299,25 @@ void PointerEvent::exec() {
> 	TQDesktopWidget *desktopWidget = TQApplication::desktop();
> 
> 	int screen = desktopWidget->screenNumber();
>-	if (screen < 0)
>+	if (screen < 0) {
> 		screen = 0;
>+	}
> 	XTestFakeMotionEvent(dpy, screen, x, y, CurrentTime);
>-	for(int i = 0; i < 5; i++)
>-		if ((buttonMask&(1<<i))!=(button_mask&(1<<i)))
>+	for(int i = 0; i < MAX_BUTTONS; i++) {
>+		if ((buttonMask&(1<<i))!=(button_mask&(1<<i))) {
>+			int localButton = i+1;
>+			for (int j=0; j<MAX_BUTTONS; j++) {
>+				if (map[j] == localButton) {
>+					localButton = j+1;
>+					break;
>+				}
>+			}
> 			XTestFakeButtonEvent(dpy,
>-					     i+1,
>+					     localButton,
> 					     (button_mask&(1<<i))?True:False,
> 					     CurrentTime);
>+		}
>+	}
> 
> 	buttonMask = button_mask;
> }
>diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
>index 223bbf5..266f9f6 100644
>--- a/krfb/krfb/rfbcontroller.h
>+++ b/krfb/krfb/rfbcontroller.h
>@@ -36,7 +36,7 @@
> 
> #include <X11/Xlib.h>
> 
>-
>+#define MAX_BUTTONS 5
> 
> class TQCloseEvent;
> class TQClipboard;
>@@ -82,6 +82,8 @@ class PointerEvent : public VNCEvent {
> 	static bool initialized;
> 	static Display *dpy;
> 	static int buttonMask;
>+
>+	unsigned char map[MAX_BUTTONS];
> public:
> 	PointerEvent(int b, int _x, int _y);
> 	virtual void exec();

Actions: View | Diff

Attachments on bug 1583: 1663 | 1669 | 1670