comparison src/macterm.h @ 50158:4f45129dc10e

(FRAME_X_OUTPUT, FRAME_X_WINDOW, FRAME_X_DISPLAY): (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): New macros for consolidation.
author Kim F. Storm <storm@cua.dk>
date Sun, 16 Mar 2003 20:49:50 +0000
parents 23a1cea22d13
children aab1e13bd844
comparison
equal deleted inserted replaced
50157:203d5a0f77a8 50158:4f45129dc10e
400 unsigned long relief_background; 400 unsigned long relief_background;
401 }; 401 };
402 402
403 typedef struct mac_output mac_output; 403 typedef struct mac_output mac_output;
404 404
405 /* Return the X output data for frame F. */
406 #define FRAME_X_OUTPUT(f) ((f)->output_data.mac)
407
405 /* Return the Mac window used for displaying data in frame F. */ 408 /* Return the Mac window used for displaying data in frame F. */
406 #define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->mWP) 409 #define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->mWP)
410 #define FRAME_X_WINDOW(f) ((f)->output_data.mac->mWP)
407 411
408 #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) 412 #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
409 #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) 413 #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
410 414
411 #define FRAME_FONT(f) ((f)->output_data.mac->font) 415 #define FRAME_FONT(f) ((f)->output_data.mac->font)
424 #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info) 428 #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info)
425 #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info) 429 #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info)
426 430
427 /* This is the `Display *' which frame F is on. */ 431 /* This is the `Display *' which frame F is on. */
428 #define FRAME_MAC_DISPLAY(f) (0) 432 #define FRAME_MAC_DISPLAY(f) (0)
433 #define FRAME_X_DISPLAY(f) (0)
429 434
430 /* This is the 'font_info *' which frame F has. */ 435 /* This is the 'font_info *' which frame F has. */
431 #define FRAME_MAC_FONT_TABLE(f) (FRAME_MAC_DISPLAY_INFO (f)->font_table) 436 #define FRAME_MAC_FONT_TABLE(f) (FRAME_MAC_DISPLAY_INFO (f)->font_table)
432 437
433 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ 438 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */
646 (PIXEL_TO_CHAR_ROW (f, ((height) \ 651 (PIXEL_TO_CHAR_ROW (f, ((height) \
647 - (f)->output_data.mac->internal_border_width))) 652 - (f)->output_data.mac->internal_border_width)))
648 653
649 struct frame * check_x_frame (Lisp_Object); 654 struct frame * check_x_frame (Lisp_Object);
650 655
656 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
657 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
658