Update upstream source from tag 'upstream/1.3.0'

Update to upstream version '1.3.0' with Debian dir e2d7a2a8d23266f7a55ce6cc1cb8e8bd6f4de380
author: Peter Pentchev <roam@debian.org> 2021-12-30 19:40:39 +0200
committer: Peter Pentchev <roam@debian.org> 2021-12-30 19:40:39 +0200
commit: 45aa1b087c92fd42cb6c5d445b173071021772a7 (patch)
tree: 010d95847f14db998ca76fc99f78faf5c1f58a81
parent: ddd8983ed013f3f21de0caee464f49247d45a02a (diff)
parent: ec558e64f5b6b965c27cb0acee0f42e5c7a4e0e8 (diff)
23 files changed, 3040 insertions, 3147 deletions
diff --git a/ChangeLog b/ChangeLog
index fea105a..db95a7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,65 @@
+2020-10-31  Jose Antonio Ortega Ruiz  <jao@gnu.org>
+
+	NEWS for 1.3.0
+
+	New gendocs.sh version
+
+2020-10-20  Jose Antonio Ortega Ruiz  <jao@gnu.org>
+
+	Interface nits
+
+2020-10-19  Jose Antonio Ortega Ruiz  <jao@gnu.org>
+
+	goto address dialog
+
+	Year range in --version messages
+
+	Nit: Ctrl+q to quit
+
+	Version bump
+
+	First fully functional GTK3
+
+	Current line and breakpoint icons
+
+	Gimme back my fonts (deprecated)
+
+	Stock icon for quit app
+
+	attach/detach buttons
+
+2020-10-18  Jose Antonio Ortega Ruiz  <jao@gnu.org>
+
+	mixgtk_widget_factory_get_by_name
+
+	Show/hide toolbars
+
+	Toolbars visible again
+
+	gtk-builder-tool simplify
+
+	Use g_error_free
+
+	gtk_widget_reparent deprecation
+
+	G_INLINE_FUNC deprecated
+
+	Work in progress
+
+	Mirgration to GTK+3: widget lookup fixes
+
+	Mirgration to GTK+3: seemingly safe changes
+
+	mixal-mode.el synchronised with emacs's
+
+2020-10-16  Jose Antonio Ortega Ruiz  <jao@gnu.org>
+
+	Doc versions updates
+
 2020-10-15  Jose Antonio Ortega Ruiz  <jao@gnu.org>
 
+	Typo
+
 	Support for Guile 3.x
 
 	NEWS updated
diff --git a/NEWS b/NEWS
index f6bb2aa..bfb2084 100644
--- a/NEWS
+++ b/NEWS
@@ -8,16 +8,22 @@ See the end for copying conditions.
 Please send mdk bug reports to bug-mdk@gnu.org.
 
 ---------------------------------------------------------------------------
+* Version 1.3.0 (31/10/20)
+
+  - Graphical user interface upgraded to GTK+ 3.14+
+
+---------------------------------------------------------------------------
 * Version 1.2.11 (15/10/20)
 
 ** Bug fixes:
 
    - #55877: mixvm.el: obsolete string-to-int removed.
    - Read/write access to/from highest word of memory (patch #9773 by
-     Kevin Brunnelle).
+     Kevin Brunelle).
    - Correctly rewind tape when seeking past beginning of file (patch
      #9974 by Kevin Brunelle).
    - Memory usage optimizations (Kevin Brunelle).
+   - Compatibility with Guile 3.
 
 ---------------------------------------------------------------------------
 * Version 1.2.10 (07/01/19)
@@ -576,7 +582,7 @@ Please send mdk bug reports to bug-mdk@gnu.org.
 * Copying information:
 
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-              2010, 2013, 2014, 2015 Free Software Foundation, Inc.
+              2010, 2013, 2014, 2015, 2019, 2020 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/configure b/configure
index a7db77c..c4b061a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU MDK 1.2.11.
+# Generated by GNU Autoconf 2.69 for GNU MDK 1.3.0.
 #
 # Report bugs to <bug-mdk@gnu.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU MDK'
 PACKAGE_TARNAME='mdk'
-PACKAGE_VERSION='1.2.11'
-PACKAGE_STRING='GNU MDK 1.2.11'
+PACKAGE_VERSION='1.3.0'
+PACKAGE_STRING='GNU MDK 1.3.0'
 PACKAGE_BUGREPORT='bug-mdk@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/mdk/'
 
@@ -1388,7 +1388,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU MDK 1.2.11 to adapt to many kinds of systems.
+\`configure' configures GNU MDK 1.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1459,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU MDK 1.2.11:";;
+     short | recursive ) echo "Configuration of GNU MDK 1.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1583,7 +1583,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU MDK configure 1.2.11
+GNU MDK configure 1.3.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2189,7 +2189,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU MDK $as_me 1.2.11, which was
+It was created by GNU MDK $as_me 1.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3056,7 +3056,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mdk'
- VERSION='1.2.11'
+ VERSION='1.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10819,19 +10819,19 @@ fi
   if test x$wguile = xfalse; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.0 >= 2.0" >&5
-$as_echo_n "checking for guile-2.0 >= 2.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.2 >= 2.2" >&5
+$as_echo_n "checking for guile-2.2 >= 2.2... " >&6; }
 
 if test -n "$GUILE_CFLAGS"; then
     pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0 >= 2.0" 2>/dev/null`
+  pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.2 >= 2.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10843,12 +10843,12 @@ if test -n "$GUILE_LIBS"; then
     pkg_cv_GUILE_LIBS="$GUILE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0 >= 2.0" 2>/dev/null`
+  pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.2 >= 2.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10869,9 +10869,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1`
+	        GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.2 >= 2.2" 2>&1`
         else
-	        GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1`
+	        GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.2 >= 2.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GUILE_PKG_ERRORS" >&5
@@ -10891,19 +10891,19 @@ fi
     if test x$wguile = xfalse; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.2 >= 2.0" >&5
-$as_echo_n "checking for guile-2.2 >= 2.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.0 >= 2.0" >&5
+$as_echo_n "checking for guile-2.0 >= 2.0... " >&6; }
 
 if test -n "$GUILE_CFLAGS"; then
     pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.2 >= 2.0" 2>/dev/null`
+  pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0 >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10915,12 +10915,12 @@ if test -n "$GUILE_LIBS"; then
     pkg_cv_GUILE_LIBS="$GUILE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.2 >= 2.0" 2>/dev/null`
+  pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0 >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -10941,9 +10941,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.2 >= 2.0" 2>&1`
+	        GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1`
         else
-	        GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.2 >= 2.0" 2>&1`
+	        GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GUILE_PKG_ERRORS" >&5
@@ -10997,19 +10997,19 @@ fi
 if test x$gui = xtrue; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.14 pango >= 1.4" >&5
+$as_echo_n "checking for gtk+-3.0 >= 3.14 pango >= 1.4... " >&6; }
 
 if test -n "$GTK_CFLAGS"; then
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.14 pango >= 1.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.14 pango >= 1.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>/dev/null`
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.14 pango >= 1.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11021,12 +11021,12 @@ if test -n "$GTK_LIBS"; then
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.14 pango >= 1.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.14 pango >= 1.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>/dev/null`
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.14 pango >= 1.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11047,9 +11047,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.14 pango >= 1.4" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.14 pango >= 1.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
@@ -11675,7 +11675,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU MDK $as_me 1.2.11, which was
+This file was extended by GNU MDK $as_me 1.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11743,7 +11743,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU MDK config.status 1.2.11
+GNU MDK config.status 1.3.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ac57582..dcc187e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([GNU MDK],1.2.11,[bug-mdk@gnu.org],mdk)
+AC_INIT([GNU MDK],1.3.0,[bug-mdk@gnu.org],mdk)
 AC_CONFIG_SRCDIR([mixlib/mix.h])
 AM_INIT_AUTOMAKE
 
@@ -124,7 +124,7 @@ esac],[gui=true])
 
 dnl Check for gtk+
 if test x$gui = xtrue; then
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4,
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.14 pango >= 1.4,
                   [LIBS="$LIBS $GTK_LIBS" AM_CFLAGS="$AM_CFLAGS $GTK_CFLAGS"],
                   [AC_MSG_WARN(Cannot find GTK+/Glade/Pango: the GUI shall not be built)
                   gui=false])
diff --git a/doc/mdk.info b/doc/mdk.info
index 3579f97..4e0ded5 100644
--- a/doc/mdk.info
+++ b/doc/mdk.info
@@ -1,11 +1,11 @@
 This is mdk.info, produced by makeinfo version 6.7 from mdk.texi.
 
-This manual is for GNU MDK (version 1.2.9, November, 2015), a set of
+This manual is for GNU MDK (version 1.3.0, October, 2020), a set of
 utilities for developing programs using Donald Knuth's MIX mythical
 computer and MIXAL, its assembly language.
 
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-2010, 2013, 2014, 2015 Free Software Foundation, Inc.
+2010, 2013, 2014, 2015, 2020 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -26,12 +26,12 @@ END-INFO-DIR-ENTRY
 
 File: mdk.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 
-This manual is for GNU MDK (version 1.2.9, November, 2015), a set of
+This manual is for GNU MDK (version 1.3.0, October, 2020), a set of
 utilities for developing programs using Donald Knuth's MIX mythical
 computer and MIXAL, its assembly language.
 
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-2010, 2013, 2014, 2015 Free Software Foundation, Inc.
+2010, 2013, 2014, 2015, 2020 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -229,7 +229,7 @@ environment would come in handy.
    The MDK package aims at providing such virtual development
 environment on a GNU box.  Thus, MDK offers you a set of utilities to
 simulate the MIX computer and to write, compile, run and debug MIXAL
-programs.  As of version 1.2.9, MDK includes the following programs:
+programs.  As of version 1.3.0, MDK includes the following programs:
 
 'mixasm'
      MIXAL assembler.  Assembler which translates MIXAL source files
@@ -370,7 +370,7 @@ directory of your choice using the command:
      tar xfvz mdk-X.Y.tar.gz
 
 where X.Y stands for the downloaded version (the current stable release
-being version 1.2.9).
+being version 1.3.0).
 
 
 File: mdk.info,  Node: Download-Footnotes,  Up: Download
@@ -433,7 +433,7 @@ and, if they are present, will generate the appropriate makefiles for
 building the 'gmixvm' graphical user interface.  Upon completion, you
 should see a message with the configuration results like the following:
 
-     *** GNU MDK 1.2.9 has been successfully configured. ***
+     *** GNU MDK 1.3.0 has been successfully configured. ***
 
      Type 'make' to build the following utilities:
          - mixasm (MIX assembler)
@@ -5935,124 +5935,124 @@ Instructions and commands
 
 
 Tag Table:
-Node: Top1195
-Node: Introduction7405
-Node: Acknowledgments10309
-Node: Installing MDK12843
-Node: Download13117
-Node: Download-Footnotes13925
-Ref: Download-Footnote-113985
-Node: Requirements14186
-Node: Basic installation15479
-Node: Emacs support17007
-Node: Special configure flags18549
-Node: Supported platforms19787
-Node: Supported platforms-Footnotes21314
-Ref: Supported platforms-Footnote-121396
-Node: MIX and MIXAL tutorial21719
-Node: The MIX computer22672
-Node: MIX architecture22990
-Node: MIX instruction set28169
-Node: Instruction structure28929
-Node: Instruction structure-Footnotes31774
-Ref: Instruction structure-Footnote-131860
-Ref: Instruction structure-Footnote-232003
-Node: Loading operators32106
-Node: Storing operators34286
-Node: Arithmetic operators35702
-Node: Address transfer operators37268
-Node: Comparison operators39441
-Node: Jump operators40595
-Node: Input-output operators43460
-Node: Input-output operators-Footnotes44939
-Ref: Input-output operators-Footnote-145027
-Node: Conversion operators45345
-Node: Shift operators46746
-Node: Miscellaneous operators48309
-Node: Execution times48969
-Node: MIXAL50839
-Node: Basic structure52457
-Node: Basic structure-Footnotes55063
-Ref: Basic structure-Footnote-155137
-Ref: Basic structure-Footnote-255199
-Node: MIXAL directives55407
-Node: MIXAL directives-Footnotes60235
-Ref: MIXAL directives-Footnote-160311
-Node: Expressions60592
-Node: W-expressions62180
-Node: Local symbols65125
-Node: Local symbols-Footnotes66753
-Ref: Local symbols-Footnote-166823
-Node: Literal constants66939
-Node: Getting started67791
-Node: Writing a source file68632
-Node: Writing a source file-Footnotes71655
-Ref: Writing a source file-Footnote-171741
-Ref: Writing a source file-Footnote-271914
-Node: Compiling72360
-Node: Running the program73383
-Node: Non-interactive mode75172
-Node: Non-interactive mode-Footnotes77568
-Ref: Non-interactive mode-Footnote-177652
-Ref: Non-interactive mode-Footnote-277942
-Node: Interactive mode78096
-Node: Interactive mode-Footnotes81757
-Ref: Interactive mode-Footnote-181833
-Node: Debugging81948
-Node: Using mixguile85518
-Node: The mixguile shell86279
-Node: Additional functions88011
-Node: Defining new functions89709
-Node: Hook functions92958
-Node: Command hooks93462
-Node: Break hooks98381
-Node: Break hooks-Footnotes99535
-Ref: Break hooks-Footnote-199601
-Node: Scheme scripts99873
-Node: Using Scheme in mixvm and gmixvm101704
-Node: Emacs tools103392
-Node: MIXAL mode104184
-Node: MIXAL mode-Footnotes104884
-Ref: MIXAL mode-Footnote-1104948
-Node: Basics105024
-Node: Help system106060
-Node: Compiling and running106955
-Node: GUD integration107866
-Node: GUD integration-Footnotes108602
-Ref: GUD integration-Footnote-1108676
-Node: mixasm108892
-Node: Invoking mixasm109527
-Node: mixvm111377
-Node: Invocation112271
-Node: Commands114820
-Node: Commands-Footnotes116485
-Ref: Commands-Footnote-1116545
-Ref: Commands-Footnote-2116666
-Node: File commands116871
-Node: Debug commands119964
-Node: State commands129934
-Node: Configuration commands133387
-Node: Scheme commands136259
-Node: Devices137363
-Node: gmixvm140782
-Node: Invoking gmixvm141623
-Node: MIXVM console145485
-Node: MIX virtual machine147079
-Node: MIXAL source view148388
-Node: MIX devices view149225
-Node: Menu and status bars150301
-Node: mixguile154361
-Node: Invoking mixguile154997
-Node: Scheme functions reference157432
-Node: mixvm wrappers158439
-Node: Hooks162516
-Node: Additional VM functions165335
-Node: Problems169694
-Node: Copying170215
-Node: GNU General Public License170545
-Node: GNU Free Documentation License208113
-Node: Concept Index230512
-Node: Instructions and commands239822
+Node: Top1200
+Node: Introduction7415
+Node: Acknowledgments10319
+Node: Installing MDK12853
+Node: Download13127
+Node: Download-Footnotes13935
+Ref: Download-Footnote-113995
+Node: Requirements14196
+Node: Basic installation15489
+Node: Emacs support17017
+Node: Special configure flags18559
+Node: Supported platforms19797
+Node: Supported platforms-Footnotes21324
+Ref: Supported platforms-Footnote-121406
+Node: MIX and MIXAL tutorial21729
+Node: The MIX computer22682
+Node: MIX architecture23000
+Node: MIX instruction set28179
+Node: Instruction structure28939
+Node: Instruction structure-Footnotes31784
+Ref: Instruction structure-Footnote-131870
+Ref: Instruction structure-Footnote-232013
+Node: Loading operators32116
+Node: Storing operators34296
+Node: Arithmetic operators35712
+Node: Address transfer operators37278
+Node: Comparison operators39451
+Node: Jump operators40605
+Node: Input-output operators43470
+Node: Input-output operators-Footnotes44949
+Ref: Input-output operators-Footnote-145037
+Node: Conversion operators45355
+Node: Shift operators46756
+Node: Miscellaneous operators48319
+Node: Execution times48979
+Node: MIXAL50849
+Node: Basic structure52467
+Node: Basic structure-Footnotes55073
+Ref: Basic structure-Footnote-155147
+Ref: Basic structure-Footnote-255209
+Node: MIXAL directives55417
+Node: MIXAL directives-Footnotes60245
+Ref: MIXAL directives-Footnote-160321
+Node: Expressions60602
+Node: W-expressions62190
+Node: Local symbols65135
+Node: Local symbols-Footnotes66763
+Ref: Local symbols-Footnote-166833
+Node: Literal constants66949
+Node: Getting started67801
+Node: Writing a source file68642
+Node: Writing a source file-Footnotes71665
+Ref: Writing a source file-Footnote-171751
+Ref: Writing a source file-Footnote-271924
+Node: Compiling72370
+Node: Running the program73393
+Node: Non-interactive mode75182
+Node: Non-interactive mode-Footnotes77578
+Ref: Non-interactive mode-Footnote-177662
+Ref: Non-interactive mode-Footnote-277952
+Node: Interactive mode78106
+Node: Interactive mode-Footnotes81767
+Ref: Interactive mode-Footnote-181843
+Node: Debugging81958
+Node: Using mixguile85528
+Node: The mixguile shell86289
+Node: Additional functions88021
+Node: Defining new functions89719
+Node: Hook functions92968
+Node: Command hooks93472
+Node: Break hooks98391
+Node: Break hooks-Footnotes99545
+Ref: Break hooks-Footnote-199611
+Node: Scheme scripts99883
+Node: Using Scheme in mixvm and gmixvm101714
+Node: Emacs tools103402
+Node: MIXAL mode104194
+Node: MIXAL mode-Footnotes104894
+Ref: MIXAL mode-Footnote-1104958
+Node: Basics105034
+Node: Help system106070
+Node: Compiling and running106965
+Node: GUD integration107876
+Node: GUD integration-Footnotes108612
+Ref: GUD integration-Footnote-1108686
+Node: mixasm108902
+Node: Invoking mixasm109537
+Node: mixvm111387
+Node: Invocation112281
+Node: Commands114830
+Node: Commands-Footnotes116495
+Ref: Commands-Footnote-1116555
+Ref: Commands-Footnote-2116676
+Node: File commands116881
+Node: Debug commands119974
+Node: State commands129944
+Node: Configuration commands133397
+Node: Scheme commands136269
+Node: Devices137373
+Node: gmixvm140792
+Node: Invoking gmixvm141633
+Node: MIXVM console145495
+Node: MIX virtual machine147089
+Node: MIXAL source view148398
+Node: MIX devices view149235
+Node: Menu and status bars150311
+Node: mixguile154371
+Node: Invoking mixguile155007
+Node: Scheme functions reference157442
+Node: mixvm wrappers158449
+Node: Hooks162526
+Node: Additional VM functions165345
+Node: Problems169704
+Node: Copying170225
+Node: GNU General Public License170555
+Node: GNU Free Documentation License208123
+Node: Concept Index230522
+Node: Instructions and commands239832
 
 End Tag Table
 
diff --git a/doc/mdk.texi b/doc/mdk.texi
index 9fec7fa..32b5b84 100644
--- a/doc/mdk.texi
+++ b/doc/mdk.texi
@@ -7,9 +7,9 @@
 @setchapternewpage odd
 @c %**end of header
 
-@set UPDATED November, 2015
-@set EDITION 1.2.9
-@set VERSION 1.2.9
+@set UPDATED October, 2020
+@set EDITION 1.3.0
+@set VERSION 1.3.0
 @set JAO Jose Antonio Ortega Ruiz
 @set PHILIP Philip E. King
 @set PIETER Pieter E. J. Pareit
@@ -20,7 +20,7 @@ This manual is for GNU MDK (version @value{VERSION}, @value{UPDATED}),
 a set of utilities for developing programs using Donald Knuth's MIX
 mythical computer and MIXAL, its assembly language.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013, 2014, 2015 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013, 2014, 2015, 2020 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/mdk_gmixvm.texi b/doc/mdk_gmixvm.texi
index 2c29553..bc2bdc5 100644
--- a/doc/mdk_gmixvm.texi
+++ b/doc/mdk_gmixvm.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004, 2006
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006, 2020
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
@@ -70,7 +70,7 @@ debug your MIX programs.
 @end ifinfo
 
 @ifhtml
-@image{../img/ss_mix, 400pt}
+@image{img/ss_mix, 400pt}
 @end ifhtml
 
 Apart from the menu and status bars, we can distinguish two zones (or
@@ -98,7 +98,7 @@ notebook page) or the menu entries under @code{@w{View->Detached windows}}.
 Here is an screenshot showing how @code{gmixvm} looks like when running
 with a couple of detached windows:
 
-@image{../img/ss_split, 420pt}
+@image{img/ss_split, 420pt}
 
 @end ifhtml
 
@@ -178,7 +178,7 @@ contents.
 @ifhtml
 The next figure shows the enter word dialog.
 
-@image{../img/ss_worddlg, 250pt}
+@image{img/ss_worddlg, 250pt}
 
 @end ifhtml
 
