Attachment 1670 Details for Bug 1583 – Same as before but with debugging

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] Same as before but with debugging

krfb_mouse_fix_with_debug_statements.diff (text/plain), 2.42 KB, created by Timothy Pearson on 2013-11-24 22:53:21 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Pearson

Created: 2013-11-24 22:53:21 CST

Size: 2.42 KB

patch

obsolete

>diff --git a/admin b/admin
>--- a/admin
>+++ b/admin
>@@ -1 +1 @@
>-Subproject commit 9f768663f33e818a14dff26b403bae12a447a9ec
>+Subproject commit 9f768663f33e818a14dff26b403bae12a447a9ec-dirty
>diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
>index 0db5751..36f451c 100644
>--- a/krfb/krfb/rfbcontroller.cc
>+++ b/krfb/krfb/rfbcontroller.cc
>@@ -286,24 +286,45 @@ 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);
>+printf("[krfb] [DEBUG] Pointer mapping: %d %d %d %d %d\n", map[0], map[1], map[2], map[3], map[4]); fflush(stdout);
> 	}
> }
> 
> void PointerEvent::exec() {
>+if (buttonMask != button_mask) printf("[krfb] [DEBUG] Entering PointerEvent::exec()\n"); fflush(stdout);
> 	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;
>+printf("[krfb] [DEBUG] PointerEvent::exec() remote requested button %d\n", localButton); fflush(stdout);
>+			for (int j=0; j<MAX_BUTTONS; j++) {
>+				if (map[j] == localButton) {
>+					localButton = j+1;
>+					break;
>+				}
>+			}
>+printf("[krfb] [DEBUG] PointerEvent::exec() using local button %d\n", localButton); fflush(stdout);
> 			XTestFakeButtonEvent(dpy,
>-					     i+1,
>+					     localButton,
> 					     (button_mask&(1<<i))?True:False,
> 					     CurrentTime);
>+		}
>+	}
> 
> 	buttonMask = button_mask;
>+if (buttonMask != button_mask) printf("[krfb] [DEBUG] Exiting PointerEvent::exec()\n"); fflush(stdout);
> }
> 
> 
>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