summaryrefslogtreecommitdiff
path: root/src/keyboard.h
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1992-12-24 06:13:00 +0000
committerJim Blandy <jimb@redhat.com>1992-12-24 06:13:00 +0000
commitd56a7c549e24d716cb136bb92bae8e387eff1013 (patch)
treefabfc6eba545b164c1193f6754df0ea9ad9a1b73 /src/keyboard.h
parent4bb994d1ad30bd0306fa81fb7e1b7b87b713e7d2 (diff)
downloademacs-d56a7c549e24d716cb136bb92bae8e387eff1013.tar.gz
emacs-d56a7c549e24d716cb136bb92bae8e387eff1013.tar.bz2
emacs-d56a7c549e24d716cb136bb92bae8e387eff1013.zip
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Qabove_handle, Qhandle, Qbelow_handle): New symbols. (make_lispy_event): New code to build scrollbar clicks. (make_lispy_movement): New code to handle scrollbar movement. (head_table): Include Qscrollbar_movement in the event heads. (syms_of_keyboard): Init and staticpro Qvertical_scrollbar, Qabove_handle, Qhandle, and Qbelow_handle. * keyboard.h (Qscrollbar_movement): Declare this along with the other event types. * lisp.h (Qvertical_scrollbar): Declare this. * window.c (window_from_scrollbar): New function. * xterm.h (struct x_display): Delete v_scrollbar, v_thumbup, v_thumbdown, v_slider, h_scrollbar, h_thumbup, h_thumbdown, h_slider, v_scrollbar_width, h_scrollbar_height fields. * keyboard.c (Qvscrollbar_part, Qvslider_part, Qvthumbup_part, Qvthumbdown_part, Qhscrollbar_part, Qhslider_part, Qhthumbup_part, Qhthumbdown_part, Qscrollbar_click): Deleted; part of an obsolete interface. (head_table): Removed from here as well. (syms_of_keyboard): And here. * keyboard.h: And here. (POSN_SCROLLBAR_BUTTON): Removed. * xscrollbar.h: File removed - no longer necessary. * xfns.c: Don't #include it any more. (Qhorizontal_scroll_bar, Qvertical_scroll_bar): Deleted. (syms_of_xfns): Don't initialize or staticpro them. (gray_bits): Salvaged from xscrollbar.h. (x_window_to_scrollbar): Deleted. (x_set_horizontal_scrollbar): Deleted. (enum x_frame_parm, x_frame_parms): Remove references to x_set_horizontal_scrollbar. (x_set_foreground_color, x_set_background_color, x_set_border_pixel): Remove special code to support scrollbars. (Fx_create_frame): Remove old scrollbar setup code. (install_vertical_scrollbar, install_horizontal_scrollbar, adjust_scrollbars, x_resize_scrollbars): Deleted. * xterm.c (construct_mouse_click): This doesn't need to take care of scrollbar clicks anymore. (XTread_socket): Remove old code to support scrollbars. Call new functions instead for events which occur in scrollbar windows. (XTupdate_end): Remove call to adjust_scrollbars; the main redisplay code takes care of that now. (enum window_type): Deleted. * ymakefile: Note that xfns.o no longer depends on xscrollbar.h.
Diffstat (limited to 'src/keyboard.h')
-rw-r--r--src/keyboard.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/keyboard.h b/src/keyboard.h
index 1a189ef568d..c7048fd6c0c 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -56,16 +56,11 @@ extern int this_command_key_count;
/* Extract the fields of a position. */
#define POSN_WINDOW(posn) (XCONS (posn)->car)
#define POSN_BUFFER_POSN(posn) (XCONS (XCONS (posn)->cdr)->car)
-#define POSN_SCROLLBAR_BUTTON POSN_BUFFER_POSN
#define POSN_WINDOW_POSN(posn) (XCONS (XCONS (XCONS (posn)->cdr)->cdr)->car)
#define POSN_TIMESTAMP(posn) \
(XCONS (XCONS (XCONS (XCONS (posn)->cdr)->cdr)->cdr)->car)
/* Some of the event heads. */
-extern Lisp_Object Qvscrollbar_part, Qvslider_part;
-extern Lisp_Object Qvthumbup_part, Qvthumbdown_part;
-extern Lisp_Object Qhscrollbar_part, Qhslider_part;
-extern Lisp_Object Qhthumbleft_part, Qhthumbright_part;
extern Lisp_Object Qswitch_frame;
/* Properties on event heads. */
@@ -77,7 +72,7 @@ extern Lisp_Object Qevent_kind, Qevent_symbol_elements;
/* The values of Qevent_kind properties. */
extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement;
-extern Lisp_Object Qscrollbar_click;
+extern Lisp_Object Qscrollbar_movement;
/* Getting the kind of an event head. */
#define EVENT_HEAD_KIND(event_head) \