diff options
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/src/xterm.c b/src/xterm.c index 2c04e9fa848..9f5c8569b96 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -147,10 +147,6 @@ int use_xim = 0; /* configure --without-xim */ -/* Non-nil means Emacs uses toolkit scroll bars. */ - -Lisp_Object Vx_toolkit_scroll_bars; - /* Non-zero means that a HELP_EVENT has been generated since Emacs start. */ @@ -159,14 +155,6 @@ static int any_help_event_p; /* Last window where we saw the mouse. Used by mouse-autoselect-window. */ static Lisp_Object last_window; -/* Non-zero means make use of UNDERLINE_POSITION font properties. */ - -int x_use_underline_position_properties; - -/* Non-zero means to draw the underline at the same place as the descent line. */ - -int x_underline_at_descent_line; - /* This is a chain of structures for all the X displays currently in use. */ @@ -207,11 +195,6 @@ static String Xt_default_resources[] = {0}; static int toolkit_scroll_bar_interaction; -/* Non-zero means to not move point as a result of clicking on a - frame to focus it (when focus-follows-mouse is nil). */ - -int x_mouse_click_focus_ignore_position; - /* Non-zero timeout value means ignore next mouse click if it arrives before that timeout elapses (i.e. as part of the same sequence of events resulting from clicking on a frame to select it). */ @@ -282,10 +265,6 @@ static int input_signal_count; static int x_noop_count; -/* The keysyms to use for the various modifiers. */ - -Lisp_Object Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym, Vx_super_keysym; -Lisp_Object Vx_keysym_table; static Lisp_Object Qalt, Qhyper, Qmeta, Qsuper, Qmodifier_value; static Lisp_Object Qvendor_specific_keysyms; @@ -10773,7 +10752,7 @@ syms_of_xterm (void) #endif DEFVAR_BOOL ("x-use-underline-position-properties", - &x_use_underline_position_properties, + x_use_underline_position_properties, doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. A value of nil means ignore them. If you encounter fonts with bogus UNDERLINE_POSITION font properties, for example 7x13 on XFree prior @@ -10783,7 +10762,7 @@ sizes. */); x_use_underline_position_properties = 1; DEFVAR_BOOL ("x-underline-at-descent-line", - &x_underline_at_descent_line, + x_underline_at_descent_line, doc: /* *Non-nil means to draw the underline at the same place as the descent line. A value of nil means to draw the underline according to the value of the variable `x-use-underline-position-properties', which is usually at the @@ -10791,7 +10770,7 @@ baseline level. The default value is nil. */); x_underline_at_descent_line = 0; DEFVAR_BOOL ("x-mouse-click-focus-ignore-position", - &x_mouse_click_focus_ignore_position, + x_mouse_click_focus_ignore_position, doc: /* Non-nil means that a mouse click to focus a frame does not move point. This variable is only used when the window manager requires that you click on a frame to select it (give it focus). In that case, a value @@ -10800,7 +10779,7 @@ reflect the mouse click position, while a non-nil value means that the selected window or cursor position is preserved. */); x_mouse_click_focus_ignore_position = 0; - DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, + DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, doc: /* Which toolkit scroll bars Emacs uses, if any. A value of nil means Emacs doesn't use toolkit scroll bars. With the X Window system, the value is a symbol describing the @@ -10833,35 +10812,35 @@ With MS Windows, the value is t. */); Qsuper = intern_c_string ("super"); Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); - DEFVAR_LISP ("x-alt-keysym", &Vx_alt_keysym, + DEFVAR_LISP ("x-alt-keysym", Vx_alt_keysym, doc: /* Which keys Emacs uses for the alt modifier. This should be one of the symbols `alt', `hyper', `meta', `super'. For example, `alt' means use the Alt_L and Alt_R keysyms. The default is nil, which is the same as `alt'. */); Vx_alt_keysym = Qnil; - DEFVAR_LISP ("x-hyper-keysym", &Vx_hyper_keysym, + DEFVAR_LISP ("x-hyper-keysym", Vx_hyper_keysym, doc: /* Which keys Emacs uses for the hyper modifier. This should be one of the symbols `alt', `hyper', `meta', `super'. For example, `hyper' means use the Hyper_L and Hyper_R keysyms. The default is nil, which is the same as `hyper'. */); Vx_hyper_keysym = Qnil; - DEFVAR_LISP ("x-meta-keysym", &Vx_meta_keysym, + DEFVAR_LISP ("x-meta-keysym", Vx_meta_keysym, doc: /* Which keys Emacs uses for the meta modifier. This should be one of the symbols `alt', `hyper', `meta', `super'. For example, `meta' means use the Meta_L and Meta_R keysyms. The default is nil, which is the same as `meta'. */); Vx_meta_keysym = Qnil; - DEFVAR_LISP ("x-super-keysym", &Vx_super_keysym, + DEFVAR_LISP ("x-super-keysym", Vx_super_keysym, doc: /* Which keys Emacs uses for the super modifier. This should be one of the symbols `alt', `hyper', `meta', `super'. For example, `super' means use the Super_L and Super_R keysyms. The default is nil, which is the same as `super'. */); Vx_super_keysym = Qnil; - DEFVAR_LISP ("x-keysym-table", &Vx_keysym_table, + DEFVAR_LISP ("x-keysym-table", Vx_keysym_table, doc: /* Hash table of character codes indexed by X keysym codes. */); Vx_keysym_table = make_hash_table (Qeql, make_number (900), make_float (DEFAULT_REHASH_SIZE), |