Mercurial > emacs
comparison src/dispnew.c @ 83362:c3dd82172ed1
Enforce the presence of `window-system' and `tty-type' frame parameters in all frames.
* src/dispnew.c (init_display): Set up `window-system' and `tty-type'
frame parameters in the initial tty frame.
* src/frame.c (Fmake_terminal_frame): Look up the `tty-type' frame
parameter, not `tty' when discovering the tty type of the new frame.
Initialize `tty' and `tty-type' frame parameters in the new frame.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-402
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 07 Sep 2005 23:28:54 +0000 |
| parents | 532e0a9335a9 |
| children | 5272862a4865 |
comparison
equal
deleted
inserted
replaced
| 83361:39de99cd3f08 | 83362:c3dd82172ed1 |
|---|---|
| 6774 f->output_method = d->type; | 6774 f->output_method = d->type; |
| 6775 f->device = d; | 6775 f->device = d; |
| 6776 | 6776 |
| 6777 d->reference_count++; | 6777 d->reference_count++; |
| 6778 d->display_info.tty->top_frame = selected_frame; | 6778 d->display_info.tty->top_frame = selected_frame; |
| 6779 change_frame_size (XFRAME (selected_frame), FrameRows (d->display_info.tty), FrameCols (d->display_info.tty), 0, 0, 1); | 6779 change_frame_size (XFRAME (selected_frame), |
| 6780 FrameRows (d->display_info.tty), | |
| 6781 FrameCols (d->display_info.tty), 0, 0, 1); | |
| 6780 | 6782 |
| 6781 /* Delete the initial display. */ | 6783 /* Delete the initial display. */ |
| 6782 if (--initial_device->reference_count == 0 | 6784 if (--initial_device->reference_count == 0 |
| 6783 && initial_device->delete_device_hook) | 6785 && initial_device->delete_device_hook) |
| 6784 (*initial_device->delete_device_hook) (initial_device); | 6786 (*initial_device->delete_device_hook) (initial_device); |
| 6785 | 6787 |
| 6786 /* Update frame parameters to reflect the new type. */ | 6788 /* Update frame parameters to reflect the new type. */ |
| 6789 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); | |
| 6787 Fmodify_frame_parameters | 6790 Fmodify_frame_parameters |
| 6788 (selected_frame, Fcons (Fcons (Qtty_type, | 6791 (selected_frame, Fcons (Fcons (Qtty_type, |
| 6789 Fdisplay_tty_type (selected_frame)), Qnil)); | 6792 Fdisplay_tty_type (selected_frame)), Qnil)); |
| 6793 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil)); | |
| 6790 } | 6794 } |
| 6791 | 6795 |
| 6792 { | 6796 { |
| 6793 struct frame *sf = SELECTED_FRAME (); | 6797 struct frame *sf = SELECTED_FRAME (); |
| 6794 int width = FRAME_TOTAL_COLS (sf); | 6798 int width = FRAME_TOTAL_COLS (sf); |