# HG changeset patch # User Karl Heuer # Date 795231904 0 # Node ID 3155b56586e9690c213a12d4251551eb59fd4a50 # Parent 0f6b7b33340ad998958b6f9f60c7ef354fbdd7a4 (struct frame): New member kboard. (FRAME_KBOARD): Accessor macro for that member, replacing get_perdisplay. diff -r 0f6b7b33340a -r 3155b56586e9 src/frame.h --- a/src/frame.h Tue Mar 14 21:15:08 1995 +0000 +++ b/src/frame.h Wed Mar 15 01:45:04 1995 +0000 @@ -166,6 +166,13 @@ it is defined in xterm.h. */ union display { struct x_display *x; int nothing; } display; +#ifdef MULTI_KBOARD + /* A pointer to the kboard structure associated with this frame. + For termcap frames, this points to initial_kboard. For X frames, + it will be the same as display.x->display_info->kboard. */ + KBOARD *kboard; +#endif + /* Number of lines of menu bar. */ int menu_bar_lines; @@ -265,6 +272,12 @@ int cost_calculation_baud_rate; }; +#ifdef MULTI_KBOARD /* Note that MULTI_KBOARD implies MULTI_FRAME */ +#define FRAME_KBOARD(f) ((f)->kboard) +#else +#define FRAME_KBOARD(f) (&the_only_kboard) +#endif + #ifdef MULTI_FRAME typedef struct frame *FRAME_PTR;