Skip to content
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

Keyboard Support Redo #246

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Keyboard Support Redo #246

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
86fc446
Make entry readonly
BAProductions Mar 14, 2023
960384d
Make control c & control v work with a read only entry
BAProductions Mar 14, 2023
9b61c1b
Init Keyboard support
BAProductions Mar 14, 2023
5d2fca9
Add placeholder text entry an set it to 0
BAProductions Mar 14, 2023
f0c9ffe
Add Gdk.EVENT_PROPAGATE
BAProductions Mar 14, 2023
2d8c0e3
Add event_controller to window AKA this
BAProductions Mar 14, 2023
7984eae
Deactivate focus
BAProductions Mar 14, 2023
12fdb04
Remove dead, unused or duplicate code
BAProductions Mar 14, 2023
72630b7
Fix escape key
BAProductions Mar 14, 2023
61f226c
Swap Gdk.Key.Return Gdk.Key.equal
BAProductions Mar 14, 2023
9334b62
Redo on_key_press to activate glib actions instead of the buttons cli…
BAProductions Mar 16, 2023
c20b654
Merge remote-tracking branch 'elementary/master' into GTK4_Keyboard_S…
BAProductions Mar 16, 2023
44416fb
Merge branch 'master' into GTK4_Keyboard_Support_Redo
BAProductions Mar 16, 2023
676977c
Merge branch 'master' into GTK4_Keyboard_Support_Redo
BAProductions Mar 18, 2023
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
191 changes: 121 additions & 70 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
private static GLib.Settings settings;
private Gdk.Clipboard clipboard;
private Gtk.EventControllerKey event_controller;

private Gtk.Revealer extended_revealer;
private Gtk.Entry entry;
Expand Down Expand Up @@ -76,14 +78,19 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
add_action_entries (ACTION_ENTRIES, this);

var application_instance = (Gtk.Application) GLib.Application.get_default ();
application_instance.set_accels_for_action (ACTION_PREFIX + ACTION_CLEAR, {"Escape"});
application_instance.set_accels_for_action (ACTION_PREFIX + ACTION_UNDO, {"<Control>z"});
application_instance.set_accels_for_action (ACTION_PREFIX + ACTION_COPY, {"<Control>c"});
application_instance.set_accels_for_action (ACTION_PREFIX + ACTION_PASTE, {"<Control>v"});

resizable = false;
title = _("Calculator");

var display = Gdk.Display.get_default ();
clipboard = display.get_clipboard ();

event_controller = new Gtk.EventControllerKey ();
event_controller.key_pressed.connect (on_key_press);

decimal_places = settings.get_int ("decimal-places");

eval = new Core.Evaluation ();
Expand Down Expand Up @@ -115,17 +122,19 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
entry = new Gtk.Entry () {
xalign = 1,
vexpand = true,
sensitive = false,
valign = Gtk.Align.FILL
};
entry.add_css_class (Granite.STYLE_CLASS_H2_LABEL);
entry.set_placeholder_text ("0");

button_calc = new Button ("=") {
tooltip_text = _("Calculate Result")
};
button_calc.add_css_class (Granite.STYLE_CLASS_H2_LABEL);
button_calc.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);

button_ans = new Button ("ANS") {
var button_ans = new Button ("ANS") {
sensitive = false,
tooltip_text = _("Insert last result")
};
Expand Down Expand Up @@ -269,7 +278,7 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
tooltip_text = _("Set memory value")
};

button_mr = new Button ("MR") {
var button_mr = new Button ("MR") {
sensitive = false,
tooltip_text = _("Recall value from memory")
};
Expand All @@ -282,12 +291,12 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
tooltip_text = _("Subtract from stored value")
};

