X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/56a70cca39b4a6bf336dcc97ff20f7481046024b..bdeb0411a2fd52eb75cac953987b690a9f6d3011:/src/w32font.h

diff --git a/src/w32font.h b/src/w32font.h
index 6345d59c71..748b329f8d 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -3,10 +3,10 @@
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_W32FONT_H
 #define EMACS_W32FONT_H
@@ -51,12 +49,17 @@ struct w32_metric_cache
 struct w32font_info
 {
   struct font font;
-  TEXTMETRIC metrics;
+  TEXTMETRICW metrics;
   unsigned int glyph_idx;
   struct w32_metric_cache **cached_metrics;
   int n_cache_blocks;
+  HFONT hfont;
 };
 
+/* Macros for getting OS specific information from a font struct.  */
+#define FONT_HANDLE(f) (((struct w32font_info *)(f))->hfont)
+#define FONT_TEXTMETRIC(f) (((struct w32font_info *)(f))->metrics)
+
 #define CACHE_BLOCKSIZE 128
 
 Lisp_Object w32font_get_cache P_ ((FRAME_PTR fe));
@@ -67,7 +70,7 @@ Lisp_Object w32font_match_internal P_ ((Lisp_Object frame,
                                         Lisp_Object font_spec,
                                         int opentype_only));
 int w32font_open_internal P_ ((FRAME_PTR f, Lisp_Object font_entity,
-                               int pixel_size, struct w32font_info *w32_font));
+                               int pixel_size, Lisp_Object font_object));
 void w32font_close P_ ((FRAME_PTR f, struct font *font));
 int w32font_has_char P_ ((Lisp_Object entity, int c));
 int w32font_text_extents P_ ((struct font *font, unsigned *code, int nglyphs,