Commit Graph

61637 Commits

Author SHA1 Message Date
Emmanuele Bassi
b9b3639af5 testgtk: Port keyval example to shortcut controllers 2020-03-22 11:14:07 -04:00
Benjamin Otte
c5f34ec919 shortcutcontroller: Implement GtkBuildable
Use it to allow adding shortcuts to the controller via the usual <child>
method.
2020-03-22 11:14:07 -04:00
Benjamin Otte
8233e69e48 shortcutaction: INtegrate with GtkBuilder property parsing
<property name="action">action(win.quit)</property> style action
specifications now work for GtkShortcutAction properties.
2020-03-22 11:14:07 -04:00
Benjamin Otte
927b99bb47 shortcuttrigger: Add gtk_shortcut_triger_new_parse_string()
And hook it up into the GtkBuilder infrastructure.
2020-03-22 11:14:07 -04:00
Benjamin Otte
354c9a0b32 application: Replace accelerator handling with shortcuts
API remains the same, but activation is now done via a
shortcutcontroller.

The code uses a controller with global scope so that the
shortcuts are managed with all the other global shortcuts.
2020-03-22 11:14:07 -04:00
Benjamin Otte
b29dce05b1 accel: Add display arg to gtk_accelerator_parse_with_keycode()
It was using the default display unconditionally.
2020-03-22 11:14:07 -04:00
Benjamin Otte
07173a266d accelerators: Make gtk_accelerator_parse() return TRUE/FALSE
A parse function should return success or not. So do that.
2020-03-22 11:14:07 -04:00
Benjamin Otte
349d90927a shortcuttrigger: Add hash(), equal(), and compare() functions
Those are useful for putting triggers in hash tables or getting sorted
output.
2020-03-22 11:14:07 -04:00
Benjamin Otte
fad0e1c5c5 shortcuts: Mananage managed shortcuts with a custom model
Reduce the amount of special casing by using a list model
for global and managed shortcuts, too.

This way, the ListModel API will work for the ShortcutController in the
GtkShortcutManager and GtkRoot.

The only special case remaining is shortcut activation, which needs to
pass the right widget to the controller in the global/managed case.
2020-03-22 11:14:07 -04:00
Benjamin Otte
59bf971e92 shortcutaction: Add gtk_shortcut_action_to_string()
For all but the callback action, we can print something useful.
2020-03-22 11:14:07 -04:00
Benjamin Otte
b282265005 widget: Keep keybindings as a GListStore
This way, we can use shortcut_controller_new_for_model() and avoid all
the special casing about run_class.
2020-03-22 11:14:07 -04:00
Benjamin Otte
d692cea113 shortcutcontroller: Add gtk_shortcut_controller_new_for_model()
This is mainly for internal use, but I can't see a reason to not have it
public for people who want to maintain their own lists.

I'm sure gnome-builder will never ever find a way to misuse it.
2020-03-22 11:14:07 -04:00
Benjamin Otte
158333241b shortcutcontroller: Implement GListModel
After all, this controller is a list of shortcuts.
2020-03-22 11:14:07 -04:00
Benjamin Otte
17439961fd gtk-demo: Port the sliding puzzle demo to shortcuts 2020-03-22 11:14:07 -04:00
Benjamin Otte
83801768fa shortcut: Change the API for creating shortcuts
When creating shortcuts, there almost always are a trigger and an action
available for use. So make gtk_shortcut_new() take those as arguments.

Also add gtk_shortcut_new_with_arguments() so people can easily pass
those in, too.
2020-03-22 11:14:07 -04:00
Benjamin Otte
2f0e94ccad shortcut: Add GtkShortcutAction
Similar to GtkShortcutTrigger, GtkShortCutAction provides all the
different ways to activate a shortcut.

So far, these different ways are supported:

 - do nothing
 - Call a user-provided callback
 - Call gtk_widget_activate()
 - Call gtk_widget_mnemonic_activate()
 - Emit an action signal
 - Activate an action from the widget's action muxer
 - Activate a GAction
2020-03-22 11:14:07 -04:00
Benjamin Otte
05bf6030fa accelgroup: Remove unneeded APIs
After the removal of GtkAccelMap, these things are no longer necessary.
2020-03-22 11:14:07 -04:00
Emmanuele Bassi
b3e3510705 gtk: Remove GtkAccelMap
Now that accel paths are gone, the object managing them isn't needed
anymore either.
2020-03-22 11:14:07 -04:00
Benjamin Otte
bbbed33adc gtk: Remove accel paths
It's an outdated technology now that everybody is using GActionGroups.

If somebody wanted to support changeable shortcuts, they'd need to
reintroduce it in another way.
2020-03-22 11:14:07 -04:00
Benjamin Otte
e55ab3d762 Remove GtkMnemonicHash
It's not used anymore.
2020-03-22 11:14:07 -04:00
Emmanuele Bassi
c2b10280da window: Remove all old mnemonic handling API 2020-03-22 11:14:07 -04:00
Emmanuele Bassi
06e7bf218c Add GtkShortcutManager
This adds an interface for taking care of shortcut controllers with
managed scope.

