pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-10 07:12:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix mouse / key grab vs modifier disabling mixup

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-07-28 21:00:56 +01:00
parent 296f91c549
commit d35abc160a
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/viewer.c
View File

@ -363,10 +363,11 @@ static void viewer_set_title(VirtViewer *viewer, gboolean grabbed)
gtk_window_set_title(GTK_WINDOW(viewer->window), title);
}
static void viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED,
VirtViewer *viewer G_GNUC_UNUSED)
static gboolean viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED,
VirtViewer *viewer G_GNUC_UNUSED)
{
/* ignore accelerator */
return TRUE;
}
@ -409,7 +410,7 @@ static void viewer_disable_modifiers(VirtViewer *viewer)
static void viewer_enable_modifiers(VirtViewer *viewer)
{
GtkSettings *settings = gtk_settings_get_default();
GSList *accels;
GSList *accels;
int i;
if (!viewer->window)
@ -438,15 +439,23 @@ static void viewer_enable_modifiers(VirtViewer *viewer)
static void viewer_grab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewer *viewer)
static void viewer_mouse_grab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewer *viewer)
{
viewer_set_title(viewer, TRUE);
}
static void viewer_mouse_ungrab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewer *viewer)
{
viewer_set_title(viewer, FALSE);
}
static void viewer_key_grab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewer *viewer)
{
viewer_disable_modifiers(viewer);
}
static void viewer_ungrab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewer *viewer)
static void viewer_key_ungrab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewer *viewer)
{
viewer_set_title(viewer, FALSE);
viewer_enable_modifiers(viewer);
}
@ -1108,7 +1117,10 @@ viewer_start (const char *uri,
viewer_event_register();
virSetErrorFunc(NULL, viewer_error_func);
viewer->conn = virConnectOpenReadOnly(uri);
/* XXX write a graphical auth function */
viewer->conn = virConnectOpenAuth(uri,
virConnectAuthPtrDefault,
VIR_CONNECT_RO);
if (!viewer->conn) {
fprintf(stderr, "unable to connect to libvirt %s\n",
uri ? uri : "xen");
@ -1163,9 +1175,14 @@ viewer_start (const char *uri,
g_signal_connect(GTK_OBJECT(viewer->vnc), "vnc-desktop-resize",
GTK_SIGNAL_FUNC(viewer_resize_desktop), viewer);
g_signal_connect(GTK_OBJECT(viewer->vnc), "vnc-pointer-grab",
GTK_SIGNAL_FUNC(viewer_grab), viewer);
GTK_SIGNAL_FUNC(viewer_mouse_grab), viewer);
g_signal_connect(GTK_OBJECT(viewer->vnc), "vnc-pointer-ungrab",
GTK_SIGNAL_FUNC(viewer_ungrab), viewer);
GTK_SIGNAL_FUNC(viewer_mouse_ungrab), viewer);
g_signal_connect(GTK_OBJECT(viewer->vnc), "vnc-keyboard-grab",
GTK_SIGNAL_FUNC(viewer_key_grab), viewer);
g_signal_connect(GTK_OBJECT(viewer->vnc), "vnc-keyboard-ungrab",
GTK_SIGNAL_FUNC(viewer_key_ungrab), viewer);
g_signal_connect(GTK_OBJECT(viewer->vnc), "vnc-auth-credential",
GTK_SIGNAL_FUNC(viewer_credential), NULL);