summaryrefslogtreecommitdiffstats
path: root/client_examples/gtkvncviewer.c
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2015-04-17 12:20:59 +0200
committerChristian Beier <dontmind@freeshell.org>2015-04-17 12:20:59 +0200
commit612de004c47586d74d5a93901a2d94ca1fc3f5e3 (patch)
treece4e63baee638a73ff142435f602b4032f4c2384 /client_examples/gtkvncviewer.c
parent107109492e37f0b508f55b5b4e4bd8dcfae3d0cf (diff)
downloadlibtdevnc-612de004c47586d74d5a93901a2d94ca1fc3f5e3.tar.gz
libtdevnc-612de004c47586d74d5a93901a2d94ca1fc3f5e3.zip
Revert "LibVNCClient: Add H.264 encoding for framebuffer updates"
This reverts commit d891478ec985660c03f95cffda0e6a1ad4ba350c. Conflicts: configure.ac libvncclient/h264.c
Diffstat (limited to 'client_examples/gtkvncviewer.c')
-rw-r--r--client_examples/gtkvncviewer.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c
index 861e4e3..bfe625e 100644
--- a/client_examples/gtkvncviewer.c
+++ b/client_examples/gtkvncviewer.c
@@ -23,10 +23,6 @@
#include <gdk/gdkkeysyms.h>
#include <rfb/rfbclient.h>
-#ifdef LIBVNCSERVER_CONFIG_LIBVA
-#include <gdk/gdkx.h>
-#endif
-
static rfbClient *cl;
static gchar *server_cut_text = NULL;
static gboolean framebuffer_allocated = FALSE;
@@ -61,14 +57,6 @@ static gboolean expose_event (GtkWidget *widget,
cl->format.greenMax = (1 << image->visual->green_prec) - 1;
cl->format.blueMax = (1 << image->visual->blue_prec) - 1;
-#ifdef LIBVNCSERVER_CONFIG_LIBVA
- /* Allow libvncclient to use a more efficient way
- * of putting the framebuffer on the screen when
- * using the H.264 format.
- */
- cl->outputWindow = GDK_WINDOW_XID(widget->window);
-#endif
-
SetFormatAndEncodings (cl);
framebuffer_allocated = TRUE;
@@ -79,14 +67,12 @@ static gboolean expose_event (GtkWidget *widget,
gdk_cursor_unref( cur );
}
-#ifndef LIBVNCSERVER_CONFIG_LIBVA
gdk_draw_image (GDK_DRAWABLE (widget->window),
widget->style->fg_gc[gtk_widget_get_state(widget)],
image,
event->area.x, event->area.y,
event->area.x, event->area.y,
event->area.width, event->area.height);
-#endif
return FALSE;
}
@@ -476,12 +462,10 @@ static void update (rfbClient *cl, int x, int y, int w, int h) {
dialog_connecting = NULL;
}
-#ifndef LIBVNCSERVER_CONFIG_LIBVA
GtkWidget *drawing_area = rfbClientGetClientData (cl, gtk_init);
if (drawing_area != NULL)
gtk_widget_queue_draw_area (drawing_area, x, y, w, h);
-#endif
}
static void kbd_leds (rfbClient *cl, int value, int pad) {