diff options
author | Karoly Lorentey <[email protected]> | 2005-06-27 00:56:21 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2005-06-27 00:56:21 +0000 |
commit | bedb9c0eda660f7dc516543be25db37b5f95e03b (patch) | |
tree | 7c47185d6b01dd86453399a966c29ea4dfe70f9b /src/frame.h | |
parent | d66d64bc20de2e172859b2c3f08d05bb2f813c00 (diff) |
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
* src/termhooks.h (display): New field: kboard.
* src/xterm.h (x_display_info): Remove kboard field.
* src/termchar.h (tty_display_info): Ditto.
* src/frame.h (frame): Ditto.
(FRAME_KBOARD): Update.
* src/dispnew.c (init_display): Don't initialize kboard.
* src/frame.c (make_frame, make_initial_frame, make_terminal_frame): Ditto.
* src/frame.c (make_frame_without_minibuffer, Fdelete_frame): Update kboard access.
* src/keyboard.c (delete_kboard): Ditto.
* src/term.c (term_init): Ditto.
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Ditto.
* src/xselect.c (x_handle_selection_clear): Ditto.
* src/xterm.c (x_term_init): Ditto.
* src/term.c (init_initial_display): Initialize kboard.
* src/xterm.c (x_term_init): Ditto.
* src/term.c (delete_tty): Remove kboard deletion.
(delete_display): Delete kboard as well.
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-363
Diffstat (limited to 'src/frame.h')
-rw-r--r-- | src/frame.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/frame.h b/src/frame.h index 9f0c830ca8..c4190255b7 100644 --- a/src/frame.h +++ b/src/frame.h @@ -292,16 +292,6 @@ struct frame /* The extra width (in pixels) currently allotted for fringes. */ int left_fringe_width, right_fringe_width; -#ifdef MULTI_KBOARD - /* XXX Maybe this should be moved to struct display, too. */ - /* A pointer to the kboard structure associated with this frame. - For termcap frames, it will be the same as - display->display_info.tty->kboard. - For X frames, it will be the same as - display->display_info.x->kboard. */ - struct kboard *kboard; -#endif - /* See FULLSCREEN_ enum below */ int want_fullscreen; @@ -456,7 +446,7 @@ struct frame }; #ifdef MULTI_KBOARD -#define FRAME_KBOARD(f) ((f)->kboard) +#define FRAME_KBOARD(f) ((f)->display->kboard) #else #define FRAME_KBOARD(f) (&the_only_kboard) #endif |