@@ -203,7 +203,7 @@ The second notebook's page, dubbed Source, shows you the MIXAL source of
 the currently loaded MIX file.
 
 @ifhtml
-@image{../img/ss_mixal, 400pt}
+@image{img/ss_mixal, 400pt}
 @end ifhtml
 
 The information is presented in four columns. The first column
@@ -228,7 +228,7 @@ program.
 
 @ifhtml
 
-@image{../img/ss_devices, 400pt}
+@image{img/ss_devices, 400pt}
 
 @end ifhtml
 
@@ -303,7 +303,7 @@ list}}.
 
 @ifhtml
 
-@image{../img/ss_symbols, 250pt}
+@image{img/ss_symbols, 250pt}
 
 @end ifhtml
 
@@ -335,7 +335,7 @@ Opens a dialog that lets you specify which format shall be used to show
 the contents of MIX binary block devices.
 
 @ifhtml
-@image{../img/ss_devform, 250pt}
+@image{img/ss_devform, 250pt}
 @end ifhtml
 
 The available formats are decimal (e.g. @w{-1234}) and MIX word
@@ -347,7 +347,7 @@ Opens a dialog that lets you choose where the MIX device files will be
 stored (@file{~/.mdk} is the default location).
 
 @ifhtml
-@image{../img/ss_devdir, 250pt}
+@image{img/ss_devdir, 250pt}
 @end ifhtml
 
 You can also specify the devices directory using the @code{mixvm}
@@ -360,7 +360,7 @@ This menu command opens a dialog that lets you specify the commands used
 for editing and compiling MIXAL source files.
 
 @ifhtml
-@image{../img/ss_extprog, 250pt}
+@image{img/ss_extprog, 250pt}
 @end ifhtml
 
 The commands are specified as template strings, where the control
diff --git a/misc/mixal-mode.el b/misc/mixal-mode.el
index a2eaafb..b9f6059 100644
--- a/misc/mixal-mode.el
+++ b/misc/mixal-mode.el
@@ -1,43 +1,45 @@
-;;; mixal-mode.el --- Major mode for the mix asm language.
+;;; mixal-mode.el --- Major mode for the mix asm language.  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+;; Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 3 of
-;; the License, or (at your option) any later version.
+;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
+;; Maintainer: Jose A Ortega Ruiz <jao@gnu.org>
+;; Created: 09 Nov 2002
+;; Version: 0.4
+;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming
 
-;; This program is distributed in the hope that it will be
-;; useful, but WITHOUT ANY WARRANTY; without even the implied
-;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;; PURPOSE.  See the GNU General Public License for more details.
+;; This file is part of GNU Emacs.
 
-;; You should have received a copy of the GNU General Public
-;; License along with this program; if not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;; MA 02110-1301 USA
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
-;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
-;; Created: 09 Nov 2002
-;; Version: 0.1
-;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming"
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
+
 ;; Major mode for the mix asm language.
 ;; The mix asm language is described in "The Art Of Computer Programming".
 ;;
-;; For optimal use, also use GNU MDK. Compiling needs mixasm, running
-;; and debugging needs mixvm and mixvm.el from GNU MDK. You can get
+;; For optimal use, also use GNU MDK.  Compiling needs mixasm, running
+;; and debugging needs mixvm and mixvm.el from GNU MDK.  You can get
 ;; GNU MDK from `https://savannah.gnu.org/projects/mdk/' and
-;; `ftp://ftp.gnu.org/pub/gnu/mdk'.
+;; `https://ftp.gnu.org/pub/gnu/mdk'.
 ;;
-;; To use this mode, place the following in your .emacs file:
+;; To use this mode, place the following in your init file:
 ;; `(load-file "/PATH-TO-FILE/mixal-mode.el")'.
+;;
 ;; When you load a file with the extension .mixal the mode will be started
-;; automatic. If you want to start the mode manual, use `M-x mixal-mode'.
-;; Font locking will work, the behavior of tabs is the same as emacs
-;; default behavior. You can compile a source file with `C-c c' you can
+;; automatically.  If you want to start the mode manually, use `M-x mixal-mode'.
+;; Font locking will work, the behavior of tabs is the same as Emacs's
+;; default behavior.  You can compile a source file with `C-c c' you can
 ;; run a compiled file with `C-c r' or run it in debug mode with `C-c d'.
 ;; You can get more information about a particular operation code by using
 ;; mixal-describe-operation-code or `C-h o'.
@@ -45,7 +47,18 @@
 ;; Have fun.
 
 ;;; History:
+;; Version 0.4:
+;; 16/10/20: Jose A Ortega Ruiz <jao@gnu.org>
+;;           Add missed instructions: SLB,SRB,JAE,JAO,JXE,JXO
 ;; Version 0.3:
+;; 12/10/05: Stefan Monnier <monnier@iro.umontreal.ca>
+;;           Use font-lock-syntactic-keywords to detect/mark comments.
+;;           Use [^ \t\n]+ to match the operand part of a line.
+;;           Drop mixal-operation-codes.
+;;           Build the mixal-operation-codes-alist immediately.
+;;           Use `interactive' in mixal-describe-operation-code.
+;;           Remove useless ".*$" at the end of some regexps.
+;;           Fix the definition of comment-start-skip.
 ;; 08/10/05: sync mdk and emacs cvs
 ;;           from emacs: compile-command and require-final-newline
 ;;           from mdk:   see version 0.2
