Skip to content

Select multiple words/lines when double/triple clicking. #5127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobertP-McDowell wants to merge 3 commits into
base: master
Choose a base branch
from
+103 −64
Open

Select multiple words/lines when double/triple clicking. #5127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0827ef5
Highlight multiple words when double clicking in mcedit.
RobertP-McDowell Jun 13, 2026
d2e52ba
Highlight multiple lines when triple clicking in mcedit.
RobertP-McDowell Jun 14, 2026
857c485
Multi click timer starts on button down, instead of up.
RobertP-McDowell Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions lib/tty/key.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,11 +818,9 @@ xmouse_get_event (Gpm_Event *ev, gboolean extended)
else
{
ev->type = GPM_UP | (GPM_SINGLE << clicks);
tv1 = g_get_monotonic_time ();
}
ev->buttons = 0;
last_btn = 0;
clicks = 0;
}
else
{
Expand All @@ -834,14 +832,6 @@ xmouse_get_event (Gpm_Event *ev, gboolean extended)
{
gint64 tv2;

if (btn >= 32 && btn <= 34)
{
btn -= 32;
ev->type = GPM_DRAG;
}
else
ev->type = GPM_DOWN;

tv2 = g_get_monotonic_time ();
if (tv1 != 0 && tv2 - tv1 < (gint64) double_click_speed * MC_USEC_PER_MSEC)
{
Expand All @@ -851,6 +841,17 @@ xmouse_get_event (Gpm_Event *ev, gboolean extended)
else
clicks = 0;

if (btn >= 32 && btn <= 34)
{
btn -= 32;
ev->type = GPM_DRAG;
}
else
{
ev->type = GPM_DOWN;
tv1 = g_get_monotonic_time ();
}

switch (btn)
{
case 0:
Expand All @@ -876,6 +877,7 @@ xmouse_get_event (Gpm_Event *ev, gboolean extended)
ev->buttons = 0;
break;
}
ev->type |= (GPM_SINGLE << clicks);
last_btn = ev->buttons;
}
}
Expand Down
112 changes: 75 additions & 37 deletions src/editor/edit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,41 @@ my_type_of (int c)
return r;
}

/* --------------------------------------------------------------------------------------------- */
/** get word at cursor for marking */

static void
edit_get_current_word_extents (WEdit *edit, off_t *start, off_t *end)
{
long pos;

for (pos = edit->buffer.curs1; pos < edit->buffer.size; pos++)
{
const int check_char = edit_buffer_get_byte (&edit->buffer, pos);

if (is_break_char (check_char))
{
if (pos == edit->buffer.curs1) // always select at least one character.
{
*start = pos;
*end = pos+1;
return;
}
break;
}
}
*end = pos;

for (; pos != 0; pos--)
{
const int check_char = edit_buffer_get_byte (&edit->buffer, pos - 1);

if (is_break_char (check_char))
break;
}
*start = pos;
}

/* --------------------------------------------------------------------------------------------- */

static void
Expand Down Expand Up @@ -3078,8 +3113,8 @@ edit_set_markers (WEdit *edit, off_t m1, off_t m2, long c1, long c2)

/* --------------------------------------------------------------------------------------------- */
/**
if mark2 is -1 then marking is from mark1 to the cursor.
Otherwise its between the markers. This handles this.
if mark2 is -1 then marking is from mark1 to end_mark_curs (the cursor).
This also handles the logic for word/line highlighting.
Returns FALSE if no text is marked.
*/

Expand Down Expand Up @@ -3107,8 +3142,25 @@ eval_marks (WEdit *edit, off_t *start_mark, off_t *end_mark)
}
else
{
*start_mark = MIN (edit->mark1, end_mark_curs);
*end_mark = MAX (edit->mark1, end_mark_curs);
if (edit->word_highlight)
{
off_t word_start;
off_t word_end;

edit_get_current_word_extents (edit, &word_start, &word_end);
Comment thread
RobertP-McDowell marked this conversation as resolved.
*start_mark = MIN (edit->mark1, word_start);
*end_mark = MAX (end_mark_curs, word_end);
}
else if (edit->line_highlight)
{
*start_mark = MIN (edit->mark1, edit_buffer_get_current_bol (&edit->buffer));
*end_mark = MAX (end_mark_curs, edit_buffer_get_current_eol (&edit->buffer));
}
else
{
*start_mark = MIN (edit->mark1, end_mark_curs);
*end_mark = MAX (edit->mark1, end_mark_curs);
}
edit->column2 = edit->curs_col + edit->over_col;
}