Only GtkWindow currently implements this interface, so we need to ensure
that we check if any top-level widget we reach is a shortcuts manager
before we call into it.
2020-03-22 11:14:07 -04:00
Benjamin Otte
45d3acf736 label: Implement mnemonics using shortcuts 2020-03-22 11:14:07 -04:00
Benjamin Otte
4c86fbb96b shortcut: Add gtk_shortcut_set_mnemonic_activate()
Makes the shortcut call gtk_widget_mnemonic_activate() upon activation.
2020-03-22 11:14:07 -04:00
Benjamin Otte
7e5d3253bd shortcuttrigger: Add support for mnemonics
Mnemonics need to be triggered with help from the controllers (who
determine the modifiers). Support for that has been added, too.

Mnemonics do not use this yet though.
2020-03-22 11:14:07 -04:00
Benjamin Otte
8564f1cb4f window: Put F10 accelerator into its own shortcut controller
So instead of relying on gtk_window_activate_key(), it's now using
proper infrastructure.
2020-03-22 11:14:07 -04:00
Benjamin Otte
656d3325af window: Get rid of public APIs that shouldn't be
Event controllers should have replaced all of them.
And if they haven't, apps need to fix their code (I'm
looking at you Gimp).
2020-03-22 11:14:07 -04:00
Benjamin Otte
ef066cae85 gdk: Remove GDK_RELEASE_MASK
It was only ever supported by keybindings and those are gone now.
2020-03-22 11:14:07 -04:00
Benjamin Otte
e0602c41d8 gtk-demo: Add a dumb demo for shortcut triggers 2020-03-22 11:14:06 -04:00
Benjamin Otte
c1f0478b5d shortcutcontroller: Add GtkShortcutScope
Allow setting the scope for a controller. The scope determines at what
point in event propagation the shortcuts will be activated.

Local scope is the usual activation, global scope means that the root
widget activates the shortcuts - ie they are activated at the very
start of event propagation (for global capture events) or the very end
(for global bubble events).
Managed scope so far is unimplemented.

This is supposed to be used to replace accelerators and mnemonics.
2020-03-22 11:14:06 -04:00
Benjamin Otte
c116b45df7 shortcuttrigger: Add gtk_shortcut_trigger_to_label()
Provide a user-presentable string.
2020-03-22 11:14:06 -04:00
Benjamin Otte
dc27478880 accelgroup: Add gtk_accel_group_print_label() 2020-03-22 11:14:06 -04:00
Benjamin Otte
13a27a0999 accellabel: Move gtk_accelerator_get_label() code
The function lives in gtkaccelgroup.c, so there's no need to have that
call a private function in another source file. Instead, make that
other source file call gtk_accelerator_get_label() instead.
2020-03-22 11:14:06 -04:00
Benjamin Otte
24b63558c6 accellabel: Get rid of class variables
We can just look them up as-needed, no need to cache them.
2020-03-22 11:14:06 -04:00
Benjamin Otte
833308bb1e gtk: Remove bindings
The whole binding functionality is now handled by shortcuts.
2020-03-22 11:14:06 -04:00
Matthias Clasen
814efb542a event controller focus: drop include
This header is not needed here, and it is going away.
2020-03-22 11:14:06 -04:00
Emmanuele Bassi
f91f257188 Remove bindings activation from GtkEventControllerKey
We're going to use shortcuts soon.
2020-03-22 11:14:06 -04:00
Emmanuele Bassi
816b266f73 popover: Remove unused include 2020-03-22 11:14:06 -04:00
Matthias Clasen
9c667d92bd popover: Add keynav keybindings
The shortcut controllers are limited to same-native,
so we need to duplicate the Tab and arrow key bindings
for focus handling, as well as the Enter bindings for
activation.
2020-03-22 11:14:06 -04:00
Emmanuele Bassi
a41c87d449 popovermenu: Port to shortcuts 2020-03-22 11:14:06 -04:00
Emmanuele Bassi
f1a8938cd7 passwordentry: Remove unused include 2020-03-22 11:14:06 -04:00
Emmanuele Bassi
a9391bb100 entry: Remove unused include 2020-03-22 11:14:06 -04:00
Benjamin Otte
06a5fd1cf7 accelgroup: Actually have a default mod mask
Don't just use a value without initializing it.
2020-03-22 11:14:06 -04:00
Benjamin Otte
2df6e8e8dc treeview: Redo event forwarding hack
Reorder the event controllers so that key forwarding to the search
entries really happens after shortcut triggering.
2020-03-22 11:14:06 -04:00
Benjamin Otte
cf6940be9f combobox: Redo key event forwarding hack
Instead of manualling invoking bindings, we now reorder event
controllers inside the treemenu, so that shortcuts run before the event
forwarding.
2020-03-22 11:14:06 -04:00
Emmanuele Bassi
1e91f65ffd widget: Add private accessor to event controllers 2020-03-22 11:14:06 -04:00
Benjamin Otte
f54c0bf1df iconview: Port bindings to use shortcuts 2020-03-22 11:14:06 -04:00
Benjamin Otte
d405d95ce4 infobar: Port bindings to use shortcuts 2020-03-22 11:14:06 -04:00
Benjamin Otte
16b8bf042c label: Port bindings to use shortcuts 2020-03-22 11:14:06 -04:00
Benjamin Otte
b695b1fd4c listbox: Port bindings to use shortcuts 2020-03-22 11:14:06 -04:00