From aae31dbe4315ccafb6c8c8ba26312c4ce284a2a1 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 13 Jun 2016 10:28:08 +0300 Subject: [PATCH] WView: remove WView::active. Use WST_FOCUSED instead. Signed-off-by: Andrew Borodin --- src/viewer/actions_cmd.c | 5 ----- src/viewer/internal.h | 1 - src/viewer/mcviewer.c | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 8c4defc8b..3c7f0c469 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -683,15 +683,10 @@ mcview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * return i; case MSG_FOCUS: - view->active = TRUE; view->dpy_bbar_dirty = TRUE; mcview_update (view); return MSG_HANDLED; - case MSG_UNFOCUS: - view->active = FALSE; - return MSG_HANDLED; - case MSG_DESTROY: if (mcview_is_in_panel (view)) { diff --git a/src/viewer/internal.h b/src/viewer/internal.h index 9776ab42c..2b2886a94 100644 --- a/src/viewer/internal.h +++ b/src/viewer/internal.h @@ -153,7 +153,6 @@ struct WView coord_cache_t *coord_cache; /* Cache for mapping offsets to cursor positions */ /* Display information */ - gboolean active; /* Active or not in QuickView mode */ screen_dimen dpy_frame_size; /* Size of the frame surrounding the real viewer */ off_t dpy_start; /* Offset of the displayed data (start of the paragraph in non-hex mode) */ off_t dpy_end; /* Offset after the displayed data */ diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c index d1f9f191f..49165b4b5 100644 --- a/src/viewer/mcviewer.c +++ b/src/viewer/mcviewer.c @@ -100,7 +100,7 @@ mcview_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) break; } - if (!view->active) + if (!widget_get_state (w, WST_FOCUSED)) { /* Grab focus */ change_panel (); @@ -205,7 +205,6 @@ mcview_new (int y, int x, int lines, int cols, gboolean is_panel) view->text_wrap_mode = FALSE; view->magic_mode = FALSE; - view->active = FALSE; view->dpy_frame_size = is_panel ? 1 : 0; view->converter = str_cnv_from_term; -- 2.11.4.GIT