From 67f6e31c6e692b1246057994c25c2957a2898493 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Sun, 3 Jun 2007 01:03:22 +0000 Subject: [PATCH] (Fmouse_position, Fmouse_pixel_position): Condition on HAVE_GPM too. --- lispref/ChangeLog | 5 +++++ src/frame.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index a9d931d3140..d5b76f26239 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2007-06-03 Nick Roberts + + * commands.texi (Click Events): Describe width and height when + object is nil. + 2007-05-30 Nick Roberts * commands.texi (Click Events): Layout more logically. Describe diff --git a/src/frame.c b/src/frame.c index ab91af264dc..0e24ad59627 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1450,7 +1450,7 @@ and returns whatever that function returns. */) f = SELECTED_FRAME (); x = y = Qnil; -#ifdef HAVE_MOUSE +#if defined (HAVE_MOUSE) || defined (HAVE_GPM) /* It's okay for the hook to refrain from storing anything. */ if (mouse_position_hook) (*mouse_position_hook) (&f, -1, @@ -1494,7 +1494,7 @@ and nil for X and Y. */) f = SELECTED_FRAME (); x = y = Qnil; -#ifdef HAVE_MOUSE +#if defined (HAVE_MOUSE) || defined (HAVE_GPM) /* It's okay for the hook to refrain from storing anything. */ if (mouse_position_hook) (*mouse_position_hook) (&f, -1, @@ -1581,6 +1581,13 @@ before calling this function on it, like this. Fselect_frame (frame); mouse_moveto (XINT (x), XINT (y)); } +#else +#ifdef HAVE_GPM + { + Fselect_frame (frame); + term_mouse_moveto (XINT (x), XINT (y)); + } +#endif #endif #endif -- 2.39.2