[vte] widget: Remove extraneous realized checks
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Remove extraneous realized checks
- Date: Sun, 13 Dec 2015 18:09:32 +0000 (UTC)
commit d69772604caf6e722e539c66d9e8787161af2096
Author: Christian Persch <chpe gnome org>
Date: Sun Dec 13 19:08:23 2015 +0100
widget: Remove extraneous realized checks
Except for focus change events, all gtk widget events are only emitted
on realized widgets.
src/vte.cc | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 997d833..51dea15 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -4913,8 +4913,7 @@ VteTerminalPrivate::widget_key_press(GdkEventKey *event)
/* Let the input method at this one first. */
if (!steal && m_input_enabled) {
- if (gtk_widget_get_realized(m_widget) &&
- gtk_im_context_filter_keypress(m_im_context, event)) {
+ if (m_im_context && gtk_im_context_filter_keypress(m_im_context, event)) {
_vte_debug_print(VTE_DEBUG_EVENTS,
"Keypress taken by IM.\n");
return true;
@@ -5209,8 +5208,8 @@ VteTerminalPrivate::widget_key_release(GdkEventKey *event)
{
read_modifiers((GdkEvent*)event);
- if (gtk_widget_get_realized(m_widget) &&
- m_input_enabled &&
+ if (m_input_enabled &&
+ m_im_context &&
gtk_im_context_filter_keypress(m_im_context, event))
return true;
@@ -7123,11 +7122,6 @@ VteTerminalPrivate::widget_motion_notify(GdkEventMotion *event)
long x, y;
bool handled = false;
- /* check to see if it matters */
- // FIXMEchpe this can't happen
- if (G_UNLIKELY(!gtk_widget_get_realized(m_widget)))
- return false;
-
x = event->x - m_padding.left;
y = event->y - m_padding.top;
@@ -7486,12 +7480,9 @@ VteTerminalPrivate::widget_enter(GdkEventCrossing *event)
{
_vte_debug_print(VTE_DEBUG_EVENTS, "Enter.\n");
- if (gtk_widget_get_realized(m_widget)) {
- /* Hilite any matches. */
- match_hilite_show(
- event->x - m_padding.left,
- event->y - m_padding.top);
- }
+ /* Hilite any matches. */
+ match_hilite_show(event->x - m_padding.left,
+ event->y - m_padding.top);
}
void
@@ -7499,15 +7490,13 @@ VteTerminalPrivate::widget_leave(GdkEventCrossing *event)
{
_vte_debug_print(VTE_DEBUG_EVENTS, "Leave.\n");
- if (gtk_widget_get_realized(m_widget)) {
- match_hilite_hide();
+ match_hilite_hide();
- /* Mark the cursor as invisible to disable hilite updating,
- * whilst the cursor is absent (otherwise we copy the entire
- * buffer after each update for nothing...)
- */
- m_mouse_cursor_visible = FALSE;
- }
+ /* Mark the cursor as invisible to disable hilite updating,
+ * whilst the cursor is absent (otherwise we copy the entire
+ * buffer after each update for nothing...)
+ */
+ m_mouse_cursor_visible = FALSE;
}
static G_GNUC_UNUSED inline const char *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]