button_mc = new Button ("MC") {
var button_mc = new Button ("MC") {
sensitive = false,
tooltip_text = _("Clear memory")
};

button_gt = new Button ("GT") {
var button_gt = new Button ("GT") {
sensitive = false,
tooltip_text = _("Grand Total")
};
Expand Down Expand Up @@ -463,16 +472,11 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
var global_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
global_box.append (infobar);
global_box.append (main_grid);
((Gtk.Widget) this).add_controller (event_controller);

child = global_box;
set_titlebar (headerbar);

entry.grab_focus ();

entry.changed.connect (remove_error);
entry.activate.connect (button_calc_clicked);
entry.get_delegate ().insert_text.connect (replace_text);

button_calc.clicked.connect (() => {button_calc_clicked ();});
button_del.clicked.connect (() => {button_del_clicked ();});
button_ans.clicked.connect (() => {button_ans_clicked ();});
Expand Down Expand Up @@ -509,47 +513,33 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
}
}

private void copy () {
int start, end;
entry.get_selection_bounds (out start, out end);
var text_selected = end - start != 0;

// we have to copy text in both cases
// because seems like application action blocks entry's action
if (!text_selected) {
entry.get_clipboard ().set_text (entry.text);
} else {
entry.get_clipboard ().set_text (entry.text.slice (start, end));
public void copy () {
if (entry.get_text () != "") {
try {
var output = eval.evaluate (entry.get_text (), decimal_places);
clipboard.set_text (output);
} catch (Core.OUT_ERROR e) {
infobar_label.label = e.message;
infobar.revealed = true;
}
}
}

private void paste () {
get_clipboard_text.begin ((obj, res) => {
var text = get_clipboard_text.end (res);
if (text == null) {
return;
public void paste () {
var cancellable = new GLib.Cancellable ();
clipboard.read_text_async.begin (cancellable, (source, res) => {
try {
var output = eval.evaluate (clipboard.read_text_async.end (res), decimal_places);
if (entry.get_text () != output) {
entry.set_text (output);
}
} catch (Error e) {
infobar_label.label = e.message;
infobar.revealed = true;
}

int start, end;
entry.get_selection_bounds (out start, out end);

var before = entry.text.slice (0, start);
var after = entry.text.slice (end, entry.text_length);

entry.text = before + text + after;
entry.set_position (before.char_count () + text.char_count ());
});
}

private async string? get_clipboard_text () {
try {
return yield entry.get_clipboard ().read_text_async (null);
} catch (Error e) {
warning (e.message);
return null;
}
}

private void action_insert (SimpleAction action, Variant? variant) {
var token = variant.get_string ();
int new_position = entry.get_position ();
Expand All @@ -566,7 +556,6 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
entry.do_insert_text (token, -1, ref cursor_position);

new_position += token.char_count ();
entry.grab_focus ();
entry.set_position (new_position);
}

Expand All @@ -581,7 +570,6 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
entry.delete_text (selection_start, selection_end);
entry.insert_text (function_call, -1, ref selection_start);
new_position += function_call.char_count ();
entry.grab_focus ();
entry.set_position (new_position);
} else {
activate_action (ACTION_INSERT, variant);
Expand Down Expand Up @@ -613,7 +601,6 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
remove_error ();
}

entry.grab_focus ();
entry.set_position (position);
}

Expand Down Expand Up @@ -643,7 +630,6 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
entry.set_text (new_text);
}

entry.grab_focus ();
entry.set_position (position - 1);
}

Expand Down Expand Up @@ -755,10 +741,8 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
private void action_clear () {
position = 0;
entry.set_text ("");
set_focus (entry);
remove_error ();

entry.grab_focus ();
entry.set_position (position);
}

Expand All @@ -784,7 +768,6 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
extended_revealer.reveal_child = false;
}
/* Focusing button_calc because without a new focus it will cause weird window drawing problems. */
entry.grab_focus ();
entry.set_position (position);
}

Expand Down Expand Up @@ -818,33 +801,101 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow {
var cursor_position = entry.cursor_position;
entry.do_insert_text (input, -1, ref cursor_position);
position += input.length;
entry.grab_focus ();
entry.set_position (position);
}

private void remove_error () {
infobar.revealed = false;
}

