diff --git a/configure.ac b/configure.ac
index 3203d7a..29a3ed1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,7 @@ AH_TEMPLATE(HAVE_LIBXINERAMA, [XINERAMA extension build environment present])
 AH_TEMPLATE(HAVE_LIBXRANDR, [XRANDR extension build environment present])
 AH_TEMPLATE(HAVE_LIBXFIXES, [XFIXES extension build environment present])
 AH_TEMPLATE(HAVE_LIBXDAMAGE, [XDAMAGE extension build environment present])
+AH_TEMPLATE(HAVE_LIBXCURSOR, [Xcursor library build environment present])
 AH_TEMPLATE(HAVE_LIBXTRAP, [DEC-XTRAP extension build environment present])
 AH_TEMPLATE(HAVE_RECORD, [RECORD extension build environment present])
 AH_TEMPLATE(HAVE_SOLARIS_XREADSCREEN, [Solaris XReadScreen available])
@@ -118,6 +119,9 @@ AC_ARG_WITH(uinput,
 [  --without-uinput        disable linux uinput device support],,)
 AC_ARG_WITH(macosx-native,
 [  --without-macosx-native disable MacOS X native display support],,)
+AC_ARG_WITH(colormultipointer,
+[  --without-colormultipointer  disable color support for multiple pointers]
+[  --with-cairo=DIR        use cairo include/library files in DIR (needed for color cursor support)],,)
 
 fi
 # end x11vnc only.
@@ -230,6 +234,18 @@ elif test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
 				$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
 		fi
 
+		# check for XI2 support
+		PKG_CHECK_MODULES(XI2, [xi >= 1.2.99] [inputproto >= 1.9.99.9],
+			 HAVE_XI2="yes"; AC_DEFINE(HAVE_XI2, 1, [XI2 available]),
+			 HAVE_XI2="no");
+
+		if test "$HAVE_XI2" = "yes" -a "x$with_colormultipointer" != "xno"; then
+			AC_CHECK_LIB(Xcursor, XcursorImageLoadCursor,
+				X_PRELIBS="$X_PRELIBS -lXcursor"
+				[AC_DEFINE(HAVE_LIBXCURSOR) HAVE_LIBXCURSOR="true"], ,
+				$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+		fi
+
 		if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
 			# need /usr/sfw/lib in RPATH for Solaris 10 and later
 			case `(uname -sr) 2>/dev/null` in
@@ -431,6 +447,34 @@ if test "x$with_avahi" = "xyes"; then
 	AC_SUBST(AVAHI_LIBS)
 fi
 
+
+if test "$HAVE_XI2" = "yes"; then
+AH_TEMPLATE(HAVE_CAIRO, [cairo graphics library present])
+if test "x$with_cairo" != "xno"; then
+	printf "checking for cairo... "
+	if test ! -z "$with_cairo" -a "x$with_cairo" != "xyes"; then
+		CAIRO_CFLAGS="-I$with_cairo/include"
+		CAIRO_LIBS="-L$with_cairo/lib -lcairo"
+		echo "using $with_cairo"
+		with_cairo=yes
+	elif pkg-config cairo >/dev/null 2>&1; then
+		CAIRO_CFLAGS=`pkg-config --cflags cairo`
+		CAIRO_LIBS=`pkg-config --libs cairo`
+		with_cairo=yes
+		echo yes
+	else
+		with_cairo=no
+		echo no
+	fi
+fi
+if test "x$with_cairo" = "xyes"; then
+	AC_DEFINE(HAVE_CAIRO)
+	AC_SUBST(CAIRO_CFLAGS)
+	AC_SUBST(CAIRO_LIBS)
+fi
+fi
+
+
 fi
 # end x11vnc only.
 
@@ -721,6 +765,11 @@ if test "x$with_gnutls" != "xno"; then
 	fi
 fi
 
+# XI2 present?
+AM_CONDITIONAL(HAVE_XI2, [ test "$HAVE_XI2" = "yes" ])
+# cairo?
+AM_CONDITIONAL(HAVE_CAIRO, [ test "$with_cairo" = "yes" ])
+
 # IPv6
 AH_TEMPLATE(IPv6, [Enable IPv6 support])
 AC_ARG_WITH(ipv6,
@@ -739,7 +788,6 @@ if test "x$with_ipv6" != "xno"; then
 fi
 
 
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h ws2tcpip.h])
@@ -747,6 +795,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys
 # x11vnc only:
 if test "$build_x11vnc" = "yes"; then
 	AC_CHECK_HEADERS([pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h])
