summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-09-21 01:11:31 +0000
committerRichard M. Stallman <rms@gnu.org>1996-09-21 01:11:31 +0000
commitc8738c33c586a3b99adb3184bf2879c8d5fa325a (patch)
tree7ba70a251e2d70f245ad25398f6115660ce28317
parentaa5abbc013c2e9fdb2bec5c7ed7cf6f5b00352f5 (diff)
downloademacs-c8738c33c586a3b99adb3184bf2879c8d5fa325a.tar.gz
emacs-c8738c33c586a3b99adb3184bf2879c8d5fa325a.tar.bz2
emacs-c8738c33c586a3b99adb3184bf2879c8d5fa325a.zip
(make_lispy_event): When converting from pixel to glyph coordinates,
offset by WINDOW_LEFT_MARGIN; this is needed for left-side scrollbars. (syms_of_keyboard): Initialize and staticpro internal_last_event_frame and read_key_sequence_cmd.
-rw-r--r--src/keyboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index a145406e375..e55d1e06650 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3764,7 +3764,7 @@ make_lispy_event (event)
else
{
int pixcolumn, pixrow;
- column -= XINT (XWINDOW (window)->left);
+ column -= WINDOW_LEFT_MARGIN (XWINDOW (window));
row -= XINT (XWINDOW (window)->top);
glyph_to_pixel_coords (f, column, row, &pixcolumn, &pixrow);
XSETINT (event->x, pixcolumn);
@@ -4027,7 +4027,7 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
if (WINDOWP (window))
{
int pixcolumn, pixrow;
- column -= XINT (XWINDOW (window)->left);
+ column -= WINDOW_LEFT_MARGIN (XWINDOW (window));
row -= XINT (XWINDOW (window)->top);
glyph_to_pixel_coords (frame, column, row, &pixcolumn, &pixrow);
XSETINT (x, pixcolumn);