Commit 64520e5c authored by Paul Eggert's avatar Paul Eggert

* term.c: Make symbols static if they're not exported.

(tty_turn_off_highlight, get_tty_terminal, max_frame_cols):
(max_frame_lines, tty_set_terminal_modes):
(tty_reset_terminal_modes, tty_turn_off_highlight):
(get_tty_terminal): Now static.
(term_mouse_moveto): Do not define if HAVE_WINDOW_SYSTEM.
* termhooks.h (term_mouse_moveto): Do not declare if
HAVE_WINDOW_SYSTEMM.
* dispextern.h (tty_set_terminal_modes, tty_reset_terminal_modes):
(tty_turn_off_highlight, get_tty_terminal): Remove decls.
parent 1fa53021
2011-04-14 Paul Eggert <eggert@cs.ucla.edu>
* term.c: Make symbols static if they're not exported.
(tty_turn_off_highlight, get_tty_terminal, max_frame_cols):
(max_frame_lines, tty_set_terminal_modes):
(tty_reset_terminal_modes, tty_turn_off_highlight):
(get_tty_terminal): Now static.
(term_mouse_moveto): Do not define if HAVE_WINDOW_SYSTEM.
* termhooks.h (term_mouse_moveto): Do not declare if
HAVE_WINDOW_SYSTEMM.
* dispextern.h (tty_set_terminal_modes, tty_reset_terminal_modes):
(tty_turn_off_highlight, get_tty_terminal): Remove decls.
* sysdep.c: Make symbols static if they're not exported.
(emacs_get_tty, emacs_set_tty, old_fcntl_flags, old_fcntl_owner):
Now static.
......
......@@ -3282,10 +3282,7 @@ extern struct terminal *init_initial_terminal (void);
/* Defined in term.c */
extern void tty_set_terminal_modes (struct terminal *);
extern void tty_reset_terminal_modes (struct terminal *);
extern void tty_turn_off_insert (struct tty_display_info *);
extern void tty_turn_off_highlight (struct tty_display_info *);
extern int string_cost (const char *);
extern int per_line_cost (const char *);
extern void calculate_costs (struct frame *);
......@@ -3293,7 +3290,6 @@ extern void produce_glyphs (struct it *);
extern void produce_special_glyphs (struct it *, enum display_element_type);
extern int tty_capable_p (struct tty_display_info *, unsigned, unsigned long, unsigned long);
extern void set_tty_color_mode (struct tty_display_info *, struct frame *);
extern struct terminal *get_tty_terminal (Lisp_Object, int);
extern struct terminal *get_named_tty (const char *);
EXFUN (Ftty_type, 1);
extern void create_tty_output (struct frame *);
......
......@@ -77,9 +77,11 @@ static int been_here = -1;
static void tty_set_scroll_region (struct frame *f, int start, int stop);
static void turn_on_face (struct frame *, int face_id);
static void turn_off_face (struct frame *, int face_id);
static void tty_turn_off_highlight (struct tty_display_info *);
static void tty_show_cursor (struct tty_display_info *);
static void tty_hide_cursor (struct tty_display_info *);
static void tty_background_highlight (struct tty_display_info *tty);
static struct terminal *get_tty_terminal (Lisp_Object, int);
static void clear_tty_hooks (struct terminal *terminal);
static void set_tty_hooks (struct terminal *terminal);
static void dissociate_if_controlling_tty (int fd);
......@@ -133,11 +135,11 @@ enum no_color_bit
/* The largest frame width in any call to calculate_costs. */
int max_frame_cols;
static int max_frame_cols;
/* The largest frame height in any call to calculate_costs. */
int max_frame_lines;
static int max_frame_lines;
/* Non-zero if we have dropped our controlling tty and therefore
should not open a frame on stdout. */
......@@ -173,7 +175,7 @@ tty_ring_bell (struct frame *f)
/* Set up termcap modes for Emacs. */
void
static void
tty_set_terminal_modes (struct terminal *terminal)
{
struct tty_display_info *tty = terminal->display_info.tty;
......@@ -201,7 +203,7 @@ tty_set_terminal_modes (struct terminal *terminal)
/* Reset termcap modes before exiting Emacs. */
void
static void
tty_reset_terminal_modes (struct terminal *terminal)
{
struct tty_display_info *tty = terminal->display_info.tty;
......@@ -286,7 +288,7 @@ tty_turn_off_insert (struct tty_display_info *tty)
/* Handle highlighting. */
void
static void
tty_turn_off_highlight (struct tty_display_info *tty)
{
if (tty->standout_mode)
......@@ -2368,7 +2370,7 @@ set_tty_color_mode (struct tty_display_info *tty, struct frame *f)
/* Return the tty display object specified by TERMINAL. */
struct terminal *
static struct terminal *
get_tty_terminal (Lisp_Object terminal, int throw)
{
struct terminal *t = get_terminal (terminal, throw);
......@@ -2614,6 +2616,8 @@ frame's terminal). */)
***********************************************************************/
#ifdef HAVE_GPM
#ifndef HAVE_WINDOW_SYSTEM
void
term_mouse_moveto (int x, int y)
{
......@@ -2627,6 +2631,7 @@ term_mouse_moveto (int x, int y)
last_mouse_x = x;
last_mouse_y = y; */
}
#endif /* HAVE_WINDOW_SYSTEM */
/* Implementation of draw_row_with_mouse_face for TTY/GPM. */
void
......
......@@ -306,7 +306,9 @@ enum {
#ifdef HAVE_GPM
#include <gpm.h>
extern int handle_one_term_event (struct tty_display_info *, Gpm_Event *, struct input_event *);
#ifndef HAVE_WINDOW_SYSTEM
extern void term_mouse_moveto (int, int);
#endif
/* The device for which we have enabled gpm support. */
extern struct tty_display_info *gpm_tty;
......@@ -660,4 +662,3 @@ extern unsigned char *encode_terminal_code (struct glyph *, int,
#ifdef HAVE_GPM
extern void close_gpm (int gpm_fd);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment