diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index 8eb59690..8aea0df5 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -828,6 +828,25 @@ libxrdp_send_pointer_system(struct xrdp_session *session, int pointer_type) return 0; } +/*****************************************************************************/ +int EXPORT_CC +libxrdp_send_pointer_position(struct xrdp_session *session, int x, int y) +{ + struct stream *s; + + make_stream(s); + init_stream(s, 8192); + xrdp_rdp_init_data(session->rdp, s); + out_uint16_le(s, TS_PTRMSGTYPE_POSITION); + out_uint16_le(s, 0); /* pad */ + out_uint16_le(s, x); + out_uint16_le(s, y); + s_mark_end(s); + xrdp_rdp_send_data(session->rdp, s, PDUTYPE2_POINTER); + free_stream(s); + return 0; +} + /*****************************************************************************/ int EXPORT_CC libxrdp_send_pointer(struct xrdp_session *session, int cache_idx, diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h index b1a5140a..d84b544a 100644 --- a/libxrdp/libxrdpinc.h +++ b/libxrdp/libxrdpinc.h @@ -142,6 +142,8 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height, int libxrdp_send_pointer_system(struct xrdp_session *session, int pointer_type); int +libxrdp_send_pointer_position(struct xrdp_session *session, int x, int y); +int libxrdp_send_pointer(struct xrdp_session *session, int cache_idx, char *data, char *mask, int x, int y, int bpp, int width, int height); diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h index 69c9cf1b..4f38765f 100644 --- a/xrdp/xrdp.h +++ b/xrdp/xrdp.h @@ -168,6 +168,8 @@ xrdp_wm_pu(struct xrdp_wm *self, struct xrdp_bitmap *control); int xrdp_wm_send_pointer_system(struct xrdp_wm *self, int pointer_type); int +xrdp_wm_send_pointer_position(struct xrdp_wm *self, int x, int y); +int xrdp_wm_send_pointer(struct xrdp_wm *self, int cache_idx, char *data, char *mask, int x, int y, int bpp, int width, int height); diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index b9490d04..d4ec44ab 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -4518,6 +4518,17 @@ server_set_pointer_system(struct xrdp_mod *mod, int pointer_type) return 0; } +/*****************************************************************************/ +static int +server_set_pointer_position(struct xrdp_mod *mod, int x, int y) +{ + struct xrdp_wm *wm; + + wm = (struct xrdp_wm *)(mod->wm); + xrdp_wm_send_pointer_position(wm, x, y); + return 0; +} + /*****************************************************************************/ static int server_set_pointer(struct xrdp_mod *mod, int x, int y, @@ -5397,6 +5408,7 @@ xrdp_mm_setup_mod1(struct xrdp_mm *self) self->mod->server_set_pointer_large = server_set_pointer_large; self->mod->server_paint_rects_ex = server_paint_rects_ex; self->mod->server_set_pointer_system = server_set_pointer_system; + self->mod->server_set_pointer_position = server_set_pointer_position; self->mod->si = &(self->wm->session->si); } } diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index 1c78cf7d..858c8e48 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -199,7 +199,8 @@ struct xrdp_mod char *cmd, int cmd_bytes, char *data, int data_bytes); int (*server_set_pointer_system)(struct xrdp_mod *v, int pointer_type); - tintptr server_dumby[100 - 52]; /* align, 100 minus the number of server + int (*server_set_pointer_position)(struct xrdp_mod *v, int x, int y); + tintptr server_dumby[100 - 53]; /* align, 100 minus the number of server functions above */ /* common */ tintptr handle; /* pointer to self as int */ diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c index 69d09e90..8d5eca29 100644 --- a/xrdp/xrdp_wm.c +++ b/xrdp/xrdp_wm.c @@ -434,6 +434,13 @@ xrdp_wm_send_pointer_system(struct xrdp_wm *self, int pointer_type) return libxrdp_send_pointer_system(self->session, pointer_type); } +/*****************************************************************************/ +int +xrdp_wm_send_pointer_position(struct xrdp_wm *self, int x, int y) +{ + return libxrdp_send_pointer_position(self->session, x, y); +} + /*****************************************************************************/ int xrdp_wm_send_pointer(struct xrdp_wm *self, int cache_idx, diff --git a/xup/xup.c b/xup/xup.c index b72f1391..259d3776 100644 --- a/xup/xup.c +++ b/xup/xup.c @@ -1623,6 +1623,21 @@ process_server_set_pointer_system(struct mod *amod, struct stream *s) return rv; } +/******************************************************************************/ +/* return error */ +static int +process_server_set_pointer_position(struct mod *amod, struct stream *s) +{ + int rv; + int x; + int y; + + in_uint16_le(s, x); + in_uint16_le(s, y); + rv = amod->server_set_pointer_position(amod, x, y); + return rv; +} + /******************************************************************************/ /* return error */ static int @@ -1861,6 +1876,9 @@ lib_mod_process_orders(struct mod *mod, int type, struct stream *s) case 65: /* server_set_pointer_system */ rv = process_server_set_pointer_system(mod, s); break; + case 66: /* server_set_pointer_position */ + rv = process_server_set_pointer_position(mod, s); + break; default: LOG_DEVEL(LOG_LEVEL_WARNING, "lib_mod_process_orders: unknown order type %d", type); diff --git a/xup/xup.h b/xup/xup.h index fea04b3b..b5061ca3 100644 --- a/xup/xup.h +++ b/xup/xup.h @@ -191,7 +191,8 @@ struct mod char *cmd, int cmd_bytes, char *data, int data_bytes); int (*server_set_pointer_system)(struct mod *v, int pointer_type); - tintptr server_dumby[100 - 52]; /* align, 100 minus the number of server + int (*server_set_pointer_position)(struct mod *v, int x, int y); + tintptr server_dumby[100 - 53]; /* align, 100 minus the number of server functions above */ /* common */ tintptr handle; /* pointer to self as long */