Mercurial > emacs
annotate src/widget.h @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 695cf19ef79e |
children | a8fa7c632ee4 375f2633d815 |
rev | line source |
---|---|
5626 | 1 /* The emacs frame widget public header file. |
2 Copyright (C) 1993 Free Software Foundation, Inc. | |
3 | |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 2, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
9229
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
9229
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
5626 | 20 |
21 /* Emacs 19 face widget ported by Fred Pierresteguy */ | |
22 | |
23 #ifndef _EmacsFrame_h | |
24 #define _EmacsFrame_h | |
25 | |
26 #define XtNminibuffer "minibuffer" | |
27 #define XtCMinibuffer "Minibuffer" | |
28 #define XtNunsplittable "unsplittable" | |
29 #define XtCUnsplittable "Unsplittable" | |
30 #define XtNinternalBorderWidth "internalBorderWidth" | |
31 #define XtCInternalBorderWidth "InternalBorderWidth" | |
32 #define XtNinterline "interline" | |
33 #define XtCInterline "Interline" | |
34 | |
35 #ifndef XtNfont | |
36 #define XtNfont "font" | |
37 #endif | |
38 #ifndef XtCFont | |
39 #define XtCFont "Font" | |
40 #endif | |
41 #ifndef XtNforeground | |
42 #define XtNforeground "foreground" | |
43 #endif | |
44 #ifndef XtCForeground | |
45 #define XtCForeground "Foreground" | |
46 #endif | |
47 | |
48 #define XtNcursorColor "cursorColor" | |
49 #define XtCCursorColor "CursorColor" | |
50 #define XtNbarCursor "barCursor" | |
51 #define XtCBarCursor "BarCursor" | |
52 | |
53 #define XtNvisualBell "visualBell" | |
54 #define XtCVisualBell "VisualBell" | |
55 #define XtCBellVolume "BellVolume" | |
56 #define XtNbellVolume "bellVolume" | |
57 | |
58 #define XtNpointerBackground "pointerBackground" | |
59 #define XtNpointerColor "pointerColor" | |
60 | |
61 #define XtNtextPointer "textPointer" | |
62 #define XtNspacePointer "spacePointer" | |
63 #define XtNmodeLinePointer "modePointer" | |
64 #define XtNgcPointer "gcPointer" | |
65 | |
66 #define XtNemacsFrame "emacsFrame" | |
67 #define XtCEmacsFrame "EmacsFrame" | |
68 | |
69 #ifndef XtNgeometry | |
70 #define XtNgeometry "geometry" | |
71 #endif | |
72 #ifndef XtCGeometry | |
73 #define XtCGeometry "Geometry" | |
74 #endif | |
9229
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
75 #ifndef XtNshowGrip |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
76 #define XtNshowGrip "showGrip" |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
77 #endif |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
78 #ifndef XtNallowResize |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
79 #define XtNallowResize "allowResize" |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
80 #endif |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
81 #ifndef XtNresizeToPreferred |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
82 #define XtNresizeToPreferred "resizeToPreferred" |
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
83 #endif |
5626 | 84 |
85 #define XtNinitialGeometry "initialGeometry" | |
86 #define XtCInitialGeometry "InitialGeometry" | |
87 | |
88 /* structures | |
89 */ | |
90 typedef struct _EmacsFrameRec *EmacsFrame; | |
91 typedef struct _EmacsFrameClassRec *EmacsFrameClass; | |
92 | |
93 extern WidgetClass emacsFrameClass; | |
94 | |
95 extern struct _DisplayContext* display_context; | |
96 | |
97 /* Special entrypoints */ | |
35057
29053ba75ce5
(EmacsFrameSetCharSize_): Prototype.
Dave Love <fx@gnu.org>
parents:
24998
diff
changeset
|
98 void EmacsFrameSetCharSize P_ ((Widget, int, int)); |
24998
c61fea4f9105
(x_set_font): Don't call face-set-after-frame-default
Gerd Moellmann <gerd@gnu.org>
parents:
14186
diff
changeset
|
99 void widget_store_internal_border P_ ((Widget widget)); |
5626 | 100 |
101 #endif /* _EmacsFrame_h */ | |
52401 | 102 |
103 /* arch-tag: 98be17cc-8878-4701-abfa-66f1c04e9cb7 | |
104 (do not change this comment) */ |