diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | mingw32-virt-viewer.spec.in | 6 | ||||
-rw-r--r-- | plugin/Makefile.am | 8 | ||||
-rw-r--r-- | src/Makefile.am | 23 | ||||
-rw-r--r-- | src/virt-viewer-about.xml (renamed from src/about.xml) | 4 | ||||
-rw-r--r-- | src/virt-viewer-auth.c (renamed from src/auth.c) | 32 | ||||
-rw-r--r-- | src/virt-viewer-auth.h (renamed from src/auth.h) | 18 | ||||
-rw-r--r-- | src/virt-viewer-auth.xml (renamed from src/auth.xml) | 0 | ||||
-rw-r--r-- | src/virt-viewer-display-spice.c (renamed from src/display-spice.c) | 144 | ||||
-rw-r--r-- | src/virt-viewer-display-spice.h (renamed from src/display-spice.h) | 2 | ||||
-rw-r--r-- | src/virt-viewer-display-vnc.c (renamed from src/display-vnc.c) | 160 | ||||
-rw-r--r-- | src/virt-viewer-display-vnc.h (renamed from src/display-vnc.h) | 2 | ||||
-rw-r--r-- | src/virt-viewer-display.c (renamed from src/display.c) | 2 | ||||
-rw-r--r-- | src/virt-viewer-display.h (renamed from src/display.h) | 3 | ||||
-rw-r--r-- | src/virt-viewer-events.c (renamed from src/events.c) | 72 | ||||
-rw-r--r-- | src/virt-viewer-events.h (renamed from src/events.h) | 4 | ||||
-rw-r--r-- | src/virt-viewer-main.c (renamed from src/main.c) | 8 | ||||
-rw-r--r-- | src/virt-viewer-priv.h (renamed from src/viewer-priv.h) | 28 | ||||
-rw-r--r-- | src/virt-viewer-util.c (renamed from src/util.c) | 4 | ||||
-rw-r--r-- | src/virt-viewer-util.h (renamed from src/util.h) | 2 | ||||
-rw-r--r-- | src/virt-viewer.c (renamed from src/viewer.c) | 474 | ||||
-rw-r--r-- | src/virt-viewer.h (renamed from src/viewer.h) | 20 | ||||
-rw-r--r-- | src/virt-viewer.xml (renamed from src/viewer.xml) | 48 | ||||
-rw-r--r-- | virt-viewer.spec.in | 6 |
24 files changed, 614 insertions, 458 deletions
diff --git a/configure.ac b/configure.ac index 004dd70..b1d3377 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT(virt-viewer, 0.3.1) -AC_CONFIG_SRCDIR(src/main.c) +AC_CONFIG_SRCDIR(src/virt-viewer-main.c) AM_CONFIG_HEADER(config.h) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) diff --git a/mingw32-virt-viewer.spec.in b/mingw32-virt-viewer.spec.in index 04dba9e..531fbb9 100644 --- a/mingw32-virt-viewer.spec.in +++ b/mingw32-virt-viewer.spec.in @@ -55,9 +55,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_mingw32_datadir}/virt-viewer/ %dir %{_mingw32_datadir}/virt-viewer/ui/ -%{_mingw32_datadir}/virt-viewer/ui/about.xml -%{_mingw32_datadir}/virt-viewer/ui/auth.xml -%{_mingw32_datadir}/virt-viewer/ui/viewer.xml +%{_mingw32_datadir}/virt-viewer/ui/virt-viewer.xml +%{_mingw32_datadir}/virt-viewer/ui/virt-viewer-about.xml +%{_mingw32_datadir}/virt-viewer/ui/virt-viewer-auth.xml %{_mingw32_mandir}/man1/virt-viewer.1* diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 93284cc..34dbd02 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -4,10 +4,10 @@ plugindir = $(libdir)/mozilla/plugins plugin_LTLIBRARIES = virt-viewer-plugin.la virt_viewer_plugin_la_SOURCES = \ - ../src/util.c ../src/util.h \ - ../src/auth.c ../src/auth.h \ - ../src/viewer.c ../src/viewer.h \ - ../src/events.c ../src/events.h \ + ../src/virt-viewer-util.c ../src/virt-viewer-util.h \ + ../src/virt-viewer-auth.c ../src/virt-viewer-auth.h \ + ../src/virt-viewer.c ../src/virt-viewer.h \ + ../src/virt-viewer-events.c ../src/virt-viewer-events.h \ virt-viewer-plugin.c virt-viewer-plugin.h \ npshell.c npunix.c virt_viewer_plugin_la_LIBADD = \ diff --git a/src/Makefile.am b/src/Makefile.am index 2f5b955..ba8ab92 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,19 +2,22 @@ bin_PROGRAMS = virt-viewer builderxmldir = $(pkgdatadir)/ui -builderxml_DATA = viewer.xml about.xml auth.xml +builderxml_DATA = \ + virt-viewer.xml \ + virt-viewer-about.xml \ + virt-viewer-auth.xml EXTRA_DIST = $(builderxml_DATA) virt_viewer_SOURCES = \ - main.c \ - util.h util.c \ - auth.h auth.c \ - events.h events.c \ - viewer.h viewer.c \ - viewer-priv.h \ - display.h display.c \ - display-vnc.h display-vnc.c \ + virt-viewer-main.c \ + virt-viewer-util.h virt-viewer-util.c \ + virt-viewer-auth.h virt-viewer-auth.c \ + virt-viewer-events.h virt-viewer-events.c \ + virt-viewer.h virt-viewer.c \ + virt-viewer-priv.h \ + virt-viewer-display.h virt-viewer-display.c \ + virt-viewer-display-vnc.h virt-viewer-display-vnc.c \ view/autoDrawer.c \ view/autoDrawer.h \ view/drawer.c \ @@ -25,7 +28,7 @@ virt_viewer_SOURCES = \ if HAVE_SPICE_GTK virt_viewer_SOURCES += \ - display-spice.h display-spice.c + virt-viewer-display-spice.h virt-viewer-display-spice.c endif virt_viewer_LDADD = \ diff --git a/src/about.xml b/src/virt-viewer-about.xml index c7978a9..603d9c7 100644 --- a/src/about.xml +++ b/src/virt-viewer-about.xml @@ -30,8 +30,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA </property> <property name="authors">Daniel P. Berrange</property> <property name="translator_credits" translatable="yes">The Fedora Translation Team</property> - <signal name="response" handler="viewer_about_close"/> - <signal name="delete_event" handler="viewer_about_delete"/> + <signal name="response" handler="virt_viewer_about_close"/> + <signal name="delete_event" handler="virt_viewer_about_delete"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/src/auth.c b/src/virt-viewer-auth.c index 3625bc1..3d63dcd 100644 --- a/src/auth.c +++ b/src/virt-viewer-auth.c @@ -26,14 +26,17 @@ #include <gtk/gtk.h> #include <string.h> -#include "auth.h" +#include "virt-viewer-auth.h" -int viewer_auth_collect_credentials(const char *type, const char *address, - char **username, char **password) +int +virt_viewer_auth_collect_credentials(const char *type, + const char *address, + char **username, + char **password) { GtkWidget *dialog = NULL; - GtkBuilder *creds = viewer_load_ui("auth.xml"); + GtkBuilder *creds = virt_viewer_util_load_ui("virt-viewer-auth.xml"); GtkWidget *credUsername; GtkWidget *credPassword; GtkWidget *promptUsername; @@ -85,7 +88,10 @@ int viewer_auth_collect_credentials(const char *type, const char *address, return response == GTK_RESPONSE_OK ? 0 : -1; } -void viewer_auth_vnc_credentials(GtkWidget *vnc, GValueArray *credList, char **vncAddress) +void +virt_viewer_auth_vnc_credentials(GtkWidget *vnc, + GValueArray *credList, + char **vncAddress) { char *username = NULL, *password = NULL; gboolean wantPassword = FALSE, wantUsername = FALSE; @@ -112,9 +118,9 @@ void viewer_auth_vnc_credentials(GtkWidget *vnc, GValueArray *credList, char **v } if (wantUsername || wantPassword) { - int ret = viewer_auth_collect_credentials("VNC", vncAddress ? *vncAddress : NULL, - wantUsername ? &username : NULL, - wantPassword ? &password : NULL); + int ret = virt_viewer_auth_collect_credentials("VNC", vncAddress ? *vncAddress : NULL, + wantUsername ? &username : NULL, + wantPassword ? &password : NULL); if (ret < 0) { vnc_display_close(VNC_DISPLAY(vnc)); @@ -165,9 +171,9 @@ void viewer_auth_vnc_credentials(GtkWidget *vnc, GValueArray *credList, char **v int -viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, - unsigned int ncred, - void *cbdata) +virt_viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, + unsigned int ncred, + void *cbdata) { char **username = NULL, **password = NULL; const char *uri = cbdata; @@ -192,8 +198,8 @@ viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, } if (username || password) { - ret = viewer_auth_collect_credentials("libvirt", uri, - username, password); + ret = virt_viewer_auth_collect_credentials("libvirt", uri, + username, password); if (ret < 0) goto cleanup; } else { diff --git a/src/auth.h b/src/virt-viewer-auth.h index 18d9a13..1cbf2b6 100644 --- a/src/auth.h +++ b/src/virt-viewer-auth.h @@ -25,15 +25,19 @@ #include <libvirt/libvirt.h> -#include "util.h" +#include "virt-viewer-util.h" -void viewer_auth_vnc_credentials(GtkWidget *vnc, GValueArray *credList, char **message); +void virt_viewer_auth_vnc_credentials(GtkWidget *vnc, + GValueArray *credList, + char **message); -int viewer_auth_collect_credentials(const char *type, const char *address, - char **username, char **password); +int virt_viewer_auth_collect_credentials(const char *type, + const char *address, + char **username, + char **password); -int viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, - unsigned int ncred, - void *cbdata); +int virt_viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, + unsigned int ncred, + void *cbdata); #endif diff --git a/src/auth.xml b/src/virt-viewer-auth.xml index f45143d..f45143d 100644 --- a/src/auth.xml +++ b/src/virt-viewer-auth.xml diff --git a/src/display-spice.c b/src/virt-viewer-display-spice.c index 6ff764e..88d64d1 100644 --- a/src/display-spice.c +++ b/src/virt-viewer-display-spice.c @@ -23,19 +23,20 @@ */ #include <spice-audio.h> -#include "util.h" -#include "display-spice.h" -#include "auth.h" + +#include "virt-viewer-util.h" +#include "virt-viewer-display-spice.h" +#include "virt-viewer-auth.h" G_DEFINE_TYPE (VirtViewerDisplaySpice, virt_viewer_display_spice, VIRT_VIEWER_TYPE_DISPLAY) -static void _spice_close(VirtViewerDisplay* display); -static void _spice_send_keys(VirtViewerDisplay* display, const guint *keyvals, int nkeyvals); -static GdkPixbuf* _spice_get_pixbuf(VirtViewerDisplay* display); -static gboolean _spice_open_fd(VirtViewerDisplay* display, int fd); -static gboolean _spice_open_host(VirtViewerDisplay* display, char *host, char *port); -static gboolean _spice_channel_open_fd(VirtViewerDisplay* display, VirtViewerDisplayChannel* channel, int fd); +static void virt_viewer_display_spice_close(VirtViewerDisplay *display); +static void virt_viewer_display_spice_send_keys(VirtViewerDisplay *display, const guint *keyvals, int nkeyvals); +static GdkPixbuf *virt_viewer_display_spice_get_pixbuf(VirtViewerDisplay *display); +static gboolean virt_viewer_display_spice_open_fd(VirtViewerDisplay *display, int fd); +static gboolean virt_viewer_display_spice_open_host(VirtViewerDisplay *display, char *host, char *port); +static gboolean virt_viewer_display_spice_channel_open_fd(VirtViewerDisplay *display, VirtViewerDisplayChannel *channel, int fd); static void @@ -43,12 +44,12 @@ virt_viewer_display_spice_class_init(VirtViewerDisplaySpiceClass *klass) { VirtViewerDisplayClass *dclass = VIRT_VIEWER_DISPLAY_CLASS(klass); - dclass->close = _spice_close; - dclass->send_keys = _spice_send_keys; - dclass->get_pixbuf = _spice_get_pixbuf; - dclass->open_fd = _spice_open_fd; - dclass->open_host = _spice_open_host; - dclass->channel_open_fd = _spice_channel_open_fd; + dclass->close = virt_viewer_display_spice_close; + dclass->send_keys = virt_viewer_display_spice_send_keys; + dclass->get_pixbuf = virt_viewer_display_spice_get_pixbuf; + dclass->open_fd = virt_viewer_display_spice_open_fd; + dclass->open_host = virt_viewer_display_spice_open_host; + dclass->channel_open_fd = virt_viewer_display_spice_channel_open_fd; } static void @@ -56,7 +57,10 @@ virt_viewer_display_spice_init(VirtViewerDisplaySpice *self G_GNUC_UNUSED) { } -static void _spice_send_keys(VirtViewerDisplay* display, const guint *keyvals, int nkeyvals) +static void +virt_viewer_display_spice_send_keys(VirtViewerDisplay *display, + const guint *keyvals, + int nkeyvals) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); @@ -66,7 +70,8 @@ static void _spice_send_keys(VirtViewerDisplay* display, const guint *keyvals, i spice_display_send_keys(self->display, keyvals, nkeyvals, SPICE_DISPLAY_KEY_EVENT_CLICK); } -static GdkPixbuf* _spice_get_pixbuf(VirtViewerDisplay* display) +static GdkPixbuf * +virt_viewer_display_spice_get_pixbuf(VirtViewerDisplay *display) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); @@ -76,7 +81,8 @@ static GdkPixbuf* _spice_get_pixbuf(VirtViewerDisplay* display) return spice_display_get_pixbuf(self->display); } -static void _spice_close(VirtViewerDisplay* display) +static void +virt_viewer_display_spice_close(VirtViewerDisplay *display) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); @@ -96,7 +102,10 @@ static void _spice_close(VirtViewerDisplay* display) self->audio = NULL; } -static gboolean _spice_open_host(VirtViewerDisplay* display, char *host, char *port) +static gboolean +virt_viewer_display_spice_open_host(VirtViewerDisplay *display, + char *host, + char *port) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); @@ -111,7 +120,9 @@ static gboolean _spice_open_host(VirtViewerDisplay* display, char *host, char *p return spice_session_connect(self->session); } -static gboolean _spice_open_fd(VirtViewerDisplay* display, int fd) +static gboolean +virt_viewer_display_spice_open_fd(VirtViewerDisplay *display, + int fd) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); @@ -120,8 +131,10 @@ static gboolean _spice_open_fd(VirtViewerDisplay* display, int fd) return spice_session_open_fd(self->session, fd); } -static gboolean _spice_channel_open_fd(VirtViewerDisplay* display, - VirtViewerDisplayChannel* channel, int fd) +static gboolean +virt_viewer_display_spice_channel_open_fd(VirtViewerDisplay *display, + VirtViewerDisplayChannel *channel, + int fd) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); @@ -130,20 +143,22 @@ static gboolean _spice_channel_open_fd(VirtViewerDisplay* display, return spice_channel_open_fd(SPICE_CHANNEL(channel), fd); } -static void _spice_channel_open_fd_request(SpiceChannel *channel, - G_GNUC_UNUSED gint tls, - VirtViewerDisplay *display) +static void +virt_viewer_display_spice_channel_open_fd_request(SpiceChannel *channel, + gint tls G_GNUC_UNUSED, + VirtViewerDisplay *display) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); g_return_if_fail(self != NULL); - viewer_channel_open_fd(display->viewer, (VirtViewerDisplayChannel *)channel); + virt_viewer_channel_open_fd(display->viewer, (VirtViewerDisplayChannel *)channel); } -static void _spice_main_channel_event(G_GNUC_UNUSED SpiceChannel *channel, - SpiceChannelEvent event, - VirtViewerDisplay *display) +static void +virt_viewer_display_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED, + SpiceChannelEvent event, + VirtViewerDisplay *display) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); char *password = NULL; @@ -157,19 +172,19 @@ static void _spice_main_channel_event(G_GNUC_UNUSED SpiceChannel *channel, break; case SPICE_CHANNEL_CLOSED: DEBUG_LOG("main channel: closed"); - viewer_quit(display->viewer); + virt_viewer_quit(display->viewer); break; case SPICE_CHANNEL_ERROR_CONNECT: DEBUG_LOG("main channel: failed to connect"); - viewer_disconnected(display->viewer); + virt_viewer_disconnected(display->viewer); break; case SPICE_CHANNEL_ERROR_AUTH: DEBUG_LOG("main channel: auth failure (wrong password?)"); - int ret = viewer_auth_collect_credentials("SPICE", - display->viewer->pretty_address, - NULL, &password); + int ret = virt_viewer_auth_collect_credentials("SPICE", + display->viewer->pretty_address, + NULL, &password); if (ret < 0) { - viewer_quit(display->viewer); + virt_viewer_quit(display->viewer); } else { g_object_set(self->session, "password", password, NULL); spice_session_connect(self->session); @@ -177,7 +192,7 @@ static void _spice_main_channel_event(G_GNUC_UNUSED SpiceChannel *channel, break; default: g_warning("unknown main channel event: %d", event); - viewer_disconnected(display->viewer); + virt_viewer_disconnected(display->viewer); break; } @@ -190,7 +205,7 @@ static void _spice_main_channel_event(G_GNUC_UNUSED SpiceChannel *channel, * the display widget to be resized to fit the available space */ static void -viewer_resize_display_widget(VirtViewer *viewer) +virt_viewer_display_spice_resize_widget(VirtViewer *viewer) { gtk_widget_queue_resize(viewer->align); } @@ -202,19 +217,24 @@ viewer_resize_display_widget(VirtViewer *viewer) * It either tries to resize the main window, or it triggers * recalculation of the display within existing window size */ -static void viewer_resize_desktop(SpiceChannel *channel G_GNUC_UNUSED, gint format G_GNUC_UNUSED, - gint width, gint height, gint stride G_GNUC_UNUSED, - gint shmid G_GNUC_UNUSED, gpointer imgdata G_GNUC_UNUSED, - VirtViewer *viewer) +static void +virt_viewer_display_spice_resize_desktop(SpiceChannel *channel G_GNUC_UNUSED, + gint format G_GNUC_UNUSED, + gint width, + gint height, + gint stride G_GNUC_UNUSED, + gint shmid G_GNUC_UNUSED, + gpointer imgdata G_GNUC_UNUSED, + VirtViewer *viewer) { DEBUG_LOG("desktop resize %dx%d", width, height); viewer->desktopWidth = width; viewer->desktopHeight = height; if (viewer->autoResize && viewer->window && !viewer->fullscreen) { - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } else { - viewer_resize_display_widget(viewer); + virt_viewer_display_spice_resize_widget(viewer); } } @@ -224,9 +244,10 @@ static void viewer_resize_desktop(SpiceChannel *channel G_GNUC_UNUSED, gint form * It attempts to fit the display widget into this space while * maintaining aspect ratio */ -static gboolean viewer_resize_align(GtkWidget *widget, - GtkAllocation *alloc, - VirtViewer *viewer) +static gboolean +virt_viewer_display_spice_resize_align(GtkWidget *widget, + GtkAllocation *alloc, + VirtViewer *viewer) { double desktopAspect; double scrollAspect; @@ -271,8 +292,10 @@ static gboolean viewer_resize_align(GtkWidget *widget, return FALSE; } -static void _spice_channel_new(SpiceSession *s, SpiceChannel *channel, - VirtViewerDisplay *display) +static void +virt_viewer_display_spice_channel_new(SpiceSession *s, + SpiceChannel *channel, + VirtViewerDisplay *display) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); int id; @@ -280,13 +303,13 @@ static void _spice_channel_new(SpiceSession *s, SpiceChannel *channel, g_return_if_fail(self != NULL); g_signal_connect(channel, "open-fd", - G_CALLBACK(_spice_channel_open_fd_request), self); + G_CALLBACK(virt_viewer_display_spice_channel_open_fd_request), self); g_object_get(channel, "channel-id", &id, NULL); if (SPICE_IS_MAIN_CHANNEL(channel)) { g_signal_connect(channel, "channel-event", - G_CALLBACK(_spice_main_channel_event), self); + G_CALLBACK(virt_viewer_display_spice_main_channel_event), self); } if (SPICE_IS_DISPLAY_CHANNEL(channel)) { @@ -295,7 +318,7 @@ static void _spice_channel_new(SpiceSession *s, SpiceChannel *channel, return; g_signal_connect(channel, "display-primary-create", - G_CALLBACK(viewer_resize_desktop), display->viewer); + G_CALLBACK(virt_viewer_display_spice_resize_desktop), display->viewer); self->display = spice_display_new(s, id); display->widget = GTK_WIDGET(self->display); @@ -306,12 +329,12 @@ static void _spice_channel_new(SpiceSession *s, SpiceChannel *channel, "scaling", TRUE, "auto-clipboard", TRUE, NULL); - viewer_add_display_and_realize(display->viewer); + virt_viewer_add_display_and_realize(display->viewer); g_signal_connect(display->viewer->align, "size-allocate", - G_CALLBACK(viewer_resize_align), display->viewer); + G_CALLBACK(virt_viewer_display_spice_resize_align), display->viewer); - viewer_initialized(display->viewer); + virt_viewer_initialized(display->viewer); } if (SPICE_IS_INPUTS_CHANNEL(channel)) { @@ -326,8 +349,10 @@ static void _spice_channel_new(SpiceSession *s, SpiceChannel *channel, } } -static void _spice_channel_destroy(G_GNUC_UNUSED SpiceSession *s, SpiceChannel *channel, - VirtViewerDisplay *display) +static void +virt_viewer_display_spice_channel_destroy(G_GNUC_UNUSED SpiceSession *s, + SpiceChannel *channel, + VirtViewerDisplay *display) { VirtViewerDisplaySpice *self = VIRT_VIEWER_DISPLAY_SPICE(display); int id; @@ -350,7 +375,8 @@ static void _spice_channel_destroy(G_GNUC_UNUSED SpiceSession *s, SpiceChannel * } } -VirtViewerDisplaySpice* virt_viewer_display_spice_new(VirtViewer *viewer) +VirtViewerDisplaySpice * +virt_viewer_display_spice_new(VirtViewer *viewer) { VirtViewerDisplaySpice *self; VirtViewerDisplay *d; @@ -363,9 +389,9 @@ VirtViewerDisplaySpice* virt_viewer_display_spice_new(VirtViewer *viewer) self->session = spice_session_new(); g_signal_connect(self->session, "channel-new", - G_CALLBACK(_spice_channel_new), self); + G_CALLBACK(virt_viewer_display_spice_channel_new), self); g_signal_connect(self->session, "channel-destroy", - G_CALLBACK(_spice_channel_destroy), self); + G_CALLBACK(virt_viewer_display_spice_channel_destroy), self); return self; } diff --git a/src/display-spice.h b/src/virt-viewer-display-spice.h index d1da86b..c375822 100644 --- a/src/display-spice.h +++ b/src/virt-viewer-display-spice.h @@ -28,7 +28,7 @@ #include <spice-widget.h> #include <spice-audio.h> -#include "display.h" +#include "virt-viewer-display.h" G_BEGIN_DECLS diff --git a/src/display-vnc.c b/src/virt-viewer-display-vnc.c index f3afd46..02f5636 100644 --- a/src/display-vnc.c +++ b/src/virt-viewer-display-vnc.c @@ -22,56 +22,69 @@ * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "auth.h" -#include "display-vnc.h" +#include "virt-viewer-auth.h" +#include "virt-viewer-display-vnc.h" G_DEFINE_TYPE(VirtViewerDisplayVNC, virt_viewer_display_vnc, VIRT_VIEWER_TYPE_DISPLAY) -static void _vnc_close(VirtViewerDisplay* display); -static void _vnc_send_keys(VirtViewerDisplay* display, const guint *keyvals, int nkeyvals); -static GdkPixbuf* _vnc_get_pixbuf(VirtViewerDisplay* display); -static gboolean _vnc_open_fd(VirtViewerDisplay* display, int fd); -static gboolean _vnc_open_host(VirtViewerDisplay* display, char *host, char *port); -static gboolean _vnc_channel_open_fd(VirtViewerDisplay* display, - VirtViewerDisplayChannel* channel, int fd); +static void virt_viewer_display_vnc_close(VirtViewerDisplay* display); +static void virt_viewer_display_vnc_send_keys(VirtViewerDisplay* display, const guint *keyvals, int nkeyvals); +static GdkPixbuf* virt_viewer_display_vnc_get_pixbuf(VirtViewerDisplay* display); +static gboolean virt_viewer_display_vnc_open_fd(VirtViewerDisplay* display, int fd); +static gboolean virt_viewer_display_vnc_open_host(VirtViewerDisplay* display, char *host, char *port); +static gboolean virt_viewer_display_vnc_channel_open_fd(VirtViewerDisplay* display, + VirtViewerDisplayChannel* channel, int fd); -static void virt_viewer_display_vnc_class_init(VirtViewerDisplayVNCClass *klass) +static void +virt_viewer_display_vnc_class_init(VirtViewerDisplayVNCClass *klass) { VirtViewerDisplayClass *dclass = VIRT_VIEWER_DISPLAY_CLASS(klass); - dclass->close = _vnc_close; - dclass->send_keys = _vnc_send_keys; - dclass->get_pixbuf = _vnc_get_pixbuf; - dclass->open_fd = _vnc_open_fd; - dclass->open_host = _vnc_open_host; - dclass->channel_open_fd = _vnc_channel_open_fd; + dclass->close = virt_viewer_display_vnc_close; + dclass->send_keys = virt_viewer_display_vnc_send_keys; + dclass->get_pixbuf = virt_viewer_display_vnc_get_pixbuf; + dclass->open_fd = virt_viewer_display_vnc_open_fd; + dclass->open_host = virt_viewer_display_vnc_open_host; + dclass->channel_open_fd = virt_viewer_display_vnc_channel_open_fd; } -static void virt_viewer_display_vnc_init(VirtViewerDisplayVNC *self G_GNUC_UNUSED) +static void +virt_viewer_display_vnc_init(VirtViewerDisplayVNC *self G_GNUC_UNUSED) { } -static void _vnc_mouse_grab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewerDisplayVNC *self) +static void +virt_viewer_display_vnc_mouse_grab(GtkWidget *vnc G_GNUC_UNUSED, + VirtViewerDisplayVNC *self) { - viewer_set_title(VIRT_VIEWER_DISPLAY(self)->viewer, TRUE); + virt_viewer_set_title(VIRT_VIEWER_DISPLAY(self)->viewer, TRUE); } -static void _vnc_mouse_ungrab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewerDisplayVNC *self) +static void +virt_viewer_display_vnc_mouse_ungrab(GtkWidget *vnc G_GNUC_UNUSED, + VirtViewerDisplayVNC *self) { - viewer_set_title(VIRT_VIEWER_DISPLAY(self)->viewer, FALSE); + virt_viewer_set_title(VIRT_VIEWER_DISPLAY(self)->viewer, FALSE); } -static void _vnc_key_grab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewerDisplayVNC *self) +static void +virt_viewer_display_vnc_key_grab(GtkWidget *vnc G_GNUC_UNUSED, + VirtViewerDisplayVNC *self) { - viewer_disable_modifiers(VIRT_VIEWER_DISPLAY(self)->viewer); + virt_viewer_disable_modifiers(VIRT_VIEWER_DISPLAY(self)->viewer); } -static void _vnc_key_ungrab(GtkWidget *vnc G_GNUC_UNUSED, VirtViewerDisplayVNC *self) +static void +virt_viewer_display_vnc_key_ungrab(GtkWidget *vnc G_GNUC_UNUSED, + VirtViewerDisplayVNC *self) { - viewer_enable_modifiers(VIRT_VIEWER_DISPLAY(self)->viewer); + virt_viewer_enable_modifiers(VIRT_VIEWER_DISPLAY(self)->viewer); } -static void _vnc_send_keys(VirtViewerDisplay* display, const guint *keyvals, int nkeyvals) +static void +virt_viewer_display_vnc_send_keys(VirtViewerDisplay* display, + const guint *keyvals, + int nkeyvals) { VirtViewerDisplayVNC *self = VIRT_VIEWER_DISPLAY_VNC(display); @@ -82,7 +95,8 @@ static void _vnc_send_keys(VirtViewerDisplay* display, const guint *keyvals, int vnc_display_send_keys(self->vnc, keyvals, nkeyvals); } -static GdkPixbuf* _vnc_get_pixbuf(VirtViewerDisplay* display) +static GdkPixbuf* +virt_viewer_display_vnc_get_pixbuf(VirtViewerDisplay* display) { VirtViewerDisplayVNC *self = VIRT_VIEWER_DISPLAY_VNC(display); @@ -92,7 +106,9 @@ static GdkPixbuf* _vnc_get_pixbuf(VirtViewerDisplay* display) return vnc_display_get_pixbuf(self->vnc); } -static gboolean _vnc_open_fd(VirtViewerDisplay* display, int fd) +static gboolean +virt_viewer_display_vnc_open_fd(VirtViewerDisplay* display, + int fd) { VirtViewerDisplayVNC *self = VIRT_VIEWER_DISPLAY_VNC(display); @@ -102,15 +118,19 @@ static gboolean _vnc_open_fd(VirtViewerDisplay* display, int fd) return vnc_display_open_fd(self->vnc, fd); } -static gboolean _vnc_channel_open_fd(VirtViewerDisplay* display G_GNUC_UNUSED, - VirtViewerDisplayChannel* channel G_GNUC_UNUSED, - int fd G_GNUC_UNUSED) +static gboolean +virt_viewer_display_vnc_channel_open_fd(VirtViewerDisplay* display G_GNUC_UNUSED, + VirtViewerDisplayChannel* channel G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { g_warning("channel_open_fd is not supported by VNC"); return FALSE; } -static gboolean _vnc_open_host(VirtViewerDisplay* display, char *host, char *port) +static gboolean +virt_viewer_display_vnc_open_host(VirtViewerDisplay* display, + char *host, + char *port) { VirtViewerDisplayVNC *self = VIRT_VIEWER_DISPLAY_VNC(display); @@ -120,7 +140,8 @@ static gboolean _vnc_open_host(VirtViewerDisplay* display, char *host, char *por return vnc_display_open_host(self->vnc, host, port); } -static void _vnc_close(VirtViewerDisplay* display) +static void +virt_viewer_display_vnc_close(VirtViewerDisplay* display) { VirtViewerDisplayVNC *self = VIRT_VIEWER_DISPLAY_VNC(display); @@ -130,22 +151,28 @@ static void _vnc_close(VirtViewerDisplay* display) vnc_display_close(self->vnc); } -static void viewer_bell(VirtViewer *viewer, gpointer data G_GNUC_UNUSED) +static void +virt_viewer_display_vnc_bell(VirtViewer *viewer, + gpointer data G_GNUC_UNUSED) { gdk_window_beep(GTK_WIDGET(viewer->window)->window); } -static void viewer_vnc_auth_unsupported(VirtViewer *viewer, - unsigned int authType, gpointer data G_GNUC_UNUSED) +static void +virt_viewer_display_vnc_auth_unsupported(VirtViewer *viewer, + unsigned int authType, + gpointer data G_GNUC_UNUSED) { - viewer_simple_message_dialog(viewer->window, - _("Unable to authenticate with VNC server at %s\n" - "Unsupported authentication type %d"), - viewer->pretty_address, authType); + virt_viewer_simple_message_dialog(viewer->window, + _("Unable to authenticate with VNC server at %s\n" + "Unsupported authentication type %d"), + viewer->pretty_address, authType); } -static void viewer_vnc_auth_failure(VirtViewer *viewer, - const char *reason, gpointer data G_GNUC_UNUSED) +static void +virt_viewer_display_vnc_auth_failure(VirtViewer *viewer, + const char *reason, + gpointer data G_GNUC_UNUSED) { GtkWidget *dialog; int ret; @@ -174,7 +201,7 @@ static void viewer_vnc_auth_failure(VirtViewer *viewer, * the display widget to be resized to fit the available space */ static void -viewer_resize_display_widget(VirtViewer *viewer) +virt_viewer_display_vnc_resize_widget(VirtViewer *viewer) { gtk_widget_queue_resize(viewer->align); } @@ -186,16 +213,17 @@ viewer_resize_display_widget(VirtViewer *viewer) * It either tries to resize the main window, or it triggers * recalculation of the display within existing window size */ -static void viewer_resize_desktop(VirtViewer *viewer, gint width, gint height) +static void +virt_viewer_display_vnc_resize_desktop(VirtViewer *viewer, gint width, gint height) { DEBUG_LOG("desktop resize %dx%d", width, height); viewer->desktopWidth = width; viewer->desktopHeight = height; if (viewer->autoResize && viewer->window && !viewer->fullscreen) { - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } else { - viewer_resize_display_widget(viewer); + virt_viewer_display_vnc_resize_widget(viewer); } } @@ -205,9 +233,10 @@ static void viewer_resize_desktop(VirtViewer *viewer, gint width, gint height) * It attempts to fit the display widget into this space while * maintaining aspect ratio */ -static gboolean viewer_resize_align(GtkWidget *widget, - GtkAllocation *alloc, - VirtViewer *viewer) +static gboolean +virt_viewer_display_vnc_resize_align(GtkWidget *widget, + GtkAllocation *alloc, + VirtViewer *viewer) { double desktopAspect; double scrollAspect; @@ -249,7 +278,8 @@ static gboolean viewer_resize_align(GtkWidget *widget, return FALSE; } -VirtViewerDisplayVNC* virt_viewer_display_vnc_new(VirtViewer *viewer) +VirtViewerDisplayVNC* +virt_viewer_display_vnc_new(VirtViewer *viewer) { VirtViewerDisplayVNC *self; VirtViewerDisplay *d; @@ -279,40 +309,40 @@ VirtViewerDisplayVNC* virt_viewer_display_vnc_new(VirtViewer *viewer) vnc_display_set_scaling(self->vnc, TRUE); g_signal_connect_swapped(self->vnc, "vnc-connected", - G_CALLBACK(viewer_connected), viewer); + G_CALLBACK(virt_viewer_connected), viewer); g_signal_connect_swapped(self->vnc, "vnc-initialized", - G_CALLBACK(viewer_initialized), viewer); + G_CALLBACK(virt_viewer_initialized), viewer); g_signal_connect_swapped(self->vnc, "vnc-disconnected", - G_CALLBACK(viewer_disconnected), viewer); + G_CALLBACK(virt_viewer_disconnected), viewer); /* When VNC desktop resizes, we have to resize the containing widget */ g_signal_connect_swapped(self->vnc, "vnc-desktop-resize", - G_CALLBACK(viewer_resize_desktop), viewer); + G_CALLBACK(virt_viewer_display_vnc_resize_desktop), viewer); g_signal_connect_swapped(self->vnc, "vnc-bell", - G_CALLBACK(viewer_bell), NULL); + G_CALLBACK(virt_viewer_display_vnc_bell), NULL); g_signal_connect_swapped(self->vnc, "vnc-auth-failure", - G_CALLBACK(viewer_vnc_auth_failure), viewer); + G_CALLBACK(virt_viewer_display_vnc_auth_failure), viewer); g_signal_connect_swapped(self->vnc, "vnc-auth-unsupported", - G_CALLBACK(viewer_vnc_auth_unsupported), viewer); + G_CALLBACK(virt_viewer_display_vnc_auth_unsupported), viewer); g_signal_connect_swapped(self->vnc, "vnc-server-cut-text", - G_CALLBACK(viewer_server_cut_text), viewer); + G_CALLBACK(virt_viewer_server_cut_text), viewer); g_signal_connect(self->vnc, "vnc-pointer-grab", - G_CALLBACK(_vnc_mouse_grab), self); + G_CALLBACK(virt_viewer_display_vnc_mouse_grab), self); g_signal_connect(self->vnc, "vnc-pointer-ungrab", - G_CALLBACK(_vnc_mouse_ungrab), self); + G_CALLBACK(virt_viewer_display_vnc_mouse_ungrab), self); g_signal_connect(self->vnc, "vnc-keyboard-grab", - G_CALLBACK(_vnc_key_grab), self); + G_CALLBACK(virt_viewer_display_vnc_key_grab), self); g_signal_connect(self->vnc, "vnc-keyboard-ungrab", - G_CALLBACK(_vnc_key_ungrab), self); + G_CALLBACK(virt_viewer_display_vnc_key_ungrab), self); g_signal_connect(self->vnc, "vnc-auth-credential", - G_CALLBACK(viewer_auth_vnc_credentials), &viewer->pretty_address); + G_CALLBACK(virt_viewer_auth_vnc_credentials), &viewer->pretty_address); - viewer_add_display_and_realize(viewer); + virt_viewer_add_display_and_realize(viewer); g_signal_connect(viewer->align, "size-allocate", - G_CALLBACK(viewer_resize_align), viewer); + G_CALLBACK(virt_viewer_display_vnc_resize_align), viewer); return self; } diff --git a/src/display-vnc.h b/src/virt-viewer-display-vnc.h index 15a7d5b..c0d776f 100644 --- a/src/display-vnc.h +++ b/src/virt-viewer-display-vnc.h @@ -27,7 +27,7 @@ #include <glib-object.h> #include <vncdisplay.h> -#include "display.h" +#include "virt-viewer-display.h" G_BEGIN_DECLS diff --git a/src/display.c b/src/virt-viewer-display.c index 2d95a58..b2a1347 100644 --- a/src/display.c +++ b/src/virt-viewer-display.c @@ -21,7 +21,7 @@ * * Author: Daniel P. Berrange <berrange@redhat.com> */ -#include "display.h" +#include "virt-viewer-display.h" G_DEFINE_ABSTRACT_TYPE(VirtViewerDisplay, virt_viewer_display, G_TYPE_OBJECT) diff --git a/src/display.h b/src/virt-viewer-display.h index 45931b4..6e8057a 100644 --- a/src/display.h +++ b/src/virt-viewer-display.h @@ -25,7 +25,8 @@ #define _VIRT_VIEWER_DISPLAY_H #include <glib-object.h> -#include "viewer-priv.h" + +#include "virt-viewer-priv.h" G_BEGIN_DECLS diff --git a/src/events.c b/src/virt-viewer-events.c index 9f893be..d7d2c9b 100644 --- a/src/events.c +++ b/src/virt-viewer-events.c @@ -27,9 +27,9 @@ #include <glib.h> #include <libvirt/libvirt.h> -#include "events.h" +#include "virt-viewer-events.h" -struct viewer_event_handle +struct virt_viewer_events_handle { int watch; int fd; @@ -44,14 +44,14 @@ struct viewer_event_handle static int nextwatch = 1; static unsigned int nhandles = 0; -static struct viewer_event_handle **handles = NULL; +static struct virt_viewer_events_handle **handles = NULL; static gboolean -viewer_event_dispatch_handle(GIOChannel *source G_GNUC_UNUSED, +virt_viewer_events_dispatch_handle(GIOChannel *source G_GNUC_UNUSED, GIOCondition condition, gpointer opaque) { - struct viewer_event_handle *data = opaque; + struct virt_viewer_events_handle *data = opaque; int events = 0; if (condition & G_IO_IN) @@ -72,13 +72,13 @@ viewer_event_dispatch_handle(GIOChannel *source G_GNUC_UNUSED, static -int viewer_event_add_handle(int fd, +int virt_viewer_events_add_handle(int fd, int events, virEventHandleCallback cb, void *opaque, virFreeCallback ff) { - struct viewer_event_handle *data; + struct virt_viewer_events_handle *data; GIOCondition cond = 0; handles = g_realloc(handles, sizeof(*handles)*(nhandles+1)); @@ -102,7 +102,7 @@ int viewer_event_add_handle(int fd, data->source = g_io_add_watch(data->channel, cond, - viewer_event_dispatch_handle, + virt_viewer_events_dispatch_handle, data); handles[nhandles++] = data; @@ -110,8 +110,8 @@ int viewer_event_add_handle(int fd, return data->watch; } -static struct viewer_event_handle * -viewer_event_find_handle(int watch) +static struct virt_viewer_events_handle * +virt_viewer_events_find_handle(int watch) { unsigned int i; for (i = 0 ; i < nhandles ; i++) @@ -122,10 +122,10 @@ viewer_event_find_handle(int watch) } static void -viewer_event_update_handle(int watch, +virt_viewer_events_update_handle(int watch, int events) { - struct viewer_event_handle *data = viewer_event_find_handle(watch); + struct virt_viewer_events_handle *data = virt_viewer_events_find_handle(watch); if (!data) { DEBUG_LOG("Update for missing handle watch %d", watch); @@ -147,7 +147,7 @@ viewer_event_update_handle(int watch, cond |= G_IO_OUT; data->source = g_io_add_watch(data->channel, cond, - viewer_event_dispatch_handle, + virt_viewer_events_dispatch_handle, data); data->events = events; } else { @@ -161,9 +161,9 @@ viewer_event_update_handle(int watch, } static int -viewer_event_remove_handle(int watch) +virt_viewer_events_remove_handle(int watch) { - struct viewer_event_handle *data = viewer_event_find_handle(watch); + struct virt_viewer_events_handle *data = virt_viewer_events_find_handle(watch); if (!data) { DEBUG_LOG("Remove of missing watch %d", watch); @@ -182,7 +182,7 @@ viewer_event_remove_handle(int watch) return 0; } -struct viewer_event_timeout +struct virt_viewer_events_timeout { int timer; int interval; @@ -195,12 +195,12 @@ struct viewer_event_timeout static int nexttimer = 1; static unsigned int ntimeouts = 0; -static struct viewer_event_timeout **timeouts = NULL; +static struct virt_viewer_events_timeout **timeouts = NULL; static gboolean -viewer_event_dispatch_timeout(void *opaque) +virt_viewer_events_dispatch_timeout(void *opaque) { - struct viewer_event_timeout *data = opaque; + struct virt_viewer_events_timeout *data = opaque; DEBUG_LOG("Dispatch timeout %p %p %d %p\n", data, data->cb, data->timer, data->opaque); (data->cb)(data->timer, data->opaque); @@ -208,12 +208,12 @@ viewer_event_dispatch_timeout(void *opaque) } static int -viewer_event_add_timeout(int interval, +virt_viewer_events_add_timeout(int interval, virEventTimeoutCallback cb, void *opaque, virFreeCallback ff) { - struct viewer_event_timeout *data; + struct virt_viewer_events_timeout *data; timeouts = g_realloc(timeouts, sizeof(*timeouts)*(ntimeouts+1)); data = g_malloc(sizeof(*data)); @@ -226,7 +226,7 @@ viewer_event_add_timeout(int interval, data->ff = ff; if (interval >= 0) data->source = g_timeout_add(interval, - viewer_event_dispatch_timeout, + virt_viewer_events_dispatch_timeout, data); timeouts[ntimeouts++] = data; @@ -237,8 +237,8 @@ viewer_event_add_timeout(int interval, } -static struct viewer_event_timeout * -viewer_event_find_timeout(int timer) +static struct virt_viewer_events_timeout * +virt_viewer_events_find_timeout(int timer) { unsigned int i; for (i = 0 ; i < ntimeouts ; i++) @@ -250,10 +250,10 @@ viewer_event_find_timeout(int timer) static void -viewer_event_update_timeout(int timer, +virt_viewer_events_update_timeout(int timer, int interval) { - struct viewer_event_timeout *data = viewer_event_find_timeout(timer); + struct virt_viewer_events_timeout *data = virt_viewer_events_find_timeout(timer); if (!data) { DEBUG_LOG("Update of missing timer %d", timer); @@ -268,7 +268,7 @@ viewer_event_update_timeout(int timer, data->interval = interval; data->source = g_timeout_add(data->interval, - viewer_event_dispatch_timeout, + virt_viewer_events_dispatch_timeout, data); } else { if (!data->source) @@ -280,9 +280,9 @@ viewer_event_update_timeout(int timer, } static int -viewer_event_remove_timeout(int timer) +virt_viewer_events_remove_timeout(int timer) { - struct viewer_event_timeout *data = viewer_event_find_timeout(timer); + struct virt_viewer_events_timeout *data = virt_viewer_events_find_timeout(timer); if (!data) { DEBUG_LOG("Remove of missing timer %d", timer); @@ -306,12 +306,12 @@ viewer_event_remove_timeout(int timer) } -void viewer_event_register(void) { - virEventRegisterImpl(viewer_event_add_handle, - viewer_event_update_handle, - viewer_event_remove_handle, - viewer_event_add_timeout, - viewer_event_update_timeout, - viewer_event_remove_timeout); +void virt_viewer_events_register(void) { + virEventRegisterImpl(virt_viewer_events_add_handle, + virt_viewer_events_update_handle, + virt_viewer_events_remove_handle, + virt_viewer_events_add_timeout, + virt_viewer_events_update_timeout, + virt_viewer_events_remove_timeout); } diff --git a/src/events.h b/src/virt-viewer-events.h index 02a7345..44ff8d7 100644 --- a/src/events.h +++ b/src/virt-viewer-events.h @@ -23,8 +23,8 @@ #ifndef VIRT_VIEWER_EVENT_H #define VIRT_VIEWER_EVENT_H -#include "util.h" +#include "virt-viewer-util.h" -void viewer_event_register(void); +void virt_viewer_events_register(void); #endif diff --git a/src/main.c b/src/virt-viewer-main.c index 9f841b3..b176022 100644 --- a/src/main.c +++ b/src/virt-viewer-main.c @@ -27,9 +27,9 @@ #include <glib/gi18n.h> #include <stdlib.h> -#include "viewer.h" +#include "virt-viewer.h" -static void viewer_version(void) +static void virt_viewer_version(void) { g_print(_("%s version %s\n"), PACKAGE, VERSION); @@ -53,7 +53,7 @@ int main(int argc, char **argv) const char *help_msg = N_("Run '" PACKAGE " --help' to see a full list of available command line options"); const GOptionEntry options [] = { { "version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, - viewer_version, N_("display version information"), NULL }, + virt_viewer_version, N_("display version information"), NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, N_("display verbose information"), NULL }, { "direct", 'd', 0, G_OPTION_ARG_NONE, &direct, @@ -104,7 +104,7 @@ int main(int argc, char **argv) return 1; } - ret = viewer_start (uri, args[0], zoom, direct, waitvm, reconnect, verbose, debug, NULL); + ret = virt_viewer_start(uri, args[0], zoom, direct, waitvm, reconnect, verbose, debug, NULL); if (ret != 0) return ret; diff --git a/src/viewer-priv.h b/src/virt-viewer-priv.h index be220f5..1cadda2 100644 --- a/src/viewer-priv.h +++ b/src/virt-viewer-priv.h @@ -106,20 +106,20 @@ struct _VirtViewerSize { gulong sig_id; }; -void viewer_connected(VirtViewer *viewer); -void viewer_initialized(VirtViewer *viewer); -void viewer_disconnected(VirtViewer *viewer); -void viewer_set_status(VirtViewer *viewer, const char *text); -void viewer_set_title(VirtViewer *viewer, gboolean grabbed); -void viewer_enable_modifiers(VirtViewer *viewer); -void viewer_disable_modifiers(VirtViewer *viewer); -void viewer_add_display_and_realize(VirtViewer *viewer); -void viewer_server_cut_text(VirtViewer *viewer, const gchar *text); -void viewer_resize_main_window(VirtViewer *viewer); -void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channel); -void viewer_quit(VirtViewer *viewer); - -void viewer_simple_message_dialog(GtkWidget *window, const char *fmt, ...); +void virt_viewer_connected(VirtViewer *viewer); +void virt_viewer_initialized(VirtViewer *viewer); +void virt_viewer_disconnected(VirtViewer *viewer); +void virt_viewer_set_status(VirtViewer *viewer, const char *text); +void virt_viewer_set_title(VirtViewer *viewer, gboolean grabbed); +void virt_viewer_enable_modifiers(VirtViewer *viewer); +void virt_viewer_disable_modifiers(VirtViewer *viewer); +void virt_viewer_add_display_and_realize(VirtViewer *viewer); +void virt_viewer_server_cut_text(VirtViewer *viewer, const gchar *text); +void virt_viewer_resize_main_window(VirtViewer *viewer); +void virt_viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channel); +void virt_viewer_quit(VirtViewer *viewer); + +void virt_viewer_simple_message_dialog(GtkWidget *window, const char *fmt, ...); #endif // _VIRT_VIEWER_PRIV_H /* diff --git a/src/util.c b/src/virt-viewer-util.c index 680c617..bda80a4 100644 --- a/src/util.c +++ b/src/virt-viewer-util.c @@ -27,9 +27,9 @@ #include <sys/stat.h> #include <unistd.h> -#include "util.h" +#include "virt-viewer-util.h" -GtkBuilder *viewer_load_ui(const char *name) +GtkBuilder *virt_viewer_util_load_ui(const char *name) { struct stat sb; GtkBuilder *builder; diff --git a/src/util.h b/src/virt-viewer-util.h index f9af8f7..2c067ad 100644 --- a/src/util.h +++ b/src/virt-viewer-util.h @@ -32,6 +32,6 @@ extern gboolean doDebug; #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) -GtkBuilder *viewer_load_ui(const char *name); +GtkBuilder *virt_viewer_util_load_ui(const char *name); #endif diff --git a/src/viewer.c b/src/virt-viewer.c index 27ea056..a8f6a6f 100644 --- a/src/viewer.c +++ b/src/virt-viewer.c @@ -45,14 +45,14 @@ #include <windows.h> #endif -#include "viewer.h" -#include "viewer-priv.h" -#include "events.h" -#include "auth.h" -#include "display-vnc.h" +#include "virt-viewer.h" +#include "virt-viewer-priv.h" +#include "virt-viewer-events.h" +#include "virt-viewer-auth.h" +#include "virt-viewer-display-vnc.h" #ifdef HAVE_SPICE_GTK -#include "display-spice.h" +#include "virt-viewer-display-spice.h" #endif #include "view/autoDrawer.h" @@ -61,18 +61,21 @@ gboolean doDebug = FALSE; -void viewer_menu_view_zoom_out(G_GNUC_UNUSED GtkWidget *menu, VirtViewer *viewer); -void viewer_menu_view_zoom_in(G_GNUC_UNUSED GtkWidget *menu, VirtViewer *viewer); -void viewer_menu_view_zoom_reset(G_GNUC_UNUSED GtkWidget *menu, VirtViewer *viewer); -void viewer_delete(GtkWidget *src G_GNUC_UNUSED, void *dummy G_GNUC_UNUSED, VirtViewer *viewer); -void viewer_menu_file_quit(GtkWidget *src G_GNUC_UNUSED, VirtViewer *viewer); -void viewer_about_close(GtkWidget *dialog, VirtViewer *viewer G_GNUC_UNUSED); -void viewer_about_delete(GtkWidget *dialog, void *dummy G_GNUC_UNUSED, VirtViewer *viewer G_GNUC_UNUSED); -void viewer_menu_help_about(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer); -void viewer_menu_view_fullscreen(GtkWidget *menu, VirtViewer *viewer); -void viewer_menu_view_resize(GtkWidget *menu, VirtViewer *viewer); -void viewer_menu_send(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer); -void viewer_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer); +/* Signal handlers for main window */ +void virt_viewer_menu_view_zoom_out(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_menu_view_zoom_in(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_menu_view_zoom_reset(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_delete(GtkWidget *src, void *dummy, VirtViewer *viewer); +void virt_viewer_menu_file_quit(GtkWidget *src, VirtViewer *viewer); +void virt_viewer_menu_help_about(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_menu_view_fullscreen(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_menu_view_resize(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_menu_send(GtkWidget *menu, VirtViewer *viewer); +void virt_viewer_menu_file_screenshot(GtkWidget *menu, VirtViewer *viewer); + +/* Signal handlers for about dialog */ +void virt_viewer_about_close(GtkWidget *dialog, VirtViewer *viewer); +void virt_viewer_about_delete(GtkWidget *dialog, void *dummy, VirtViewer *viewer); static const char * const menuNames[LAST_MENU] = { "menu-file", "menu-view", "menu-send", "menu-help" @@ -107,11 +110,13 @@ static const struct keyComboDef keyCombos[] = { }; -static gboolean viewer_connect_timer(void *opaque); -static int viewer_initial_connect(VirtViewer *viewer); +static gboolean virt_viewer_connect_timer(void *opaque); +static int virt_viewer_initial_connect(VirtViewer *viewer); -void viewer_simple_message_dialog(GtkWidget *window, const char *fmt, ...) +void +virt_viewer_simple_message_dialog(GtkWidget *window, + const char *fmt, ...) { GtkWidget *dialog; char *msg; @@ -139,7 +144,8 @@ void viewer_simple_message_dialog(GtkWidget *window, const char *fmt, ...) } -void viewer_add_display_and_realize(VirtViewer *viewer) +void +virt_viewer_add_display_and_realize(VirtViewer *viewer) { g_return_if_fail(viewer != NULL); g_return_if_fail(viewer->display != NULL); @@ -162,7 +168,7 @@ void viewer_add_display_and_realize(VirtViewer *viewer) * to later resize it smaller again */ static gboolean -viewer_unset_widget_size_cb(gpointer data) +virt_viewer_unset_widget_size_cb(gpointer data) { GtkWidget *widget = data; DEBUG_LOG("Unset requisition on widget=%p", widget); @@ -178,9 +184,9 @@ viewer_unset_widget_size_cb(gpointer data) * activated */ static gboolean -viewer_set_widget_size_cb(GtkWidget *widget, - GtkRequisition *req, - gpointer data) +virt_viewer_set_widget_size_cb(GtkWidget *widget, + GtkRequisition *req, + gpointer data) { VirtViewerSize *size = data; DEBUG_LOG("Set requisition on widget=%p to %dx%d", widget, size->width, size->height); @@ -188,9 +194,9 @@ viewer_set_widget_size_cb(GtkWidget *widget, req->width = size->width; req->height = size->height; - g_signal_handler_disconnect (widget, size->sig_id); - g_free (size); - g_idle_add (viewer_unset_widget_size_cb, widget); + g_signal_handler_disconnect(widget, size->sig_id); + g_free(size); + g_idle_add(virt_viewer_unset_widget_size_cb, widget); return FALSE; } @@ -200,10 +206,10 @@ viewer_set_widget_size_cb(GtkWidget *widget, * Registers a callback used to set the widget size once */ static void -viewer_set_widget_size(VirtViewer *viewer, - GtkWidget *widget, - int width, - int height) +virt_viewer_set_widget_size(VirtViewer *viewer, + GtkWidget *widget, + int width, + int height) { VirtViewerSize *size = g_new (VirtViewerSize, 1); DEBUG_LOG("Queue resize widget=%p width=%d height=%d", widget, width, height); @@ -212,7 +218,7 @@ viewer_set_widget_size(VirtViewer *viewer, size->height = height; size->sig_id = g_signal_connect (widget, "size-request", - G_CALLBACK (viewer_set_widget_size_cb), + G_CALLBACK (virt_viewer_set_widget_size_cb), size); gtk_widget_queue_resize (widget); @@ -225,7 +231,8 @@ viewer_set_widget_size(VirtViewer *viewer, * isn't large enough that it goes as large as possible and lets the display * scale down to fit, maintaining aspect ratio */ -void viewer_resize_main_window(VirtViewer *viewer) +void +virt_viewer_resize_main_window(VirtViewer *viewer) { GdkRectangle fullscreen; GdkScreen *screen; @@ -269,38 +276,46 @@ void viewer_resize_main_window(VirtViewer *viewer) SCALE(width); SCALE(height); - viewer_set_widget_size(viewer, + virt_viewer_set_widget_size(viewer, viewer->align, width, height); } -void viewer_menu_view_zoom_out(G_GNUC_UNUSED GtkWidget *menu, VirtViewer *viewer) +void +virt_viewer_menu_view_zoom_out(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer) { viewer->zoomlevel -= 10; if (viewer->zoomlevel < 10) viewer->zoomlevel = 10; - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } -void viewer_menu_view_zoom_in(G_GNUC_UNUSED GtkWidget *menu, VirtViewer *viewer) +void +virt_viewer_menu_view_zoom_in(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer) { viewer->zoomlevel += 10; if (viewer->zoomlevel > 200) viewer->zoomlevel = 200; - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } -void viewer_menu_view_zoom_reset(G_GNUC_UNUSED GtkWidget *menu, VirtViewer *viewer) +void +virt_viewer_menu_view_zoom_reset(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer) { viewer->zoomlevel = 100; - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } -void viewer_set_title(VirtViewer *viewer, gboolean grabbed) +void +virt_viewer_set_title(VirtViewer *viewer, + gboolean grabbed) { char *title; const char *subtitle; @@ -321,15 +336,17 @@ void viewer_set_title(VirtViewer *viewer, gboolean grabbed) g_free(title); } -static gboolean viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED, - VirtViewer *viewer G_GNUC_UNUSED) +static gboolean +virt_viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer G_GNUC_UNUSED) { /* ignore accelerator */ return TRUE; } -void viewer_disable_modifiers(VirtViewer *viewer) +void +virt_viewer_disable_modifiers(VirtViewer *viewer) { GtkSettings *settings = gtk_settings_get_default(); GValue empty; @@ -358,14 +375,15 @@ void viewer_disable_modifiers(VirtViewer *viewer) GtkWidget *menu = GTK_WIDGET(gtk_builder_get_object(viewer->builder, menuNames[i])); viewer->accelMenuSig[i] = g_signal_connect(menu, "mnemonic-activate", - G_CALLBACK(viewer_ignore_accel), viewer); + G_CALLBACK(virt_viewer_ignore_accel), viewer); } viewer->accelEnabled = FALSE; } -void viewer_enable_modifiers(VirtViewer *viewer) +void +virt_viewer_enable_modifiers(VirtViewer *viewer) { GtkSettings *settings = gtk_settings_get_default(); GSList *accels; @@ -394,7 +412,8 @@ void viewer_enable_modifiers(VirtViewer *viewer) viewer->accelEnabled = TRUE; } -void viewer_quit(VirtViewer *viewer) +void +virt_viewer_quit(VirtViewer *viewer) { g_return_if_fail(viewer != NULL); @@ -403,18 +422,24 @@ void viewer_quit(VirtViewer *viewer) gtk_main_quit(); } -void viewer_delete(GtkWidget *src G_GNUC_UNUSED, void *dummy G_GNUC_UNUSED, VirtViewer *viewer) +void +virt_viewer_delete(GtkWidget *src G_GNUC_UNUSED, + void *dummy G_GNUC_UNUSED, + VirtViewer *viewer) { - viewer_quit(viewer); + virt_viewer_quit(viewer); } -void viewer_menu_file_quit(GtkWidget *src G_GNUC_UNUSED, VirtViewer *viewer) +void +virt_viewer_menu_file_quit(GtkWidget *src G_GNUC_UNUSED, + VirtViewer *viewer) { - viewer_quit(viewer); + virt_viewer_quit(viewer); } -static void viewer_leave_fullscreen(VirtViewer *viewer) +static void +virt_viewer_leave_fullscreen(VirtViewer *viewer) { GtkWidget *menu = GTK_WIDGET(gtk_builder_get_object(viewer->builder, "top-menu")); if (!viewer->fullscreen) @@ -425,10 +450,11 @@ static void viewer_leave_fullscreen(VirtViewer *viewer) gtk_widget_hide(viewer->toolbar); gtk_window_unfullscreen(GTK_WINDOW(viewer->window)); if (viewer->autoResize) - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } -static void viewer_enter_fullscreen(VirtViewer *viewer) +static void +virt_viewer_enter_fullscreen(VirtViewer *viewer) { GtkWidget *menu = GTK_WIDGET(gtk_builder_get_object(viewer->builder, "top-menu")); if (viewer->fullscreen) @@ -441,39 +467,47 @@ static void viewer_enter_fullscreen(VirtViewer *viewer) } -static void viewer_toolbar_leave_fullscreen(GtkWidget *button G_GNUC_UNUSED, VirtViewer *viewer) +static void +virt_viewer_toolbar_leave_fullscreen(GtkWidget *button G_GNUC_UNUSED, + VirtViewer *viewer) { GtkWidget *menu = GTK_WIDGET(gtk_builder_get_object(viewer->builder, "menu-view-fullscreen")); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), FALSE); - viewer_leave_fullscreen(viewer); + virt_viewer_leave_fullscreen(viewer); } -void viewer_menu_view_fullscreen(GtkWidget *menu, VirtViewer *viewer) +void +virt_viewer_menu_view_fullscreen(GtkWidget *menu, + VirtViewer *viewer) { if (!viewer->window) return; if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu))) { - viewer_enter_fullscreen(viewer); + virt_viewer_enter_fullscreen(viewer); } else { - viewer_leave_fullscreen(viewer); + virt_viewer_leave_fullscreen(viewer); } } -void viewer_menu_view_resize(GtkWidget *menu, VirtViewer *viewer) +void +virt_viewer_menu_view_resize(GtkWidget *menu, + VirtViewer *viewer) { if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu))) { viewer->autoResize = TRUE; if (!viewer->fullscreen) - viewer_resize_main_window(viewer); + virt_viewer_resize_main_window(viewer); } else { viewer->autoResize = FALSE; } } -void viewer_menu_send(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer) +void +virt_viewer_menu_send(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer) { int i; GtkWidget *label = gtk_bin_get_child(GTK_BIN(menu)); @@ -492,7 +526,9 @@ void viewer_menu_send(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer) } -static void viewer_save_screenshot(VirtViewer *viewer, const char *file) +static void +virt_viewer_save_screenshot(VirtViewer *viewer, + const char *file) { GdkPixbuf *pix = virt_viewer_display_get_pixbuf(viewer->display); gdk_pixbuf_save(pix, file, "png", NULL, @@ -500,7 +536,10 @@ static void viewer_save_screenshot(VirtViewer *viewer, const char *file) gdk_pixbuf_unref(pix); } -void viewer_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer) + +void +virt_viewer_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer) { GtkWidget *dialog; @@ -521,28 +560,35 @@ void viewer_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *view char *filename; filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - viewer_save_screenshot(viewer, filename); + virt_viewer_save_screenshot(viewer, filename); g_free (filename); } gtk_widget_destroy (dialog); } -void viewer_about_close(GtkWidget *dialog, VirtViewer *viewer G_GNUC_UNUSED) +void +virt_viewer_about_close(GtkWidget *dialog, + VirtViewer *viewer G_GNUC_UNUSED) { gtk_widget_hide(dialog); gtk_widget_destroy(dialog); } -void viewer_about_delete(GtkWidget *dialog, void *dummy G_GNUC_UNUSED, VirtViewer *viewer G_GNUC_UNUSED) +void +virt_viewer_about_delete(GtkWidget *dialog, + void *dummy G_GNUC_UNUSED, + VirtViewer *viewer G_GNUC_UNUSED) { gtk_widget_hide(dialog); gtk_widget_destroy(dialog); } -void viewer_menu_help_about(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer) +void +virt_viewer_menu_help_about(GtkWidget *menu G_GNUC_UNUSED, + VirtViewer *viewer) { - GtkBuilder *about = viewer_load_ui("about.xml"); + GtkBuilder *about = virt_viewer_util_load_ui("virt-viewer-about.xml"); GtkWidget *dialog = GTK_WIDGET(gtk_builder_get_object(about, "about")); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION); @@ -555,8 +601,9 @@ void viewer_menu_help_about(GtkWidget *menu G_GNUC_UNUSED, VirtViewer *viewer) } - -static int viewer_parse_uuid(const char *name, unsigned char *uuid) +static int +virt_viewer_parse_uuid(const char *name, + unsigned char *uuid) { int i; @@ -597,7 +644,8 @@ static int viewer_parse_uuid(const char *name, unsigned char *uuid) } -static virDomainPtr viewer_lookup_domain(VirtViewer *viewer) +static virDomainPtr +virt_viewer_lookup_domain(VirtViewer *viewer) { char *end; int id = strtol(viewer->domkey, &end, 10); @@ -607,7 +655,7 @@ static virDomainPtr viewer_lookup_domain(VirtViewer *viewer) if (id >= 0 && end && !*end) { dom = virDomainLookupByID(viewer->conn, id); } - if (!dom && viewer_parse_uuid(viewer->domkey, uuid) == 0) { + if (!dom && virt_viewer_parse_uuid(viewer->domkey, uuid) == 0) { dom = virDomainLookupByUUID(viewer->conn, uuid); } if (!dom) { @@ -616,8 +664,9 @@ static virDomainPtr viewer_lookup_domain(VirtViewer *viewer) return dom; } -static int viewer_matches_domain(VirtViewer *viewer, - virDomainPtr dom) +static int +virt_viewer_matches_domain(VirtViewer *viewer, + virDomainPtr dom) { char *end; const char *name; @@ -629,7 +678,7 @@ static int viewer_matches_domain(VirtViewer *viewer, if (virDomainGetID(dom) == id) return 1; } - if (viewer_parse_uuid(viewer->domkey, wantuuid) == 0) { + if (virt_viewer_parse_uuid(viewer->domkey, wantuuid) == 0) { virDomainGetUUID(dom, domuuid); if (memcmp(wantuuid, domuuid, VIR_UUID_BUFLEN) == 0) return 1; @@ -642,7 +691,9 @@ static int viewer_matches_domain(VirtViewer *viewer, return 0; } -static char * viewer_extract_xpath_string(const gchar *xmldesc, const gchar *xpath) +static char * +virt_viewer_extract_xpath_string(const gchar *xmldesc, + const gchar *xpath) { xmlDocPtr xml = NULL; xmlParserCtxtPtr pctxt = NULL; @@ -687,7 +738,12 @@ static char * viewer_extract_xpath_string(const gchar *xmldesc, const gchar *xpa } -static int viewer_extract_host(const char *uristr, char **host, char **transport, char **user, int *port) +static int +virt_viewer_extract_host(const char *uristr, + char **host, + char **transport, + char **user, + int *port) { xmlURIPtr uri; char *offset; @@ -721,7 +777,8 @@ static int viewer_extract_host(const char *uristr, char **host, char **transport #if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK) -static int viewer_open_tunnel(const char **cmd) +static int +virt_viewer_open_tunnel(const char **cmd) { int fd[2]; pid_t pid; @@ -753,8 +810,13 @@ static int viewer_open_tunnel(const char **cmd) } -static int viewer_open_tunnel_ssh(const char *sshhost, int sshport, const char *sshuser, - const char *host, const char *port, const char *unixsock) +static int +virt_viewer_open_tunnel_ssh(const char *sshhost, + int sshport, + const char *sshuser, + const char *host, + const char *port, + const char *unixsock) { const char *cmd[10]; char portstr[50]; @@ -783,10 +845,11 @@ static int viewer_open_tunnel_ssh(const char *sshhost, int sshport, const char * } cmd[n++] = NULL; - return viewer_open_tunnel(cmd); + return virt_viewer_open_tunnel(cmd); } -static int viewer_open_unix_sock(const char *unixsock) +static int +virt_viewer_open_unix_sock(const char *unixsock) { struct sockaddr_un addr; int fd; @@ -808,7 +871,9 @@ static int viewer_open_unix_sock(const char *unixsock) #endif /* defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK) */ -static void viewer_trace(VirtViewer *viewer, const char *fmt, ...) +static void +virt_viewer_trace(VirtViewer *viewer, + const char *fmt, ...) { va_list ap; @@ -825,14 +890,18 @@ static void viewer_trace(VirtViewer *viewer, const char *fmt, ...) } } -void viewer_set_status(VirtViewer *viewer, const char *text) + +void +virt_viewer_set_status(VirtViewer *viewer, + const char *text) { gtk_notebook_set_current_page(GTK_NOTEBOOK(viewer->notebook), 0); gtk_label_set_text(GTK_LABEL(viewer->status), text); } -static void viewer_show_display(VirtViewer *viewer) +static void +virt_viewer_show_display(VirtViewer *viewer) { g_return_if_fail(viewer != NULL); g_return_if_fail(viewer->display != NULL); @@ -843,7 +912,8 @@ static void viewer_show_display(VirtViewer *viewer) gtk_notebook_set_current_page(GTK_NOTEBOOK(viewer->notebook), 1); } -static void viewer_connect_info_free(VirtViewer *viewer) +static void +virt_viewer_connect_info_free(VirtViewer *viewer) { free(viewer->host); free(viewer->ghost); @@ -861,53 +931,54 @@ static void viewer_connect_info_free(VirtViewer *viewer) viewer->port = 0; } -static gboolean viewer_extract_connect_info(VirtViewer *viewer, - virDomainPtr dom) +static gboolean +virt_viewer_extract_connect_info(VirtViewer *viewer, + virDomainPtr dom) { char *type = NULL; char *xpath = NULL; gboolean retval = FALSE; char *xmldesc = virDomainGetXMLDesc(dom, 0); - viewer_connect_info_free(viewer); + virt_viewer_connect_info_free(viewer); - if ((type = viewer_extract_xpath_string(xmldesc, "string(/domain/devices/graphics/@type)")) == NULL) { - viewer_simple_message_dialog(viewer->window, _("Cannot determine the graphic type for the guest %s"), + if ((type = virt_viewer_extract_xpath_string(xmldesc, "string(/domain/devices/graphics/@type)")) == NULL) { + virt_viewer_simple_message_dialog(viewer->window, _("Cannot determine the graphic type for the guest %s"), viewer->domkey); goto cleanup; } if (g_strcasecmp(type, "vnc") == 0) { - viewer_trace(viewer, "Guest %s has a %s display\n", + virt_viewer_trace(viewer, "Guest %s has a %s display\n", viewer->domkey, type); viewer->display = VIRT_VIEWER_DISPLAY(virt_viewer_display_vnc_new(viewer)); #ifdef HAVE_SPICE_GTK } else if (g_strcasecmp(type, "spice") == 0) { - viewer_trace(viewer, "Guest %s has a %s display\n", + virt_viewer_trace(viewer, "Guest %s has a %s display\n", viewer->domkey, type); viewer->display = VIRT_VIEWER_DISPLAY(virt_viewer_display_spice_new(viewer)); #endif } else { - viewer_trace(viewer, "Guest %s has unsupported %s display type\n", + virt_viewer_trace(viewer, "Guest %s has unsupported %s display type\n", viewer->domkey, type); - viewer_simple_message_dialog(viewer->window, _("Unknown graphic type for the guest %s"), + virt_viewer_simple_message_dialog(viewer->window, _("Unknown graphic type for the guest %s"), viewer->domkey); goto cleanup; } xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@port)", type); - if ((viewer->gport = viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { + if ((viewer->gport = virt_viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { free(xpath); xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@socket)", type); - if ((viewer->unixsock = viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { - viewer_simple_message_dialog(viewer->window, _("Cannot determine the graphic address for the guest %s"), + if ((viewer->unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { + virt_viewer_simple_message_dialog(viewer->window, _("Cannot determine the graphic address for the guest %s"), viewer->domkey); goto cleanup; } } else { free(xpath); xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@listen)", type); - viewer->ghost = viewer_extract_xpath_string(xmldesc, xpath); + viewer->ghost = virt_viewer_extract_xpath_string(xmldesc, xpath); if (viewer->ghost == NULL) viewer->ghost = g_strdup("localhost"); } @@ -917,8 +988,8 @@ static gboolean viewer_extract_connect_info(VirtViewer *viewer, else DEBUG_LOG("Guest graphics address is %s", viewer->unixsock); - if (viewer_extract_host(viewer->uri, &viewer->host, &viewer->transport, &viewer->user, &viewer->port) < 0) { - viewer_simple_message_dialog(viewer->window, _("Cannot determine the host for the guest %s"), + if (virt_viewer_extract_host(viewer->uri, &viewer->host, &viewer->transport, &viewer->user, &viewer->port) < 0) { + virt_viewer_simple_message_dialog(viewer->window, _("Cannot determine the host for the guest %s"), viewer->domkey); goto cleanup; } @@ -932,7 +1003,9 @@ cleanup: } #if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK) -void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channel) +void +virt_viewer_channel_open_fd(VirtViewer *viewer, + VirtViewerDisplayChannel *channel) { int fd = -1; @@ -941,25 +1014,27 @@ void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channe if (viewer->transport && g_strcasecmp(viewer->transport, "ssh") == 0 && !viewer->direct) { - if ((fd = viewer_open_tunnel_ssh(viewer->host, viewer->port, viewer->user, + if ((fd = virt_viewer_open_tunnel_ssh(viewer->host, viewer->port, viewer->user, viewer->ghost, viewer->gport, NULL)) < 0) - viewer_simple_message_dialog(viewer->window, _("Connect to ssh failed.")); + virt_viewer_simple_message_dialog(viewer->window, _("Connect to ssh failed.")); } else - viewer_simple_message_dialog(viewer->window, _("Can't connect to channel, SSH only supported.")); + virt_viewer_simple_message_dialog(viewer->window, _("Can't connect to channel, SSH only supported.")); if (fd >= 0) virt_viewer_display_channel_open_fd(viewer->display, channel, fd); } #else -void viewer_channel_open_fd(VirtViewer *viewer G_GNUC_UNUSED, +void +virt_viewer_channel_open_fd(VirtViewer *viewer G_GNUC_UNUSED, VirtViewerDisplayChannel *channel G_GNUC_UNUSED) { - viewer_simple_message_dialog(viewer->window, _("Connect to channel unsupported.")); + virt_viewer_simple_message_dialog(viewer->window, _("Connect to channel unsupported.")); } #endif -static int viewer_activate(VirtViewer *viewer, - virDomainPtr dom) +static int +virt_viewer_activate(VirtViewer *viewer, + virDomainPtr dom) { int fd = -1; int ret = -1; @@ -967,10 +1042,10 @@ static int viewer_activate(VirtViewer *viewer, if (viewer->active) goto cleanup; - viewer_trace(viewer, "Guest %s is running, determining display\n", + virt_viewer_trace(viewer, "Guest %s is running, determining display\n", viewer->domkey); if (viewer->display == NULL) { - if (!viewer_extract_connect_info(viewer, dom)) + if (!virt_viewer_extract_connect_info(viewer, dom)) goto cleanup; if (viewer->gport) @@ -983,27 +1058,24 @@ static int viewer_activate(VirtViewer *viewer, if (viewer->transport && g_strcasecmp(viewer->transport, "ssh") == 0 && !viewer->direct) { - char *dst; - if (viewer->gport) { - viewer_trace(viewer, "Opening indirect TCP connection to display at %s:%s\n", + virt_viewer_trace(viewer, "Opening indirect TCP connection to display at %s:%s\n", viewer->ghost, viewer->gport); } else { - viewer_trace(viewer, "Opening indirect UNIX connection to display at %s\n", + virt_viewer_trace(viewer, "Opening indirect UNIX connection to display at %s\n", viewer->unixsock); - dst = g_strdup(viewer->unixsock); } - viewer_trace(viewer, "Setting up SSH tunnel via %s@%s:%d\n", + virt_viewer_trace(viewer, "Setting up SSH tunnel via %s@%s:%d\n", viewer->user, viewer->host, viewer->port ? viewer->port : 22); - if ((fd = viewer_open_tunnel_ssh(viewer->host, viewer->port, + if ((fd = virt_viewer_open_tunnel_ssh(viewer->host, viewer->port, viewer->user, viewer->ghost, viewer->gport, viewer->unixsock)) < 0) return -1; } else if (viewer->unixsock) { - viewer_trace(viewer, "Opening direct UNIX connection to display at %s", + virt_viewer_trace(viewer, "Opening direct UNIX connection to display at %s", viewer->unixsock); - if ((fd = viewer_open_unix_sock(viewer->unixsock)) < 0) + if ((fd = virt_viewer_open_unix_sock(viewer->unixsock)) < 0) return -1; } #endif @@ -1011,35 +1083,38 @@ static int viewer_activate(VirtViewer *viewer, if (fd >= 0) { ret = virt_viewer_display_open_fd(viewer->display, fd); } else { - viewer_trace(viewer, "Opening direct TCP connection to display at %s:%s\n", + virt_viewer_trace(viewer, "Opening direct TCP connection to display at %s:%s\n", viewer->ghost, viewer->gport); ret = virt_viewer_display_open_host(viewer->display, viewer->ghost, viewer->gport); } - viewer_set_status(viewer, "Connecting to graphic server"); + virt_viewer_set_status(viewer, "Connecting to graphic server"); free(viewer->domtitle); viewer->domtitle = g_strdup(virDomainGetName(dom)); viewer->connected = FALSE; viewer->active = TRUE; - viewer_set_title(viewer, FALSE); + virt_viewer_set_title(viewer, FALSE); cleanup: return ret; } /* text was actually requested */ -static void viewer_vnc_clipboard_copy(GtkClipboard *clipboard G_GNUC_UNUSED, - GtkSelectionData *data, - guint info G_GNUC_UNUSED, - VirtViewer *viewer) +static void +virt_viewer_clipboard_copy(GtkClipboard *clipboard G_GNUC_UNUSED, + GtkSelectionData *data, + guint info G_GNUC_UNUSED, + VirtViewer *viewer) { gtk_selection_data_set_text(data, viewer->clipboard, -1); } -void viewer_server_cut_text(VirtViewer *viewer, const gchar *text) +void +virt_viewer_server_cut_text(VirtViewer *viewer, + const gchar *text) { GtkClipboard *cb; gsize a, b; @@ -1062,21 +1137,23 @@ void viewer_server_cut_text(VirtViewer *viewer, const gchar *text) gtk_clipboard_set_with_owner (cb, targets, G_N_ELEMENTS(targets), - (GtkClipboardGetFunc)viewer_vnc_clipboard_copy, + (GtkClipboardGetFunc)virt_viewer_clipboard_copy, NULL, G_OBJECT (viewer)); } } -static gboolean viewer_retryauth(gpointer opaque) +static gboolean +virt_viewer_retryauth(gpointer opaque) { VirtViewer *viewer = opaque; - viewer_initial_connect(viewer); + virt_viewer_initial_connect(viewer); return FALSE; } -static void viewer_deactivate(VirtViewer *viewer) +static void +virt_viewer_deactivate(VirtViewer *viewer) { if (!viewer->active) return; @@ -1090,72 +1167,76 @@ static void viewer_deactivate(VirtViewer *viewer) viewer->active = FALSE; g_free(viewer->pretty_address); viewer->pretty_address = NULL; - viewer_set_title(viewer, FALSE); + virt_viewer_set_title(viewer, FALSE); if (viewer->authretry) { viewer->authretry = FALSE; - g_idle_add(viewer_retryauth, viewer); + g_idle_add(virt_viewer_retryauth, viewer); } else if (viewer->reconnect) { if (!viewer->withEvents) { DEBUG_LOG("No domain events, falling back to polling"); g_timeout_add(500, - viewer_connect_timer, + virt_viewer_connect_timer, viewer); } - viewer_set_status(viewer, "Waiting for guest domain to re-start"); - viewer_trace(viewer, "Guest %s display has disconnected, waiting to reconnect", + virt_viewer_set_status(viewer, "Waiting for guest domain to re-start"); + virt_viewer_trace(viewer, "Guest %s display has disconnected, waiting to reconnect", viewer->domkey); } else { - viewer_set_status(viewer, "Guest domain has shutdown"); - viewer_trace(viewer, "Guest %s display has disconnected, shutting down", + virt_viewer_set_status(viewer, "Guest domain has shutdown"); + virt_viewer_trace(viewer, "Guest %s display has disconnected, shutting down", viewer->domkey); gtk_main_quit(); } } -void viewer_connected(VirtViewer *viewer) +void +virt_viewer_connected(VirtViewer *viewer) { viewer->connected = TRUE; - viewer_set_status(viewer, "Connected to graphic server"); + virt_viewer_set_status(viewer, "Connected to graphic server"); } -void viewer_initialized(VirtViewer *viewer) +void +virt_viewer_initialized(VirtViewer *viewer) { - viewer_show_display(viewer); - viewer_set_title(viewer, FALSE); + virt_viewer_show_display(viewer); + virt_viewer_set_title(viewer, FALSE); } -void viewer_disconnected(VirtViewer *viewer) +void +virt_viewer_disconnected(VirtViewer *viewer) { if (!viewer->connected) { - viewer_simple_message_dialog(viewer->window, _("Unable to connect to the graphic server %s"), + virt_viewer_simple_message_dialog(viewer->window, _("Unable to connect to the graphic server %s"), viewer->pretty_address); } - viewer_deactivate(viewer); + virt_viewer_deactivate(viewer); } -static int viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED, - virDomainPtr dom, - int event, - int detail G_GNUC_UNUSED, - void *opaque) +static int +virt_viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED, + virDomainPtr dom, + int event, + int detail G_GNUC_UNUSED, + void *opaque) { VirtViewer *viewer = opaque; DEBUG_LOG("Got domain event %d %d", event, detail); - if (!viewer_matches_domain(viewer, dom)) + if (!virt_viewer_matches_domain(viewer, dom)) return 0; - + switch (event) { case VIR_DOMAIN_EVENT_STOPPED: - viewer_deactivate(viewer); + virt_viewer_deactivate(viewer); break; case VIR_DOMAIN_EVENT_STARTED: - viewer_activate(viewer, dom); + virt_viewer_activate(viewer, dom); break; } @@ -1163,42 +1244,43 @@ static int viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED, } -static int viewer_initial_connect(VirtViewer *viewer) +static int +virt_viewer_initial_connect(VirtViewer *viewer) { virDomainPtr dom = NULL; virDomainInfo info; int ret = -1; - viewer_set_status(viewer, "Finding guest domain"); - dom = viewer_lookup_domain(viewer); + virt_viewer_set_status(viewer, "Finding guest domain"); + dom = virt_viewer_lookup_domain(viewer); if (!dom) { if (viewer->waitvm) { - viewer_set_status(viewer, "Waiting for guest domain to be created"); - viewer_trace(viewer, "Guest %s does not yet exist, waiting for it to be created\n", + virt_viewer_set_status(viewer, "Waiting for guest domain to be created"); + virt_viewer_trace(viewer, "Guest %s does not yet exist, waiting for it to be created\n", viewer->domkey); goto done; } else { - viewer_simple_message_dialog(viewer->window, _("Cannot find guest domain %s"), + virt_viewer_simple_message_dialog(viewer->window, _("Cannot find guest domain %s"), viewer->domkey); DEBUG_LOG("Cannot find guest %s", viewer->domkey); goto cleanup; } } - viewer_set_status(viewer, "Checking guest domain status"); + virt_viewer_set_status(viewer, "Checking guest domain status"); if (virDomainGetInfo(dom, &info) < 0) { DEBUG_LOG("Cannot get guest state"); goto cleanup; } if (info.state == VIR_DOMAIN_SHUTOFF) { - viewer_set_status(viewer, "Waiting for guest domain to start"); + virt_viewer_set_status(viewer, "Waiting for guest domain to start"); } else { - ret = viewer_activate(viewer, dom); + ret = virt_viewer_activate(viewer, dom); if (ret < 0) { if (viewer->waitvm) { - viewer_set_status(viewer, "Waiting for guest domain to start server"); - viewer_trace(viewer, "Guest %s has not activated its display yet, waiting for it to start\n", + virt_viewer_set_status(viewer, "Waiting for guest domain to start server"); + virt_viewer_trace(viewer, "Guest %s has not activated its display yet, waiting for it to start\n", viewer->domkey); } else { DEBUG_LOG("Failed to activate viewer"); @@ -1219,14 +1301,15 @@ static int viewer_initial_connect(VirtViewer *viewer) return ret; } -static gboolean viewer_connect_timer(void *opaque) +static gboolean +virt_viewer_connect_timer(void *opaque) { VirtViewer *viewer = opaque; DEBUG_LOG("Connect timer fired"); if (!viewer->active && - viewer_initial_connect(viewer) < 0) + virt_viewer_initial_connect(viewer) < 0) gtk_main_quit(); if (viewer->active) @@ -1235,7 +1318,8 @@ static gboolean viewer_connect_timer(void *opaque) return TRUE; } -static void viewer_toolbar_setup(VirtViewer *viewer) +static void +virt_viewer_toolbar_setup(VirtViewer *viewer) { GtkWidget *button; @@ -1258,7 +1342,7 @@ static void viewer_toolbar_setup(VirtViewer *viewer) gtk_tool_item_set_is_important(GTK_TOOL_ITEM(button), TRUE); gtk_widget_show(GTK_WIDGET(button)); gtk_toolbar_insert(GTK_TOOLBAR(viewer->toolbar), GTK_TOOL_ITEM(button), 0); - g_signal_connect(button, "clicked", G_CALLBACK(viewer_toolbar_leave_fullscreen), viewer); + g_signal_connect(button, "clicked", G_CALLBACK(virt_viewer_toolbar_leave_fullscreen), viewer); viewer->layout = ViewAutoDrawer_New(); @@ -1272,21 +1356,23 @@ static void viewer_toolbar_setup(VirtViewer *viewer) } -static void viewer_error_func (void *data G_GNUC_UNUSED, virErrorPtr error G_GNUC_UNUSED) +static void +virt_viewer_error_func (void *data G_GNUC_UNUSED, + virErrorPtr error G_GNUC_UNUSED) { /* nada */ } int -viewer_start (const char *uri, - const char *name, - gint zoom, - gboolean direct, - gboolean waitvm, - gboolean reconnect, - gboolean verbose, - gboolean debug, - GtkWidget *container) +virt_viewer_start(const char *uri, + const char *name, + gint zoom, + gboolean direct, + gboolean waitvm, + gboolean reconnect, + gboolean verbose, + gboolean debug, + GtkWidget *container) { VirtViewer *viewer; GtkWidget *menu; @@ -1295,7 +1381,7 @@ viewer_start (const char *uri, virConnectAuth auth_libvirt = { .credtype = cred_types, .ncredtype = ARRAY_CARDINALITY(cred_types), - .cb = viewer_auth_libvirt_credentials, + .cb = virt_viewer_auth_libvirt_credentials, .cbdata = (void *)uri, }; @@ -1315,24 +1401,24 @@ viewer_start (const char *uri, g_value_init(&viewer->accelSetting, G_TYPE_STRING); - viewer_event_register(); + virt_viewer_events_register(); - virSetErrorFunc(NULL, viewer_error_func); + virSetErrorFunc(NULL, virt_viewer_error_func); - viewer_trace(viewer, "Opening connection to libvirt with URI %s\n", + virt_viewer_trace(viewer, "Opening connection to libvirt with URI %s\n", uri ? uri : "<null>"); viewer->conn = virConnectOpenAuth(uri, //virConnectAuthPtrDefault, &auth_libvirt, VIR_CONNECT_RO); if (!viewer->conn) { - viewer_simple_message_dialog(NULL, _("Unable to connect to libvirt with URI %s"), + virt_viewer_simple_message_dialog(NULL, _("Unable to connect to libvirt with URI %s"), uri ? uri : _("[none]")); return -1; } if (!container) { - viewer->builder = viewer_load_ui("viewer.xml"); + viewer->builder = virt_viewer_util_load_ui("virt-viewer.xml"); menu = GTK_WIDGET(gtk_builder_get_object(viewer->builder, "menu-view-resize")); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE); @@ -1357,7 +1443,7 @@ viewer_start (const char *uri, gtk_widget_show_all(GTK_WIDGET(container)); } else { GtkWidget *vbox = GTK_WIDGET(gtk_builder_get_object(viewer->builder, "viewer-box")); - viewer_toolbar_setup(viewer); + virt_viewer_toolbar_setup(viewer); //gtk_box_pack_end(GTK_BOX(vbox), viewer->toolbar, TRUE, TRUE, 0); //gtk_box_pack_end(GTK_BOX(vbox), viewer->notebook, TRUE, TRUE, 0); @@ -1378,11 +1464,11 @@ viewer_start (const char *uri, gtk_widget_show_all(viewer->window); } - if (viewer_initial_connect(viewer) < 0) + if (virt_viewer_initial_connect(viewer) < 0) return -1; if (virConnectDomainEventRegister(viewer->conn, - viewer_domain_event, + virt_viewer_domain_event, viewer, NULL) < 0) viewer->withEvents = FALSE; @@ -1393,7 +1479,7 @@ viewer_start (const char *uri, !viewer->active) { DEBUG_LOG("No domain events, falling back to polling"); g_timeout_add(500, - viewer_connect_timer, + virt_viewer_connect_timer, viewer); } diff --git a/src/viewer.h b/src/virt-viewer.h index 554a6e6..39bda5a 100644 --- a/src/viewer.h +++ b/src/virt-viewer.h @@ -23,16 +23,16 @@ #ifndef VIRT_VIEWER_H #define VIRT_VIEWER_H -#include "util.h" +#include "virt-viewer-util.h" -extern int viewer_start (const char *uri, - const char *name, - gint zoom, - gboolean direct, - gboolean waitvm, - gboolean reconnect, - gboolean verbose, - gboolean debug, - GtkWidget *container); +extern int virt_viewer_start(const char *uri, + const char *name, + gint zoom, + gboolean direct, + gboolean waitvm, + gboolean reconnect, + gboolean verbose, + gboolean debug, + GtkWidget *container); #endif /* VIRT_VIEWER_H */ diff --git a/src/viewer.xml b/src/virt-viewer.xml index 9241877..8f2eb0b 100644 --- a/src/viewer.xml +++ b/src/virt-viewer.xml @@ -5,7 +5,7 @@ <object class="GtkWindow" id="viewer"> <property name="default_width">400</property> <property name="default_height">400</property> - <signal name="delete_event" handler="viewer_delete"/> + <signal name="delete_event" handler="virt_viewer_delete"/> <child> <object class="GtkVBox" id="viewer-box"> <property name="visible">True</property> @@ -26,7 +26,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Screenshot</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_file_screenshot"/> + <signal name="activate" handler="virt_viewer_menu_file_screenshot"/> </object> </child> <child> @@ -40,7 +40,7 @@ <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="viewer_menu_file_quit"/> + <signal name="activate" handler="virt_viewer_menu_file_quit"/> </object> </child> </object> @@ -60,7 +60,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Full screen</property> <property name="use_underline">True</property> - <signal name="toggled" handler="viewer_menu_view_fullscreen"/> + <signal name="toggled" handler="virt_viewer_menu_view_fullscreen"/> </object> </child> <child> @@ -76,7 +76,7 @@ <property name="visible">True</property> <property name="label">gtk-zoom-in</property> <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="viewer_menu_view_zoom_in"/> + <signal name="activate" handler="virt_viewer_menu_view_zoom_in"/> </object> </child> <child> @@ -84,7 +84,7 @@ <property name="visible">True</property> <property name="label">gtk-zoom-out</property> <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="viewer_menu_view_zoom_out"/> + <signal name="activate" handler="virt_viewer_menu_view_zoom_out"/> </object> </child> <child> @@ -97,7 +97,7 @@ <property name="visible">True</property> <property name="label">gtk-zoom-100</property> <accelerator key="0" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="viewer_menu_view_zoom_reset"/> + <signal name="activate" handler="virt_viewer_menu_view_zoom_reset"/> </object> </child> </object> @@ -109,7 +109,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Automatically resize</property> <property name="use_underline">True</property> - <signal name="toggled" handler="viewer_menu_view_resize"/> + <signal name="toggled" handler="virt_viewer_menu_view_resize"/> </object> </child> </object> @@ -129,7 +129,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+_Del</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -137,7 +137,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+_Backspace</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -150,7 +150,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_1</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -158,7 +158,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_2</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -166,7 +166,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_3</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -174,7 +174,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_4</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -182,7 +182,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_5</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -190,7 +190,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_6</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -198,7 +198,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_7</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -206,7 +206,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_8</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -214,7 +214,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_9</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -222,7 +222,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F1_0</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -230,7 +230,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F11</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -238,7 +238,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F12</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> <child> @@ -251,7 +251,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">_PrintScreen</property> <property name="use_underline">True</property> - <signal name="activate" handler="viewer_menu_send"/> + <signal name="activate" handler="virt_viewer_menu_send"/> </object> </child> </object> @@ -272,7 +272,7 @@ <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="viewer_menu_help_about"/> + <signal name="activate" handler="virt_viewer_menu_help_about"/> </object> </child> </object> diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in index ec14bcf..f1aed0b 100644 --- a/virt-viewer.spec.in +++ b/virt-viewer.spec.in @@ -97,9 +97,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/ui/ -%{_datadir}/%{name}/ui/auth.xml -%{_datadir}/%{name}/ui/about.xml -%{_datadir}/%{name}/ui/viewer.xml +%{_datadir}/%{name}/ui/virt-viewer.xml +%{_datadir}/%{name}/ui/virt-viewer-auth.xml +%{_datadir}/%{name}/ui/virt-viewer-about.xml %{_mandir}/man1/%{name}* %if %{_with_plugin} |