Commit: 74a7bae47928022775830fb27bb433f621f3bb07 - phabrics (git)

Commit MetaInfo

• Révision: 74a7bae47928022775830fb27bb433f621f3bb07 (tree)
• l'heure: 2020-09-12 20:28:46
• Auteur: Ruben Agin <phabrics@phab...>
• Commiter: Ruben Agin

Message de Log

Checkpoint for final VNC code prep.

Change Summary

• delete: .gitignore
• modified: contrib/tme-0.8/configure.ac
• modified: contrib/tme-0.8/host/Makefile.am
• modified: contrib/tme-0.8/host/bsd/Makefile.am
• modified: contrib/tme-0.8/host/gtk/Makefile.am
• modified: contrib/tme-0.8/host/gtk/gtk-screen.c
• modified: contrib/tme-0.8/host/openvpn/Makefile.am
• modified: contrib/tme-0.8/host/rfb/Makefile.am
• modified: contrib/tme-0.8/host/rfb/rfb-display.c
• delete: contrib/tme-0.8/host/rfb/rfb-display.h
• modified: contrib/tme-0.8/host/tun/Makefile.am
• delete: contrib/tme-0.8/host/{display => }/display-keyboard.c
• delete: contrib/tme-0.8/host/{display => }/display-mouse.c
• delete: contrib/tme-0.8/host/{display => }/display.c
• delete: contrib/tme-0.8/host/{display => }/display.h
• delete: contrib/tme-0.8/host/{display => }/keymap-def.h
• delete: contrib/tme-0.8/host/{display => }/keymap-make.pl
• delete: contrib/tme-0.8/host/{eth => }/eth-if.h
• delete: contrib/tme-0.8/host/{eth => }/eth-impl.c

Modification

--- a/.gitignore
+++ /dev/null
@@ -1,72 +0,0 @@
-syntax: glob
-INSTALL
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.*
-configure
-depcomp
-install-sh
-libltdl
-argz.m4
-libtool.m4
-ltargz.m4
-ltdl.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
-ltmain.sh
-missing
-ylwrap
-Makefile
-.deps
-libtool
-stamp-h1
-recode-host.*
-tmeconfig.h
-*.o
-*.lo
-*.a
-*.la
-*.lai
-*.so
-*.so.*
-bus-device-auto.c
-fb-xlat-auto.c
-float-auto.c
-ieee754-auto.h
-ieee754-misc-auto.c
-ieee754-ops-auto.c
-ieee754-ops-auto.h
-m6888x-auto.c
-m68k-auto.h
-m68k-bus-auto.c
-m68k-insns-auto.c
-m68k-opmap.c
-sparc-auto.h
-sparc-bus-auto.c
-sparc-fpu-auto.c
-sparc-insns-auto.c
-sparc-vis-auto.c
-memory-auto.c
-memory-auto.h
-shlibvar.h
-tme-sun-eeprom
-tme-sun-idprom
-tme-preopen.txt
-tme-plugins.txt
-.libs
-tmesh/tmesh
-tmesh-input.c
-TAGS
-build*
-*~
-./
-tmememory.h
-*.tex
-*.info
-mdate-sh
-stamp-vti
-version.texi

--- a/contrib/tme-0.8/configure.ac
+++ b/contrib/tme-0.8/configure.ac
@@ -765,14 +765,14 @@ AC_CHECK_DECLS(
 )
 CFLAGS="${old_CFLAGS}"
 
-tme_host_types="tun bsd openvpn posix gtk"
+tme_host_types="tun bsd openvpn posix gtk rfb"
 
 for tme_host_type in ${tme_host_types}; do
     eval enable_${tme_host_type}=no
 done
 
 AC_ARG_ENABLE(hosts,
-[  --enable-hosts=hosttypes         enable hosts (default="tun bsd openvpn posix gtk" if host supports)],
+[  --enable-hosts=hosttypes         enable hosts (default="tun bsd openvpn posix gtk rfb" if host supports)],
    [tme_host_types=${enableval}], [enable_hosts=yes])
 
 if test "x${enable_hosts}" = xno; then
