/[emacs]/emacs/src/w32term.c
ViewVC logotype

Diff of /emacs/src/w32term.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.220 by jhd, Sat Dec 11 21:12:45 2004 UTC revision 1.221 by jasonr, Mon Jan 3 22:52:51 2005 UTC
# Line 819  w32_reset_terminal_modes (void) Line 819  w32_reset_terminal_modes (void)
819    
820  /* Function prototypes of this page.  */  /* Function prototypes of this page.  */
821    
822  static XCharStruct *w32_per_char_metric P_ ((XFontStruct *,  XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
                                              wchar_t *, int));  
823  static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *));  static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *));
824    
825    
# Line 957  w32_native_per_char_metric (font, char2b Line 956  w32_native_per_char_metric (font, char2b
956  }  }
957    
958    
959  static XCharStruct *  XCharStruct *
960  w32_per_char_metric (font, char2b, font_type)  w32_per_char_metric (font, char2b, font_type)
961       XFontStruct *font;       XFontStruct *font;
962       wchar_t *char2b;       wchar_t *char2b;
# Line 5290  x_new_font (f, fontname) Line 5289  x_new_font (f, fontname)
5289    FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;    FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
5290    FRAME_FONTSET (f) = -1;    FRAME_FONTSET (f) = -1;
5291    
5292    FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f));    FRAME_COLUMN_WIDTH (f) = fontp->average_width;
5293      FRAME_SPACE_WIDTH (f) = fontp->space_width;
5294    FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));    FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));
5295    
5296    compute_fringe_widths (f, 1);    compute_fringe_widths (f, 1);

Legend:
Removed from v.1.220  
changed lines
  Added in v.1.221

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26