comparison src/w32term.c @ 90072:cb67264d6096

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents fb79180b618d 15087a4cee39
children 6d92d69fae33
comparison
equal deleted inserted replaced
90071:f6b4d0ebf147 90072:cb67264d6096
1 /* Implementation of GUI terminal on the Microsoft W32 API. 1 /* Implementation of GUI terminal on the Microsoft W32 API.
2 Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001 2 Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001, 2005
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
844 Display Iterator 844 Display Iterator
845 ***********************************************************************/ 845 ***********************************************************************/
846 846
847 /* Function prototypes of this page. */ 847 /* Function prototypes of this page. */
848 848
849 static XCharStruct *w32_per_char_metric P_ ((XFontStruct *, 849 XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
850 wchar_t *, int));
851 static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, 850 static int w32_encode_char P_ ((int, wchar_t *, struct font_info *,
852 struct charset *, int *)); 851 struct charset *, int *));
853 852
854 853
855 /* Get metrics of character CHAR2B in FONT. Value is always non-null. 854 /* Get metrics of character CHAR2B in FONT. Value is always non-null.
983 982
984 return retval; 983 return retval;
985 } 984 }
986 985
987 986
988 static XCharStruct * 987 XCharStruct *
989 w32_per_char_metric (font, char2b, font_type) 988 w32_per_char_metric (font, char2b, font_type)
990 XFontStruct *font; 989 XFontStruct *font;
991 wchar_t *char2b; 990 wchar_t *char2b;
992 int /* enum w32_char_font_type */ font_type; 991 int /* enum w32_char_font_type */ font_type;
993 { 992 {
5444 5443
5445 FRAME_FONT (f) = (XFontStruct *) (fontp->font); 5444 FRAME_FONT (f) = (XFontStruct *) (fontp->font);
5446 FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset; 5445 FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
5447 FRAME_FONTSET (f) = -1; 5446 FRAME_FONTSET (f) = -1;
5448 5447
5449 FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f)); 5448 FRAME_COLUMN_WIDTH (f) = fontp->average_width;
5449 FRAME_SPACE_WIDTH (f) = fontp->space_width;
5450 FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f)); 5450 FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));
5451 5451
5452 compute_fringe_widths (f, 1); 5452 compute_fringe_widths (f, 1);
5453 5453
5454 /* Compute the scroll bar width in character columns. */ 5454 /* Compute the scroll bar width in character columns. */