aboutsummaryrefslogtreecommitdiffstats
path: root/src/xftfont.c
diff options
context:
space:
mode:
authorPaul Eggert2015-01-21 23:40:50 -0800
committerPaul Eggert2015-01-21 23:41:24 -0800
commitb631bb57cf84f880186035f7158c19237856e2ce (patch)
tree4529a22056f61a1ee4efdaf98d1003c31e98b149 /src/xftfont.c
parent7f4e7dd378c456b498c270b47b46aaae365a72ab (diff)
downloademacs-b631bb57cf84f880186035f7158c19237856e2ce.tar.gz
emacs-b631bb57cf84f880186035f7158c19237856e2ce.zip
Use bool for boolean in xfont.c, xftfont.c, xgselect.c
* xfont.c (xfont_driver, xfont_chars_supported) (xfont_text_extents): * xftfont.c (xftfont_get_colors, xftfont_open) (xftfont_prepare_face, xftfont_done_face) (xftfont_cached_font_ok): * xgselect.c (xg_select): Use bool for boolean.
Diffstat (limited to 'src/xftfont.c')
-rw-r--r--src/xftfont.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/xftfont.c b/src/xftfont.c
index 054b38e120f..0e8b876f1d3 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -85,7 +85,7 @@ xftfont_get_colors (struct frame *f, struct face *face, GC gc,
85 else 85 else
86 { 86 {
87 XGCValues xgcv; 87 XGCValues xgcv;
88 bool fg_done = 0, bg_done = 0; 88 bool fg_done = false, bg_done = false;
89 89
90 block_input (); 90 block_input ();
91 XGetGCValues (FRAME_X_DISPLAY (f), gc, 91 XGetGCValues (FRAME_X_DISPLAY (f), gc,
@@ -93,15 +93,15 @@ xftfont_get_colors (struct frame *f, struct face *face, GC gc,
93 if (xftface_info) 93 if (xftface_info)
94 { 94 {
95 if (xgcv.foreground == face->foreground) 95 if (xgcv.foreground == face->foreground)
96 *fg = xftface_info->xft_fg, fg_done = 1; 96 *fg = xftface_info->xft_fg, fg_done = true;
97 else if (xgcv.foreground == face->background) 97 else if (xgcv.foreground == face->background)
98 *fg = xftface_info->xft_bg, fg_done = 1; 98 *fg = xftface_info->xft_bg, fg_done = true;
99 if (! bg) 99 if (! bg)
100 bg_done = 1; 100 bg_done = true;
101 else if (xgcv.background == face->background) 101 else if (xgcv.background == face->background)
102 *bg = xftface_info->xft_bg, bg_done = 1; 102 *bg = xftface_info->xft_bg, bg_done = true;
103 else if (xgcv.background == face->foreground) 103 else if (xgcv.background == face->foreground)
104 *bg = xftface_info->xft_fg, bg_done = 1; 104 *bg = xftface_info->xft_fg, bg_done = true;
105 } 105 }
106 106
107 if (! (fg_done & bg_done)) 107 if (! (fg_done & bg_done))
@@ -434,7 +434,7 @@ xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
434 font->baseline_offset = 0; 434 font->baseline_offset = 0;
435 font->relative_compose = 0; 435 font->relative_compose = 0;
436 font->default_ascent = 0; 436 font->default_ascent = 0;
437 font->vertical_centering = 0; 437 font->vertical_centering = false;
438#ifdef FT_BDF_H 438#ifdef FT_BDF_H
439 if (! (ft_face->face_flags & FT_FACE_FLAG_SFNT)) 439 if (! (ft_face->face_flags & FT_FACE_FLAG_SFNT))
440 { 440 {
@@ -487,7 +487,7 @@ xftfont_prepare_face (struct frame *f, struct face *face)
487{ 487{
488 struct xftface_info *xftface_info; 488 struct xftface_info *xftface_info;
489 489
490#if 0 490#if false
491 /* This doesn't work if face->ascii_face doesn't use an Xft font. */ 491 /* This doesn't work if face->ascii_face doesn't use an Xft font. */
492 if (face != face->ascii_face) 492 if (face != face->ascii_face)
493 { 493 {
@@ -507,7 +507,7 @@ xftfont_done_face (struct frame *f, struct face *face)
507{ 507{
508 struct xftface_info *xftface_info; 508 struct xftface_info *xftface_info;
509 509
510#if 0 510#if false
511 /* This doesn't work if face->ascii_face doesn't use an Xft font. */ 511 /* This doesn't work if face->ascii_face doesn't use an Xft font. */
512 if (face != face->ascii_face 512 if (face != face->ascii_face
513 || ! face->extra) 513 || ! face->extra)
@@ -682,7 +682,7 @@ xftfont_cached_font_ok (struct frame *f, Lisp_Object font_object,
682 Display *display = FRAME_X_DISPLAY (f); 682 Display *display = FRAME_X_DISPLAY (f);
683 FcPattern *pat = FcPatternCreate (); 683 FcPattern *pat = FcPatternCreate ();
684 FcBool b1, b2; 684 FcBool b1, b2;
685 bool ok = 0; 685 bool ok = false;
686 int i1, i2, r1, r2; 686 int i1, i2, r1, r2;
687 687
688 xftfont_add_rendering_parameters (pat, entity); 688 xftfont_add_rendering_parameters (pat, entity);
@@ -712,7 +712,7 @@ xftfont_cached_font_ok (struct frame *f, Lisp_Object font_object,
712 r2 = FcPatternGetInteger (oldpat, FC_RGBA, 0, &i2); 712 r2 = FcPatternGetInteger (oldpat, FC_RGBA, 0, &i2);
713 if (r1 != r2 || i1 != i2) goto out; 713 if (r1 != r2 || i1 != i2) goto out;
714 714
715 ok = 1; 715 ok = true;
716 out: 716 out:
717 FcPatternDestroy (pat); 717 FcPatternDestroy (pat);
718 return ok; 718 return ok;