shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-20 14:03:40 +03:00
Code Issues Projects Releases Wiki Activity

Add "USB device reset" accel

Browse Source 
Adds a "USB device reset" default keyboard shortcut (ctrl+shift+r), as
well as the option to override this shortcut with the --hotkeys opt.
Updates documentation accordingly.

Signed-off-by: Shawn M. Chapla <schapla@codeweavers.com>
This commit is contained in:
Shawn M. Chapla 2020-09-24 17:43:31 -04:00 committed by Shawn M. Chapla
parent 1608dabd9f
commit f08cb607a4
4 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/remote-viewer.pod
View File

@ -73,9 +73,9 @@ guest display widget does not have focus. Any actions specified in B<HOTKEYS>
will be effective even when the guest display widget has input focus. The format
for B<HOTKEYS> is <action1>=<key1>[+<key2>][,<action2>=<key3>[+<key4>]].
Key-names are case-insensitive. Valid actions are: toggle-fullscreen,
release-cursor, secure-attention, smartcard-insert and smartcard-remove. The
C<secure-attention> action sends a secure attention sequence (Ctrl+Alt+Del) to
the guest. Examples:
release-cursor, secure-attention, usb-device-reset, smartcard-insert and
smartcard-remove. The C<secure-attention> action sends a secure attention
sequence (Ctrl+Alt+Del) to the guest. Examples:
--hotkeys=toggle-fullscreen=shift+f11,release-cursor=shift+f12

6
man/virt-viewer.pod
View File

@ -93,9 +93,9 @@ guest display widget does not have focus. Any actions specified in B<HOTKEYS>
will be effective even when the guest display widget has input focus. The format
for B<HOTKEYS> is <action1>=<key1>[+<key2>][,<action2>=<key3>[+<key4>]].
Key-names are case-insensitive. Valid actions are: toggle-fullscreen,
release-cursor, secure-attention, smartcard-insert and smartcard-remove. The
C<secure-attention> action sends a secure attention sequence (Ctrl+Alt+Del) to
the guest. Examples:
release-cursor, secure-attention, usb-device-reset, smartcard-insert and
smartcard-remove. The C<secure-attention> action sends a secure attention
sequence (Ctrl+Alt+Del) to the guest. Examples:
--hotkeys=toggle-fullscreen=shift+f11,release-cursor=shift+f12

49
src/virt-viewer-app.c
View File

