[gtk-vnc] Drop support for libview in example program

[Daniel P. Berrange <dberrange src gnome org>]

commit 05caeb007b491ee2ffa54fc0b456983f1c94f11b
Author: Daniel P. Berrangé <berrange redhat com>
Date:   Mon Aug 5 10:13:22 2019 +0100

    Drop support for libview in example program
    
    The libview project is abandonware with no commit upstream since 2011
    and no support for GTK3. Since we dropped GTK2 there's no reason to
    keep libview support.
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 configure.ac          | 18 ------------------
 examples/Makefile.am  |  5 ++---
 examples/gvncviewer.c | 39 ---------------------------------------
 3 files changed, 2 insertions(+), 60 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a27f54e..75236fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,6 @@ AC_SUBST(GCRYPT_REQUIRED)
 GNUTLS_REQUIRED=3.1.18
 AC_SUBST(GNUTLS_REQUIRED)
 
-VIEW_REQUIRED=0.6.0
 CAIRO_REQUIRED=1.2.0
 
 dnl *******************************************************************************
@@ -163,23 +162,6 @@ AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
 
-AC_ARG_WITH(libview,
-[  --with-libview          enable libview support in gvncviewer],
-[case "${withval}" in
-   yes|no) ;;
-   *)     AC_MSG_ERROR([bad value ${withval} for libview option]) ;;
- esac],[withval=yes])
-
-WITH_LIBVIEW=0
-if test "${withval}" = "yes"; then
-  PKG_CHECK_MODULES(VIEW, libview >= $VIEW_REQUIRED,
-                  [WITH_LIBVIEW=1], [WITH_LIBVIEW=0])
-fi
-AC_DEFINE_UNQUOTED([WITH_LIBVIEW],[$WITH_LIBVIEW], [Whether to use libview])
-AC_SUBST(VIEW_CFLAGS)
-AC_SUBST(VIEW_LIBS)
-
-
 AC_ARG_WITH(pulseaudio,
   [AS_HELP_STRING([--with-pulseaudio],
     [use PulseAudio for audio playback @<:@default=check@:>@])],
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 91f5aaa..59330c0 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,15 +9,14 @@ gvncviewer_SOURCES = gvncviewer.c
 gvncviewer_LDADD = ../src/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
                    ../src/libgvnc-1.0.la \
                   $(GIOUNIX_LIBS) \
-                  $(GTK_LIBS) \
-                  $(VIEW_LIBS)
+                  $(GTK_LIBS)
 if HAVE_PULSEAUDIO
 gvncviewer_LDADD += ../src/libgvncpulse-1.0.la
 endif
 gvncviewer_CFLAGS = $(GTK_CFLAGS) \
                    $(GIOUNIX_CFLAGS) \
                    $(WARN_CFLAGS) \
-                   $(VIEW_CFLAGS) -I$(top_srcdir)/src/
+                   -I$(top_srcdir)/src/
 
 EXTRA_DIST = gvncviewer.py gvncviewer.js gvncviewer.pl
 
diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
index 0af0ac3..b05b4f3 100644
--- a/examples/gvncviewer.c
+++ b/examples/gvncviewer.c
@@ -34,10 +34,6 @@
 #include <gio/gunixsocketaddress.h>
 #endif
 
-#if WITH_LIBVIEW
-#include <libview/autoDrawer.h>
-#endif
-
 #ifndef GDK_Return
 #define GDK_Return GDK_KEY_Return
 #endif
@@ -637,27 +633,6 @@ static void vnc_credential(GtkWidget *vncdisplay, GValueArray *credList)
         gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
-#if WITH_LIBVIEW
-static gboolean window_state_event(GtkWidget *widget,
-                                   GdkEventWindowState *event,
-                                   gpointer data)
-{
-    ViewAutoDrawer *drawer = VIEW_AUTODRAWER(data);
-
-    if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
-        if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
-            vnc_display_force_grab(VNC_DISPLAY(vnc), TRUE);
-            ViewAutoDrawer_SetActive(drawer, TRUE);
-        } else {
-            vnc_display_force_grab(VNC_DISPLAY(vnc), FALSE);
-            ViewAutoDrawer_SetActive(drawer, FALSE);
-        }
-    }
-
-    return FALSE;
-}
-#endif
-
 int main(int argc, char **argv)
 {
     gchar *name;
@@ -709,11 +684,7 @@ int main(int argc, char **argv)
     vnc = vnc_display_new();
 
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-#if WITH_LIBVIEW
-    layout = ViewAutoDrawer_New();
-#else
     layout = gtk_vbox_new(FALSE, 0);
-#endif
     menubar = gtk_menu_bar_new();
 
 #ifdef HAVE_PULSEAUDIO
@@ -777,14 +748,8 @@ int main(int argc, char **argv)
 
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(settings), submenu);
 
-#if WITH_LIBVIEW
-    ViewAutoDrawer_SetActive(VIEW_AUTODRAWER(layout), FALSE);
-    ViewOvBox_SetOver(VIEW_OV_BOX(layout), menubar);
-    ViewOvBox_SetUnder(VIEW_OV_BOX(layout), vnc);
-#else
     gtk_box_pack_start(GTK_BOX(layout), menubar, FALSE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(layout), vnc, TRUE, TRUE, 0);
-#endif
     gtk_container_add(GTK_CONTAINER(window), layout);
     gtk_widget_realize(vnc);
 
@@ -899,10 +864,6 @@ int main(int argc, char **argv)
                      G_CALLBACK(do_scaling), vnc);
     g_signal_connect(smoothing, "toggled",
                      G_CALLBACK(do_smoothing), vnc);
-#if WITH_LIBVIEW
-    g_signal_connect(window, "window-state-event",
-                     G_CALLBACK(window_state_event), layout);
-#endif
 
     gtk_main();