private void replace_text (string new_text, int new_text_length, ref int position) {
var replacement_text = "";

switch (new_text) {
case ".":
case ",":
replacement_text = Posix.nl_langinfo (Posix.NLItem.RADIXCHAR);
break;
case "/":
replacement_text = "÷";
break;
case "*":
replacement_text = "×";
break;
private bool on_key_press (Gtk.EventControllerKey controller, uint keyval, uint keycode, Gdk.ModifierType mod_state) {
switch (keyval) {
BAProductions marked this conversation as resolved.
Show resolved Hide resolved
case Gdk.Key.@0:
case Gdk.Key.KP_0:
activate_action(ACTION_INSERT, new GLib.Variant("s", "0"));
return true;
case Gdk.Key.@1:
case Gdk.Key.KP_1:
activate_action(ACTION_INSERT, new GLib.Variant("s", "1"));
return true;
case Gdk.Key.@2:
case Gdk.Key.KP_2:
activate_action(ACTION_INSERT, new GLib.Variant("s", "2"));
return true;
case Gdk.Key.@3:
case Gdk.Key.KP_3:
activate_action(ACTION_INSERT, new GLib.Variant("s", "3"));
return true;
case Gdk.Key.@4:
case Gdk.Key.KP_4:
activate_action(ACTION_INSERT, new GLib.Variant("s", "4"));
return true;
case Gdk.Key.@5:
case Gdk.Key.KP_5:
activate_action(ACTION_INSERT, new GLib.Variant("s", "5"));
return true;
case Gdk.Key.@6:
case Gdk.Key.KP_6:
activate_action(ACTION_INSERT, new GLib.Variant("s", "6"));
return true;
case Gdk.Key.@7:
case Gdk.Key.KP_7:
activate_action(ACTION_INSERT, new GLib.Variant("s", "7"));
return true;
case Gdk.Key.@8:
case Gdk.Key.KP_8:
activate_action(ACTION_INSERT, new GLib.Variant("s", "8"));
return true;
case Gdk.Key.@9:
case Gdk.Key.KP_9:
activate_action(ACTION_INSERT, new GLib.Variant("s", "9"));
return true;
case Gdk.Key.plus:
case Gdk.Key.KP_Add:
activate_action(ACTION_INSERT, new GLib.Variant("s", "+"));
return true;
case Gdk.Key.minus:
case Gdk.Key.KP_Subtract:
activate_action(ACTION_INSERT, new GLib.Variant("s", "-"));
return true;
case Gdk.Key.asterisk:
case Gdk.Key.KP_Multiply:
activate_action(ACTION_INSERT, new GLib.Variant("s", "*"));
return true;
case Gdk.Key.slash:
case Gdk.Key.KP_Divide:
activate_action(ACTION_INSERT, new GLib.Variant("s", "/"));
return true;
case Gdk.Key.period:
case Gdk.Key.decimalpoint:
case Gdk.Key.KP_Decimal:
activate_action(ACTION_INSERT, new GLib.Variant("s", "."));
return true;
case Gdk.Key.BackSpace:
case Gdk.Key.KP_Delete:
button_del_clicked();
return true;
case Gdk.Key.equal:
case Gdk.Key.KP_Enter:
case Gdk.Key.KP_Equal:
button_calc_clicked ();
return true;
case Gdk.Key.Escape:
activate_action(ACTION_CLEAR, null);
return true;
}

if (replacement_text != "" && replacement_text != new_text) {
entry.do_insert_text (replacement_text, entry.cursor_position + replacement_text.char_count (), ref position);
Signal.stop_emission_by_name ((void*) entry.get_delegate (), "insert-text");
switch (keyval) {
case Gdk.Key.percent:
activate_action(ACTION_INSERT, new GLib.Variant("s", "%"));
return true;
case Gdk.Key.parenleft:
activate_action(ACTION_INSERT, new GLib.Variant("s", "("));
return true;
case Gdk.Key.parenright:
activate_action(ACTION_INSERT, new GLib.Variant("s", ")"));
return true;
}
return Gdk.EVENT_PROPAGATE;
}
}