From: Arun Persaud <arun@nubati.net>
Date: Sat, 29 Aug 2009 06:04:15 +0000 (-0700)
Subject: added more callbacks
X-Git-Tag: gtk-20091122~38
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=e50d3b26b5306dabeb7fa24ac5cc45fc5975c2cf

added more callbacks

can now call flag, abort and resign games, etc.
---

diff --git a/callback.c b/callback.c
index 0ae04cc..2fce80f 100644
--- a/callback.c
+++ b/callback.c
@@ -103,6 +103,103 @@ void ReloadGameProc(object, user_data)
     return;
 }
 
+void MachineWhiteProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    MachineWhiteEvent();
+    return;
+}
+
+void MachineBlackProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    MachineBlackEvent();
+    return;
+}
+
+void TwoMachinesProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    TwoMachinesEvent();
+    return;
+}
+
+void AcceptProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    AcceptEvent();
+    return;
+}
+
+void DeclineProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    DeclineEvent();
+    return;
+}
+
+void RematchProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    RematchEvent();
+    return;
+}
+
+void CallFlagProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    CallFlagEvent();
+    return;
+}
+
+void DrawProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    DrawEvent();
+    return;
+}
+
+void AbortProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    AbortEvent();
+    return;
+}
+
+void AdjournProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    AdjournEvent();
+    return;
+}
+
+void ResignProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ResignEvent();
+    return;
+}
+
+
+void MoveNowProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    MoveNowEvent();
+    return;
+}
+
 
 gboolean CloseWindowProc(GtkWidget *button)
 {
diff --git a/callback.h b/callback.h
index db9e377..4db01b1 100644
--- a/callback.h
+++ b/callback.h
@@ -1,7 +1,19 @@
 void QuitProc P((GtkObject *object, gpointer user_data));
+void MachineBlackProc P((GtkObject *object, gpointer user_data));
+void MachineWhiteProc P((GtkObject *object, gpointer user_data));
+void TwoMachinesProc P((GtkObject *object, gpointer user_data));
+void AcceptProc P((GtkObject *object, gpointer user_data));
+void DeclineProc P((GtkObject *object, gpointer user_data));
+void RematchProc P((GtkObject *object, gpointer user_data));
+void CallFlagProc P((GtkObject *object, gpointer user_data));
+void Drawroc P((GtkObject *object, gpointer user_data));
+void AbortProc P((GtkObject *object, gpointer user_data));
+void AdjournProc P((GtkObject *object, gpointer user_data));
+void ResignProc P((GtkObject *object, gpointer user_data));
 void ResetProc P((GtkObject *object, gpointer user_data));
 void WhiteClockProc P((GtkObject *object, gpointer user_data));
 void BlackClockProc P((GtkObject *object, gpointer user_data));
+void MoveNowProc P((GtkObject *object, gpointer user_data));
 void AboutProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void ShowCoordsProc P((GtkObject *object, gpointer user_data));
 void ErrorPopDownProc P((GtkObject *object, gpointer user_data));
diff --git a/gtk-interface.xml b/gtk-interface.xml
index 6cd5f80..6692f90 100644
--- a/gtk-interface.xml
+++ b/gtk-interface.xml
@@ -187,6 +187,7 @@
                             <property name="visible">True</property>
                             <property name="use_underline">True</property>
                             <property name="use_stock">True</property>
+                            <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                             <signal name="activate" handler="QuitProc"/>
                           </object>
                         </child>
@@ -208,6 +209,7 @@
                             <property name="label" translatable="yes">Machine White</property>
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
+                            <signal name="activate" handler="MachineWhiteProc"/>
                           </object>
                         </child>
                         <child>
@@ -217,6 +219,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="activate" handler="MachineBlackProc"/>
                           </object>
                         </child>
                         <child>
@@ -226,6 +229,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="activate" handler="TwoMachinesProc"/>
                           </object>
                         </child>
                         <child>
@@ -346,6 +350,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Accept</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="AcceptProc"/>
                           </object>
                         </child>
                         <child>
@@ -353,13 +358,15 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Call Flag</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="CallFlagProc"/>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuActio.Decline">
+                          <object class="GtkMenuItem" id="menuAction.Decline">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Decline</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="DeclineProc"/>
                           </object>
                         </child>
                         <child>
@@ -372,6 +379,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Rematch</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="RematchProc"/>
                           </object>
                         </child>
                         <child>
@@ -379,6 +387,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Draw</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="DrawProc"/>
                           </object>
                         </child>
                         <child>
@@ -386,6 +395,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Adjourn</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="AdjournProc"/>
                           </object>
                         </child>
                         <child>
@@ -393,6 +403,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Resign</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="ResignProc"/>
                           </object>
                         </child>
                         <child>
@@ -400,6 +411,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Abort</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="AbortProc"/>
                           </object>
                         </child>
                         <child>
@@ -485,6 +497,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Move now</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="MoveNowProc"/>
                           </object>
                         </child>
                         <child>
@@ -822,7 +835,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <signal name="clicked" handler="PauseProc"/>
+                    <signal name="activate" handler="PauseProc"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/svg/DarkSquare.svg b/svg/DarkSquare.svg
index 6859a52..5c934c6 100644
--- a/svg/DarkSquare.svg
+++ b/svg/DarkSquare.svg
@@ -2,14 +2,61 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="100"
    height="100"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.46+devel r21645"
+   sodipodi:docname="DarkSquare.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata127">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="790"
+     inkscape:window-height="813"
+     id="namedview125"
+     showgrid="false"
+     inkscape:zoom="2.58"
+     inkscape:cx="62.015504"
+     inkscape:cy="44.96124"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
   <defs
-     id="defs4" />
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 50 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="100 : 50 : 1"
+       inkscape:persp3d-origin="50 : 33.333333 : 1"
+       id="perspective129" />
+  </defs>
   <g
      transform="translate(-31.428572,-40.933632)"
      id="layer1">
@@ -21,4 +68,14 @@
        id="rect12"
        style="color:#000000;fill:#c8c365;fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="85.658913"
+     y="93.023254"
+     id="text131"><tspan
+       sodipodi:role="line"
+       id="tspan133"
+       x="85.658913"
+       y="93.023254">D</tspan></text>
 </svg>
diff --git a/svg/LightSquare.svg b/svg/LightSquare.svg
index ead1ff7..b665d5e 100644
--- a/svg/LightSquare.svg
+++ b/svg/LightSquare.svg
@@ -2,23 +2,81 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="100"
    height="100"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.46+devel r21645"
+   sodipodi:docname="LightSquare.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata127">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1123"
+     inkscape:window-height="813"
+     id="namedview125"
+     showgrid="false"
+     inkscape:zoom="2.58"
+     inkscape:cx="-7.364341"
+     inkscape:cy="44.96124"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
   <defs
-     id="defs4" />
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 50 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="100 : 50 : 1"
+       inkscape:persp3d-origin="50 : 33.333333 : 1"
+       id="perspective129" />
+  </defs>
   <g
      transform="translate(-31.428572,-40.933632)"
-     id="layer1">
+     id="layer1"
+     style="stroke:#73d216;fill:#77a26d;fill-opacity:1">
     <rect
        width="100"
        height="100"
        x="31.428572"
        y="40.933632"
        id="rect12"
-       style="color:#000000;fill:#77a26d;fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:#77a26d;fill-opacity:1;stroke:#73d216;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="85.658913"
+     y="93.023254"
+     id="text131"><tspan
+       sodipodi:role="line"
+       id="tspan133"
+       x="85.658913"
+       y="93.023254">L</tspan></text>
 </svg>
diff --git a/svg/NeutralSquare.svg b/svg/NeutralSquare.svg
index 0b34ecb..4b42698 100644
--- a/svg/NeutralSquare.svg
+++ b/svg/NeutralSquare.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,155 +9,99 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="97.221024"
-   height="89.91935"
-   id="svg2833"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   version="1.0"
+   version="1.1"
+   width="100"
+   height="100"
+   id="svg2"
+   inkscape:version="0.46+devel r21645"
    sodipodi:docname="NeutralSquare.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2835">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2841" />
-    <inkscape:perspective
-       id="perspective2851"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2873"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2916"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2959"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3002"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3045"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3088"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3131"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3174"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3217"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3260"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3303"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3346"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="8.7527877"
-     inkscape:cy="82.430952"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="658"
-     inkscape:window-height="834"
-     inkscape:window-x="564"
-     inkscape:window-y="56" />
   <metadata
-     id="metadata2838">
+     id="metadata127">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="790"
+     inkscape:window-height="813"
+     id="namedview125"
+     showgrid="false"
+     inkscape:zoom="2.58"
+     inkscape:cx="62.015504"
+     inkscape:cy="44.96124"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 50 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="100 : 50 : 1"
+       inkscape:persp3d-origin="50 : 33.333333 : 1"
+       id="perspective129" />
+  </defs>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
+     transform="translate(-31.428572,-40.933632)"
      id="layer1"
-     transform="translate(-67.582896,-63.246303)">
+     style="stroke:#d3d7cf;fill:#d3d7cf">
     <rect
-       style="fill:#999999"
-       id="rect3381"
        width="100"
        height="100"
-       x="68.593048"
-       y="63.262077" />
+       x="31.428572"
+       y="40.933632"
+       id="rect12"
+       style="color:#000000;fill:#d3d7cf;fill-opacity:1;stroke:#d3d7cf;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="85.658913"
+     y="93.023254"
+     id="text131"
+     inkscape:transform-center-x="-4.1767578"><tspan
+       sodipodi:role="line"
+       id="tspan133"
+       x="85.658913"
+       y="93.023254">N</tspan></text>
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.9379841,42.635659 32.558139,2.7131783"
+     id="path60" />
+  <path
+     id="path62"
+     d="M 9.3023252,53.875969 39.92248,13.953488"
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 17.44186,62.403101 48.062015,22.48062"
+     id="path64" />
+  <path
+     id="path66"
+     d="M 31.395348,70.542636 62.015503,30.620155"
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 31.395348,70.542636 62.015503,30.620155"
+     id="path68" />
+  <path
+     id="path70"
+     d="M 43.798449,83.720931 74.418604,43.79845"
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/xboard.c b/xboard.c
index a6d954d..c0c505c 100644
--- a/xboard.c
+++ b/xboard.c
@@ -313,16 +313,10 @@ void SavePositionProc P((Widget w, XEvent *event,
 void MailMoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void ReloadCmailMsgProc P((Widget w, XEvent *event, String *prms,
 			    Cardinal *nprms));
-void MachineBlackProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void MachineWhiteProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
 void AnalyzeModeProc P((Widget w, XEvent *event,
 			 String *prms, Cardinal *nprms));
 void AnalyzeFileProc P((Widget w, XEvent *event,
 			 String *prms, Cardinal *nprms));
-void TwoMachinesProc P((Widget w, XEvent *event, String *prms,
-			Cardinal *nprms));
 void IcsClientProc P((Widget w, XEvent *event, String *prms,
 		      Cardinal *nprms));
 void EditGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
@@ -333,14 +327,6 @@ void EditCommentProc P((Widget w, XEvent *event,
 			String *prms, Cardinal *nprms));
 void IcsInputBoxProc P((Widget w, XEvent *event,
 			String *prms, Cardinal *nprms));
-void AcceptProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void DeclineProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void RematchProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void CallFlagProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void DrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AbortProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjournProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ResignProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void AdjuWhiteProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void AdjuBlackProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void AdjuDrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
@@ -358,7 +344,6 @@ void TruncateGameProc P((Widget w, XEvent *event, String *prms,
 			 Cardinal *nprms));
 void RetractMoveProc P((Widget w, XEvent *event, String *prms,
 			Cardinal *nprms));
-void MoveNowProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void AlwaysQueenProc P((Widget w, XEvent *event, String *prms,
 			Cardinal *nprms));
 void AnimateDraggingProc P((Widget w, XEvent *event, String *prms,
@@ -716,9 +701,9 @@ MenuItem fileMenu[] = {
 };
 
 MenuItem modeMenu[] = {
-    {N_("Machine White"), MachineWhiteProc},
-    {N_("Machine Black"), MachineBlackProc},
-    {N_("Two Machines"), TwoMachinesProc},
+  //    {N_("Machine White"), MachineWhiteProc},
+  //    {N_("Machine Black"), MachineBlackProc},
+  //    {N_("Two Machines"), TwoMachinesProc},
     {N_("Analysis Mode"), AnalyzeModeProc},
     {N_("Analyze File"), AnalyzeFileProc },
     {N_("ICS Client"), IcsClientProc},
@@ -738,15 +723,15 @@ MenuItem modeMenu[] = {
 };
 
 MenuItem actionMenu[] = {
-    {N_("Accept"), AcceptProc},
-    {N_("Decline"), DeclineProc},
-    {N_("Rematch"), RematchProc},
-    {"----", NothingProc},
-    {N_("Call Flag"), CallFlagProc},
-    {N_("Draw"), DrawProc},
-    {N_("Adjourn"), AdjournProc},
-    {N_("Abort"), AbortProc},
-    {N_("Resign"), ResignProc},
+    //    {N_("Accept"), AcceptProc},
+    //    {N_("Decline"), DeclineProc},
+  //    {N_("Rematch"), RematchProc},
+  //    {"----", NothingProc},
+  //    {N_("Call Flag"), CallFlagProc},
+  //    {N_("Draw"), DrawProc},
+  //    {N_("Adjourn"), AdjournProc},
+  //    {N_("Abort"), AbortProc},
+  //    {N_("Resign"), ResignProc},
     {"----", NothingProc},
     {N_("Stop Observing"), StopObservingProc},
     {N_("Stop Examining"), StopExaminingProc},
@@ -765,7 +750,7 @@ MenuItem stepMenu[] = {
     {N_("Revert"), RevertProc},
     {N_("Truncate Game"), TruncateGameProc},
     {"----", NothingProc},
-    {N_("Move Now"), MoveNowProc},
+    //    {N_("Move Now"), MoveNowProc},
     {N_("Retract Move"), RetractMoveProc},
     {NULL, NULL}
 };
@@ -1930,11 +1915,11 @@ XtActionsRec boardActions[] = {
     { "SavePositionProc", SavePositionProc },
     { "MailMoveProc", MailMoveProc },
     { "ReloadCmailMsgProc", ReloadCmailMsgProc },
-    { "MachineWhiteProc", MachineWhiteProc },
-    { "MachineBlackProc", MachineBlackProc },
+    //    { "MachineWhiteProc", MachineWhiteProc },
+    //    { "MachineBlackProc", MachineBlackProc },
     { "AnalysisModeProc", AnalyzeModeProc },
     { "AnalyzeFileProc", AnalyzeFileProc },
-    { "TwoMachinesProc", TwoMachinesProc },
+    //    { "TwoMachinesProc", TwoMachinesProc },
     { "IcsClientProc", IcsClientProc },
     { "EditGameProc", EditGameProc },
     { "EditPositionProc", EditPositionProc },
@@ -1946,14 +1931,14 @@ XtActionsRec boardActions[] = {
     { "EditCommentProc", EditCommentProc },
     { "IcsAlarmProc", IcsAlarmProc },
     { "IcsInputBoxProc", IcsInputBoxProc },
-    { "AcceptProc", AcceptProc },
-    { "DeclineProc", DeclineProc },
-    { "RematchProc", RematchProc },
-    { "CallFlagProc", CallFlagProc },
-    { "DrawProc", DrawProc },
-    { "AdjournProc", AdjournProc },
-    { "AbortProc", AbortProc },
-    { "ResignProc", ResignProc },
+    //    { "AcceptProc", AcceptProc },
+    //    { "DeclineProc", DeclineProc },
+    //    { "RematchProc", RematchProc },
+    //    { "CallFlagProc", CallFlagProc },
+    //    { "DrawProc", DrawProc },
+    //    { "AdjournProc", AdjournProc },
+    //    { "AbortProc", AbortProc },
+    //    { "ResignProc", ResignProc },
     { "AdjuWhiteProc", AdjuWhiteProc },
     { "AdjuBlackProc", AdjuBlackProc },
     { "AdjuDrawProc", AdjuDrawProc },
@@ -1966,7 +1951,7 @@ XtActionsRec boardActions[] = {
     { "ToEndProc", ToEndProc },
     { "RevertProc", RevertProc },
     { "TruncateGameProc", TruncateGameProc },
-    { "MoveNowProc", MoveNowProc },
+    //    { "MoveNowProc", MoveNowProc },
     { "RetractMoveProc", RetractMoveProc },
     { "AlwaysQueenProc", AlwaysQueenProc },
     { "AnimateDraggingProc", AnimateDraggingProc },
@@ -3209,6 +3194,12 @@ void CreatePieces()
   WhitePawn, WhiteKnight, WhiteBishop, WhiteRook, WhiteQueen, WhiteKing,
   BlackPawn, BlackKnight, BlackBishop, BlackRook, BlackQueen, BlackKing,
   */
+  int i;
+
+  /* get some defaults going */
+  for(i=WhitePawn; i<DemotePiece+1; i++)
+    SVGpieces[i]   = load_pixbuf("svg/NeutralSquare.svg",squareSize);
+    
 
   SVGpieces[WhitePawn]   = load_pixbuf("svg/WhitePawn.svg",squareSize);
   SVGpieces[WhiteKnight] = load_pixbuf("svg/WhiteKnight.svg",squareSize);
@@ -3697,19 +3688,22 @@ static void BlankSquare(x, y, color, piece, dest)
      Drawable dest;
 {
       GdkPixbuf *pb;
-      switch (color) {
-      case 1: /* light */
-	pb = SVGLightSquare;
-	break;
-      case 0: /* dark */
-	pb = SVGDarkSquare;
-	break;
-      case 2: /* neutral */
-      default:
-	pb = SVGNeutralSquare;
-	break;
-      }
+
+      switch (color) 
+	{
+	case 0: /* dark */
+	  pb = SVGDarkSquare;
+	  break;
+	case 1: /* light */
+	  pb = SVGLightSquare;
+	  break;
+	case 2: /* neutral */
+	default:
+	  pb = SVGNeutralSquare;
+	  break;
+	}
       gdk_draw_pixbuf(GDK_WINDOW(GUI_Board->window),NULL,pb,0,0,x,y,-1,-1, GDK_RGB_DITHER_NORMAL, 0, 0);
+      return;
 }
 
 static void DrawPiece(piece, square_color, x, y, dest)
@@ -3805,7 +3799,6 @@ void DrawSquare(row, column, piece, do_flash)
 	    cairo_set_font_size (cr, 12.0);
 	    cairo_text_extents (cr, string, &extents);
 
-
 	    if (column == (flipView ? BOARD_LEFT-1 : BOARD_RGHT) )
 	      {
 		xpos= x + squareSize - extents.width - 2;
@@ -3829,7 +3822,6 @@ void DrawSquare(row, column, piece, do_flash)
 	    /* free memory */
 	    cairo_destroy (cr);
 	  }
-
       }
     else
       {
@@ -5532,24 +5524,6 @@ void AutoSaveGame()
     SaveGameProc(NULL, NULL, NULL, NULL);
 }
 
-void MachineBlackProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MachineBlackEvent();
-}
-
-void MachineWhiteProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MachineWhiteEvent();
-}
-
 void AnalyzeModeProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;
@@ -5615,15 +5589,6 @@ void AnalyzeFileProc(w, event, prms, nprms)
     AnalysisPeriodicEvent(1);
 }
 
-void TwoMachinesProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    TwoMachinesEvent();
-}
-
 void IcsClientProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;
@@ -5686,78 +5651,6 @@ void IcsInputBoxProc(w, event, prms, nprms)
     }
 }
 
-void AcceptProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AcceptEvent();
-}
-
-void DeclineProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    DeclineEvent();
-}
-
-void RematchProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RematchEvent();
-}
-
-void CallFlagProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    CallFlagEvent();
-}
-
-void DrawProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    DrawEvent();
-}
-
-void AbortProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AbortEvent();
-}
-
-void AdjournProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AdjournEvent();
-}
-
-void ResignProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ResignEvent();
-}
-
 void AdjuWhiteProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;
@@ -5877,16 +5770,6 @@ void RetractMoveProc(w, event, prms, nprms)
     RetractMoveEvent();
 }
 
-void MoveNowProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MoveNowEvent();
-}
-
-
 void AlwaysQueenProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;