[ghex] findreplace: grab focus and focus cursor tweaks
- From: Logan Rathbone <larathbone src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ghex] findreplace: grab focus and focus cursor tweaks
- Date: Fri, 10 Dec 2021 20:02:31 +0000 (UTC)
commit 4540a4d300eadd3f57949d470fd4e1a4c820c0bf
Author: Logan Rathbone <poprocks gmail com>
Date: Fri Dec 10 05:11:56 2021 -0500
findreplace: grab focus and focus cursor tweaks
src/findreplace.c | 25 +++++++++++++--
src/gtkhex.c | 92 ++++++++++++++++++++++++++++++-------------------------
2 files changed, 73 insertions(+), 44 deletions(-)
---
diff --git a/src/findreplace.c b/src/findreplace.c
index 4795075..6c75e55 100644
--- a/src/findreplace.c
+++ b/src/findreplace.c
@@ -93,6 +93,7 @@ struct _JumpDialog {
GtkWidget *label;
GtkWidget *int_entry;
GtkWidget *ok, *cancel;
+ GtkEventController *focus_controller;
};
G_DEFINE_TYPE (JumpDialog, jump_dialog, PANE_TYPE_DIALOG)
@@ -231,6 +232,7 @@ find_common (FindDialog *self, enum FindDirection direction,
{
found = TRUE;
gtk_hex_set_cursor (priv->gh, offset);
+ gtk_widget_grab_focus (GTK_WIDGET(priv->gh));
}
else
{
@@ -378,7 +380,9 @@ goto_byte_cb (GtkButton *button, gpointer user_data)
_("Can not position cursor beyond the "
"end of file."));
} else {
- gtk_hex_set_cursor(priv->gh, byte);
+ /* SUCCESS */
+ gtk_hex_set_cursor (priv->gh, byte);
+ gtk_widget_grab_focus (GTK_WIDGET(priv->gh));
}
}
else {
@@ -744,6 +748,9 @@ find_dialog_grab_focus (GtkWidget *widget)
FindDialog *self = FIND_DIALOG(widget);
FindDialogPrivate *f_priv = find_dialog_get_instance_private (self);
+ if (gtk_widget_has_focus (f_priv->f_gh))
+ return FALSE;
+
return gtk_widget_grab_focus (f_priv->f_gh);
}
@@ -915,6 +922,13 @@ jump_dialog_init (JumpDialog *self)
self->label = gtk_label_new (_("Jump to byte (enter offset):"));
self->int_entry = gtk_entry_new();
+ /* In GTK4, you can't expect GtkEntry itself to report correctly whether
+ * it has focus, (has-focus will == FALSE even though it looks focused...
+ * so we add an event controller manually and track that. Thanks to mclasen
+ */
+ self->focus_controller = gtk_event_controller_focus_new ();
+ gtk_widget_add_controller (self->int_entry, self->focus_controller);
+
gtk_box_append (GTK_BOX(self->box), self->label);
gtk_box_append (GTK_BOX(self->box), self->int_entry);
@@ -952,8 +966,15 @@ static gboolean
jump_dialog_grab_focus (GtkWidget *widget)
{
JumpDialog *self = JUMP_DIALOG(widget);
+ gboolean retval;
+
+ if (gtk_event_controller_focus_contains_focus (
+ GTK_EVENT_CONTROLLER_FOCUS(self->focus_controller)))
+ retval = FALSE;
+ else
+ retval = gtk_widget_grab_focus (self->int_entry);
- return gtk_widget_grab_focus (self->int_entry);
+ return retval;
}
static void
diff --git a/src/gtkhex.c b/src/gtkhex.c
index 564a0dc..4fa7b11 100644
--- a/src/gtkhex.c
+++ b/src/gtkhex.c
@@ -1522,7 +1522,7 @@ key_press_cb (GtkEventControllerKey *controller,
{
GtkHex *gh = GTK_HEX(user_data);
GtkWidget *widget = GTK_WIDGET(user_data);
- gboolean ret = TRUE;
+ gboolean ret = GDK_EVENT_PROPAGATE;
int file_size;
g_return_val_if_fail (HEX_IS_DOCUMENT (gh->document), FALSE);
@@ -1537,12 +1537,10 @@ key_press_cb (GtkEventControllerKey *controller,
show_cursor (gh, FALSE);
/* Figure out if we're holding shift or not. */
- if (! (state & GDK_SHIFT_MASK)) {
- gh->selecting = FALSE;
- }
- else {
+ if (state & GDK_SHIFT_MASK)
gh->selecting = TRUE;
- }
+ else
+ gh->selecting = FALSE;
/* FIXME - This could use a cleanup. Mostly flown in from old code.
*/
@@ -1550,37 +1548,43 @@ key_press_cb (GtkEventControllerKey *controller,
{
case GDK_KEY_BackSpace:
if (gh->cursor_pos > 0) {
- hex_document_set_data(gh->document, gh->cursor_pos - 1,
+ hex_document_set_data (gh->document, gh->cursor_pos - 1,
0, 1, NULL, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
- gtk_hex_set_cursor(gh, gh->cursor_pos - 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos - 1);
+ ret = GDK_EVENT_STOP;
}
break;
case GDK_KEY_Delete:
if (gh->cursor_pos < file_size) {
- hex_document_set_data(gh->document, gh->cursor_pos,
+ hex_document_set_data (gh->document, gh->cursor_pos,
0, 1, NULL, TRUE);
- gtk_hex_set_cursor(gh, gh->cursor_pos);
+ gtk_hex_set_cursor (gh, gh->cursor_pos);
+ ret = GDK_EVENT_STOP;
}
break;
case GDK_KEY_Up:
- gtk_hex_set_cursor(gh, gh->cursor_pos - gh->cpl);
+ gtk_hex_set_cursor (gh, gh->cursor_pos - gh->cpl);
+ ret = GDK_EVENT_STOP;
break;
case GDK_KEY_Down:
- gtk_hex_set_cursor(gh, gh->cursor_pos + gh->cpl);
+ gtk_hex_set_cursor (gh, gh->cursor_pos + gh->cpl);
+ ret = GDK_EVENT_STOP;
break;
case GDK_KEY_Page_Up:
- gtk_hex_set_cursor(gh, MAX(0, gh->cursor_pos - gh->vis_lines*gh->cpl));
+ gtk_hex_set_cursor (gh, MAX(0, gh->cursor_pos - gh->vis_lines*gh->cpl));
+ ret = GDK_EVENT_STOP;
break;
case GDK_KEY_Page_Down:
gtk_hex_set_cursor(gh, MIN(file_size,
gh->cursor_pos + gh->vis_lines*gh->cpl));
+ ret = GDK_EVENT_STOP;
break;
default:
@@ -1597,70 +1601,75 @@ key_press_cb (GtkEventControllerKey *controller,
if (gh->lower_nibble)
gtk_hex_set_cursor (gh, gh->cursor_pos - 1);
}
+ ret = GDK_EVENT_STOP;
break;
case GDK_KEY_Right:
- if (gh->cursor_pos >= file_size)
+ if (gh->cursor_pos >= file_size) {
+ ret = GDK_EVENT_STOP;
break;
+ }
if (state & GDK_SHIFT_MASK) {
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
}
else {
gh->lower_nibble = !gh->lower_nibble;
- if(!gh->lower_nibble)
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ if (!gh->lower_nibble)
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
}
+ ret = GDK_EVENT_STOP;
break;
default:
if (keyval >= '0' && keyval <= '9')
{
- hex_document_set_nibble(gh->document, keyval - '0',
+ hex_document_set_nibble (gh->document, keyval - '0',
gh->cursor_pos, gh->lower_nibble,
gh->insert, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
gh->lower_nibble = !gh->lower_nibble;
- if(!gh->lower_nibble)
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ if (!gh->lower_nibble)
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
}
else if (keyval >= 'A' && keyval <= 'F')
{
- hex_document_set_nibble(gh->document, keyval - 'A' +
10,
+ hex_document_set_nibble (gh->document, keyval - 'A' +
10,
gh->cursor_pos, gh->lower_nibble,
gh->insert, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
gh->lower_nibble = !gh->lower_nibble;
if (!gh->lower_nibble)
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
}
else if (keyval >= 'a' && keyval <= 'f')
{
- hex_document_set_nibble(gh->document, keyval - 'a' +
10,
+ hex_document_set_nibble (gh->document, keyval - 'a' +
10,
gh->cursor_pos, gh->lower_nibble,
gh->insert, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
gh->lower_nibble = !gh->lower_nibble;
if (!gh->lower_nibble)
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
}
else if (keyval >= GDK_KEY_KP_0 && keyval <= GDK_KEY_KP_9)
{
- hex_document_set_nibble(gh->document, keyval -
GDK_KEY_KP_0,
+ hex_document_set_nibble (gh->document, keyval -
GDK_KEY_KP_0,
gh->cursor_pos, gh->lower_nibble,
gh->insert, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
gh->lower_nibble = !gh->lower_nibble;
- if(!gh->lower_nibble)
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ if (!gh->lower_nibble)
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
}
- else
- ret = FALSE;
-
break;
}
}
@@ -1669,33 +1678,33 @@ key_press_cb (GtkEventControllerKey *controller,
switch (keyval)
{
case GDK_KEY_Left:
- gtk_hex_set_cursor(gh, gh->cursor_pos - 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos - 1);
+ ret = GDK_EVENT_STOP;
break;
case GDK_KEY_Right:
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
break;
default:
if (is_displayable (keyval))
{
- hex_document_set_byte(gh->document, keyval,
+ hex_document_set_byte (gh->document, keyval,
gh->cursor_pos, gh->insert, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
}
else if (keyval >= GDK_KEY_KP_0 && keyval <= GDK_KEY_KP_9)
{
- hex_document_set_byte(gh->document, keyval -
GDK_KEY_KP_0 + '0',
+ hex_document_set_byte (gh->document, keyval -
GDK_KEY_KP_0 + '0',
gh->cursor_pos, gh->insert, TRUE);
if (gh->selecting)
gh->selecting = FALSE;
- gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
- }
- else
- {
- ret = FALSE;
+ gtk_hex_set_cursor (gh, gh->cursor_pos + 1);
+ ret = GDK_EVENT_STOP;
}
break;
}
@@ -1703,7 +1712,6 @@ key_press_cb (GtkEventControllerKey *controller,
break;
}
show_cursor (gh, TRUE);
-
return ret;
}
@@ -1716,7 +1724,7 @@ key_release_cb (GtkEventControllerKey *controller,
{
GtkHex *gh = GTK_HEX(user_data);
GtkWidget *widget = GTK_WIDGET(user_data);
- gboolean ret = TRUE;
+ gboolean ret = GDK_EVENT_PROPAGATE;
/* avoid shift key getting 'stuck'
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
