diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-05-18 11:36:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-05-18 11:36:50 +0300 |
| commit | 784b56e25bda24e9c1e0689f1d71d3cf6fe5d552 (patch) | |
| tree | 1c3514e049c53075ecb594d44fcd3d9f584cd22f /src | |
| parent | 6b3868cb1469a6222498dba8220aec9e02d43c1e (diff) | |
| download | emacs-784b56e25bda24e9c1e0689f1d71d3cf6fe5d552.tar.gz | |
Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows.
src/w32term.c [GLYPH_DEBUG]: Add prototype for x_check_font.
(x_check_font) [GLYPH_DEBUG]: New function, copied from xterm.c
src/w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: Fix broken
reference to image_cache->refcount.
(x_create_tip_frame): Fix broken use of FRAME_IMAGE_CACHE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/w32fns.c | 4 | ||||
| -rw-r--r-- | src/w32term.c | 25 |
3 files changed, 38 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c72c8ae4d65..b3614db2d55 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2012-05-18 Eli Zaretskii <eliz@gnu.org> + + Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows. + + * w32term.c [GLYPH_DEBUG]: Add prototype for x_check_font. + (x_check_font) [GLYPH_DEBUG]: New function, copied from xterm.c + + * w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: Fix broken + reference to image_cache->refcount. + (x_create_tip_frame): Fix broken use of FRAME_IMAGE_CACHE. + 2012-05-17 Juri Linkov <juri@jurta.org> * search.c (Fword_search_regexp, Fword_search_backward) diff --git a/src/w32fns.c b/src/w32fns.c index a3ccb4ea3e5..f5161117f9d 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4003,7 +4003,7 @@ unwind_create_frame (Lisp_Object frame) #if GLYPH_DEBUG /* Check that reference counts are indeed correct. */ xassert (dpyinfo->reference_count == dpyinfo_refcount); - xassert (dpyinfo->image_cache->refcount == image_cache_refcount); + xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount); #endif return Qt; } @@ -5236,7 +5236,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, #if GLYPH_DEBUG image_cache_refcount = - FRAME_IMAGE_CACHE ? FRAME_IMAGE_CACHE (f)->refcount : 0; + FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ FRAME_KBOARD (f) = kb; diff --git a/src/w32term.c b/src/w32term.c index 18a3753f9e9..2ccd7574332 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -231,6 +231,10 @@ static void my_set_focus (struct frame *, HWND); static void my_set_foreground_window (HWND); static void my_destroy_window (struct frame *, HWND); +#if GLYPH_DEBUG +static void x_check_font (struct frame *, struct font *); +#endif + static Lisp_Object Qvendor_specific_keysyms; @@ -5906,6 +5910,27 @@ x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y) /*********************************************************************** + Fonts + ***********************************************************************/ + +#if GLYPH_DEBUG + +/* Check that FONT is valid on frame F. It is if it can be found in F's + font table. */ + +static void +x_check_font (struct frame *f, struct font *font) +{ + xassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX])); + if (font->driver->check) + xassert (font->driver->check (f, font) == 0); +} + +#endif /* GLYPH_DEBUG != 0 */ + + + +/*********************************************************************** Initialization ***********************************************************************/ |