@@ -783,6 +783,11 @@ for tme_host_type in ${tme_host_types}; do
     eval enable_${tme_host_type}=yes
 done
 
+AS_IF([test "x${enable_rfb}" = xyes], [
+   TME_HOSTS="rfb ${TME_HOSTS}"
+   PKG_CHECK_MODULES([RFB], [libvncserver])		   
+])
+
 AM_CONDITIONAL([USING_OPENVPN], [test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = xyes])
 if test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = xyes; then
    TME_HOSTS="openvpn ${TME_HOSTS}"
@@ -815,12 +820,13 @@ found_BPFVERSION
  fi])
 
 if test "x${TME_HOSTS}" != x; then
-   TME_HOSTS="eth ${TME_HOSTS}"
+   TME_HOSTS="${TME_HOSTS}"
 fi
 
 if test "x${enable_posix}" = xyes; then
    TME_HOSTS="posix ${TME_HOSTS}"
 fi
+
 AC_MSG_RESULT($TME_HOSTS)
 
 AC_SYS_POSIX_TERMIOS
@@ -1028,7 +1034,7 @@ dnl Checks for GTK.
 AM_PATH_GTK_3_0([], have_gtk=yes, have_gtk=no)
 if test "x$have_gtk" = xyes; then
    if test "x${enable_gtk}" = xyes; then
-      TME_HOSTS="gtk display ${TME_HOSTS}"
+      TME_HOSTS="gtk ${TME_HOSTS}"
    fi
    TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff"
 #   TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff d16b16s0p32olml_r0xf800_g0x07e0_b0x001f d8b8s0p32olml_r0xff_g0xff_b0xff d1b1s0p32olml_r0x1_g0x1_b0x1"
