Mercurial > emacs
view lispintro/drawers.eps @ 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 | a8ee89e61d20 |
children | 6ad2412f0362 |
line wrap: on
line source
%!PS-Adobe-3.0 EPSF-3.0 %%BoundingBox: 34 577 324 778 %%Title: chest-of-drawers-diagram-new %%CreationDate: Fri Sep 14 17:40:57 2001 %%Creator: Tgif-4.1.35 by William Chia-Wei Cheng (william@cs.UCLA.edu) %%ProducedBy: (unknown) %%Pages: 1 %%DocumentFonts: (atend) %%EndComments %%BeginProlog /tgifdict 53 dict def tgifdict begin /tgifellipsedict 6 dict def tgifellipsedict /mtrx matrix put /TGEL % tgifellipse { tgifellipsedict begin /yrad exch def /xrad exch def /y exch def /x exch def /savematrix mtrx currentmatrix def x y translate xrad yrad scale 0 0 1 0 360 arc savematrix setmatrix end } def /TGMAX { exch dup 3 1 roll exch dup 3 1 roll gt { pop } { exch pop } ifelse } def /TGMIN { exch dup 3 1 roll exch dup 3 1 roll lt { pop } { exch pop } ifelse } def /TGSW { stringwidth pop } def /bd { bind def } bind def /GS { gsave } bd /GR { grestore } bd /NP { newpath } bd /CP { closepath } bd /CHP { charpath } bd /CT { curveto } bd /L { lineto } bd /RL { rlineto } bd /M { moveto } bd /RM { rmoveto } bd /S { stroke } bd /F { fill } bd /TR { translate } bd /RO { rotate } bd /SC { scale } bd /MU { mul } bd /DI { div } bd /DU { dup } bd /NE { neg } bd /AD { add } bd /SU { sub } bd /PO { pop } bd /EX { exch } bd /CO { concat } bd /CL { clip } bd /EC { eoclip } bd /EF { eofill } bd /IM { image } bd /IMM { imagemask } bd /ARY { array } bd /SG { setgray } bd /RG { setrgbcolor } bd /SD { setdash } bd /W { setlinewidth } bd /SM { setmiterlimit } bd /SLC { setlinecap } bd /SLJ { setlinejoin } bd /SH { show } bd /FF { findfont } bd /MS { makefont setfont } bd /AR { arcto 4 {pop} repeat } bd /CURP { currentpoint } bd /FLAT { flattenpath strokepath clip newpath } bd /TGSM { tgiforigctm setmatrix } def /TGRM { savematrix setmatrix } def end %%EndProlog %%Page: 1 1 %%PageBoundingBox: 34 577 324 778 tgifdict begin /tgifsavedpage save def 1 SM 1 W 0 SG 72 0 MU 72 11 MU TR 72 128 DI 100.000 MU 100 DI DU NE SC GS /tgiforigctm matrix currentmatrix def % BOX 0 SG GS 10 SM GS NP 64 104 M 255 104 L 255 360 L 64 360 L CP S GR GR % POLY/OPEN-SPLINE 0 SG GS NP 65 296 M 254 296 L TGSM 1 W S GR % POLY/OPEN-SPLINE 0 SG GS NP 63 233 M 255 233 L TGSM 1 W S GR % POLY/OPEN-SPLINE 0 SG GS NP 63 169 M 255 169 L TGSM 1 W S GR % POLY/OPEN-SPLINE 0 SG GS NP 251 362 M 251 361 L 251 379 L 244 379 L 229 361 L TGSM 1 W S GR % OVAL 0 SG GS GS NP 160 72 10 6 TGEL S GR GR % POLY/OPEN-SPLINE 0 SG GS NP 63 104 M 128 64 L 138 69 L TGSM 1 W S GR % POLY/OPEN-SPLINE 0 SG GS NP 255 103 M 190 63 L 180 68 L TGSM 1 W S GR % TEXT NP 0 SG GS 1 W 160 152 M GS GS 0 /Courier FF [17 0 0 -17 0 0] MS (symbol name) TGSW AD GR 2 DI NE 0 RM 0 SG /Courier FF [17 0 0 -17 0 0] MS (symbol name) SH GR GR % TEXT NP 0 SG GS 1 W 160 41 M GS GS 0 /Courier FF [17 0 0 -17 0 0] MS (Chest of Drawers) TGSW AD GR 2 DI NE 0 RM 0 SG /Courier FF [17 0 0 -17 0 0] MS (Chest of Drawers) SH GR GR % TEXT NP 0 SG GS 1 W 344 41 M GS 0 SG /Courier FF [17 0 0 -17 0 0] MS (Contents of Drawers) SH GR GR % TEXT NP 0 SG GS 1 W 344 160 M GS 0 SG /Courier FF [17 0 0 -17 0 0] MS (bouquet) SH GR GR % TEXT NP 0 SG GS 1 W 344 220 M GS 0 SG /Courier FF [17 0 0 -17 0 0] MS ([none]) SH GR GR % TEXT NP 0 SG GS 1 W 344 279 M GS 0 SG /Courier FF [17 0 0 -17 0 0] MS (\(rose violet buttercup\)) SH GR GR % TEXT NP 0 SG GS 1 W 344 337 M GS 0 SG /Courier FF [17 0 0 -17 0 0] MS ([not described here]) SH GR GR % POLY/OPEN-SPLINE 0 SG GS NP 68 362 M 68 361 L 68 379 L 75 379 L 90 361 L TGSM 1 W S GR % TEXT NP 0 SG GS 1 W 158 132 M GS GS 0 /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) TGSW AD GR 2 DI NE 0 RM 0 SG /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) SH GR GR % TEXT NP 0 SG GS 1 W 345 139 M GS 0 SG /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (map to) SH GR GR % TEXT NP 0 SG GS 1 W 350 259 M GS 0 SG /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (map to) SH GR GR % TEXT NP 0 SG GS 1 W 159 213 M GS GS 0 /Courier FF [17 0 0 -17 0 0] MS (symbol definition) TGSW AD GR 2 DI NE 0 RM 0 SG /Courier FF [17 0 0 -17 0 0] MS (symbol definition) SH GR GR % TEXT NP 0 SG GS 1 W 159 195 M GS GS 0 /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) TGSW AD GR 2 DI NE 0 RM 0 SG /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) SH GR GR % TEXT NP 0 SG GS 1 W 160 276 M GS GS 0 /Courier FF [17 0 0 -17 0 0] MS (variable name) TGSW AD GR 2 DI NE 0 RM 0 SG /Courier FF [17 0 0 -17 0 0] MS (variable name) SH GR GR % TEXT NP 0 SG GS 1 W 158 260 M GS GS 0 /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) TGSW AD GR 2 DI NE 0 RM 0 SG /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) SH GR GR % TEXT NP 0 SG GS 1 W 160 339 M GS GS 0 /Courier FF [17 0 0 -17 0 0] MS (property list) TGSW AD GR 2 DI NE 0 RM 0 SG /Courier FF [17 0 0 -17 0 0] MS (property list) SH GR GR % TEXT NP 0 SG GS 1 W 158 323 M GS GS 0 /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) TGSW AD GR 2 DI NE 0 RM 0 SG /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS (directions to) SH GR GR GR tgifsavedpage restore end showpage %%Trailer %MatchingCreationDate: Fri Sep 14 17:40:57 2001 %%DocumentFonts: NewCenturySchlbk-Roman %%+ Courier %%EOF