comparison src/xterm.h @ 11013:f0fe22922005

(struct x_display_info): member kboard (formerly perdisplay) is now a pointer, not an actual struct. (get_perdisplay, get_perdisplay_macro): Deleted.
author Karl Heuer <kwzh@gnu.org>
date Wed, 15 Mar 1995 01:53:00 +0000
parents 2bbb48f3dd0c
children d6b56a8f415b
comparison
equal deleted inserted replaced
11012:31d88266ed12 11013:f0fe22922005
287 287
288 /* More atoms, which are selection types. */ 288 /* More atoms, which are selection types. */
289 Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE, 289 Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE,
290 Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL, 290 Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL,
291 Xatom_ATOM_PAIR; 291 Xatom_ATOM_PAIR;
292 PERDISPLAY perdisplay; 292 #ifdef MULTI_KBOARD
293 KBOARD *kboard;
294 #endif
293 }; 295 };
294 296
295 /* This is a chain of structures for all the X displays currently in use. */ 297 /* This is a chain of structures for all the X displays currently in use. */
296 extern struct x_display_info *x_display_list; 298 extern struct x_display_info *x_display_list;
297 299
303 305
304 extern struct x_display_info *x_display_info_for_display (); 306 extern struct x_display_info *x_display_info_for_display ();
305 extern struct x_display_info *x_display_info_for_name (); 307 extern struct x_display_info *x_display_info_for_name ();
306 308
307 extern struct x_display_info *x_term_init (); 309 extern struct x_display_info *x_term_init ();
308
309 #ifdef MULTI_PERDISPLAY
310 /* The perdisplay structure itself has to be accessible in files that don't
311 need to know about X. So we'll define get_perdisplay as a function to
312 retrieve that structure opaquely. But sources that include this header
313 will automatically get the macro version, and save a function call. */
314
315 #define get_perdisplay_macro(f) (&(f)->display.x->display_info->perdisplay)
316 #define get_perdisplay(f) get_perdisplay_macro (f)
317 #endif
318 310
319 /* Each X frame object points to its own struct x_display object 311 /* Each X frame object points to its own struct x_display object
320 in the display.x field. The x_display structure contains all 312 in the display.x field. The x_display structure contains all
321 the information that is specific to X windows. */ 313 the information that is specific to X windows. */
322 314