[vte] terminal: Move some initialisations to the class
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] terminal: Move some initialisations to the class
- Date: Mon, 18 Nov 2019 21:43:09 +0000 (UTC)
commit db8ca71880af64fa0be1eef8d127aa92070a90c3
Author: Christian Persch <chpe src gnome org>
Date: Mon Nov 18 22:42:22 2019 +0100
terminal: Move some initialisations to the class
... and use bool instead of gboolean.
src/vte.cc | 24 ++++++------------------
src/vteinternal.hh | 20 ++++++++++----------
2 files changed, 16 insertions(+), 28 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 611a15e7..264caae2 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -7397,7 +7397,7 @@ Terminal::ensure_font()
int cell_width, cell_height;
int char_ascent, char_descent;
GtkBorder char_spacing;
- m_fontdirty = FALSE;
+ m_fontdirty = false;
_vte_draw_set_text_font (m_draw,
m_widget,
m_fontdesc,
@@ -7435,8 +7435,8 @@ Terminal::update_font()
}
m_fontdesc = desc;
- m_fontdirty = TRUE;
- m_has_fonts = TRUE;
+ m_fontdirty = true;
+ m_has_fonts = true;
/* Set the drawing font. */
if (widget_realized()) {
@@ -7525,7 +7525,7 @@ Terminal::set_cell_width_scale(double scale)
m_cell_width_scale = scale;
/* Set the drawing font. */
- m_fontdirty = TRUE;
+ m_fontdirty = true;
if (widget_realized()) {
ensure_font();
}
@@ -7542,7 +7542,7 @@ Terminal::set_cell_height_scale(double scale)
m_cell_height_scale = scale;
/* Set the drawing font. */
- m_fontdirty = TRUE;
+ m_fontdirty = true;
if (widget_realized()) {
ensure_font();
}
@@ -7897,19 +7897,12 @@ Terminal::Terminal(vte::platform::Widget* w,
/* Miscellaneous options. */
set_backspace_binding(VTE_ERASE_AUTO);
set_delete_binding(VTE_ERASE_AUTO);
- m_audible_bell = TRUE;
m_text_blink_mode = VTE_TEXT_BLINK_ALWAYS;
- m_allow_bold = TRUE;
- m_bold_is_bright = FALSE;
- m_rewrap_on_resize = TRUE;
-
- m_input_enabled = TRUE;
/* Cursor shape. */
m_cursor_shape = VTE_CURSOR_SHAPE_BLOCK;
/* Cursor blinking. */
- m_cursor_blinks = FALSE;
m_cursor_blink_mode = VTE_CURSOR_BLINK_SYSTEM;
/* DECSCUSR cursor style (shape and blinking possibly overridden
@@ -7931,13 +7924,8 @@ Terminal::Terminal(vte::platform::Widget* w,
set_word_char_exceptions(WORD_CHAR_EXCEPTIONS_DEFAULT);
/* Selection */
- m_selection_block_mode = FALSE;
m_unscaled_font_desc = nullptr;
m_fontdesc = nullptr;
- m_has_fonts = FALSE;
-
- /* Hyperlink */
- m_allow_hyperlink = FALSE;
update_view_extents();
@@ -8097,7 +8085,7 @@ Terminal::widget_unrealize()
_vte_draw_free(m_draw);
m_draw = NULL;
}
- m_fontdirty = TRUE;
+ m_fontdirty = true;
/* Unmap the widget if it hasn't been already. */
// FIXMEchpe this can't happen
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index a4f50913..fce0d0b9 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -451,7 +451,7 @@ public:
gboolean m_selecting;
gboolean m_will_select_after_threshold;
gboolean m_selecting_had_delta;
- gboolean m_selection_block_mode; // FIXMEegmont move it into a 4th value in vte_selection_type?
+ bool m_selection_block_mode{false}; // FIXMEegmont move it into a 4th value in vte_selection_type?
enum vte_selection_type m_selection_type;
vte::grid::halfcoords m_selection_origin, m_selection_last; /* BiDi: logical in normal modes,
visual in m_selection_block_mode */
vte::grid::span m_selection_resolved;
@@ -468,13 +468,13 @@ public:
/* Miscellaneous options. */
VteEraseBinding m_backspace_binding;
VteEraseBinding m_delete_binding;
- gboolean m_audible_bell;
- gboolean m_allow_bold;
- gboolean m_bold_is_bright;
+ bool m_audible_bell{true};
+ bool m_allow_bold{true};
+ bool m_bold_is_bright{false};
+ bool m_rewrap_on_resize{true};
gboolean m_text_modified_flag;
gboolean m_text_inserted_flag;
gboolean m_text_deleted_flag;
- gboolean m_rewrap_on_resize;
/* Scrolling options. */
bool m_scroll_on_output{false};
@@ -495,9 +495,9 @@ public:
guint m_cursor_blink_tag{0}; /* cursor blinking timeout ID */
gint m_cursor_blink_cycle; /* gtk-cursor-blink-time / 2 */
int m_cursor_blink_timeout{500}; /* gtk-cursor-blink-timeout */
- gboolean m_cursor_blinks; /* whether the cursor is actually blinking */
gint64 m_cursor_blink_time; /* how long the cursor has been blinking yet */
gboolean m_has_focus; /* is the terminal window focused */
+ bool m_cursor_blinks{false}; /* whether the cursor is actually blinking */
/* Contents blinking */
VteTextBlinkMode m_text_blink_mode;
@@ -511,7 +511,7 @@ public:
VteCursorStyle m_cursor_style;
/* Input device options. */
- gboolean m_input_enabled;
+ bool m_input_enabled{true};
time_t m_last_keypress_time;
MouseTrackingMode m_mouse_tracking_mode{MOUSE_TRACKING_NONE};
@@ -619,7 +619,6 @@ public:
PangoFontDescription *m_unscaled_font_desc;
PangoFontDescription *m_fontdesc;
double m_font_scale{1.};
- gboolean m_fontdirty;
/* First, the dimensions of ASCII characters are measured. The result
* could probably be called char_{width,height} or font_{width,height}
@@ -712,7 +711,8 @@ public:
guint m_modifiers;
/* Font stuff. */
- gboolean m_has_fonts;
+ bool m_has_fonts{false};
+ bool m_fontdirty{true};
long m_line_thickness{VTE_LINE_WIDTH};
long m_underline_position{0};
long m_underline_thickness{VTE_LINE_WIDTH};
@@ -734,7 +734,7 @@ public:
auto vadjustment() noexcept { return m_vadjustment.get(); }
/* Hyperlinks */
- gboolean m_allow_hyperlink;
+ bool m_allow_hyperlink{false};
vte::base::Ring::hyperlink_idx_t m_hyperlink_hover_idx;
const char *m_hyperlink_hover_uri; /* data is owned by the ring */
long m_hyperlink_auto_id{0};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]