@@ -1602,10 +1608,9 @@ AC_CONFIG_FILES([Makefile
           host/Makefile
           host/openvpn/Makefile
           host/posix/Makefile
-          host/eth/Makefile
+          host/rfb/Makefile
           host/bsd/Makefile
           host/tun/Makefile
-          host/display/Makefile
           host/gtk/Makefile
           bus/Makefile
           bus/multibus/Makefile

--- a/contrib/tme-0.8/host/Makefile.am
+++ b/contrib/tme-0.8/host/Makefile.am
@@ -2,5 +2,27 @@
 # Makefile.am for The Machine Emulator host/:
 
 AUTOMAKE_OPTIONS = 1.4 gnu
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL $(GTK_CFLAGS)
+
+lib_LTLIBRARIES = libtme-host.la
+libtme_host_la_SOURCES = eth-impl.c eth-if.h display-mouse.c display-keyboard.c display.c display.h
+libtme_host_la_LIBADD = $(top_builddir)/generic/libtme-generic.la $(GTK_LIBS)
+
+EXTRA_DIST = keymap-make.pl keymap-def.h
+
+display-keyboard.lo:  keymap.h
+
+BUILT_SOURCES = keymap.h
+CLEANFILES = keymap.h
+if USING_X
+keymap.h: keymap-make.pl
+	  $(PERL) $< > $@
+else
+keymap.h: keymap-def.h
+	  cp $< $@
+endif
+
+include $(top_srcdir)/modules
+
 SUBDIRS = @TME_HOSTS@
-DIST_SUBDIRS = posix display gtk eth bsd tun openvpn
+DIST_SUBDIRS = posix gtk bsd tun openvpn rfb

--- a/contrib/tme-0.8/host/bsd/Makefile.am
+++ b/contrib/tme-0.8/host/bsd/Makefile.am
@@ -3,14 +3,14 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/../eth -I. -D_TME_IMPL
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I. -D_TME_IMPL
 
 pkglib_LTLIBRARIES = tme_host_bsd.la
 tme_host_bsd_la_SOURCES = bsd-bpf.c
 tme_host_bsd_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_bsd_la_LIBADD = ../eth/libeth.la
+tme_host_bsd_la_LIBADD = ../libtme-host.la
 include $(top_srcdir)/modules
-$(pkglib_LTLIBRARIES): ../eth/libeth.la
-../eth/libeth.la: force
+$(pkglib_LTLIBRARIES): ../libtme-host.la
+../libtme-host.la: force
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;

--- a/contrib/tme-0.8/host/display/display-keyboard.c
+++ b/contrib/tme-0.8/host/display-keyboard.c
@@ -463,7 +463,7 @@ _tme_keyboard_ctrl(struct tme_keyboard_connection *conn_keyboard,
 
   /* ring the bell: */
   if (ctrl & TME_KEYBOARD_CTRL_BELL) {
-    gdk_beep();
+    display->tme_display_bell(display);
   }
 
   return (TME_OK);

--- a/contrib/tme-0.8/host/display/display.h
+++ b/contrib/tme-0.8/host/display.h
@@ -40,7 +40,7 @@
 #include <tme/generic/fb.h>
 #include <tme/generic/keyboard.h>
 #include <tme/generic/mouse.h>
-#define TME_THREADS_GLIB
+#define TME_THREADS_POSIX
 #include <tme/threads.h>
 #include <tme/hash.h>
 
@@ -160,8 +160,9 @@ struct tme_display {
   int tme_screen_height;
   
   /* implementation-specific callback functions: */
-  struct tme_screen *(*tme_screen_add) _TME_P((struct tme_display *, struct tme_connection *));
+  int (*tme_display_bell) _TME_P((struct tme_display *));
   int (*tme_display_update) _TME_P((struct tme_display *));
+  struct tme_screen *(*tme_screen_add) _TME_P((struct tme_display *, struct tme_connection *));
   int (*tme_screen_resize) _TME_P((struct tme_screen *));
   int (*tme_screen_redraw) _TME_P((struct tme_screen *));
   int (*tme_screen_update) _TME_P((struct tme_screen *));

--- a/contrib/tme-0.8/host/gtk/Makefile.am
+++ b/contrib/tme-0.8/host/gtk/Makefile.am
@@ -3,15 +3,15 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/../display -I. -D_TME_IMPL $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I. -D_TME_IMPL $(GTK_CFLAGS)
 
 pkglib_LTLIBRARIES = tme_host_gtk.la
 tme_host_gtk_la_SOURCES = gtk-mouse.c gtk-keyboard.c gtk-screen.c gtk-display.h
 tme_host_gtk_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_gtk_la_LIBADD = ../display/libdisplay.la $(GTK_LIBS)
+tme_host_gtk_la_LIBADD = ../libtme-host.la
 
 include $(top_srcdir)/modules
-$(pkglib_LTLIBRARIES): ../display/libdisplay.la
-../display/libdisplay.la: force
+$(pkglib_LTLIBRARIES): ../libtme-host.la
+../libtme-host.la: force
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;

--- a/contrib/tme-0.8/host/gtk/gtk-screen.c
+++ b/contrib/tme-0.8/host/gtk/gtk-screen.c
@@ -40,13 +40,9 @@ _TME_RCSID("$Id: gtk-screen.c,v 1.11 2009/08/30 21:39:03 fredette Exp $");
 #include "gtk-display.h"
 #include <stdlib.h>
 
-/* this is called before the screen's display is updated: */
 static void
-_tme_gtk_screen_redraw(struct tme_gtk_screen *screen)
-{
-  cairo_surface_flush(screen->tme_gtk_screen_surface);
-  cairo_surface_mark_dirty(screen->tme_gtk_screen_surface);
-  gtk_widget_queue_draw(screen->tme_gtk_screen_gtkframe);
+_tme_gtk_display_bell(struct tme_gdk_display *display) {
+  gdk_display_bell(display->tme_gdk_display);
 }
 
 static int
@@ -319,6 +315,15 @@ _tme_gtk_screen_configure(GtkWidget         *widget,
   return TRUE;
 }
 
+/* this is called before the screen's display is updated: */
+static void
+_tme_gtk_screen_redraw(struct tme_gtk_screen *screen)
+{
+  cairo_surface_flush(screen->tme_gtk_screen_surface);
+  cairo_surface_mark_dirty(screen->tme_gtk_screen_surface);
+  gtk_widget_queue_draw(screen->tme_gtk_screen_gtkframe);
+}
+
 /* Redraw the screen from the surface. Note that the ::draw
  * signal receives a ready-to-be-used cairo_t that is already
  * clipped to only draw the exposed areas of the widget
@@ -356,7 +361,6 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
   struct tme_gtk_screen *screen;
   GdkDisplay *gdkdisplay;
   GdkDeviceManager *devices;
-  GdkRectangle workarea;
   GtkWidget *menu_bar;
   GtkWidget *menu;
   GtkWidget *submenu;
@@ -368,19 +372,6 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
 
   screen = tme_screen_new(display, struct tme_gtk_screen, conn);
 
-  display->tme_gdk_display = gdk_display_get_default();
-
-  display->tme_gdk_display_cursor
-    = gdk_cursor_new_for_display(display->tme_gdk_display, GDK_BLANK_CURSOR);
-
-  display->tme_gdk_display_seat = gdk_display_get_default_seat(display->tme_gdk_display);
-
-  display->tme_gdk_display_monitor = gdk_display_get_primary_monitor(display->tme_gdk_display);
-
-  gdk_monitor_get_workarea(display->tme_gdk_display_monitor, &workarea);
-
-  display->display.tme_screen_width = workarea.width;
-  display->display.tme_screen_height = workarea.height;
   screen->screen.tme_screen_scale = gdk_monitor_get_scale_factor(display->tme_gdk_display_monitor);
   
   /* create the top-level window, and allow it to shrink, grow,
@@ -547,7 +538,8 @@ _tme_display_menu_radio(struct tme_gtk_screen *screen,
 
 /* the new GTK display function: */
 TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
-  struct tme_display *display;
+  struct tme_gdk_display *display;
+  GdkRectangle workarea;
 
   /* start our data structure: */
   display = tme_new0(struct tme_gdk_display, 1);
@@ -558,11 +550,26 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
 
   _tme_gtk_init();
   
+  display->tme_gdk_display = gdk_display_get_default();
+
+  display->tme_gdk_display_cursor
+    = gdk_cursor_new_for_display(display->tme_gdk_display, GDK_BLANK_CURSOR);
+
+  display->tme_gdk_display_seat = gdk_display_get_default_seat(display->tme_gdk_display);
+
+  display->tme_gdk_display_monitor = gdk_display_get_primary_monitor(display->tme_gdk_display);
+
+  gdk_monitor_get_workarea(display->tme_gdk_display_monitor, &workarea);
+
+  display->display.tme_screen_width = workarea.width;
+  display->display.tme_screen_height = workarea.height;
+
   /* set the display-specific functions: */
-  display->tme_screen_add = _tme_gtk_screen_new;
-  display->tme_screen_resize = _tme_gtk_screen_resize;
-  display->tme_screen_redraw = _tme_gtk_screen_redraw;
-  display->tme_display_update = _tme_gtk_display_update;
+  display->display.tme_display_bell = _tme_gtk_display_bell;
+  display->display.tme_display_update = _tme_gtk_display_update;
+  display->display.tme_screen_add = _tme_gtk_screen_new;
+  display->display.tme_screen_resize = _tme_gtk_screen_resize;
+  display->display.tme_screen_redraw = _tme_gtk_screen_redraw;
 
   /* setup the thread loop function: */
   //tme_threads_init(NULL, gtk_main);

--- a/contrib/tme-0.8/host/openvpn/Makefile.am
+++ b/contrib/tme-0.8/host/openvpn/Makefile.am
@@ -3,18 +3,18 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/../eth -I. -D_TME_IMPL
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I. -D_TME_IMPL
 
 pkglib_LTLIBRARIES = tme_host_openvpn.la
 tme_host_openvpn_la_SOURCES = \
 	openvpn-link.c \
 	openvpn-tap.c
-tme_host_openvpn_la_LIBADD = ../eth/libeth.la
+tme_host_openvpn_la_LIBADD = ../libtme-host.la
 tme_host_openvpn_la_LDFLAGS = -module -version-info 0:0:0
 
 include $(top_srcdir)/modules
 
-$(pkglib_LTLIBRARIES): ../eth/libeth.la
-../eth/libeth.la: force
+$(pkglib_LTLIBRARIES): ../libtme-host.la
+../libtme-host.la: force
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;

--- a/contrib/tme-0.8/host/rfb/Makefile.am
+++ b/contrib/tme-0.8/host/rfb/Makefile.am
@@ -3,15 +3,15 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/../display -I. -D_TME_IMPL $(RFB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I. -D_TME_IMPL $(RFB_CFLAGS)
 
 pkglib_LTLIBRARIES = tme_host_rfb.la
-tme_host_rfb_la_SOURCES = rfb-display.c rfb-display.h
+tme_host_rfb_la_SOURCES = rfb-display.c
 tme_host_rfb_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_rfb_la_LIBADD = ../display/libdisplay.la $(RFB_LIBS)
+tme_host_rfb_la_LIBADD = ../libtme-host.la $(RFB_LIBS)
 
 include $(top_srcdir)/modules
-$(pkglib_LTLIBRARIES): ../display/libdisplay.la
-../display/libdisplay.la: force
+$(pkglib_LTLIBRARIES): ../libtme-host.la
+../libtme-host.la: force
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;

--- a/contrib/tme-0.8/host/rfb/rfb-display.c
+++ b/contrib/tme-0.8/host/rfb/rfb-display.c
@@ -36,15 +36,27 @@
 #include <tme/common.h>
 
 /* includes: */
-#include "rfb-display.h"
+#include "display.h"
+#include <rfb/rfb.h>
 #include <stdlib.h>
 
+static const int bpp=4;
+static int maxx=800, maxy=600;
+/* TODO: odd maxx doesn't work (vncviewer bug) */
+
 typedef struct tme_rfb_screen {
   int tme_rfb_screen_mouse_buttons_last,
     tme_rfb_screen_mouse_warp_x,
     tme_rfb_screen_mouse_warp_y;
 } tme_rfb_screen;
 
+typedef struct tme_rfb_display {
+  /* the generic display structure */
+  struct tme_display display;
+
+  rfbScreenInfoPtr server;
+} tme_rfb_display;
+
 static void _tme_rfb_clientgone(rfbClientPtr cl)
 {
   free(cl->clientData);
@@ -58,6 +70,11 @@ static enum rfbNewClientAction _tme_rfb_newclient(rfbClientPtr cl)
   return RFB_CLIENT_ACCEPT;
 }
 
+static void
+_tme_rfb_display_bell(struct tme_rfb_display *display) {
+  rfbSendBell(display->server);
+}
+
 static int
 _tme_rfb_display_update(struct tme_display *display) {
   long usec;
@@ -77,83 +94,66 @@ _tme_rfb_screen_redraw(struct tme_screen *screen)
   struct tme_fb_connection *conn_fb = screen->tme_screen_fb;
   rfbScreenInfoPtr server = ((tme_rfb_display *)screen->tme_screen_display)->server;
   
-  if(conn_fb->tme_fb_connection_buffer == server->frameBuffer)
+  if((char *)conn_fb->tme_fb_connection_buffer == server->frameBuffer)
     rfbMarkRectAsModified(server, 0, 0,
 			  conn_fb->tme_fb_connection_width,
 			  conn_fb->tme_fb_connection_height);
 }
 
 /* switch to new framebuffer contents */
-static void _tme_rfb_screen_resize(struct tme_screen *screen, int width, int height)
+static void _tme_rfb_screen_resize(struct tme_screen *screen)
 {
   unsigned char *oldfb, *newfb;
   struct tme_fb_connection *conn_fb = screen->tme_screen_fb;
+  int width = conn_fb->tme_fb_connection_width;
+  int height = conn_fb->tme_fb_connection_height;
   rfbScreenInfoPtr server = ((tme_rfb_display *)screen->tme_screen_display)->server;
   
   newfb = (unsigned char*)tme_malloc(width * height * bpp);
-  if(!conn_fb->tme_fb_connection_buffer ||
-     conn_fb->tme_fb_connection_buffer == server->frameBuffer) {
-    oldfb = (unsigned char*)server->frameBuffer;
+  if((char *)conn_fb->tme_fb_connection_buffer == server->frameBuffer) {
     rfbNewFramebuffer(server, (char*)newfb, width, height, 8, 3, bpp);
-    free(oldfb);
-  } else
-    free(conn_fb->tme_fb_connection_buffer);
+  }
+  free(conn_fb->tme_fb_connection_buffer);
   conn_fb->tme_fb_connection_buffer = newfb;  
   /*** FIXME: Re-install cursor. ***/
 }
 
-/* Create a new surface of the appropriate size to store our scribbles */
-static gboolean
-_tme_rfb_screen_configure(RfbWidget         *widget,
-			  GdkEventConfigure *event,
-			  gpointer          _screen)
+/* this makes a new screen: */
+struct tme_screen *
+_tme_rfb_screen_new(struct tme_rfb_display *display,
+		    struct tme_connection *conn)
 {
-  struct tme_rfb_screen *screen;
-  struct tme_display *display;
-  GdkWindow *window;
-  int scale;
-  
-  screen = (struct tme_rfb_screen *) _screen;
-
-  /* get the display: */
-  display = screen->screen.tme_screen_display;
+  struct tme_screen *screen;
+  struct tme_fb_connection *conn_fb;
 
   /* lock our mutex: */
-  tme_mutex_lock(&display->tme_display_mutex);
+  tme_mutex_lock(&display->display.tme_display_mutex);
 
-  cairo_surface_destroy(screen->tme_rfb_screen_surface);
+  screen = tme_screen_new(display, struct tme_screen, conn);
 
-  window = rfb_widget_get_window(screen->tme_rfb_screen_rfbframe);
+  screen->tme_screen_scale = 1;
   
-  screen->screen.tme_screen_scale = gdk_window_get_scale_factor(window);
-  
-  screen->tme_rfb_screen_surface
-    = gdk_window_create_similar_image_surface(window,
-					      screen->tme_rfb_screen_format,
-					      gdk_window_get_width(window) * screen->screen.tme_screen_scale,
-					      gdk_window_get_height(window) * screen->screen.tme_screen_scale,
-					      screen->screen.tme_screen_scale);
-
-  conn_fb = screen->screen.tme_screen_fb;
+  conn_fb = screen->tme_screen_fb;
 
   /* update our framebuffer connection: */
   conn_fb->tme_fb_connection_skipx = 0;
-  conn_fb->tme_fb_connection_scanline_pad = _tme_rfb_scanline_pad(cairo_image_surface_get_stride(screen->tme_rfb_screen_surface));
+  conn_fb->tme_fb_connection_scanline_pad = bpp;
   conn_fb->tme_fb_connection_order = TME_ENDIAN_NATIVE;
-  conn_fb->tme_fb_connection_buffer = cairo_image_surface_get_data(screen->tme_rfb_screen_surface);
-  conn_fb->tme_fb_connection_buffsz = cairo_image_surface_get_stride(screen->tme_rfb_screen_surface) * conn_fb->tme_fb_connection_height;
-  conn_fb->tme_fb_connection_bits_per_pixel = 16;
-  conn_fb->tme_fb_connection_depth = 16;
+  conn_fb->tme_fb_connection_bits_per_pixel = bpp * 8;
+  conn_fb->tme_fb_connection_depth = 24;
   conn_fb->tme_fb_connection_class = TME_FB_XLAT_CLASS_COLOR;
-  conn_fb->tme_fb_connection_mask_g = 0x0007e0;
-  conn_fb->tme_fb_connection_mask_b = 0x00001f;
-  conn_fb->tme_fb_connection_mask_r = 0x00f800;
+  conn_fb->tme_fb_connection_mask_g = 0x00ff00;
+  conn_fb->tme_fb_connection_mask_b = 0x0000ff;
+  conn_fb->tme_fb_connection_mask_r = 0xff0000;
+  display->server->frameBuffer = conn_fb->tme_fb_connection_buffer;
   
+  _tme_screen_configure(screen);
+
   /* unlock our mutex: */
-  tme_mutex_unlock(&display->tme_display_mutex);
+  tme_mutex_unlock(&display->display.tme_display_mutex);
 
   /* We've handled the configure event, no need for further processing. */
-  return TRUE;
+  return (screen);
 }
 
 /* this is a VNC callback for a key press or release event: */
@@ -181,8 +181,6 @@ _tme_rfb_key_event(rfbBool down, rfbKeySym key, rfbClientPtr cl)
   /* unlock the mutex: */
   tme_mutex_unlock(&display->tme_display_mutex);
 
-  /* don't process this event any further: */
-  return (TRUE);
 }
 
 /* this is a VNC callback for a mouse event: */
@@ -259,7 +257,7 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_rfb,display) {
   display = element->tme_element_private;
 
   /* allocate initial screen structure of the given size: */
-  server=rfbGetScreen(args, arg_i,maxx,maxy,8,3,4);
+  server=rfbGetScreen(&arg_i,args,maxx,maxy,8,3,bpp);
   if(!server)
     return 1;
   server->desktopName = "The Machine Emulator";
@@ -273,11 +271,15 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_rfb,display) {
   rfbInitServer(server);
   
   display->server = server;
+  display->display.tme_screen_width = maxx;
+  display->display.tme_screen_height = maxy;
+
   /* set the display-specific functions: */
-  // display->tme_screen_add = _tme_rfb_screen_new;
-  display->tme_screen_resize = _tme_rfb_screen_resize;
-  display->tme_screen_redraw = _tme_rfb_screen_redraw;
-  display->tme_display_update = _tme_rfb_display_update;
+  display->display.tme_display_bell = _tme_rfb_display_bell;
+  display->display.tme_display_update = _tme_rfb_display_update;
+  display->display.tme_screen_add = _tme_rfb_screen_new;
+  display->display.tme_screen_resize = _tme_rfb_screen_resize;
+  display->display.tme_screen_redraw = _tme_rfb_screen_redraw;
 
   return (TME_OK);
 }

--- a/contrib/tme-0.8/host/rfb/rfb-display.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* $Id: gtk-display.h,v 1.10 2009/08/28 01:29:47 fredette Exp $ */
-
-/* host/gtk/gtk-display.h - header file for GTK display support: */
-
-/*
- * Copyright (c) 2003 Matt Fredette
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Matt Fredette.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _HOST_GTK_DISPLAY_H
-#define _HOST_GTK_DISPLAY_H
-
-_TME_RCSID("$Id: gtk-display.h,v 1.10 2009/08/28 01:29:47 fredette Exp $");
-
-/* includes: */
-#include "display.h"
-#ifndef G_ENABLE_DEBUG
-#define G_ENABLE_DEBUG (0)
-#endif /* !G_ENABLE_DEBUG */
-#include <gtk/gtk.h>
-
-/* macros: */
-
-/* types: */
-
-/* a display: */
-struct tme_gdk_display {
-
-  /* the generic display structure */
-  struct tme_display display;
-
-  GdkDisplay *tme_gdk_display;
-  
-  GdkCursor *tme_gdk_display_cursor;
-
-  GdkSeat *tme_gdk_display_seat;
-
-  GdkMonitor *tme_gdk_display_monitor;
-};
-  
-/* a screen: */
-struct tme_gtk_screen {
-
-  /* the generic screen structure */
-  struct tme_screen screen;
-
-  rfbScreenInfoPtr server;
-  
-  /* the top-level window: */
-  GtkWidget *tme_gtk_screen_window;
-  
-  /* the outer vertical packing box: */
-  GtkWidget *tme_gtk_screen_vbox0;
-
-  /* the GtkWidget, GdkWindow & cairo_surface for the framebuffer: */
-  GtkWidget *tme_gtk_screen_gtkframe;
-  cairo_surface_t *tme_gtk_screen_surface;
-  cairo_format_t tme_gtk_screen_format;
-
-  /* the mouse on label: */
-  GtkWidget *tme_gtk_screen_mouse_label;
-
-  /* the status bar, and the context ID: */
-  GtkWidget *tme_gtk_screen_mouse_statusbar;
-  guint tme_gtk_screen_mouse_statusbar_cid;
-
-  /* if GDK_VoidSymbol, mouse mode is off.  otherwise,
-     mouse mode is on, and this is the keyval that will
-     turn mouse mode off: */
-  guint tme_gtk_screen_mouse_keyval;
-
-  /* when mouse mode is on, this is the previous events mask
-     for the framebuffer event box: */
-  GdkEventMask tme_gtk_screen_mouse_events_old;
-
-  /* when mouse mode is on, this is the warp center: */
-  gint tme_gtk_screen_mouse_warp_x;
-  gint tme_gtk_screen_mouse_warp_y;
-
-  /* when mouse mode is on, the last tme buttons state: */
-  unsigned int tme_gtk_screen_mouse_buttons_last;
-};
-
-/* a menu item: */
-struct tme_display_menu_item {
-  /* the string for the menu item label: */
-  const char *name;
-
-  GCallback menu_func;
-};
-
-/* prototypes: */
-void _tme_gtk_keyboard_attach _TME_P((struct tme_gtk_screen *));
-void _tme_gtk_mouse_attach _TME_P((struct tme_gtk_screen *));
-gint _tme_display_enter_focus _TME_P((GtkWidget *, GdkEvent *, gpointer));
-GtkWidget *_tme_display_menu_radio _TME_P((struct tme_gtk_screen *, struct tme_display_menu_item *, int num_items));
-
-#endif /* _HOST_GTK_DISPLAY_H */
-

--- a/contrib/tme-0.8/host/tun/Makefile.am
+++ b/contrib/tme-0.8/host/tun/Makefile.am
@@ -3,17 +3,16 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnu
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/../eth -I$(top_srcdir)/lib -I. -D_TME_IMPL -DDEV_TAP_FILENAME=@DEV_TAP_FILENAME@ $(NATINC)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/lib -I. -D_TME_IMPL -DDEV_TAP_FILENAME=@DEV_TAP_FILENAME@ $(NATINC)
 
 pkglib_LTLIBRARIES = tme_host_tun.la
 tme_host_tun_la_SOURCES = tun-tap.c
 tme_host_tun_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_tun_la_LIBADD = $(NATLIBS) \
-			 ../eth/libeth.la
+tme_host_tun_la_LIBADD = ../libtme-host.la $(NATLIBS)
 
 include $(top_srcdir)/modules
 
-$(pkglib_LTLIBRARIES): ../eth/libeth.la
-../eth/libeth.la: force
+$(pkglib_LTLIBRARIES): ../libtme-host.la
+../libtme-host.la: force
 	cd `dirname $@` && $(MAKE) `basename $@`
 force: ;