updated for version 7.0035v7.0035

1 files changed, 10 insertions, 20 deletions

diff --git a/src/gui_x11.c b/src/gui_x11.c
index 88ee91c0c5..6d990c5d1b 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -3276,33 +3276,23 @@ gui_x11_callbacks(textArea, vimForm)
 }
 
 /*
- * Get current y mouse coordinate in text window.
- * Return -1 when unknown.
+ * Get current mouse coordinates in text window.
  */
-    int
-gui_mch_get_mouse_x()
-{
-    int		rootx, rooty, winx, winy;
-    Window	root, child;
-    unsigned int mask;
-
-    if (gui.wid && XQueryPointer(gui.dpy, gui.wid, &root, &child,
-					 &rootx, &rooty, &winx, &winy, &mask))
-	return winx;
-    return -1;
-}
-
-    int
-gui_mch_get_mouse_y()
+    void
+gui_mch_getmouse(int *x, int *y)
 {
     int		rootx, rooty, winx, winy;
     Window	root, child;
     unsigned int mask;
 
     if (gui.wid && XQueryPointer(gui.dpy, gui.wid, &root, &child,
-					 &rootx, &rooty, &winx, &winy, &mask))
-	return winy;
-    return -1;
+					 &rootx, &rooty, &winx, &winy, &mask)) {
+	*x = winx;
+	*y = winy;
+    } else {
+	*x = -1;
+	*y = -1;
+    }
 }
 
     void