@ -112,6 +112,7 @@ static void virt_viewer_app_update_pretty_address(VirtViewerApp *self);
static void virt_viewer_app_set_fullscreen(VirtViewerApp *self, gboolean fullscreen);
static void virt_viewer_app_update_menu_displays(VirtViewerApp *self);
static void virt_viewer_update_smartcard_accels(VirtViewerApp *self);
static void virt_viewer_update_usbredir_accels(VirtViewerApp *self);
static void virt_viewer_app_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOptionGroup *group);
static VirtViewerWindow *virt_viewer_app_get_nth_window(VirtViewerApp *self, gint nth);
@ -165,6 +166,9 @@ struct _VirtViewerAppPrivate {
GdkModifierType insert_smartcard_accel_mods;
guint remove_smartcard_accel_key;
GdkModifierType remove_smartcard_accel_mods;
gboolean usb_device_reset_accel_valid;
guint usb_device_reset_accel_key;
GdkModifierType usb_device_reset_accel_mods;
gboolean quit_on_disconnect;
gboolean supports_share_clipboard;
VirtViewerKeyMapping *keyMappings;
@ -1271,6 +1275,7 @@ virt_viewer_app_has_usbredir_updated(VirtViewerSession *session,
virt_viewer_app_set_usb_options_sensitive(self, has_usbredir);
virt_viewer_app_set_usb_reset_sensitive(self, has_usbredir);
virt_viewer_update_usbredir_accels(self);
}
static void notify_software_reader_cb(GObject *gobject G_GNUC_UNUSED,
@ -2128,6 +2133,44 @@ virt_viewer_update_smartcard_accels(VirtViewerApp *self)
}
}
static void
virt_viewer_set_usb_device_reset_accel(VirtViewerApp *self,
guint accel_key,
GdkModifierType accel_mods,
gboolean overwrite)
{
VirtViewerAppPrivate *priv = self->priv;
if (overwrite || !priv->usb_device_reset_accel_valid) {
priv->usb_device_reset_accel_valid = TRUE;
priv->usb_device_reset_accel_key = accel_key;
priv->usb_device_reset_accel_mods = accel_mods;
}
}
static void
virt_viewer_update_usbredir_accels(VirtViewerApp *self)
{
gboolean has_usbredir;
VirtViewerAppPrivate *priv = self->priv;
if (self->priv->session != NULL) {
g_object_get(G_OBJECT(self->priv->session),
"has-usbredir", &has_usbredir, NULL);
} else {
has_usbredir = FALSE;
}
if (has_usbredir) {
gtk_accel_map_change_entry("<virt-viewer>/file/usb-device-reset",
priv->usb_device_reset_accel_key,
priv->usb_device_reset_accel_mods,
TRUE);
} else {
gtk_accel_map_change_entry("<virt-viewer>/file/usb-device-reset", 0, 0, TRUE);
}
}
static void
virt_viewer_app_on_application_startup(GApplication *app)
{
@ -2163,6 +2206,8 @@ virt_viewer_app_on_application_startup(GApplication *app)
virt_viewer_set_insert_smartcard_accel(self, GDK_KEY_F8, GDK_SHIFT_MASK);
virt_viewer_set_remove_smartcard_accel(self, GDK_KEY_F9, GDK_SHIFT_MASK);
virt_viewer_set_usb_device_reset_accel(self, GDK_KEY_r, GDK_SHIFT_MASK | GDK_CONTROL_MASK, FALSE);
gtk_accel_map_add_entry("<virt-viewer>/view/toggle-fullscreen", GDK_KEY_F11, 0);
gtk_accel_map_add_entry("<virt-viewer>/view/release-cursor", GDK_KEY_F12, GDK_SHIFT_MASK);
gtk_accel_map_add_entry("<virt-viewer>/view/zoom-reset", GDK_KEY_0, GDK_CONTROL_MASK);
@ -2414,6 +2459,7 @@ virt_viewer_app_clear_hotkeys(VirtViewerApp *self)
gtk_accel_map_change_entry("<virt-viewer>/send/secure-attention", 0, 0, TRUE);
virt_viewer_set_insert_smartcard_accel(self, 0, 0);
virt_viewer_set_remove_smartcard_accel(self, 0, 0);
virt_viewer_set_usb_device_reset_accel(self, 0, 0, TRUE);
}
void
@ -2471,6 +2517,8 @@ virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys_str)
virt_viewer_set_insert_smartcard_accel(self, accel_key, accel_mods);
} else if (g_str_equal(*hotkey, "smartcard-remove")) {
virt_viewer_set_remove_smartcard_accel(self, accel_key, accel_mods);
} else if (g_str_equal(*hotkey, "usb-device-reset")) {
virt_viewer_set_usb_device_reset_accel(self, accel_key, accel_mods, TRUE);
} else {
g_warning("Unknown hotkey command %s", *hotkey);
}
@ -2481,6 +2529,7 @@ virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys_str)
virt_viewer_app_set_enable_accel(self, TRUE);
virt_viewer_update_smartcard_accels(self);
virt_viewer_update_usbredir_accels(self);
}
void

2
src/virt-viewer-window.c
View File

@ -376,6 +376,8 @@ virt_viewer_window_init (VirtViewerWindow *self)
"can-activate-accel", G_CALLBACK(can_activate_cb), self);
g_signal_connect(gtk_builder_get_object(priv->builder, "menu-view-zoom-out"),
"can-activate-accel", G_CALLBACK(can_activate_cb), self);
g_signal_connect(gtk_builder_get_object(priv->builder, "menu-file-usb-device-reset"),
"can-activate-accel", G_CALLBACK(can_activate_cb), self);
vbox = GTK_WIDGET(gtk_builder_get_object(priv->builder, "viewer-box"));
virt_viewer_window_toolbar_setup(self);