X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=main.c;h=356d379261ce3cb642a5d9a62a1fabd268f9cfca;hb=96d85a3aa82d2efe8a0f83fcb1bc17e86f8e56b5;hp=0a9209e531bad15c78361aa718afb8a85ed37f17;hpb=a1aebc1321f69e419bacb3acab8155ea0ac53fe2;p=ovirt-viewer.git diff --git a/main.c b/main.c index 0a9209e..356d379 100644 --- a/main.c +++ b/main.c @@ -25,6 +25,7 @@ #include #include +#include #include #ifdef HAVE_NETDB_H @@ -62,10 +63,19 @@ gboolean check_cert = FALSE; // do we want this enabled by default ? // would require a CA by default (self-signed wont work) // (don't set to true, change var/flag to no_check_cert) +/* The WUI thread has updated the vm list. Here in the main thread +* we keep our own copy of the vmlist. +*/ +static GSList *vmlist = NULL; + /* Private functions. */ static void start_ui (void); static GtkWidget *menu_item_new (int which_menu); +static void refresh_menu_vm_list (GtkWidget *, gpointer); +static void connect_to_wui_on_enter (GtkWidget *, gpointer); static void connect_to_wui (GtkWidget *, gpointer); +static void send_key_to_vm (GtkWidget *widget, gpointer _keyComboDef); +static void login_to_wui_on_enter (GtkWidget *, gpointer); static void login_to_wui (GtkWidget *, gpointer); static gboolean delete_event (GtkWidget *widget, GdkEvent *event, gpointer data); static void destroy (GtkWidget *widget, gpointer data); @@ -80,6 +90,7 @@ static void viewer_initialized (GtkWidget *vnc, GtkWidget *data); static void viewer_disconnected (GtkWidget *vnc); static void viewer_credential (GtkWidget *vnc, GValueArray *credList); static int viewer_open_vnc_socket (const char *vnchost, int vncport); +static void add_vm_to_connectmenu (gpointer _vm, gpointer data); /* For any widgets accessed from multiple functions. */ static GtkWidget *window; @@ -96,6 +107,7 @@ static GtkWidget *login_area; static GtkWidget *la_username; static GtkWidget *la_password; static GtkWidget *la_button; +static GtkWidget *la_error; static GtkWidget *notebook; static GtkWidget *statusbar; static guint statusbar_ctx; @@ -125,9 +137,42 @@ static struct menuItem menuItems[] = { { HELP_MENU, NULL, "_Help", "Help" } }; +#define MAX_KEY_COMBO 3 + struct keyComboDef { + guint keys[MAX_KEY_COMBO]; + guint nkeys; + const char *label; + }; + +#define NUM_KEY_COMBOS 17 +static struct keyComboDef keyCombos[] = { + { { GDK_Control_L, GDK_Alt_L, GDK_Delete }, 3, "Ctrl+Alt+Del"}, + { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace }, 3, "Ctrl+Alt+Backspace"}, + { {}, 0, "" }, + { { GDK_Control_L, GDK_Alt_L, GDK_F1 }, 3, "Ctrl+Alt+F1"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F2 }, 3, "Ctrl+Alt+F2"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F3 }, 3, "Ctrl+Alt+F3"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F4 }, 3, "Ctrl+Alt+F4"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F5 }, 3, "Ctrl+Alt+F5"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F6"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F7"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F8"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F5 }, 3, "Ctrl+Alt+F9"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F10"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F11"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F12"}, + { {}, 0, "" }, + { { GDK_Print }, 1, "PrintScreen"}, +}; + /* Window title. */ static const char *title = "oVirt Viewer"; +// when running vm +// 47 chars +static const char *title_vm = + "oVirt Viewer: (ctrl+alt to grab/release mouse) "; + /* Gtk widget styles. Avoid installation hassles by keeping this * inside the binary. It can still be overridden by the user (who * will do that?) @@ -230,12 +275,14 @@ main (int argc, char *argv[]) static void start_ui (void) { + int i; GtkWidget *vbox; GtkWidget *menubar; GtkWidget *view; GtkWidget *viewmenu; GtkWidget *sendkey; GtkWidget *sendkeymenu; + GtkWidget *sendkeymenuitem; GtkWidget *wind; GtkWidget *windmenu; GtkWidget *help; @@ -244,7 +291,9 @@ start_ui (void) GtkWidget *ca_vbox; GtkWidget *ca_hbox; GtkWidget *ca_label; + GtkWidget *la_vbox; GtkWidget *la_hbox; + GtkWidget *la_label; DEBUG ("creating viewer windows and menus"); @@ -289,6 +338,9 @@ start_ui (void) refresh_vmlist_separator = gtk_separator_menu_item_new (); g_object_ref (refresh_vmlist_separator); + g_signal_connect (G_OBJECT (refresh_vmlist), "activate", + G_CALLBACK (refresh_menu_vm_list), NULL); + #if 0 screenshot = gtk_menu_item_new_with_mnemonic ("_Screenshot"); gtk_menu_append (GTK_MENU (filemenu), screenshot); @@ -304,6 +356,13 @@ start_ui (void) sendkeymenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (sendkey), sendkeymenu); + for(i = 0; i < NUM_KEY_COMBOS; ++i){ + sendkeymenuitem = gtk_menu_item_new_with_label (keyCombos[i].label); + gtk_menu_append (GTK_MENU (sendkeymenu), sendkeymenuitem); + g_signal_connect (G_OBJECT (sendkeymenuitem), "activate", + G_CALLBACK (send_key_to_vm), &(keyCombos[i])); + } + wind = menu_item_new (WINDOW_MENU); windmenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (wind), windmenu); @@ -340,24 +399,36 @@ start_ui (void) gtk_widget_set_name (connection_area, "ovirt-viewer-connection-area"); + g_signal_connect (G_OBJECT (ca_hostname), "key-release-event", + G_CALLBACK (connect_to_wui_on_enter), NULL); g_signal_connect (G_OBJECT (ca_button), "clicked", G_CALLBACK (connect_to_wui), NULL); login_area = gtk_event_box_new (); + la_vbox = gtk_vbox_new (FALSE, 0); la_hbox = gtk_hbox_new (FALSE, 0); + la_label = gtk_label_new ("Username / password:"); la_username = gtk_entry_new (); gtk_entry_set_width_chars (GTK_ENTRY (la_username), 12); la_password = gtk_entry_new (); gtk_entry_set_width_chars (GTK_ENTRY (la_password), 12); gtk_entry_set_visibility (GTK_ENTRY (la_password), FALSE); la_button = gtk_button_new_with_label ("Login"); + la_error = gtk_label_new (NULL); gtk_container_add (GTK_CONTAINER (la_hbox), la_username); gtk_container_add (GTK_CONTAINER (la_hbox), la_password); gtk_container_add (GTK_CONTAINER (la_hbox), la_button); - gtk_container_add (GTK_CONTAINER (login_area), la_hbox); + gtk_box_pack_start (GTK_BOX (la_vbox), la_label, TRUE, FALSE, 4); + gtk_box_pack_start (GTK_BOX (la_vbox), la_hbox, TRUE, FALSE, 4); + gtk_box_pack_start (GTK_BOX (la_vbox), la_error, TRUE, FALSE, 4); + gtk_container_add (GTK_CONTAINER (login_area), la_vbox); gtk_widget_set_name (login_area, "ovirt-viewer-login-area"); + g_signal_connect (G_OBJECT (la_username), "key-release-event", + G_CALLBACK (login_to_wui_on_enter), NULL); + g_signal_connect (G_OBJECT (la_password), "key-release-event", + G_CALLBACK (login_to_wui_on_enter), NULL); g_signal_connect (G_OBJECT (la_button), "clicked", G_CALLBACK (login_to_wui), NULL); @@ -469,6 +540,21 @@ help_about (GtkWidget *menu) } static void +refresh_menu_vm_list(GtkWidget *widget, gpointer data) +{ + wui_thread_send_refresh_vm_list(); +} + +static void +connect_to_wui_on_enter (GtkWidget *widget, gpointer data) +{ + // if key released was not 'enter' key + if(((GdkEventKey *)data)->type == GDK_KEY_RELEASE && (((GdkEventKey *)data)->keyval & 0xFF) != 13 ) return; + + connect_to_wui(widget, data); +} + +static void connect_to_wui (GtkWidget *widget, gpointer data) { const char *hostname; @@ -487,6 +573,15 @@ connect_to_wui (GtkWidget *widget, gpointer data) } static void +login_to_wui_on_enter (GtkWidget *widget, gpointer data) +{ + // if key released was not 'enter' key + if(((GdkEventKey *)data)->type == GDK_KEY_RELEASE && (((GdkEventKey *)data)->keyval & 0xFF) != 13 ) return; + + login_to_wui(widget, data); +} + +static void login_to_wui (GtkWidget *widget, gpointer data) { const char *username, *password; @@ -513,6 +608,7 @@ connect_to_vm (GtkWidget *widget, gpointer _vm) const char *label; const char* hostname; char *label2; + char new_title[97]; // 47 chars for title + 50 for vm name DEBUG ("searching tabs for uuid %s", vm->uuid); @@ -533,6 +629,14 @@ connect_to_vm (GtkWidget *widget, gpointer _vm) DEBUG ("not found, creating new tab"); + // before we open vnc connection, make sure vm is running + gboolean vm_running = main_vmlist_has_running_vm(vm); + + if(!vm_running){ + main_status_error (g_strdup ("VM not running")); + return; + } + /* This VM isn't in the notebook already, so create a new console. */ hostname = gtk_entry_get_text (GTK_ENTRY (ca_hostname)); fd = viewer_open_vnc_socket(hostname, vm->forward_vnc_port); @@ -544,6 +648,16 @@ connect_to_vm (GtkWidget *widget, gpointer _vm) return; } + main_status_error(g_strdup("")); + + for(i = 0; i < 47; ++i) new_title[i] = title_vm[i]; + for(i = 0; i < 50; ++i){ + if(vm->description[i] == '\0') break; + new_title[47 + i] = vm->description[i]; + } + new_title[i < 50 ? i+47 : 96] = '\0'; + gtk_window_set_title (GTK_WINDOW (window), new_title); + /* gtk_signal_connect(GTK_OBJECT(child), "vnc-pointer-grab", GTK_SIGNAL_FUNC(viewer_grab), window); @@ -581,6 +695,30 @@ connect_to_vm (GtkWidget *widget, gpointer _vm) DEBUG ("finished creating new tab"); } +/* Send key to a virtual machine. This callback is called from the + * send key menu. If finds vm in focus, and sends specified key to it + */ +static void +send_key_to_vm (GtkWidget *widget, gpointer _keyComboDef) +{ + GtkWidget* viewer; + struct keyComboDef* key_combo = (struct keyComboDef*) _keyComboDef; + int c = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); + + if(c < 0){ + return; + } + + viewer = gtk_notebook_get_nth_page(GTK_NOTEBOOK (notebook), c); + if(viewer != NULL){ + DEBUG ("sending keys to vm"); + vnc_display_send_keys(VNC_DISPLAY(viewer), + key_combo->keys, + key_combo->nkeys); + } +} + + /* static void viewer_grab(GtkWidget *vnc, GtkWidget *window) { @@ -914,9 +1052,7 @@ main_login_error (gpointer _str) DEBUG ("login error: %s", str); ASSERT_IS_MAIN_THREAD (); - /* gtk_label_set_text (GTK_LABEL (la_error), str); - */ g_free (str); return FALSE; @@ -940,13 +1076,6 @@ main_status_error (gpointer _str) return FALSE; } -/* The WUI thread has updated the vm list. Here in the main thread - * we keep our own copy of the vmlist. - */ -static GSList *vmlist = NULL; - -static void add_vm_to_connectmenu (gpointer _vm, gpointer data); - gboolean main_vmlist_updated (gpointer data) { @@ -987,6 +1116,9 @@ add_vm_to_connectmenu (gpointer _vm, gpointer data) struct vm *vm = (struct vm *) _vm; GtkWidget *item; + // TODO only present running vms ? + // if(vm->state == "running") + DEBUG ("adding %s to Connect menu", vm->description); item = gtk_menu_item_new_with_label (vm->description);