X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/56388398e7a1251497f002072c061002ec9d9e81..41d579ce4a2a86428f200788df4b15b936aa5076:/src/termhooks.h diff --git a/src/termhooks.h b/src/termhooks.h index 2acd20bbb3..b147f6ed0a 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -1,13 +1,13 @@ /* Parameters and display hooks for terminal devices. - Copyright (C) 1985, 1986, 1993, 1994, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +Copyright (C) 1985-1986, 1993-1994, 2001-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. -GNU Emacs is free software; you can redistribute it and/or modify +GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ +along with GNU Emacs. If not, see . */ /* Miscellanea. */ @@ -41,16 +39,11 @@ enum scroll_bar_part { /* If the value of the frame parameter changed, whis hook is called. For example, if going from fullscreen to not fullscreen this hook may do something OS dependent, like extended window manager hints on X11. */ -extern void (*fullscreen_hook) P_ ((struct frame *f)); +extern void (*fullscreen_hook) (struct frame *f); /* Input queue declarations and hooks. */ -/* Expedient hack: only provide the below definitions to files that - are prepared to handle lispy things. CONSP is defined if lisp.h - has been included before this file. */ -#ifdef CONSP - enum event_kind { NO_EVENT, /* nothing happened. This should never @@ -107,7 +100,7 @@ enum event_kind HORIZ_WHEEL_EVENT, /* A wheel event generated by a second horizontal wheel that is present on some mice. See WHEEL_EVENT. */ -#if defined (WINDOWSNT) || defined (MAC_OS) +#if defined (WINDOWSNT) LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is generated on WINDOWSNT or Mac OS when the keyboard layout or input @@ -178,16 +171,6 @@ enum event_kind save yourself before shutdown. */ SAVE_SESSION_EVENT -#ifdef MAC_OS - /* Generated when an Apple event, a HICommand event, or a Services - menu event is received and the corresponding handler is - registered. Members `x' and `y' are for the event class and ID - symbols, respectively. Member `arg' is a Lisp object converted - from the received Apple event. Parameters for non-Apple events - are converted to those in Apple events. */ - , MAC_APPLE_EVENT -#endif - #ifdef HAVE_GPM , GPM_CLICK_EVENT #endif @@ -196,6 +179,8 @@ enum event_kind , DBUS_EVENT #endif + , CONFIG_CHANGED_EVENT + #ifdef WINDOWSNT /* Generated when an APPCOMMAND event is received, in response to Multimedia or Internet buttons on some keyboards. @@ -210,6 +195,15 @@ enum event_kind first, so this is not a problem there. */ , MULTIMEDIA_KEY_EVENT #endif + +#ifdef HAVE_NS + /* Generated when native multi-keystroke input method is used to modify + tentative or indicative text display. */ + , NS_TEXT_EVENT + /* Non-key system events (e.g. application menu events) */ + , NS_NONKEY_EVENT +#endif + }; /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT @@ -229,9 +223,11 @@ struct input_event /* For an ASCII_KEYSTROKE_EVENT and MULTIBYTE_CHAR_KEYSTROKE_EVENT, this is the character. For a NON_ASCII_KEYSTROKE_EVENT, this is the keysym code. - For a mouse event, this is the button number. */ + For a mouse event, this is the button number. + For a HELP_EVENT, this is the position within the object + (stored in ARG below) where the help was found. */ /* In WindowsNT, for a mouse wheel event, this is the delta. */ - int code; + EMACS_INT code; enum scroll_bar_part part; int modifiers; /* See enum below for interpretation. */ @@ -256,7 +252,7 @@ struct input_event Lisp_Object arg; }; -#define EVENT_INIT(event) bzero (&(event), sizeof (struct input_event)) +#define EVENT_INIT(event) memset (&(event), 0, sizeof (struct input_event)) /* Bits in the modifiers member of the input_event structure. Note that reorder_modifiers assumes that the bits are in canonical @@ -316,10 +312,9 @@ extern void term_mouse_moveto (int, int); extern struct tty_display_info *gpm_tty; #endif -#endif /* CONSP */ - -struct mac_display_info; +struct ns_display_info; +struct x_display_info; struct w32_display_info; /* Terminal-local parameters. */ @@ -333,6 +328,11 @@ struct terminal /* Parameter alist of this terminal. */ Lisp_Object param_alist; + /* List of charsets supported by the terminal. It is set by + Fset_terminal_coding_system_internal along with + the member terminal_coding. */ + Lisp_Object charset_list; + /* All fields before `next_terminal' should be Lisp_Object and are traced by the GC. All fields afterwards are ignored by the GC. */ @@ -353,10 +353,8 @@ struct terminal times. */ char *name; -#ifdef MULTI_KBOARD /* The terminal's keyboard object. */ struct kboard *kboard; -#endif #ifdef HAVE_WINDOW_SYSTEM /* Cache of images. */ @@ -369,7 +367,7 @@ struct terminal struct tty_display_info *tty; /* termchar.h */ struct x_display_info *x; /* xterm.h */ struct w32_display_info *w32; /* w32term.h */ - struct mac_display_info *mac; /* macterm.h */ + struct ns_display_info *ns; /* nsterm.h */ } display_info; @@ -417,27 +415,28 @@ struct terminal /* Text display hooks. */ - void (*cursor_to_hook) P_ ((struct frame *f, int vpos, int hpos)); - void (*raw_cursor_to_hook) P_ ((struct frame *, int, int)); + void (*cursor_to_hook) (struct frame *f, int vpos, int hpos); + void (*raw_cursor_to_hook) (struct frame *, int, int); - void (*clear_to_end_hook) P_ ((struct frame *)); - void (*clear_frame_hook) P_ ((struct frame *)); - void (*clear_end_of_line_hook) P_ ((struct frame *, int)); + void (*clear_to_end_hook) (struct frame *); + void (*clear_frame_hook) (struct frame *); + void (*clear_end_of_line_hook) (struct frame *, int); - void (*ins_del_lines_hook) P_ ((struct frame *f, int, int)); + void (*ins_del_lines_hook) (struct frame *f, int, int); - void (*insert_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n)); - void (*write_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n)); - void (*delete_glyphs_hook) P_ ((struct frame *, int)); + void (*insert_glyphs_hook) (struct frame *f, struct glyph *s, int n); + void (*write_glyphs_hook) (struct frame *f, struct glyph *s, int n); + void (*delete_glyphs_hook) (struct frame *, int); - void (*ring_bell_hook) P_ ((struct frame *f)); + void (*ring_bell_hook) (struct frame *f); + void (*toggle_invisible_pointer_hook) (struct frame *f, int invisible); - void (*reset_terminal_modes_hook) P_ ((struct terminal *)); - void (*set_terminal_modes_hook) P_ ((struct terminal *)); + void (*reset_terminal_modes_hook) (struct terminal *); + void (*set_terminal_modes_hook) (struct terminal *); - void (*update_begin_hook) P_ ((struct frame *)); - void (*update_end_hook) P_ ((struct frame *)); - void (*set_terminal_window_hook) P_ ((struct frame *, int)); + void (*update_begin_hook) (struct frame *); + void (*update_end_hook) (struct frame *); + void (*set_terminal_window_hook) (struct frame *, int); /* Multi-frame and mouse support hooks. */ @@ -459,12 +458,12 @@ struct terminal This should clear mouse_moved until the next motion event arrives. */ - void (*mouse_position_hook) P_ ((struct frame **f, int, - Lisp_Object *bar_window, - enum scroll_bar_part *part, - Lisp_Object *x, - Lisp_Object *y, - unsigned long *time)); + void (*mouse_position_hook) (struct frame **f, int, + Lisp_Object *bar_window, + enum scroll_bar_part *part, + Lisp_Object *x, + Lisp_Object *y, + unsigned long *time); /* The window system handling code should set this if the mouse has moved since the last call to the mouse_position_hook. Calling that @@ -474,7 +473,7 @@ struct terminal /* When a frame's focus redirection is changed, this hook tells the window system code to re-decide where to put the highlight. Under X, this means that Emacs lies about where the focus is. */ - void (*frame_rehighlight_hook) P_ ((struct frame *)); + void (*frame_rehighlight_hook) (struct frame *); /* If we're displaying frames using a window system that can stack frames on top of each other, this hook allows you to bring a frame @@ -486,12 +485,12 @@ struct terminal If RAISE is non-zero, F is brought to the front, before all other windows. If RAISE is zero, F is sent to the back, behind all other windows. */ - void (*frame_raise_lower_hook) P_ ((struct frame *f, int raise)); + void (*frame_raise_lower_hook) (struct frame *f, int raise); /* If the value of the frame parameter changed, whis hook is called. For example, if going from fullscreen to not fullscreen this hook may do something OS dependent, like extended window manager hints on X11. */ - void (*fullscreen_hook) P_ ((struct frame *f)); + void (*fullscreen_hook) (struct frame *f); /* Scroll bar hooks. */ @@ -521,9 +520,9 @@ struct terminal indicate that we are displaying PORTION characters out of a total of WHOLE characters, starting at POSITION. If WINDOW doesn't yet have a scroll bar, create one for it. */ - void (*set_vertical_scroll_bar_hook) P_ ((struct window *window, - int portion, int whole, - int position)); + void (*set_vertical_scroll_bar_hook) (struct window *window, + int portion, int whole, + int position); /* The following three hooks are used when we're doing a thorough @@ -546,11 +545,11 @@ struct terminal If non-zero, this hook should be safe to apply to any frame, whether or not it can support scroll bars, and whether or not it is currently displaying them. */ - void (*condemn_scroll_bars_hook) P_ ((struct frame *frame)); + void (*condemn_scroll_bars_hook) (struct frame *frame); /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. Note that it's okay to redeem a scroll bar that is not condemned. */ - void (*redeem_scroll_bar_hook) P_ ((struct window *window)); + void (*redeem_scroll_bar_hook) (struct window *window); /* Remove all scroll bars on FRAME that haven't been saved since the last call to `*condemn_scroll_bars_hook'. @@ -563,7 +562,7 @@ struct terminal If non-zero, this hook should be safe to apply to any frame, whether or not it can support scroll bars, and whether or not it is currently displaying them. */ - void (*judge_scroll_bars_hook) P_ ((struct frame *FRAME)); + void (*judge_scroll_bars_hook) (struct frame *FRAME); /* Called to read input events. @@ -585,17 +584,17 @@ struct terminal Therefore, in most cases EXPECTED should be simply ignored. XXX This documentation needs to be updated. */ - int (*read_socket_hook) P_ ((struct terminal *terminal, - int expected, - struct input_event *hold_quit)); + int (*read_socket_hook) (struct terminal *terminal, + int expected, + struct input_event *hold_quit); /* Called when a frame's display becomes entirely up to date. */ - void (*frame_up_to_date_hook) P_ ((struct frame *)); + void (*frame_up_to_date_hook) (struct frame *); /* Called to delete the device-specific portions of a frame that is on this terminal device. */ - void (*delete_frame_hook) P_ ((struct frame *)); + void (*delete_frame_hook) (struct frame *); /* Called after the last frame on this terminal is deleted, or when the display device was closed (hangup). @@ -604,10 +603,10 @@ struct terminal instead. Otherwise the hook must call delete_terminal itself. The hook must check for and close any live frames that are still - on the terminal. Fdelete_frame ensures that there are no live + on the terminal. delete_frame ensures that there are no live frames on the terminal when it calls this hook, so infinite recursion is prevented. */ - void (*delete_terminal_hook) P_ ((struct terminal *)); + void (*delete_terminal_hook) (struct terminal *); }; @@ -641,23 +640,21 @@ extern struct terminal *terminal_list; #ifdef HAVE_NTGUI #define FRAME_WINDOW_P(f) FRAME_W32_P (f) #endif -#ifdef MAC_OS -#define FRAME_WINDOW_P(f) FRAME_MAC_P (f) -#endif #ifndef FRAME_WINDOW_P #define FRAME_WINDOW_P(f) (0) #endif /* Return true if the terminal device is not suspended. */ -#define TERMINAL_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input) +#define TERMINAL_ACTIVE_P(d) (((d)->type != output_termcap && (d)->type !=output_msdos_raw) || (d)->display_info.tty->input) -extern Lisp_Object get_terminal_param P_ ((struct terminal *, Lisp_Object)); -extern struct terminal *get_terminal P_ ((Lisp_Object terminal, int)); -extern struct terminal *create_terminal P_ ((void)); -extern void delete_terminal P_ ((struct terminal *)); +extern struct terminal *get_terminal (Lisp_Object terminal, int); +extern struct terminal *create_terminal (void); +extern void delete_terminal (struct terminal *); /* The initial terminal device, created by initial_term_init. */ extern struct terminal *initial_terminal; -/* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d - (do not change this comment) */ +#ifdef HAVE_GPM +extern void close_gpm (int gpm_fd); +#endif +