diff options
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/xterm.h b/src/xterm.h index eff75403476..e79eecadc34 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -50,7 +50,7 @@ typedef GtkWidget *xt_or_gtk_widget; #define XtParent(x) (gtk_widget_get_parent (x)) #undef XSync #define XSync(d, b) do { gdk_window_process_all_updates (); \ - XSync (d, b); } while (0) + XSync (d, b); } while (false) #endif /* USE_GTK */ /* True iff GTK's version is at least I.J.K. */ @@ -62,7 +62,7 @@ typedef GtkWidget *xt_or_gtk_widget; < GTK_MINOR_VERSION + ((k) \ <= GTK_MICRO_VERSION))) # else -# define GTK_CHECK_VERSION(i, j, k) 0 +# define GTK_CHECK_VERSION(i, j, k) false # endif #endif @@ -115,7 +115,7 @@ struct xim_inst_t struct x_bitmap_record { Pixmap pixmap; - int have_mask; + bool have_mask; Pixmap mask; char *file; int refcount; @@ -400,7 +400,7 @@ struct x_display_info #ifdef HAVE_X_I18N /* Whether or not to use XIM if we have it. */ -extern int use_xim; +extern bool use_xim; #endif /* This is a chain of structures for all the X displays currently in use. */ @@ -488,9 +488,9 @@ struct x_output /* The handle box that makes the tool bar detachable. */ GtkWidget *handlebox_widget; #endif - /* Non-zero if tool bar is packed into the hbox widget (i.e. vertical). */ - bool toolbar_in_hbox; - bool toolbar_is_packed; + /* True if tool bar is packed into the hbox widget (i.e. vertical). */ + bool_bf toolbar_in_hbox : 1; + bool_bf toolbar_is_packed : 1; /* The last size hints set. */ GdkGeometry size_hints; @@ -551,9 +551,6 @@ struct x_output mapped to display an hourglass cursor. */ Window hourglass_window; - /* Non-zero means hourglass cursor is currently displayed. */ - unsigned hourglass_p : 1; - /* These are the current window manager hints. It seems that XSetWMHints, when presented with an unset bit in the `flags' member of the hints structure, does not leave the corresponding @@ -579,15 +576,28 @@ struct x_output int id; #endif - /* Nonzero means our parent is another application's window + /* True means hourglass cursor is currently displayed. */ + bool_bf hourglass_p : 1; + + /* True means our parent is another application's window and was explicitly specified. */ - unsigned explicit_parent : 1; + bool_bf explicit_parent : 1; + + /* True means tried already to make this frame visible. */ + bool_bf asked_for_visible : 1; + + /* True if this frame was ever previously visible. */ + bool_bf has_been_visible : 1; - /* Nonzero means tried already to make this frame visible. */ - unsigned asked_for_visible : 1; + /* Xt waits for a ConfigureNotify event from the window manager in + EmacsFrameSetCharSize when the shell widget is resized. For some + window managers like fvwm2 2.2.5 and KDE 2.1 this event doesn't + arrive for an unknown reason and Emacs hangs in Xt. If this is + false, tell Xt not to wait. */ + bool_bf wait_for_wm : 1; - /* Nonzero if this frame was ever previously visible. */ - unsigned has_been_visible : 1; + /* True if _NET_WM_STATE_HIDDEN is set for this frame. */ + bool_bf net_wm_state_hidden_seen : 1; #ifdef HAVE_X_I18N /* Input context (currently, this means Compose key handler setup). */ @@ -608,13 +618,6 @@ struct x_output They are changed only when a different background is involved. */ unsigned long relief_background; - /* Xt waits for a ConfigureNotify event from the window manager in - EmacsFrameSetCharSize when the shell widget is resized. For some - window managers like fvwm2 2.2.5 and KDE 2.1 this event doesn't - arrive for an unknown reason and Emacs hangs in Xt. If this is - zero, tell Xt not to wait. */ - int wait_for_wm; - /* As x_pixels_diff, but to FRAME_OUTER_WINDOW. For some reason the two might differ by a pixel, depending on WM */ int x_pixels_outer_diff; @@ -632,9 +635,6 @@ struct x_output /* The offset we need to add to compensate for type A WMs. */ int move_offset_top; int move_offset_left; - - /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */ - unsigned net_wm_state_hidden_seen : 1; }; #define No_Cursor (None) @@ -827,7 +827,7 @@ struct scroll_bar do { \ Window window = XtWindow (w); \ ptr->x_window = window; \ -} while (0) + } while (false) #endif /* USE_X_TOOLKIT */ |