[Emacs-diffs] Changes to emacs/src/w32term.h

[Kim F. Storm]

Index: emacs/src/w32term.h
diff -c emacs/src/w32term.h:1.52 emacs/src/w32term.h:1.53
*** emacs/src/w32term.h:1.52    Thu Mar  6 07:56:56 2003
--- emacs/src/w32term.h Sun Mar 16 15:48:21 2003
***************
*** 441,448 ****
--- 441,452 ----
    FULLSCREEN_MOVE_WAIT  = 8,
  };
  
+ /* Return the X output data for frame F.  */
+ #define FRAME_X_OUTPUT(f) ((f)->output_data.w32)
+ 
  /* Return the window associated with the frame F.  */
  #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc)
+ #define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc)
  
  #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
  #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
***************
*** 459,464 ****
--- 463,471 ----
  #define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info)
  #define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info)
  
+ /* This is the `Display *' which frame F is on.  */
+ #define FRAME_X_DISPLAY(f) (0)
+ 
  /* This is the 'font_info *' which frame F has.  */
  #define FRAME_W32_FONT_TABLE(f) (FRAME_W32_DISPLAY_INFO (f)->font_table)
  
***************
*** 851,853 ****
--- 858,869 ----
  EXFUN (Fx_display_color_p, 1);
  EXFUN (Fx_display_grayscale_p, 1);
  int image_ascent P_ ((struct image *, struct face *));
+ 
+ #define FONT_TYPE_FOR_UNIBYTE(font, ch)                       \
+   ((font)->bdf ? BDF_1D_FONT : ANSI_FONT)
+ 
+ #define FONT_TYPE_FOR_MULTIBYTE(font, ch)             \
+   (!(font)->bdf                                               \
+    ? UNICODE_FONT                                     \
+    : ((CHARSET_DIMENSION (CHAR_CHARSET ((ch))) == 1)  \
+       ? BDF_1D_FONT : BDF_2D_FONT))