@@ -68,21 +81,23 @@
 ;;; Key map
 (defvar mixal-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "\C-cc" 'compile)
-    (define-key map "\C-cr" 'mixal-run)
-    (define-key map "\C-cd" 'mixal-debug)
-    (define-key map "\C-ho" 'mixal-describe-operation-code)
+    (define-key map "\C-c\C-c" 'compile)
+    (define-key map "\C-c\C-r" 'mixal-run)
+    (define-key map "\C-c\C-d" 'mixal-debug)
+    (define-key map "\C-h\C-o" 'mixal-describe-operation-code)
     map)
   "Keymap for `mixal-mode'.")
-; (makunbound 'mixal-mode-map)
+;; (makunbound 'mixal-mode-map)
 
 ;;; Syntax table
 (defvar mixal-mode-syntax-table
   (let ((st (make-syntax-table)))
-    ; (modify-syntax-entry ?* "<" st)    we need to do a bit more to make
-    ; (modify-syntax-entry ?\n ">" st)    fontlocking for comments work
+    ;; We need to do a bit more to make fontlocking for comments work.
+    ;; See use of syntax-propertize-function.
+    ;; (modify-syntax-entry ?* "<" st)
+    (modify-syntax-entry ?\n ">" st)
     st)
-  "Syntax table for `dot-mode'.")
+  "Syntax table for `mixal-mode'.")
 
 (defvar mixal-font-lock-label-face 'font-lock-variable-name-face
   "Face name to use for label names.
@@ -99,49 +114,9 @@ value.")
 Default value is that of `font-lock-builtin-face', but you can modify its
 value.")
 
-(defvar mixal-operation-codes
-  '("NOP" "ADD" "FADD" "SUB" "FSUB" "MUL" "FMUL" "DIV" "FDIV" "NUM" "CHAR"
-    "HLT" "SLA" "SRA" "SLAX" "SRAX" "SLC" "SRC" "SLB" "SRB" "MOVE" "LDA" "LD1" "LD2" "LD3"
-    "LD4" "LD5" "LD6" "LDX" "LDAN" "LD1N" "LD2N" "LD3N" "LD4N" "LD5N" "LD6N"
-    "LDXN" "STA" "ST1" "ST2" "ST3" "ST4" "ST5" "ST6" "STX" "STJ" "STZ" "JBUS"
-    "IOC" "IN" "OUT" "JRAD" "JMP" "JSJ" "JOV" "JNOV"
-    "JL" "JE" "JG" "JGE" "JNE" "JLE"
-    "JAN" "J1N" "J2N" "J3N" "J4N" "J5N" "J6N" "JXN"
-    "JAZ" "J1Z" "J2Z" "J3Z" "J4Z" "J5Z" "J6Z" "JXZ"
-    "JAP" "J1P" "J2P" "J3P" "J4P" "J5P" "J6P" "JXP"
-    "JANN" "J1NN" "J2NN" "J3NN" "J4NN" "J5NN" "J6NN" "JXNN"
-    "JANZ" "J1NZ" "J2NZ" "J3NZ" "J4NZ" "J5NZ" "J6NZ" "JXNZ"
-    "JANP" "J1NP" "J2NP" "J3NP" "J4NP" "J5NP" "J6NP" "JXNP"
-    "JAE"                                            "JXE"
-    "JAO"                                            "JXO"
-    "INCA" "DECA" "ENTA" "ENNA" "INC1" "DEC1" "ENT1" "ENN1"
-    "INC2" "DEC2" "ENT2" "ENN2" "INC3" "DEC3" "ENT3" "ENN3" "INC4" "DEC4"
-    "ENT4" "ENN4" "INC5" "DEC5" "ENT5" "ENN5" "INC6" "DEC6" "ENT6" "ENN6"
-    "INCX" "DECX" "ENTX" "ENNX" "CMPA" "FCMP" "CMP1" "CMP2" "CMP3" "CMP4"
-    "CMP5" "CMP6" "CMPX")
-  "List of possible operation codes as strings.")
-; (makunbound 'mixal-operation-codes)
-
 (defvar mixal-assembly-pseudoinstructions
   '("ORIG" "EQU" "CON" "ALF" "END")
-  "List of possible assembly pseudoinstructions")
-
-;;; Font-locking:
-(defvar mixal-font-lock-keywords
-  `(("^\\([A-Z0-9a-z]+\\).*$"
-     (1 mixal-font-lock-label-face))
-    (,(regexp-opt mixal-operation-codes 'words)
-     . mixal-font-lock-operation-code-face)
-    (,(regexp-opt
-       mixal-assembly-pseudoinstructions 'words)
-     . mixal-font-lock-assembly-pseudoinstruction-face)
-    ("^[A-Z0-9a-z]*[ \t]+[A-ZO-9a-z]+[ \t]+\\(=.*=\\).*$"
-     (1 font-lock-constant-face))
-    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[A-Z0-9a-z,():+-\\*=\" ]*[\t]+\\(.*\\)$"
-     (1 font-lock-comment-face))
-    ("^\\*.*$" . font-lock-comment-face))
-  "Keyword highlighting specification for `mixal-mode'.")
-; (makunbound 'mixal-font-lock-keywords)
+  "List of possible assembly pseudoinstructions.")
 
 ;;;; Compilation
 ;; Output from mixasm is compatible with default behavior of emacs,
@@ -151,1175 +126,988 @@ value.")
 ;; Tabs works well by default.
 
 ;;;; Describe
-(defvar mixal-operation-codes-alist '()
-  "Alist that contains all the possible operation codes for mix.
-Each elt has the form (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME)
-Where OP-CODE is the text of the opcode as an symbol, FULL-NAME is the human readable name
-as a string, C-BYTE is the operation code telling what operation is to be performed, F-BYTE holds
-an modification of the operation code which can be a symbol or a number, DESCRIPTION contains
-an string with a description about the operation code and EXECUTION-TIME holds info
-about the time it takes, number or string.")
-; (makunbound 'mixal-operation-codes-alist)
-
-(defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time)
-  "Add an operation code to the list that contains information about possible op code's."
-  (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte
-						description execution-time)
-					  mixal-operation-codes-alist )))
-
-;; now add each operation code
-
-(mixal-add-operation-code
- 'LDA 'loading "load A" 8 'field
- "Put in rA the contents of cell no. M.
+(defvar mixal-operation-codes-alist
+  ;; FIXME: the codes FADD, FSUB, FMUL, FDIV, JRAD, and FCMP were in
+  ;; mixal-operation-codes but not here.  They should probably be added here.
+  ;;
+  ;; We used to define this with a backquote and subexps like ,(+ 8 3) for
+  ;; better clarity, but the resulting code was too big and caused the
+  ;; byte-compiler to eat up all the stack space.  Even using
+  ;; `eval-when-compile' didn't help because the byte-compiler insists on
+  ;; compiling the code before evaluating it.
+  '((LDA loading "load A" 8 field
+         "Put in rA the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LDX 'loading "load X" 15 'field
- "Put in rX the contents of cell no. M.
+    (LDX loading "load X" 15 field
+         "Put in rX the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD1 'loading "load I1" (+ 8 1) 'field
- "Put in rI1 the contents of cell no. M.
+    (LD1 loading "load I1" 9 field
+         "Put in rI1 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
- 2)
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
+         2)
 
-(mixal-add-operation-code
- 'LD2 'loading "load I2" (+ 8 2) 'field
- "Put in rI2 the contents of cell no. M.
+    (LD2 loading "load I2" 10 field
+         "Put in rI2 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
- 2)
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
+         2)
 
-(mixal-add-operation-code
- 'LD3 'loading "load I3" (+ 8 3) 'field
- "Put in rI3 the contents of cell no. M.
+    (LD3 loading "load I3" 11 field
+         "Put in rI3 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
- 2)
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
+         2)
 
-(mixal-add-operation-code
- 'LD4 'loading "load I4" (+ 8 4) 'field
- "Put in rI4 the contents of cell no. M.
+    (LD4 loading "load I4" 12 field
+         "Put in rI4 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
- 2)
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
+         2)
 
-(mixal-add-operation-code
- 'LD5 'loading "load I5" (+ 8 5) 'field
- "Put in rI5 the contents of cell no. M.
+    (LD5 loading "load I5" 13 field
+         "Put in rI5 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
- 2)
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
+         2)
 
-(mixal-add-operation-code
- 'LD6 'loading "load I6" (+ 8 6) 'field
- "Put in rI6 the contents of cell no. M.
+    (LD6 loading "load I6" 14 field
+         "Put in rI6 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
- 2)
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
+         2)
 
-(mixal-add-operation-code
- 'LDAN 'loading "load A negative" 16 'field
- "Put in rA the contents of cell no. M, with opposite sign.
+    (LDAN loading "load A negative" 16 field
+          "Put in rA the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LDXN 'loading "load X negative" 23 'field
- "Put in rX the contents of cell no. M, with opposite sign.
+    (LDXN loading "load X negative" 23 field
+          "Put in rX the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD1N 'loading "load I1 negative" (+ 16 1) 'field
- "Put in rI1 the contents of cell no. M, with opposite sign.
+    (LD1N loading "load I1 negative" 17 field
+          "Put in rI1 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD2N 'loading "load I2 negative" (+ 16 2) 'field
- "Put in rI2 the contents of cell no. M, with opposite sign.
+    (LD2N loading "load I2 negative" 18 field
+          "Put in rI2 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD3N 'loading "load I3 negative" (+ 16 3) 'field
- "Put in rI3 the contents of cell no. M, with opposite sign.
+    (LD3N loading "load I3 negative" 19 field
+          "Put in rI3 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD4N 'loading "load I4 negative" (+ 16 4) 'field
- "Put in rI4 the contents of cell no. M, with opposite sign.
+    (LD4N loading "load I4 negative" 20 field
+          "Put in rI4 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD5N 'loading "load I5 negative" (+ 16 5) 'field
- "Put in rI5 the contents of cell no. M, with opposite sign.
+    (LD5N loading "load I5 negative" 21 field
+          "Put in rI5 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD6N 'loading "load I6 negative" (+ 16 6) 'field
- "Put in rI6 the contents of cell no. M, with opposite sign.
+    (LD6N loading "load I6 negative" 22 field
+          "Put in rI6 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'STA 'storing "store A" 24 'field
- "Store in cell Nr. M the contents of rA.
+    (STA storing "store A" 24 field
+         "Store in cell Nr. M the contents of rA.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'STX 'storing "store X" 31 'field
- "Store in cell Nr. M the contents of rX.
+    (STX storing "store X" 31 field
+         "Store in cell Nr. M the contents of rX.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ST1 'storing "store I1" (+ 24 1) 'field
- "Store in cell Nr. M the contents of rI1.
+    (ST1 storing "store I1" 25 field
+         "Store in cell Nr. M the contents of rI1.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield.
 Because index registers only have 2 bytes and a sign, the rest of the bytes
 are assumed to be 0."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ST2 'storing "store I2" (+ 24 2) 'field
- "Store in cell Nr. M the contents of rI2.
+    (ST2 storing "store I2" 26 field
+         "Store in cell Nr. M the contents of rI2.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield.
 Because index registers only have 2 bytes and a sign, the rest of the bytes
 are assumed to be 0."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ST3 'storing "store I3" (+ 24 3) 'field
- "Store in cell Nr. M the contents of rI3.
+    (ST3 storing "store I3" 27 field
+         "Store in cell Nr. M the contents of rI3.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield.
 Because index registers only have 2 bytes and a sign, the rest of the bytes
 are assumed to be 0."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ST4 'storing "store I4" (+ 24 4) 'field
- "Store in cell Nr. M the contents of rI4.
+    (ST4 storing "store I4" 28 field
+         "Store in cell Nr. M the contents of rI4.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield.
 Because index registers only have 2 bytes and a sign, the rest of the bytes
 are assumed to be 0."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ST5 'storing "store I5" (+ 24 5) 'field
- "Store in cell Nr. M the contents of rI5.
+    (ST5 storing "store I5" 29 field
+         "Store in cell Nr. M the contents of rI5.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield.
 Because index registers only have 2 bytes and a sign, the rest of the bytes
 are assumed to be 0."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ST6 'storing "store I6" (+ 24 6) 'field
- "Store in cell Nr. M the contents of rI6.
+    (ST6 storing "store I6" 30 field
+         "Store in cell Nr. M the contents of rI6.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The
 sign of the memory cell is not changed, unless it is part of the subfield.
 Because index registers only have 2 bytes and a sign, the rest of the bytes
 are assumed to be 0."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'STJ 'storing "store J" 32 'field
- "Store in cell Nr. M the contents of rJ.
+    (STJ storing "store J" 32 field
+         "Store in cell Nr. M the contents of rJ.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with bytes from a register. These
 bytes are taken beginning by the rightmost side of the register. The sign
 of rJ is always +, sign of the memory cell is not changed, unless it is
 part of the subfield. The default field for STJ is (0:2)."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'STZ 'storing "store zero" 33 'field
- "Store in cell Nr. M '+ 0'.
+    (STZ storing "store zero" 33 field
+         "Store in cell Nr. M `+ 0'.
 The modification of the operation code represents the subfield of the
 memory cell that is to be overwritten with zeros."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'ADD 'arithmetic "add" 1 'field
- "Add to A the contents of cell Nr. M.
+    (ADD arithmetic "add" 1 field
+         "Add to A the contents of cell Nr. M.
 Subfield is padded with zero to make a word.
 If the result is to large, the operation result modulo 1,073,741,823 (the
 maximum value storable in a MIX word) is stored in `rA', and the overflow
 toggle is set to TRUE."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'SUB 'arithmetic "subtract" 2 'field
- "Subtract to A the contents of cell Nr. M.
+    (SUB arithmetic "subtract" 2 field
+         "Subtract to A the contents of cell Nr. M.
 Subfield is padded with zero to make a word.
 If the result is to large, the operation result modulo 1,073,741,823 (the
 maximum value storable in a MIX word) is stored in `rA', and the overflow
 toggle is set to TRUE."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'MUL 'arithmetic "multiply" 3 'field
- "Multiplies the contents of cell Nr. M with A, result is 10 bytes and stored in rA and rX.
+    (MUL arithmetic "multiply" 3 field
+         "Multiplies the contents of cell Nr. M with A, result is 10 bytes and stored in rA and rX.
 The sign is + if the sign of rA and cell M where the same, otherwise, it is -"
- 10)
+         10)
 
-(mixal-add-operation-code
- 'DIV 'arithmetic "divide" 4 'field
- "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX.
+    (DIV arithmetic "divide" 4 field
+         "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX.
 The sign is taken from rA, and after the divide the sign of rA is set to + when
-both the sign of rA and M where the same. Divide by zero and overflow of rA result
-in undefined behavior."
- 12)
+both the sign of rA and M where the same. Divide by zero and overflow of rA
+result in undefined behavior."
+         12)
 
-(mixal-add-operation-code
- 'ENTA 'address-transfer "enter A" 48 2
- "Literal value is stored in rA.
+    (ENTA address-transfer "enter A" 48
+          "Literal value is stored in rA.
 Indexed, stores value of index in rA."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENTX 'address-transfer "enter X" 55 2
- "Literal value is stored in rX.
+    (ENTX address-transfer "enter X" 55
+          "Literal value is stored in rX.
 Indexed, stores value of index in rX."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENT1 'address-transfer "Enter rI1" (+ 48 1) 2
- "Literal value is stored in rI1.
+    (ENT1 address-transfer "Enter rI1" 49
+          "Literal value is stored in rI1.
 Indexed, stores value of index in rI1."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENT2 'address-transfer "Enter rI2" (+ 48 2) 2
- "Literal value is stored in rI2.
+    (ENT2 address-transfer "Enter rI2" 50
+          "Literal value is stored in rI2.
 Indexed, stores value of index in rI2."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENT3 'address-transfer "Enter rI3" (+ 48 3) 2
- "Literal value is stored in rI3.
+    (ENT3 address-transfer "Enter rI3" 51
+          "Literal value is stored in rI3.
 Indexed, stores value of index in rI3."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENT4 'address-transfer "Enter rI4" (+ 48 4) 2
- "Literal value is stored in rI4.
+    (ENT4 address-transfer "Enter rI4" 52
+          "Literal value is stored in rI4.
 Indexed, stores value of index in rI4."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENT5 'address-transfer "Enter rI5" (+ 48 5) 2
- "Literal value is stored in rI5.
+    (ENT5 address-transfer "Enter rI5" 53
+          "Literal value is stored in rI5.
 Indexed, stores value of index in rI5."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENT6 'address-transfer "Enter rI6" (+ 48 6) 2
- "Literal value is stored in rI6.
+    (ENT6 address-transfer "Enter rI6" 54
+          "Literal value is stored in rI6.
 Indexed, stores value of index in rI6."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENNA 'address-transfer "enter negative A" 48 3
- "Literal value is stored in rA with opposite sign.
+    (ENNA address-transfer "enter negative A" 48
+          "Literal value is stored in rA with opposite sign.
 Indexed, stores value of index in rA with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENNX 'address-transfer "enter negative X" 55 3
- "Literal value is stored in rX with opposite sign.
+    (ENNX address-transfer "enter negative X" 55
+          "Literal value is stored in rX with opposite sign.
 Indexed, stores value of index in rX with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENN1 'address-transfer "Enter negative rI1" (+ 48 1) 3
- "Literal value is stored in rI1 with opposite sign.
+    (ENN1 address-transfer "Enter negative rI1" 49
+          "Literal value is stored in rI1 with opposite sign.
 Indexed, stores value of index in rI1 with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENN2 'address-transfer "Enter negative rI2" (+ 48 2) 3
- "Literal value is stored in rI2 with opposite sign.
+    (ENN2 address-transfer "Enter negative rI2" 50
+          "Literal value is stored in rI2 with opposite sign.
 Indexed, stores value of index in rI2 with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENN3 'address-transfer "Enter negative rI3" (+ 48 3) 3
- "Literal value is stored in rI3 with opposite sign.
+    (ENN3 address-transfer "Enter negative rI3" 51
+          "Literal value is stored in rI3 with opposite sign.
 Indexed, stores value of index in rI3 with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENN4 'address-transfer "Enter negative rI4" (+ 48 4) 3
- "Literal value is stored in rI4 with opposite sign.
+    (ENN4 address-transfer "Enter negative rI4" 52
+          "Literal value is stored in rI4 with opposite sign.
 Indexed, stores value of index in rI4 with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENN5 'address-transfer "Enter negative rI5" (+ 48 5) 3
- "Literal value is stored in rI5 with opposite sign.
+    (ENN5 address-transfer "Enter negative rI5" 53
+          "Literal value is stored in rI5 with opposite sign.
 Indexed, stores value of index in rI5 with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'ENN6 'address-transfer "Enter negative rI6" (+ 48 6) 3
- "Literal value is stored in rI6 with opposite sign.
+    (ENN6 address-transfer "Enter negative rI6" 54
+          "Literal value is stored in rI6 with opposite sign.
 Indexed, stores value of index in rI6 with opposite sign."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INCA 'address-transfer "increase A" 48 0
- "Increase register A with the literal value of M.
+    (INCA address-transfer "increase A" 48
+          "Increase register A with the literal value of M.
 On overflow the overflow toggle is set."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INCX 'address-transfer "increase X" 55 0
- "Increase register X with the literal value of M.
+    (INCX address-transfer "increase X" 55
+          "Increase register X with the literal value of M.
 On overflow the overflow toggle is set."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INC1 'address-transfer "increase I1" (+ 48 1) 0
- "Increase register I1 with the literal value of M.
+    (INC1 address-transfer "increase I1" 49
+          "Increase register I1 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INC2 'address-transfer "increase I2" (+ 48 2) 0
- "Increase register I2 with the literal value of M.
+    (INC2 address-transfer "increase I2" 50
+          "Increase register I2 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INC3 'address-transfer "increase I3" (+ 48 3) 0
- "Increase register I3 with the literal value of M.
+    (INC3 address-transfer "increase I3" 51
+          "Increase register I3 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INC4 'address-transfer "increase I4" (+ 48 4) 0
- "Increase register I4 with the literal value of M.
+    (INC4 address-transfer "increase I4" 52
+          "Increase register I4 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INC5 'address-transfer "increase I5" (+ 48 5) 0
- "Increase register I5 with the literal value of M.
+    (INC5 address-transfer "increase I5" 53
+          "Increase register I5 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'INC6 'address-transfer "increase I6" (+ 48 6) 0
- "Increase register I6 with the literal value of M.
+    (INC6 address-transfer "increase I6" 54
+          "Increase register I6 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DECA 'address-transfer "decrease A" 48 1
- "Decrease register A with the literal value of M.
+    (DECA address-transfer "decrease A" 48
+          "Decrease register A with the literal value of M.
 On overflow the overflow toggle is set."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DECX 'address-transfer "decrease X" 55 1
- "Decrease register X with the literal value of M.
+    (DECX address-transfer "decrease X" 55
+          "Decrease register X with the literal value of M.
 On overflow the overflow toggle is set."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DEC1 'address-transfer "decrease I1" (+ 48 1) 1
- "Decrease register I1 with the literal value of M.
+    (DEC1 address-transfer "decrease I1" 49
+          "Decrease register I1 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DEC2 'address-transfer "decrease I2" (+ 48 2) 1
- "Decrease register I2 with the literal value of M.
+    (DEC2 address-transfer "decrease I2" 50
+          "Decrease register I2 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DEC3 'address-transfer "decrease I3" (+ 48 3) 1
- "Decrease register I3 with the literal value of M.
+    (DEC3 address-transfer "decrease I3" 51
+          "Decrease register I3 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DEC4 'address-transfer "decrease I4" (+ 48 4) 1
- "Decrease register I4 with the literal value of M.
+    (DEC4 address-transfer "decrease I4" 52
+          "Decrease register I4 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DEC5 'address-transfer "decrease I5" (+ 48 5) 1
- "Decrease register I5 with the literal value of M.
+    (DEC5 address-transfer "decrease I5" 53
+          "Decrease register I5 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'DEC6 'address-transfer "decrease I6" (+ 48 6) 1
- "Decrease register I6 with the literal value of M.
+    (DEC6 address-transfer "decrease I6" 54
+          "Decrease register I6 with the literal value of M.
 The result is undefined when the result does not fit in
 2 bytes."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'CMPA 'comparison "compare A" 56 'field
- "Compare contents of A with contents of M.
+    (CMPA comparison "compare A" 56 field
+          "Compare contents of A with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome."
- 2)
-
+          2)
 
-(mixal-add-operation-code
- 'CMPX 'comparison "compare X" 63 'field
- "Compare contents of rX with contents of M.
+    (CMPX comparison "compare X" 63 field
+          "Compare contents of rX with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome."
- 2)
-
+          2)
 
-(mixal-add-operation-code
- 'CMP1 'comparison "compare I1" (+ 56 1) 'field
- "Compare contents of rI1 with contents of M.
+    (CMP1 comparison "compare I1" 57 field
+          "Compare contents of rI1 with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 have a value of 0."
- 2)
+          2)
 
-
-(mixal-add-operation-code
- 'CMP2 'comparison "compare I2" (+ 56 2) 'field
- "Compare contents of rI2 with contents of M.
+    (CMP2 comparison "compare I2" 58 field
+          "Compare contents of rI2 with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 have a value of 0."
- 2)
-
+          2)
 
-(mixal-add-operation-code
- 'CMP3 'comparison "compare I3" (+ 56 3) 'field
- "Compare contents of rI3 with contents of M.
+    (CMP3 comparison "compare I3" 59 field
+          "Compare contents of rI3 with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 have a value of 0."
- 2)
-
+          2)
 
-(mixal-add-operation-code
- 'CMP4 'comparison "compare I4" (+ 56 4) 'field
- "Compare contents of rI4 with contents of M.
+    (CMP4 comparison "compare I4" 60 field
+          "Compare contents of rI4 with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 have a value of 0."
- 2)
+          2)
 
-
-(mixal-add-operation-code
- 'CMP5 'comparison "compare I5" (+ 56 5) 'field
- "Compare contents of rI5 with contents of M.
+    (CMP5 comparison "compare I5" 61 field
+          "Compare contents of rI5 with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 have a value of 0."
- 2)
-
+          2)
 
-(mixal-add-operation-code
- 'CMP6 'comparison "compare I6" (+ 56 6) 'field
- "Compare contents of rI6 with contents of M.
+    (CMP6 comparison "compare I6" 62 field
+          "Compare contents of rI6 with contents of M.
 The field specifier works on both fields. The comparison indicator
 is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 have a value of 0."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'JMP 'jump "jump" 39 0
- "Unconditional jump.
+    (JMP jump "jump" 39
+         "Unconditional jump.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'JSJ 'jump "jump, save J" 39 1
- "Unconditional jump, but rJ is not modified."
- 1)
+    (JSJ jump "jump, save J" 39
+         "Unconditional jump, but rJ is not modified."
+         1)
 
-(mixal-add-operation-code
- 'JOV 'jump "jump on overflow" 39 2
- "Jump if OV is set (and turn it off).
+    (JOV jump "jump on overflow" 39
+         "Jump if OV is set (and turn it off).
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'JNOV 'jump "Jump on no overflow" 39 3
- "Jump if OV is not set (and turn it off).
+    (JNOV jump "Jump on no overflow" 39
+          "Jump if OV is not set (and turn it off).
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'JL 'jump "Jump on less" 39 4
- "Jump if '[CM] = L'.
+    (JL jump "Jump on less" 39
+        "Jump if '[CM] = L'.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+        1)
 
-(mixal-add-operation-code
- 'JE 'jump "Jump on equal" 39 5
- "Jump if '[CM] = E'.
+    (JE jump "Jump on equal" 39
+        "Jump if '[CM] = E'.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+        1)
 
-
-(mixal-add-operation-code
- 'JG 'jump "Jump on greater" 39 6
- "Jump if '[CM] = G'.
+    (JG jump "Jump on greater" 39
+        "Jump if '[CM] = G'.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+        1)
 
-(mixal-add-operation-code
- 'JGE 'jump "Jump on not less" 39 7
- "Jump if '[CM]' does not equal 'L'.
+    (JGE jump "Jump on not less" 39
+         "Jump if '[CM]' does not equal 'L'.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'JNE 'jump "Jump on not equal" 39 8
- "Jump if '[CM]' does not equal 'E'.
+    (JNE jump "Jump on not equal" 39
+         "Jump if '[CM]' does not equal 'E'.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'JLE 'jump "Jump on not greater" 39 9
- "Jump if '[CM]' does not equal 'G'.
+    (JLE jump "Jump on not greater" 39
+         "Jump if '[CM]' does not equal 'G'.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'JAN 'jump "jump A negative" 40 0
- "Jump if the content of rA is negative.
+    (JAN jump "jump A negative" 40
+         "Jump if the content of rA is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'JAZ 'jump "jump A zero" 40 1
- "Jump if the content of rA is zero.
+    (JAZ jump "jump A zero" 40
+         "Jump if the content of rA is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'JAP 'jump "jump A positive" 40 2
- "Jump if the content of rA is positive.
+    (JAP jump "jump A positive" 40
+         "Jump if the content of rA is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'JANN 'jump "jump A non-negative" 40 3
- "Jump if the content of rA is non-negative.
+    (JANN jump "jump A non-negative" 40
+          "Jump if the content of rA is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'JANZ 'jump "jump A non-zero" 40 4
- "Jump if the content of rA is non-zero.
+    (JANZ jump "jump A non-zero" 40
+          "Jump if the content of rA is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'JANP 'jump "jump A non-positive" 40 5
- "Jump if the content of rA is non-positive.
+    (JANP jump "jump A non-positive" 40
+          "Jump if the content of rA is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'JAE 'jump "jump A even" 40 6
- "Jump if the content of rA is even.
+    (JAE jump "jump A even" 40
+          "Jump if the content of rA is even.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'JAO 'jump "jump A odd" 40 7
- "Jump if the content of rA is odd.
+    (JAO jump "jump A odd" 40
+         "Jump if the content of rA is odd.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'JXN 'jump "jump X negative" 47 0
- "Jump if the content of rX is negative.
+    (JXN jump "jump X negative" 47
+         "Jump if the content of rX is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'JXZ 'jump "jump X zero" 47 1
- "Jump if the content of rX is zero.
+    (JXZ jump "jump X zero" 47
+         "Jump if the content of rX is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'JXP 'jump "jump X positive" 47 2
- "Jump if the content of rX is positive.
+    (JXP jump "jump X positive" 47
+         "Jump if the content of rX is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'JXNN 'jump "jump X non-negative" 47 3
- "Jump if the content of rX is non-negative.
+    (JXNN jump "jump X non-negative" 47
+          "Jump if the content of rX is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'JXNZ 'jump "jump X non-zero" 47 4
- "Jump if the content of rX is non-zero.
+    (JXNZ jump "jump X non-zero" 47
+          "Jump if the content of rX is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'JXNP 'jump "jump X non-positive" 47 5
- "Jump if the content of rX is non-positive.
+    (JXNP jump "jump X non-positive" 47
+          "Jump if the content of rX is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'JXE 'jump "jump X even" 47 6
- "Jump if the content of rX is even.
+    (JXE jump "jump X even" 47
+         "Jump if the content of rX is even.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'JXO 'jump "jump X odd" 47 7
- "Jump if the content of rX is odd.
+    (JXO jump "jump X odd" 47
+         "Jump if the content of rX is odd.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'J1N 'jump "jump I1 negative" (+ 40 1) 0
- "Jump if the content of rI1 is negative.
+    (J1N jump "jump I1 negative" 41
+     "Jump if the content of rI1 is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+     1)
 
-(mixal-add-operation-code
- 'J1Z 'jump "jump I1 zero" (+ 40 1) 1
- "Jump if the content of rI1 is zero.
+    (J1Z jump "jump I1 zero" 41
+         "Jump if the content of rI1 is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'J1P 'jump "jump I1 positive" (+ 40 1) 2
- "Jump if the content of rI1 is positive.
+    (J1P jump "jump I1 positive" 41
+         "Jump if the content of rI1 is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J1NN 'jump "jump I1 non-negative" (+ 40 1) 3
- "Jump if the content of rI1 is non-negative.
+    (J1NN jump "jump I1 non-negative" 41
+          "Jump if the content of rI1 is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J1NZ 'jump "jump I1 non-zero" (+ 40 1) 4
- "Jump if the content of rI1 is non-zero.
+    (J1NZ jump "jump I1 non-zero" 41
+          "Jump if the content of rI1 is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'J1NP 'jump "jump I1 non-positive" (+ 40 1) 5
- "Jump if the content of rI1 is non-positive.
+    (J1NP jump "jump I1 non-positive" 41
+          "Jump if the content of rI1 is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'J2N 'jump "jump I2 negative" (+ 40 1) 0
- "Jump if the content of rI2 is negative.
+    (J2N jump "jump I2 negative" 41
+         "Jump if the content of rI2 is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J2Z 'jump "jump I2 zero" (+ 40 1) 1
- "Jump if the content of rI2 is zero.
+    (J2Z jump "jump I2 zero" 41
+         "Jump if the content of rI2 is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J2P 'jump "jump I2 positive" (+ 40 1) 2
- "Jump if the content of rI2 is positive.
+    (J2P jump "jump I2 positive" 41
+         "Jump if the content of rI2 is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'J2NN 'jump "jump I2 non-negative" (+ 40 1) 3
- "Jump if the content of rI2 is non-negative.
+    (J2NN jump "jump I2 non-negative" 41
+          "Jump if the content of rI2 is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J2NZ 'jump "jump I2 non-zero" (+ 40 1) 4
- "Jump if the content of rI2 is non-zero.
+    (J2NZ jump "jump I2 non-zero" 41
+          "Jump if the content of rI2 is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J2NP 'jump "jump I2 non-positive" (+ 40 1) 5
- "Jump if the content of rI2 is non-positive.
+    (J2NP jump "jump I2 non-positive" 41
+          "Jump if the content of rI2 is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'J3N 'jump "jump I3 negative" (+ 40 1) 0
- "Jump if the content of rI3 is negative.
+    (J3N jump "jump I3 negative" 41
+         "Jump if the content of rI3 is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J3Z 'jump "jump I3 zero" (+ 40 1) 1
- "Jump if the content of rI3 is zero.
+    (J3Z jump "jump I3 zero" 41
+         "Jump if the content of rI3 is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'J3P 'jump "jump I3 positive" (+ 40 1) 2
- "Jump if the content of rI3 is positive.
+    (J3P jump "jump I3 positive" 41
+         "Jump if the content of rI3 is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J3NN 'jump "jump I3 non-negative" (+ 40 1) 3
- "Jump if the content of rI3 is non-negative.
+    (J3NN jump "jump I3 non-negative" 41
+          "Jump if the content of rI3 is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'J3NZ 'jump "jump I3 non-zero" (+ 40 1) 4
- "Jump if the content of rI3 is non-zero.
+    (J3NZ jump "jump I3 non-zero" 41
+          "Jump if the content of rI3 is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J3NP 'jump "jump I3 non-positive" (+ 40 1) 5
- "Jump if the content of rI3 is non-positive.
+    (J3NP jump "jump I3 non-positive" 41
+          "Jump if the content of rI3 is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J4N 'jump "jump I4 negative" (+ 40 1) 0
- "Jump if the content of rI4 is negative.
+    (J4N jump "jump I4 negative" 41
+         "Jump if the content of rI4 is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'J4Z 'jump "jump I4 zero" (+ 40 1) 1
- "Jump if the content of rI4 is zero.
+    (J4Z jump "jump I4 zero" 41
+         "Jump if the content of rI4 is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J4P 'jump "jump I4 positive" (+ 40 1) 2
- "Jump if the content of rI4 is positive.
+    (J4P jump "jump I4 positive" 41
+         "Jump if the content of rI4 is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J4NN 'jump "jump I4 non-negative" (+ 40 1) 3
- "Jump if the content of rI4 is non-negative.
+    (J4NN jump "jump I4 non-negative" 41
+          "Jump if the content of rI4 is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'J4NZ 'jump "jump I4 non-zero" (+ 40 1) 4
- "Jump if the content of rI4 is non-zero.
+    (J4NZ jump "jump I4 non-zero" 41
+          "Jump if the content of rI4 is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J4NP 'jump "jump I4 non-positive" (+ 40 1) 5
- "Jump if the content of rI4 is non-positive.
+    (J4NP jump "jump I4 non-positive" 41
+          "Jump if the content of rI4 is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J5N 'jump "jump I5 negative" (+ 40 1) 0
- "Jump if the content of rI5 is negative.
+    (J5N jump "jump I5 negative" 41
+         "Jump if the content of rI5 is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'J5Z 'jump "jump I5 zero" (+ 40 1) 1
- "Jump if the content of rI5 is zero.
+    (J5Z jump "jump I5 zero" 41
+         "Jump if the content of rI5 is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J5P 'jump "jump I5 positive" (+ 40 1) 2
- "Jump if the content of rI5 is positive.
+    (J5P jump "jump I5 positive" 41
+         "Jump if the content of rI5 is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J5NN 'jump "jump I5 non-negative" (+ 40 1) 3
- "Jump if the content of rI5 is non-negative.
+    (J5NN jump "jump I5 non-negative" 41
+          "Jump if the content of rI5 is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'J5NZ 'jump "jump I5 non-zero" (+ 40 1) 4
- "Jump if the content of rI5 is non-zero.
+    (J5NZ jump "jump I5 non-zero" 41
+          "Jump if the content of rI5 is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J5NP 'jump "jump I5 non-positive" (+ 40 1) 5
- "Jump if the content of rI5 is non-positive.
+    (J5NP jump "jump I5 non-positive" 41
+          "Jump if the content of rI5 is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J6N 'jump "jump I6 negative" (+ 40 1) 0
- "Jump if the content of rI6 is negative.
+    (J6N jump "jump I6 negative" 41
+         "Jump if the content of rI6 is negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+         1)
 
-
-(mixal-add-operation-code
- 'J6Z 'jump "jump I6 zero" (+ 40 1) 1
- "Jump if the content of rI6 is zero.
+    (J6Z jump "jump I6 zero" 41
+         "Jump if the content of rI6 is zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J6P 'jump "jump I6 positive" (+ 40 1) 2
- "Jump if the content of rI6 is positive.
+    (J6P jump "jump I6 positive" 41
+         "Jump if the content of rI6 is positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+         1)
 
-(mixal-add-operation-code
- 'J6NN 'jump "jump I6 non-negative" (+ 40 1) 3
- "Jump if the content of rI6 is non-negative.
+    (J6NN jump "jump I6 non-negative" 41
+          "Jump if the content of rI6 is non-negative.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-
-(mixal-add-operation-code
- 'J6NZ 'jump "jump I6 non-zero" (+ 40 1) 4
- "Jump if the content of rI6 is non-zero.
+    (J6NZ jump "jump I6 non-zero" 41
+          "Jump if the content of rI6 is non-zero.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
-
+          1)
 
-(mixal-add-operation-code
- 'J6NP 'jump "jump I6 non-positive" (+ 40 1) 5
- "Jump if the content of rI6 is non-positive.
+    (J6NP jump "jump I6 non-positive" 41
+          "Jump if the content of rI6 is non-positive.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
- 1)
+          1)
 
-(mixal-add-operation-code
- 'SLA 'miscellaneous "shift left A" 6 0
- "Shift to A, M bytes left.
+    (SLA miscellaneous "shift left A" 6
+         "Shift to A, M bytes left.
 Hero's will be added to the right."
- 2)
-
+         2)
 
-(mixal-add-operation-code
- 'SRA 'miscellaneous "shift right A" 6 1
- "Shift to A, M bytes right.
+    (SRA miscellaneous "shift right A" 6
+         "Shift to A, M bytes right.
 Zeros will be added to the left."
- 2)
+         2)
 
-
-(mixal-add-operation-code
- 'SLAX 'miscellaneous "shift left AX" 6 2
- "Shift AX, M bytes left.
+    (SLAX miscellaneous "shift left AX" 6
+          "Shift AX, M bytes left.
 Zeros will be added to the right."
- 2)
+          2)
 
+    (SRAX miscellaneous "shift right AX" 6
+          "Shift AX, M bytes right.
+Zeros will be added to the left."
+          2)
 
+    (SLC miscellaneous "shift left AX circularly" 6
+         "Shift AX, M bytes left circularly.
+The bytes that fall off to the left will be added to the right."
+         2)
 
-(mixal-add-operation-code
- 'SRAX 'miscellaneous "shift right AX" 6 3
- "Shift AX, M bytes right.
-Zeros will be added to the left."
- 2)
+    (SRC miscellaneous "shift right AX circularly" 6
+         "Shift AX, M bytes right circularly.
+The bytes that fall off to the right will be added to the left."
+         2)
 
+    (SLB miscellaneous "shift left AX binary" 6
+         "Shift AX, M binary places left."
+         2)
 
-(mixal-add-operation-code
- 'SLC 'miscellaneous "shift left AX circularly" 6 4
- "Shift AX, M bytes left circularly.
-The bytes that fall off to the left will be added to the right."
- 2)
+    (SRB miscellaneous "shift right AX binary" 6
+         "Shift AX, M binary places right."
+         2)
 
+    (MOVE miscellaneous "move" 7 number
+          "Move MOD words from M to the location stored in rI1."
+          (+ 1 (* 2 number)))
 
-(mixal-add-operation-code
- 'SRC 'miscellaneous "shift right AX circularly" 6 4
- "Shift AX, M bytes right circularly.
-The bytes that fall off to the right will be added to the left."
- 2)
-
-(mixal-add-operation-code
- 'SLB 'miscellaneous "shift left AX binary" 6 6
- "Shift AX, M binary places left."
- 2)
-
-(mixal-add-operation-code
- 'SRB 'miscellaneous "shift right AX binary" 6 7
- "Shift AX, M binary places right."
- 2)
-
-(mixal-add-operation-code
- 'MOVE 'miscellaneous "move" 7 'number
- "Move MOD words from M to the location stored in rI1."
- '(+ 1 (* 2 number)))
-
-(mixal-add-operation-code
- 'NOP 'miscellaneous "no operation" 0 'ignored
- "No operation, M and F are not used by the machine."
- 1)
-
-(mixal-add-operation-code
- 'HLT 'miscellaneous "halt" 5 2
- "Halt.
+    (NOP miscellaneous "no operation" 0 ignored
+         "No operation, M and F are not used by the machine."
+         1)
+
+    (HLT miscellaneous "halt" 5
+         "Halt.
 Stop instruction fetching."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'IN 'input-output "input" 36 'unit
- "Transfer a block of words from the specified unit to memory.
+    (IN input-output "input" 36 unit
+        "Transfer a block of words from the specified unit to memory.
 The transfer starts at address M."
- 1)
+        1)
 
-(mixal-add-operation-code
- 'OUT 'input-output "output" 37 'unit
- "Transfer a block of words from memory.
+    (OUT input-output "output" 37 unit
+         "Transfer a block of words from memory.
 The transfer starts at address M to the specified unit."
- 1)
+         1)
 
-(mixal-add-operation-code
- 'IOC 'input-output "input-output control" 35 'unit
- "Perform a control operation.
+    (IOC input-output "input-output control" 35 unit
+         "Perform a control operation.
 The control operation is given by M on the specified unit."
- 1)
-
-(mixal-add-operation-code
- 'JRED 'input-output "jump ready" 38 'unit
- "Jump to M if the specified unit is ready."
- 1)
+         1)
 
+    (JRED input-output "jump ready" 38 unit
+          "Jump to M if the specified unit is ready."
+          1)
 
-(mixal-add-operation-code
- 'JBUS 'input-output "jump busy" 34 'unit
- "Jump to M if the specified unit is busy."
- 1)
+    (JBUS input-output "jump busy" 34 unit
+          "Jump to M if the specified unit is busy."
+          1)
 
-(mixal-add-operation-code
- 'NUM 'conversion "convert to numeric" 5 0
- "Convert rAX to its numerical value and store it in rA.
+    (NUM conversion "convert to numeric" 5
+         "Convert rAX to its numerical value and store it in rA.
 the register rAX is assumed to contain a character representation of
 a number."
- 10)
+         10)
 
-(mixal-add-operation-code
- 'CHAR 'conversion "convert to characters" 5 1
- "Convert the number stored in rA to a character representation.
+    (CHAR conversion "convert to characters" 5
+          "Convert the number stored in rA to a character representation.
 The converted character representation is stored in rAX."
- 10)
+          10))
+
+  "Alist that contains all the possible operation codes for mix.
+Each elt has the form
+  (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME)
+Where OP-CODE is the text of the opcode as a symbol,
+FULL-NAME is the human readable name as a string,
+C-BYTE is the operation code telling what operation is to be performed,
+F-BYTE holds a modification of the operation code which can be a symbol
+  or a number,
+DESCRIPTION contains an string with a description about the operation code and
+EXECUTION-TIME holds info about the time it takes, number or string.")
+;; (makunbound 'mixal-operation-codes-alist)
+
+
+;;; Font-locking:
+(defconst mixal-syntax-propertize-function
+  (syntax-propertize-rules
+   ;; Normal comments start with a * in column 0 and end at end of line.
+   ("^\\*" (0 "<"))
+   ;; Every line can end with a comment which is placed after the operand.
+   ;; I assume here that mnemonics without operands can not have a comment.
+   ("^[[:alnum:]]*[ \t]+[[:alnum:]]+[ \t]+[^ \n\t]+[ \t]*\\([ \t]\\)[^\n \t]"
+    (1 "<"))))
+
+(defvar mixal-font-lock-keywords
+  `(("^\\([A-Z0-9a-z]+\\)"
+     (1 mixal-font-lock-label-face))
+    (,(regexp-opt (mapcar (lambda (x) (symbol-name (car x)))
+                          mixal-operation-codes-alist) 'words)
+     . mixal-font-lock-operation-code-face)
+    (,(regexp-opt mixal-assembly-pseudoinstructions 'words)
+     . mixal-font-lock-assembly-pseudoinstruction-face)
+    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+\\(=.*=\\)"
+     (1 font-lock-constant-face)))
+  "Keyword highlighting specification for `mixal-mode'.")
+;; (makunbound 'mixal-font-lock-keywords)
 
 (defvar mixal-describe-operation-code-history nil
   "History list for describe operation code.")
 
-(defun mixal-describe-operation-code (&optional op-code)
+(defun mixal-describe-operation-code (op-code)
   "Display the full documentation of OP-CODE."
-  (interactive)
-  ;; we like to provide completition and history, so do it ourself (interactive "?bla")?
-  (unless op-code
+  (interactive
+   (list
     (let* ((completion-ignore-case t)
 	   ;; we already have a list, but it is not in the right format
-	   ;; transform it to a valid table so completition can use it
-	   (table (mapcar '(lambda (elm)
-			     (cons (symbol-name (car elm)) nil))
+	   ;; transform it to a valid table so completion can use it
+	   (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil))
 			  mixal-operation-codes-alist))
 	   ;; prompt is different depending on we are close to a valid op-code
-	   (have-default (member (current-word) mixal-operation-codes))
+	   (have-default (assq (intern-soft (current-word))
+                               mixal-operation-codes-alist))
 	   (prompt (concat "Describe operation code "
 			   (if have-default
 			       (concat "(default " (current-word) "): ")
 			     ": "))))
-      ;; as the operation code to the user
-      (setq op-code (completing-read prompt table nil t nil
-				     'mixal-describe-operation-code-history
-				     (current-word)))))
+      ;; As the operation code to the user.
+      (completing-read prompt table nil t nil
+                       'mixal-describe-operation-code-history
+                       (current-word)))))
   ;; get the info on the op-code and output it to the help buffer
   (let ((op-code-help (assq (intern-soft op-code) mixal-operation-codes-alist)))
     (when op-code-help
@@ -1334,35 +1122,38 @@ The converted character representation is stored in rAX."
 
 ;;;; Running
 (defun mixal-run ()
-  "Run's mixal file in current buffer, assumes that file has been compiled"
+  "Run mixal file in current buffer, assumes that file has been compiled."
   (interactive)
-  (mixvm (concat "mixvm -r -t -d "
-		 (file-name-sans-extension (buffer-file-name)))))
+  (if (fboundp 'mixvm)
+      (mixvm (concat "mixvm -r -t -d "
+		     (file-name-sans-extension (buffer-file-name))))
+    (error "mixvm.el needs to be loaded to run `mixvm'")))
 
 (defun mixal-debug ()
-  "Starts mixvm for debugging, assumes that file has been compiled with debugging support"
+  "Start mixvm for debugging.
+Assumes that file has been compiled with debugging support."
   (interactive)
-  (mixvm (concat "mixvm "
-		 (file-name-sans-extension (buffer-file-name)))))
+  (if (fboundp 'mixvm)
+      (mixvm (concat "mixvm "
+		     (file-name-sans-extension (buffer-file-name))))
+    (error "mixvm.el needs to be loaded to run `mixvm'")))
 
 ;;;###autoload
-(define-derived-mode mixal-mode fundamental-mode "mixal"
-  "Major mode for the mixal asm language.
-\\{mixal-mode-map}"
+(define-derived-mode mixal-mode prog-mode "mixal"
+  "Major mode for the mixal asm language."
   (set (make-local-variable 'comment-start) "*")
-  (set (make-local-variable 'comment-start-skip) "*")
-  (set (make-local-variable 'font-lock-defaults) '(mixal-font-lock-keywords))
-; might add an indent function in the future
-;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
-  (set (make-local-variable 'compile-command) (concat "mixasm "
-						      buffer-file-name))
-  ;; mixasm will do strange when there is no final newline,
-  ;; so let Emacs ensure that it is always there
-  (set (make-local-variable 'require-final-newline)
-       mode-require-final-newline))
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.mixal\\'" . mixal-mode))
+  (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*")
+  (set (make-local-variable 'font-lock-defaults)
+       '(mixal-font-lock-keywords))
+  (set (make-local-variable 'syntax-propertize-function)
+       mixal-syntax-propertize-function)
+  ;; might add an indent function in the future
+  ;;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
+  (set (make-local-variable 'compile-command)
+       (concat "mixasm "
+	       (if buffer-file-name
+		   (shell-quote-argument buffer-file-name)))))
 
 (provide 'mixal-mode)
+
 ;;; mixal-mode.el ends here
diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade
index 9d35ead..ad106b4 100644
--- a/mixgtk/mixgtk.glade
+++ b/mixgtk/mixgtk.glade
@@ -1,1033 +1,230 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="main_window">
-    <property name="title" translatable="yes">gmixvm</property>
-    <property name="role">gmixvm-main</property>
-    <property name="default_width">650</property>
-    <property name="default_height">550</property>
-    <child>
-      <widget class="GtkVBox" id="main_vbox">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.2 -->
+<interface>
+  <requires lib="gtk+" version="3.14"/>
+  <object class="GtkDialog" id="about_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">2</property>
+    <property name="title" translatable="yes">About gmixvm</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox13">
         <property name="visible">True</property>
-        <property name="border_width">2</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkMenuBar" id="mainmenubar">
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area13">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">spread</property>
             <child>
-              <widget class="GtkMenuItem" id="file">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="file_menu">
-                    <child>
-                      <widget class="GtkImageMenuItem" id="file_open">
-                        <property name="label" translatable="yes">_Load</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Load a MIX file</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_file_open_activate"/>
-                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-open</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="edit">
-                        <property name="label">gtk-edit</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Edit a MIXAL source file</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_file_edit_activate"/>
-                        <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="compile">
-                        <property name="label" translatable="yes">_Compile</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Compile a MIXAL source file</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_file_compile_activate"/>
-                        <accelerator key="B" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-execute</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separator5">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="file_exit">
-                        <property name="label" translatable="yes">E_xit</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Exit application</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_file_exit_activate"/>
-                        <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image3">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-quit</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="debug">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">De_bug</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="debug_menu">
-                    <child>
-                      <widget class="GtkImageMenuItem" id="debug_run">
-                        <property name="label" translatable="yes">_Run</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Run program</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_debug_run_activate"/>
-                        <accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image4">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-media-play</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="debug_next">
-                        <property name="label" translatable="yes">_Next</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Execute next instruction</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_debug_next_activate"/>
-                        <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image5">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-media-next</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="clear_breakpoints">
-                        <property name="label" translatable="yes">_Clear breakpoints</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Clear all set breakpoints</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_clear_breakpoints_activate"/>
-                        <accelerator key="C" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image6">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-clear</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="symbols">
-                        <property name="label" translatable="yes">_Symbols</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Show the symbol table</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_symbols_activate"/>
-                        <accelerator key="Y" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image7">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-index</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="view1">
+              <object class="GtkButton" id="okbutton2">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Vie_w</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="view1_menu">
-                    <child>
-                      <widget class="GtkImageMenuItem" id="toolbars1">
-                        <property name="label" translatable="yes">_Toolbars</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <child>
-                          <widget class="GtkMenu" id="toolbars1_menu">
-                            <child>
-                              <widget class="GtkCheckMenuItem" id="show_toolbars">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Show Toolbars</property>
-                                <property name="use_underline">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="toolbars_style">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Style</property>
-                                <property name="use_underline">True</property>
-                                <child>
-                                  <widget class="GtkMenu" id="toolbars_style_menu">
-                                    <child>
-                                      <widget class="GtkRadioMenuItem" id="tb_style_icons">
-                                        <property name="visible">True</property>
-                                        <property name="tooltip" translatable="yes">Show only icons in toolbar buttons</property>
-                                        <property name="label" translatable="yes">_Icons</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                      </widget>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkRadioMenuItem" id="tb_style_labels">
-                                        <property name="visible">True</property>
-                                        <property name="tooltip" translatable="yes">Show only labels in toolbar buttons</property>
-                                        <property name="label" translatable="yes">_Labels</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property name="group">tb_style_icons</property>
-                                      </widget>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkRadioMenuItem" id="tb_style_both">
-                                        <property name="visible">True</property>
-                                        <property name="tooltip" translatable="yes">Show both icons and labels in toolbar buttons</property>
-                                        <property name="label" translatable="yes">_Both</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property name="group">tb_style_icons</property>
-                                      </widget>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkRadioMenuItem" id="tb_style_bothh">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">_Sideways</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property name="group">tb_style_icons</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image8">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-preferences</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id=" detached_windows">
-                        <property name="label" translatable="yes">_Detached windows</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <child>
-                          <widget class="GtkMenu" id=" detached_windows_menu">
-                            <child>
-                              <widget class="GtkCheckMenuItem" id="detach_vm">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Virtual machine</property>
-                                <property name="use_underline">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckMenuItem" id="detach_source">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Source</property>
-                                <property name="use_underline">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckMenuItem" id="detach_dev">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Devices</property>
-                                <property name="use_underline">True</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image9">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-dnd-multiple</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="border_width">1</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_about_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">3</property>
+            <property name="label_xalign">0</property>
+            <property name="label_yalign">0</property>
             <child>
-              <widget class="GtkMenuItem" id="settings2">
+              <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">S_ettings</property>
-                <property name="use_underline">True</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <widget class="GtkMenu" id="settings2_menu">
-                    <child>
-                      <widget class="GtkImageMenuItem" id="fonts1">
-                        <property name="label" translatable="yes">Change _font</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <child>
-                          <widget class="GtkMenu" id="fonts1_menu">
-                            <child>
-                              <widget class="GtkMenuItem" id="mix">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Virtual machine</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_mix_font_activate"/>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="mixal">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Source</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_mixal_font_activate"/>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="command_prompt_menu">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Command _prompt</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_prompt_font_activate"/>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="command_log_menu">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Command l_og</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_log_font_activate"/>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="devices">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Devices</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_devices_font_activate"/>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="symbol_list">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Symbol _list</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_symbols_font_activate"/>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkSeparatorMenuItem" id="separator4">
-                                <property name="visible">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkMenuItem" id="all_fonts">
-                                <property name="visible">True</property>
-                                <property name="tooltip" translatable="yes">Change all fonts at once</property>
-                                <property name="label" translatable="yes">_All</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="on_all_fonts_activate"/>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image10">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-select-font</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="device_output1">
-                        <property name="label" translatable="yes">_Device output</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Change format of binary devices output</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_devform_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image11">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-directory</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="devices_dir">
-                        <property name="label" translatable="yes">De_vices dir</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_devdir_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image12">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-home</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
+                  <object class="GtkBox" id="vbox9">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="border_width">15</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">10</property>
                     <child>
-                      <widget class="GtkImageMenuItem" id="external_programs1">
-                        <property name="label" translatable="yes">E_xternal programs</property>
+                      <object class="GtkLabel" id="label1441">
                         <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_external_programs_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image13">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-execute</property>
-                          </widget>
-                        </child>
-                      </widget>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;MIX virtual machine&lt;/b&gt;
+&lt;small&gt;(GNU MDK)&lt;/small&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">center</property>
+                        <property name="yalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkSeparatorMenuItem" id="separator3">
+                      <object class="GtkLabel" id="version_label">
+                        <property name="width_request">52</property>
+                        <property name="height_request">16</property>
                         <property name="visible">True</property>
-                      </widget>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">label223</property>
+                        <property name="justify">center</property>
+                        <property name="yalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="save">
-                        <property name="label" translatable="yes">_Save</property>
+                      <object class="GtkLabel" id="mdk_web">
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Save current settings</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_save_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image14">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-save</property>
-                          </widget>
-                        </child>
-                      </widget>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">&lt;a href="http://www.gnu.org/software/mdk/mdk.html"&gt;www.gnu.org/software/mdk&lt;/a&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">center</property>
+                        <property name="selectable">True</property>
+                        <property name="yalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckMenuItem" id="save_on_exit">
+                      <object class="GtkLabel" id="label1440">
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Toogle save settings on exit</property>
-                        <property name="label" translatable="yes">Save on _exit</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="on_save_on_exit_toggle"/>
-                      </widget>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">&lt;small&gt;Please send bug reports to bug-mdk@gnu.org&lt;/small&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">center</property>
+                        <property name="wrap">True</property>
+                        <property name="selectable">True</property>
+                        <property name="yalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="help">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="help_menu">
                     <child>
-                      <widget class="GtkImageMenuItem" id="about">
-                        <property name="label" translatable="yes">_About</property>
+                      <object class="GtkLabel" id="label1442">
                         <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="on_about_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image15">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-about</property>
-                          </widget>
-                        </child>
-                      </widget>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;small&gt;Copyright (C) 2000-2020
+Free Software Foundation, Inc&lt;/small&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">center</property>
+                        <property name="yalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
                     </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHandleBox" id="tb_handle">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkToolbar" id="main_toolbar">
-                <property name="visible">True</property>
-                <property name="toolbar_style">icons</property>
-                <child>
-                  <widget class="GtkToolButton" id="load_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Load MIX program</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Open</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-open</property>
-                    <signal name="clicked" handler="on_file_open_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="compile_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Compile MIXAL source</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Compile</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-execute</property>
-                    <signal name="clicked" handler="on_file_compile_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="edit_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Edit MIXAL source</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Edit</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-justify-fill</property>
-                    <signal name="clicked" handler="on_file_edit_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem13">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="run_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Run</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Run</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-go-forward</property>
-                    <signal name="clicked" handler="on_debug_run_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="step_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Next</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Next</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-goto-last</property>
-                    <signal name="clicked" handler="on_debug_next_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="clear_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Clear breakpoints</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Clear</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-clear</property>
-                    <signal name="clicked" handler="on_clear_breakpoints_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="symbols_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Symbol table</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Symbols</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-index</property>
-                    <signal name="clicked" handler="on_symbols_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button28">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Device directory</property>
-                    <property name="label" translatable="yes">Devdir</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-home</property>
-                    <signal name="clicked" handler="on_devdir_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button30">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Output format</property>
-                    <property name="label" translatable="yes">Format</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-zoom-100</property>
-                    <signal name="clicked" handler="on_devform_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button31">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">External programs</property>
-                    <property name="label" translatable="yes">Programs</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-properties</property>
-                    <signal name="clicked" handler="on_external_programs_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem8">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="detach_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Detach window</property>
-                    <property name="label" translatable="yes">Detach</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-dnd-multiple</property>
-                    <signal name="clicked" handler="on_detach_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="attach_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Attach all windows</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Attach</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-dnd</property>
-                    <signal name="clicked" handler="on_attach_all_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">3</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <widget class="GtkVPaned" id="main_panel">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="position">1</property>
-            <child>
-              <widget class="GtkNotebook" id="main_notebook">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </widget>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="prompt_vbox">
-                <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <widget class="GtkScrolledWindow" id="mixlog_scrolledwindow">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <widget class="GtkTextView" id="command_log">
-                        <property name="visible">True</property>
-                        <property name="editable">False</property>
-                        <property name="wrap_mode">word</property>
-                        <property name="left_margin">3</property>
-                        <property name="right_margin">4</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkEntry" id="command_prompt">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
-                    <property name="tooltip" translatable="yes">Enter MIXVM command here</property>
-                    <signal name="key_press_event" handler="on_command_prompt_key_press_event" after="yes"/>
-                    <signal name="activate" handler="on_command_prompt_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkStatusbar" id="main_statusbar">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="word_dialog">
-    <property name="title" translatable="yes">Enter value</property>
+    <action-widgets>
+      <action-widget response="-5">okbutton2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="devdir_dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Devices directory</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">mouse</property>
+    <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
+    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkBox" id="dialog-vbox11">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <widget class="GtkFixed" id="word_layout">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-            <child>
-              <widget class="GtkEntry" id="word_decimal">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="events">GDK_KEY_PRESS_MASK</property>
-                <property name="width_chars">28</property>
-                <property name="text" translatable="yes">0</property>
-                <signal name="changed" handler="on_word_dec_changed" after="yes"/>
-              </widget>
-              <packing>
-                <property name="x">88</property>
-                <property name="y">64</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="word_b2">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_KEY_PRESS_MASK</property>
-                <property name="max_length">2</property>
-                <property name="width_chars">3</property>
-                <property name="text" translatable="yes">0</property>
-                <signal name="changed" handler="on_word_byte_changed"/>
-              </widget>
-              <packing>
-                <property name="x">144</property>
-                <property name="y">32</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="word_b3">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_BUTTON_PRESS_MASK</property>
-                <property name="max_length">2</property>
-                <property name="width_chars">3</property>
-                <property name="text" translatable="yes">0</property>
-                <signal name="changed" handler="on_word_byte_changed"/>
-              </widget>
-              <packing>
-                <property name="x">176</property>
-                <property name="y">32</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="word_b4">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_KEY_PRESS_MASK</property>
-                <property name="max_length">2</property>
-                <property name="width_chars">3</property>
-                <property name="text" translatable="yes">0</property>
-                <signal name="changed" handler="on_word_byte_changed"/>
-              </widget>
-              <packing>
-                <property name="x">208</property>
-                <property name="y">32</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="word_b5">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_KEY_PRESS_MASK</property>
-                <property name="max_length">2</property>
-                <property name="width_chars">3</property>
-                <property name="text" translatable="yes">0</property>
-                <signal name="changed" handler="on_word_byte_changed"/>
-              </widget>
-              <packing>
-                <property name="x">238</property>
-                <property name="y">32</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="word_b1">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_KEY_PRESS_MASK</property>
-                <property name="max_length">2</property>
-                <property name="width_chars">3</property>
-                <property name="text" translatable="yes">0</property>
-                <signal name="changed" handler="on_word_byte_changed"/>
-              </widget>
-              <packing>
-                <property name="x">112</property>
-                <property name="y">32</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="word_sign">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_KEY_PRESS_MASK</property>
-                <property name="max_length">1</property>
-                <property name="width_chars">2</property>
-                <property name="text" translatable="yes">+</property>
-                <signal name="changed" handler="on_word_sign_changed"/>
-              </widget>
-              <packing>
-                <property name="x">88</property>
-                <property name="y">32</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label60">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Decimal</property>
-                <property name="justify">center</property>
-              </widget>
-              <packing>
-                <property name="x">14</property>
-                <property name="y">68</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label61">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Bytes</property>
-                <property name="justify">center</property>
-              </widget>
-              <packing>
-                <property name="x">15</property>
-                <property name="y">36</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="word_label">
-                <property name="width_request">0</property>
-                <property name="height_request">0</property>
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Enter value</property>
-                <property name="justify">center</property>
-              </widget>
-              <packing>
-                <property name="x">112</property>
-                <property name="y">8</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkButtonBox" id="dialog-action_area11">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="word_cancel">
+              <object class="GtkButton" id="devdir_cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_word_cancel_clicked"/>
-              </widget>
+                <signal name="clicked" handler="on_devdir_cancel_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="word_reset">
-                <property name="label">gtk-clear</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="focus_on_click">False</property>
-                <signal name="clicked" handler="on_word_reset_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="word_ok">
+              <object class="GtkButton" id="devdir_ok">
                 <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_word_ok_clicked"/>
-              </widget>
+                <signal name="clicked" handler="on_devdir_ok_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -1035,1390 +232,2164 @@
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="goto_dialog">
-    <property name="title" translatable="yes">Go to memory cell</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">mouse</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox6">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
-            <property name="border_width">12</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">25</property>
+            <property name="spacing">11</property>
             <child>
-              <widget class="GtkLabel" id="label225">
+              <object class="GtkLabel" id="label239">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Go to address:</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Directory</property>
                 <property name="justify">center</property>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="goto_entry">
+              <object class="GtkEntry" id="devdir_entry">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
+                <property name="editable">False</property>
+                <property name="caps_lock_warning">False</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="devdir_browse">
+                <property name="label">_Select</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="activates_default">True</property>
-              </widget>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_devdir_browse_clicked" swapped="no"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">10</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">devdir_cancel</action-widget>
+      <action-widget response="-5">devdir_ok</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="devform_dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Device output format</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">320</property>
+    <property name="type_hint">dialog</property>
+    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox8">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area6">
+          <object class="GtkButtonBox" id="dialog-action_area8">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="goto_cancel">
+              <object class="GtkButton" id="button37">
                 <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="goto_ok">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
+              <object class="GtkButton" id="button38">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkButton" id="button39">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkFontSelectionDialog" id="fontsel_dialog">
-    <property name="border_width">4</property>
-    <property name="title" translatable="yes">Select Font</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child internal-child="font_selection">
-      <widget class="GtkFontSelection" id="fontselection1">
-        <property name="visible">True</property>
-        <property name="border_width">4</property>
-      </widget>
-    </child>
-    <child internal-child="cancel_button">
-      <widget class="GtkButton" id="cancel_button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="can_default">True</property>
-        <property name="receives_default">False</property>
-      </widget>
-    </child>
-    <child internal-child="apply_button">
-      <widget class="GtkButton" id="apply_button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="can_default">True</property>
-        <property name="receives_default">False</property>
-      </widget>
-    </child>
-    <child internal-child="ok_button">
-      <widget class="GtkButton" id="ok_button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="can_default">True</property>
-        <property name="receives_default">False</property>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="devform_dialog">
-    <property name="title" translatable="yes">Device output format</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">320</property>
-    <property name="default_height">140</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox8">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkFixed" id="fixed2">
+          <object class="GtkFixed" id="fixed2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
-              <widget class="GtkButton" id="devset_button">
+              <object class="GtkButton" id="devset_button">
                 <property name="label" translatable="yes">S_et all</property>
                 <property name="width_request">0</property>
                 <property name="height_request">0</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip" translatable="yes">Set all devices to current format</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_devset_button_clicked"/>
-              </widget>
+                <signal name="clicked" handler="on_devset_button_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="x">233</property>
-                <property name="y">31</property>
+                <property name="x">241</property>
+                <property name="y">34</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label232">
+              <object class="GtkLabel" id="label232">
                 <property name="width_request">0</property>
                 <property name="height_request">0</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Device</property>
                 <property name="justify">center</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x">24</property>
                 <property name="y">10</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label233">
+              <object class="GtkLabel" id="label233">
                 <property name="width_request">0</property>
                 <property name="height_request">0</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Format</property>
                 <property name="justify">center</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x">24</property>
                 <property name="y">38</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBoxEntry" id="dev_combo">
-                <property name="width_request">183</property>
-                <property name="height_request">25</property>
-                <property name="visible">True</property>
-                <property name="items" translatable="yes">tape0
-tape1
-tape2
-tape3
-tape4
-tape5
-tape6
-tape7
-disk0
-disk1
-disk2
-disk3
-disk4
-disk5
-disk6
-disk7</property>
-                <signal name="changed" handler="on_dev_combo_changed"/>
-              </widget>
-              <packing>
-                <property name="x">90</property>
-                <property name="y">2</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkRadioButton" id="wordradio">
+              <object class="GtkRadioButton" id="wordradio">
                 <property name="label" translatable="yes">Word</property>
                 <property name="width_request">0</property>
                 <property name="height_request">0</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip" translatable="yes">Show output as MIX words</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x">89</property>
                 <property name="y">34</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkRadioButton" id="decradio">
+              <object class="GtkRadioButton" id="decradio">
                 <property name="label" translatable="yes">Decimal</property>
                 <property name="width_request">0</property>
                 <property name="height_request">0</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip" translatable="yes">Show output as decimal numbers</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">wordradio</property>
-                <signal name="toggled" handler="on_decradio_toggled"/>
-              </widget>
+                <signal name="toggled" handler="on_decradio_toggled" swapped="no"/>
+              </object>
               <packing>
                 <property name="x">154</property>
                 <property name="y">34</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkComboBoxText" id="dev_combo">
+                <property name="width_request">100</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">0</property>
+                <property name="has_entry">True</property>
+                <items>
+                  <item>tape0</item>
+                  <item>tape1</item>
+                  <item>tape2</item>
+                  <item>tape3</item>
+                  <item>tape4</item>
+                  <item>tape5</item>
+                  <item>tape6</item>
+                  <item>tape7</item>
+                  <item>disk0</item>
+                  <item>disk1</item>
+                  <item>disk2</item>
+                  <item>disk3</item>
+                  <item>disk4</item>
+                  <item>disk5</item>
+                  <item>disk6</item>
+                  <item>disk7</item>
+                </items>
+                <signal name="changed" handler="on_dev_combo_changed" swapped="no"/>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
+                    <property name="can_focus">False</property>
+                    <property name="text" translatable="yes">tape0</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="x">94</property>
+                <property name="y">3</property>
+              </packing>
+            </child>
+          </object>
           <packing>
+            <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
+            <property name="padding">5</property>
+            <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area8">
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button37</action-widget>
+      <action-widget response="-10">button38</action-widget>
+      <action-widget response="-5">button39</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="devices_window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Devices</property>
+    <property name="default_width">550</property>
+    <property name="default_height">250</property>
+    <signal name="delete-event" handler="on_window_hide" swapped="no"/>
+    <signal name="destroy" handler="on_window_hide" swapped="no"/>
+    <signal name="destroy-event" handler="on_window_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox" id="vbox4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkToolbar" id="dev_toolbar">
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
+            <property name="can_focus">False</property>
+            <property name="can_default">True</property>
+            <property name="border_width">2</property>
+            <property name="toolbar_style">icons</property>
             <child>
-              <widget class="GtkButton" id="button37">
-                <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
+              <object class="GtkToolButton" id="devdir_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Directory</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-home</property>
+                <signal name="clicked" handler="on_devdir_activate" swapped="no"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button38">
-                <property name="label">gtk-apply</property>
-                <property name="response_id">-10</property>
+              <object class="GtkToolButton" id="output_button">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Output</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-zoom-100</property>
+                <signal name="clicked" handler="on_devform_activate" swapped="no"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button39">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem11">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </widget>
+                <property name="can_focus">False</property>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button21">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Font</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-select-font</property>
+                <signal name="clicked" handler="on_devices_font_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem12">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="attach_button_dev">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Attach</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-dnd-multiple</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+        <child>
+          <object class="GtkBox" id="dev_container">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="external_dialog">
+  </object>
+  <object class="GtkDialog" id="external_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">1</property>
     <property name="title" translatable="yes">External programs</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
+    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox9">
+      <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area9">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button40">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button41">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <widget class="GtkVBox" id="vbox2">
+          <object class="GtkBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="homogeneous">True</property>
             <child>
-              <widget class="GtkFixed" id="fixed3">
+              <object class="GtkFixed" id="fixed3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">9</property>
                 <child>
-                  <widget class="GtkEntry" id="editor_entry">
+                  <object class="GtkEntry" id="editor_entry">
                     <property name="width_request">0</property>
                     <property name="height_request">0</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip" translatable="yes">Enter the arguments for the editor. %s will be substituted by the full path to the MIXAL file to edit. </property>
                     <property name="text" translatable="yes">-e vi %s</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x">168</property>
                     <property name="y">24</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label234">
+                  <object class="GtkLabel" id="label234">
                     <property name="width_request">0</property>
                     <property name="height_request">0</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Editor command and arguments (e.g -e vi %s)</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x">8</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFileChooserButton" id="editor_chooser">
+                  <object class="GtkFileChooserButton" id="editor_chooser">
                     <property name="width_request">151</property>
                     <property name="height_request">31</property>
                     <property name="visible">True</property>
-                    <property name="use_preview_label">False</property>
+                    <property name="can_focus">False</property>
                     <property name="preview_widget_active">False</property>
-                  </widget>
+                    <property name="use_preview_label">False</property>
+                  </object>
                   <packing>
                     <property name="x">8</property>
                     <property name="y">24</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFixed" id="fixed4">
+              <object class="GtkFixed" id="fixed4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">9</property>
                 <child>
-                  <widget class="GtkLabel" id="label235">
+                  <object class="GtkLabel" id="label235">
                     <property name="width_request">0</property>
                     <property name="height_request">0</property>
                     <property name="visible">True</property>
-                    <property name="xalign">0.47999998927116394</property>
-                    <property name="yalign">0.52999997138977051</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">MIX asssembler path</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
+                    <property name="xalign">0.47999998927116394</property>
+                    <property name="yalign">0.52999997138977051</property>
+                  </object>
                   <packing>
                     <property name="x">8</property>
                     <property name="y">8</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFileChooserButton" id="mixasm_chooser">
+                  <object class="GtkFileChooserButton" id="mixasm_chooser">
                     <property name="width_request">151</property>
                     <property name="height_request">31</property>
                     <property name="visible">True</property>
-                    <property name="use_preview_label">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="create_folders">False</property>
                     <property name="preview_widget_active">False</property>
+                    <property name="use_preview_label">False</property>
                     <property name="title" translatable="yes">Select mixasm executable</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x">8</property>
                     <property name="y">32</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="mixasm_mls">
+                  <object class="GtkCheckButton" id="mixasm_mls">
                     <property name="label" translatable="yes">Generate listing file</property>
                     <property name="width_request">152</property>
                     <property name="height_request">24</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip" translatable="yes">If checked, mixasm will be called with the --listing flag.</property>
                     <property name="use_underline">True</property>
-                    <property name="focus_on_click">False</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x">176</property>
                     <property name="y">32</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button40</action-widget>
+      <action-widget response="-5">button41</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkFontChooserDialog" id="fontsel_dialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="language">en-gb</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area9">
-            <property name="visible">True</property>
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="goto_dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Memory cell</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="button40">
+              <object class="GtkButton" id="goto_cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button41">
+              <object class="GtkButton" id="goto_ok">
                 <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="symbols_dialog">
-    <property name="title" translatable="yes">Symbol table</property>
-    <property name="default_width">245</property>
-    <property name="default_height">265</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox10">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow26">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">in</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Go to address</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child>
-              <widget class="GtkTreeView" id="symbols_view">
+              <object class="GtkEntry" id="goto_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
-                <property name="reorderable">True</property>
-                <property name="rules_hint">True</property>
-              </widget>
+                <property name="has_focus">True</property>
+                <property name="max_length">4</property>
+                <property name="activates_default">True</property>
+                <property name="width_chars">6</property>
+                <property name="max_width_chars">6</property>
+                <property name="xalign">0.5</property>
+                <property name="caps_lock_warning">False</property>
+                <property name="input_purpose">digits</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
             </child>
-          </widget>
+          </object>
           <packing>
-            <property name="position">2</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">goto_cancel</action-widget>
+      <action-widget response="-5">goto_ok</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="input_dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">MIX Console input</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <signal name="close" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox12">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area10">
+          <object class="GtkButtonBox" id="dialog-action_area12">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="okbutton1">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
-                <signal name="clicked" handler="on_symbol_ok_clicked"/>
-                <child>
-                  <widget class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox36">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <widget class="GtkImage" id="image57">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-close</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label1437">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Close</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
+                <property name="use_stock">True</property>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+        <child>
+          <object class="GtkBox" id="vbox7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">3</property>
+            <property name="orientation">vertical</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkLabel" id="label1438">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Enter up to 70 characters</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="input_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">70</property>
+                <property name="activates_default">True</property>
+                <property name="width_chars">70</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="main_window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">gmixvm</property>
+    <property name="role">gmixvm-main</property>
+    <property name="default_width">650</property>
+    <property name="default_height">550</property>
+    <child type="titlebar">
+      <placeholder/>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="mixal_window">
-    <property name="title" translatable="yes">MIXAL source</property>
-    <property name="default_width">570</property>
-    <property name="default_height">225</property>
     <child>
-      <widget class="GtkVBox" id="vbox5">
+      <object class="GtkBox" id="main_vbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">2</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child>
-          <widget class="GtkHandleBox" id="tb_handle">
+          <object class="GtkMenuBar" id="mainmenubar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
-              <widget class="GtkToolbar" id="dlg_toolbar">
+              <object class="GtkMenuItem" id="file">
                 <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="border_width">2</property>
-                <property name="toolbar_style">icons</property>
-                <child>
-                  <widget class="GtkToolButton" id="button14">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Run</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Run</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-go-forward</property>
-                    <signal name="clicked" handler="on_debug_run_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button15">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Next</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Step</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-goto-last</property>
-                    <signal name="clicked" handler="on_debug_next_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button16">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Clear breakpoints</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Clear</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-clear</property>
-                    <signal name="clicked" handler="on_clear_breakpoints_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button18">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Symbol table</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Symbols</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-index</property>
-                    <signal name="clicked" handler="on_symbols_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="file_menu">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="file_open">
+                        <property name="label" translatable="yes">_Load</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_file_open_activate" swapped="no"/>
+                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="edit">
+                        <property name="label">gtk-edit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_file_edit_activate" swapped="no"/>
+                        <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="compile">
+                        <property name="label" translatable="yes">_Compile</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_file_compile_activate" swapped="no"/>
+                        <accelerator key="B" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separator5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="file_exit">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_file_exit_activate" swapped="no"/>
+                        <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="debug">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">De_bug</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="debug_menu">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="debug_run">
+                        <property name="label" translatable="yes">_Run</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_debug_run_activate" swapped="no"/>
+                        <accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="debug_next">
+                        <property name="label" translatable="yes">_Next</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_debug_next_activate" swapped="no"/>
+                        <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="clear_breakpoints">
+                        <property name="label" translatable="yes">_Clear breakpoints</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_clear_breakpoints_activate" swapped="no"/>
+                        <accelerator key="C" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="symbols">
+                        <property name="label" translatable="yes">_Symbols</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_symbols_activate" swapped="no"/>
+                        <accelerator key="Y" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkToolButton" id="button22">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Source code font</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Font</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-select-font</property>
-                    <signal name="clicked" handler="on_mixal_font_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="view1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Vie_w</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="view1_menu">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="toolbars1">
+                        <property name="label" translatable="yes">_Toolbars</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="toolbars1_menu">
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckMenuItem" id="show_toolbars">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Show Toolbars</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="toolbars_style">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Style</property>
+                                <property name="use_underline">True</property>
+                                <child type="submenu">
+                                  <object class="GtkMenu" id="toolbars_style_menu">
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkRadioMenuItem" id="tb_style_icons">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">_Icons</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="active">True</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioMenuItem" id="tb_style_labels">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">_Labels</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="active">True</property>
+                                        <property name="group">tb_style_icons</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioMenuItem" id="tb_style_both">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">_Both</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="active">True</property>
+                                        <property name="group">tb_style_icons</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioMenuItem" id="tb_style_bothh">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">_Sideways</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="active">True</property>
+                                        <property name="group">tb_style_icons</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id=" detached_windows">
+                        <property name="label" translatable="yes">_Detached windows</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id=" detached_windows_menu">
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckMenuItem" id="detach_vm">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Virtual machine</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkCheckMenuItem" id="detach_source">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Source</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkCheckMenuItem" id="detach_dev">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Devices</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem10">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="settings2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">S_ettings</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="settings2_menu">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="fonts1">
+                        <property name="label" translatable="yes">Change _font</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="fonts1_menu">
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkMenuItem" id="mix">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Virtual machine</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_mix_font_activate" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="mixal">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Source</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_mixal_font_activate" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="command_prompt_menu">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Command _prompt</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_prompt_font_activate" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="command_log_menu">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Command l_og</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_log_font_activate" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="devices">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Devices</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_devices_font_activate" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="symbol_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Symbol _list</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_symbols_font_activate" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparatorMenuItem" id="separator4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="all_fonts">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_All</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_all_fonts_activate" swapped="no"/>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="device_output1">
+                        <property name="label" translatable="yes">_Device output</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_devform_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="devices_dir">
+                        <property name="label" translatable="yes">De_vices dir</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_devdir_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="external_programs1">
+                        <property name="label" translatable="yes">E_xternal programs</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_external_programs_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separator3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="save">
+                        <property name="label" translatable="yes">_Save</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_save_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="save_on_exit">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Save on _exit</property>
+                        <property name="use_underline">True</property>
+                        <signal name="toggled" handler="on_save_on_exit_toggle" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkToolButton" id="attach_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Attach window</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Attach</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-dnd</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="help">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="help_menu">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="about">
+                        <property name="label" translatable="yes">_About</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_about_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="mixal_container">
+          <object class="GtkToolbar" id="main_toolbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="toolbar_style">icons</property>
             <child>
-              <placeholder/>
+              <object class="GtkToolButton" id="load_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Open</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-open</property>
+                <signal name="clicked" handler="on_file_open_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkStatusbar" id="mixal_statusbar">
-            <property name="visible">True</property>
-          </widget>
+            <child>
+              <object class="GtkToolButton" id="compile_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Compile</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-execute</property>
+                <signal name="clicked" handler="on_file_compile_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="edit_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Edit</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-justify-fill</property>
+                <signal name="clicked" handler="on_file_edit_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem13">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="run_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Run</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-go-forward</property>
+                <signal name="clicked" handler="on_debug_run_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="step_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Next</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-goto-last</property>
+                <signal name="clicked" handler="on_debug_next_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="clear_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Clear</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-clear</property>
+                <signal name="clicked" handler="on_clear_breakpoints_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="symbols_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Symbols</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-index</property>
+                <signal name="clicked" handler="on_symbols_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button28">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Devdir</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-home</property>
+                <signal name="clicked" handler="on_devdir_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button30">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Format</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-zoom-100</property>
+                <signal name="clicked" handler="on_devform_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button31">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Programs</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-preferences</property>
+                <signal name="clicked" handler="on_external_programs_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem8">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="detach_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Detach</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-dnd-multiple</property>
+                <signal name="clicked" handler="on_detach_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="attach_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Attach</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-revert-to-saved</property>
+                <signal name="clicked" handler="on_attach_all_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="devices_window">
-    <property name="title" translatable="yes">Devices</property>
-    <property name="default_width">550</property>
-    <property name="default_height">250</property>
-    <signal name="destroy" handler="on_window_hide"/>
-    <signal name="destroy_event" handler="on_window_hide"/>
-    <signal name="delete_event" handler="on_window_hide"/>
-    <child>
-      <widget class="GtkVBox" id="vbox4">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkHandleBox" id="tb_handle">
+          <object class="GtkPaned" id="main_panel">
             <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="orientation">vertical</property>
+            <property name="position">1</property>
             <child>
-              <widget class="GtkToolbar" id="dlg_toolbar">
+              <object class="GtkNotebook" id="main_notebook">
                 <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="border_width">2</property>
-                <property name="toolbar_style">icons</property>
-                <child>
-                  <widget class="GtkToolButton" id="devdir_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Device directory</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Directory</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-home</property>
-                    <signal name="clicked" handler="on_devdir_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="output_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Output format</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Output</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-zoom-100</property>
-                    <signal name="clicked" handler="on_devform_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem11">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="button21">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Change output font</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Font</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-select-font</property>
-                    <signal name="clicked" handler="on_devices_font_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <property name="scrollable">True</property>
+              </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="prompt_vbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem12">
+                  <object class="GtkScrolledWindow" id="mixlog_scrolledwindow">
                     <property name="visible">True</property>
-                  </widget>
+                    <property name="can_focus">False</property>
+                    <property name="shadow_type">in</property>
+                    <property name="min_content_height">10</property>
+                    <child>
+                      <object class="GtkTextView" id="command_log">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">word</property>
+                        <property name="left_margin">3</property>
+                        <property name="right_margin">4</property>
+                        <property name="monospace">True</property>
+                      </object>
+                    </child>
+                  </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="attach_button">
+                  <object class="GtkEntry" id="command_prompt">
                     <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Attach window</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Attach</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-dnd</property>
-                  </widget>
+                    <property name="can_focus">True</property>
+                    <property name="has_focus">True</property>
+                    <signal name="activate" handler="on_command_prompt_activate" swapped="no"/>
+                    <signal name="key-press-event" handler="on_command_prompt_key_press_event" after="yes" swapped="no"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
             </child>
-          </widget>
+          </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="dev_container">
+          <object class="GtkStatusbar" id="main_statusbar">
             <property name="visible">True</property>
-            <child>
-              <placeholder/>
-            </child>
-          </widget>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="valign">end</property>
+            <property name="baseline_position">bottom</property>
+          </object>
           <packing>
-            <property name="position">1</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="devdir_dialog">
-    <property name="title" translatable="yes">Devices directory</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox11">
+  </object>
+  <object class="GtkWindow" id="mixal_window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">MIXAL source</property>
+    <property name="default_width">570</property>
+    <property name="default_height">225</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox" id="vbox5">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkHBox" id="hbox1">
+          <object class="GtkToolbar" id="mixal_toolbar">
             <property name="visible">True</property>
-            <property name="border_width">25</property>
-            <property name="spacing">11</property>
+            <property name="can_focus">False</property>
+            <property name="can_default">True</property>
+            <property name="border_width">2</property>
+            <property name="toolbar_style">icons</property>
             <child>
-              <widget class="GtkLabel" id="label239">
+              <object class="GtkToolButton" id="button14">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Directory</property>
-                <property name="justify">center</property>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Run</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-go-forward</property>
+                <signal name="clicked" handler="on_debug_run_activate" swapped="no"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="devdir_entry">
+              <object class="GtkToolButton" id="button15">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="editable">False</property>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Step</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-goto-last</property>
+                <signal name="clicked" handler="on_debug_next_activate" swapped="no"/>
+              </object>
               <packing>
-                <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="devdir_browse">
-                <property name="label">gtk-open</property>
+              <object class="GtkToolButton" id="button16">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_devdir_browse_clicked"/>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Clear</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-clear</property>
+                <signal name="clicked" handler="on_clear_breakpoints_activate" swapped="no"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area11">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="devdir_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
+              <object class="GtkToolButton" id="button18">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_devdir_cancel_clicked"/>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Symbols</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-index</property>
+                <signal name="clicked" handler="on_symbols_activate" swapped="no"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="devdir_ok">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem7">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_devdir_ok_clicked"/>
-              </widget>
+                <property name="can_focus">False</property>
+              </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button22">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Font</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-select-font</property>
+                <signal name="clicked" handler="on_mixal_font_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="attach_button_mixal">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Attach</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-dnd-multiple</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+        <child>
+          <object class="GtkBox" id="mixal_container">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStatusbar" id="mixal_statusbar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="mixvm_window">
+  </object>
+  <object class="GtkWindow" id="mixvm_window">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Virtual machine</property>
     <property name="default_width">640</property>
     <property name="default_height">268</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
-      <widget class="GtkVBox" id="vbox8">
+      <object class="GtkBox" id="vbox8">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkHandleBox" id="tb_handle">
+          <object class="GtkToolbar" id="mixvm_toolbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="can_default">True</property>
+            <property name="toolbar_style">icons</property>
             <child>
-              <widget class="GtkToolbar" id="dlg_toolbar">
+              <object class="GtkToolButton" id="toolbutton2">
                 <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="toolbar_style">icons</property>
-                <child>
-                  <widget class="GtkToolButton" id="toolbutton2">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Change font</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Font</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-select-font</property>
-                    <signal name="clicked" handler="on_mix_font_activate"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem9">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="attach_button">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Attach window</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Attach</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-dnd</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-              </widget>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Font</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-select-font</property>
+                <signal name="clicked" handler="on_mix_font_activate" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="separatortoolitem9">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="attach_button_mixvm">
+                <property name="name">attach_button</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Attach</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-dnd-multiple</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="mixvm_toolbar-atkobject">
+                <property name="AtkObject::accessible-role" translatable="yes">menu-bar</property>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="mixvm_container">
+          <object class="GtkFrame" id="mixvm_container">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkHBox" id="mixvm_widget">
+              <object class="GtkBox" id="mixvm_widget">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox6">
+                  <object class="GtkBox" id="vbox6">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">1</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">1</property>
                     <child>
-                      <widget class="GtkFrame" id="frame3">
+                      <object class="GtkFrame" id="frame3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">2</property>
                         <property name="label_xalign">0</property>
                         <child>
-                          <widget class="GtkTable" id="table1">
+                          <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="border_width">8</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">6</property>
                             <property name="column_spacing">11</property>
                             <property name="row_spacing">6</property>
                             <child>
-                              <widget class="GtkLabel" id="label97">
+                              <object class="GtkLabel" id="label97">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">A</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label100">
+                              <object class="GtkLabel" id="label100">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">I1</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label101">
+                              <object class="GtkLabel" id="label101">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">I2</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rA_entry">
+                              <object class="GtkEntry" id="rA_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="can_default">True</property>
                                 <property name="has_default">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">19</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rI2_entry">
+                              <object class="GtkEntry" id="rI2_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">9</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rI1_entry">
+                              <object class="GtkEntry" id="rI1_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">9</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label98">
+                              <object class="GtkLabel" id="label98">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">X</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label102">
+                              <object class="GtkLabel" id="label102">
                                 <property name="width_request">16</property>
                                 <property name="height_request">16</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">I3</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label103">
+                              <object class="GtkLabel" id="label103">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">I4</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">4</property>
                                 <property name="right_attach">5</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label104">
+                              <object class="GtkLabel" id="label104">
                                 <property name="width_request">16</property>
                                 <property name="height_request">16</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">I5</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">4</property>
                                 <property name="right_attach">5</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label105">
+                              <object class="GtkLabel" id="label105">
                                 <property name="width_request">16</property>
                                 <property name="height_request">16</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">I6</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">4</property>
                                 <property name="right_attach">5</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label99">
+                              <object class="GtkLabel" id="label99">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">J</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rX_entry">
+                              <object class="GtkEntry" id="rX_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">19</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rI4_entry">
+                              <object class="GtkEntry" id="rI4_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">9</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">5</property>
                                 <property name="right_attach">6</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rI5_entry">
+                              <object class="GtkEntry" id="rI5_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">9</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">5</property>
                                 <property name="right_attach">6</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rI6_entry">
+                              <object class="GtkEntry" id="rI6_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">9</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">5</property>
                                 <property name="right_attach">6</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rI3_entry">
+                              <object class="GtkEntry" id="rI3_entry">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="width_chars">9</property>
-                                <signal name="button_press_event" handler="on_register_click"/>
-                              </widget>
+                                <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox22">
+                              <object class="GtkBox" id="hbox22">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <widget class="GtkEntry" id="rJ_entry">
+                                  <object class="GtkEntry" id="rJ_entry">
                                     <property name="width_request">0</property>
                                     <property name="height_request">0</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="editable">False</property>
                                     <property name="width_chars">9</property>
-                                    <signal name="button_press_event" handler="on_register_click"/>
-                                  </widget>
+                                    <signal name="button-press-event" handler="on_register_click" swapped="no"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -2428,52 +2399,45 @@ disk7</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label264">
-                            <property name="visible">True</property>
-                            <property name="xpad">2</property>
-                            <property name="label" translatable="yes">Registers </property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">5</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox7">
+                      <object class="GtkBox" id="hbox7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
-                          <widget class="GtkFrame" id="frame5">
+                          <object class="GtkFrame" id="frame5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="border_width">2</property>
                             <property name="label_xalign">0</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox6">
+                              <object class="GtkBox" id="hbox6">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="border_width">1</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="greater_radio">
+                                  <object class="GtkRadioButton" id="greater_radio">
                                     <property name="label" translatable="yes">G</property>
                                     <property name="width_request">0</property>
                                     <property name="height_request">0</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip" translatable="yes">Greater</property>
                                     <property name="border_width">2</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_cmp_g_toggled"/>
-                                  </widget>
+                                    <signal name="toggled" handler="on_cmp_g_toggled" swapped="no"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -2481,20 +2445,19 @@ disk7</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkRadioButton" id="equal_radio">
+                                  <object class="GtkRadioButton" id="equal_radio">
                                     <property name="label" translatable="yes">E</property>
                                     <property name="width_request">0</property>
                                     <property name="height_request">0</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip" translatable="yes">Equal</property>
                                     <property name="border_width">2</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">greater_radio</property>
-                                    <signal name="toggled" handler="on_cmp_e_toggled"/>
-                                  </widget>
+                                    <signal name="toggled" handler="on_cmp_e_toggled" swapped="no"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -2502,20 +2465,19 @@ disk7</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkRadioButton" id="lesser_radio">
+                                  <object class="GtkRadioButton" id="lesser_radio">
                                     <property name="label" translatable="yes">L</property>
                                     <property name="width_request">0</property>
                                     <property name="height_request">0</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip" translatable="yes">Lesser</property>
                                     <property name="border_width">2</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">greater_radio</property>
-                                    <signal name="toggled" handler="on_cmp_l_toggled"/>
-                                  </widget>
+                                    <signal name="toggled" handler="on_cmp_l_toggled" swapped="no"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -2523,10 +2485,11 @@ disk7</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkVSeparator" id="vseparator9">
+                                  <object class="GtkVSeparator" id="vseparator9">
                                     <property name="height_request">7</property>
                                     <property name="visible">True</property>
-                                  </widget>
+                                    <property name="can_focus">False</property>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -2534,34 +2497,24 @@ disk7</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="over_toggle">
+                                  <object class="GtkCheckButton" id="over_toggle">
                                     <property name="label" translatable="yes">Overflow</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_overflow_toggled"/>
-                                  </widget>
+                                    <signal name="toggled" handler="on_overflow_toggled" swapped="no"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">4</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                            <child>
-                              <widget class="GtkLabel" id="label266">
-                                <property name="visible">True</property>
-                                <property name="xpad">2</property>
-                                <property name="label" translatable="yes">Flags </property>
-                              </widget>
-                              <packing>
-                                <property name="type">label_item</property>
-                              </packing>
-                            </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -2569,20 +2522,19 @@ disk7</property>
                           </packing>
                         </child>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <widget class="GtkFrame" id="frame6">
+                          <object class="GtkFrame" id="frame6">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="border_width">2</property>
                             <property name="label_xalign">0</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox1">
+                              <object class="GtkBox" id="hbox2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="border_width">4</property>
                                 <property name="spacing">1</property>
                                 <child>
-                                  <widget class="GtkEntry" id="loc_entry">
+                                  <object class="GtkEntry" id="loc_entry">
                                     <property name="width_request">0</property>
                                     <property name="height_request">0</property>
                                     <property name="visible">True</property>
@@ -2591,7 +2543,7 @@ disk7</property>
                                     <property name="max_length">4</property>
                                     <property name="width_chars">6</property>
                                     <property name="text" translatable="yes">0</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -2600,19 +2552,19 @@ disk7</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="loc_arrow">
+                                  <object class="GtkButton" id="loc_arrow">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip" translatable="yes">View loc address</property>
-                                    <signal name="clicked" handler="on_loc_arrow_clicked"/>
+                                    <signal name="clicked" handler="on_loc_arrow_clicked" swapped="no"/>
                                     <child>
-                                      <widget class="GtkImage" id="image4">
+                                      <object class="GtkImage" id="image4">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-jump-to</property>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -2620,19 +2572,9 @@ disk7</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label1323">
-                                <property name="visible">True</property>
-                                <property name="xpad">2</property>
-                                <property name="label" translatable="yes">Location </property>
-                              </widget>
-                              <packing>
-                                <property name="type">label_item</property>
-                              </packing>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -2640,31 +2582,35 @@ disk7</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">5</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="frame2">
+                      <object class="GtkFrame" id="frame2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">2</property>
                         <property name="label_xalign">0</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox4">
+                          <object class="GtkBox" id="hbox4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="border_width">5</property>
                             <property name="spacing">5</property>
                             <property name="homogeneous">True</property>
                             <child>
-                              <widget class="GtkLabel" id="label258">
+                              <object class="GtkLabel" id="label258">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Uptime:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -2672,14 +2618,15 @@ disk7</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="uptime_label">
+                              <object class="GtkLabel" id="uptime_label">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">00000000</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -2687,12 +2634,13 @@ disk7</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label260">
+                              <object class="GtkLabel" id="label260">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Elapsed:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -2701,14 +2649,15 @@ disk7</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="elapsed_label">
+                              <object class="GtkLabel" id="elapsed_label">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">000000</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -2716,12 +2665,13 @@ disk7</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label261">
+                              <object class="GtkLabel" id="label261">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Program:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -2730,41 +2680,32 @@ disk7</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="program_label">
+                              <object class="GtkLabel" id="program_label">
                                 <property name="width_request">0</property>
                                 <property name="height_request">0</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">000000</property>
                                 <property name="justify">center</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">5</property>
                               </packing>
                             </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label263">
-                            <property name="visible">True</property>
-                            <property name="xpad">2</property>
-                            <property name="label" translatable="yes">Times </property>
-                            <property name="justify">center</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">5</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -2773,292 +2714,421 @@ disk7</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame4">
+                  <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">7</property>
                     <property name="label_xalign">0</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="memory_scroll">
+                      <object class="GtkScrolledWindow" id="memory_scroll">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="border_width">5</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <widget class="GtkTreeView" id="memory_cells">
+                          <object class="GtkTreeView" id="memory_cells">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_BUTTON_PRESS_MASK</property>
                             <property name="rules_hint">True</property>
-                          </widget>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
+                          </object>
                         </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label265">
-                        <property name="visible">True</property>
-                        <property name="xpad">2</property>
-                        <property name="label" translatable="yes">Memory </property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="padding">3</property>
                     <property name="pack_type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="symbols_dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Symbol table</property>
+    <property name="default_width">245</property>
+    <property name="default_height">265</property>
+    <property name="icon_name">dictionary</property>
+    <property name="type_hint">dialog</property>
+    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox10">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-              <widget class="GtkLabel" id="label1414">
+              <object class="GtkButton" id="button1">
                 <property name="visible">True</property>
-                <property name="xpad">2</property>
-                <property name="label" translatable="yes">MIX Virtual Machine </property>
-              </widget>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <signal name="clicked" handler="on_symbol_ok_clicked" swapped="no"/>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <object class="GtkBox" id="hbox36">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <object class="GtkImage" id="image57">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-close</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label1437">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Close</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
               <packing>
-                <property name="type">label_item</property>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
-            <property name="position">1</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow26">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="symbols_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="headers_visible">False</property>
+                <property name="reorderable">True</property>
+                <property name="rules_hint">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="input_dialog">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">MIX Console input</property>
+  </object>
+  <object class="GtkDialog" id="word_dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Enter value</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="window_position">mouse</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="close" handler="gtk_widget_hide"/>
+    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="destroy-event" handler="gtk_widget_hide" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox12">
+      <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <widget class="GtkVBox" id="vbox7">
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
             <property name="visible">True</property>
-            <property name="border_width">3</property>
-            <property name="orientation">vertical</property>
-            <property name="homogeneous">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-              <widget class="GtkLabel" id="label1438">
+              <object class="GtkButton" id="word_cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Enter up to 70 characters</property>
-              </widget>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_word_cancel_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="input_entry">
+              <object class="GtkButton" id="word_reset">
+                <property name="label">gtk-clear</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">70</property>
-                <property name="activates_default">True</property>
-                <property name="width_chars">70</property>
-              </widget>
+                <property name="focus_on_click">False</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_word_reset_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area12">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="okbutton1">
+              <object class="GtkButton" id="word_ok">
                 <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+                <signal name="clicked" handler="on_word_ok_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="about_dialog">
-    <property name="border_width">2</property>
-    <property name="title" translatable="yes">About gmixvm</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
-    <signal name="destroy" handler="gtk_widget_hide"/>
-    <signal name="destroy_event" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox13">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkFrame" id="frame7">
+          <object class="GtkFixed" id="word_layout">
             <property name="visible">True</property>
-            <property name="border_width">3</property>
-            <property name="label_xalign">0</property>
-            <property name="label_yalign">0</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">5</property>
             <child>
-              <widget class="GtkAlignment" id="alignment2">
+              <object class="GtkEntry" id="word_decimal">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
                 <property name="visible">True</property>
-                <child>
-                  <widget class="GtkVBox" id="vbox9">
-                    <property name="visible">True</property>
-                    <property name="border_width">15</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">10</property>
-                    <child>
-                      <widget class="GtkLabel" id="label1441">
-                        <property name="visible">True</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;MIX virtual machine&lt;/b&gt;
-&lt;small&gt;(GNU MDK)&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="justify">center</property>
-                      </widget>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="version_label">
-                        <property name="width_request">52</property>
-                        <property name="height_request">16</property>
-                        <property name="visible">True</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">label223</property>
-                        <property name="justify">center</property>
-                      </widget>
-                      <packing>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="mdk_web">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">http://www.gnu.org/software/mdk/mdk.html</property>
-                        <property name="use_markup">True</property>
-                        <property name="justify">center</property>
-                        <property name="selectable">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1440">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">&lt;small&gt;Please send bug reports to bug-mdk@gnu.org&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="justify">center</property>
-                        <property name="wrap">True</property>
-                        <property name="selectable">True</property>
-                      </widget>
-                      <packing>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1442">
-                        <property name="visible">True</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">&lt;small&gt;Copyright (C) 2001-2009
-Free Software Foundation, Inc&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="justify">center</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="events">GDK_KEY_PRESS_MASK</property>
+                <property name="width_chars">28</property>
+                <property name="text" translatable="yes">0</property>
+                <signal name="changed" handler="on_word_dec_changed" after="yes" swapped="no"/>
+              </object>
+              <packing>
+                <property name="x">88</property>
+                <property name="y">64</property>
+              </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area13">
-            <property name="visible">True</property>
-            <property name="layout_style">spread</property>
             <child>
-              <widget class="GtkButton" id="okbutton2">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
+              <object class="GtkEntry" id="word_b2">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="border_width">1</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_about_clicked"/>
-              </widget>
+                <property name="events">GDK_KEY_PRESS_MASK</property>
+                <property name="max_length">2</property>
+                <property name="width_chars">3</property>
+                <property name="text" translatable="yes">0</property>
+                <signal name="changed" handler="on_word_byte_changed" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="x">144</property>
+                <property name="y">32</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="word_b3">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_BUTTON_PRESS_MASK</property>
+                <property name="max_length">2</property>
+                <property name="width_chars">3</property>
+                <property name="text" translatable="yes">0</property>
+                <signal name="changed" handler="on_word_byte_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="x">176</property>
+                <property name="y">32</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="word_b4">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_KEY_PRESS_MASK</property>
+                <property name="max_length">2</property>
+                <property name="width_chars">3</property>
+                <property name="text" translatable="yes">0</property>
+                <signal name="changed" handler="on_word_byte_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="x">208</property>
+                <property name="y">32</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="word_b5">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_KEY_PRESS_MASK</property>
+                <property name="max_length">2</property>
+                <property name="width_chars">3</property>
+                <property name="text" translatable="yes">0</property>
+                <signal name="changed" handler="on_word_byte_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="x">238</property>
+                <property name="y">32</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="word_b1">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_KEY_PRESS_MASK</property>
+                <property name="max_length">2</property>
+                <property name="width_chars">3</property>
+                <property name="text" translatable="yes">0</property>
+                <signal name="changed" handler="on_word_byte_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="x">112</property>
+                <property name="y">32</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="word_sign">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_KEY_PRESS_MASK</property>
+                <property name="max_length">1</property>
+                <property name="width_chars">2</property>
+                <property name="text" translatable="yes">+</property>
+                <signal name="changed" handler="on_word_sign_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="x">88</property>
+                <property name="y">32</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkLabel" id="label60">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Decimal</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="x">14</property>
+                <property name="y">68</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label61">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Bytes</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="x">15</property>
+                <property name="y">36</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="word_label">
+                <property name="width_request">0</property>
+                <property name="height_request">0</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Enter value</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="x">112</property>
+                <property name="y">8</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">word_cancel</action-widget>
+      <action-widget response="-5">word_ok</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/mixgtk/mixgtk_cmd_dispatcher.c b/mixgtk/mixgtk_cmd_dispatcher.c
index be58f13..12ed394 100644
--- a/mixgtk/mixgtk_cmd_dispatcher.c
+++ b/mixgtk/mixgtk_cmd_dispatcher.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c :
  * Implementation of the functions declared in mixgtk_cmd_dispatcher.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -411,14 +411,14 @@ on_command_prompt_key_press_event (GtkEntry *w, GdkEventKey *e, gpointer d)
 
 #ifdef HAVE_LIBHISTORY
   HIST_ENTRY *entry = NULL;
-  if (key == GDK_Up)
+  if (key == GDK_KEY_Up)
     {
       entry = previous_history ();
       if (entry && entry->line)
 	gtk_entry_set_text (w, entry->line);
       result = TRUE;
     }
-  if (key == GDK_Down)
+  if (key == GDK_KEY_Down)
     {
       entry = next_history ();
       if (entry && entry->line)
@@ -427,7 +427,7 @@ on_command_prompt_key_press_event (GtkEntry *w, GdkEventKey *e, gpointer d)
     }
 #endif
 
-  if (key == GDK_Tab)
+  if (key == GDK_KEY_Tab)
     {
       complete_command_ ();
       result = TRUE;
diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c
index 1d28b6e..c1abd0b 100644
--- a/mixgtk/mixgtk_device.c
+++ b/mixgtk/mixgtk_device.c
@@ -1,7 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_device.c :
  * actual types for mixgtk devices
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -181,8 +181,8 @@ init_input_widgets_ (void)
 {
   input_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_INPUT_DIALOG);
   g_assert (input_dlg_);
-  input_dlg_entry_ = GTK_ENTRY (mixgtk_widget_factory_get_child_by_name
-                                (MIXGTK_INPUT_DIALOG, "input_entry"));
+  input_dlg_entry_ =
+    GTK_ENTRY (mixgtk_widget_factory_get_by_name ("input_entry"));
   g_assert (input_dlg_entry_);
   GtkEntryCompletion *completion = gtk_entry_completion_new ();
   input_list_ = gtk_list_store_new (1, G_TYPE_STRING);
@@ -195,6 +195,7 @@ init_input_widgets_ (void)
   gtk_entry_completion_set_minimum_key_length (completion, 1);
   gtk_entry_completion_set_text_column (completion, 0);
   gtk_entry_set_completion (input_dlg_entry_, completion);
+  gtk_widget_hide (input_dlg_);
 }
 
 static gboolean
@@ -339,7 +340,7 @@ mixgtk_device_construct_gui_ (struct mixgtk_device_t *dev)
         gtk_tree_view_new_with_model (GTK_TREE_MODEL (bindev->store));
 
       gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dev->widget), FALSE);
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE);
+      // gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE);
 
       for (k = 0; k < BIN_DEV_COL_; ++k)
 	{
@@ -480,11 +481,17 @@ mixgtk_device_set_format (mix_device_type_t dev, gboolean dec)
 }
 
 
+static gpointer
+combo_child_ ()
+{
+  return gtk_bin_get_child (GTK_BIN (combo_));
+}
+
 static mix_device_type_t
 get_device_idx_ (void)
 {
   int k;
-  const gchar *name = gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_)->child));
+  const gchar *name = gtk_entry_get_text (GTK_ENTRY (combo_child_ ()));
   for (k = 0; k <= LAST_BIN_DEV_; ++k)
     if (!strcmp (name, DEF_NAMES_[k])) break;
   return k;
@@ -495,16 +502,13 @@ init_devform_ (void)
 {
   devdlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVFORM_DIALOG);
   g_assert (devdlg_);
-  dtoggle_ = mixgtk_widget_factory_get_child_by_name
-    (MIXGTK_DEVFORM_DIALOG, "decradio");
+  dtoggle_ = mixgtk_widget_factory_get_by_name ("decradio");
   g_assert (dtoggle_);
-  wtoggle_ = mixgtk_widget_factory_get_child_by_name
-    (MIXGTK_DEVFORM_DIALOG, "wordradio");
+  wtoggle_ = mixgtk_widget_factory_get_by_name ("wordradio");
   g_assert (wtoggle_);
-  combo_ = mixgtk_widget_factory_get_child_by_name
-    (MIXGTK_DEVFORM_DIALOG, "dev_combo");
+  combo_ = mixgtk_widget_factory_get_by_name ("dev_combo");
   g_assert (combo_);
-  gtk_editable_set_editable (GTK_EDITABLE (GTK_BIN (combo_)->child), FALSE);
+  gtk_editable_set_editable (GTK_EDITABLE (combo_child_ ()), FALSE);
 }
 
 void
@@ -572,9 +576,8 @@ on_devdir_activate ()
     {
       devdir_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVDIR_DIALOG);
       g_assert (devdir_dlg_);
-      devdir_entry_ = GTK_ENTRY
-	(mixgtk_widget_factory_get_child_by_name (MIXGTK_DEVDIR_DIALOG,
-						  DEVDIR_ENTRY_NAME));
+      devdir_entry_ =
+        GTK_ENTRY (mixgtk_widget_factory_get_by_name (DEVDIR_ENTRY_NAME));
       g_assert (devdir_entry_);
     }
   gtk_entry_set_text (devdir_entry_, mix_device_get_dir ());
@@ -591,8 +594,8 @@ on_devdir_browse_clicked ()
     gtk_file_chooser_dialog_new (_("Devices folder"),
                                  GTK_WINDOW (devdir_dlg_),
                                  GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                 "_Cancel", GTK_RESPONSE_CANCEL,
+                                 "_Open", GTK_RESPONSE_ACCEPT,
                                  NULL);
 
   if (current != NULL)
diff --git a/mixgtk/mixgtk_external.c b/mixgtk/mixgtk_external.c
index 534542f..bf04c2b 100644
--- a/mixgtk/mixgtk_external.c
+++ b/mixgtk/mixgtk_external.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c :
  * Implementation of the functions declared in mixgtk_external.h
  * ------------------------------------------------------------------
- * Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,8 +95,7 @@ init_widgets_ (void)
 
   for (k = 0; k < ext_wdg_no; ++k)
     {
-      ext_wdg_[k] = mixgtk_widget_factory_get_child_by_name
-        (MIXGTK_EXTERNPROG_DIALOG, ext_wdg_names_[k]);
+      ext_wdg_[k] = mixgtk_widget_factory_get_by_name (ext_wdg_names_[k]);
       g_assert (ext_wdg_[k]);
     }
 
diff --git a/mixgtk/mixgtk_fontsel.c b/mixgtk/mixgtk_fontsel.c
index f1674ef..0f3012a 100644
--- a/mixgtk/mixgtk_fontsel.c
+++ b/mixgtk/mixgtk_fontsel.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_fontsel.c :
  * Implementation of the functions declared in mixgtk_fontsel.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,8 @@
 #include "mixgtk_device.h"
 #include "mixgtk_fontsel.h"
 
-static GtkFontSelectionDialog *fontsel_dialog_ = NULL;
+static GtkFontChooserDialog *fontsel_dialog_ = NULL;
+#define FONTSEL_ GTK_FONT_CHOOSER (fontsel_dialog_)
 
 static const gchar *keys_[MIX_FONT_NO] = {
   "MIX.font", "Prompt.font", "Log.font", "MIXAL.font", "Devices.font",
@@ -42,7 +43,7 @@ static void
 init_fontsel_ (void)
 {
   fontsel_dialog_ =
-    GTK_FONT_SELECTION_DIALOG
+    GTK_FONT_CHOOSER_DIALOG
     (mixgtk_widget_factory_get_dialog (MIXGTK_FONTSEL_DIALOG));
   g_assert (fontsel_dialog_ != NULL);
 }
@@ -67,8 +68,7 @@ mixgtk_fontsel_set_font (mixgtk_font_t f, GtkWidget *w)
 
   if (font_desc)
     {
-      gtk_widget_modify_font (w, font_desc);
-      gtk_widget_queue_draw (w);
+      gtk_widget_override_font (w, font_desc);
       pango_font_description_free (font_desc);
     }
   else
@@ -87,8 +87,7 @@ mixgtk_fontsel_query_font (mixgtk_font_t f, GtkWidget **w, size_t no)
   if (!fontsel_dialog_) init_fontsel_ ();
 
   current = mixgtk_config_get (keys_[f]);
-  gtk_font_selection_dialog_set_font_name (fontsel_dialog_,
-                                           current? current : default_font_);
+  gtk_font_chooser_set_font (FONTSEL_, current? current : default_font_);
 
   while (result == GTK_RESPONSE_APPLY)
     {
@@ -98,7 +97,7 @@ mixgtk_fontsel_query_font (mixgtk_font_t f, GtkWidget **w, size_t no)
           gint k;
           mixgtk_config_update
             (keys_[f],
-             gtk_font_selection_dialog_get_font_name (fontsel_dialog_));
+             gtk_font_chooser_get_font (FONTSEL_));
           for (k = 0; k < no; ++k)
             mixgtk_fontsel_set_font (f, w[k]);
           ret = TRUE;
@@ -117,8 +116,7 @@ on_all_fonts_activate (void)
   if (!fontsel_dialog_) init_fontsel_ ();
 
   current = mixgtk_config_get (keys_[MIX_FONT_DEFAULT]);
-  gtk_font_selection_dialog_set_font_name (fontsel_dialog_,
-                                           current? current : default_font_);
+  gtk_font_chooser_set_font (FONTSEL_, current? current : default_font_);
 
   while (result == GTK_RESPONSE_APPLY)
     {
@@ -126,7 +124,7 @@ on_all_fonts_activate (void)
       if (result != GTK_RESPONSE_CANCEL)
         {
           gint k;
-          current = gtk_font_selection_dialog_get_font_name (fontsel_dialog_);
+          current = gtk_font_chooser_get_font (FONTSEL_);
 
           for (k = 0; k < MIX_FONT_NO; ++k)
             mixgtk_config_update (keys_[k], current);
diff --git a/mixgtk/mixgtk_gen_handlers.c b/mixgtk/mixgtk_gen_handlers.c
index 4124b9c..64fb06f 100644
--- a/mixgtk/mixgtk_gen_handlers.c
+++ b/mixgtk/mixgtk_gen_handlers.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_gen_handlers.c :
  * Implementation of the functions declared in mixgtk_gen_handlers.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@ get_chooser_ (const gchar *title, gboolean src)
         (gtk_file_chooser_dialog_new ("gmixvm",
                                       NULL,
                                       GTK_FILE_CHOOSER_ACTION_OPEN,
-                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                      "_Cancel", GTK_RESPONSE_CANCEL,
+                                      "_Open", GTK_RESPONSE_ACCEPT,
                                       NULL));
       src_filter = gtk_file_filter_new ();
       gtk_file_filter_add_pattern (src_filter, "*.mixal");
@@ -185,7 +185,8 @@ on_clear_breakpoints_activate (GtkWidget *w, gpointer data)
 void
 on_save_on_exit_toggle (GtkWidget *w, gpointer data)
 {
-  mixgtk_config_set_autosave (GTK_CHECK_MENU_ITEM (w)->active);
+  gboolean active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (w));
+  mixgtk_config_set_autosave (active);
 }
 
 void
@@ -193,5 +194,3 @@ on_save_activate (GtkWidget *w, gpointer data)
 {
   mixgtk_config_save ();
 }
-
-
diff --git a/mixgtk/mixgtk_input.c b/mixgtk/mixgtk_input.c
index e49810d..944392a 100644
--- a/mixgtk/mixgtk_input.c
+++ b/mixgtk/mixgtk_input.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_input.c :
  * Implementation of the functions declared in mixgtk_input.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -136,14 +136,14 @@ on_word_sign_changed (GtkEditable *sign, gpointer *data)
       mix_word_t w =
         mix_word_new (atoi (gtk_entry_get_text (GTK_ENTRY (childs_[DEC_]))));
 
-      g_signal_handlers_block_by_func (GTK_OBJECT (sign),
+      g_signal_handlers_block_by_func (sign,
                                        on_word_sign_changed, data);
 
       if (txt[0] != '+' && txt[0] != '-') txt[0] = '+';
       gtk_editable_delete_text (sign, 0, 1);
       gtk_editable_insert_text (sign, txt, 1, &pos);
 
-      g_signal_handlers_unblock_by_func (GTK_OBJECT (sign),
+      g_signal_handlers_unblock_by_func (sign,
                                          on_word_sign_changed, data);
       set_word_ (txt[0] == '-' ? mix_word_negative (w) : w);
     }
@@ -185,8 +185,7 @@ init_dialog_ (void)
   g_assert (dialog_ != NULL);
   for (k = 0; k < SIZE_; ++k)
     {
-      childs_[k] = mixgtk_widget_factory_get_child_by_name
-	(MIXGTK_WORD_DIALOG, WGT_NAMES_[k]);
+      childs_[k] = mixgtk_widget_factory_get_by_name (WGT_NAMES_[k]);
       g_assert (childs_[k] != NULL);
     }
 }
@@ -202,13 +201,10 @@ set_word_ (mix_word_t word)
   g_snprintf (BUFFER, SIZE, "%s%d", neg ? "-" : "", val);
 
 
-  g_signal_handlers_block_by_func (GTK_OBJECT (childs_[DEC_]),
-                                   on_word_dec_changed, NULL);
-  g_signal_handlers_block_by_func (GTK_OBJECT (childs_[SIGN_]),
-                                   on_word_sign_changed, NULL);
+  g_signal_handlers_block_by_func (childs_[DEC_], on_word_dec_changed, NULL);
+  g_signal_handlers_block_by_func (childs_[SIGN_], on_word_sign_changed, NULL);
   for (k = B1_; k <= B5_; ++k)
-    g_signal_handlers_block_by_func (GTK_OBJECT (childs_[k]),
-                                     on_word_byte_changed, NULL);
+    g_signal_handlers_block_by_func (childs_[k], on_word_byte_changed, NULL);
 
   gtk_entry_set_text (GTK_ENTRY (childs_[DEC_]), BUFFER);
   gtk_entry_set_text (GTK_ENTRY (childs_[SIGN_]), neg ? "-" : "+");
@@ -221,11 +217,7 @@ set_word_ (mix_word_t word)
     }
 
   for (k = B1_; k <= B5_; ++k)
-    g_signal_handlers_unblock_by_func (GTK_OBJECT (childs_[k]),
-                                       on_word_byte_changed, NULL);
-  g_signal_handlers_unblock_by_func (GTK_OBJECT (childs_[DEC_]),
-                                     on_word_dec_changed, NULL);
-  g_signal_handlers_unblock_by_func (GTK_OBJECT (childs_[SIGN_]),
-                                     on_word_sign_changed, NULL);
+    g_signal_handlers_unblock_by_func (childs_[k], on_word_byte_changed, NULL);
+  g_signal_handlers_unblock_by_func (childs_[DEC_], on_word_dec_changed, NULL);
+  g_signal_handlers_unblock_by_func (childs_[SIGN_], on_word_sign_changed, NULL);
 }
-
diff --git a/mixgtk/mixgtk_mixal.c b/mixgtk/mixgtk_mixal.c
index 5470eb8..cb09b70 100644
--- a/mixgtk/mixgtk_mixal.c
+++ b/mixgtk/mixgtk_mixal.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_mixal.c :
  * Implementation of the functions declared in mixgtk_mixal.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,8 +42,8 @@ static GtkTreeView *symbols_view_ = NULL;
 static GtkListStore *symbols_store_ = NULL;
 static const gchar *SYMBOLS_VIEW_NAME_ = "symbols_view";
 
-static const gchar *bp_stock_id_ = NULL;
-static const gchar *pc_stock_id_ = NULL;
+static const gchar *bp_stock_id_ = "gtk-stop";
+static const gchar *pc_stock_id_ = "gtk-go-forward";
 static const guint bp_stock_size_ = GTK_ICON_SIZE_MENU;
 
 enum {
@@ -77,8 +77,7 @@ init_symbols_ (void)
   symbols_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_SYMBOLS_DIALOG);
   g_assert (symbols_dlg_);
   symbols_view_ = GTK_TREE_VIEW
-    (mixgtk_widget_factory_get_child_by_name
-     (MIXGTK_SYMBOLS_DIALOG, SYMBOLS_VIEW_NAME_));
+    (mixgtk_widget_factory_get_by_name (SYMBOLS_VIEW_NAME_));
   g_assert (symbols_view_);
 
   mixgtk_fontsel_set_font (MIX_FONT_SYMBOLS, GTK_WIDGET (symbols_view_));
@@ -148,7 +147,6 @@ fill_symbols_ (const mix_symbol_table_t *table)
 static void
 init_clist_ (void)
 {
-  GtkStockItem item;
 
   GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
   GtkCellRenderer *bprenderer = gtk_cell_renderer_pixbuf_new ();
@@ -166,7 +164,7 @@ init_clist_ (void)
 
   gtk_tree_view_set_model (clist_, GTK_TREE_MODEL (clist_store_));
   g_object_unref (G_OBJECT (clist_store_));
-  gtk_tree_view_set_rules_hint (clist_, TRUE);
+  // gtk_tree_view_set_rules_hint (clist_, TRUE);
 
   gtk_tree_view_append_column
     (clist_,
@@ -190,16 +188,6 @@ init_clist_ (void)
                                                "text", CLIST_CODE_COL,
                                                NULL));
 
-  if (gtk_stock_lookup (GTK_STOCK_STOP, &item))
-    {
-      bp_stock_id_ = item.stock_id;
-    }
-
-  if (gtk_stock_lookup (GTK_STOCK_GO_FORWARD, &item))
-    {
-      pc_stock_id_ = item.stock_id;
-    }
-
   symbols_dlg_ = NULL;
   symbols_view_ = NULL;
 
diff --git a/mixgtk/mixgtk_mixvm.c b/mixgtk/mixgtk_mixvm.c
index 268bc25..777c6f3 100644
--- a/mixgtk/mixgtk_mixvm.c
+++ b/mixgtk/mixgtk_mixvm.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_mixvm.c :
  * Implementation of the functions declared in mixgtk_mixvm.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008, 2019 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -258,31 +258,37 @@ mixgtk_mixvm_update_vm_widgets (void)
 
 
 /* update cmp flag */
+static gboolean
+button_active_ (GtkWidget *widget)
+{
+  return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+}
+
 void
 on_cmp_e_toggled (GtkWidget *widget, gpointer data)
 {
-  if (GTK_TOGGLE_BUTTON (widget)->active)
+  if (button_active_ (widget))
     mix_vm_set_cmpflag (vm_, mix_EQ);
 }
 
 void
 on_cmp_l_toggled (GtkWidget *widget, gpointer data)
 {
-  if (GTK_TOGGLE_BUTTON (widget)->active)
+  if (button_active_ (widget))
     mix_vm_set_cmpflag (vm_, mix_LESS);
 }
 
 void
 on_cmp_g_toggled (GtkWidget *widget, gpointer data)
 {
-  if (GTK_TOGGLE_BUTTON (widget)->active)
+  if (button_active_ (widget))
     mix_vm_set_cmpflag (vm_, mix_GREAT);
 }
 
 void
 on_overflow_toggled (GtkWidget *widget, gpointer data)
 {
-  mix_vm_set_overflow (vm_, GTK_TOGGLE_BUTTON (widget)->active);
+  mix_vm_set_overflow (vm_, button_active_ (widget));
 }
 
 void
@@ -532,4 +538,3 @@ init_mem_ (void)
 
   return TRUE;
 }
-
diff --git a/mixgtk/mixgtk_widgets.c b/mixgtk/mixgtk_widgets.c
index 2bfff34..a5bd5e5 100644
--- a/mixgtk/mixgtk_widgets.c
+++ b/mixgtk/mixgtk_widgets.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_widgets.c :
  * Implementation of the functions declared in mixgtk_widgets.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004, 2006, 2007, 2014 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006, 2007, 2014, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 
 
 #include <unistd.h>
-#include <glade/glade.h>
 #include <mixlib/mix.h>
 #include "mixgtk_config.h"
 #include "mixgtk_widgets.h"
@@ -84,18 +83,11 @@ static const gchar *names_[] = {
 #define WIDGET_NO_ (sizeof (names_) / sizeof (names_[0]))
 
 /* the glade specs */
-static GladeXML *xml_[DLG_NO_] = {NULL};
+static GtkBuilder *builder_ = NULL;
 
 /* the xml file name */
 static const gchar *file_ = NULL;
 
-static void init_xml_ (mixgtk_dialog_id_t dlg)
-{
-  xml_[dlg] = glade_xml_new (file_, dnames_[dlg], NULL);
-  glade_xml_signal_autoconnect (xml_[dlg]);
-  g_assert (xml_[dlg] != NULL);
-}
-
 /* create a new factory from an xml glade file */
 gboolean
 mixgtk_widget_factory_init (void)
@@ -103,20 +95,16 @@ mixgtk_widget_factory_init (void)
   if (!file_)
     {
       const gchar *glade_file = GLADE_FILE;
-      glade_init ();
       if (access (glade_file, R_OK)) {
 	if (access (LOCAL_GLADE_FILE, R_OK)) return FALSE;
 	glade_file = LOCAL_GLADE_FILE;
       }
       file_ = g_strdup (glade_file);
-    }
-  else
-    {
-      gint k;
-      for (k = 0; k < DLG_NO_; ++k) if (xml_[k]) xml_[k] = NULL;
+      builder_ = gtk_builder_new_from_file (file_);
+      g_assert (builder_);
+      gtk_builder_connect_signals (builder_, NULL);
     }
 
-  init_xml_ (MIXGTK_MAIN);
   return TRUE;
 }
 
@@ -126,7 +114,7 @@ mixgtk_widget_factory_get (mixgtk_dialog_id_t dlg, mixgtk_widget_id_t widget)
 {
   g_assert ((long)widget < WIDGET_NO_);
 
-  return mixgtk_widget_factory_get_child_by_name (dlg, names_[widget]);
+  return mixgtk_widget_factory_get_by_name (names_[widget]);
 }
 
 
@@ -134,17 +122,14 @@ GtkWidget *
 mixgtk_widget_factory_get_dialog (mixgtk_dialog_id_t dlg)
 {
   g_assert (dlg < DLG_NO_);
-
-  if (!xml_[dlg]) init_xml_ (dlg);
-  return glade_xml_get_widget (xml_[dlg], dnames_[dlg]);
+  return GTK_WIDGET (gtk_builder_get_object (builder_, dnames_[dlg]));
 }
 
 GtkWidget *
-mixgtk_widget_factory_get_child_by_name (mixgtk_dialog_id_t dlg,
-					 const gchar *name)
+mixgtk_widget_factory_get_by_name (const gchar *name)
 {
-  g_assert (dlg < DLG_NO_);
   g_assert (name != NULL);
-  if (!xml_[dlg]) init_xml_ (dlg);
-  return glade_xml_get_widget (xml_[dlg], name);
+  GtkWidget *w = GTK_WIDGET (gtk_builder_get_object (builder_, name));
+  if (!w) g_warning ("Widget '%s' not found", name);
+  return w;
 }
diff --git a/mixgtk/mixgtk_widgets.h b/mixgtk/mixgtk_widgets.h
index e1c7ec3..9263583 100644
--- a/mixgtk/mixgtk_widgets.h
+++ b/mixgtk/mixgtk_widgets.h
@@ -1,7 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_widgets.h :
  * glade-based factory of mixvm widgets
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -94,8 +94,6 @@ mixgtk_widget_factory_get (mixgtk_dialog_id_t dlg, mixgtk_widget_id_t widget);
 
 /* Get a widget by name */
 extern GtkWidget *
-mixgtk_widget_factory_get_child_by_name (mixgtk_dialog_id_t dlg,
-					 const gchar *name);
+mixgtk_widget_factory_get_by_name (const gchar *name);
 
 #endif /* MIXGTK_WIDGETS_H */
-
diff --git a/mixgtk/mixgtk_wm.c b/mixgtk/mixgtk_wm.c
index 93f64ca..b442eb9 100644
--- a/mixgtk/mixgtk_wm.c
+++ b/mixgtk/mixgtk_wm.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_wm.c :
  * Implementation of the functions declared in mixgtk_wm.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,8 @@ typedef struct window_info_t_
   GtkCheckMenuItem *menu;
   const gchar *menu_name;
   const gchar *config_key;
+  const gchar *toolbar_name;
+  const gchar *attach_button;
   gboolean detached;
   void (*detach) (void);
   void (*attach) (void);
@@ -82,17 +84,21 @@ static void mixal_attach_ (void);
 static void mixal_detach_ (void);
 static void dev_attach_ (void);
 static void dev_detach_ (void);
+static void reparent_ (GtkWidget *widget, GtkWidget *parent);
 static void update_attach_buttons_ (void);
 static void on_tb_style_ (GtkMenuItem *w, gpointer style);
 static void on_nb_switch_ (GtkNotebook *notebook, GtkWidget *page,
                            guint page_num, gpointer user_data);
 
 static window_info_t_ infos_[] = {
-  {MIXGTK_MIXVM_DIALOG, NULL, NULL, "detach_vm", "MIX.detach",
+  {MIXGTK_MIXVM_DIALOG, NULL, NULL,
+   "detach_vm", "MIX.detach", "mixvm_toolbar", "attach_button_mixvm",
    FALSE, mixvm_detach_, mixvm_attach_},
-  {MIXGTK_MIXAL_DIALOG, NULL, NULL, "detach_source", "MIXAL.detach",
+  {MIXGTK_MIXAL_DIALOG, NULL, NULL,
+   "detach_source", "MIXAL.detach", "mixal_toolbar", "attach_button_mixal",
    FALSE, mixal_detach_, mixal_attach_},
-  {MIXGTK_DEVICES_DIALOG, NULL, NULL, "detach_dev", "Devices.detach",
+  {MIXGTK_DEVICES_DIALOG, NULL, NULL,
+   "detach_dev", "Devices.detach", "dev_toolbar", "attach_button_dev",
    FALSE, dev_detach_, dev_attach_}
 };
 
@@ -197,10 +203,10 @@ on_attach_toggled (GtkCheckMenuItem *item)
   for (k = 0; k < INF_NO_; ++k)
     if (item == infos_[k].menu) break;
   g_return_if_fail (k < INF_NO_);
-  if (item->active) mixgtk_wm_detach_window (k);
+  gboolean active = gtk_check_menu_item_get_active (item);
+  if (active) mixgtk_wm_detach_window (k);
   else mixgtk_wm_attach_window (k);
-  mixgtk_config_update (infos_[k].config_key,
-                        (item->active)? DETACH_YES_ : DETACH_NO_);
+  mixgtk_config_update (infos_[k].config_key, active? DETACH_YES_ : DETACH_NO_);
 }
 
 void
@@ -216,8 +222,8 @@ on_window_hide (GtkWidget *w)
 void
 on_show_toolbars_toggled (GtkCheckMenuItem *item)
 {
-  if (item->active != mixgtk_config_show_toolbars ())
-    show_toolbars_ (item->active);
+  gboolean active = gtk_check_menu_item_get_active (item);
+  if (active != mixgtk_config_show_toolbars ()) show_toolbars_ (active);
 }
 
 void
@@ -252,8 +258,7 @@ init_info_ (void)
 
       infos_[k].menu =
         GTK_CHECK_MENU_ITEM
-        (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN,
-                                                  infos_[k].menu_name));
+        (mixgtk_widget_factory_get_by_name (infos_[k].menu_name));
       g_assert (infos_[k].menu != NULL);
       txt = mixgtk_config_get (infos_[k].config_key);
       infos_[k].detached = txt && !g_ascii_strcasecmp (txt, DETACH_YES_);
@@ -309,8 +314,7 @@ init_signals_ (void)
         G_OBJECT (mixgtk_widget_factory_get_dialog (infos_[k].dialog));
 
       GObject *button =
-        G_OBJECT (mixgtk_widget_factory_get (infos_[k].dialog,
-                                             MIXGTK_WIDGET_ATTACH_BUTTON));
+        G_OBJECT (mixgtk_widget_factory_get_by_name (infos_[k].attach_button));
 
       g_assert (dialog != NULL);
       g_assert (button != NULL);
@@ -426,7 +430,7 @@ init_dev_ (void)
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
 
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (page), devs);
+  gtk_container_add (GTK_CONTAINER (page), devs);
 
   infos_[MIXGTK_DEVICES_WINDOW].widget = page;
 
@@ -450,8 +454,7 @@ init_tb_ (void)
   gint style = mixgtk_config_tb_style ();
 
   tb_menu_ = GTK_CHECK_MENU_ITEM
-    (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN,
-  					      TB_MENU_NAME_));
+    (mixgtk_widget_factory_get_by_name (TB_MENU_NAME_));
   g_assert (tb_menu_ != NULL);
 
   gtk_check_menu_item_set_active (tb_menu_, mixgtk_config_show_toolbars ());
@@ -475,8 +478,7 @@ init_tb_ (void)
 
   for (k = 0; k < 4; ++k)
     {
-      GtkWidget *item =
-        mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, names[k]);
+      GtkWidget *item = mixgtk_widget_factory_get_by_name (names[k]);
       g_signal_connect (G_OBJECT (item),
                         "activate",
                         G_CALLBACK (on_tb_style_), GUINT_TO_POINTER (k));
@@ -493,22 +495,21 @@ on_tb_style_ (GtkMenuItem *w, gpointer style)
   mixgtk_config_set_tb_style (ui_style);
 }
 
+static const gchar *TB_NAME = "main_toolbar";
+
 static void
 set_tb_style_ (guint style)
 {
-  static const gchar *TB_NAME = "main_toolbar";
-  static const gchar *TB_DNAME = "dlg_toolbar";
-
   gint k;
 
-  GtkToolbar *tb = GTK_TOOLBAR
-    (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, TB_NAME));
+  GtkToolbar *tb =
+    GTK_TOOLBAR (mixgtk_widget_factory_get_by_name (TB_NAME));
   gtk_toolbar_set_style (tb, style);
 
   for (k = 0; k < INF_NO_; ++k)
     {
       GtkToolbar *tb = GTK_TOOLBAR
-        (mixgtk_widget_factory_get_child_by_name (infos_[k].dialog, TB_DNAME));
+        (mixgtk_widget_factory_get_by_name (infos_[k].toolbar_name));
       gtk_toolbar_set_style (tb, style);
     }
 }
@@ -516,12 +517,9 @@ set_tb_style_ (guint style)
 static void
 show_toolbars_ (gboolean show)
 {
-  static const gchar *HANDLE_NAME = "tb_handle";
-
   gint k;
 
-  GtkWidget *handle =
-    mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, HANDLE_NAME);
+  GtkWidget *handle = mixgtk_widget_factory_get_by_name (TB_NAME);
 
   if (show)
     gtk_widget_show (handle);
@@ -531,7 +529,7 @@ show_toolbars_ (gboolean show)
   for (k = 0; k < INF_NO_; ++k)
     {
       GtkWidget *hd =
-        mixgtk_widget_factory_get_child_by_name (infos_[k].dialog, HANDLE_NAME);
+        mixgtk_widget_factory_get_by_name (infos_[k].toolbar_name);
       if (show) gtk_widget_show (hd); else gtk_widget_hide (hd);
     }
 
@@ -544,7 +542,7 @@ init_autosave_ (void)
 #define AUTOSAVE_ITEM_ "save_on_exit"
 
   GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM
-    (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, AUTOSAVE_ITEM_));
+    (mixgtk_widget_factory_get_by_name (AUTOSAVE_ITEM_));
   if (item)
     {
       gtk_check_menu_item_set_active (item, mixgtk_config_is_autosave ());
@@ -559,8 +557,7 @@ init_about_ (void)
   GtkWidget *label;
   about_ = mixgtk_widget_factory_get_dialog (MIXGTK_ABOUT_DIALOG);
   g_assert (about_ != NULL);
-  label = mixgtk_widget_factory_get_child_by_name (MIXGTK_ABOUT_DIALOG,
-						   VERSION_LABEL_);
+  label = mixgtk_widget_factory_get_by_name (VERSION_LABEL_);
   g_assert (label != NULL);
   gtk_label_set_text (GTK_LABEL (label), VERSION);
   gtk_widget_show (label);
@@ -574,10 +571,16 @@ mixvm_attach_ (void)
 }
 
 static void
+reparent_ (GtkWidget *widget, GtkWidget *parent)
+{
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);
+  gtk_container_add (GTK_CONTAINER (parent), widget);
+}
+
+static void
 mixvm_detach_ (void)
 {
-  gtk_widget_reparent (infos_[MIXGTK_MIXVM_WINDOW].widget,
-                       GTK_WIDGET (mixvm_container_));
+  reparent_ (infos_[MIXGTK_MIXVM_WINDOW].widget, GTK_WIDGET (mixvm_container_));
 }
 
 static void
@@ -616,8 +619,7 @@ mixal_detach_ (void)
     }
 
   mixgtk_mixal_reparent (stat);
-  gtk_widget_reparent (infos_[MIXGTK_MIXAL_WINDOW].widget,
-                       GTK_WIDGET (mixal_container_));
+  reparent_ (infos_[MIXGTK_MIXAL_WINDOW].widget, GTK_WIDGET (mixal_container_));
 }
 
 static void
@@ -630,10 +632,10 @@ dev_attach_ (void)
 static void
 dev_detach_ (void)
 {
-  gtk_widget_reparent (infos_[MIXGTK_DEVICES_WINDOW].widget,
-                       GTK_WIDGET (dev_container_));
+  reparent_ (infos_[MIXGTK_DEVICES_WINDOW].widget, GTK_WIDGET (dev_container_));
 }
 
+
 static void
 on_nb_switch_ (GtkNotebook *notebook, GtkWidget *page,
                guint page_num, gpointer user_data)
@@ -664,6 +666,3 @@ update_attach_buttons_ (void)
   gtk_tool_item_set_visible_horizontal (detach_button_, wants_detach);
   gtk_tool_item_set_visible_vertical (detach_button_, wants_detach);
 }
-
-
-
diff --git a/mixlib/mix.c b/mixlib/mix.c
index 0c992b1..fadfdc0 100644
--- a/mixlib/mix.c
+++ b/mixlib/mix.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mix.c :
  * Implementation of the functions declared in mix.h
  * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2014 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2014, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ mix_release_lib (void)
 }
 
 const char *MIX_GPL_LICENSE =
-"Copyright (C) 2000-2014 Free Software Foundation, Inc.\n"
+"Copyright (C) 2000-2020 Free Software Foundation, Inc.\n"
 "There is NO warranty.  You may redistribute this software\n"
 "under the terms of the GNU General Public License.\n"
 "For more information about these matters, see the files named COPYING.\n";
diff --git a/mixlib/xmix_vm.c b/mixlib/xmix_vm.c
index 1b8d80a..3223552 100644
--- a/mixlib/xmix_vm.c
+++ b/mixlib/xmix_vm.c
@@ -1,7 +1,7 @@
 /* ---------------------- xmix_vm.c :
  * Implementation of the functions declared in xmix_vm.h
  * ------------------------------------------------------------------
- * Copyright (C) 2000, 2003, 2004, 2007, 2010, 2013, 2019 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2003, 2004, 2007, 2010, 2013, 2019, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,14 +24,14 @@
 #include "xmix_vm.h"
 
 /* auxiliar functions */
-G_INLINE_FUNC mix_address_t
+static inline mix_address_t
 get_M_ (const mix_vm_t *vm, const mix_ins_t *ins);
-G_INLINE_FUNC mix_word_t
+static inline mix_word_t
 get_V_ (const mix_vm_t *vm, const mix_ins_t *ins);
-G_INLINE_FUNC mix_device_t *
+static inline mix_device_t *
 get_dev_ (mix_vm_t *vm, mix_fspec_t type);
 
-G_INLINE_FUNC mix_address_t
+static inline mix_address_t
 get_M_ (const mix_vm_t *vm, const mix_ins_t *ins)
 {
   if ( ins->index == 0 )
@@ -41,13 +41,13 @@ get_M_ (const mix_vm_t *vm, const mix_ins_t *ins)
                           mix_word_to_short_fast (get_rI_ (vm, ins->index)));
 }
 
-G_INLINE_FUNC mix_word_t
+static inline mix_word_t
 get_V_ (const mix_vm_t *vm, const mix_ins_t *ins)
 {
   return mix_word_get_field (ins->fspec, get_cell_ (vm, get_M_ (vm,ins)));
 }
 
-G_INLINE_FUNC mix_device_t *
+static inline mix_device_t *
 get_dev_ (mix_vm_t *vm, mix_fspec_t type)
 {
   if (type >= BD_NO_) return NULL;
diff --git a/mixlib/xmix_vm_handlers.c b/mixlib/xmix_vm_handlers.c
index f356607..f8b6b1f 100644
--- a/mixlib/xmix_vm_handlers.c
+++ b/mixlib/xmix_vm_handlers.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- xmix_vm_handlers.c :
  * Implementation of the functions declared in xmix_vm_handlers.h
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2014 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2014, 2020 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -314,7 +314,7 @@ cmd_compile_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg)
           if (gerr && gerr->message) log_error_ (dis, gerr->message);
         }
 
-      if (gerr) g_free (gerr);
+      if (gerr) g_error_free (gerr);
       if (output) g_free (output);
       if (errors) g_free (errors);
author	Peter Pentchev <roam@debian.org>	2021-12-30 19:40:39 +0200
committer	Peter Pentchev <roam@debian.org>	2021-12-30 19:40:39 +0200
commit	45aa1b087c92fd42cb6c5d445b173071021772a7 (patch)
tree	010d95847f14db998ca76fc99f78faf5c1f58a81
parent	ddd8983ed013f3f21de0caee464f49247d45a02a (diff)
parent	ec558e64f5b6b965c27cb0acee0f42e5c7a4e0e8 (diff)