Expand Down Expand Up @@ -3154,18 +3206,30 @@ edit_mark_cmd (WEdit *edit, gboolean unmark)
edit_set_markers (edit, 0, 0, 0, 0);
edit->force |= REDRAW_PAGE;
}
else if (edit->mark2 >= 0)
else if (edit->mark2 >= 0) // mark highlighting just started.
{
off_t m1 = edit->buffer.curs1;
Comment thread
RobertP-McDowell marked this conversation as resolved.

edit->end_mark_curs = -1;
edit_set_markers (edit, edit->buffer.curs1, -1, edit->curs_col + edit->over_col,
if (edit->word_highlight)
edit_get_current_word_extents (edit, &m1, &edit->end_mark_curs);
else if (edit->line_highlight)
{
m1 = edit_buffer_get_current_bol (&edit->buffer);
edit->end_mark_curs = edit_buffer_get_current_eol (&edit->buffer);
}
edit_set_markers (edit, m1, -1, edit->curs_col + edit->over_col,
edit->curs_col + edit->over_col);
edit->force |= REDRAW_PAGE;
}
else
else // mark highlighting just ended.
{
edit->end_mark_curs = edit->buffer.curs1;
edit_set_markers (edit, edit->mark1, edit->buffer.curs1, edit->column1,
edit->curs_col + edit->over_col);
off_t m1;
off_t m2;

eval_marks (edit, &m1, &m2);
edit->end_mark_curs = m2;
edit_set_markers (edit, m1, m2, edit->column1, edit->curs_col + edit->over_col);
}
}

Expand All @@ -3175,33 +3239,7 @@ edit_mark_cmd (WEdit *edit, gboolean unmark)
void
edit_mark_current_word_cmd (WEdit *edit)
{
long pos;

for (pos = edit->buffer.curs1; pos != 0; pos--)
{
int c1, c2;

c1 = edit_buffer_get_byte (&edit->buffer, pos);
c2 = edit_buffer_get_byte (&edit->buffer, pos - 1);
if (!isspace (c1) && isspace (c2))
break;
if ((my_type_of (c1) & my_type_of (c2)) == 0)
break;
}
edit->mark1 = pos;

for (; pos < edit->buffer.size; pos++)
{
int c1, c2;

c1 = edit_buffer_get_byte (&edit->buffer, pos);
c2 = edit_buffer_get_byte (&edit->buffer, pos + 1);
if (!isspace (c1) && isspace (c2))
break;
if ((my_type_of (c1) & my_type_of (c2)) == 0)
break;
}
edit->mark2 = MIN (pos + 1, edit->buffer.size);
edit_get_current_word_extents (edit, &edit->mark1, &edit->mark2);

edit->force |= REDRAW_LINE_ABOVE | REDRAW_AFTER_CURSOR;
}
Expand Down
23 changes: 10 additions & 13 deletions src/editor/editwidget.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,11 @@ edit_mouse_callback (Widget *w, mouse_msg_t msg, mouse_event_t *event)
edit_update_curs_row (edit);
edit_update_curs_col (edit);

if (event->count == GPM_DOUBLE)
edit->word_highlight = TRUE;
else if (event->count == GPM_TRIPLE)
edit->line_highlight = TRUE;

if (edit->fullscreen == 0)
{
if (event->y == 0)
Expand Down Expand Up @@ -1131,11 +1136,15 @@ edit_mouse_callback (Widget *w, mouse_msg_t msg, mouse_event_t *event)
}
}

MC_FALLTHROUGH; // to start/stop text selection
edit_update_cursor (edit, event);
edit_total_update (edit);
break;

case MSG_MOUSE_UP:
edit_update_cursor (edit, event);
edit_total_update (edit);
edit->word_highlight = FALSE;
edit->line_highlight = FALSE;
break;

case MSG_MOUSE_CLICK:
Expand All @@ -1149,18 +1158,6 @@ edit_mouse_callback (Widget *w, mouse_msg_t msg, mouse_event_t *event)
// double click on top line (toggle fullscreen)
edit_toggle_fullscreen (edit);
}
else if (event->count == GPM_DOUBLE)
{
// double click
edit_mark_current_word_cmd (edit);
edit_total_update (edit);
}
else if (event->count == GPM_TRIPLE)
{
// triple click: works in GPM only, not in xterm
edit_mark_current_line_cmd (edit);
edit_total_update (edit);
}
break;

case MSG_MOUSE_DRAG:
Expand Down
10 changes: 6 additions & 4 deletions src/editor/editwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,12 @@ struct WEdit
unsigned int delete_file : 1; // New file, needs to be deleted unless modified
unsigned int highlight : 1; // There is a selected block
unsigned int column_highlight : 1;
unsigned int fullscreen : 1; // Is window fullscreen or not
long prev_col; /* recent column position of the cursor - used when moving
up or down past lines that are shorter than the current line */
long start_line; // line number of the top of the page
unsigned int word_highlight : 1; // Highlight each word the cursor crosses
unsigned int line_highlight : 1; // Highlight each line the cursor crosses
unsigned int fullscreen : 1; // Is window fullscreen or not
long prev_col; /* recent column position of the cursor - used when moving
up or down past lines that are shorter than the current line */
long start_line; // line number of the top of the page

// file info
off_t mark1; // position of highlight start
Expand Down