aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2015-01-26 21:57:51 +0100
committerJoakim Verona2015-01-26 21:57:51 +0100
commitd464b0ee300a1919f4398195974396e3e3d66d57 (patch)
treed05753de64e4611c3fa1695cfdb037e8036e6980 /src
parentf93da81268bb784d51d83db9413a6e9259aacfe1 (diff)
parent81f7fcb4b8a4f370162def4fd42fd62674db96a5 (diff)
downloademacs-d464b0ee300a1919f4398195974396e3e3d66d57.tar.gz
emacs-d464b0ee300a1919f4398195974396e3e3d66d57.zip
merge master
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog54
-rw-r--r--src/image.c16
-rw-r--r--src/w32fns.c79
-rw-r--r--src/w32term.c119
-rw-r--r--src/w32term.h2
-rw-r--r--src/xfaces.c4
-rw-r--r--src/xfns.c219
-rw-r--r--src/xterm.h6
8 files changed, 276 insertions, 223 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b137045f216..eb823b3e152 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,59 @@
12015-01-26 Andreas Schwab <schwab@linux-m68k.org>
2
3 * image.c (lookup_pixel_color): Reorder conditions that are
4 written backwards.
5 (x_to_xcolors): Likewise.
6 (x_detect_edges): Likewise.
7 (png_load_body): Likewise.
8 (gif_close): Likewise.
9 (gif_load): Likewise.
10
112015-01-25 Eli Zaretskii <eliz@gnu.org>
12
13 Use bool for boolean in w32term.c
14 * w32term.c (x_update_window_begin, x_update_window_end)
15 (x_update_end, x_after_update_window_line)
16 (x_set_glyph_string_gc, x_draw_glyph_string_background)
17 (x_draw_glyph_string_foreground)
18 (x_draw_composite_glyph_string_foreground)
19 (x_draw_glyphless_glyph_string_foreground)
20 (x_draw_image_glyph_string, x_draw_glyph_string)
21 (x_draw_stretch_glyph_string, note_mouse_movement)
22 (w32_mouse_position, x_scroll_bar_report_motion)
23 (x_horizontal_scroll_bar_report_motion, w32_read_socket)
24 (w32_set_vertical_scroll_bar, w32_set_horizontal_scroll_bar)
25 (w32_draw_window_cursor, x_new_font, x_set_offset)
26 (x_set_window_size, x_make_frame_invisible, x_iconify_frame): Use
27 bool where appropriate.
28
29 Use bool for boolean in w32fns.c
30 * w32fns.c (w32_defined_color, x_decode_color)
31 (Fxw_color_defined_p, Fxw_color_values, x_set_icon_type)
32 (x_set_menu_bar_lines, x_change_tool_bar_height)
33 (x_set_internal_border_width, x_explicitly_set_name)
34 (x_implicitly_set_name, Fx_create_frame, w32_window)
35 (x_create_tip_frame, Fx_show_tip): Use bool where appropriate.
36
12015-01-25 Paul Eggert <eggert@cs.ucla.edu> 372015-01-25 Paul Eggert <eggert@cs.ucla.edu>
2 38
39 Use bool for boolean in xfns.c
40 * xfaces.c (x_update_menu_appearance):
41 * xfns.c (x_real_positions, x_defined_color, x_decode_color)
42 (xg_set_icon, xg_set_icon_from_xpm_data, x_set_cursor_color)
43 (x_set_icon_type, x_set_icon_name, x_set_menu_bar_lines)
44 (x_change_tool_bar_height, x_set_internal_border_width)
45 (x_encode_text, x_set_name_internal, x_explicitly_set_name)
46 (x_implicitly_set_name, x_default_scroll_bar_color_parameter)
47 (hack_wm_protocols, xic_create_fontsetname, xic_free_xfontset)
48 (x_window, x_icon, Fx_wm_set_size_hint, Fx_create_frame)
49 (Fxw_color_defined_p, Fxw_color_values, x_create_tip_frame)
50 (Fx_show_tip, clean_up_file_dialog, Fx_file_dialog)
51 (clean_up_dialog, syms_of_xfns):
52 * xterm.h (xg_set_icon, xg_set_icon_from_xpm_data)
53 (xic_create_fontsetname):
54 Use bool for boolean.
55 * xfns.c: Include bitmaps/gray.xbm unconditionally.
56
3 Count MANY function args more reliably 57 Count MANY function args more reliably
4 * alloc.c (Fgc_status, purecopy, unbind_to, garbage_collect_1): 58 * alloc.c (Fgc_status, purecopy, unbind_to, garbage_collect_1):
5 * buffer.c (Fbuffer_list, Fkill_buffer): 59 * buffer.c (Fbuffer_list, Fkill_buffer):
diff --git a/src/image.c b/src/image.c
index 9c09c5596b9..df299bbd164 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4423,7 +4423,7 @@ lookup_pixel_color (struct frame *f, unsigned long pixel)
4423 Colormap cmap; 4423 Colormap cmap;
4424 bool rc; 4424 bool rc;
4425 4425
4426 if (ct_colors_allocated_max <= ct_colors_allocated) 4426 if (ct_colors_allocated >= ct_colors_allocated_max)
4427 return FRAME_FOREGROUND_PIXEL (f); 4427 return FRAME_FOREGROUND_PIXEL (f);
4428 4428
4429#ifdef HAVE_X_WINDOWS 4429#ifdef HAVE_X_WINDOWS
@@ -4554,7 +4554,7 @@ x_to_xcolors (struct frame *f, struct image *img, bool rgb_p)
4554 HGDIOBJ prev; 4554 HGDIOBJ prev;
4555#endif /* HAVE_NTGUI */ 4555#endif /* HAVE_NTGUI */
4556 4556
4557 if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *colors / img->width < img->height) 4557 if (img->height > min (PTRDIFF_MAX, SIZE_MAX) / sizeof *colors / img->width)
4558 memory_full (SIZE_MAX); 4558 memory_full (SIZE_MAX);
4559 colors = xmalloc (sizeof *colors * img->width * img->height); 4559 colors = xmalloc (sizeof *colors * img->width * img->height);
4560 4560
@@ -4695,7 +4695,7 @@ x_detect_edges (struct frame *f, struct image *img, int *matrix, int color_adjus
4695 4695
4696#define COLOR(A, X, Y) ((A) + (Y) * img->width + (X)) 4696#define COLOR(A, X, Y) ((A) + (Y) * img->width + (X))
4697 4697
4698 if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *new / img->width < img->height) 4698 if (img->height > min (PTRDIFF_MAX, SIZE_MAX) / sizeof *new / img->width)
4699 memory_full (SIZE_MAX); 4699 memory_full (SIZE_MAX);
4700 new = xmalloc (sizeof *new * img->width * img->height); 4700 new = xmalloc (sizeof *new * img->width * img->height);
4701 4701
@@ -5917,8 +5917,8 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
5917 row_bytes = png_get_rowbytes (png_ptr, info_ptr); 5917 row_bytes = png_get_rowbytes (png_ptr, info_ptr);
5918 5918
5919 /* Allocate memory for the image. */ 5919 /* Allocate memory for the image. */
5920 if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *rows < height 5920 if (height > min (PTRDIFF_MAX, SIZE_MAX) / sizeof *rows
5921 || min (PTRDIFF_MAX, SIZE_MAX) / sizeof *pixels / height < row_bytes) 5921 || row_bytes > min (PTRDIFF_MAX, SIZE_MAX) / sizeof *pixels / height)
5922 memory_full (SIZE_MAX); 5922 memory_full (SIZE_MAX);
5923 c->pixels = pixels = xmalloc (sizeof *pixels * row_bytes * height); 5923 c->pixels = pixels = xmalloc (sizeof *pixels * row_bytes * height);
5924 c->rows = rows = xmalloc (height * sizeof *rows); 5924 c->rows = rows = xmalloc (height * sizeof *rows);
@@ -7235,7 +7235,7 @@ gif_image_p (Lisp_Object object)
7235# ifdef WINDOWSNT 7235# ifdef WINDOWSNT
7236 7236
7237/* GIF library details. */ 7237/* GIF library details. */
7238# if 5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR) 7238# if GIFLIB_MAJOR + (GIFLIB_MINOR >= 1) > 5
7239DEF_DLL_FN (int, DGifCloseFile, (GifFileType *, int *)); 7239DEF_DLL_FN (int, DGifCloseFile, (GifFileType *, int *));
7240# else 7240# else
7241DEF_DLL_FN (int, DGifCloseFile, (GifFileType *)); 7241DEF_DLL_FN (int, DGifCloseFile, (GifFileType *));
@@ -7316,7 +7316,7 @@ gif_close (GifFileType *gif, int *err)
7316{ 7316{
7317 int retval; 7317 int retval;
7318 7318
7319#if 5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR) 7319#if GIFLIB_MAJOR + (GIFLIB_MINOR >= 1) > 5
7320 retval = DGifCloseFile (gif, err); 7320 retval = DGifCloseFile (gif, err);
7321#else 7321#else
7322 retval = DGifCloseFile (gif); 7322 retval = DGifCloseFile (gif);
@@ -7471,7 +7471,7 @@ gif_load (struct frame *f, struct image *img)
7471 int subimg_height = subimage->ImageDesc.Height; 7471 int subimg_height = subimage->ImageDesc.Height;
7472 int subimg_top = subimage->ImageDesc.Top; 7472 int subimg_top = subimage->ImageDesc.Top;
7473 int subimg_left = subimage->ImageDesc.Left; 7473 int subimg_left = subimage->ImageDesc.Left;
7474 if (! (0 <= subimg_width && 0 <= subimg_height 7474 if (! (subimg_width >= 0 && subimg_height >= 0
7475 && 0 <= subimg_top && subimg_top <= height - subimg_height 7475 && 0 <= subimg_top && subimg_top <= height - subimg_height
7476 && 0 <= subimg_left && subimg_left <= width - subimg_width)) 7476 && 0 <= subimg_left && subimg_left <= width - subimg_width))
7477 { 7477 {
diff --git a/src/w32fns.c b/src/w32fns.c
index 55e58294629..c269c4f8e68 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1133,7 +1133,8 @@ gamma_correct (struct frame *f, COLORREF *color)
1133 If ALLOC is nonzero, allocate a new colormap cell. */ 1133 If ALLOC is nonzero, allocate a new colormap cell. */
1134 1134
1135int 1135int
1136w32_defined_color (struct frame *f, const char *color, XColor *color_def, int alloc) 1136w32_defined_color (struct frame *f, const char *color, XColor *color_def,
1137 bool alloc_p)
1137{ 1138{
1138 register Lisp_Object tem; 1139 register Lisp_Object tem;
1139 COLORREF w32_color_ref; 1140 COLORREF w32_color_ref;
@@ -1167,7 +1168,7 @@ w32_defined_color (struct frame *f, const char *color, XColor *color_def, int al
1167 entry = entry->next; 1168 entry = entry->next;
1168 } 1169 }
1169 1170
1170 if (entry == NULL && alloc) 1171 if (entry == NULL && alloc_p)
1171 { 1172 {
1172 /* not already mapped, so add to list */ 1173 /* not already mapped, so add to list */
1173 entry = xmalloc (sizeof (struct w32_palette_entry)); 1174 entry = xmalloc (sizeof (struct w32_palette_entry));
@@ -1220,7 +1221,7 @@ x_decode_color (struct frame *f, Lisp_Object arg, int def)
1220 1221
1221 /* w32_defined_color is responsible for coping with failures 1222 /* w32_defined_color is responsible for coping with failures
1222 by looking for a near-miss. */ 1223 by looking for a near-miss. */
1223 if (w32_defined_color (f, SDATA (arg), &cdef, 1)) 1224 if (w32_defined_color (f, SDATA (arg), &cdef, true))
1224 return cdef.pixel; 1225 return cdef.pixel;
1225 1226
1226 /* defined_color failed; return an ultimate default. */ 1227 /* defined_color failed; return an ultimate default. */
@@ -1524,7 +1525,7 @@ x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1524void 1525void
1525x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 1526x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1526{ 1527{
1527 int result; 1528 bool result;
1528 1529
1529 if (NILP (arg) && NILP (oldval)) 1530 if (NILP (arg) && NILP (oldval))
1530 return; 1531 return;
@@ -1632,7 +1633,7 @@ x_set_internal_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldva
1632 1633
1633 if (FRAME_X_WINDOW (f) != 0) 1634 if (FRAME_X_WINDOW (f) != 0)
1634 { 1635 {
1635 adjust_frame_size (f, -1, -1, 3, 0, Qinternal_border_width); 1636 adjust_frame_size (f, -1, -1, 3, false, Qinternal_border_width);
1636 1637
1637 if (FRAME_VISIBLE_P (f)) 1638 if (FRAME_VISIBLE_P (f))
1638 x_clear_under_internal_border (f); 1639 x_clear_under_internal_border (f);
@@ -1678,7 +1679,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
1678 of the outer rectangle (including decorations) unchanged, and a 1679 of the outer rectangle (including decorations) unchanged, and a
1679 second time because we want to keep the height of the inner 1680 second time because we want to keep the height of the inner
1680 rectangle (without the decorations unchanged). */ 1681 rectangle (without the decorations unchanged). */
1681 adjust_frame_size (f, -1, -1, 2, 1, Qmenu_bar_lines); 1682 adjust_frame_size (f, -1, -1, 2, true, Qmenu_bar_lines);
1682 1683
1683 /* Not sure whether this is needed. */ 1684 /* Not sure whether this is needed. */
1684 x_clear_under_internal_border (f); 1685 x_clear_under_internal_border (f);
@@ -1748,7 +1749,7 @@ x_change_tool_bar_height (struct frame *f, int height)
1748 (!f->tool_bar_redisplayed_once ? 1 1749 (!f->tool_bar_redisplayed_once ? 1
1749 : (old_height == 0 || height == 0) ? 2 1750 : (old_height == 0 || height == 0) ? 2
1750 : 4), 1751 : 4),
1751 0, Qtool_bar_lines); 1752 false, Qtool_bar_lines);
1752 1753
1753 /* adjust_frame_size might not have done anything, garbage frame 1754 /* adjust_frame_size might not have done anything, garbage frame
1754 here. */ 1755 here. */
@@ -1771,7 +1772,7 @@ x_change_tool_bar_height (struct frame *f, int height)
1771 F->explicit_name is set, ignore the new name; otherwise, set it. */ 1772 F->explicit_name is set, ignore the new name; otherwise, set it. */
1772 1773
1773void 1774void
1774x_set_name (struct frame *f, Lisp_Object name, int explicit) 1775x_set_name (struct frame *f, Lisp_Object name, bool explicit)
1775{ 1776{
1776 /* Make sure that requests from lisp code override requests from 1777 /* Make sure that requests from lisp code override requests from
1777 Emacs redisplay code. */ 1778 Emacs redisplay code. */
@@ -1826,7 +1827,7 @@ x_set_name (struct frame *f, Lisp_Object name, int explicit)
1826void 1827void
1827x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 1828x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1828{ 1829{
1829 x_set_name (f, arg, 1); 1830 x_set_name (f, arg, true);
1830} 1831}
1831 1832
1832/* This function should be called by Emacs redisplay code to set the 1833/* This function should be called by Emacs redisplay code to set the
@@ -1835,7 +1836,7 @@ x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1835void 1836void
1836x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 1837x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1837{ 1838{
1838 x_set_name (f, arg, 0); 1839 x_set_name (f, arg, false);
1839} 1840}
1840 1841
1841/* Change the title of frame F to NAME. 1842/* Change the title of frame F to NAME.
@@ -4199,7 +4200,7 @@ my_create_tip_window (struct frame *f)
4199/* Create and set up the w32 window for frame F. */ 4200/* Create and set up the w32 window for frame F. */
4200 4201
4201static void 4202static void
4202w32_window (struct frame *f, long window_prompting, int minibuffer_only) 4203w32_window (struct frame *f, long window_prompting, bool minibuffer_only)
4203{ 4204{
4204 block_input (); 4205 block_input ();
4205 4206
@@ -4418,7 +4419,7 @@ This function is an internal primitive--use `make-frame' instead. */)
4418 struct frame *f; 4419 struct frame *f;
4419 Lisp_Object frame, tem; 4420 Lisp_Object frame, tem;
4420 Lisp_Object name; 4421 Lisp_Object name;
4421 int minibuffer_only = 0; 4422 bool minibuffer_only = false;
4422 long window_prompting = 0; 4423 long window_prompting = 0;
4423 ptrdiff_t count = SPECPDL_INDEX (); 4424 ptrdiff_t count = SPECPDL_INDEX ();
4424 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; 4425 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
@@ -4478,12 +4479,12 @@ This function is an internal primitive--use `make-frame' instead. */)
4478 else if (EQ (tem, Qonly)) 4479 else if (EQ (tem, Qonly))
4479 { 4480 {
4480 f = make_minibuffer_frame (); 4481 f = make_minibuffer_frame ();
4481 minibuffer_only = 1; 4482 minibuffer_only = true;
4482 } 4483 }
4483 else if (WINDOWP (tem)) 4484 else if (WINDOWP (tem))
4484 f = make_frame_without_minibuffer (tem, kb, display); 4485 f = make_frame_without_minibuffer (tem, kb, display);
4485 else 4486 else
4486 f = make_frame (1); 4487 f = make_frame (true);
4487 4488
4488 XSETFRAME (frame, f); 4489 XSETFRAME (frame, f);
4489 4490
@@ -4520,12 +4521,12 @@ This function is an internal primitive--use `make-frame' instead. */)
4520 /* Cast to UINT_PTR shuts up compiler warnings about cast to 4521 /* Cast to UINT_PTR shuts up compiler warnings about cast to
4521 pointer from integer of different size. */ 4522 pointer from integer of different size. */
4522 f->output_data.w32->parent_desc = (Window) (UINT_PTR) XFASTINT (parent); 4523 f->output_data.w32->parent_desc = (Window) (UINT_PTR) XFASTINT (parent);
4523 f->output_data.w32->explicit_parent = 1; 4524 f->output_data.w32->explicit_parent = true;
4524 } 4525 }
4525 else 4526 else
4526 { 4527 {
4527 f->output_data.w32->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; 4528 f->output_data.w32->parent_desc = FRAME_DISPLAY_INFO (f)->root_window;
4528 f->output_data.w32->explicit_parent = 0; 4529 f->output_data.w32->explicit_parent = false;
4529 } 4530 }
4530 4531
4531 /* Set the name; the functions to which we pass f expect the name to 4532 /* Set the name; the functions to which we pass f expect the name to
@@ -4533,12 +4534,12 @@ This function is an internal primitive--use `make-frame' instead. */)
4533 if (EQ (name, Qunbound) || NILP (name)) 4534 if (EQ (name, Qunbound) || NILP (name))
4534 { 4535 {
4535 fset_name (f, build_string (dpyinfo->w32_id_name)); 4536 fset_name (f, build_string (dpyinfo->w32_id_name));
4536 f->explicit_name = 0; 4537 f->explicit_name = false;
4537 } 4538 }
4538 else 4539 else
4539 { 4540 {
4540 fset_name (f, name); 4541 fset_name (f, name);
4541 f->explicit_name = 1; 4542 f->explicit_name = true;
4542 /* Use the frame's title when getting resources for this frame. */ 4543 /* Use the frame's title when getting resources for this frame. */
4543 specbind (Qx_resource_name, name); 4544 specbind (Qx_resource_name, name);
4544 } 4545 }
@@ -4616,7 +4617,7 @@ This function is an internal primitive--use `make-frame' instead. */)
4616 had one frame line vs one toolbar line which left us with a zero 4617 had one frame line vs one toolbar line which left us with a zero
4617 root window height which was obviously wrong as well ... */ 4618 root window height which was obviously wrong as well ... */
4618 adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), 4619 adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
4619 FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, 1, 4620 FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, true,
4620 Qx_create_frame_1); 4621 Qx_create_frame_1);
4621 4622
4622 /* The X resources controlling the menu-bar and tool-bar are 4623 /* The X resources controlling the menu-bar and tool-bar are
@@ -4651,7 +4652,7 @@ This function is an internal primitive--use `make-frame' instead. */)
4651 4652
4652 f->output_data.w32->current_cursor = f->output_data.w32->nontext_cursor; 4653 f->output_data.w32->current_cursor = f->output_data.w32->nontext_cursor;
4653 4654
4654 window_prompting = x_figure_window_size (f, parameters, 1); 4655 window_prompting = x_figure_window_size (f, parameters, true);
4655 4656
4656 tem = x_get_arg (dpyinfo, parameters, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); 4657 tem = x_get_arg (dpyinfo, parameters, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
4657 f->no_split = minibuffer_only || EQ (tem, Qt); 4658 f->no_split = minibuffer_only || EQ (tem, Qt);
@@ -4685,14 +4686,14 @@ This function is an internal primitive--use `make-frame' instead. */)
4685 /* Allow x_set_window_size, now. */ 4686 /* Allow x_set_window_size, now. */
4686 f->can_x_set_window_size = true; 4687 f->can_x_set_window_size = true;
4687 4688
4688 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, 1, 4689 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, true,
4689 Qx_create_frame_2); 4690 Qx_create_frame_2);
4690 4691
4691 /* Tell the server what size and position, etc, we want, and how 4692 /* Tell the server what size and position, etc, we want, and how
4692 badly we want them. This should be done after we have the menu 4693 badly we want them. This should be done after we have the menu
4693 bar so that its size can be taken into account. */ 4694 bar so that its size can be taken into account. */
4694 block_input (); 4695 block_input ();
4695 x_wm_set_size_hint (f, window_prompting, 0); 4696 x_wm_set_size_hint (f, window_prompting, false);
4696 unblock_input (); 4697 unblock_input ();
4697 4698
4698 /* Make the window appear on the frame and enable display, unless 4699 /* Make the window appear on the frame and enable display, unless
@@ -4762,7 +4763,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
4762 4763
4763 CHECK_STRING (color); 4764 CHECK_STRING (color);
4764 4765
4765 if (w32_defined_color (f, SDATA (color), &foo, 0)) 4766 if (w32_defined_color (f, SDATA (color), &foo, false))
4766 return Qt; 4767 return Qt;
4767 else 4768 else
4768 return Qnil; 4769 return Qnil;
@@ -4777,7 +4778,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
4777 4778
4778 CHECK_STRING (color); 4779 CHECK_STRING (color);
4779 4780
4780 if (w32_defined_color (f, SDATA (color), &foo, 0)) 4781 if (w32_defined_color (f, SDATA (color), &foo, false))
4781 return list3i ((GetRValue (foo.pixel) << 8) | GetRValue (foo.pixel), 4782 return list3i ((GetRValue (foo.pixel) << 8) | GetRValue (foo.pixel),
4782 (GetGValue (foo.pixel) << 8) | GetGValue (foo.pixel), 4783 (GetGValue (foo.pixel) << 8) | GetGValue (foo.pixel),
4783 (GetBValue (foo.pixel) << 8) | GetBValue (foo.pixel)); 4784 (GetBValue (foo.pixel) << 8) | GetBValue (foo.pixel));
@@ -5647,7 +5648,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5647 frame = Qnil; 5648 frame = Qnil;
5648 GCPRO3 (parms, name, frame); 5649 GCPRO3 (parms, name, frame);
5649 /* Make a frame without minibuffer nor mode-line. */ 5650 /* Make a frame without minibuffer nor mode-line. */
5650 f = make_frame (0); 5651 f = make_frame (false);
5651 f->wants_modeline = 0; 5652 f->wants_modeline = 0;
5652 XSETFRAME (frame, f); 5653 XSETFRAME (frame, f);
5653 5654
@@ -5655,7 +5656,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5655 buffer = Fget_buffer_create (tip); 5656 buffer = Fget_buffer_create (tip);
5656 /* Use set_window_buffer instead of Fset_window_buffer (see 5657 /* Use set_window_buffer instead of Fset_window_buffer (see
5657 discussion of bug#11984, bug#12025, bug#12026). */ 5658 discussion of bug#11984, bug#12025, bug#12026). */
5658 set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, 0, 0); 5659 set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, false, false);
5659 old_buffer = current_buffer; 5660 old_buffer = current_buffer;
5660 set_buffer_internal_1 (XBUFFER (buffer)); 5661 set_buffer_internal_1 (XBUFFER (buffer));
5661 bset_truncate_lines (current_buffer, Qnil); 5662 bset_truncate_lines (current_buffer, Qnil);
@@ -5685,19 +5686,19 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5685#endif /* GLYPH_DEBUG */ 5686#endif /* GLYPH_DEBUG */
5686 FRAME_KBOARD (f) = kb; 5687 FRAME_KBOARD (f) = kb;
5687 f->output_data.w32->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; 5688 f->output_data.w32->parent_desc = FRAME_DISPLAY_INFO (f)->root_window;
5688 f->output_data.w32->explicit_parent = 0; 5689 f->output_data.w32->explicit_parent = false;
5689 5690
5690 /* Set the name; the functions to which we pass f expect the name to 5691 /* Set the name; the functions to which we pass f expect the name to
5691 be set. */ 5692 be set. */
5692 if (EQ (name, Qunbound) || NILP (name)) 5693 if (EQ (name, Qunbound) || NILP (name))
5693 { 5694 {
5694 fset_name (f, build_string (dpyinfo->w32_id_name)); 5695 fset_name (f, build_string (dpyinfo->w32_id_name));
5695 f->explicit_name = 0; 5696 f->explicit_name = false;
5696 } 5697 }
5697 else 5698 else
5698 { 5699 {
5699 fset_name (f, name); 5700 fset_name (f, name);
5700 f->explicit_name = 1; 5701 f->explicit_name = true;
5701 /* use the frame's title when getting resources for this frame. */ 5702 /* use the frame's title when getting resources for this frame. */
5702 specbind (Qx_resource_name, name); 5703 specbind (Qx_resource_name, name);
5703 } 5704 }
@@ -5758,7 +5759,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5758 f->output_data.w32->dwStyle = WS_BORDER | WS_POPUP | WS_DISABLED; 5759 f->output_data.w32->dwStyle = WS_BORDER | WS_POPUP | WS_DISABLED;
5759 f->output_data.w32->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; 5760 f->output_data.w32->parent_desc = FRAME_DISPLAY_INFO (f)->root_window;
5760 5761
5761 window_prompting = x_figure_window_size (f, parms, 0); 5762 window_prompting = x_figure_window_size (f, parms, false);
5762 5763
5763 /* No fringes on tip frame. */ 5764 /* No fringes on tip frame. */
5764 f->fringe_cols = 0; 5765 f->fringe_cols = 0;
@@ -5786,7 +5787,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5786 SET_FRAME_COLS (f, 0); 5787 SET_FRAME_COLS (f, 0);
5787 SET_FRAME_LINES (f, 0); 5788 SET_FRAME_LINES (f, 0);
5788 adjust_frame_size (f, width * FRAME_COLUMN_WIDTH (f), 5789 adjust_frame_size (f, width * FRAME_COLUMN_WIDTH (f),
5789 height * FRAME_LINE_HEIGHT (f), 0, 1, Qnil); 5790 height * FRAME_LINE_HEIGHT (f), 0, true, Qnil);
5790 5791
5791 /* Add `tooltip' frame parameter's default value. */ 5792 /* Add `tooltip' frame parameter's default value. */
5792 if (NILP (Fframe_parameter (frame, Qtooltip))) 5793 if (NILP (Fframe_parameter (frame, Qtooltip)))
@@ -5818,7 +5819,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5818 Fmodify_frame_parameters (frame, colors); 5819 Fmodify_frame_parameters (frame, colors);
5819 } 5820 }
5820 5821
5821 f->no_split = 1; 5822 f->no_split = true;
5822 5823
5823 UNGCPRO; 5824 UNGCPRO;
5824 5825
@@ -5965,7 +5966,8 @@ Text larger than the specified size is clipped. */)
5965 int root_x, root_y; 5966 int root_x, root_y;
5966 struct buffer *old_buffer; 5967 struct buffer *old_buffer;
5967 struct text_pos pos; 5968 struct text_pos pos;
5968 int i, width, height, seen_reversed_p; 5969 int i, width, height;
5970 bool seen_reversed_p;
5969 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; 5971 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
5970 int old_windows_or_buffers_changed = windows_or_buffers_changed; 5972 int old_windows_or_buffers_changed = windows_or_buffers_changed;
5971 ptrdiff_t count = SPECPDL_INDEX (); 5973 ptrdiff_t count = SPECPDL_INDEX ();
@@ -6094,7 +6096,7 @@ Text larger than the specified size is clipped. */)
6094 6096
6095 FRAME_TOTAL_COLS (f) = WINDOW_TOTAL_COLS (w); 6097 FRAME_TOTAL_COLS (f) = WINDOW_TOTAL_COLS (w);
6096 adjust_frame_glyphs (f); 6098 adjust_frame_glyphs (f);
6097 w->pseudo_window_p = 1; 6099 w->pseudo_window_p = true;
6098 6100
6099 /* Display the tooltip text in a temporary buffer. */ 6101 /* Display the tooltip text in a temporary buffer. */
6100 old_buffer = current_buffer; 6102 old_buffer = current_buffer;
@@ -6106,7 +6108,8 @@ Text larger than the specified size is clipped. */)
6106 try_window (FRAME_ROOT_WINDOW (f), pos, TRY_WINDOW_IGNORE_FONTS_CHANGE); 6108 try_window (FRAME_ROOT_WINDOW (f), pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
6107 6109
6108 /* Compute width and height of the tooltip. */ 6110 /* Compute width and height of the tooltip. */
6109 width = height = seen_reversed_p = 0; 6111 width = height = 0;
6112 seen_reversed_p = false;
6110 for (i = 0; i < w->desired_matrix->nrows; ++i) 6113 for (i = 0; i < w->desired_matrix->nrows; ++i)
6111 { 6114 {
6112 struct glyph_row *row = &w->desired_matrix->rows[i]; 6115 struct glyph_row *row = &w->desired_matrix->rows[i];
@@ -6118,7 +6121,7 @@ Text larger than the specified size is clipped. */)
6118 break; 6121 break;
6119 6122
6120 /* Let the row go over the full width of the frame. */ 6123 /* Let the row go over the full width of the frame. */
6121 row->full_width_p = 1; 6124 row->full_width_p = true;
6122 6125
6123 row_width = row->pixel_width; 6126 row_width = row->pixel_width;
6124 if (row->used[TEXT_AREA]) 6127 if (row->used[TEXT_AREA])
@@ -6142,7 +6145,7 @@ Text larger than the specified size is clipped. */)
6142 if (g->type == STRETCH_GLYPH && NILP (g->object)) 6145 if (g->type == STRETCH_GLYPH && NILP (g->object))
6143 { 6146 {
6144 row_width -= g->pixel_width; 6147 row_width -= g->pixel_width;
6145 seen_reversed_p = 1; 6148 seen_reversed_p = true;
6146 } 6149 }
6147 } 6150 }
6148 } 6151 }
@@ -6183,7 +6186,7 @@ Text larger than the specified size is clipped. */)
6183 6186
6184 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row)) 6187 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
6185 break; 6188 break;
6186 row->full_width_p = 1; 6189 row->full_width_p = true;
6187 row_width = row->pixel_width; 6190 row_width = row->pixel_width;
6188 if (row->used[TEXT_AREA] && !row->reversed_p) 6191 if (row->used[TEXT_AREA] && !row->reversed_p)
6189 { 6192 {
diff --git a/src/w32term.c b/src/w32term.c
index ce28e05a45b..251c46c73cf 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -559,7 +559,7 @@ x_update_window_begin (struct window *w)
559 if (f == hlinfo->mouse_face_mouse_frame) 559 if (f == hlinfo->mouse_face_mouse_frame)
560 { 560 {
561 /* Don't do highlighting for mouse motion during the update. */ 561 /* Don't do highlighting for mouse motion during the update. */
562 hlinfo->mouse_face_defer = 1; 562 hlinfo->mouse_face_defer = true;
563 563
564 /* If F needs to be redrawn, simply forget about any prior mouse 564 /* If F needs to be redrawn, simply forget about any prior mouse
565 highlighting. */ 565 highlighting. */
@@ -682,11 +682,11 @@ x_update_window_end (struct window *w, bool cursor_on_p,
682 block_input (); 682 block_input ();
683 683
684 if (cursor_on_p) 684 if (cursor_on_p)
685 display_and_set_cursor (w, 1, 685 display_and_set_cursor (w, true,
686 w->output_cursor.hpos, w->output_cursor.vpos, 686 w->output_cursor.hpos, w->output_cursor.vpos,
687 w->output_cursor.x, w->output_cursor.y); 687 w->output_cursor.x, w->output_cursor.y);
688 688
689 if (draw_window_fringes (w, 1)) 689 if (draw_window_fringes (w, true))
690 { 690 {
691 if (WINDOW_RIGHT_DIVIDER_WIDTH (w)) 691 if (WINDOW_RIGHT_DIVIDER_WIDTH (w))
692 x_draw_right_divider (w); 692 x_draw_right_divider (w);
@@ -728,7 +728,7 @@ x_update_end (struct frame *f)
728 return; 728 return;
729 729
730 /* Mouse highlight may be displayed again. */ 730 /* Mouse highlight may be displayed again. */
731 MOUSE_HL_INFO (f)->mouse_face_defer = 0; 731 MOUSE_HL_INFO (f)->mouse_face_defer = false;
732} 732}
733 733
734 734
@@ -758,7 +758,7 @@ x_after_update_window_line (struct window *w, struct glyph_row *desired_row)
758 eassert (w); 758 eassert (w);
759 759
760 if (!desired_row->mode_line_p && !w->pseudo_window_p) 760 if (!desired_row->mode_line_p && !w->pseudo_window_p)
761 desired_row->redraw_fringe_bitmaps_p = 1; 761 desired_row->redraw_fringe_bitmaps_p = true;
762 762
763 /* When a window has disappeared, make sure that no rest of 763 /* When a window has disappeared, make sure that no rest of
764 full-width rows stays visible in the internal border. Could 764 full-width rows stays visible in the internal border. Could
@@ -903,7 +903,7 @@ w32_destroy_fringe_bitmap (int which)
903static void x_set_glyph_string_clipping (struct glyph_string *); 903static void x_set_glyph_string_clipping (struct glyph_string *);
904static void x_set_glyph_string_gc (struct glyph_string *); 904static void x_set_glyph_string_gc (struct glyph_string *);
905static void x_draw_glyph_string_background (struct glyph_string *, 905static void x_draw_glyph_string_background (struct glyph_string *,
906 int); 906 bool);
907static void x_draw_glyph_string_foreground (struct glyph_string *); 907static void x_draw_glyph_string_foreground (struct glyph_string *);
908static void x_draw_composite_glyph_string_foreground (struct glyph_string *); 908static void x_draw_composite_glyph_string_foreground (struct glyph_string *);
909static void x_draw_glyph_string_box (struct glyph_string *); 909static void x_draw_glyph_string_box (struct glyph_string *);
@@ -925,7 +925,7 @@ static void w32_draw_relief_rect (struct frame *, int, int, int, int,
925 int, int, int, int, int, int, 925 int, int, int, int, int, int,
926 RECT *); 926 RECT *);
927static void w32_draw_box_rect (struct glyph_string *, int, int, int, int, 927static void w32_draw_box_rect (struct glyph_string *, int, int, int, int,
928 int, int, int, RECT *); 928 int, bool, bool, RECT *);
929 929
930 930
931/* Set S->gc to a suitable GC for drawing glyph string S in cursor 931/* Set S->gc to a suitable GC for drawing glyph string S in cursor
@@ -1064,7 +1064,7 @@ x_set_glyph_string_gc (struct glyph_string *s)
1064 else if (s->hl == DRAW_CURSOR) 1064 else if (s->hl == DRAW_CURSOR)
1065 { 1065 {
1066 x_set_cursor_gc (s); 1066 x_set_cursor_gc (s);
1067 s->stippled_p = 0; 1067 s->stippled_p = false;
1068 } 1068 }
1069 else if (s->hl == DRAW_MOUSE_FACE) 1069 else if (s->hl == DRAW_MOUSE_FACE)
1070 { 1070 {
@@ -1190,7 +1190,7 @@ x_clear_glyph_string_rect (struct glyph_string *s,
1190 contains the first component of a composition. */ 1190 contains the first component of a composition. */
1191 1191
1192static void 1192static void
1193x_draw_glyph_string_background (struct glyph_string *s, int force_p) 1193x_draw_glyph_string_background (struct glyph_string *s, bool force_p)
1194{ 1194{
1195 /* Nothing to do if background has already been drawn or if it 1195 /* Nothing to do if background has already been drawn or if it
1196 shouldn't be drawn in the first place. */ 1196 shouldn't be drawn in the first place. */
@@ -1208,7 +1208,7 @@ x_draw_glyph_string_background (struct glyph_string *s, int force_p)
1208 s->background_width, 1208 s->background_width,
1209 s->height - 2 * box_line_width); 1209 s->height - 2 * box_line_width);
1210 XSetFillStyle (s->display, s->gc, FillSolid); 1210 XSetFillStyle (s->display, s->gc, FillSolid);
1211 s->background_filled_p = 1; 1211 s->background_filled_p = true;
1212 } 1212 }
1213 else 1213 else
1214#endif 1214#endif
@@ -1220,7 +1220,7 @@ x_draw_glyph_string_background (struct glyph_string *s, int force_p)
1220 x_clear_glyph_string_rect (s, s->x, s->y + box_line_width, 1220 x_clear_glyph_string_rect (s, s->x, s->y + box_line_width,
1221 s->background_width, 1221 s->background_width,
1222 s->height - 2 * box_line_width); 1222 s->height - 2 * box_line_width);
1223 s->background_filled_p = 1; 1223 s->background_filled_p = true;
1224 } 1224 }
1225 } 1225 }
1226} 1226}
@@ -1273,11 +1273,11 @@ x_draw_glyph_string_foreground (struct glyph_string *s)
1273 y = s->ybase - boff; 1273 y = s->ybase - boff;
1274 if (s->for_overlaps 1274 if (s->for_overlaps
1275 || (s->background_filled_p && s->hl != DRAW_CURSOR)) 1275 || (s->background_filled_p && s->hl != DRAW_CURSOR))
1276 font->driver->draw (s, 0, s->nchars, x, y, 0); 1276 font->driver->draw (s, 0, s->nchars, x, y, false);
1277 else 1277 else
1278 font->driver->draw (s, 0, s->nchars, x, y, 1); 1278 font->driver->draw (s, 0, s->nchars, x, y, true);
1279 if (s->face->overstrike) 1279 if (s->face->overstrike)
1280 font->driver->draw (s, 0, s->nchars, x + 1, y, 0); 1280 font->driver->draw (s, 0, s->nchars, x + 1, y, false);
1281 1281
1282 SelectObject (s->hdc, old_font); 1282 SelectObject (s->hdc, old_font);
1283 } 1283 }
@@ -1331,9 +1331,9 @@ x_draw_composite_glyph_string_foreground (struct glyph_string *s)
1331 int xx = x + s->cmp->offsets[j * 2]; 1331 int xx = x + s->cmp->offsets[j * 2];
1332 int yy = y - s->cmp->offsets[j * 2 + 1]; 1332 int yy = y - s->cmp->offsets[j * 2 + 1];
1333 1333
1334 font->driver->draw (s, j, j + 1, xx, yy, 0); 1334 font->driver->draw (s, j, j + 1, xx, yy, false);
1335 if (s->face->overstrike) 1335 if (s->face->overstrike)
1336 font->driver->draw (s, j, j + 1, xx + 1, yy, 0); 1336 font->driver->draw (s, j, j + 1, xx + 1, yy, false);
1337 } 1337 }
1338 SelectObject (s->hdc, old_font); 1338 SelectObject (s->hdc, old_font);
1339 } 1339 }
@@ -1358,20 +1358,20 @@ x_draw_composite_glyph_string_foreground (struct glyph_string *s)
1358 1358
1359 if (j < i) 1359 if (j < i)
1360 { 1360 {
1361 font->driver->draw (s, j, i, x, y, 0); 1361 font->driver->draw (s, j, i, x, y, false);
1362 x += width; 1362 x += width;
1363 } 1363 }
1364 xoff = LGLYPH_XOFF (glyph); 1364 xoff = LGLYPH_XOFF (glyph);
1365 yoff = LGLYPH_YOFF (glyph); 1365 yoff = LGLYPH_YOFF (glyph);
1366 wadjust = LGLYPH_WADJUST (glyph); 1366 wadjust = LGLYPH_WADJUST (glyph);
1367 font->driver->draw (s, i, i + 1, x + xoff, y + yoff, 0); 1367 font->driver->draw (s, i, i + 1, x + xoff, y + yoff, false);
1368 x += wadjust; 1368 x += wadjust;
1369 j = i + 1; 1369 j = i + 1;
1370 width = 0; 1370 width = 0;
1371 } 1371 }
1372 } 1372 }
1373 if (j < i) 1373 if (j < i)
1374 font->driver->draw (s, j, i, x, y, 0); 1374 font->driver->draw (s, j, i, x, y, false);
1375 1375
1376 SelectObject (s->hdc, old_font); 1376 SelectObject (s->hdc, old_font);
1377 } 1377 }
@@ -1386,7 +1386,7 @@ x_draw_glyphless_glyph_string_foreground (struct glyph_string *s)
1386 struct glyph *glyph = s->first_glyph; 1386 struct glyph *glyph = s->first_glyph;
1387 XChar2b char2b[8]; 1387 XChar2b char2b[8];
1388 int x, i, j; 1388 int x, i, j;
1389 int with_background; 1389 bool with_background;
1390 1390
1391 /* If first glyph of S has a left box line, start drawing the text 1391 /* If first glyph of S has a left box line, start drawing the text
1392 of S to the right of that box line. */ 1392 of S to the right of that box line. */
@@ -1401,8 +1401,8 @@ x_draw_glyphless_glyph_string_foreground (struct glyph_string *s)
1401 SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT); 1401 SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT);
1402 1402
1403 s->char2b = char2b; 1403 s->char2b = char2b;
1404 with_background = ! (s->for_overlaps 1404 with_background = ((s->for_overlaps
1405 || (s->background_filled_p && s->hl != DRAW_CURSOR)); 1405 || (s->background_filled_p && s->hl != DRAW_CURSOR))) == 0;
1406 for (i = 0; i < s->nchars; i++, glyph++) 1406 for (i = 0; i < s->nchars; i++, glyph++)
1407 { 1407 {
1408 char buf[7], *str = NULL; 1408 char buf[7], *str = NULL;
@@ -1712,7 +1712,7 @@ w32_draw_relief_rect (struct frame *f,
1712static void 1712static void
1713w32_draw_box_rect (struct glyph_string *s, 1713w32_draw_box_rect (struct glyph_string *s,
1714 int left_x, int top_y, int right_x, int bottom_y, int width, 1714 int left_x, int top_y, int right_x, int bottom_y, int width,
1715 int left_p, int right_p, RECT *clip_rect) 1715 bool left_p, bool right_p, RECT *clip_rect)
1716{ 1716{
1717 w32_set_clip_rectangle (s->hdc, clip_rect); 1717 w32_set_clip_rectangle (s->hdc, clip_rect);
1718 1718
@@ -1747,8 +1747,8 @@ w32_draw_box_rect (struct glyph_string *s,
1747static void 1747static void
1748x_draw_glyph_string_box (struct glyph_string *s) 1748x_draw_glyph_string_box (struct glyph_string *s)
1749{ 1749{
1750 int width, left_x, right_x, top_y, bottom_y, last_x, raised_p; 1750 int width, left_x, right_x, top_y, bottom_y, last_x;
1751 int left_p, right_p; 1751 bool left_p, right_p, raised_p;
1752 struct glyph *last_glyph; 1752 struct glyph *last_glyph;
1753 RECT clip_rect; 1753 RECT clip_rect;
1754 1754
@@ -2157,7 +2157,7 @@ x_draw_image_glyph_string (struct glyph_string *s)
2157#endif 2157#endif
2158 x_draw_glyph_string_bg_rect (s, x, y, width, height); 2158 x_draw_glyph_string_bg_rect (s, x, y, width, height);
2159 2159
2160 s->background_filled_p = 1; 2160 s->background_filled_p = true;
2161 } 2161 }
2162 2162
2163 /* Draw the foreground. */ 2163 /* Draw the foreground. */
@@ -2293,7 +2293,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
2293 x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); 2293 x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height);
2294 } 2294 }
2295 2295
2296 s->background_filled_p = 1; 2296 s->background_filled_p = true;
2297} 2297}
2298 2298
2299 2299
@@ -2321,7 +2321,7 @@ x_draw_glyph_string (struct glyph_string *s)
2321 if (next->first_glyph->type == STRETCH_GLYPH) 2321 if (next->first_glyph->type == STRETCH_GLYPH)
2322 x_draw_stretch_glyph_string (next); 2322 x_draw_stretch_glyph_string (next);
2323 else 2323 else
2324 x_draw_glyph_string_background (next, 1); 2324 x_draw_glyph_string_background (next, true);
2325 next->num_clips = 0; 2325 next->num_clips = 0;
2326 } 2326 }
2327 } 2327 }
@@ -2338,7 +2338,7 @@ x_draw_glyph_string (struct glyph_string *s)
2338 2338
2339 { 2339 {
2340 x_set_glyph_string_clipping (s); 2340 x_set_glyph_string_clipping (s);
2341 x_draw_glyph_string_background (s, 1); 2341 x_draw_glyph_string_background (s, true);
2342 x_draw_glyph_string_box (s); 2342 x_draw_glyph_string_box (s);
2343 x_set_glyph_string_clipping (s); 2343 x_set_glyph_string_clipping (s);
2344 relief_drawn_p = 1; 2344 relief_drawn_p = 1;
@@ -2366,26 +2366,26 @@ x_draw_glyph_string (struct glyph_string *s)
2366 2366
2367 case CHAR_GLYPH: 2367 case CHAR_GLYPH:
2368 if (s->for_overlaps) 2368 if (s->for_overlaps)
2369 s->background_filled_p = 1; 2369 s->background_filled_p = true;
2370 else 2370 else
2371 x_draw_glyph_string_background (s, 0); 2371 x_draw_glyph_string_background (s, false);
2372 x_draw_glyph_string_foreground (s); 2372 x_draw_glyph_string_foreground (s);
2373 break; 2373 break;
2374 2374
2375 case COMPOSITE_GLYPH: 2375 case COMPOSITE_GLYPH:
2376 if (s->for_overlaps || (s->cmp_from > 0 2376 if (s->for_overlaps || (s->cmp_from > 0
2377 && ! s->first_glyph->u.cmp.automatic)) 2377 && ! s->first_glyph->u.cmp.automatic))
2378 s->background_filled_p = 1; 2378 s->background_filled_p = true;
2379 else 2379 else
2380 x_draw_glyph_string_background (s, 1); 2380 x_draw_glyph_string_background (s, true);
2381 x_draw_composite_glyph_string_foreground (s); 2381 x_draw_composite_glyph_string_foreground (s);
2382 break; 2382 break;
2383 2383
2384 case GLYPHLESS_GLYPH: 2384 case GLYPHLESS_GLYPH:
2385 if (s->for_overlaps) 2385 if (s->for_overlaps)
2386 s->background_filled_p = 1; 2386 s->background_filled_p = true;
2387 else 2387 else
2388 x_draw_glyph_string_background (s, 0); 2388 x_draw_glyph_string_background (s, false);
2389 x_draw_glyphless_glyph_string_foreground (s); 2389 x_draw_glyphless_glyph_string_foreground (s);
2390 break; 2390 break;
2391 2391
@@ -3302,7 +3302,7 @@ note_mouse_movement (struct frame *frame, MSG *msg)
3302 3302
3303 if (msg->hwnd != FRAME_W32_WINDOW (frame)) 3303 if (msg->hwnd != FRAME_W32_WINDOW (frame))
3304 { 3304 {
3305 frame->mouse_moved = 1; 3305 frame->mouse_moved = true;
3306 dpyinfo->last_mouse_scroll_bar = NULL; 3306 dpyinfo->last_mouse_scroll_bar = NULL;
3307 note_mouse_highlight (frame, -1, -1); 3307 note_mouse_highlight (frame, -1, -1);
3308 dpyinfo->last_mouse_glyph_frame = NULL; 3308 dpyinfo->last_mouse_glyph_frame = NULL;
@@ -3315,7 +3315,7 @@ note_mouse_movement (struct frame *frame, MSG *msg)
3315 || mouse_x < r->left || mouse_x >= r->right 3315 || mouse_x < r->left || mouse_x >= r->right
3316 || mouse_y < r->top || mouse_y >= r->bottom) 3316 || mouse_y < r->top || mouse_y >= r->bottom)
3317 { 3317 {
3318 frame->mouse_moved = 1; 3318 frame->mouse_moved = true;
3319 dpyinfo->last_mouse_scroll_bar = NULL; 3319 dpyinfo->last_mouse_scroll_bar = NULL;
3320 note_mouse_highlight (frame, mouse_x, mouse_y); 3320 note_mouse_highlight (frame, mouse_x, mouse_y);
3321 /* Remember the mouse position here, as w32_mouse_position only 3321 /* Remember the mouse position here, as w32_mouse_position only
@@ -3399,7 +3399,7 @@ w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
3399 3399
3400 /* Clear the mouse-moved flag for every frame on this display. */ 3400 /* Clear the mouse-moved flag for every frame on this display. */
3401 FOR_EACH_FRAME (tail, frame) 3401 FOR_EACH_FRAME (tail, frame)
3402 XFRAME (frame)->mouse_moved = 0; 3402 XFRAME (frame)->mouse_moved = false;
3403 3403
3404 dpyinfo->last_mouse_scroll_bar = NULL; 3404 dpyinfo->last_mouse_scroll_bar = NULL;
3405 3405
@@ -3822,7 +3822,7 @@ w32_set_vertical_scroll_bar (struct window *w,
3822 } 3822 }
3823 unblock_input (); 3823 unblock_input ();
3824 3824
3825 bar = x_scroll_bar_create (w, left, top, width, height, 0); 3825 bar = x_scroll_bar_create (w, left, top, width, height, false);
3826 } 3826 }
3827 else 3827 else
3828 { 3828 {
@@ -3922,7 +3922,7 @@ w32_set_horizontal_scroll_bar (struct window *w,
3922 } 3922 }
3923 unblock_input (); 3923 unblock_input ();
3924 3924
3925 bar = x_scroll_bar_create (w, left, top, width, height, 1); 3925 bar = x_scroll_bar_create (w, left, top, width, height, true);
3926 } 3926 }
3927 else 3927 else
3928 { 3928 {
@@ -4405,7 +4405,7 @@ x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
4405 XSETINT (*x, pos); 4405 XSETINT (*x, pos);
4406 XSETINT (*y, top_range); 4406 XSETINT (*y, top_range);
4407 4407
4408 f->mouse_moved = 0; 4408 f->mouse_moved = false;
4409 dpyinfo->last_mouse_scroll_bar = NULL; 4409 dpyinfo->last_mouse_scroll_bar = NULL;
4410 4410
4411 *time = dpyinfo->last_mouse_movement_time; 4411 *time = dpyinfo->last_mouse_movement_time;
@@ -4456,7 +4456,7 @@ x_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_windo
4456 XSETINT (*y, pos); 4456 XSETINT (*y, pos);
4457 XSETINT (*x, left_range); 4457 XSETINT (*x, left_range);
4458 4458
4459 f->mouse_moved = 0; 4459 f->mouse_moved = false;
4460 dpyinfo->last_mouse_scroll_bar = NULL; 4460 dpyinfo->last_mouse_scroll_bar = NULL;
4461 4461
4462 *time = dpyinfo->last_mouse_movement_time; 4462 *time = dpyinfo->last_mouse_movement_time;
@@ -4596,7 +4596,7 @@ w32_read_socket (struct terminal *terminal,
4596 4596
4597 /* Definitely not obscured, so mark as visible. */ 4597 /* Definitely not obscured, so mark as visible. */
4598 SET_FRAME_VISIBLE (f, 1); 4598 SET_FRAME_VISIBLE (f, 1);
4599 SET_FRAME_ICONIFIED (f, 0); 4599 SET_FRAME_ICONIFIED (f, false);
4600 SET_FRAME_GARBAGED (f); 4600 SET_FRAME_GARBAGED (f);
4601 if (!f->output_data.w32->asked_for_visible) 4601 if (!f->output_data.w32->asked_for_visible)
4602 DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f, 4602 DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,
@@ -4658,7 +4658,7 @@ w32_read_socket (struct terminal *terminal,
4658 && !EQ (f->tool_bar_window, hlinfo->mouse_face_window)) 4658 && !EQ (f->tool_bar_window, hlinfo->mouse_face_window))
4659 { 4659 {
4660 clear_mouse_face (hlinfo); 4660 clear_mouse_face (hlinfo);
4661 hlinfo->mouse_face_hidden = 1; 4661 hlinfo->mouse_face_hidden = true;
4662 } 4662 }
4663 4663
4664 if (temp_index == sizeof temp_buffer / sizeof (short)) 4664 if (temp_index == sizeof temp_buffer / sizeof (short))
@@ -4683,7 +4683,7 @@ w32_read_socket (struct terminal *terminal,
4683 && !EQ (f->tool_bar_window, hlinfo->mouse_face_window)) 4683 && !EQ (f->tool_bar_window, hlinfo->mouse_face_window))
4684 { 4684 {
4685 clear_mouse_face (hlinfo); 4685 clear_mouse_face (hlinfo);
4686 hlinfo->mouse_face_hidden = 1; 4686 hlinfo->mouse_face_hidden = true;
4687 } 4687 }
4688 4688
4689 if (temp_index == sizeof temp_buffer / sizeof (short)) 4689 if (temp_index == sizeof temp_buffer / sizeof (short))
@@ -4761,7 +4761,7 @@ w32_read_socket (struct terminal *terminal,
4761 && !EQ (f->tool_bar_window, hlinfo->mouse_face_window)) 4761 && !EQ (f->tool_bar_window, hlinfo->mouse_face_window))
4762 { 4762 {
4763 clear_mouse_face (hlinfo); 4763 clear_mouse_face (hlinfo);
4764 hlinfo->mouse_face_hidden = 1; 4764 hlinfo->mouse_face_hidden = true;
4765 } 4765 }
4766 4766
4767 if (temp_index == sizeof temp_buffer / sizeof (short)) 4767 if (temp_index == sizeof temp_buffer / sizeof (short))
@@ -4794,7 +4794,7 @@ w32_read_socket (struct terminal *terminal,
4794 4794
4795 if (hlinfo->mouse_face_hidden) 4795 if (hlinfo->mouse_face_hidden)
4796 { 4796 {
4797 hlinfo->mouse_face_hidden = 0; 4797 hlinfo->mouse_face_hidden = false;
4798 clear_mouse_face (hlinfo); 4798 clear_mouse_face (hlinfo);
4799 } 4799 }
4800 4800
@@ -4913,7 +4913,7 @@ w32_read_socket (struct terminal *terminal,
4913 the ButtonPress. */ 4913 the ButtonPress. */
4914 if (f != 0) 4914 if (f != 0)
4915 { 4915 {
4916 f->mouse_moved = 0; 4916 f->mouse_moved = false;
4917 if (!tool_bar_p) 4917 if (!tool_bar_p)
4918 f->last_tool_bar_item = -1; 4918 f->last_tool_bar_item = -1;
4919 } 4919 }
@@ -4940,7 +4940,7 @@ w32_read_socket (struct terminal *terminal,
4940 event; any subsequent mouse-movement Emacs events 4940 event; any subsequent mouse-movement Emacs events
4941 should reflect only motion after the 4941 should reflect only motion after the
4942 ButtonPress. */ 4942 ButtonPress. */
4943 f->mouse_moved = 0; 4943 f->mouse_moved = false;
4944 f->last_tool_bar_item = -1; 4944 f->last_tool_bar_item = -1;
4945 } 4945 }
4946 dpyinfo->last_mouse_frame = f; 4946 dpyinfo->last_mouse_frame = f;
@@ -5041,7 +5041,7 @@ w32_read_socket (struct terminal *terminal,
5041 { 5041 {
5042 case SIZE_MINIMIZED: 5042 case SIZE_MINIMIZED:
5043 SET_FRAME_VISIBLE (f, 0); 5043 SET_FRAME_VISIBLE (f, 0);
5044 SET_FRAME_ICONIFIED (f, 1); 5044 SET_FRAME_ICONIFIED (f, true);
5045 5045
5046 inev.kind = ICONIFY_EVENT; 5046 inev.kind = ICONIFY_EVENT;
5047 XSETFRAME (inev.frame_or_window, f); 5047 XSETFRAME (inev.frame_or_window, f);
@@ -5052,7 +5052,7 @@ w32_read_socket (struct terminal *terminal,
5052 bool iconified = FRAME_ICONIFIED_P (f); 5052 bool iconified = FRAME_ICONIFIED_P (f);
5053 5053
5054 SET_FRAME_VISIBLE (f, 1); 5054 SET_FRAME_VISIBLE (f, 1);
5055 SET_FRAME_ICONIFIED (f, 0); 5055 SET_FRAME_ICONIFIED (f, false);
5056 5056
5057 /* wait_reading_process_output will notice this 5057 /* wait_reading_process_output will notice this
5058 and update the frame's display structures. */ 5058 and update the frame's display structures. */
@@ -5099,7 +5099,7 @@ w32_read_socket (struct terminal *terminal,
5099 conditional again in revision 116727. martin */ 5099 conditional again in revision 116727. martin */
5100 if (iconified) 5100 if (iconified)
5101 SET_FRAME_VISIBLE (f, 1); 5101 SET_FRAME_VISIBLE (f, 1);
5102 SET_FRAME_ICONIFIED (f, 0); 5102 SET_FRAME_ICONIFIED (f, false);
5103 5103
5104 /* wait_reading_process_output will notice this 5104 /* wait_reading_process_output will notice this
5105 and update the frame's display structures. */ 5105 and update the frame's display structures. */
@@ -5636,7 +5636,7 @@ w32_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
5636 w->phys_cursor_type = cursor_type; 5636 w->phys_cursor_type = cursor_type;
5637 } 5637 }
5638 5638
5639 w->phys_cursor_on_p = 1; 5639 w->phys_cursor_on_p = true;
5640 5640
5641 /* If this is the active cursor, we need to track it with the 5641 /* If this is the active cursor, we need to track it with the
5642 system caret, so third party software like screen magnifiers 5642 system caret, so third party software like screen magnifiers
@@ -5674,7 +5674,7 @@ w32_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
5674 ? (w->phys_cursor.hpos < 0) 5674 ? (w->phys_cursor.hpos < 0)
5675 : (w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA]))) 5675 : (w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA])))
5676 { 5676 {
5677 glyph_row->cursor_in_fringe_p = 1; 5677 glyph_row->cursor_in_fringe_p = true;
5678 draw_fringe_bitmap (w, glyph_row, glyph_row->reversed_p); 5678 draw_fringe_bitmap (w, glyph_row, glyph_row->reversed_p);
5679 return; 5679 return;
5680 } 5680 }
@@ -5838,7 +5838,8 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
5838 problems because the tip frame has no widget. */ 5838 problems because the tip frame has no widget. */
5839 if (NILP (tip_frame) || XFRAME (tip_frame) != f) 5839 if (NILP (tip_frame) || XFRAME (tip_frame) != f)
5840 adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), 5840 adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
5841 FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 3, 0, Qfont); 5841 FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 3,
5842 false, Qfont);
5842 } 5843 }
5843 5844
5844 /* X version sets font of input methods here also. */ 5845 /* X version sets font of input methods here also. */
@@ -5945,7 +5946,7 @@ x_set_offset (struct frame *f, register int xoff, register int yoff,
5945 x_calc_absolute_position (f); 5946 x_calc_absolute_position (f);
5946 5947
5947 block_input (); 5948 block_input ();
5948 x_wm_set_size_hint (f, (long) 0, 0); 5949 x_wm_set_size_hint (f, (long) 0, false);
5949 5950
5950 modified_left = f->left_pos; 5951 modified_left = f->left_pos;
5951 modified_top = f->top_pos; 5952 modified_top = f->top_pos;
@@ -6140,7 +6141,7 @@ x_set_window_size (struct frame *f, bool change_gravity,
6140 } 6141 }
6141 6142
6142 f->win_gravity = NorthWestGravity; 6143 f->win_gravity = NorthWestGravity;
6143 x_wm_set_size_hint (f, (long) 0, 0); 6144 x_wm_set_size_hint (f, (long) 0, false);
6144 6145
6145 f->want_fullscreen = FULLSCREEN_NONE; 6146 f->want_fullscreen = FULLSCREEN_NONE;
6146 w32fullscreen_hook (f); 6147 w32fullscreen_hook (f);
@@ -6452,7 +6453,7 @@ x_make_frame_invisible (struct frame *f)
6452 FRAME_SAMPLE_VISIBILITY set this. So do it by hand, 6453 FRAME_SAMPLE_VISIBILITY set this. So do it by hand,
6453 and synchronize with the server to make sure we agree. */ 6454 and synchronize with the server to make sure we agree. */
6454 SET_FRAME_VISIBLE (f, 0); 6455 SET_FRAME_VISIBLE (f, 0);
6455 SET_FRAME_ICONIFIED (f, 0); 6456 SET_FRAME_ICONIFIED (f, false);
6456 6457
6457 unblock_input (); 6458 unblock_input ();
6458} 6459}
@@ -6477,7 +6478,7 @@ x_iconify_frame (struct frame *f)
6477 SendMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MINIMIZE, 0); 6478 SendMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MINIMIZE, 0);
6478 6479
6479 SET_FRAME_VISIBLE (f, 0); 6480 SET_FRAME_VISIBLE (f, 0);
6480 SET_FRAME_ICONIFIED (f, 1); 6481 SET_FRAME_ICONIFIED (f, true);
6481 6482
6482 unblock_input (); 6483 unblock_input ();
6483} 6484}
diff --git a/src/w32term.h b/src/w32term.h
index c905ef15737..3532e95fdce 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -239,7 +239,7 @@ Lisp_Object display_x_get_resource (struct w32_display_info *,
239extern struct w32_display_info *w32_term_init (Lisp_Object, 239extern struct w32_display_info *w32_term_init (Lisp_Object,
240 char *, char *); 240 char *, char *);
241extern int w32_defined_color (struct frame *f, const char *color, 241extern int w32_defined_color (struct frame *f, const char *color,
242 XColor *color_def, int alloc); 242 XColor *color_def, bool alloc_p);
243extern void x_set_window_size (struct frame *f, bool change_gravity, 243extern void x_set_window_size (struct frame *f, bool change_gravity,
244 int width, int height, bool pixelwise); 244 int width, int height, bool pixelwise);
245extern int x_display_pixel_height (struct w32_display_info *); 245extern int x_display_pixel_height (struct w32_display_info *);
diff --git a/src/xfaces.c b/src/xfaces.c
index 1ba6b51a5fb..31048aece5d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3489,7 +3489,7 @@ x_update_menu_appearance (struct frame *f)
3489 Lisp_Object xlfd = Ffont_xlfd_name (LFACE_FONT (lface), Qnil); 3489 Lisp_Object xlfd = Ffont_xlfd_name (LFACE_FONT (lface), Qnil);
3490#ifdef USE_MOTIF 3490#ifdef USE_MOTIF
3491 const char *suffix = "List"; 3491 const char *suffix = "List";
3492 Bool motif = True; 3492 bool motif = true;
3493#else 3493#else
3494#if defined HAVE_X_I18N 3494#if defined HAVE_X_I18N
3495 3495
@@ -3497,7 +3497,7 @@ x_update_menu_appearance (struct frame *f)
3497#else 3497#else
3498 const char *suffix = ""; 3498 const char *suffix = "";
3499#endif 3499#endif
3500 Bool motif = False; 3500 bool motif = false;
3501#endif 3501#endif
3502 3502
3503 if (! NILP (xlfd)) 3503 if (! NILP (xlfd))
diff --git a/src/xfns.c b/src/xfns.c
index a09e4a6df63..9dd00868d7b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -46,12 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
46#include <sys/types.h> 46#include <sys/types.h>
47#include <sys/stat.h> 47#include <sys/stat.h>
48 48
49#if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */
50#include "bitmaps/gray.xbm" 49#include "bitmaps/gray.xbm"
51#else
52#include <X11/bitmaps/gray>
53#endif
54
55#include "xsettings.h" 50#include "xsettings.h"
56 51
57#ifdef HAVE_XRANDR 52#ifdef HAVE_XRANDR
@@ -182,7 +177,7 @@ x_real_positions (struct frame *f, int *xptr, int *yptr)
182{ 177{
183 int win_x, win_y, outer_x IF_LINT (= 0), outer_y IF_LINT (= 0); 178 int win_x, win_y, outer_x IF_LINT (= 0), outer_y IF_LINT (= 0);
184 int real_x = 0, real_y = 0; 179 int real_x = 0, real_y = 0;
185 int had_errors = 0; 180 bool had_errors = false;
186 Window win = f->output_data.x->parent_desc; 181 Window win = f->output_data.x->parent_desc;
187 Atom actual_type; 182 Atom actual_type;
188 unsigned long actual_size, bytes_remaining; 183 unsigned long actual_size, bytes_remaining;
@@ -386,7 +381,7 @@ bool
386x_defined_color (struct frame *f, const char *color_name, 381x_defined_color (struct frame *f, const char *color_name,
387 XColor *color, bool alloc_p) 382 XColor *color, bool alloc_p)
388{ 383{
389 bool success_p = 0; 384 bool success_p = false;
390 Display *dpy = FRAME_X_DISPLAY (f); 385 Display *dpy = FRAME_X_DISPLAY (f);
391 Colormap cmap = FRAME_X_COLORMAP (f); 386 Colormap cmap = FRAME_X_COLORMAP (f);
392 387
@@ -415,9 +410,9 @@ x_decode_color (struct frame *f, Lisp_Object color_name, int mono_color)
415 410
416 CHECK_STRING (color_name); 411 CHECK_STRING (color_name);
417 412
418#if 0 /* Don't do this. It's wrong when we're not using the default 413#if false /* Don't do this. It's wrong when we're not using the default
419 colormap, it makes freeing difficult, and it's probably not 414 colormap, it makes freeing difficult, and it's probably not
420 an important optimization. */ 415 an important optimization. */
421 if (strcmp (SDATA (color_name), "black") == 0) 416 if (strcmp (SDATA (color_name), "black") == 0)
422 return BLACK_PIX_DEFAULT (f); 417 return BLACK_PIX_DEFAULT (f);
423 else if (strcmp (SDATA (color_name), "white") == 0) 418 else if (strcmp (SDATA (color_name), "white") == 0)
@@ -430,7 +425,7 @@ x_decode_color (struct frame *f, Lisp_Object color_name, int mono_color)
430 425
431 /* x_defined_color is responsible for coping with failures 426 /* x_defined_color is responsible for coping with failures
432 by looking for a near-miss. */ 427 by looking for a near-miss. */
433 if (x_defined_color (f, SSDATA (color_name), &cdef, 1)) 428 if (x_defined_color (f, SSDATA (color_name), &cdef, true))
434 return cdef.pixel; 429 return cdef.pixel;
435 430
436 signal_error ("Undefined color", color_name); 431 signal_error ("Undefined color", color_name);
@@ -477,10 +472,10 @@ x_set_tool_bar_position (struct frame *f,
477/* Set icon from FILE for frame F. By using GTK functions the icon 472/* Set icon from FILE for frame F. By using GTK functions the icon
478 may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */ 473 may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */
479 474
480int 475bool
481xg_set_icon (struct frame *f, Lisp_Object file) 476xg_set_icon (struct frame *f, Lisp_Object file)
482{ 477{
483 int result = 0; 478 bool result = false;
484 Lisp_Object found; 479 Lisp_Object found;
485 480
486 found = x_find_image_file (file); 481 found = x_find_image_file (file);
@@ -500,7 +495,7 @@ xg_set_icon (struct frame *f, Lisp_Object file)
500 pixbuf); 495 pixbuf);
501 g_object_unref (pixbuf); 496 g_object_unref (pixbuf);
502 497
503 result = 1; 498 result = true;
504 } 499 }
505 else 500 else
506 g_error_free (err); 501 g_error_free (err);
@@ -511,17 +506,17 @@ xg_set_icon (struct frame *f, Lisp_Object file)
511 return result; 506 return result;
512} 507}
513 508
514int 509bool
515xg_set_icon_from_xpm_data (struct frame *f, const char **data) 510xg_set_icon_from_xpm_data (struct frame *f, const char **data)
516{ 511{
517 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data); 512 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
518 513
519 if (!pixbuf) 514 if (!pixbuf)
520 return 0; 515 return false;
521 516
522 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), pixbuf); 517 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), pixbuf);
523 g_object_unref (pixbuf); 518 g_object_unref (pixbuf);
524 return 1; 519 return true;
525} 520}
526#endif /* USE_GTK */ 521#endif /* USE_GTK */
527 522
@@ -778,20 +773,20 @@ static void
778x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 773x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
779{ 774{
780 unsigned long fore_pixel, pixel; 775 unsigned long fore_pixel, pixel;
781 bool fore_pixel_allocated_p = 0, pixel_allocated_p = 0; 776 bool fore_pixel_allocated_p = false, pixel_allocated_p = false;
782 struct x_output *x = f->output_data.x; 777 struct x_output *x = f->output_data.x;
783 778
784 if (!NILP (Vx_cursor_fore_pixel)) 779 if (!NILP (Vx_cursor_fore_pixel))
785 { 780 {
786 fore_pixel = x_decode_color (f, Vx_cursor_fore_pixel, 781 fore_pixel = x_decode_color (f, Vx_cursor_fore_pixel,
787 WHITE_PIX_DEFAULT (f)); 782 WHITE_PIX_DEFAULT (f));
788 fore_pixel_allocated_p = 1; 783 fore_pixel_allocated_p = true;
789 } 784 }
790 else 785 else
791 fore_pixel = FRAME_BACKGROUND_PIXEL (f); 786 fore_pixel = FRAME_BACKGROUND_PIXEL (f);
792 787
793 pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); 788 pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
794 pixel_allocated_p = 1; 789 pixel_allocated_p = true;
795 790
796 /* Make sure that the cursor color differs from the background color. */ 791 /* Make sure that the cursor color differs from the background color. */
797 if (pixel == FRAME_BACKGROUND_PIXEL (f)) 792 if (pixel == FRAME_BACKGROUND_PIXEL (f))
@@ -799,7 +794,7 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
799 if (pixel_allocated_p) 794 if (pixel_allocated_p)
800 { 795 {
801 x_free_colors (f, &pixel, 1); 796 x_free_colors (f, &pixel, 1);
802 pixel_allocated_p = 0; 797 pixel_allocated_p = false;
803 } 798 }
804 799
805 pixel = x->mouse_pixel; 800 pixel = x->mouse_pixel;
@@ -808,7 +803,7 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
808 if (fore_pixel_allocated_p) 803 if (fore_pixel_allocated_p)
809 { 804 {
810 x_free_colors (f, &fore_pixel, 1); 805 x_free_colors (f, &fore_pixel, 1);
811 fore_pixel_allocated_p = 0; 806 fore_pixel_allocated_p = false;
812 } 807 }
813 fore_pixel = FRAME_BACKGROUND_PIXEL (f); 808 fore_pixel = FRAME_BACKGROUND_PIXEL (f);
814 } 809 }
@@ -833,8 +828,8 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
833 828
834 if (FRAME_VISIBLE_P (f)) 829 if (FRAME_VISIBLE_P (f))
835 { 830 {
836 x_update_cursor (f, 0); 831 x_update_cursor (f, false);
837 x_update_cursor (f, 1); 832 x_update_cursor (f, true);
838 } 833 }
839 } 834 }
840 835
@@ -894,7 +889,7 @@ x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
894static void 889static void
895x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 890x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
896{ 891{
897 int result; 892 bool result;
898 893
899 if (STRINGP (arg)) 894 if (STRINGP (arg))
900 { 895 {
@@ -926,7 +921,7 @@ x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
926static void 921static void
927x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 922x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
928{ 923{
929 int result; 924 bool result;
930 925
931 if (STRINGP (arg)) 926 if (STRINGP (arg))
932 { 927 {
@@ -992,7 +987,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
992 FRAME_EXTERNAL_MENU_BAR (f) = 1; 987 FRAME_EXTERNAL_MENU_BAR (f) = 1;
993 if (FRAME_X_P (f) && f->output_data.x->menubar_widget == 0) 988 if (FRAME_X_P (f) && f->output_data.x->menubar_widget == 0)
994 /* Make sure next redisplay shows the menu bar. */ 989 /* Make sure next redisplay shows the menu bar. */
995 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = 1; 990 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = true;
996 } 991 }
997 else 992 else
998 { 993 {
@@ -1005,7 +1000,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
1005#else /* not USE_X_TOOLKIT && not USE_GTK */ 1000#else /* not USE_X_TOOLKIT && not USE_GTK */
1006 FRAME_MENU_BAR_LINES (f) = nlines; 1001 FRAME_MENU_BAR_LINES (f) = nlines;
1007 FRAME_MENU_BAR_HEIGHT (f) = nlines * FRAME_LINE_HEIGHT (f); 1002 FRAME_MENU_BAR_HEIGHT (f) = nlines * FRAME_LINE_HEIGHT (f);
1008 adjust_frame_size (f, -1, -1, 2, 1, Qmenu_bar_lines); 1003 adjust_frame_size (f, -1, -1, 2, true, Qmenu_bar_lines);
1009 if (FRAME_X_WINDOW (f)) 1004 if (FRAME_X_WINDOW (f))
1010 x_clear_under_internal_border (f); 1005 x_clear_under_internal_border (f);
1011 1006
@@ -1084,17 +1079,17 @@ x_change_tool_bar_height (struct frame *f, int height)
1084 FRAME_TOOL_BAR_HEIGHT (f) = 0; 1079 FRAME_TOOL_BAR_HEIGHT (f) = 0;
1085 if (height) 1080 if (height)
1086 { 1081 {
1087 FRAME_EXTERNAL_TOOL_BAR (f) = 1; 1082 FRAME_EXTERNAL_TOOL_BAR (f) = true;
1088 if (FRAME_X_P (f) && f->output_data.x->toolbar_widget == 0) 1083 if (FRAME_X_P (f) && f->output_data.x->toolbar_widget == 0)
1089 /* Make sure next redisplay shows the tool bar. */ 1084 /* Make sure next redisplay shows the tool bar. */
1090 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = 1; 1085 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = true;
1091 update_frame_tool_bar (f); 1086 update_frame_tool_bar (f);
1092 } 1087 }
1093 else 1088 else
1094 { 1089 {
1095 if (FRAME_EXTERNAL_TOOL_BAR (f)) 1090 if (FRAME_EXTERNAL_TOOL_BAR (f))
1096 free_frame_tool_bar (f); 1091 free_frame_tool_bar (f);
1097 FRAME_EXTERNAL_TOOL_BAR (f) = 0; 1092 FRAME_EXTERNAL_TOOL_BAR (f) = false;
1098 } 1093 }
1099#else /* !USE_GTK */ 1094#else /* !USE_GTK */
1100 int unit = FRAME_LINE_HEIGHT (f); 1095 int unit = FRAME_LINE_HEIGHT (f);
@@ -1134,7 +1129,7 @@ x_change_tool_bar_height (struct frame *f, int height)
1134 (!f->tool_bar_redisplayed_once ? 1 1129 (!f->tool_bar_redisplayed_once ? 1
1135 : (old_height == 0 || height == 0) ? 2 1130 : (old_height == 0 || height == 0) ? 2
1136 : 4), 1131 : 4),
1137 0, Qtool_bar_lines); 1132 false, Qtool_bar_lines);
1138 1133
1139 /* adjust_frame_size might not have done anything, garbage frame 1134 /* adjust_frame_size might not have done anything, garbage frame
1140 here. */ 1135 here. */
@@ -1166,7 +1161,7 @@ x_set_internal_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldva
1166 1161
1167 if (FRAME_X_WINDOW (f) != 0) 1162 if (FRAME_X_WINDOW (f) != 0)
1168 { 1163 {
1169 adjust_frame_size (f, -1, -1, 3, 0, Qinternal_border_width); 1164 adjust_frame_size (f, -1, -1, 3, false, Qinternal_border_width);
1170 1165
1171#ifdef USE_GTK 1166#ifdef USE_GTK
1172 xg_clear_under_internal_border (f); 1167 xg_clear_under_internal_border (f);
@@ -1271,14 +1266,14 @@ x_set_scroll_bar_background (struct frame *f, Lisp_Object value, Lisp_Object old
1271 1266
1272 Store the byte length of resulting text in *TEXT_BYTES. 1267 Store the byte length of resulting text in *TEXT_BYTES.
1273 1268
1274 If the text contains only ASCII and Latin-1, store 1 in *STRING_P, 1269 If the text contains only ASCII and Latin-1, store true in *STRING_P,
1275 which means that the `encoding' of the result can be `STRING'. 1270 which means that the `encoding' of the result can be `STRING'.
1276 Otherwise store 0 in *STRINGP, which means that the `encoding' of 1271 Otherwise store false in *STRINGP, which means that the `encoding' of
1277 the result should be `COMPOUND_TEXT'. */ 1272 the result should be `COMPOUND_TEXT'. */
1278 1273
1279static unsigned char * 1274static unsigned char *
1280x_encode_text (Lisp_Object string, Lisp_Object coding_system, 1275x_encode_text (Lisp_Object string, Lisp_Object coding_system,
1281 ptrdiff_t *text_bytes, int *stringp, bool *freep) 1276 ptrdiff_t *text_bytes, bool *stringp, bool *freep)
1282{ 1277{
1283 int result = string_xstring_p (string); 1278 int result = string_xstring_p (string);
1284 struct coding_system coding; 1279 struct coding_system coding;
@@ -1287,8 +1282,8 @@ x_encode_text (Lisp_Object string, Lisp_Object coding_system,
1287 { 1282 {
1288 /* No multibyte character in OBJ. We need not encode it. */ 1283 /* No multibyte character in OBJ. We need not encode it. */
1289 *text_bytes = SBYTES (string); 1284 *text_bytes = SBYTES (string);
1290 *stringp = 1; 1285 *stringp = true;
1291 *freep = 0; 1286 *freep = false;
1292 return SDATA (string); 1287 return SDATA (string);
1293 } 1288 }
1294 1289
@@ -1302,7 +1297,7 @@ x_encode_text (Lisp_Object string, Lisp_Object coding_system,
1302 SCHARS (string), SBYTES (string), Qnil); 1297 SCHARS (string), SBYTES (string), Qnil);
1303 *text_bytes = coding.produced; 1298 *text_bytes = coding.produced;
1304 *stringp = (result == 1 || !EQ (coding_system, Qcompound_text)); 1299 *stringp = (result == 1 || !EQ (coding_system, Qcompound_text));
1305 *freep = 1; 1300 *freep = true;
1306 return coding.destination; 1301 return coding.destination;
1307} 1302}
1308 1303
@@ -1320,8 +1315,8 @@ x_set_name_internal (struct frame *f, Lisp_Object name)
1320 { 1315 {
1321 XTextProperty text, icon; 1316 XTextProperty text, icon;
1322 ptrdiff_t bytes; 1317 ptrdiff_t bytes;
1323 int stringp; 1318 bool stringp;
1324 bool do_free_icon_value = 0, do_free_text_value = 0; 1319 bool do_free_icon_value = false, do_free_text_value = false;
1325 Lisp_Object coding_system; 1320 Lisp_Object coding_system;
1326 Lisp_Object encoded_name; 1321 Lisp_Object encoded_name;
1327 Lisp_Object encoded_icon_name; 1322 Lisp_Object encoded_icon_name;
@@ -1469,7 +1464,7 @@ x_set_name (struct frame *f, Lisp_Object name, bool explicit)
1469static void 1464static void
1470x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 1465x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1471{ 1466{
1472 x_set_name (f, arg, 1); 1467 x_set_name (f, arg, true);
1473} 1468}
1474 1469
1475/* This function should be called by Emacs redisplay code to set the 1470/* This function should be called by Emacs redisplay code to set the
@@ -1478,7 +1473,7 @@ x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1478void 1473void
1479x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 1474x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
1480{ 1475{
1481 x_set_name (f, arg, 0); 1476 x_set_name (f, arg, false);
1482} 1477}
1483 1478
1484/* Change the title of frame F to NAME. 1479/* Change the title of frame F to NAME.
@@ -1557,7 +1552,7 @@ static Lisp_Object
1557x_default_scroll_bar_color_parameter (struct frame *f, 1552x_default_scroll_bar_color_parameter (struct frame *f,
1558 Lisp_Object alist, Lisp_Object prop, 1553 Lisp_Object alist, Lisp_Object prop,
1559 const char *xprop, const char *xclass, 1554 const char *xprop, const char *xclass,
1560 int foreground_p) 1555 bool foreground_p)
1561{ 1556{
1562 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); 1557 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
1563 Lisp_Object tem; 1558 Lisp_Object tem;
@@ -1614,9 +1609,9 @@ hack_wm_protocols (struct frame *f, Widget widget)
1614{ 1609{
1615 Display *dpy = XtDisplay (widget); 1610 Display *dpy = XtDisplay (widget);
1616 Window w = XtWindow (widget); 1611 Window w = XtWindow (widget);
1617 int need_delete = 1; 1612 bool need_delete = true;
1618 int need_focus = 1; 1613 bool need_focus = true;
1619 int need_save = 1; 1614 bool need_save = true;
1620 1615
1621 block_input (); 1616 block_input ();
1622 { 1617 {
@@ -1640,20 +1635,20 @@ hack_wm_protocols (struct frame *f, Widget widget)
1640 nitems--; 1635 nitems--;
1641 if (atoms[nitems] 1636 if (atoms[nitems]
1642 == FRAME_DISPLAY_INFO (f)->Xatom_wm_delete_window) 1637 == FRAME_DISPLAY_INFO (f)->Xatom_wm_delete_window)
1643 need_delete = 0; 1638 need_delete = false;
1644 else if (atoms[nitems] 1639 else if (atoms[nitems]
1645 == FRAME_DISPLAY_INFO (f)->Xatom_wm_take_focus) 1640 == FRAME_DISPLAY_INFO (f)->Xatom_wm_take_focus)
1646 need_focus = 0; 1641 need_focus = false;
1647 else if (atoms[nitems] 1642 else if (atoms[nitems]
1648 == FRAME_DISPLAY_INFO (f)->Xatom_wm_save_yourself) 1643 == FRAME_DISPLAY_INFO (f)->Xatom_wm_save_yourself)
1649 need_save = 0; 1644 need_save = false;
1650 } 1645 }
1651 } 1646 }
1652 if (catoms) 1647 if (catoms)
1653 XFree (catoms); 1648 XFree (catoms);
1654 } 1649 }
1655 { 1650 {
1656 Atom props [10]; 1651 Atom props[10];
1657 int count = 0; 1652 int count = 0;
1658 if (need_delete) 1653 if (need_delete)
1659 props[count++] = FRAME_DISPLAY_INFO (f)->Xatom_wm_delete_window; 1654 props[count++] = FRAME_DISPLAY_INFO (f)->Xatom_wm_delete_window;
@@ -1705,7 +1700,7 @@ static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
1705/* Create an Xt fontset spec from the name of a base font. 1700/* Create an Xt fontset spec from the name of a base font.
1706 If `motif' is True use the Motif syntax. */ 1701 If `motif' is True use the Motif syntax. */
1707char * 1702char *
1708xic_create_fontsetname (const char *base_fontname, int motif) 1703xic_create_fontsetname (const char *base_fontname, bool motif)
1709{ 1704{
1710 const char *sep = motif ? ";" : ","; 1705 const char *sep = motif ? ";" : ",";
1711 char *fontsetname; 1706 char *fontsetname;
@@ -1947,7 +1942,7 @@ void
1947xic_free_xfontset (struct frame *f) 1942xic_free_xfontset (struct frame *f)
1948{ 1943{
1949 Lisp_Object rest, frame; 1944 Lisp_Object rest, frame;
1950 bool shared_p = 0; 1945 bool shared_p = false;
1951 1946
1952 if (!FRAME_XIC_FONTSET (f)) 1947 if (!FRAME_XIC_FONTSET (f))
1953 return; 1948 return;
@@ -1960,7 +1955,7 @@ xic_free_xfontset (struct frame *f)
1960 && FRAME_DISPLAY_INFO (cf) == FRAME_DISPLAY_INFO (f) 1955 && FRAME_DISPLAY_INFO (cf) == FRAME_DISPLAY_INFO (f)
1961 && FRAME_XIC_FONTSET (cf) == FRAME_XIC_FONTSET (f)) 1956 && FRAME_XIC_FONTSET (cf) == FRAME_XIC_FONTSET (f))
1962 { 1957 {
1963 shared_p = 1; 1958 shared_p = true;
1964 break; 1959 break;
1965 } 1960 }
1966 } 1961 }
@@ -2220,7 +2215,7 @@ xic_set_xfontset (struct frame *f, const char *base_fontname)
2220/* Create and set up the X widget for frame F. */ 2215/* Create and set up the X widget for frame F. */
2221 2216
2222static void 2217static void
2223x_window (struct frame *f, long window_prompting, int minibuffer_only) 2218x_window (struct frame *f, long window_prompting)
2224{ 2219{
2225 XClassHint class_hints; 2220 XClassHint class_hints;
2226 XSetWindowAttributes attributes; 2221 XSetWindowAttributes attributes;
@@ -2228,7 +2223,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
2228 Widget shell_widget; 2223 Widget shell_widget;
2229 Widget pane_widget; 2224 Widget pane_widget;
2230 Widget frame_widget; 2225 Widget frame_widget;
2231 Arg al [25]; 2226 Arg al[25];
2232 int ac; 2227 int ac;
2233 2228
2234 block_input (); 2229 block_input ();
@@ -2298,8 +2293,8 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
2298 + f->output_data.x->menubar_widget->core.border_width) 2293 + f->output_data.x->menubar_widget->core.border_width)
2299 : 0); 2294 : 0);
2300 2295
2301#if 0 /* Experimentally, we now get the right results 2296#if false /* Experimentally, we now get the right results
2302 for -geometry -0-0 without this. 24 Aug 96, rms. */ 2297 for -geometry -0-0 without this. 24 Aug 96, rms. */
2303 if (FRAME_EXTERNAL_MENU_BAR (f)) 2298 if (FRAME_EXTERNAL_MENU_BAR (f))
2304 { 2299 {
2305 Dimension ibw = 0; 2300 Dimension ibw = 0;
@@ -2328,9 +2323,9 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
2328 We pass that information later, in x_wm_set_size_hints. */ 2323 We pass that information later, in x_wm_set_size_hints. */
2329 { 2324 {
2330 int left = f->left_pos; 2325 int left = f->left_pos;
2331 int xneg = window_prompting & XNegative; 2326 bool xneg = (window_prompting & XNegative) != 0;
2332 int top = f->top_pos; 2327 int top = f->top_pos;
2333 int yneg = window_prompting & YNegative; 2328 bool yneg = (window_prompting & YNegative) != 0;
2334 if (xneg) 2329 if (xneg)
2335 left = -left; 2330 left = -left;
2336 if (yneg) 2331 if (yneg)
@@ -2429,7 +2424,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
2429 Lisp_Object name; 2424 Lisp_Object name;
2430 bool explicit = f->explicit_name; 2425 bool explicit = f->explicit_name;
2431 2426
2432 f->explicit_name = 0; 2427 f->explicit_name = false;
2433 name = f->name; 2428 name = f->name;
2434 fset_name (f, Qnil); 2429 fset_name (f, Qnil);
2435 x_set_name (f, name, explicit); 2430 x_set_name (f, name, explicit);
@@ -2568,7 +2563,7 @@ x_window (struct frame *f)
2568 Lisp_Object name; 2563 Lisp_Object name;
2569 bool explicit = f->explicit_name; 2564 bool explicit = f->explicit_name;
2570 2565
2571 f->explicit_name = 0; 2566 f->explicit_name = false;
2572 name = f->name; 2567 name = f->name;
2573 fset_name (f, Qnil); 2568 fset_name (f, Qnil);
2574 x_set_name (f, name, explicit); 2569 x_set_name (f, name, explicit);
@@ -2614,15 +2609,12 @@ x_icon_verify (struct frame *f, Lisp_Object parms)
2614static void 2609static void
2615x_icon (struct frame *f, Lisp_Object parms) 2610x_icon (struct frame *f, Lisp_Object parms)
2616{ 2611{
2617 Lisp_Object icon_x, icon_y;
2618#if 0
2619 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
2620#endif
2621
2622 /* Set the position of the icon. Note that twm groups all 2612 /* Set the position of the icon. Note that twm groups all
2623 icons in an icon window. */ 2613 icons in an icon window. */
2624 icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER); 2614 Lisp_Object icon_x
2625 icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER); 2615 = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
2616 Lisp_Object icon_y
2617 = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
2626 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound)) 2618 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
2627 { 2619 {
2628 CHECK_TYPE_RANGED_INTEGER (int, icon_x); 2620 CHECK_TYPE_RANGED_INTEGER (int, icon_x);
@@ -2636,9 +2628,10 @@ x_icon (struct frame *f, Lisp_Object parms)
2636 if (! EQ (icon_x, Qunbound)) 2628 if (! EQ (icon_x, Qunbound))
2637 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y)); 2629 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y));
2638 2630
2639#if 0 /* x_get_arg removes the visibility parameter as a side effect, 2631#if false /* x_get_arg removes the visibility parameter as a side effect,
2640 but x_create_frame still needs it. */ 2632 but x_create_frame still needs it. */
2641 /* Start up iconic or window? */ 2633 /* Start up iconic or window? */
2634 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
2642 x_wm_set_window_state 2635 x_wm_set_window_state
2643 (f, (EQ (x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL), 2636 (f, (EQ (x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL),
2644 Qicon) 2637 Qicon)
@@ -2866,7 +2859,7 @@ Signal error if FRAME is not an X frame. */)
2866 struct frame *f = decode_window_system_frame (frame); 2859 struct frame *f = decode_window_system_frame (frame);
2867 2860
2868 block_input (); 2861 block_input ();
2869 x_wm_set_size_hint (f, 0, 0); 2862 x_wm_set_size_hint (f, 0, false);
2870 unblock_input (); 2863 unblock_input ();
2871 return Qnil; 2864 return Qnil;
2872} 2865}
@@ -2906,7 +2899,7 @@ This function is an internal primitive--use `make-frame' instead. */)
2906 struct frame *f; 2899 struct frame *f;
2907 Lisp_Object frame, tem; 2900 Lisp_Object frame, tem;
2908 Lisp_Object name; 2901 Lisp_Object name;
2909 int minibuffer_only = 0; 2902 bool minibuffer_only = false;
2910 long window_prompting = 0; 2903 long window_prompting = 0;
2911 ptrdiff_t count = SPECPDL_INDEX (); 2904 ptrdiff_t count = SPECPDL_INDEX ();
2912 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; 2905 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
@@ -2960,12 +2953,12 @@ This function is an internal primitive--use `make-frame' instead. */)
2960 else if (EQ (tem, Qonly)) 2953 else if (EQ (tem, Qonly))
2961 { 2954 {
2962 f = make_minibuffer_frame (); 2955 f = make_minibuffer_frame ();
2963 minibuffer_only = 1; 2956 minibuffer_only = true;
2964 } 2957 }
2965 else if (WINDOWP (tem)) 2958 else if (WINDOWP (tem))
2966 f = make_frame_without_minibuffer (tem, kb, display); 2959 f = make_frame_without_minibuffer (tem, kb, display);
2967 else 2960 else
2968 f = make_frame (1); 2961 f = make_frame (true);
2969 2962
2970 XSETFRAME (frame, f); 2963 XSETFRAME (frame, f);
2971 2964
@@ -3032,12 +3025,12 @@ This function is an internal primitive--use `make-frame' instead. */)
3032 if (!NILP (parent)) 3025 if (!NILP (parent))
3033 { 3026 {
3034 f->output_data.x->parent_desc = (Window) XFASTINT (parent); 3027 f->output_data.x->parent_desc = (Window) XFASTINT (parent);
3035 f->output_data.x->explicit_parent = 1; 3028 f->output_data.x->explicit_parent = true;
3036 } 3029 }
3037 else 3030 else
3038 { 3031 {
3039 f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; 3032 f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window;
3040 f->output_data.x->explicit_parent = 0; 3033 f->output_data.x->explicit_parent = false;
3041 } 3034 }
3042 3035
3043 /* Set the name; the functions to which we pass f expect the name to 3036 /* Set the name; the functions to which we pass f expect the name to
@@ -3045,12 +3038,12 @@ This function is an internal primitive--use `make-frame' instead. */)
3045 if (EQ (name, Qunbound) || NILP (name)) 3038 if (EQ (name, Qunbound) || NILP (name))
3046 { 3039 {
3047 fset_name (f, build_string (dpyinfo->x_id_name)); 3040 fset_name (f, build_string (dpyinfo->x_id_name));
3048 f->explicit_name = 0; 3041 f->explicit_name = false;
3049 } 3042 }
3050 else 3043 else
3051 { 3044 {
3052 fset_name (f, name); 3045 fset_name (f, name);
3053 f->explicit_name = 1; 3046 f->explicit_name = true;
3054 /* Use the frame's title when getting resources for this frame. */ 3047 /* Use the frame's title when getting resources for this frame. */
3055 specbind (Qx_resource_name, name); 3048 specbind (Qx_resource_name, name);
3056 } 3049 }
@@ -3137,10 +3130,10 @@ This function is an internal primitive--use `make-frame' instead. */)
3137 3130
3138 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground, 3131 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground,
3139 "scrollBarForeground", 3132 "scrollBarForeground",
3140 "ScrollBarForeground", 1); 3133 "ScrollBarForeground", true);
3141 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_background, 3134 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_background,
3142 "scrollBarBackground", 3135 "scrollBarBackground",
3143 "ScrollBarBackground", 0); 3136 "ScrollBarBackground", false);
3144 3137
3145#ifdef GLYPH_DEBUG 3138#ifdef GLYPH_DEBUG
3146 image_cache_refcount = 3139 image_cache_refcount =
@@ -3163,7 +3156,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3163 had one frame line vs one toolbar line which left us with a zero 3156 had one frame line vs one toolbar line which left us with a zero
3164 root window height which was obviously wrong as well ... */ 3157 root window height which was obviously wrong as well ... */
3165 adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), 3158 adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
3166 FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, 1, 3159 FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, true,
3167 Qx_create_frame_1); 3160 Qx_create_frame_1);
3168 3161
3169 /* Set the menu-bar-lines and tool-bar-lines parameters. We don't 3162 /* Set the menu-bar-lines and tool-bar-lines parameters. We don't
@@ -3193,7 +3186,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3193 FRAME_TOOL_BAR_POSITION (f), 0, 0, RES_TYPE_SYMBOL); 3186 FRAME_TOOL_BAR_POSITION (f), 0, 0, RES_TYPE_SYMBOL);
3194 3187
3195 /* Compute the size of the X window. */ 3188 /* Compute the size of the X window. */
3196 window_prompting = x_figure_window_size (f, parms, 1); 3189 window_prompting = x_figure_window_size (f, parms, true);
3197 3190
3198 tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); 3191 tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
3199 f->no_split = minibuffer_only || EQ (tem, Qt); 3192 f->no_split = minibuffer_only || EQ (tem, Qt);
@@ -3202,7 +3195,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3202 3195
3203 /* Create the X widget or window. */ 3196 /* Create the X widget or window. */
3204#ifdef USE_X_TOOLKIT 3197#ifdef USE_X_TOOLKIT
3205 x_window (f, window_prompting, minibuffer_only); 3198 x_window (f, window_prompting);
3206#else 3199#else
3207 x_window (f); 3200 x_window (f);
3208#endif 3201#endif
@@ -3238,7 +3231,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3238 /* Consider frame official, now. */ 3231 /* Consider frame official, now. */
3239 f->can_x_set_window_size = true; 3232 f->can_x_set_window_size = true;
3240 3233
3241 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, 1, 3234 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, true,
3242 Qx_create_frame_2); 3235 Qx_create_frame_2);
3243 3236
3244#if defined (USE_X_TOOLKIT) || defined (USE_GTK) 3237#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
@@ -3263,7 +3256,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3263 badly we want them. This should be done after we have the menu 3256 badly we want them. This should be done after we have the menu
3264 bar so that its size can be taken into account. */ 3257 bar so that its size can be taken into account. */
3265 block_input (); 3258 block_input ();
3266 x_wm_set_size_hint (f, window_prompting, 0); 3259 x_wm_set_size_hint (f, window_prompting, false);
3267 unblock_input (); 3260 unblock_input ();
3268 3261
3269 /* Make the window appear on the frame and enable display, unless 3262 /* Make the window appear on the frame and enable display, unless
@@ -3392,7 +3385,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
3392 3385
3393 CHECK_STRING (color); 3386 CHECK_STRING (color);
3394 3387
3395 if (x_defined_color (f, SSDATA (color), &foo, 0)) 3388 if (x_defined_color (f, SSDATA (color), &foo, false))
3396 return Qt; 3389 return Qt;
3397 else 3390 else
3398 return Qnil; 3391 return Qnil;
@@ -3407,7 +3400,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
3407 3400
3408 CHECK_STRING (color); 3401 CHECK_STRING (color);
3409 3402
3410 if (x_defined_color (f, SSDATA (color), &foo, 0)) 3403 if (x_defined_color (f, SSDATA (color), &foo, false))
3411 return list3i (foo.red, foo.green, foo.blue); 3404 return list3i (foo.red, foo.green, foo.blue);
3412 else 3405 else
3413 return Qnil; 3406 return Qnil;
@@ -4946,14 +4939,14 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
4946 4939
4947 frame = Qnil; 4940 frame = Qnil;
4948 GCPRO3 (parms, name, frame); 4941 GCPRO3 (parms, name, frame);
4949 f = make_frame (1); 4942 f = make_frame (true);
4950 XSETFRAME (frame, f); 4943 XSETFRAME (frame, f);
4951 4944
4952 AUTO_STRING (tip, " *tip*"); 4945 AUTO_STRING (tip, " *tip*");
4953 buffer = Fget_buffer_create (tip); 4946 buffer = Fget_buffer_create (tip);
4954 /* Use set_window_buffer instead of Fset_window_buffer (see 4947 /* Use set_window_buffer instead of Fset_window_buffer (see
4955 discussion of bug#11984, bug#12025, bug#12026). */ 4948 discussion of bug#11984, bug#12025, bug#12026). */
4956 set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, 0, 0); 4949 set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, false, false);
4957 old_buffer = current_buffer; 4950 old_buffer = current_buffer;
4958 set_buffer_internal_1 (XBUFFER (buffer)); 4951 set_buffer_internal_1 (XBUFFER (buffer));
4959 bset_truncate_lines (current_buffer, Qnil); 4952 bset_truncate_lines (current_buffer, Qnil);
@@ -4987,7 +4980,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
4987 fset_icon_name (f, Qnil); 4980 fset_icon_name (f, Qnil);
4988 FRAME_DISPLAY_INFO (f) = dpyinfo; 4981 FRAME_DISPLAY_INFO (f) = dpyinfo;
4989 f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; 4982 f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window;
4990 f->output_data.x->explicit_parent = 0; 4983 f->output_data.x->explicit_parent = false;
4991 4984
4992 /* These colors will be set anyway later, but it's important 4985 /* These colors will be set anyway later, but it's important
4993 to get the color reference counts right, so initialize them! */ 4986 to get the color reference counts right, so initialize them! */
@@ -5027,12 +5020,12 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
5027 if (EQ (name, Qunbound) || NILP (name)) 5020 if (EQ (name, Qunbound) || NILP (name))
5028 { 5021 {
5029 fset_name (f, build_string (dpyinfo->x_id_name)); 5022 fset_name (f, build_string (dpyinfo->x_id_name));
5030 f->explicit_name = 0; 5023 f->explicit_name = false;
5031 } 5024 }
5032 else 5025 else
5033 { 5026 {
5034 fset_name (f, name); 5027 fset_name (f, name);
5035 f->explicit_name = 1; 5028 f->explicit_name = true;
5036 /* use the frame's title when getting resources for this frame. */ 5029 /* use the frame's title when getting resources for this frame. */
5037 specbind (Qx_resource_name, name); 5030 specbind (Qx_resource_name, name);
5038 } 5031 }
@@ -5103,7 +5096,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
5103 5096
5104 f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; 5097 f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window;
5105 5098
5106 x_figure_window_size (f, parms, 0); 5099 x_figure_window_size (f, parms, false);
5107 5100
5108 { 5101 {
5109 XSetWindowAttributes attrs; 5102 XSetWindowAttributes attrs;
@@ -5156,7 +5149,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
5156 height = FRAME_LINES (f); 5149 height = FRAME_LINES (f);
5157 SET_FRAME_COLS (f, 0); 5150 SET_FRAME_COLS (f, 0);
5158 SET_FRAME_LINES (f, 0); 5151 SET_FRAME_LINES (f, 0);
5159 change_frame_size (f, width, height, 1, 0, 0, 0); 5152 change_frame_size (f, width, height, true, false, false, false);
5160 5153
5161 /* Add `tooltip' frame parameter's default value. */ 5154 /* Add `tooltip' frame parameter's default value. */
5162 if (NILP (Fframe_parameter (frame, Qtooltip))) 5155 if (NILP (Fframe_parameter (frame, Qtooltip)))
@@ -5209,7 +5202,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
5209 } 5202 }
5210 } 5203 }
5211 5204
5212 f->no_split = 1; 5205 f->no_split = true;
5213 5206
5214 UNGCPRO; 5207 UNGCPRO;
5215 5208
@@ -5327,7 +5320,8 @@ Text larger than the specified size is clipped. */)
5327 int root_x, root_y; 5320 int root_x, root_y;
5328 struct buffer *old_buffer; 5321 struct buffer *old_buffer;
5329 struct text_pos pos; 5322 struct text_pos pos;
5330 int i, width, height, seen_reversed_p; 5323 int i, width, height;
5324 bool seen_reversed_p;
5331 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; 5325 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
5332 int old_windows_or_buffers_changed = windows_or_buffers_changed; 5326 int old_windows_or_buffers_changed = windows_or_buffers_changed;
5333 ptrdiff_t count = SPECPDL_INDEX (); 5327 ptrdiff_t count = SPECPDL_INDEX ();
@@ -5465,7 +5459,7 @@ Text larger than the specified size is clipped. */)
5465 5459
5466 FRAME_TOTAL_COLS (f) = w->total_cols; 5460 FRAME_TOTAL_COLS (f) = w->total_cols;
5467 adjust_frame_glyphs (f); 5461 adjust_frame_glyphs (f);
5468 w->pseudo_window_p = 1; 5462 w->pseudo_window_p = true;
5469 5463
5470 /* Display the tooltip text in a temporary buffer. */ 5464 /* Display the tooltip text in a temporary buffer. */
5471 old_buffer = current_buffer; 5465 old_buffer = current_buffer;
@@ -5477,7 +5471,8 @@ Text larger than the specified size is clipped. */)
5477 try_window (FRAME_ROOT_WINDOW (f), pos, TRY_WINDOW_IGNORE_FONTS_CHANGE); 5471 try_window (FRAME_ROOT_WINDOW (f), pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
5478 5472
5479 /* Compute width and height of the tooltip. */ 5473 /* Compute width and height of the tooltip. */
5480 width = height = seen_reversed_p = 0; 5474 width = height = 0;
5475 seen_reversed_p = false;
5481 for (i = 0; i < w->desired_matrix->nrows; ++i) 5476 for (i = 0; i < w->desired_matrix->nrows; ++i)
5482 { 5477 {
5483 struct glyph_row *row = &w->desired_matrix->rows[i]; 5478 struct glyph_row *row = &w->desired_matrix->rows[i];
@@ -5489,7 +5484,7 @@ Text larger than the specified size is clipped. */)
5489 break; 5484 break;
5490 5485
5491 /* Let the row go over the full width of the frame. */ 5486 /* Let the row go over the full width of the frame. */
5492 row->full_width_p = 1; 5487 row->full_width_p = true;
5493 5488
5494 row_width = row->pixel_width; 5489 row_width = row->pixel_width;
5495 if (row->used[TEXT_AREA]) 5490 if (row->used[TEXT_AREA])
@@ -5512,7 +5507,7 @@ Text larger than the specified size is clipped. */)
5512 if (g->type == STRETCH_GLYPH && NILP (g->object)) 5507 if (g->type == STRETCH_GLYPH && NILP (g->object))
5513 { 5508 {
5514 row_width -= g->pixel_width; 5509 row_width -= g->pixel_width;
5515 seen_reversed_p = 1; 5510 seen_reversed_p = true;
5516 } 5511 }
5517 } 5512 }
5518 } 5513 }
@@ -5548,7 +5543,7 @@ Text larger than the specified size is clipped. */)
5548 5543
5549 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row)) 5544 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
5550 break; 5545 break;
5551 row->full_width_p = 1; 5546 row->full_width_p = true;
5552 row_width = row->pixel_width; 5547 row_width = row->pixel_width;
5553 if (row->used[TEXT_AREA] && !row->reversed_p) 5548 if (row->used[TEXT_AREA] && !row->reversed_p)
5554 { 5549 {
@@ -5715,7 +5710,7 @@ clean_up_file_dialog (void *arg)
5715 block_input (); 5710 block_input ();
5716 XtUnmanageChild (dialog); 5711 XtUnmanageChild (dialog);
5717 XtDestroyWidget (dialog); 5712 XtDestroyWidget (dialog);
5718 x_menu_set_in_use (0); 5713 x_menu_set_in_use (false);
5719 unblock_input (); 5714 unblock_input ();
5720} 5715}
5721 5716
@@ -5839,7 +5834,7 @@ value of DIR as in previous invocations; this is standard Windows behavior. */)
5839 record_unwind_protect_ptr (clean_up_file_dialog, dialog); 5834 record_unwind_protect_ptr (clean_up_file_dialog, dialog);
5840 5835
5841 /* Process events until the user presses Cancel or OK. */ 5836 /* Process events until the user presses Cancel or OK. */
5842 x_menu_set_in_use (1); 5837 x_menu_set_in_use (true);
5843 result = 0; 5838 result = 0;
5844 while (result == 0) 5839 while (result == 0)
5845 { 5840 {
@@ -5893,7 +5888,7 @@ value of DIR as in previous invocations; this is standard Windows behavior. */)
5893static void 5888static void
5894clean_up_dialog (void) 5889clean_up_dialog (void)
5895{ 5890{
5896 x_menu_set_in_use (0); 5891 x_menu_set_in_use (false);
5897} 5892}
5898 5893
5899DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0, 5894DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
@@ -6192,7 +6187,7 @@ Changing the value does not affect existing frames
6192unless you set the mouse color. */); 6187unless you set the mouse color. */);
6193 Vx_pointer_shape = Qnil; 6188 Vx_pointer_shape = Qnil;
6194 6189
6195#if 0 /* This doesn't really do anything. */ 6190#if false /* This doesn't really do anything. */
6196 DEFVAR_LISP ("x-nontext-pointer-shape", Vx_nontext_pointer_shape, 6191 DEFVAR_LISP ("x-nontext-pointer-shape", Vx_nontext_pointer_shape,
6197 doc: /* The shape of the pointer when not over text. 6192 doc: /* The shape of the pointer when not over text.
6198This variable takes effect when you create a new frame 6193This variable takes effect when you create a new frame
@@ -6206,7 +6201,7 @@ This variable takes effect when you create a new frame
6206or when you set the mouse color. */); 6201or when you set the mouse color. */);
6207 Vx_hourglass_pointer_shape = Qnil; 6202 Vx_hourglass_pointer_shape = Qnil;
6208 6203
6209#if 0 /* This doesn't really do anything. */ 6204#if false /* This doesn't really do anything. */
6210 DEFVAR_LISP ("x-mode-pointer-shape", Vx_mode_pointer_shape, 6205 DEFVAR_LISP ("x-mode-pointer-shape", Vx_mode_pointer_shape,
6211 doc: /* The shape of the pointer when over the mode line. 6206 doc: /* The shape of the pointer when over the mode line.
6212This variable takes effect when you create a new frame 6207This variable takes effect when you create a new frame
@@ -6268,25 +6263,25 @@ Chinese, Japanese, and Korean. */);
6268If nil or if the file selection dialog is not available, the new GTK file 6263If nil or if the file selection dialog is not available, the new GTK file
6269chooser is used instead. To turn off all file dialogs set the 6264chooser is used instead. To turn off all file dialogs set the
6270variable `use-file-dialog'. */); 6265variable `use-file-dialog'. */);
6271 x_gtk_use_old_file_dialog = 0; 6266 x_gtk_use_old_file_dialog = false;
6272 6267
6273 DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files, 6268 DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files,
6274 doc: /* If non-nil, the GTK file chooser will by default show hidden files. 6269 doc: /* If non-nil, the GTK file chooser will by default show hidden files.
6275Note that this is just the default, there is a toggle button on the file 6270Note that this is just the default, there is a toggle button on the file
6276chooser to show or not show hidden files on a case by case basis. */); 6271chooser to show or not show hidden files on a case by case basis. */);
6277 x_gtk_show_hidden_files = 0; 6272 x_gtk_show_hidden_files = false;
6278 6273
6279 DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text, 6274 DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text,
6280 doc: /* If non-nil, the GTK file chooser will show additional help text. 6275 doc: /* If non-nil, the GTK file chooser will show additional help text.
6281If more space for files in the file chooser dialog is wanted, set this to nil 6276If more space for files in the file chooser dialog is wanted, set this to nil
6282to turn the additional text off. */); 6277to turn the additional text off. */);
6283 x_gtk_file_dialog_help_text = 1; 6278 x_gtk_file_dialog_help_text = true;
6284 6279
6285 DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, 6280 DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips,
6286 doc: /* If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. 6281 doc: /* If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used.
6287Otherwise use Emacs own tooltip implementation. 6282Otherwise use Emacs own tooltip implementation.
6288When using Gtk+ tooltips, the tooltip face is not used. */); 6283When using Gtk+ tooltips, the tooltip face is not used. */);
6289 x_gtk_use_system_tooltips = 1; 6284 x_gtk_use_system_tooltips = true;
6290 6285
6291 /* Tell Emacs about this window system. */ 6286 /* Tell Emacs about this window system. */
6292 Fprovide (Qx, Qnil); 6287 Fprovide (Qx, Qnil);
@@ -6317,7 +6312,7 @@ When using Gtk+ tooltips, the tooltip face is not used. */);
6317 char gtk_version[sizeof ".." + 3 * INT_STRLEN_BOUND (int)]; 6312 char gtk_version[sizeof ".." + 3 * INT_STRLEN_BOUND (int)];
6318 int len = sprintf (gtk_version, "%d.%d.%d", 6313 int len = sprintf (gtk_version, "%d.%d.%d",
6319 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); 6314 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
6320 Vgtk_version_string = make_pure_string (gtk_version, len, len, 0); 6315 Vgtk_version_string = make_pure_string (gtk_version, len, len, false);
6321 } 6316 }
6322#endif /* USE_GTK */ 6317#endif /* USE_GTK */
6323 6318
diff --git a/src/xterm.h b/src/xterm.h
index 123f31cda7b..e597227c81c 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1067,8 +1067,8 @@ extern void x_clipboard_manager_save_frame (Lisp_Object);
1067extern void x_clipboard_manager_save_all (void); 1067extern void x_clipboard_manager_save_all (void);
1068 1068
1069#ifdef USE_GTK 1069#ifdef USE_GTK
1070extern int xg_set_icon (struct frame *, Lisp_Object); 1070extern bool xg_set_icon (struct frame *, Lisp_Object);
1071extern int xg_set_icon_from_xpm_data (struct frame *, const char **); 1071extern bool xg_set_icon_from_xpm_data (struct frame *, const char **);
1072#endif /* USE_GTK */ 1072#endif /* USE_GTK */
1073 1073
1074extern void xic_free_xfontset (struct frame *); 1074extern void xic_free_xfontset (struct frame *);
@@ -1081,7 +1081,7 @@ extern bool x_defined_color (struct frame *, const char *, XColor *, bool);
1081#ifdef HAVE_X_I18N 1081#ifdef HAVE_X_I18N
1082extern void free_frame_xic (struct frame *); 1082extern void free_frame_xic (struct frame *);
1083# if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT 1083# if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
1084extern char * xic_create_fontsetname (const char *base_fontname, int motif); 1084extern char *xic_create_fontsetname (const char *, bool);
1085# endif 1085# endif
1086#endif 1086#endif
1087 1087
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-20 22:18:47 +0000