Mercurial > emacs
annotate src/widget.h @ 82990:2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
lib-src/emacsclient.c (copy_from_to, pty_conversation): Re-added SIGIO
hack. (Sigh.)
lisp/frame.el (make-frame-on-tty): Use make-terminal-frame, not
make-frame.
src/dispnew.c (line_hash_code, line_draw_cost): Updated to use
the new display_method parameters.
(Fredraw_frame): fflush the tty only if f is a termcap frame.
(direct_output_for_insert): Updated to use the new display_method
parameters. fflush the tty only if f is a termcap frame.
(direct_output_forward_char, update_frame_1, scrolling): Ditto.
(update_frame_line, Fding, bitch_at_user): Ditto.
(Fsend_string_to_terminal): Fail if current frame is not on a tty.
(init_display): Frame size change is safe here.
src/frame.c (Vterminal_frame): Restored previously deleted variable.
(syms_of_frame): Initialize it.
(make_terminal_frame): Copy the frame's display_method from tty_display_info.
(Fmake_terminal_frame): Enable simultaneous X and tty frames (buggy).
(Fredirect_frame_focus): Don't call frame_rehighlight_hook if frame
is on a termcap device.
src/frame.h (struct frame): Renamed display to display_method.
(Vterminal_frame): Re-added declaration.
src/keyboard.c (flow_control): Moved to struct tty_display_info.
(read_avail_input): Check ttys even if there is a read_socket_hook.
(Fset_input_mode): Call reset_sys_modes/init_sys_modes and set
flow_control or meta_key only when the frame is a termcap frame.
(Fcurrent_input_mode): Handle flow_control and meta_key right on
non-termcap frames.
src/scroll.c (calculate_scrolling, calculate_direct_scrolling): Update
to use the new display_method parameters.
(scrolling_1, scroll_cost): Ditto.
src/sysdep.c (init_sys_modes, reset_sys_modes): Always set the
terminal parameters if tty_out->input is not stdin. Updated to the
new location of flow_control.
(hft_init): Moved HFT init code to term_init, as it needs the frame.
src/term.c (tty_display_method_template): New variable.
(update_begin): Added rif hack.
(set_terminal_window, ins_del_lines, term_init): Updated to use the
new display_method parameters.
(insert_glyphs, ins_del_lines): Only call insert_glyphs_hook if the
current frame is not on a tty.
(calculate_costs): Don't calculate costs if not on a tty.
(term_dummy_init): Fixed tty->output initialization. Preallocate Wcm
and display_method.
(term_init): Allocate & initialize display_method. Blindly fixed
WINDOWSNT-specific parts. Added HFT-specific initialization
exception from hft_init.
(delete_tty): Only delete termcap frames. Free() the display_method.
src/termchar.h (struct tty_display_info): Moved high-level terminal
characteristics to struct display_method. Added flow_control and
display_method members.
src/termhooks.h (struct display_method): New struct (renamed from
struct device). Added accessor macros.
src/window.c (init_window_once): Initialize Vterminal_frame.
src/xdisp.c (init_iterator, expose_frame): Added rif hack.
(try_window_id): Updated to use the new display_method parameters.
src/xfaces.c (realize_basic_faces): Don't call
x_update_menu_appearance if the frame is a tty frame.
src/xfns.c (Fx_create_frame): Added rif hack. Initialize
display_method.
(x_create_tip_frame): Initialize display_method.
src/xterm.c (x_display_method): New variable.
(x_flush, x_frame_of_widget, XTmouse_position): Ignore non-X frames.
(x_window_to_scroll_bar, x_window_to_menu_bar): Ditto.
(xim_destroy_callback, xim_instantiate_callback): Ditto.
(frame_highlight, frame_unhighlight): Added rif hack.
(x_initialize): Don't initialize rif. Do initialize x_display_method.
src/xterm.h (x_display_method): New declaration.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-30
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 02 Jan 2004 01:15:26 +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) */ |