Skip to content

input: readline-style editing keys; formatting accels move to Alt #7

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
rubinlinux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

input: readline-style editing keys; formatting accels move to Alt #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/fe-gtk/fkeys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,12 @@ static const struct key_action key_actions[KEY_MAX_ACTIONS + 1] = {
"ACCEL=<Alt>2\nChange Tab\nD1:2\n\n"\
"ACCEL=<Alt>1\nChange Tab\nD1:1\n\n"\
"ACCEL=<Alt>grave\nChange Tab\nD1:auto\n\n"\
"ACCEL=<Primary>o\nInsert in Buffer\nD1:\017\n\n"\
"ACCEL=<Primary>b\nInsert in Buffer\nD1:\002\n\n"\
"ACCEL=<Primary>k\nInsert in Buffer\nD1:\003\n\n"\
"ACCEL=<Primary>i\nInsert in Buffer\nD1:\035\n\n"\
"ACCEL=<Primary>u\nInsert in Buffer\nD1:\037\n\n"\
"ACCEL=<Primary>r\nInsert in Buffer\nD1:\026\n\n"\
"ACCEL=<Alt>o\nInsert in Buffer\nD1:\017\n\n"\
"ACCEL=<Alt>b\nInsert in Buffer\nD1:\002\n\n"\
"ACCEL=<Alt>k\nInsert in Buffer\nD1:\003\n\n"\
"ACCEL=<Alt>i\nInsert in Buffer\nD1:\035\n\n"\
"ACCEL=<Alt>u\nInsert in Buffer\nD1:\037\n\n"\
"ACCEL=<Alt>r\nInsert in Buffer\nD1:\026\n\n"\
"ACCEL=<Shift>Page_Down\nChange Selected Nick\nD1!\n\n"\
"ACCEL=<Shift>Page_Up\nChange Selected Nick\nD1:Up\n\n"\
"ACCEL=Page_Down\nScroll Page\nD1:Down\n\n"\
Expand Down
105 changes: 105 additions & 0 deletions src/fe-gtk/hex-input-edit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,6 +1496,32 @@ show_context_menu (HexInputEdit *edit, double x, double y)
gtk_popover_popup (GTK_POPOVER (popover));
}

/* Delete bytes [start,end) with an undo snapshot, fixing up the cursor.
* Used by the readline-style line/word kill keys (Ctrl-U/K/W/D). */
static void
delete_range_bytes (HexInputEdit *edit, int start, int end)
{
HexInputEditPriv *priv = edit->priv;

if (!priv->editable)
return;
if (start < 0)
start = 0;
if (end > (int) priv->text->len)
end = (int) priv->text->len;
if (start >= end)
return;

push_undo_snapshot (edit);
g_string_erase (priv->text, start, end - start);
if (priv->cursor_byte >= end)
priv->cursor_byte -= end - start;
else if (priv->cursor_byte > start)
priv->cursor_byte = start;
priv->sel_anchor_byte = -1;
mark_dirty (edit);
}

static gboolean
key_pressed_cb (GtkEventControllerKey *controller, guint keyval,
guint keycode, GdkModifierType state, gpointer data)
Expand All @@ -1515,11 +1541,90 @@ key_pressed_cb (GtkEventControllerKey *controller, guint keyval,
{
switch (keyval)
{
/* Ctrl-A: beginning of line (readline). Select-all moves to Ctrl-/ */
case GDK_KEY_a:
case GDK_KEY_A:
priv->cursor_byte = 0;
priv->sel_anchor_byte = -1;
reset_blink (edit);
return TRUE;

case GDK_KEY_slash:
do_select_all (edit);
return TRUE;

/* Ctrl-E: end of line */
case GDK_KEY_e:
case GDK_KEY_E:
priv->cursor_byte = (int) priv->text->len;
priv->sel_anchor_byte = -1;
reset_blink (edit);
return TRUE;

/* Ctrl-B / Ctrl-F: move one char left / right */
case GDK_KEY_b:
case GDK_KEY_B:
if (priv->cursor_byte > 0)
{
const char *prev = g_utf8_find_prev_char (priv->text->str,
priv->text->str + priv->cursor_byte);
if (prev)
priv->cursor_byte = (int)(prev - priv->text->str);
}
priv->sel_anchor_byte = -1;
reset_blink (edit);
return TRUE;

case GDK_KEY_f:
case GDK_KEY_F:
if (priv->cursor_byte < (int) priv->text->len)
{
const char *next = g_utf8_next_char (
priv->text->str + priv->cursor_byte);
priv->cursor_byte = (int)(next - priv->text->str);
}
priv->sel_anchor_byte = -1;
reset_blink (edit);
return TRUE;

/* Ctrl-U: kill to start of line */
case GDK_KEY_u:
case GDK_KEY_U:
delete_range_bytes (edit, 0, priv->cursor_byte);
reset_blink (edit);
return TRUE;

/* Ctrl-K: kill to end of line */
case GDK_KEY_k:
case GDK_KEY_K:
delete_range_bytes (edit, priv->cursor_byte, (int) priv->text->len);
reset_blink (edit);
return TRUE;

/* Ctrl-W: delete previous word */
case GDK_KEY_w:
case GDK_KEY_W:
{
int wb = find_word_boundary_left (priv->text->str,
(int) priv->text->len, priv->cursor_byte);
delete_range_bytes (edit, wb, priv->cursor_byte);
reset_blink (edit);
return TRUE;
}

/* Ctrl-D: delete next char */
case GDK_KEY_d:
case GDK_KEY_D:
if (priv->cursor_byte < (int) priv->text->len)
{
const char *next = g_utf8_next_char (
priv->text->str + priv->cursor_byte);
delete_range_bytes (edit, priv->cursor_byte,
(int)(next - priv->text->str));
}
reset_blink (edit);
return TRUE;

case GDK_KEY_c:
case GDK_KEY_C:
do_copy (edit);
Expand Down
Loading