mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 09:19:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #3251: mcviewer: grab focus on mouse click in QuickView mode.

Browse Source 
(mcview_t): add new member 'active' to recognize current state in QuickView mode.
(mcview_callback): toggle mcview_t::active in MGS_FOCUS and MSG_UNFOCUS
event handlers.
(do_mcview_event): use mcview_t::active to grab focus.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2014-09-01 13:21:04 +04:00
parent d794397536
commit f5c04331e1
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/viewer/actions_cmd.c
View File

@ -679,10 +679,15 @@ mcview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *
return i; return i;
case MSG_FOCUS: case MSG_FOCUS:
view->active = TRUE;
view->dpy_bbar_dirty = TRUE; view->dpy_bbar_dirty = TRUE;
mcview_update (view); mcview_update (view);
return MSG_HANDLED; return MSG_HANDLED;
case MSG_UNFOCUS:
view->active = FALSE;
return MSG_HANDLED;
case MSG_DESTROY: case MSG_DESTROY:
if (mcview_is_in_panel (view)) if (mcview_is_in_panel (view))
{ {

1
src/viewer/internal.h
View File

@ -139,6 +139,7 @@ struct mcview_struct
coord_cache_t *coord_cache; /* Cache for mapping offsets to cursor positions */ coord_cache_t *coord_cache; /* Cache for mapping offsets to cursor positions */
/* Display information */ /* Display information */
gboolean active; /* Active or not in QuickView mode */
screen_dimen dpy_frame_size; /* Size of the frame surrounding the real viewer */ screen_dimen dpy_frame_size; /* Size of the frame surrounding the real viewer */
off_t dpy_start; /* Offset of the displayed data */ off_t dpy_start; /* Offset of the displayed data */
off_t dpy_end; /* Offset after the displayed data */ off_t dpy_end; /* Offset after the displayed data */

7
src/viewer/mcviewer.c
View File

@ -106,7 +106,7 @@ do_mcview_event (mcview_t * view, Gpm_Event * event, int *result)
if ((local.type & (GPM_DOWN | GPM_DRAG)) == 0) if ((local.type & (GPM_DOWN | GPM_DRAG)) == 0)
return FALSE; return FALSE;
/* Wheel events */ /* Wheel events. Allow them in the inactive panel */
if ((local.buttons & GPM_B_UP) != 0 && (local.type & GPM_DOWN) != 0) if ((local.buttons & GPM_B_UP) != 0 && (local.type & GPM_DOWN) != 0)
{ {
mcview_move_up (view, 2); mcview_move_up (view, 2);
@ -118,6 +118,10 @@ do_mcview_event (mcview_t * view, Gpm_Event * event, int *result)
return TRUE; return TRUE;
} }
/* Grab focus */
if (mcview_is_in_panel (view) && !view->active)
change_panel ();
x = local.x; x = local.x;
y = local.y; y = local.y;
@ -207,6 +211,7 @@ mcview_new (int y, int x, int lines, int cols, gboolean is_panel)
view->text_wrap_mode = FALSE; view->text_wrap_mode = FALSE;
view->magic_mode = FALSE; view->magic_mode = FALSE;
view->active = FALSE;
view->dpy_frame_size = is_panel ? 1 : 0; view->dpy_frame_size = is_panel ? 1 : 0;
view->converter = str_cnv_from_term; view->converter = str_cnv_from_term;