+	AC_CHECK_HEADER([X11/extensions/shmproto.h], , , [#include <X11/Xmd.h>])
 fi
 
 # Checks for typedefs, structures, and compiler characteristics.
diff --git a/x11vnc/Makefile.am b/x11vnc/Makefile.am
index cef82f3..bc112e8 100644
--- a/x11vnc/Makefile.am
+++ b/x11vnc/Makefile.am
@@ -31,13 +31,13 @@ LD_CYGIPC=-lcygipc
 endif
 
 bin_PROGRAMS=x11vnc
-x11vnc_SOURCES = 8to24.c appshare.c avahi.c cleanup.c connections.c cursor.c gui.c help.c inet.c keyboard.c linuxfb.c macosx.c macosxCG.c macosxCGP.c macosxCGS.c macosx_opengl.c options.c pm.c pointer.c rates.c remote.c scan.c screen.c selection.c solid.c sslcmds.c sslhelper.c uinput.c unixpw.c user.c userinput.c util.c v4l.c win_utils.c x11vnc.c x11vnc_defs.c xdamage.c xevents.c xinerama.c xkb_bell.c xrandr.c xrecord.c xwrappers.c 8to24.h allowed_input_t.h avahi.h blackout_t.h cleanup.h connections.h cursor.h enc.h enums.h gui.h help.h inet.h keyboard.h linuxfb.h macosx.h macosxCG.h macosxCGP.h macosxCGS.h macosx_opengl.h nox11.h nox11_funcs.h options.h params.h pm.h pointer.h rates.h remote.h scan.h screen.h scrollevent_t.h selection.h solid.h sslcmds.h sslhelper.h ssltools.h tkx11vnc.h uinput.h unixpw.h user.h userinput.h util.h v4l.h win_utils.h winattr_t.h x11vnc.h xdamage.h xevents.h xinerama.h xkb_bell.h xrandr.h xrecord.h xwrappers.h
+x11vnc_SOURCES = 8to24.c appshare.c avahi.c cleanup.c connections.c cursor.c gui.c help.c inet.c keyboard.c linuxfb.c macosx.c macosxCG.c macosxCGP.c macosxCGS.c macosx_opengl.c options.c pm.c pointer.c rates.c remote.c scan.c screen.c selection.c solid.c sslcmds.c sslhelper.c uinput.c unixpw.c user.c userinput.c util.c v4l.c win_utils.c x11vnc.c x11vnc_defs.c xdamage.c xevents.c xinerama.c xkb_bell.c xrandr.c xrecord.c xwrappers.c xi2_devices.c 8to24.h allowed_input_t.h avahi.h blackout_t.h cleanup.h connections.h cursor.h enc.h enums.h gui.h help.h inet.h keyboard.h linuxfb.h macosx.h macosxCG.h macosxCGP.h macosxCGS.h macosx_opengl.h nox11.h nox11_funcs.h options.h params.h pm.h pointer.h rates.h remote.h scan.h screen.h scrollevent_t.h selection.h solid.h sslcmds.h sslhelper.h ssltools.h tkx11vnc.h uinput.h unixpw.h user.h userinput.h util.h v4l.h win_utils.h winattr_t.h x11vnc.h xdamage.h xevents.h xinerama.h xkb_bell.h xrandr.h xrecord.h xwrappers.h xi2_devices.h
 
 if HAVE_SYSTEM_LIBVNCSERVER
 INCLUDES_LIBVNCSERVER = @SYSTEM_LIBVNCSERVER_CFLAGS@
 else
 INCLUDES_LIBVNCSERVER =
 endif
-INCLUDES = $(INCLUDES_LIBVNCSERVER) @X_CFLAGS@ @AVAHI_CFLAGS@
+INCLUDES = $(INCLUDES_LIBVNCSERVER) @X_CFLAGS@ @AVAHI_CFLAGS@ @XI2_CFLAGS@ @CAIRO_CFLAGS@
 
-x11vnc_LDADD=$(LDADD) @SSL_LIBS@ @CRYPT_LIBS@ @X_LIBS@ @AVAHI_LIBS@ $(LD_CYGIPC)
+x11vnc_LDADD=$(LDADD) @SSL_LIBS@ @CRYPT_LIBS@ @X_LIBS@ @AVAHI_LIBS@ @XI2_LIBS@ @CAIRO_LIBS@ $(LD_CYGIPC)
diff --git a/x11vnc/cleanup.c b/x11vnc/cleanup.c
index 60db819..9120a10 100644
--- a/x11vnc/cleanup.c
+++ b/x11vnc/cleanup.c
@@ -51,6 +51,7 @@ so, delete this exception statement from your version.
 #include "xrecord.h"
 #include "xevents.h"
 #include "uinput.h"
+#include "xi2_devices.h"
 
 /*
  * Exiting and error handling routines
@@ -143,6 +144,7 @@ static void clean_icon_mode(void) {
 	}
 }
 
+
 /*
  * Normal exiting
  */
@@ -210,6 +212,18 @@ void clean_up_exit(int ret) {
 	/* X keyboard cleanups */
 	delete_added_keycodes(0);
 
+	/* remove all created XInput2 devices */
+	if(use_multipointer) {
+	  rfbClientIteratorPtr iter = rfbGetClientIterator(screen);
+	  rfbClientPtr cl;
+	  while((cl = rfbClientIteratorNext(iter))) {
+	    ClientData *cd = (ClientData *) cl->clientData;
+	    if(removeMD(dpy, cd->ptr_id))
+	      rfbLog("cleanup: removed XInput2 MD for client %s.\n", cl->host);
+	  }
+	  rfbReleaseClientIterator(iter);
+	}
+
 	if (clear_mods == 1) {
 		clear_modifiers(0);
 	} else if (clear_mods == 2) {
@@ -529,11 +543,11 @@ static void interrupted (int sig) {
 	if (exit_flag) {
 		fprintf(stderr, "extra[%d] signal: %d\n", exit_flag, sig);
 		exit_flag++;
-		if (use_threads) {
-			usleep2(250 * 1000);
-		} else if (exit_flag <= 2) {
-			return;
-		}
+		if (use_threads)
+		  usleep2(250 * 1000);
+		if (exit_flag <= 2)
+		  return;
+
 		if (rm_flagfile) {
 			unlink(rm_flagfile);
 			rm_flagfile = NULL;
@@ -549,7 +563,7 @@ static void interrupted (int sig) {
 	} else {
 		fprintf(stderr, "caught signal: %d\n", sig);
 	}
-	if (sig == SIGINT) {
+	if (sig == SIGINT || sig == SIGTERM) {
 		shut_down = 1;
 		return;
 	}
diff --git a/x11vnc/connections.c b/x11vnc/connections.c
index d2a9b5c..a5f7972 100644
--- a/x11vnc/connections.c
+++ b/x11vnc/connections.c
@@ -54,6 +54,8 @@ so, delete this exception statement from your version.
 #include "userinput.h"
 #include "pointer.h"
 #include "xrandr.h"
+#include "xi2_devices.h"
+
 
 /*
  * routines for handling incoming, outgoing, etc connections
@@ -783,6 +785,18 @@ static void free_client_data(rfbClientPtr client) {
 				free(cd->unixname);
 				cd->unixname = NULL;
 			}
+			if (cd->cursor) {
+			        rfbFreeCursor(cd->cursor);
+			        cd->cursor = NULL;
+			}
+			if (cd->under_cursor_buffer) {
+			        free(cd->under_cursor_buffer);
+			        cd->under_cursor_buffer = NULL;
+			}
+			if (cd->cursor_region) {
+				sraRgnDestroy(cd->cursor_region);
+				cd->cursor_region = NULL;
+			}
 		}
 		free(client->clientData);
 		client->clientData = NULL;
@@ -886,6 +900,11 @@ void client_gone(rfbClientPtr client) {
 		}
 	}
 
+	/* remove clients XInput2 master device */
+        if(use_multipointer) 
+	  if(removeMD(dpy, cd->ptr_id))
+	    rfbLog("removed XInput2 MD for client %s.\n", client->host);
+
 	free_client_data(client);
 
 	if (inetd && client == inetd_client) {
@@ -3964,6 +3983,12 @@ enum rfbNewClientAction new_client(rfbClientPtr client) {
 		return(RFB_CLIENT_REFUSE);
 	}
 
+        if(use_multipointer && xi2_device_creation_in_progress) {
+            rfbLog("denying additional client: %s during MD creation.\n", client->host);
+	    CLIENT_UNLOCK;
+            return(RFB_CLIENT_REFUSE);
+        }
+
 	client->clientData = (void *) calloc(sizeof(ClientData), 1);
 	cd = (ClientData *) client->clientData;
 
@@ -4015,6 +4040,38 @@ enum rfbNewClientAction new_client(rfbClientPtr client) {
 
 	cd->uid = clients_served;
 
+        /*
+	  create new XInput2 master device and add it it to client
+	*/
+        if(use_multipointer)
+          {
+	    char tmp[256];
+            snprintf(tmp, 256, "x11vnc %s", client->host);
+
+            xi2_device_creation_in_progress = 1;
+
+	    if((cd->ptr_id = createMD(dpy, tmp)) < 0) {
+	      rfbLog("ERROR creating XInput2 MD for client %s, denying client.\n", client->host);
+	      free_client_data(client);
+	      xi2_device_creation_in_progress = 0;
+	      CLIENT_UNLOCK;
+	      return(RFB_CLIENT_REFUSE);
+	    }
+
+            cd->kbd_id = getPairedMD(dpy, cd->ptr_id);
+
+            rfbLog("Created XInput2 MD %i %i for client %s.\n", cd->ptr_id, cd->kbd_id, client->host);
+
+            xi2_device_creation_in_progress = 0;
+
+            snprintf(tmp, 256, "%i", cd->uid);
+	    cd->cursor = setClientCursor(dpy, cd->ptr_id, 0.4*(cd->ptr_id%3), 0.2*(cd->ptr_id%5), 1*(cd->ptr_id%2), tmp);
+	    if(!cd->cursor)
+              rfbLog("Setting cursor for client %s failed.\n", client->host);
+
+	    cd->cursor_region = sraRgnCreate();
+          }
+
 	client->clientGoneHook = client_gone;
 
 	if (client_count) {
diff --git a/x11vnc/cursor.c b/x11vnc/cursor.c
index 3d613a6..639aaaa 100644
--- a/x11vnc/cursor.c
+++ b/x11vnc/cursor.c
@@ -39,6 +39,7 @@ so, delete this exception statement from your version.
 #include "scan.h"
 #include "unixpw.h"
 #include "macosx.h"
+#include "xi2_devices.h"
 
 int xfixes_present = 0;
 int xfixes_first_initialized = 0;
@@ -62,14 +63,18 @@ void restore_cursor_shape_updates(rfbScreenInfoPtr s);
 void disable_cursor_shape_updates(rfbScreenInfoPtr s);
 int cursor_shape_updates_clients(rfbScreenInfoPtr s);
 int cursor_pos_updates_clients(rfbScreenInfoPtr s);
-void cursor_position(int x, int y);
+void cursor_position(int x, int y, rfbClientPtr client);
 void set_no_cursor(void);
 void set_warrow_cursor(void);
 int set_cursor(int x, int y, int which);
 int check_x11_pointer(void);
 int store_cursor(int serial, unsigned long *data, int w, int h, int cbpp, int xhot, int yhot);
 unsigned long get_cursor_serial(int mode);
-
+rfbCursorPtr pixels2curs(unsigned long *pixels, int w, int h,
+			 int xhot, int yhot, int Bpp);
+void save_under_cursor_buffer(rfbClientPtr cl);
+void draw_cursor(rfbClientPtr cl);
+void restore_under_cursor_buffer(rfbClientPtr cl);
 
 typedef struct win_str_info {
 	char *wm_name;
@@ -91,8 +96,6 @@ static void curs_copy(cursor_info_t *dest, cursor_info_t *src);
 static void setup_cursors(void);
 static void set_rfb_cursor(int which);
 static void tree_descend_cursor(int *depth, Window *w, win_str_info_t *winfo);
-static rfbCursorPtr pixels2curs(unsigned long *pixels, int w, int h,
-    int xhot, int yhot, int Bpp);
 static int get_exact_cursor(int init);
 static void set_cursor_was_changed(rfbScreenInfoPtr s);
 
@@ -1003,7 +1006,7 @@ void initialize_xfixes(void) {
 #endif
 }
 
-static rfbCursorPtr pixels2curs(unsigned long *pixels, int w, int h,
+rfbCursorPtr pixels2curs(unsigned long *pixels, int w, int h,
     int xhot, int yhot, int Bpp) {
 	rfbCursorPtr c;
 	static unsigned long black = 0, white = 1;
@@ -1828,7 +1831,7 @@ int cursor_pos_updates_clients(rfbScreenInfoPtr s) {
  * Then set up for sending rfbCursorPosUpdates back
  * to clients that understand them.  This seems to be TightVNC specific.
  */
-void cursor_position(int x, int y) {
+void cursor_position(int x, int y, rfbClientPtr client) {
 	rfbClientIteratorPtr iter;
 	rfbClientPtr cl;
 	int cnt = 0, nonCursorPosUpdates_clients = 0;
@@ -1853,6 +1856,11 @@ void cursor_position(int x, int y) {
 		if (y >= dpy_y) y = dpy_y-1;
 	}
 
+
+	if(client == NULL) {
+	/* handle screen's master cursor */
+        if (debug_pointer)
+	  rfbLog("cursor_position: set screen pos x=%3d y=%d\n", x, y);
 	if (x == screen->cursorX && y == screen->cursorY) {
 		return;
 	}
@@ -1899,6 +1907,19 @@ void cursor_position(int x, int y) {
 		rfbLog("cursor_position: sent position x=%3d y=%3d to %d"
 		    " clients\n", x, y, cnt);
 	}
+       }
+       else {
+	 /* if client is non-NULL, handle client cursor */
+	 if(use_multipointer) {
+	   ClientData *cd = (ClientData *) client->clientData;
+	   if (debug_pointer)
+	     rfbLog("cursor_position: set client pos x=%3d y=%d\n", x, y);
+	   INPUT_LOCK;
+	   cd->cursor_x = x;
+	   cd->cursor_y = y;
+	   INPUT_UNLOCK;
+	 }
+       }
 }
 
 static void set_rfb_cursor(int which) {
@@ -1973,12 +1994,63 @@ int check_x11_pointer(void) {
 
 #endif
 
+#ifdef LIBVNCSERVER_HAVE_XI2
+#if ! NO_X11
+	/* if we are in multipointer mode,
+	   check the position of all client pointers here */
+	if(use_multipointer && screen) {
+	  rfbClientIteratorPtr iter;
+	  rfbClientPtr cl;
+	  double root_x, root_y, win_x, win_y;
+	  XIButtonState buttons_return;
+	  XIModifierState modifiers_return;
+	  XIGroupState group_return;
+
+	  iter = rfbGetClientIterator(screen);
+	  while( (cl = rfbClientIteratorNext(iter)) ) {
+	    if (dpy) {
+	      X_LOCK;
+	      ret = XIQueryPointer(dpy, ((ClientData*)cl->clientData)->ptr_id, rootwin, &root_w, &child_w,
+				   &root_x, &root_y, &win_x, &win_y,
+				   &buttons_return, &modifiers_return, &group_return);
+	      X_UNLOCK;
+	    }
+
+	    if(!ret)
+	      continue;
+
+	    if (debug_pointer)
+	      rfbLog("XIQueryPointer:     x:%4f, y:%4f)\n", root_x, root_y);
+
+	    /* offset subtracted since XIQueryPointer relative to rootwin */
+	    x = root_x - off_x - coff_x;
+	    y = root_y - off_y - coff_y;
+
+	    if (clipshift) {
+	      static int cnt = 0;
+	      if (x < 0 || y < 0 || x >= dpy_x || y >= dpy_y)  {
+		if (cnt++ % 4 != 0) {
+		  if (debug_pointer)
+		    rfbLog("Skipping cursor_position() outside our clipshift\n");
+		  continue;
+		}
+	      }
+	    }
+
+	    /* record the cursor position in the rfb screen */
+	    cursor_position(x, y, cl);
+	  }
+	  rfbReleaseClientIterator(iter);
+	}
+#endif
+#endif
+
 
 #if ! NO_X11
 	if (dpy) {
 		X_LOCK;
 		ret = XQueryPointer_wr(dpy, rootwin, &root_w, &child_w, &root_x, &root_y,
-		    &win_x, &win_y, &mask);
+                   &win_x, &win_y, &mask);
 		X_UNLOCK;
 	}
 #else
@@ -2016,10 +2088,255 @@ if (0) fprintf(stderr, "check_x11_pointer %d %d\n", root_x, root_y);
 	}
 
 	/* record the cursor position in the rfb screen */
-	cursor_position(x, y);
+	cursor_position(x, y, NULL);
 
 	/* change the cursor shape if necessary */
 	rint = set_cursor(x, y, get_which_cursor());
 	return rint;
 }
 
+
+
+/*
+  the following routines save what's under a cursor, draw a cursor into 
+  the framebuffer and  restore the saved framebuffer region. most of 
+  the code stolen from libvncserver.
+  this is mostly used in multi-pointer mode: because RFB only has the 
+  notion of a single cursor, we draw the extra client cursor directly 
+  into the framebuffer to provide some visual feedback to the user. 
+*/
+void save_under_cursor_buffer(rfbClientPtr cl)
+{
+  ClientData *cd = (ClientData *) cl->clientData;
+  rfbCursorPtr c = cd->cursor;
+  int j,x1,x2,y1,y2,bpp=screen->serverFormat.bitsPerPixel/8,
+    rowstride=screen->paddedWidthInBytes,
+    bufsize;  
+  rfbBool wasChanged=FALSE;
+
+  if(!c)
+    return;
+
+  bufsize = c->width * c->height * bpp;
+
+  /* make sure the buffer is big enough */
+  if(cd->under_cursor_buffer_len < bufsize) {
+    LOCK(cl->updateMutex);
+    cd->under_cursor_buffer = realloc(cd->under_cursor_buffer, bufsize);
+    cd->under_cursor_buffer_len = bufsize;
+    UNLOCK(cl->updateMutex);
+  }
+
+  /* sanity checks */ 
+  x1 = cd->cursor_x - c->xhot;
+  x2 = x1 + c->width;
+  if(x1<0) { x1=0; }
+  if(x2 >= screen->width) x2= screen->width-1;
+  x2 -= x1; /* width */
+  if(x2<=0) 
+    return; /* nothing to do */
+
+  y1 = cd->cursor_y - c->yhot;
+  y2 = y1 + c->height;
+  if(y1<0) { y1=0; }
+  if(y2>=screen->height) y2=screen->height-1;
+  y2 -= y1; /* height */
+  if(y2<=0) 
+    return; /* nothing to do */
+
+  LOCK(cl->updateMutex);
+  /* save what's under the cursor now */
+  for(j=0;j<y2;j++) {
+    char* dest = cd->under_cursor_buffer+j*x2*bpp;
+    const char* src = screen->frameBuffer+(y1+j)*rowstride+x1*bpp;
+    unsigned int count=x2*bpp;
+    if(wasChanged || memcmp(dest,src,count)) {
+       wasChanged=TRUE;
+       memcpy(dest,src,count);
+    }
+  }
+  UNLOCK(cl->updateMutex);
+}
+
+void draw_cursor(rfbClientPtr cl)
+{
+  ClientData *cd = (ClientData *) cl->clientData;
+  rfbCursorPtr c = cd->cursor;
+  int i,j,x1,x2,y1,y2,i1,j1,bpp=screen->serverFormat.bitsPerPixel/8,
+    rowstride=screen->paddedWidthInBytes, w;  
+ 
+  if(!c)
+    return;
+
+  w = (c->width+7)/8;
+ 
+  /* sanity checks */ 
+  i1=j1=0; 
+
+  x1 = cd->cursor_x - c->xhot;
+  x2 = x1 + c->width;
+  if(x1<0) { i1=-x1; x1=0; }
+  if(x2 >= screen->width) x2= screen->width-1;
+  x2 -= x1; /* width */
+  if(x2<=0) 
+    return; /* nothing to do */
+
+  y1 = cd->cursor_y - c->yhot;
+  y2 = y1 + c->height;
+  if(y1<0) { j1=-y1; y1=0; }
+  if(y2>=screen->height) y2=screen->height-1;
+  y2 -= y1; /* height */
+  if(y2<=0) 
+    return; /* nothing to do */
+
+  LOCK(cl->screen->cursorMutex);
+
+  if (c->alphaSource) {
+    int rmax, rshift;
+    int gmax, gshift;
+    int bmax, bshift;
+    int amax = 255;	/* alphaSource is always 8bits of info per pixel */
+    unsigned int rmask, gmask, bmask;
+
+    rmax   = screen->serverFormat.redMax;
+    gmax   = screen->serverFormat.greenMax;
+    bmax   = screen->serverFormat.blueMax;
+    rshift = screen->serverFormat.redShift;
+    gshift = screen->serverFormat.greenShift;
+    bshift = screen->serverFormat.blueShift;
+
+    rmask = (rmax << rshift);
+    gmask = (gmax << gshift);
+    bmask = (bmax << bshift);
+
+    for(j=0;j<y2;j++) {
+      for(i=0;i<x2;i++) {
+	/*
+	 * we loop over the whole cursor ignoring c->mask[],
+	 * using the extracted alpha value instead.
+	 */
+	char *dest;
+	unsigned char *src, *aptr;
+	unsigned int val, dval, sval;
+	int rdst, gdst, bdst;		/* fb RGB */
+	int asrc, rsrc, gsrc, bsrc;	/* rich source ARGB */
+
+	dest = screen->frameBuffer + (j+y1)*rowstride + (i+x1)*bpp;
+	src  = c->richSource  + (j+j1)*c->width*bpp + (i+i1)*bpp;
+	aptr = c->alphaSource + (j+j1)*c->width + (i+i1);
+
+	asrc = *aptr;
+	if (!asrc) {
+	  continue;
+	}
+
+	if (bpp == 1) {
+	  dval = *((unsigned char*) dest);
+	  sval = *((unsigned char*) src);
+	} else if (bpp == 2) {
+	  dval = *((unsigned short*) dest);
+	  sval = *((unsigned short*) src);
+	} else if (bpp == 3) {
+	  unsigned char *dst = (unsigned char *) dest;
+	  dval = 0;
+	  dval |= ((*(dst+0)) << 0);
+	  dval |= ((*(dst+1)) << 8);
+	  dval |= ((*(dst+2)) << 16);
+	  sval = 0;
+	  sval |= ((*(src+0)) << 0);
+	  sval |= ((*(src+1)) << 8);
+	  sval |= ((*(src+2)) << 16);
+	} else if (bpp == 4) {
+	  dval = *((unsigned int*) dest);
+	  sval = *((unsigned int*) src);
+	} else {
+	  continue;
+	}
+
+	/* extract dest and src RGB */
+	rdst = (dval & rmask) >> rshift;	/* fb */
+	gdst = (dval & gmask) >> gshift;
+	bdst = (dval & bmask) >> bshift;
+
+	rsrc = (sval & rmask) >> rshift;	/* richcursor */
+	gsrc = (sval & gmask) >> gshift;
+	bsrc = (sval & bmask) >> bshift;
+
+	/* blend in fb data. */
+	if (! c->alphaPreMultiplied) {
+	  rsrc = (asrc * rsrc)/amax;
+	  gsrc = (asrc * gsrc)/amax;
+	  bsrc = (asrc * bsrc)/amax;
+	}
+	rdst = rsrc + ((amax - asrc) * rdst)/amax;
+	gdst = gsrc + ((amax - asrc) * gdst)/amax;
+	bdst = bsrc + ((amax - asrc) * bdst)/amax;
+
+	val = 0;
+	val |= (rdst << rshift);
+	val |= (gdst << gshift);
+	val |= (bdst << bshift);
+
+	/* insert the cooked pixel into the fb */
+	memcpy(dest, &val, bpp);
+      }
+    }
+  }
+  else {
+    /* no alpha  */
+    for(j=0;j<y2;j++)
+      for(i=0;i<x2;i++)
+	if((c->mask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80)
+	  memcpy(screen->frameBuffer+(j+y1)*rowstride+(i+x1)*bpp,
+		 c->richSource+(j+j1)*c->width*bpp+(i+i1)*bpp,bpp);
+  }
+
+  mark_rect_as_modified(x1, y1, x1+x2, y1+y2, 1);
+
+  UNLOCK(cl->screen->cursorMutex);
+}
+
+
+/* this restores the under cursor buffer we saved in
+   draw_cursor to the framebuffer */
+void restore_under_cursor_buffer(rfbClientPtr cl)
+{
+  ClientData *cd = (ClientData *) cl->clientData;
+  rfbCursorPtr c=cd->cursor;
+  int j,x1,x2,y1,y2,bpp=screen->serverFormat.bitsPerPixel/8,
+    rowstride=screen->paddedWidthInBytes;
+
+  if(!c) 
+    return;
+
+  /* sanity checks */
+  x1 = cd->cursor_x - c->xhot;
+  x2 = x1 + c->width;
+  if(x1<0) { x1=0; }
+  if(x2 >= screen->width) x2= screen->width-1;
+  x2 -= x1; /* width */
+  if(x2<=0)
+    return; /* nothing to do */
+
+  y1 = cd->cursor_y - c->yhot;
+  y2 = y1 + c->height;
+  if(y1<0) { y1=0; }
+  if(y2>=screen->height) y2=screen->height-1;
+  y2 -= y1; /* height */
+  if(y2<=0)
+    return; /* nothing to do */
+
+  LOCK(cl->screen->cursorMutex);
+  /* restore framebuffer from saved data */
+  if(cd->under_cursor_buffer_len > 0) {
+    for(j=0;j<y2;j++)
+      memcpy(screen->frameBuffer+(y1+j)*rowstride+x1*bpp,
+	     cd->under_cursor_buffer+j*x2*bpp,
+	     x2*bpp);
+
+    /* seems the additional w/2 and h/2 rect extension is needed in threaded mode */
+    mark_rect_as_modified(x1-x2/2, y1-y2/2, x1+x2+x2/2, y1+y2+y2/2, 1);
+  }
+  UNLOCK(cl->screen->cursorMutex);
+}
+
diff --git a/x11vnc/cursor.h b/x11vnc/cursor.h
index 9c74944..0ce1e4d 100644
--- a/x11vnc/cursor.h
+++ b/x11vnc/cursor.h
@@ -59,12 +59,17 @@ extern void disable_cursor_shape_updates(rfbScreenInfoPtr s);
 extern int cursor_shape_updates_clients(rfbScreenInfoPtr s);
 extern int cursor_noshape_updates_clients(rfbScreenInfoPtr s);
 extern int cursor_pos_updates_clients(rfbScreenInfoPtr s);
-extern void cursor_position(int x, int y);
+extern void cursor_position(int x, int y, rfbClientPtr client);
 extern void set_no_cursor(void);
 extern void set_warrow_cursor(void);
 extern int set_cursor(int x, int y, int which);
 extern int check_x11_pointer(void);
 extern int store_cursor(int serial, unsigned long *data, int w, int h, int cbpp, int xhot, int yhot);
 extern unsigned long get_cursor_serial(int mode);
+extern rfbCursorPtr pixels2curs(unsigned long *pixels, int w, int h,
+				int xhot, int yhot, int Bpp);
+extern void save_under_cursor_buffer(rfbClientPtr cl);
+extern void draw_cursor(rfbClientPtr cl);
+extern void restore_under_cursor_buffer(rfbClientPtr cl);
 
 #endif /* _X11VNC_CURSOR_H */
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 5cd5c12..364e1e8 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -4253,6 +4253,11 @@ void print_help(int mode) {
 "                       there are problems or decrease it to live on the edge\n"
 "                       (perhaps useful on a slow machine).\n"
 "\n"
+#ifdef LIBVNCSERVER_HAVE_XI2
+"-multiptr              Enable support for multiple pointers, one per client.\n"
+"                       Uses XInput2 aka MPX. Default is off.\n"
+"\n"
+#endif
 "-sigpipe string        Broken pipe (SIGPIPE) handling.  \"string\" can be\n"
 "                       \"ignore\" or \"exit\".  For \"ignore\" LibVNCServer\n"
 "                       will handle the abrupt loss of a client and continue,\n"
diff --git a/x11vnc/keyboard.c b/x11vnc/keyboard.c
index 54ff70e..be3bc6e 100644
--- a/x11vnc/keyboard.c
+++ b/x11vnc/keyboard.c
@@ -48,6 +48,8 @@ so, delete this exception statement from your version.
 #include "uinput.h"
 #include "macosx.h"
 #include "screen.h"
+#include "xi2_devices.h"
+
 
 void get_keystate(int *keystate);
 void clear_modifiers(int init);
@@ -80,7 +82,7 @@ static void add_dead_keysyms(char *str);
 static void initialize_xkb_modtweak(void);
 static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
     rfbClientPtr client);
-static void tweak_mod(signed char mod, rfbBool down);
+static void tweak_mod(signed char mod, rfbBool down, int dev_id);
 static void modifier_tweak_keyboard(rfbBool down, rfbKeySym keysym,
     rfbClientPtr client);
 static void pipe_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client);
@@ -188,7 +190,7 @@ void clear_modifiers(int init) {
 			rfbLog("clear_modifiers: up: %-10s (0x%x) "
 			    "keycode=0x%x\n", keystrs[i], keysym, keycode);
 		}
-		XTestFakeKeyEvent_wr(dpy, keycode, False, CurrentTime);
+		XTestFakeKeyEvent_wr(dpy, -1, keycode, False, CurrentTime); /* multipointer FIXME? */
 	}
 	XFlush_wr(dpy);
 #endif	/* NO_X11 */
@@ -277,7 +279,7 @@ void clear_keys(void) {
 		if (keystate[k]) {
 			KeyCode keycode = (KeyCode) k;
 			rfbLog("clear_keys: keycode=%d\n", keycode);
-			XTestFakeKeyEvent_wr(dpy, keycode, False, CurrentTime);
+			XTestFakeKeyEvent_wr(dpy, -1, keycode, False, CurrentTime);/* multipointer FIXME? */
 		}
 	}
 	XFlush_wr(dpy);
@@ -331,9 +333,9 @@ void clear_locks(void) {
 					char *nm = XKeysymToString(ks);
 					rfbLog("toggling: %03d / %03d -- %s\n", key, ks, nm ? nm : "BadKey");
 					did = 1;
-					XTestFakeKeyEvent_wr(dpy, key, True, CurrentTime);
+					XTestFakeKeyEvent_wr(dpy, -1, key, True, CurrentTime); /* multipointer FIXME? */
 					usleep(10*1000);
-					XTestFakeKeyEvent_wr(dpy, key, False, CurrentTime);
+					XTestFakeKeyEvent_wr(dpy, -1, key, False, CurrentTime);
 					XFlush_wr(dpy);
 				}
 			}
@@ -1593,7 +1595,10 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 
 	if (!client || !down || !keysym) {} /* unused vars warning: */
 
-	RAWFB_RET_VOID
+	RAWFB_RET_VOID;
+
+        ClientData *cd = (ClientData *) client->clientData;
+        
 
 	X_LOCK;
 
@@ -1740,7 +1745,10 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 
 	if (debug_keyboard > 1) {
 		/* get state early for debug output */
-		XkbGetState(dpy, XkbUseCoreKbd, &kbstate);
+                if(use_multipointer)
+                  XkbGetState(dpy, cd->kbd_id, &kbstate);
+                else
+                  XkbGetState(dpy, XkbUseCoreKbd, &kbstate);
 		got_kbstate = 1;
 		PKBSTATE
 	}
@@ -1778,8 +1786,11 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			int best = 0, best_score = -1;
 			/* need to break the tie... */
 			if (! got_kbstate) {
-				XkbGetState(dpy, XkbUseCoreKbd, &kbstate);
-				got_kbstate = 1;
+                               if(use_multipointer)
+                                 XkbGetState(dpy, cd->kbd_id, &kbstate);
+                               else
+                                 XkbGetState(dpy, XkbUseCoreKbd, &kbstate);
+                               got_kbstate = 1;
 			}
 			if (khints && keysym < 0x100) {
 				int ks = (int) keysym, j;
@@ -2034,8 +2045,11 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 
 		if (! got_kbstate) {
 			/* get the current modifier state if we haven't yet */
-			XkbGetState(dpy, XkbUseCoreKbd, &kbstate);
-			got_kbstate = 1;
+			 if(use_multipointer)
+                           XkbGetState(dpy, cd->kbd_id, &kbstate);
+                         else
+                           XkbGetState(dpy, XkbUseCoreKbd, &kbstate);
+                         got_kbstate = 1;
 		}
 
 		/*
@@ -2277,7 +2291,7 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 				    "inadvertent Multi_key from Shift "
 				    "(doing %03d up now)\n", shift_is_down);
 			}
-			XTestFakeKeyEvent_wr(dpy, shift_is_down, False,
+			XTestFakeKeyEvent_wr(dpy, cd->kbd_id, shift_is_down, False,
 			    CurrentTime);
 		} else {
 			involves_multi_key = 0;
@@ -2289,7 +2303,7 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			if (sentmods[i] == 0) continue;
 			dn = (Bool) needmods[i];
 			if (dn) continue;
-			XTestFakeKeyEvent_wr(dpy, sentmods[i], dn, CurrentTime);
+			XTestFakeKeyEvent_wr(dpy, cd->kbd_id, sentmods[i], dn, CurrentTime);
 		}
 		for (j=0; j<8; j++) {
 			/* next, do the Mod downs */
@@ -2297,7 +2311,7 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			if (sentmods[i] == 0) continue;
 			dn = (Bool) needmods[i];
 			if (!dn) continue;
-			XTestFakeKeyEvent_wr(dpy, sentmods[i], dn, CurrentTime);
+			XTestFakeKeyEvent_wr(dpy, cd->kbd_id, sentmods[i], dn, CurrentTime);
 		}
 
 		if (involves_multi_key) {
@@ -2309,14 +2323,14 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 				    "inadvertent Multi_key from Shift "
 				    "(doing %03d down now)\n", shift_is_down);
 			}
-			XTestFakeKeyEvent_wr(dpy, shift_is_down, True,
+			XTestFakeKeyEvent_wr(dpy, cd->kbd_id, shift_is_down, True,
 			    CurrentTime);
 		}
 
 		/*
 		 * With the above modifier work done, send the actual keycode:
 		 */
-		XTestFakeKeyEvent_wr(dpy, Kc_f, (Bool) down, CurrentTime);
+		XTestFakeKeyEvent_wr(dpy, cd->kbd_id, Kc_f, (Bool) down, CurrentTime);
 
 		/*
 		 * Now undo the modifier work:
@@ -2327,7 +2341,7 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			if (sentmods[i] == 0) continue;
 			dn = (Bool) needmods[i];
 			if (!dn) continue;
-			XTestFakeKeyEvent_wr(dpy, sentmods[i], !dn,
+			XTestFakeKeyEvent_wr(dpy, cd->kbd_id, sentmods[i], !dn,
 			    CurrentTime);
 		}
 		for (j=7; j>=0; j--) {
@@ -2336,13 +2350,13 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			if (sentmods[i] == 0) continue;
 			dn = (Bool) needmods[i];
 			if (dn) continue;
-			XTestFakeKeyEvent_wr(dpy, sentmods[i], !dn,
+			XTestFakeKeyEvent_wr(dpy, cd->kbd_id, sentmods[i], !dn,
 			    CurrentTime);
 		}
 
 	} else { /* for up case, hopefully just need to pop it up: */
 
-		XTestFakeKeyEvent_wr(dpy, Kc_f, (Bool) down, CurrentTime);
+               XTestFakeKeyEvent_wr(dpy, cd->kbd_id, Kc_f, (Bool) down, CurrentTime);
 	}
 	X_UNLOCK;
 }
@@ -2601,7 +2615,7 @@ void initialize_modtweak(void) {
 /*
  * does the actual tweak:
  */
-static void tweak_mod(signed char mod, rfbBool down) {
+static void tweak_mod(signed char mod, rfbBool down, int dev_id) {
 	rfbBool is_shift = mod_state & (LEFTSHIFT|RIGHTSHIFT);
 	Bool dn = (Bool) down;
 	KeyCode altgr = altgr_code;
@@ -2628,20 +2642,20 @@ static void tweak_mod(signed char mod, rfbBool down) {
 	X_LOCK;
 	if (is_shift && mod != 1) {
 	    if (mod_state & LEFTSHIFT) {
-		XTestFakeKeyEvent_wr(dpy, left_shift_code, !dn, CurrentTime);
+              XTestFakeKeyEvent_wr(dpy, dev_id, left_shift_code, !dn, CurrentTime);
 	    }
 	    if (mod_state & RIGHTSHIFT) {
-		XTestFakeKeyEvent_wr(dpy, right_shift_code, !dn, CurrentTime);
+              XTestFakeKeyEvent_wr(dpy, dev_id, right_shift_code, !dn, CurrentTime);
 	    }
 	}
 	if ( ! is_shift && mod == 1 ) {
-	    XTestFakeKeyEvent_wr(dpy, left_shift_code, dn, CurrentTime);
+          XTestFakeKeyEvent_wr(dpy, dev_id, left_shift_code, dn, CurrentTime);
 	}
 	if ( altgr && (mod_state & ALTGR) && mod != 2 ) {
-	    XTestFakeKeyEvent_wr(dpy, altgr, !dn, CurrentTime);
+          XTestFakeKeyEvent_wr(dpy, dev_id, altgr, !dn, CurrentTime);
 	}
 	if ( altgr && ! (mod_state & ALTGR) && mod == 2 ) {
-	    XTestFakeKeyEvent_wr(dpy, altgr, dn, CurrentTime);
+          XTestFakeKeyEvent_wr(dpy, dev_id, altgr, dn, CurrentTime);
 	}
 	X_UNLOCK;
 
@@ -2664,6 +2678,7 @@ static void modifier_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 #else
 	KeyCode k;
 	int tweak = 0;
+        ClientData *cd = (ClientData *) client->clientData;
 
 	RAWFB_RET_VOID
 
@@ -2704,7 +2719,7 @@ static void modifier_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			X_UNLOCK;
 			tweak = 0;
 		} else {
-			tweak_mod(modifiers[keysym], True);
+                        tweak_mod(modifiers[keysym], True, cd->kbd_id);
 			k = keycodes[keysym];
 		}
 	} else {
@@ -2734,12 +2749,12 @@ static void modifier_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 	}
 	if ( k != NoSymbol ) {
 		X_LOCK;
-		XTestFakeKeyEvent_wr(dpy, k, (Bool) down, CurrentTime);
+		XTestFakeKeyEvent_wr(dpy, cd->kbd_id,  k, (Bool) down, CurrentTime);
 		X_UNLOCK;
 	}
 
 	if ( tweak ) {
-		tweak_mod(modifiers[keysym], False);
+             tweak_mod(modifiers[keysym], False, cd->kbd_id);
 	}
 #endif	/* NO_X11 */
 }
@@ -2872,7 +2887,7 @@ static void pipe_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 		int mask, button = (int) keysym;
 		int x = cursor_x, y = cursor_y;
 		char *b, bstr[32];
-
+				
 		if (!down) {
 			return;
 		}
@@ -2903,7 +2918,7 @@ static void pipe_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 				pointer_event(mask, x, y, client);
 			}
 			b++;
-		}
+		}	
 		return;
 	}
 
@@ -3059,6 +3074,7 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 	static rfbKeySym max_keyrepeat_last_keysym = NoSymbol;
 	static double max_keyrepeat_last_time = 0.0;
 	static double max_keyrepeat_always = -1.0;
+        ClientData *cd = (ClientData *) client->clientData;
 
 	if (threads_drop_input) {
 		return;
@@ -3310,7 +3326,7 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 	got_user_input++;
 	got_keyboard_input++;
 	
-	RAWFB_RET_VOID
+	RAWFB_RET_VOID;
 
 
 	apply_remap(&keysym, &isbutton);
@@ -3340,7 +3356,7 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 	if (isbutton) {
 		int mask, button = (int) keysym;
 		char *b, bstr[32];
-
+		
 		if (! down) {
 			INPUT_UNLOCK;
 			return;	/* nothing to send */
@@ -3357,7 +3373,7 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 		 * remap the button click to keystroke sequences!
 		 * Usually just will simulate the button click.
 		 */
-
+	
 		/* loop over possible multiclicks: Button123 */
 		sprintf(bstr, "%d", button);
 		b = bstr;
@@ -3368,9 +3384,9 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 			t[1] = '\0';
 			if (sscanf(t, "%d", &butt) == 1) {
 				mask = 1<<(butt-1);
-				do_button_mask_change(mask, butt);	/* down */
+				do_button_mask_change(mask, butt, client);	/* down */
 				mask = 0;
-				do_button_mask_change(mask, butt);	/* up */
+				do_button_mask_change(mask, butt, client);	/* up */
 			}
 			b++;
 		}
@@ -3406,8 +3422,10 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
 		    k ? "" : " *ignored*");
 	}
 
+
 	if ( k != NoSymbol ) {
-		XTestFakeKeyEvent_wr(dpy, k, (Bool) down, CurrentTime);
+               
+ XTestFakeKeyEvent_wr(dpy, cd->kbd_id, k, (Bool) down, CurrentTime);
 		XFlush_wr(dpy);
 	}
 
diff --git a/x11vnc/misc/Makefile.am b/x11vnc/misc/Makefile.am
index e6a50aa..d178438 100644
--- a/x11vnc/misc/Makefile.am
+++ b/x11vnc/misc/Makefile.am
@@ -1,3 +1,13 @@
 SUBDIRS = turbovnc
 DIST_SUBDIRS = turbovnc
+
 EXTRA_DIST=README blockdpy.c dtVncPopup rx11vnc rx11vnc.pl shm_clear ranfb.pl slide.pl vcinject.pl x11vnc_loop Xdummy ultravnc_repeater.pl connect_switch panner.pl desktop.cgi inet6to4 uinput.pl qt_tslib_inject.pl
+
+if HAVE_XI2
+if HAVE_CAIRO
+noinst_PROGRAMS=xi2setcursor
+xi2setcursor_SOURCES=xi2setcursor.c
+xi2setcursor_CFLAGS= @XI2_CFLAGS@ @CAIRO_CFLAGS@ 
+xi2setcursor_LDADD= @X_LIBS@ @XI2_LIBS@ @CAIRO_LIBS@
+endif
+endif
diff --git a/x11vnc/misc/README b/x11vnc/misc/README
index 2ed1dff..e135a6c 100644
--- a/x11vnc/misc/README
+++ b/x11vnc/misc/README
@@ -12,19 +12,19 @@ documentation near the top of the file.
 
 x11vnc -accept scripts: 
 
-   blockdpy.c	try to lock screen if local person knocks monitor out of DPMS
-   dtVncPopup	CDE/dtksh by Stefan Radman to accept connections, lock screen
+   blockdpy.c	  try to lock screen if local person knocks monitor out of DPMS
+   dtVncPopup	  CDE/dtksh by Stefan Radman to accept connections, lock screen
 
 x11vnc launch wrappers:
 
-   rx11vnc	simple ssh/rsh x11vnc launcher.  -S option needs work...
-   rx11vnc.pl	perl script tries to do rx11vnc -S tunnelling better.
+   rx11vnc	  simple ssh/rsh x11vnc launcher.  -S option needs work...
+   rx11vnc.pl	  perl script tries to do rx11vnc -S tunnelling better.
 
 x11vnc -pipeinput/-rawfb utilities:
 
-   vcinject.pl	perl script like LinuxVNC.c, for x11vnc viewing of linux console 
-   slide.pl	amusing example using x11vnc -rawfb for jpeg slideshow. 
-   ranfb.pl	example -rawfb setup:./ranfb.pl to set up a framebuffer.
+   vcinject.pl	  perl script like LinuxVNC.c, for x11vnc viewing of linux console 
+   slide.pl   	  amusing example using x11vnc -rawfb for jpeg slideshow. 
+   ranfb.pl	  example -rawfb setup:./ranfb.pl to set up a framebuffer.
 
    uinput.pl    test perl script for Linux uinput injection.
 
@@ -38,6 +38,10 @@ Misc. scripts:
    Xdummy       An LD_PRELOAD kludge to run the Xorg "dummy" device driver
 		like Xvfb.
 
+   xi2setcursor.c: utility to change the cursor image of a given pointer device
+                into a coloroured and labeled cursor image. Useful with 
+                -afteraccept in multi-pointer setups.
+
    ultravnc_repeater.pl: Unix script to act as UltraVNC repeater proxy.
 
    connect_switch:  Share HTTPS, VNC, SSH, etc. through a single port (e.g. 443)
@@ -48,3 +52,4 @@ Misc. scripts:
                 server.  Also can do port-redirection to internal machines.
 
    inet6to4     ipv6 to ipv4 relay (i.e. until libvncserver supports ipv6)
+
diff --git a/x11vnc/misc/xi2setcursor.c b/x11vnc/misc/xi2setcursor.c
new file mode 100644
index 0000000..ef785be
--- /dev/null
+++ b/x11vnc/misc/xi2setcursor.c
@@ -0,0 +1,641 @@
+/*
+  Based on the unclutter utility by Mark M Martin, mmm@cetia.fr  sep 1992.,
+  this small (quick&dirty) helper program sets the cursor of a given (or the
+  last added) pointer device and afterwards tracks the pointer position and 
+  uses unclutters subwindow trick to always show a labeled cursor, even if the 
+  window the pointer is in specifies another one.
+*/
+
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xproto.h>
+#include <X11/Xcursor/Xcursor.h>
+#include <X11/extensions/XInput2.h> 
+#include <X11/extensions/XInput.h> /* for BadDevice() */
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <regex.h>
+#include <cairo.h> 
+
+
+
+#define CW_SIZE 10 /* width and height of cursor window */
+#define DFLT_SLEEPTIME 50 /* default milliseconds to wait in between pointer queries */
+
+
+char *progname;
+
+char **names = 0;	/* -> argv list of names to avoid */
+char **classes = 0;     /* -> argv list of classes to avoid */
+regex_t *nc_re = 0;     /* regex for list of classes/names to avoid */
+
+Display *display;
+
+int dev = -1; /* device id */
+int numscreens;
+Window *realroot;  /* array of root windows */
+
+/* XI error numbers are dynamically generated, 
+   we have to get the via macros, e.g. BadDevice(display, &my_errorcode)
+*/
+int baddevice_err; 
+
+
+void pexit(char *str)
+{
+  fprintf(stderr,"%s: %s\n",progname,str);
+  exit(EXIT_FAILURE);
+}
+
+
+
+void usage()
+{
+  pexit("usage:\n\
+	-display <display>\n\
+	-dev <device id>	open device with this id instead of last\n\
+                                created pointer\n\
+	-label <label>		cursor label to apply. if none, use device id\n\
+	-sleep		        miliseconds to wait in between cursor updates\n\
+	-color <X11 color>	color of the cursor, given as an X11 color name\n\
+                                if none is given, color depends on device id\n\
+	-onescreen		apply only to given screen of display\n\
+ 	-visible       		ignore visibility events\n\
+ 	-noevents      		don't send pseudo events\n\
+	-regex			name or class below is a regular expression\n\
+	-not names...		don't apply to windows whose wm-name begins.\n\
+				(must be last argument)\n\
+	-notname names...	same as -not names...\n\
+	-notclass classes...    don't apply to windows whose wm-class begins.\n\
+				(must be last argument, cannot be used with\n\
+				-not or -notname)");
+}
+
+
+
+
+
+
+/* Since the small window we create is a child of the window the pointer is
+ * in, it can be destroyed by its adoptive parent.  Hence our destroywindow()
+ * can return an error, saying it no longer exists.  Similarly, the parent
+ * window can disappear while we are trying to create the child. Trap and
+ * ignore these errors.
+ 
+ also, it's possible that the device gets removed while xisetcursor is running,
+ so ignore XI_BadDevice errors as well.
+
+*/
+int (*defaulthandler)();
+
+int errorhandler(Display *display, XErrorEvent *error)
+{
+  if(error->error_code != BadWindow && error->error_code != baddevice_err) 
+    (*defaulthandler)(display,error);
+  return 1;
+}
+
+
+
+/*
+ * return true if window has a wm_name (class) and the start of it matches
+ * one of the given names (classes) to avoid
+ */
+int nameinlist(display,window)
+     Display *display;
+     Window window;
+{
+  char **cpp;
+  char *name = 0;
+
+  if(names)
+    XFetchName (display, window, &name);
+  else if(classes){
+    XClassHint *xch = XAllocClassHint();
+    if(XGetClassHint (display, window, xch))
+      name = strdup(xch->res_class);
+    if(xch)
+      XFree(xch);
+  }else
+    return 0;
+
+  if(name){
+    if(nc_re){
+      if(!regexec(nc_re, name, 0, 0, 0)) {
+	XFree(name);
+	return 1;
+      }
+    }else{
+      for(cpp = names!=0 ? names : classes;*cpp!=0;cpp++){
+	if(strncmp(*cpp,name,strlen(*cpp))==0)
+	  break;
+      }
+      XFree(name);
+      return(*cpp!=0);
+    }
+  }
+  return 0;
+}	
+
+
+void cleanup()
+{
+  int screen;
+  for(screen = 0; screen < numscreens; ++screen)
+    {
+      realroot[screen] = XRootWindow(display,screen);
+      
+      /* finally ... */
+      if(XIUndefineCursor(display, dev, realroot[screen]) != Success)
+	printf("undefine cursor failed\n");  
+
+      XFlush(display);
+    }
+}
+
+
+
+/*
+ * 
+ */
+Cursor createCursor(Display *dpy, int dev, Window root, float r, float g, float b, const char* label)
+{
+  /* label setup */
+  const int idFontSize = 18;
+  const int idXOffset = 11;
+  const int idYOffset = 25;
+  const size_t textsz = 64;
+  char text[textsz];
+  int total_width, total_height;
+  XcursorImage *cursor_image = NULL;
+
+  if(dev < 0)
+    return 0;
+
+
+  if(label)
+    snprintf(text, textsz, "%s", label);
+  else
+    snprintf(text, textsz, "%i", dev);
+ 
+  
+  cairo_surface_t* main_surface;
+  cairo_surface_t* dummy_surface;
+  cairo_surface_t* barecursor_surface;
+  cairo_t* cr;
+
+  
+  /* simple cursor w/o label */
+  barecursor_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 24, 24);
+  cr = cairo_create(barecursor_surface);
+  cairo_move_to (cr, 1, 1);
+  cairo_line_to (cr, 12, 8);
+  cairo_line_to (cr, 5, 15);
+  cairo_close_path (cr);
+  cairo_set_source_rgba(cr, r, g, b, 0.9);
+  cairo_fill_preserve (cr);
+  cairo_set_source_rgba(cr, 0, 0, 0, 0.8);
+  cairo_set_line_width (cr, 0.8);
+  cairo_stroke (cr);
+
+    
+  /* get estimated text extents */
+  cairo_text_extents_t est;
+  dummy_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 500, 10);/* ah well, but should fit */
+  cr = cairo_create(dummy_surface);
+  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+  cairo_set_font_size (cr, idFontSize);
+  cairo_text_extents(cr, text, &est);
+
+  /* an from these calculate our final size */
+  total_width = (int)(idXOffset + est.width + est.x_bearing);	
+  total_height = (int)(idYOffset + est.height + est.y_bearing);	
+
+  /* draw evrything */
+  main_surface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, total_width, total_height );
+  cr = cairo_create(main_surface);
+  cairo_set_source_surface(cr, barecursor_surface, 0, 0);
+  cairo_paint (cr);
+  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+  cairo_set_font_size (cr, idFontSize);
+  cairo_set_source_rgba (cr, r, g, b, 0.8);
+  cairo_move_to(cr, idXOffset, idYOffset);
+  cairo_show_text(cr,text);
+    
+ 
+  /* copy cairo surface to cursor image */
+  cursor_image = XcursorImageCreate(total_width, total_height);
+  /* this is important! otherwise we get badmatch, badcursor xerrrors galore... */
+  cursor_image->xhot = cursor_image->yhot = 0; 
+  memcpy(cursor_image->pixels, cairo_image_surface_get_data (main_surface), sizeof(CARD32) * total_width * total_height);
+ 
+ 
+  Cursor cursor = XcursorImageLoadCursor(dpy, cursor_image);
+  
+
+  /* clean up */
+  XcursorImageDestroy(cursor_image);
+
+  cairo_destroy(cr);
+  cairo_surface_destroy(dummy_surface);
+  cairo_surface_destroy(main_surface);
+  cairo_surface_destroy(barecursor_surface);
+  
+  return cursor;
+}
+
+
+
+
+
+int main(int argc, char** argv)
+{
+  int xi2opcode;
+  int screen;
+  int oldx = -99, oldy=-99, dovisible = 1, doevents = 1, onescreen = 0, dev_wanted = -1;
+  Cursor *cursor;
+  Window root;
+  char *displayname = 0;
+  char *label = 0;
+  int sleeptime = DFLT_SLEEPTIME;
+  XColor color;
+  char* colorspec = 0;
+  XIDeviceInfo* devinfo;
+  int num, ignore;
+
+  
+  /* call exit() on interrupt and termination */
+  struct sigaction action;
+  memset(&action, 0, sizeof(action));
+  action.sa_handler = &exit;
+  sigaction(SIGINT, &action, NULL);
+  sigaction(SIGTERM, &action, NULL);
+  /* this in turn calls cleanup */
+  atexit(cleanup);
+    
+
+  progname = *argv;
+  argc--;
+  while(argv++,argc-->0){
+
+    if(strcmp(*argv,"-noevents")==0){
+      doevents = 0;
+    }else if(strcmp(*argv,"-dev")==0){
+      argc--,argv++;
+      if( argc<0 || atoi(*argv)<0 )
+	usage();
+      dev_wanted = atoi(*argv);}
+    else if(strcmp(*argv,"-onescreen")==0){
+      onescreen = 1;
+    }else if(strcmp(*argv,"-visible")==0){
+      dovisible = 0;
+    }else if(strcmp(*argv,"-regex")==0){
+      nc_re = (regex_t *)malloc(sizeof(regex_t));
+    }else if(strcmp(*argv,"-not")==0 || strcmp(*argv,"-notname")==0){
+      /* take rest of srg list */
+      names = ++argv;
+      if(*names==0)names = 0;	/* no args follow */
+      argc = 0;
+    }else if(strcmp(*argv,"-notclass")==0){
+      /* take rest of arg list */
+      classes = ++argv;
+      if(*classes==0)classes = 0;	/* no args follow */
+      argc = 0;
+    }else if(strcmp(*argv,"-display")==0 || strcmp(*argv,"-d")==0){
+      argc--,argv++;
+      if(argc<0)usage();
+      displayname = *argv;
+    }else if(strcmp(*argv,"-label")==0){
+      argc--,argv++;
+      if(argc<0)usage();
+      label = *argv;
+    }else if(strcmp(*argv,"-sleep")==0){
+      argc--,argv++;
+      if(argc<0)usage();
+      sleeptime = atoi(*argv);
+    }else if(strcmp(*argv,"-color")==0){
+      argc--,argv++;
+      if(argc<0)usage();
+      colorspec = *argv;
+    }else usage();
+  }
+
+ 
+
+  /* compile a regex from the first name or class */
+  if(nc_re){
+    if(names || classes){
+      if (regcomp(nc_re, (names != 0 ? *names : *classes),
+		  REG_EXTENDED | REG_NOSUB)) { /* error */
+	free(nc_re);
+	names = classes = 0;
+	nc_re = 0;
+      }
+    }else{ /* -regex without -not... ... */
+      free(nc_re);
+      nc_re = 0;
+    }
+  }
+
+  display = XOpenDisplay(displayname);
+  if(!display)
+    pexit("could not open display");
+
+
+  if(colorspec)
+    if(! XParseColor(display, DefaultColormap(display, DefaultScreen(display)), colorspec, &color))
+      pexit("could not find color\n");
+
+  /* get error code */
+  BadDevice(display, baddevice_err);
+  
+  /* query XI and XI2 */
+  int major = 2, minor = 0;
+  if(! XQueryExtension (display, "XInputExtension", &xi2opcode, &ignore, &ignore))
+    pexit("No XInput Extension!");
+  
+  if (XIQueryVersion(display, &major, &minor) != Success)
+    pexit("XINPUT 2 not available!\n");
+
+    
+  if(dev_wanted >= 0)/* just look for this device */
+    {
+      devinfo = XIQueryDevice(display, dev_wanted, &num);
+      if(!num)
+	pexit("Unable to find specified device!\n");
+      else
+	dev = dev_wanted;
+    }
+  else /* use the last added pointer dev */
+    {
+      devinfo = XIQueryDevice(display, XIAllMasterDevices, &num);
+      
+      int i;
+      for(i = num-1; i >= 0; --i) 
+        if (devinfo[i].use == XIMasterPointer)
+	  {
+	    dev = devinfo[i].deviceid;
+	    break;
+	  }
+    }  
+  XIFreeDeviceInfo(devinfo);
+  
+
+  printf("%s: using device with id: %i\n", progname, dev);
+
+
+
+  numscreens = ScreenCount(display);
+  cursor = (Cursor*) malloc(numscreens*sizeof(Cursor));
+  realroot = (Window*) malloc(numscreens*sizeof(Window));
+
+  /* each screen needs its own empty cursor.
+   * note each real root id so can find which screen we are on
+   */
+  for(screen = 0;screen<numscreens;screen++)
+    if(onescreen && screen!=DefaultScreen(display))
+      {
+	realroot[screen] = -1;
+	cursor[screen] = -1;
+      }
+    else
+      {
+	realroot[screen] = XRootWindow(display,screen);
+	if(colorspec)
+	  {
+	    float div = 65535; /* XColor stores RBG from 0 to 65535 */
+	    cursor[screen] = createCursor(display, dev, realroot[screen], color.red/div, color.green/div, color.blue/div, label);
+	  }
+	else
+	  cursor[screen] = createCursor(display, dev, realroot[screen], 0.4*(dev%3), 0.2*(dev%5), 1*(dev%2), label);
+	
+	/* finally ... */
+	if(XIDefineCursor(display, dev, realroot[screen], cursor[screen]) != Success)
+	  printf("define cursor failed\n");  
+      }
+  
+  screen = DefaultScreen(display);
+  root = RootWindow(display,screen);
+
+  defaulthandler = XSetErrorHandler(errorhandler);
+
+ 
+
+  /*
+   * create a small unmapped window on a screen just so xdm can use
+   * it as a handle on which to killclient() us.
+   */
+  XCreateWindow(display, realroot[screen], 0,0,1,1, 0, CopyFromParent,
+		InputOutput, CopyFromParent, 0, (XSetWindowAttributes*)0);
+
+ 
+  /*
+    register for device hierarchy changes
+  */
+  XIEventMask mask;
+  unsigned char bits[4] = {0};
+  
+  mask.mask = bits;
+  mask.mask_len = sizeof(bits);
+  mask.deviceid = XIAllDevices;
+  XISetMask(bits, XI_HierarchyChanged);
+  
+  XISelectEvents(display, DefaultRootWindow(display), &mask, 1);
+	
+
+ 
+  while(1)
+    {
+      Window dummywin,windowin,newroot;
+      double rootx,rooty,winx,winy;
+      XIModifierState modifs;
+      XIGroupState group;
+      XIButtonState buttons;
+      Window lastwindowavoided = None;
+	
+      /*
+       * 
+       */
+      while(1)
+	{
+	  if(!XIQueryPointer(display, dev, root, &newroot, &windowin,
+			     &rootx, &rooty, &winx, &winy, &buttons, &modifs, &group))
+	    {
+	      /* window manager with virtual root may have restarted
+	       * or we have changed screens */
+	      if(!onescreen)
+		{
+		  for(screen = 0;screen<numscreens;screen++)
+		    if(newroot==realroot[screen])break;
+		  if(screen>=numscreens)
+		    pexit("not on a known screen");
+		}
+	      root = RootWindow(display,screen);
+
+	      /* somehow the XIChangeHierarchy event below is missed, check here as well if dev still exists */
+	      devinfo = XIQueryDevice(display, dev, &num);
+	      if(!devinfo)
+		{
+		  fprintf(stderr, "device %d gone, ", dev);
+		  pexit("exiting.\n");
+		}
+	      XIFreeDeviceInfo(devinfo);
+	    }
+	  else 
+	    /* check if any bit is set */
+	    if((*(buttons.mask)) || !(rootx == oldx && rooty == oldy))
+	      oldx = rootx, oldy = rooty;
+	  
+	    else 
+	      if(windowin==None)
+		{
+		  windowin = root;
+		  break;
+		}
+	      else 
+		if(windowin!=lastwindowavoided)
+		  {
+		    /* descend tree of windows under cursor to bottommost */
+		    Window childin;
+		    int toavoid = xFalse;
+		    lastwindowavoided = childin = windowin;
+		    do
+		      {
+			windowin = childin;
+			if(nameinlist (display, windowin))
+			  {
+			    toavoid = xTrue;
+			    break;
+			  }
+		      }
+		    while(XIQueryPointer(display, dev, windowin, &dummywin,
+					 &childin, &rootx, &rooty, &winx, &winy, 
+					 &buttons, &modifs, &group)
+			  && childin!=None);
+		    if(!toavoid)
+		      {
+			lastwindowavoided = None;
+			break;
+		      }
+		  }
+
+	  usleep(1000*sleeptime);
+	}
+
+
+      XSetWindowAttributes attributes;
+      XEvent event;
+      Window cursorwindow;
+  	    
+      /* create small input-only window under cursor
+       * as a sub window of the window currently under the cursor
+       */
+      attributes.event_mask = LeaveWindowMask |
+	EnterWindowMask |
+	StructureNotifyMask |
+	FocusChangeMask;
+      if(dovisible)
+	attributes.event_mask |= VisibilityChangeMask;
+      attributes.override_redirect = True;
+      attributes.cursor = cursor[screen];
+
+      cursorwindow = XCreateWindow(display, windowin,
+				   winx - CW_SIZE/2, winy - CW_SIZE/2,
+				   CW_SIZE, CW_SIZE, 0, CopyFromParent,
+				   InputOnly, CopyFromParent, 
+				   CWOverrideRedirect | CWEventMask | CWCursor,
+				   &attributes);
+
+      /* discard old events for previously created windows */
+      XSync(display,True);
+
+
+      XMapWindow(display,cursorwindow);
+      /*
+       * Dont wait for expose/map cos override and inputonly(?).
+       * Check that created window captured the pointer by looking
+       * for inevitable EnterNotify event that must follow MapNotify.
+       * [Bug fix thanks to Charles Hannum <mycroft@ai.mit.edu>]
+       */
+      XSync(display,False);
+      if(!XCheckTypedWindowEvent(display, cursorwindow, EnterNotify,
+				 &event))
+	oldx = -1;	/* slow down retry */
+      else{
+	if(doevents)
+	  {
+	    /*
+	     * send a pseudo EnterNotify event to the parent window
+	     * to try to convince application that we didnt really leave it
+	     */
+	    event.xcrossing.type = EnterNotify;
+	    event.xcrossing.display = display;
+	    event.xcrossing.window = windowin;
+	    event.xcrossing.root = root;
+	    event.xcrossing.subwindow = None;
+	    event.xcrossing.time = CurrentTime;
+	    event.xcrossing.x = winx;
+	    event.xcrossing.y = winy;
+	    event.xcrossing.x_root = rootx;
+	    event.xcrossing.y_root = rooty;
+	    event.xcrossing.mode = NotifyNormal;
+	    event.xcrossing.same_screen = True;
+	    event.xcrossing.focus = True;
+	    /* event.xcrossing.state = modifs; */
+	    (void)XSendEvent(display,windowin,
+			     True/*propagate*/,EnterWindowMask,&event);
+	  }
+
+	/* wait till pointer leaves window */
+	while(1)
+	  {
+	    XNextEvent(display,&event);
+
+	    if (event.xcookie.type == GenericEvent &&
+		event.xcookie.extension == xi2opcode &&
+		XGetEventData(display, &event.xcookie))
+	      {
+		if(event.xcookie.evtype == XI_HierarchyChanged)
+		  {
+		    devinfo = XIQueryDevice(display, dev, &num);
+		    if(!devinfo)
+		      {
+			XDestroyWindow(display, cursorwindow);
+		        fprintf(stderr, "device %d removed, ", dev);
+			pexit("exiting.\n");
+		      }
+		    XIFreeDeviceInfo(devinfo);
+		  }
+	      }
+	    XFreeEventData(display, &event.xcookie);
+	    
+	    
+	    if(event.type==LeaveNotify ||
+	       event.type==FocusOut ||
+	       event.type==UnmapNotify ||
+	       event.type==ConfigureNotify ||
+	       event.type==CirculateNotify ||
+	       event.type==ReparentNotify ||
+	       event.type==DestroyNotify ||
+	       (event.type==VisibilityNotify && event.xvisibility.state!=VisibilityUnobscured)
+	       )
+	      break;
+	  }
+
+	/* check if a second xi2setcursor is running cos they thrash */
+	if(event.type==LeaveNotify &&
+	   event.xcrossing.window==cursorwindow &&
+	   event.xcrossing.detail==NotifyInferior)
+	  {
+	    fprintf(stderr, "xi2setcursor caring for dev %d: someone created a sub-window to my sub-window! taking a nap...\n", dev);
+	    usleep(1000*1000);
+	  }
+	
+      }
+      XDestroyWindow(display, cursorwindow);
+    }
+}
diff --git a/x11vnc/pointer.c b/x11vnc/pointer.c
index f2995c3..7e765f0 100644
--- a/x11vnc/pointer.c
+++ b/x11vnc/pointer.c
@@ -49,19 +49,21 @@ so, delete this exception statement from your version.
 #include "scan.h"
 #include "macosx.h"
 #include "screen.h"
+#include "xi2_devices.h"
+
 
 int pointer_queued_sent = 0;
 
 void initialize_pointer_map(char *pointer_remap);
-void do_button_mask_change(int mask, int button);
+void do_button_mask_change(int mask, int button, rfbClientPtr client);
 void pointer_event(int mask, int x, int y, rfbClientPtr client);
 void initialize_pipeinput(void);
 int check_pipeinput(void);
-void update_x11_pointer_position(int x, int y);
+void update_x11_pointer_position(int x, int y, rfbClientPtr client);
 
 
 static void buttonparse(int from, char **s);
-static void update_x11_pointer_mask(int mask);
+static void update_x11_pointer_mask(int mask, rfbClientPtr client);
 static void pipe_pointer(int mask, int x, int y, rfbClientPtr client);
 
 /*
@@ -335,7 +337,7 @@ void initialize_pointer_map(char *pointer_remap) {
 /*
  * Send a pointer position event to the X server.
  */
-void update_x11_pointer_position(int x, int y) {
+void update_x11_pointer_position(int x, int y, rfbClientPtr client) {
 #if NO_X11
 	RAWFB_RET_VOID
 	if (!x || !y) {}
@@ -343,8 +345,22 @@ void update_x11_pointer_position(int x, int y) {
 #else
 	int rc;
 
+	static int watch_dx_dy = -1;
+	int ptr_id = -1;
+
 	RAWFB_RET_VOID
 
+	if(client)
+	  ptr_id = ((ClientData*)client->clientData)->ptr_id;
+
+	if (watch_dx_dy == -1) {
+		if (getenv("X11VNC_WATCH_DX_DY")) {
+			watch_dx_dy = 1;
+		} else {
+			watch_dx_dy = 0;
+		}
+	}
+
 	X_LOCK;
 	if (!always_inject && cursor_x == x && cursor_y == y) {
 		;
@@ -353,11 +369,14 @@ void update_x11_pointer_position(int x, int y) {
 		 * off_x and off_y not needed with XWarpPointer since
 		 * window is used:
 		 */
-		XWarpPointer(dpy, None, window, 0, 0, 0, 0, x + coff_x,
-		    y + coff_y);
+#ifdef LIBVNCSERVER_HAVE_XI2
+                if(use_multipointer && ptr_id >= 0)
+                  XIWarpPointer(dpy, ptr_id, None, window, 0, 0, 0, 0, x + coff_x, y + coff_y);
+                else
+#endif
+                  XWarpPointer(dpy, None, window, 0, 0, 0, 0, x + coff_x, y + coff_y);
 	} else {
-		XTestFakeMotionEvent_wr(dpy, scr, x + off_x + coff_x,
-		    y + off_y + coff_y, CurrentTime);
+	         XTestFakeMotionEvent_wr(dpy, ptr_id, scr, x + off_x + coff_x, y + off_y + coff_y, CurrentTime);
 	}
 	X_UNLOCK;
 
@@ -369,7 +388,8 @@ void update_x11_pointer_position(int x, int y) {
 	cursor_y = y;
 
 	/* record the x, y position for the rfb screen as well. */
-	cursor_position(x, y);
+	if(!use_multipointer)
+	  cursor_position(x, y, NULL);
 
 	/* change the cursor shape if necessary */
 	rc = set_cursor(x, y, get_which_cursor());
@@ -379,12 +399,21 @@ void update_x11_pointer_position(int x, int y) {
 #endif	/* NO_X11 */
 }
 
-void do_button_mask_change(int mask, int button) {
+void do_button_mask_change(int mask, int button, rfbClientPtr client) {
 #if NO_X11
 	if (!mask || !button) {}
 	return;
 #else
 	int mb, k, i = button-1;
+	int ptr_buttonmask = button_mask;
+	int ptr_id = -1, kbd_id = -1;
+
+	if(client) {
+	  ClientData *cd = (ClientData*)client->clientData;
+	  ptr_buttonmask  = cd->ptr_buttonmask;
+	  ptr_id = cd->ptr_id;
+	  kbd_id = cd->kbd_id;
+	}
 
 	/*
 	 * this expands to any pointer_map button -> keystrokes
@@ -397,6 +426,7 @@ void do_button_mask_change(int mask, int button) {
 			break;
 		}
 
+          
 		if (pointer_map[i+1][k].button) {
 			/* send button up or down */
 
@@ -404,7 +434,7 @@ void do_button_mask_change(int mask, int button) {
 			if ((num_buttons && mb > num_buttons) || mb < 1) {
 				rfbLog("ignoring mouse button out of "
 				    "bounds: %d>%d mask: 0x%x -> 0x%x\n",
-				    mb, num_buttons, button_mask, mask);
+				    mb, num_buttons, ptr_buttonmask, mask);
 				continue;
 			}
 			if (debug_pointer) {
@@ -412,7 +442,7 @@ void do_button_mask_change(int mask, int button) {
 				    " %s (event %d)\n", mb, bmask
 				    ? "down" : "up", k+1);
 			}
-			XTestFakeButtonEvent_wr(dpy, mb, (mask & (1<<i))
+			XTestFakeButtonEvent_wr(dpy, ptr_id, mb, (mask & (1<<i))
 			    ? True : False, CurrentTime);
 		} else {
 			/* send keysym up or down */
@@ -434,11 +464,11 @@ void do_button_mask_change(int mask, int button) {
 				    "%s\n", down, up, str ? str : "null");
 			}
 			if (down) {
-				XTestFakeKeyEvent_wr(dpy, key, True,
+                                    XTestFakeKeyEvent_wr(dpy, kbd_id, key, True,
 				    CurrentTime);
 			}
 			if (up) {
-				XTestFakeKeyEvent_wr(dpy, key, False,
+                                    XTestFakeKeyEvent_wr(dpy, kbd_id, key, False,
 				    CurrentTime);
 			}
 		}
@@ -449,7 +479,7 @@ void do_button_mask_change(int mask, int button) {
 /*
  * Send a pointer button event to the X server.
  */
-static void update_x11_pointer_mask(int mask) {
+static void update_x11_pointer_mask(int mask, rfbClientPtr client) {
 #if NO_X11
 	last_event = last_input = last_pointer_input = time(NULL);
 
@@ -458,12 +488,16 @@ static void update_x11_pointer_mask(int mask) {
 	return;
 #else
 	int snapped = 0, xr_mouse = 1, i;
+	int ptr_buttonmask = button_mask;
 	last_event = last_input = last_pointer_input = time(NULL);
 
 	RAWFB_RET_VOID
 
-	if (mask != button_mask) {
-		last_pointer_click_time = dnow();
+        if(client)  
+	  ptr_buttonmask = ((ClientData*)client->clientData)->ptr_buttonmask;
+
+	if (mask != ptr_buttonmask) {
+	        last_pointer_click_time = dnow();
 	}
 
 	if (nofb) {
@@ -474,7 +508,7 @@ static void update_x11_pointer_mask(int mask) {
 		xr_mouse = 0;
 	} else if (skip_cr_when_scaling("scroll")) {
 		xr_mouse = 0;
-	} else if (xrecord_skip_button(mask, button_mask)) {
+	} else if (xrecord_skip_button(mask, ptr_buttonmask)) {
 		xr_mouse = 0;
 	}
 
@@ -484,7 +518,7 @@ static void update_x11_pointer_mask(int mask) {
 		Window frame = None, mwin = None;
 		int skip = 0;
 
-		if (!button_mask) {
+		if (!ptr_buttonmask) {
 			X_LOCK;
 			if (get_wm_frame_pos(&px, &py, &x, &y, &w, &h,
 			    &frame, &mwin)) {
@@ -535,7 +569,7 @@ if (debug_scroll > 1) fprintf(stderr, "internal scrollbar: %dx%d\n", w, h);
 			xrecord_watch(1, SCR_MOUSE);
 			snapshot_stack_list(0, 0.50);
 			snapped = 1;
-			if (button_mask) {
+			if (ptr_buttonmask) {
 				xrecord_set_by_mouse = 1;
 			} else {
 				update_stack_list();
@@ -544,7 +578,7 @@ if (debug_scroll > 1) fprintf(stderr, "internal scrollbar: %dx%d\n", w, h);
 		}
 	}
 
-	if (mask && !button_mask) {
+	if (mask && !ptr_buttonmask) {
 		/* button down, snapshot the stacking list before flushing */
 		if (wireframe && !wireframe_in_progress &&
 		    strcmp(wireframe_copyrect, "never")) {
@@ -558,12 +592,12 @@ if (debug_scroll > 1) fprintf(stderr, "internal scrollbar: %dx%d\n", w, h);
 
 	/* look for buttons that have be clicked or released: */
 	for (i=0; i < MAX_BUTTONS; i++) {
-	    if ( (button_mask & (1<<i)) != (mask & (1<<i)) ) {
+	    if ( (ptr_buttonmask & (1<<i)) != (mask & (1<<i)) ) {
 		if (debug_pointer) {
 			rfbLog("pointer(): mask change: mask: 0x%x -> "
-			    "0x%x button: %d\n", button_mask, mask,i+1);
+			    "0x%x button: %d\n", ptr_buttonmask, mask,i+1);
 		}
-		do_button_mask_change(mask, i+1);	/* button # is i+1 */
+		do_button_mask_change(mask, i+1, client);	/* button # is i+1 */
 	    }
 	}
 
@@ -575,6 +609,8 @@ if (debug_scroll > 1) fprintf(stderr, "internal scrollbar: %dx%d\n", w, h);
 	 */
 	button_mask_prev = button_mask;
 	button_mask = mask;
+	if(client)
+	  ((ClientData*)client->clientData)->ptr_buttonmask = mask;
 #endif	/* NO_X11 */
 }
 
@@ -617,14 +653,14 @@ static void pipe_pointer(int mask, int x, int y, rfbClientPtr client) {
 	}
 
 	hint[0] = '\0';
-	if (mask == button_mask) {
+	if (mask == cd->ptr_buttonmask) {
 		strcat(hint, "None");
 	} else {
 		int i, old, newb, m = 1, cnt = 0;
 		for (i=0; i<MAX_BUTTONS; i++) {
 			char s[20];
 
-			old = button_mask & m;
+			old = cd->ptr_buttonmask & m;
 			newb = mask & m;
 			m = m << 1;
 
@@ -663,6 +699,14 @@ void pointer_event(int mask, int x, int y, rfbClientPtr client) {
 	allowed_input_t input;
 	int sent = 0, buffer_it = 0;
 	double now;
+	ClientData *cd = NULL;
+        
+	if(client)
+	  cd = (ClientData *) client->clientData;
+	
+	/* needed to allow multiple dragging actions at once */
+        if(client && use_multipointer) 
+          client->screen->pointerClient = NULL;
 
 	if (threads_drop_input) {
 		return;
@@ -731,6 +775,8 @@ void pointer_event(int mask, int x, int y, rfbClientPtr client) {
 				/* raw_fb hack track button state */
 				button_mask_prev = button_mask;
 				button_mask = mask;
+				if(cd)
+				  cd->ptr_buttonmask = mask;
 			}
 			if (!view_only && (input.motion || input.button)) {
 				last_rfb_ptr_injected = dnow();
@@ -802,6 +848,7 @@ void pointer_event(int mask, int x, int y, rfbClientPtr client) {
 		/* storage for the event queue */
 		static int nevents = 0;
 		static int ev[NEV][3];
+		static rfbClientPtr ev_cl[NEV];
 		int i;
 		/* timer things */
 		static double dt = 0.0, tmr = 0.0, maxwait = 0.4;
@@ -843,6 +890,7 @@ void pointer_event(int mask, int x, int y, rfbClientPtr client) {
 				ev[i][0] = mask;
 				ev[i][1] = x;
 				ev[i][2] = y;
+				ev_cl[i] = client;
 				if (! input.button) {
 					ev[i][0] = -1;
 				}
@@ -878,11 +926,11 @@ void pointer_event(int mask, int x, int y, rfbClientPtr client) {
 				    i+1, dnowx());
 			}
 			if (ev[i][1] >= 0) {
-				update_x11_pointer_position(ev[i][1], ev[i][2]);
+				update_x11_pointer_position(ev[i][1], ev[i][2], ev_cl[i]);
 				sent = 1;
 			}
 			if (ev[i][0] >= 0) {
-				update_x11_pointer_mask(ev[i][0]);
+			        update_x11_pointer_mask(ev[i][0], ev_cl[i]);
 				sent = 1;
 			}
 
@@ -920,15 +968,15 @@ void pointer_event(int mask, int x, int y, rfbClientPtr client) {
 
 	/* update the X display with the event: */
 	if (input.motion) {
-		update_x11_pointer_position(x, y);
-		sent = 1;
+	        update_x11_pointer_position(x, y, client);
+                sent = 1;
 	}
 	if (input.button) {
-		if (mask != button_mask) {
+		if (mask != button_mask) {   /*FIXME multipointer?*/
 			button_change_x = cursor_x;
 			button_change_y = cursor_y;
 		}
-		update_x11_pointer_mask(mask);
+ 	        update_x11_pointer_mask(mask, client);
 		sent = 1;
 	}
 
diff --git a/x11vnc/pointer.h b/x11vnc/pointer.h
index 1fe5e0b..ff62474 100644
--- a/x11vnc/pointer.h
+++ b/x11vnc/pointer.h
@@ -38,10 +38,10 @@ so, delete this exception statement from your version.
 extern int pointer_queued_sent;
 
 extern void initialize_pointer_map(char *pointer_remap);
-extern void do_button_mask_change(int mask, int button);
+extern void do_button_mask_change(int mask, int button, rfbClientPtr client);
 extern void pointer_event(int mask, int x, int y, rfbClientPtr client);
 extern int check_pipeinput(void);
 extern void initialize_pipeinput(void);
-extern void update_x11_pointer_position(int x, int y);
+extern void update_x11_pointer_position(int x, int y, rfbClientPtr client);
 
 #endif /* _X11VNC_POINTER_H */
diff --git a/x11vnc/remote.c b/x11vnc/remote.c
index 3e9e5f8..126c636 100644
--- a/x11vnc/remote.c
+++ b/x11vnc/remote.c
@@ -4407,11 +4407,11 @@ char *process_remote_cmd(char *cmd, int stringonly) {
 		} else {
 			X_LOCK;
 			if (down == -1) {
-				XTestFakeKeyEvent_wr(dpy, kc, 1, CurrentTime);
+ 			        XTestFakeKeyEvent_wr(dpy, -1, kc, 1, CurrentTime);
 				usleep(50*1000);
-				XTestFakeKeyEvent_wr(dpy, kc, 0, CurrentTime);
+			        XTestFakeKeyEvent_wr(dpy, -1, kc, 0, CurrentTime);
 			} else {
-				XTestFakeKeyEvent_wr(dpy, kc, down, CurrentTime);
+			        XTestFakeKeyEvent_wr(dpy, -1, kc, down, CurrentTime);
 			}
 			XFlush_wr(dpy);
 			X_UNLOCK;
@@ -4480,7 +4480,7 @@ char *process_remote_cmd(char *cmd, int stringonly) {
 		if (sscanf(p, "%d,%d", &mb, &down) == 2) {
 			X_LOCK;
 			rfbLog("remote_cmd: XTestFakeButtonEvent(mb=%d, down=%d)\n", mb, down);
-			XTestFakeButtonEvent_wr(dpy, mb, down ? True : False, CurrentTime);
+			XTestFakeButtonEvent_wr(dpy, -1, mb, down ? True : False, CurrentTime);
 			XFlush_wr(dpy);
 			X_UNLOCK;
 		}
diff --git a/x11vnc/screen.c b/x11vnc/screen.c
index d0851f6..19e3553 100644
--- a/x11vnc/screen.c
+++ b/x11vnc/screen.c
@@ -61,6 +61,7 @@ so, delete this exception statement from your version.
 #include "xrandr.h"
 #include "xrecord.h"
 #include "pm.h"
+#include "xi2_devices.h"
 
 #include <rfb/rfbclient.h>
 
@@ -92,6 +93,7 @@ rfbBool vnc_reflect_send_cuttext(char *str, int len);
 static void debug_colormap(XImage *fb);
 static void set_visual(char *str);
 static void nofb_hook(rfbClientPtr cl);
+static void multicursor_hook(rfbClientPtr cl);
 static void remove_fake_fb(void);
 static void install_fake_fb(int w, int h, int bpp);
 static void initialize_snap_fb(void);
@@ -786,6 +788,63 @@ static void nofb_hook(rfbClientPtr cl) {
 	screen->displayHook = NULL;
 }
 
+
+/*
+  hook to draw and restore cursors when in threaded mode.
+*/
+static void multicursor_hook(rfbClientPtr client)
+{
+  ClientData* cd = (ClientData*)client->clientData;
+  rfbClientIteratorPtr iter;
+  rfbClientPtr cl;
+
+  if(! cd->cursor_drawn) {
+     /* disable cursor shape/position updates for this client */
+    if (client->enableCursorShapeUpdates) {
+      cd->had_cursor_shape_updates = 1;
+      client->enableCursorShapeUpdates = FALSE;
+      if (debug_pointer) 
+	rfbLog("%s disable HCSU\n", client->host);
+    }
+    if (client->enableCursorPosUpdates) {
+      cd->had_cursor_pos_updates = 1;
+      client->enableCursorPosUpdates = FALSE;
+      if (debug_pointer) 
+	rfbLog("%s disable HCPU\n", client->host);
+    }
+    client->cursorWasChanged = FALSE;
+
+    /* we use this to make sure positions are not changed */
+    INPUT_LOCK;
+
+    /* save fb */
+    iter = rfbGetClientIterator(screen);
+    while( (cl = rfbClientIteratorNext(iter)) ) 
+      save_under_cursor_buffer(cl);
+    rfbReleaseClientIterator(iter);
+
+    /* draw all cursors into fb after saving all */
+    iter = rfbGetClientIterator(screen);
+    while( (cl = rfbClientIteratorNext(iter)) ) 
+      draw_cursor(cl);
+    rfbReleaseClientIterator(iter);
+
+    cd->cursor_drawn = TRUE;
+  }
+  else {
+    /* restore fb */
+    iter = rfbGetClientIterator(screen);
+    while( (cl = rfbClientIteratorNext(iter)) ) 
+      restore_under_cursor_buffer(cl);
+    rfbReleaseClientIterator(iter);
+
+    INPUT_UNLOCK;
+  
+    cd->cursor_drawn = FALSE;
+  }
+}
+
+
 void free_old_fb(void) {
 	char *fbs[16];
 	int i, j, nfb = 0, db = 0; 
@@ -1286,7 +1345,7 @@ rfbBool vnc_reflect_cursor_pos(rfbClient *cl, int x, int y) {
 		return TRUE; /* some clients initializing, cannot send */ 
 	}
 
-	cursor_position(x, y);
+	cursor_position(x, y, NULL);
 	set_cursor(x, y, get_which_cursor());
 
 	return TRUE;
@@ -1584,7 +1643,7 @@ rfbBool vnc_reflect_send_pointer(int x, int y, int mask) {
 	cursor_y = y;
 
 	/* record the x, y position for the rfb screen as well. */
-	cursor_position(x, y);
+	cursor_position(x, y, NULL);
 
 	/* change the cursor shape if necessary */
 	rc = set_cursor(x, y, get_which_cursor());
@@ -2664,19 +2723,19 @@ if (0) fprintf(stderr, "DefaultDepth: %d  visial_id: %d\n", depth, (int) visual_
 
 		if (subwin_x + wdpy_x > disp_x) {
 			shift = 1;
-			subwin_x = disp_x - wdpy_x - 3;
+			subwin_x = off_x = disp_x - wdpy_x - 3;
 		}
 		if (subwin_y + wdpy_y > disp_y) {
 			shift = 1;
-			subwin_y = disp_y - wdpy_y - 3;
+			subwin_y = off_y = disp_y - wdpy_y - 3;
 		}
 		if (subwin_x < 0) {
 			shift = 1;
-			subwin_x = 1;
+			subwin_x = off_x = 1;
 		}
 		if (subwin_y < 0) {
 			shift = 1;
-			subwin_y = 1;
+			subwin_y = off_y = 1;
 		}
 
 		if (resize) {
@@ -3546,6 +3605,16 @@ void initialize_screen(int *argc, char **argv, XImage *fb) {
 		cmap8to24_fb = NULL;
 		rot_fb = NULL;
 
+		if (use_multipointer) {
+		  /* needed to allow multiple dragging actions at once */
+		  screen->deferPtrUpdateTime = 0; 
+		  /* this draws cursors into the framebuffer */
+		  if(use_threads) {
+		    screen->displayHook = multicursor_hook;
+		    screen->displayFinishedHook = multicursor_hook;
+		  }
+		}
+
 		if (cmap8to24) {
 			int n = main_bytes_per_line * fb->height;
 			if (depth <= 8) {
diff --git a/x11vnc/uinput.c b/x11vnc/uinput.c
index 92bd1d8..ac0324f 100644
--- a/x11vnc/uinput.c
+++ b/x11vnc/uinput.c
@@ -994,6 +994,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) {
 	int do_reset, reset_lower_right = 1;
 	double now;
 	static int first = 1;
+	ClientData *cd = (ClientData *) client->clientData;
 
 	if (first) {
 		if (getenv("RESET_ALWAYS")) {
@@ -1155,7 +1156,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) {
 		fprintf(stderr, "mask:        %s\n", bitprint(mask, 16));
 		fprintf(stderr, "bmask:       %s\n", bitprint(bmask, 16));
 		fprintf(stderr, "last_mask:   %s\n", bitprint(last_mask, 16));
-		fprintf(stderr, "button_mask: %s\n", bitprint(button_mask, 16));
+		fprintf(stderr, "button_mask: %s\n", bitprint(cd->ptr_buttonmask, 16));
 	}
 
 	if (uinput_touchscreen) {
diff --git a/x11vnc/util.c b/x11vnc/util.c
index 80b1607..aaf8269 100644
--- a/x11vnc/util.c
+++ b/x11vnc/util.c
@@ -37,6 +37,8 @@ so, delete this exception statement from your version.
 #include "win_utils.h"
 #include "unixpw.h"
 #include "connections.h"
+#include "cursor.h"
+#include "xi2_devices.h"
 
 struct timeval _mysleep;
 
@@ -578,10 +580,32 @@ int rfbPE(long usec) {
 	}
 	if (! use_threads) {
 		rfbBool r;
+		rfbClientIteratorPtr iter;
+		rfbClientPtr cl;
+
+		if(use_multipointer) {
+		  iter = rfbGetClientIterator(screen);
+		  while( (cl = rfbClientIteratorNext(iter)) )
+		    save_under_cursor_buffer(cl);
+		  rfbReleaseClientIterator(iter);
+
+		  iter = rfbGetClientIterator(screen);
+		  while( (cl = rfbClientIteratorNext(iter)) )
+		    draw_cursor(cl);
+		  rfbReleaseClientIterator(iter);
+		}
+
 		r = rfbProcessEvents(screen, usec);
 		if (r) {
 			res = 1;
 		}
+
+		if(use_multipointer) {
+		  iter = rfbGetClientIterator(screen);
+		  while( (cl = rfbClientIteratorNext(iter)) )
+		    restore_under_cursor_buffer(cl);
+		  rfbReleaseClientIterator(iter);
+		}
 	}
 
  	if (unixpw && unixpw_in_progress && !uip0) {
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index 64a73de..1c09ffc 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -161,6 +161,7 @@
 #include "selection.h"
 #include "pm.h"
 #include "solid.h"
+#include "xi2_devices.h"
 
 /*
  * main routine for the x11vnc program
@@ -1609,6 +1610,9 @@ static void print_settings(int try_http, int bg, char *gui_str) {
 	fprintf(stderr, " xdamage:    %d\n", use_xdamage);
 	fprintf(stderr, "  xd_area:   %d\n", xdamage_max_area);
 	fprintf(stderr, "  xd_mem:    %.3f\n", xdamage_memory);
+#ifdef LIBVNCSERVER_HAVE_XI2
+	fprintf(stderr, " multiptr:   %d\n", use_multipointer);
+#endif
 	fprintf(stderr, " sigpipe:    %s\n", sigpipe
 	    ? sigpipe : "null");
 	fprintf(stderr, " threads:    %d\n", use_threads);
@@ -3786,6 +3790,12 @@ int main(int argc, char* argv[]) {
 			}
 			continue;
 		}
+#ifdef LIBVNCSERVER_HAVE_XI2
+                if (!strcmp(arg, "-multiptr")) {
+                        use_multipointer++;
+			continue;
+		}
+#endif
 		if (!strcmp(arg, "-sigpipe") || !strcmp(arg, "-sig")) {
 			CHECK_ARGC
 			if (known_sigpipe_mode(argv[++i])) {
@@ -5283,6 +5293,16 @@ int main(int argc, char* argv[]) {
 		use_xfixes = 0;
 	}
 
+        if(use_multipointer)
+          {
+	    /* XFixesGetCursorImage() gets confused with multiple pointers and crashes */
+            use_xfixes = 0;
+            rfbLog("Disabled XFIXES while using multiple pointer support.\n");
+            /* disable these as most clients expect only a single cursor */
+            cursor_shape_updates = 0;
+            rfbLog("Drawing cursors into framebuffer while using multiple pointer support.\n");
+          }
+
 #if LIBVNCSERVER_HAVE_LIBXDAMAGE
 	if (! XDamageQueryExtension(dpy, &xdamage_base_event_type, &er)) {
 		if (! quiet && ! raw_fb_str) {
@@ -5466,6 +5486,29 @@ int main(int argc, char* argv[]) {
 
 	initialize_xrecord();
 
+#ifdef LIBVNCSERVER_HAVE_XI2
+	/* check for Xinput 2 */
+        maj = 2;
+        min = 0;
+	if (! XInputQueryVersion_wr(dpy, &maj, &min)) {
+		xinput2_present = 0;
+		if (! quiet) {
+			rfbLog("\n");
+			rfbLog("Xinput2 support was not found on this display.\n");
+			rfbLog("Multi pointer support will not be available.\n");
+                        rfbLog("\n");
+		}
+	} else {
+		xinput2_present = 1;
+		/* set the virtual core pointer (id 2) as client pointer so 
+		   that ambigious calls like XQueryPointer() get this one */
+		XISetClientPointer(dpy, None, 2);
+	}
+        
+        if(!xinput2_present)
+          use_multipointer = 0;
+#endif
+
 	tmpi = 1;
 	if (scroll_copyrect) {
 		if (strstr(scroll_copyrect, "never")) {
@@ -5725,29 +5768,29 @@ int main(int argc, char* argv[]) {
 					k = XKeysymToKeycode(dpy, sym);
 					if (isupper(c)) {
 						k2 = XKeysymToKeycode(dpy, XK_Shift_L);
-						XTestFakeKeyEvent_wr(dpy, k2, True, CurrentTime);
+						XTestFakeKeyEvent_wr(dpy, -1, k2, True, CurrentTime);
 						XFlush_wr(dpy);
 						usleep(100*1000);
 					}
 					if (0) fprintf(stderr, "C/k %c/%x\n", c, k);
-					XTestFakeKeyEvent_wr(dpy, k, True, CurrentTime);
+					XTestFakeKeyEvent_wr(dpy, -1, k, True, CurrentTime);
 					XFlush_wr(dpy);
 					usleep(100*1000);
-					XTestFakeKeyEvent_wr(dpy, k, False, CurrentTime);
+					XTestFakeKeyEvent_wr(dpy, -1, k, False, CurrentTime);
 					XFlush_wr(dpy);
 					usleep(100*1000);
 					if (isupper(c)) {
 						k2 = XKeysymToKeycode(dpy, XK_Shift_L);
-						XTestFakeKeyEvent_wr(dpy, k2, False, CurrentTime);
+						XTestFakeKeyEvent_wr(dpy, -1, k2, False, CurrentTime);
 						XFlush_wr(dpy);
 						usleep(100*1000);
 					}
 				}
 				k2 = XKeysymToKeycode(dpy, XK_Tab);
-				XTestFakeKeyEvent_wr(dpy, k2, True, CurrentTime);
+				XTestFakeKeyEvent_wr(dpy, -1, k2, True, CurrentTime);
 				XFlush_wr(dpy);
 				usleep(100*1000);
-				XTestFakeKeyEvent_wr(dpy, k2, False, CurrentTime);
+				XTestFakeKeyEvent_wr(dpy, -1, k2, False, CurrentTime);
 				XFlush_wr(dpy);
 				usleep(100*1000);
 			}
diff --git a/x11vnc/x11vnc.h b/x11vnc/x11vnc.h
index 015531d..37ee073 100644
--- a/x11vnc/x11vnc.h
+++ b/x11vnc/x11vnc.h
@@ -302,6 +302,11 @@ so, delete this exception statement from your version.
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
+#ifdef LIBVNCSERVER_HAVE_X11_EXTENSIONS_SHMPROTO_H
+/* XShm.h was split into several headers as of xextproto 7.1.0 */
+#include <X11/Xmd.h>
+#include <X11/extensions/shmproto.h>
+#endif
 #endif
 #if LIBVNCSERVER_HAVE_SHMAT
 #include <sys/ipc.h>
@@ -687,6 +692,16 @@ typedef struct _ClientData {
 	int cmp_bytes_sent;
 	int raw_bytes_sent;
 
+        int ptr_id; /* pointer and keyboard device ids used in multipointer mode */ 
+        int kbd_id;
+        int ptr_buttonmask;
+        int cursor_x; /* these are used in multipointer mode to draw  */
+        int cursor_y; /* client cursors directly into the framebuffer */
+        rfbCursorPtr cursor;
+        char* under_cursor_buffer;
+        int under_cursor_buffer_len;
+        sraRegionPtr cursor_region;
+        rfbBool cursor_drawn;
 } ClientData;
 
 extern void nox11_exit(int rc);
diff --git a/x11vnc/xevents.c b/x11vnc/xevents.c
index 72b6515..cf0eda7 100644
--- a/x11vnc/xevents.c
+++ b/x11vnc/xevents.c
@@ -554,35 +554,35 @@ static void bust_grab(int reset) {
 		/* try button press+release */
 		fprintf(stderr, "**bust_grab: button%d  %.4f\n",
 		    button, dnowx());
-		XTestFakeButtonEvent_wr(dpy, button, True, CurrentTime);
+		XTestFakeButtonEvent_wr(dpy, -1, button, True, CurrentTime);
 		XFlush_wr(dpy);
 		usleep(50 * 1000);
-		XTestFakeButtonEvent_wr(dpy, button, False, CurrentTime);
+		XTestFakeButtonEvent_wr(dpy, -1, button, False, CurrentTime);
 	} else if (x > 0) {
 		/* try button motion*/
 		int scr = DefaultScreen(dpy);
 
 		fprintf(stderr, "**bust_grab: x=%d y=%d  %.4f\n", x, y,
 		    dnowx());
-		XTestFakeMotionEvent_wr(dpy, scr, x, y, CurrentTime);
+		XTestFakeMotionEvent_wr(dpy, -1, scr, x, y, CurrentTime);
 		XFlush_wr(dpy);
 		usleep(50 * 1000);
 
 		/* followed by button press */
 		button = 1;
 		fprintf(stderr, "**bust_grab: button%d\n", button);
-		XTestFakeButtonEvent_wr(dpy, button, True, CurrentTime);
+		XTestFakeButtonEvent_wr(dpy, -1, button, True, CurrentTime);
 		XFlush_wr(dpy);
 		usleep(50 * 1000);
-		XTestFakeButtonEvent_wr(dpy, button, False, CurrentTime);
+		XTestFakeButtonEvent_wr(dpy, -1, button, False, CurrentTime);
 	} else {
 		/* try Escape or Space press+release */
 		fprintf(stderr, "**bust_grab: keycode: %d  %.4f\n",
 		    (int) key, dnowx());
-		XTestFakeKeyEvent_wr(dpy, key, True, CurrentTime);
+		XTestFakeKeyEvent_wr(dpy, -1, key, True, CurrentTime);
 		XFlush_wr(dpy);
 		usleep(50 * 1000);
-		XTestFakeKeyEvent_wr(dpy, key, False, CurrentTime);
+		XTestFakeKeyEvent_wr(dpy, -1, key, False, CurrentTime);
 	}
 	XFlush_wr(dpy);
 	last_bust = time(NULL);
@@ -1900,8 +1900,8 @@ void set_single_window(rfbClientPtr cl, int x, int y) {
 		Window r, c;
 		int rootx, rooty, wx, wy;
 		unsigned int mask;
-
-		update_x11_pointer_position(x, y);
+	
+		update_x11_pointer_position(x, y, cl);
 		XSync(dpy, False);
 
 		if (XQueryPointer_wr(dpy, rootwin, &r, &c, &rootx, &rooty,
diff --git a/x11vnc/xi2_devices.c b/x11vnc/xi2_devices.c
new file mode 100644
index 0000000..862bf66
--- /dev/null
+++ b/x11vnc/xi2_devices.c
@@ -0,0 +1,293 @@
+/*
+  XInput2 device handling routines for x11vnc.  
+
+  Copyright (C) 2009-2010 Christian Beier <dontmind@freeshell.org>
+  All rights reserved.
+
+  This file is part of x11vnc.
+
+  x11vnc is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at
+  your option) any later version.
+
+  x11vnc is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with x11vnc; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+  or see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string.h>
+#include <X11/Xproto.h> 
+#include <X11/keysym.h> 
+
+#include "x11vnc.h" 
+#include "cursor.h"
+#include "cleanup.h"
+#include "xi2_devices.h" 
+
+#ifdef LIBVNCSERVER_HAVE_LIBXCURSOR
+#include <X11/Xcursor/Xcursor.h> 
+#ifdef LIBVNCSERVER_HAVE_CAIRO
+#include <cairo.h>
+#endif
+#endif
+
+
+/* does the X version we're running on support XI2? */
+int xinput2_present;
+int use_multipointer;
+int xi2_device_creation_in_progress;
+
+
+/*
+  create MD with given name
+  returns device id, -1 on error
+*/
+int createMD(Display* dpy, char* name)
+{
+#ifndef LIBVNCSERVER_HAVE_XI2
+  return 0;
+#else
+  int dev_id = -1;
+  XErrorHandler old_handler;
+  XIAddMasterInfo c;
+  XIDeviceInfo	*devinfo;
+  int		num_devices, i;
+  char handle[256]; /* device name */
+  snprintf(handle, 256, "%s pointer", name);
+
+  c.type = XIAddMaster;
+  c.name = name;
+  c.send_core = 1;
+  c.enable = 1;
+
+  X_LOCK;
+
+  trapped_xerror = 0;
+  old_handler = XSetErrorHandler(trap_xerror);
+	
+  XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
+  XSync(dpy, False);
+
+  if(trapped_xerror) {
+    XSetErrorHandler(old_handler);
+    trapped_xerror = 0;
+    X_UNLOCK;
+    return -1;
+  }
+
+  XSetErrorHandler(old_handler);
+  trapped_xerror = 0;
+
+  /* find newly created dev by name
+     FIXME: better wait for XIHierarchy event here? */
+  devinfo = XIQueryDevice(dpy, XIAllMasterDevices, &num_devices);
+  for(i = num_devices-1; i >= 0; --i) 
+    if(strcmp(devinfo[i].name, handle) == 0)
+      {
+	dev_id = devinfo[i].deviceid;
+	break;
+      }
+ 
+  XIFreeDeviceInfo(devinfo);
+
+  X_UNLOCK;
+
+  return dev_id;
+#endif
+}
+
+
+
+/*
+  remove device 
+  return 1 on success, 0 on failure
+*/
+int removeMD(Display* dpy, int dev_id)
+{
+#ifndef LIBVNCSERVER_HAVE_XI2
+  return 0;
+#else
+  int found = 0, res = 0;
+  XIDeviceInfo	*devinfo;
+  int		num_devices, i;
+
+  if(dev_id < 0)
+    return 0;
+
+  X_LOCK;
+
+  /* see if this device exists */
+  devinfo = XIQueryDevice(dpy, XIAllMasterDevices, &num_devices);
+  for(i = 0; i < num_devices; ++i)
+    if(devinfo[i].deviceid == dev_id)
+      found = 1;
+  XIFreeDeviceInfo(devinfo);
+
+  if(found) {
+    XIRemoveMasterInfo r;
+
+    r.type = XIRemoveMaster;
+    r.deviceid = dev_id;
+    r.return_mode = XIFloating;
+
+    res = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&r, 1) == Success ? 1 : 0;
+    XSync(dpy, False);
+  }
+
+  X_UNLOCK;
+
+  return res;
+#endif
+}
+
+
+
+
+
+int getPairedMD(Display* dpy, int dev_id)
+{
+#ifndef LIBVNCSERVER_HAVE_XI2
+  return 0;
+#else
+  int paired = -1;
+  XIDeviceInfo* devinfo;
+  int devicecount = 0;
+
+  if(dev_id < 0)
+    return paired;
+
+  X_LOCK;
+
+  devinfo = XIQueryDevice(dpy, dev_id, &devicecount);
+  if(devicecount)
+    paired = devinfo->attachment;
+  XIFreeDeviceInfo(devinfo);
+
+  X_UNLOCK;
+
+  return paired;
+#endif
+}
+
+
+
+
+
+
+/*
+  set cursor of pointer dev.
+  returns the cursor shape as an rfbCursorPtr
+*/
+rfbCursorPtr setClientCursor(Display *dpy, int dev_id, float r, float g, float b, char *label)
+{
+#ifndef LIBVNCSERVER_HAVE_LIBXCURSOR
+  return NULL;
+#else
+#ifndef LIBVNCSERVER_HAVE_CAIRO
+  return NULL;
+#else
+
+  /* label setup */
+  const int idFontSize = 18;
+  const int idXOffset = 11;
+  const int idYOffset = 25;
+  const size_t textsz = 64;
+  char text[textsz];
+  int total_width, total_height;
+  cairo_surface_t* main_surface;
+  cairo_surface_t* dummy_surface;
+  cairo_surface_t* barecursor_surface;
+  cairo_t* cr;
+  cairo_text_extents_t est;
+  Cursor cursor;
+  XcursorImage *cursor_image = NULL;
+  rfbCursorPtr rfbcursor = NULL;
+
+  if(dev_id < 0)
+    return NULL;
+
+  if(label)
+    snprintf(text, textsz, "%s", label);
+  else
+    snprintf(text, textsz, "%i", (int) dev_id);
+ 
+  /* simple cursor w/o label */
+  barecursor_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 24, 24);
+  cr = cairo_create(barecursor_surface);
+  cairo_move_to (cr, 1, 1);
+  cairo_line_to (cr, 12, 8);
+  cairo_line_to (cr, 5, 15);
+  cairo_close_path (cr);
+  cairo_set_source_rgba(cr, r, g, b, 0.9);
+  cairo_fill_preserve (cr);
+  cairo_set_source_rgba(cr, 0, 0, 0, 0.8);
+  cairo_set_line_width (cr, 0.8);
+  cairo_stroke (cr);
+
+    
+  /* get estimated text extents */
+  dummy_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 500, 10);/* ah well, but should fit */
+  cr = cairo_create(dummy_surface);
+  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+  cairo_set_font_size (cr, idFontSize);
+  cairo_text_extents(cr, text, &est);
+
+  /* an from these calculate our final size */
+  total_width = (int)(idXOffset + est.width + est.x_bearing);	
+  total_height = (int)(idYOffset + est.height + est.y_bearing);	
+
+  /* draw evrything */
+  main_surface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, total_width, total_height );
+  cr = cairo_create(main_surface);
+  cairo_set_source_surface(cr, barecursor_surface, 0, 0);
+  cairo_paint (cr);
+  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+  cairo_set_font_size (cr, idFontSize);
+  cairo_set_source_rgba (cr, r, g, b, 0.8);
+  cairo_move_to(cr, idXOffset, idYOffset);
+  cairo_show_text(cr,text);
+    
+  X_LOCK;
+  /* copy cairo surface to cursor image */
+  cursor_image = XcursorImageCreate(total_width, total_height);
+  /* this is important! otherwise we get badmatch, badcursor xerrrors galore... */
+  cursor_image->xhot = cursor_image->yhot = 0; 
+  memcpy(cursor_image->pixels, cairo_image_surface_get_data (main_surface), sizeof(CARD32) * total_width * total_height);
+  X_UNLOCK;
+
+  /* convert to rfb cursor which we return later */
+  rfbcursor = pixels2curs((unsigned long*)cursor_image->pixels,
+			  cursor_image->width,
+			  cursor_image->height,
+			  cursor_image->xhot,
+			  cursor_image->yhot,
+			  bpp/8);
+  
+  X_LOCK;
+
+  /* and display  */
+  cursor = XcursorImageLoadCursor(dpy, cursor_image);
+  XIDefineCursor(dpy, dev_id, RootWindow(dpy, DefaultScreen(dpy)), cursor);
+  XFreeCursor(dpy, cursor);
+
+  /* clean up */
+  cairo_destroy(cr);
+  cairo_surface_destroy(dummy_surface);
+  cairo_surface_destroy(main_surface);
+  cairo_surface_destroy(barecursor_surface);
+  XcursorImageDestroy(cursor_image);
+
+  X_UNLOCK;
+
+  return rfbcursor;
+#endif
+#endif
+}
+
diff --git a/x11vnc/xi2_devices.h b/x11vnc/xi2_devices.h
new file mode 100644
index 0000000..eda1cf7
--- /dev/null
+++ b/x11vnc/xi2_devices.h
@@ -0,0 +1,62 @@
+/*
+  XInput2 device handling routines for x11vnc.  
+
+  Copyright (C) 2009-2010 Christian Beier <dontmind@freeshell.org>
+  All rights reserved.
+
+  This file is part of x11vnc.
+
+  x11vnc is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at
+  your option) any later version.
+
+  x11vnc is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with x11vnc; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+  or see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _X11VNC_XI2_DEVICES
+#define _X11VNC_XI2_DEVICES
+
+#ifdef LIBVNCSERVER_HAVE_XI2
+#include <X11/extensions/XInput2.h> 
+#endif
+
+extern int xinput2_present;
+extern int use_multipointer;
+extern int xi2_device_creation_in_progress;
+
+
+/*
+  create xi2 master device with given name
+  returns device_id, -1 on error
+*/
+extern int createMD(Display* dpy, char* name);
+
+/*
+  remove master device 
+  returns 1 on success, 0 on failure
+*/
+extern int removeMD(Display* dpy, int dev_id);
+
+/*
+  gets the paired pointer/keyboard id to dev_id
+  returns -1 on error
+*/
+extern int getPairedMD(Display* dpy, int dev_id);
+
+
+/* 
+   set cursor of pointer dev
+*/
+extern rfbCursorPtr setClientCursor(Display *dpy, int dev_id, float r, float g, float b, char *label);
+
+
+#endif /* _X11VNC_XI2_DEVICES */
diff --git a/x11vnc/xwrappers.c b/x11vnc/xwrappers.c
index e7158cf..814c54b 100644
--- a/x11vnc/xwrappers.c
+++ b/x11vnc/xwrappers.c
@@ -39,6 +39,8 @@ so, delete this exception statement from your version.
 #include "connections.h"
 #include "cleanup.h"
 #include "macosx.h"
+#include "xi2_devices.h"
+
 
 int xshm_present = 0;
 int xshm_opcode = 0;
@@ -83,15 +85,15 @@ void init_track_keycode_state(void);
 
 void XTRAP_FakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
     unsigned long delay);
-void XTestFakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
+void XTestFakeKeyEvent_wr(Display* dpy, int dev_id, KeyCode key, Bool down,
     unsigned long delay);
 void XTRAP_FakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
     unsigned long delay);
-void XTestFakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
+void XTestFakeButtonEvent_wr(Display* dpy, int dev_id, unsigned int button, Bool is_press,
     unsigned long delay);
 void XTRAP_FakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
     unsigned long delay);
-void XTestFakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
+void XTestFakeMotionEvent_wr(Display* dpy, int dev_id, int screen, int x, int y,
     unsigned long delay);
 
 Bool XTestCompareCurrentCursorWithWindow_wr(Display* dpy, Window w);
@@ -894,7 +896,7 @@ void XTRAP_FakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
 #endif	/* NO_X11 */
 }
 
-void XTestFakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
+void XTestFakeKeyEvent_wr(Display* dpy, int dev_id, KeyCode key, Bool down,
     unsigned long delay) {
 	static int first = 1;
 	int regrab = 0;
@@ -947,7 +949,17 @@ void XTestFakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
 		    key, down, dnowx());	
 	}
 #if LIBVNCSERVER_HAVE_XTEST
-	XTestFakeKeyEvent(dpy, key, down, delay);
+#ifdef LIBVNCSERVER_HAVE_XI2
+        if(use_multipointer && dev_id >= 0)
+          {
+	    XDevice xdev;
+	    xdev.device_id = dev_id;
+	    XTestFakeDeviceKeyEvent(dpy, &xdev, key, down, NULL, 0, delay);
+	  }
+        else
+#endif
+          XTestFakeKeyEvent(dpy, key, down, delay);
+
 	if (regrab) {
 		adjust_grabs(1, 1);
 	}
@@ -987,7 +999,7 @@ void XTRAP_FakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
 #endif	/* NO_X11 */
 }
 
-void XTestFakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
+void XTestFakeButtonEvent_wr(Display* dpy, int dev_id, unsigned int button, Bool is_press,
     unsigned long delay) {
 	int regrab = 0;
 
@@ -1024,7 +1036,16 @@ void XTestFakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
 		    button, is_press, dnowx());	
 	}
 #if LIBVNCSERVER_HAVE_XTEST
-    	XTestFakeButtonEvent(dpy, button, is_press, delay);
+#ifdef LIBVNCSERVER_HAVE_XI2
+        if(use_multipointer && dev_id >= 0)
+          {
+	    XDevice xdev;
+	    xdev.device_id = dev_id;
+	    XTestFakeDeviceButtonEvent(dpy, &xdev, button, is_press, NULL, 0, delay);
+	  }
+        else
+#endif
+          XTestFakeButtonEvent(dpy, button, is_press, delay);
 #endif
 	if (regrab) {
 		adjust_grabs(1, 1);
@@ -1058,7 +1079,7 @@ void XTRAP_FakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
 #endif	/* NO_X11 */
 }
 
-void XTestFakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
+void XTestFakeMotionEvent_wr(Display* dpy, int dev_id, int screen, int x, int y,
     unsigned long delay) {
 	int regrab = 0;
 
@@ -1091,7 +1112,17 @@ void XTestFakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
 		    x, y, dnowx());	
 	}
 #if LIBVNCSERVER_HAVE_XTEST
-	XTestFakeMotionEvent(dpy, screen, x, y, delay);
+#ifdef LIBVNCSERVER_HAVE_XI2
+        if(use_multipointer && dev_id >= 0)
+          {
+            int axes[] = {x, y};
+	    XDevice xdev;
+	    xdev.device_id = dev_id;
+            XTestFakeDeviceMotionEvent(dpy, &xdev, 0, 0, axes, 2, delay);
+          }
+        else
+#endif
+          XTestFakeMotionEvent(dpy, screen, x, y, delay);
 #endif
 	if (regrab) {
 		adjust_grabs(1, 1);
@@ -1285,6 +1316,28 @@ Bool XRecordQueryVersion_wr(Display *dpy, int *maj, int *min) {
 #endif
 }
 
+Bool XInputQueryVersion_wr(Display *dpy, int *maj, int *min) {
+	RAWFB_RET(False)
+#if NO_X11
+	rfbLog("This x11vnc was built without X11 support (-rawfb only).\n");
+	if (!display_name || !d || !db) {}
+	return NULL;
+#else
+	int ignore;
+	if(! XQueryExtension (dpy, "XInputExtension", &ignore, &ignore, &ignore))
+	  return False;
+#ifdef LIBVNCSERVER_HAVE_XI2
+	if (XIQueryVersion(dpy, maj, min) != Success)
+	  return False;
+#endif
+
+	return True;
+#endif	/* NO_X11 */
+}
+
+
+
+
 int xauth_raw(int on) {
 	char tmp[] = "/tmp/x11vnc-xauth.XXXXXX";
 	int tmp_fd = -1;
diff --git a/x11vnc/xwrappers.h b/x11vnc/xwrappers.h
index f1e0fbf..0d43fd3 100644
--- a/x11vnc/xwrappers.h
+++ b/x11vnc/xwrappers.h
@@ -79,15 +79,15 @@ extern void init_track_keycode_state(void);
 
 extern void XTRAP_FakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
     unsigned long delay);
-extern void XTestFakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
+extern void XTestFakeKeyEvent_wr(Display* dpy, int dev_id, KeyCode key, Bool down,
     unsigned long delay);
 extern void XTRAP_FakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
     unsigned long delay);
-extern void XTestFakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
+extern void XTestFakeButtonEvent_wr(Display* dpy, int dev_id, unsigned int button, Bool is_press,
     unsigned long delay);
 extern void XTRAP_FakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
     unsigned long delay);
-extern void XTestFakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
+extern void XTestFakeMotionEvent_wr(Display* dpy, int dev_id, int screen, int x, int y,
     unsigned long delay);
 
 extern Bool XTestCompareCurrentCursorWithWindow_wr(Display* dpy, Window w);
@@ -101,6 +101,7 @@ extern int XTRAP_GrabControl_wr(Display *dpy, Bool impervious);
 extern void disable_grabserver(Display *in_dpy, int change);
 
 extern Bool XRecordQueryVersion_wr(Display *dpy, int *maj, int *min);
+extern Bool XInputQueryVersion_wr(Display *dpy, int *maj, int *min);
 
 extern int xauth_raw(int on);
 extern Display *XOpenDisplay_wr(char *display_name);