Mercurial > emacs
comparison src/xterm.h @ 83323:61487e73bbc2
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: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-363
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 27 Jun 2005 00:56:21 +0000 |
| parents | 3dcba0bc766b |
| children | 6c13700d1c13 |
comparison
equal
deleted
inserted
replaced
| 83322:cb3cae14fe7e | 83323:61487e73bbc2 |
|---|---|
| 325 Atom Xatom_DONE, Xatom_PAGE; | 325 Atom Xatom_DONE, Xatom_PAGE; |
| 326 | 326 |
| 327 /* Atom used in toolkit scroll bar client messages. */ | 327 /* Atom used in toolkit scroll bar client messages. */ |
| 328 Atom Xatom_Scrollbar; | 328 Atom Xatom_Scrollbar; |
| 329 | 329 |
| 330 #ifdef MULTI_KBOARD | |
| 331 struct kboard *kboard; | |
| 332 #endif | |
| 333 int cut_buffers_initialized; /* Whether we're sure they all exist */ | 330 int cut_buffers_initialized; /* Whether we're sure they all exist */ |
| 334 | 331 |
| 335 /* The frame (if any) which has the X window that has keyboard focus. | 332 /* The frame (if any) which has the X window that has keyboard focus. |
| 336 Zero if none. This is examined by Ffocus_frame in xfns.c. Note | 333 Zero if none. This is examined by Ffocus_frame in xfns.c. Note |
| 337 that a mere EnterNotify event can set this; if you need to know the | 334 that a mere EnterNotify event can set this; if you need to know the |