Make PGN parser immune to unprotected time stamps

[xboard.git] / gtk / xoptions.c

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index f60f6a3..7a03ffb 100644 (file)
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -1,7 +1,7 @@
 /*
  * xoptions.c -- Move list window, part of X front end for XBoard
  *
 /*
  * xoptions.c -- Move list window, part of X front end for XBoard
  *

- * Copyright 2000, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.

  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify


@@ -50,7 +50,7 @@ extern char *getenv();
 #include <cairo/cairo.h>
 #include <cairo/cairo-xlib.h>
 #include <gtk/gtk.h>
 #include <cairo/cairo.h>
 #include <cairo/cairo-xlib.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkkeysyms.h>  
+#include <gdk/gdkkeysyms.h>

 
 #include "common.h"
 #include "backend.h"
 
 #include "common.h"
 #include "backend.h"


@@ -146,9 +146,9 @@ MarkMenuItem (char *menuRef, int state)
 }
 
 void GetWidgetTextGTK(GtkWidget *w, char **buf)
 }
 
 void GetWidgetTextGTK(GtkWidget *w, char **buf)

-{        
+{

     GtkTextIter start;
     GtkTextIter start;

-    GtkTextIter end;    
+    GtkTextIter end;

 
     if (GTK_IS_ENTRY(w)) {
        *buf = (char *) gtk_entry_get_text(GTK_ENTRY (w));
 
     if (GTK_IS_ENTRY(w)) {
        *buf = (char *) gtk_entry_get_text(GTK_ENTRY (w));


@@ -160,7 +160,7 @@ void GetWidgetTextGTK(GtkWidget *w, char **buf)
     }
     else {
         printf("error in GetWidgetText, invalid widget\n");
     }
     else {
         printf("error in GetWidgetText, invalid widget\n");

-        *buf = NULL; 
+        *buf = NULL;

     }
 }
 
     }
 }
 


@@ -175,7 +175,7 @@ GetWidgetText (Option *opt, char **buf)
       case PathName:
       case TextBox: GetWidgetTextGTK((GtkWidget *) opt->handle, buf); break;
       case Spin:
       case PathName:
       case TextBox: GetWidgetTextGTK((GtkWidget *) opt->handle, buf); break;
       case Spin:

-       x = gtk_spin_button_get_value (GTK_SPIN_BUTTON(opt->handle));                   
+       x = gtk_spin_button_get_value (GTK_SPIN_BUTTON(opt->handle));

        snprintf(val, 12, "%d", x); *buf = val;
        break;
       default:
        snprintf(val, 12, "%d", x); *buf = val;
        break;
       default:


@@ -185,19 +185,19 @@ GetWidgetText (Option *opt, char **buf)
 }
 
 void SetSpinValue(Option *opt, char *val, int n)
 }
 
 void SetSpinValue(Option *opt, char *val, int n)

-{    
+{

     if (opt->type == Spin)
       {
         if (!strcmp(val, _("Unused")))
            gtk_widget_set_sensitive(opt->handle, FALSE);
         else
           {
     if (opt->type == Spin)
       {
         if (!strcmp(val, _("Unused")))
            gtk_widget_set_sensitive(opt->handle, FALSE);
         else
           {

-            gtk_widget_set_sensitive(opt->handle, TRUE);      
+            gtk_widget_set_sensitive(opt->handle, TRUE);

             gtk_spin_button_set_value(opt->handle, atoi(val));
           }
       }
     else
             gtk_spin_button_set_value(opt->handle, atoi(val));
           }
       }
     else

-      printf("error in SetSpinValue, unknown type %d\n", opt->type);    
+      printf("error in SetSpinValue, unknown type %d\n", opt->type);

 }
 
 void SetWidgetTextGTK(GtkWidget *w, char *text)
 }
 
 void SetWidgetTextGTK(GtkWidget *w, char *text)


@@ -274,14 +274,14 @@ LoadListBox (Option *opt, char *emptyText, int n1, int n2)
     GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
     GtkListStore *store = GTK_LIST_STORE(model);
     GtkTreeIter iter;
     GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
     GtkListStore *store = GTK_LIST_STORE(model);
     GtkTreeIter iter;

- 
+

     if(n1 >= 0 && n2 >= 0) {
        SetListBoxItem(store, n1, data[n1]);
        SetListBoxItem(store, n2, data[n2]);
        return;
     }
 
     if(n1 >= 0 && n2 >= 0) {
        SetListBoxItem(store, n1, data[n1]);
        SetListBoxItem(store, n2, data[n2]);
        return;
     }
 

-    if (gtk_tree_model_get_iter_first(model, &iter)) 
+    if (gtk_tree_model_get_iter_first(model, &iter))

        gtk_list_store_clear(store);
 
     while(*data) { // add elements to listbox one by one
        gtk_list_store_clear(store);
 
     while(*data) { // add elements to listbox one by one


@@ -317,8 +317,13 @@ void
 ScrollToCursor (Option *opt, int caretPos)
 {
     static GtkTextIter iter;
 ScrollToCursor (Option *opt, int caretPos)
 {
     static GtkTextIter iter;

+    static GtkTextMark *mark;
+    if(!mark) mark = gtk_text_mark_new(NULL, 0);

     gtk_text_buffer_get_iter_at_offset((GtkTextBuffer *) opt->handle, &iter, caretPos);
     gtk_text_buffer_get_iter_at_offset((GtkTextBuffer *) opt->handle, &iter, caretPos);

-    gtk_text_view_scroll_to_iter((GtkTextView *) opt->textValue, &iter, 0.0, 0, 0.5, 0.5);
+    gtk_text_buffer_add_mark((GtkTextBuffer *) opt->handle, mark, &iter);
+    gtk_text_view_scroll_to_mark((GtkTextView *) opt->textValue, mark, 0.0, 0, 0.5, 0.5);
+//    gtk_text_view_scroll_to_iter((GtkTextView *) opt->textValue, &iter, 0.0, 0, 0.5, 0.5);
+    gtk_text_buffer_delete_mark((GtkTextBuffer *) opt->handle, mark);

 }
 
 int
 }
 
 int


@@ -366,7 +371,7 @@ void ComboSelect(GtkWidget *widget, gpointer addr)
     gint i = ((intptr_t)addr) & 255; // option number
     gint g;
 
     gint i = ((intptr_t)addr) & 255; // option number
     gint g;
 

-    g = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));    
+    g = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));

     values[i] = g; // store in temporary, for transfer at OK
 
 #if TODO_GTK
     values[i] = g; // store in temporary, for transfer at OK
 
 #if TODO_GTK


@@ -416,18 +421,26 @@ CreateMenuPopup (Option *opt, int n, int def)
 
     menu = gtk_menu_new();
 //    menu = XtCreatePopupShell(opt->name, simpleMenuWidgetClass, parent, NULL, 0);
 
     menu = gtk_menu_new();
 //    menu = XtCreatePopupShell(opt->name, simpleMenuWidgetClass, parent, NULL, 0);

-    for (i=0; 1; i++) 
+    for (i=0; 1; i++)

       {
        char *msg = mb[i].string;
        if(!msg) break;
       {
        char *msg = mb[i].string;
        if(!msg) break;

-       if(strcmp(msg, "----")) { // 
+       if(strcmp(msg, "----")) { //

          if(!(opt->min & NO_GETTEXT)) msg = _(msg);
          if(mb[i].handle) {
            entry = gtk_check_menu_item_new_with_label(msg); // should be used for items that can be checkmarked
            if(mb[i].handle == RADIO) gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(entry), True);
          } else
            entry = gtk_menu_item_new_with_label(msg);
          if(!(opt->min & NO_GETTEXT)) msg = _(msg);
          if(mb[i].handle) {
            entry = gtk_check_menu_item_new_with_label(msg); // should be used for items that can be checkmarked
            if(mb[i].handle == RADIO) gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(entry), True);
          } else
            entry = gtk_menu_item_new_with_label(msg);

-         gtk_signal_connect_object (GTK_OBJECT (entry), "activate", GTK_SIGNAL_FUNC(MenuSelect), (gpointer) (n<<16)+i);
+         gtk_signal_connect_object (GTK_OBJECT (entry), "activate", GTK_SIGNAL_FUNC(MenuSelect), (gpointer) (intptr_t) ((n<<16)+i));
+         if(mb[i].accel) {
+           guint accelerator_key;
+           GdkModifierType accelerator_mods;
+
+           gtk_accelerator_parse(mb[i].accel, &accelerator_key, &accelerator_mods);
+           gtk_widget_add_accelerator (GTK_WIDGET(entry), "activate",GtkAccelerators,
+                                       accelerator_key, accelerator_mods, GTK_ACCEL_VISIBLE);
+         };

          gtk_widget_show(entry);
        } else entry = gtk_separator_menu_item_new();
        gtk_menu_append(GTK_MENU (menu), entry);
          gtk_widget_show(entry);
        } else entry = gtk_separator_menu_item_new();
        gtk_menu_append(GTK_MENU (menu), entry);


@@ -515,7 +528,7 @@ ShiftKeys ()
 static gboolean
 GameListEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
 {
 static gboolean
 GameListEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
 {

-    int n = (int) gdata;
+    int n = (intptr_t) gdata;

 
     if(n == 4) {
        if(((GdkEventKey *) event)->keyval != GDK_Return) return FALSE;
 
     if(n == 4) {
        if(((GdkEventKey *) event)->keyval != GDK_Return) return FALSE;


@@ -555,7 +568,7 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
     GtkTextIter start, end;
     String val = NULL;
     gboolean res;
     GtkTextIter start, end;
     String val = NULL;
     gboolean res;

-    gint index, x, y;
+    gint index = 0, x, y;

 
     switch(event->type) { // figure out what's up
        case GDK_MOTION_NOTIFY:
 
     switch(event->type) { // figure out what's up
        case GDK_MOTION_NOTIFY:


@@ -585,7 +598,7 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
            /* get text from textbuffer */
            gtk_text_buffer_get_start_iter (memo->handle, &start);
            gtk_text_buffer_get_end_iter (memo->handle, &end);
            /* get text from textbuffer */
            gtk_text_buffer_get_start_iter (memo->handle, &start);
            gtk_text_buffer_get_end_iter (memo->handle, &end);

-           val = gtk_text_buffer_get_text (memo->handle, &start, &end, FALSE); 
+           val = gtk_text_buffer_get_text (memo->handle, &start, &end, FALSE);

            break;
        default:
            return FALSE; // should not happen
            break;
        default:
            return FALSE; // should not happen


@@ -612,7 +625,7 @@ AddHandler (Option *opt, DialogClass dlg, int nr)
       case 5: // game list
        g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 );
       case 4: // game-list filter
       case 5: // game list
        g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 );
       case 4: // game-list filter

-       g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (GameListEvent), (gpointer) nr );
+       g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (GameListEvent), (gpointer) (intptr_t) nr );

        break;
       case 6: // engine output (uses generic textview callback)
        break;
        break;
       case 6: // engine output (uses generic textview callback)
        break;


@@ -626,7 +639,7 @@ AddHandler (Option *opt, DialogClass dlg, int nr)
 GtkWidget *shells[NrOfDialogs];
 DialogClass parents[NrOfDialogs];
 WindowPlacement *wp[NrOfDialogs] = { // Beware! Order must correspond to DialogClass enum
 GtkWidget *shells[NrOfDialogs];
 DialogClass parents[NrOfDialogs];
 WindowPlacement *wp[NrOfDialogs] = { // Beware! Order must correspond to DialogClass enum

-    NULL, &wpComment, &wpTags, NULL, NULL, NULL, NULL, &wpMoveHistory, &wpGameList, &wpEngineOutput, &wpEvalGraph,
+    NULL, &wpComment, &wpTags, NULL, NULL, NULL, &wpDualBoard, &wpMoveHistory, &wpGameList, &wpEngineOutput, &wpEvalGraph,

     NULL, NULL, NULL, NULL, &wpMain
 };
 
     NULL, NULL, NULL, NULL, &wpMain
 };
 


@@ -661,7 +674,7 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
           SubstructureRedirectMask | SubstructureNotifyMask,
           &xev);
 
           SubstructureRedirectMask | SubstructureNotifyMask,
           &xev);
 

-    XFlush(xDisplay); 
+    XFlush(xDisplay);

     XSync(xDisplay, False);
 #endif
 }
     XSync(xDisplay, False);
 #endif
 }


@@ -669,13 +682,13 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
 int
 PopDown (DialogClass n)
 {
 int
 PopDown (DialogClass n)
 {

-    //Arg args[10];    
-    
-    if (!shellUp[n] || !shells[n]) return 0;    
+    //Arg args[10];
+
+    if (!shellUp[n] || !shells[n]) return 0;

     if(n && wp[n]) { // remember position
        GetActualPlacement(shells[n], wp[n]);
     }
     if(n && wp[n]) { // remember position
        GetActualPlacement(shells[n], wp[n]);
     }

-    
+

     gtk_widget_hide(shells[n]);
     shellUp[n]--; // count rather than clear
 
     gtk_widget_hide(shells[n]);
     shellUp[n]--; // count rather than clear
 


@@ -717,7 +730,7 @@ gboolean GenericPopDown(w, resptype, gdata)
 #endif
     shells[dlg] = w; // make sure we pop down the right one in case of multiple instances
 
 #endif
     shells[dlg] = w; // make sure we pop down the right one in case of multiple instances
 

-    /* OK pressed */    
+    /* OK pressed */

     if (resptype == GTK_RESPONSE_ACCEPT) {
         if (GenericReadout(currentOption, -1)) PopDown(dlg);
         return TRUE;
     if (resptype == GTK_RESPONSE_ACCEPT) {
         if (GenericReadout(currentOption, -1)) PopDown(dlg);
         return TRUE;


@@ -732,11 +745,11 @@ gboolean GenericPopDown(w, resptype, gdata)
 }
 
 int AppendText(Option *opt, char *s)
 }
 
 int AppendText(Option *opt, char *s)

-{    
+{

     char *v;
     int len;
     char *v;
     int len;

-    GtkTextIter end;    
-  
+    GtkTextIter end;
+

     GetWidgetTextGTK(opt->handle, &v);
     len = strlen(v);
     g_free(v);
     GetWidgetTextGTK(opt->handle, &v);
     len = strlen(v);
     g_free(v);


@@ -786,7 +799,7 @@ GraphEventProc(GtkWidget *widget, GdkEvent *event, gpointer gdata)
            /* Get window size */
            gtk_widget_get_allocation(widget, &a);
            w = a.width; h = a.height;
            /* Get window size */
            gtk_widget_get_allocation(widget, &a);
            w = a.width; h = a.height;

-//printf("expose %dx%d @ (%d,%d)\n", w, h, a.x, a.y);
+//printf("expose %dx%d @ (%d,%d): %dx%d @(%d,%d)\n", w, h, a.x, a.y, eevent->area.width, eevent->area.height, eevent->area.x, eevent->area.y);

 #ifdef TODO_GTK
            j = 0;
            XtSetArg(args[j], XtNwidth, &w); j++;
 #ifdef TODO_GTK
            j = 0;
            XtSetArg(args[j], XtNwidth, &w); j++;


@@ -867,8 +880,8 @@ GraphExpose (Option *opt, int x, int y, int w, int h)
 void GenericCallback(GtkWidget *widget, gpointer gdata)
 {
     const gchar *name;
 void GenericCallback(GtkWidget *widget, gpointer gdata)
 {
     const gchar *name;

-    char buf[MSG_SIZ];    
-    int data = (intptr_t) gdata;   
+    char buf[MSG_SIZ];
+    int data = (intptr_t) gdata;

     DialogClass dlg;
 #ifdef TODO_GTK
     GtkWidget *sh = XtParent(XtParent(XtParent(w))), *oldSh;
     DialogClass dlg;
 #ifdef TODO_GTK
     GtkWidget *sh = XtParent(XtParent(XtParent(w))), *oldSh;


@@ -883,18 +896,18 @@ void GenericCallback(GtkWidget *widget, gpointer gdata)
     oldSh = shells[dlg]; shells[dlg] = sh; // bow to reality
 
     if (data == 30000) { // cancel
     oldSh = shells[dlg]; shells[dlg] = sh; // bow to reality
 
     if (data == 30000) { // cancel

-        PopDown(dlg); 
+        PopDown(dlg);

     } else
     if (data == 30001) { // save buttons imply OK
         if(GenericReadout(currentOption, -1)) PopDown(dlg); // calls OK-proc after full readout, but no popdown if it returns false
     } else
 
     if(currentCps) {
     } else
     if (data == 30001) { // save buttons imply OK
         if(GenericReadout(currentOption, -1)) PopDown(dlg); // calls OK-proc after full readout, but no popdown if it returns false
     } else
 
     if(currentCps) {

-        name = gtk_button_get_label (GTK_BUTTON(widget));         
+        name = gtk_button_get_label (GTK_BUTTON(widget));

        if(currentOption[data].type == SaveButton) GenericReadout(currentOption, -1);
         snprintf(buf, MSG_SIZ,  "option %s\n", name);
         SendToProgram(buf, currentCps);
        if(currentOption[data].type == SaveButton) GenericReadout(currentOption, -1);
         snprintf(buf, MSG_SIZ,  "option %s\n", name);
         SendToProgram(buf, currentCps);

-    } else ((ButtonCallback*) currentOption[data].target)(data);   
+    } else ((ButtonCallback*) currentOption[data].target)(data);

 
     shells[dlg] = oldSh; // in case of multiple instances, restore previous (as this one could be popped down now)
 }
 
     shells[dlg] = oldSh; // in case of multiple instances, restore previous (as this one could be popped down now)
 }


@@ -907,7 +920,7 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata)
     GtkFileFilter *gtkfilter_all;
     int opt_i = (intptr_t) gdata;
     GtkFileChooserAction fc_action;
     GtkFileFilter *gtkfilter_all;
     int opt_i = (intptr_t) gdata;
     GtkFileChooserAction fc_action;

-  
+

     gtkfilter     = gtk_file_filter_new();
     gtkfilter_all = gtk_file_filter_new();
 
     gtkfilter     = gtk_file_filter_new();
     gtkfilter_all = gtk_file_filter_new();
 


@@ -930,11 +943,11 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata)
     gtk_file_filter_add_pattern(gtkfilter_all, "*");
     gtk_file_filter_set_name   (gtkfilter_all, "All Files");
     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),gtkfilter_all);
     gtk_file_filter_add_pattern(gtkfilter_all, "*");
     gtk_file_filter_set_name   (gtkfilter_all, "All Files");
     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),gtkfilter_all);

-    
+

     /* filter for specific filetypes e.g. pgn or fen */
     /* filter for specific filetypes e.g. pgn or fen */

-    if (currentOption[opt_i].textValue != NULL && (strcmp(currentOption[opt_i].textValue, "") != 0) )    
-      {          
-        strcat(fileext, currentOption[opt_i].textValue);    
+    if (currentOption[opt_i].textValue != NULL && (strcmp(currentOption[opt_i].textValue, "") != 0) )
+      {
+        strcat(fileext, currentOption[opt_i].textValue);

         gtk_file_filter_add_pattern(gtkfilter, fileext);
         gtk_file_filter_set_name (gtkfilter, currentOption[opt_i].textValue);
         gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog),gtkfilter);
         gtk_file_filter_add_pattern(gtkfilter, fileext);
         gtk_file_filter_set_name (gtkfilter, currentOption[opt_i].textValue);
         gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog),gtkfilter);


@@ -942,14 +955,14 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata)
         gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter);
       }
     else
         gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter);
       }
     else

-      gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter_all);       
+      gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter_all);

 
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
       {
         char *filename;
 
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
       {
         char *filename;

-        filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));             
+        filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));

         entry = currentOption[opt_i].handle;
         entry = currentOption[opt_i].handle;

-        gtk_entry_set_text (GTK_ENTRY (entry), filename);        
+        gtk_entry_set_text (GTK_ENTRY (entry), filename);

         g_free (filename);
 
       }
         g_free (filename);
 
       }


@@ -1064,32 +1077,32 @@ Pack (GtkWidget *hbox, GtkWidget *table, GtkWidget *entry, int left, int right,
 
 int
 GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int topLevel)
 
 int
 GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int topLevel)

-{    
+{

     GtkWidget *dialog = NULL;
     gint       w;
     GtkWidget *label;
     GtkWidget *box;
     GtkWidget *checkbutton;
     GtkWidget *entry;
     GtkWidget *dialog = NULL;
     gint       w;
     GtkWidget *label;
     GtkWidget *box;
     GtkWidget *checkbutton;
     GtkWidget *entry;

-    GtkWidget *oldHbox, *hbox = NULL;    
+    GtkWidget *oldHbox = NULL, *hbox = NULL;

     GtkWidget *pane = NULL;
     GtkWidget *button;
     GtkWidget *table;
     GtkWidget *pane = NULL;
     GtkWidget *button;
     GtkWidget *table;

-    GtkWidget *spinner;    
+    GtkWidget *spinner;

     GtkAdjustment *spinner_adj;
     GtkWidget *combobox;
     GtkWidget *textview;
     GtkAdjustment *spinner_adj;
     GtkWidget *combobox;
     GtkWidget *textview;

-    GtkTextBuffer *textbuffer;           
-    GdkColor color;     
+    GtkTextBuffer *textbuffer;
+    GdkColor color;

     GtkWidget *actionarea;
     GtkWidget *actionarea;

-    GtkWidget *sw;    
-    GtkWidget *list;    
-    GtkWidget *graph;    
-    GtkWidget *menuButton;    
-    GtkWidget *menuBar;    
-    GtkWidget *menu;    
-
-    int i, j, arraysize, left, top, height=999, width=1, boxStart, breakType = 0, r;    
+    GtkWidget *sw;
+    GtkWidget *list;
+    GtkWidget *graph;
+    GtkWidget *menuButton;
+    GtkWidget *menuBar = NULL;
+    GtkWidget *menu;
+
+    int i, j, arraysize, left, top, height=999, width=1, boxStart=0, breakType = 0, r;

     char def[MSG_SIZ], *msg, engineDlg = (currentCps != NULL && dlgNr != BrowserDlg);
 
     if(dlgNr < PromoDlg && shellUp[dlgNr]) return 0; // already up
     char def[MSG_SIZ], *msg, engineDlg = (currentCps != NULL && dlgNr != BrowserDlg);
 
     if(dlgNr < PromoDlg && shellUp[dlgNr]) return 0; // already up


@@ -1097,6 +1110,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
     if(dlgNr && dlgNr < PromoDlg && shells[dlgNr]) { // reusable, and used before (but popped down)
         gtk_widget_show(shells[dlgNr]);
         shellUp[dlgNr] = True;
     if(dlgNr && dlgNr < PromoDlg && shells[dlgNr]) { // reusable, and used before (but popped down)
         gtk_widget_show(shells[dlgNr]);
         shellUp[dlgNr] = True;

+       if(wp[dlgNr]) gtk_window_move(GTK_WINDOW(shells[dlgNr]), wp[dlgNr]->x, wp[dlgNr]->y);

         return 0;
     }
 
         return 0;
     }
 


@@ -1110,10 +1124,10 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 //        if(n > 50) width = 4; else if(n>24) width = 2; else width = 1;
        width = n / 20 + 1;
         height = n / width + 1;
 //        if(n > 50) width = 4; else if(n>24) width = 2; else width = 1;
        width = n / 20 + 1;
         height = n / width + 1;

-printf("n=%d, h=%d, w=%d\n",n,height,width);
+if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);

 //     if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = SAME_ROW; // OK on same line
         currentOption[n].type = EndMark; currentOption[n].target = NULL; // delimit list by callback-less end mark
 //     if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = SAME_ROW; // OK on same line
         currentOption[n].type = EndMark; currentOption[n].target = NULL; // delimit list by callback-less end mark

-    }    
+    }

 
     parents[dlgNr] = parent;
 #ifdef TODO_GTK
 
     parents[dlgNr] = parent;
 #ifdef TODO_GTK


@@ -1124,26 +1138,37 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
       XtCreatePopupShell(title, !top || !appData.topLevel ? transientShellWidgetClass : topLevelShellWidgetClass,
                                                            shells[parent], args, i);
 #endif
       XtCreatePopupShell(title, !top || !appData.topLevel ? transientShellWidgetClass : topLevelShellWidgetClass,
                                                            shells[parent], args, i);
 #endif

-    dialog = gtk_dialog_new_with_buttons( title,
-                                      GTK_WINDOW(shells[parent]),
-                                     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR |
-                                          (modal ? GTK_DIALOG_MODAL : 0),
-                                      GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-                                      GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-                                      NULL );      
+
+    if(topLevel)
+      {
+       dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_window_set_title(GTK_WINDOW(dialog), title);
+       box = gtk_vbox_new(FALSE,0);
+       gtk_container_add (GTK_CONTAINER (dialog), box);
+      }
+    else
+      {
+       dialog = gtk_dialog_new_with_buttons( title,
+                                             GTK_WINDOW(shells[parent]),
+                                             GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR |
+                                             (modal ? GTK_DIALOG_MODAL : 0),
+                                             GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                             GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                                             NULL );
+       box = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) );
+      }

 
     shells[dlgNr] = dialog;
 
     shells[dlgNr] = dialog;

-    box = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) );
-//    gtk_box_set_spacing(GTK_BOX(box), 5);    
+//    gtk_box_set_spacing(GTK_BOX(box), 5);

 
     arraysize = 0;
     for (i=0;option[i].type != EndMark;i++) {
 
     arraysize = 0;
     for (i=0;option[i].type != EndMark;i++) {

-        arraysize++;   
+        arraysize++;

     }
 
     table = gtk_table_new(arraysize, r=TableWidth(option), FALSE);
     left = 0;
     }
 
     table = gtk_table_new(arraysize, r=TableWidth(option), FALSE);
     left = 0;

-    top = -1;    
+    top = -1;

 
     for (i=0;option[i].type != EndMark;i++) {
        if(option[i].type == -1) continue;
 
     for (i=0;option[i].type != EndMark;i++) {
        if(option[i].type == -1) continue;


@@ -1162,7 +1187,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
            gtk_box_pack_start (GTK_BOX (pane), table, TRUE, TRUE, 0);
            table = gtk_table_new(arraysize - i, r=TableWidth(option + i), FALSE);
             top = 0;
            gtk_box_pack_start (GTK_BOX (pane), table, TRUE, TRUE, 0);
            table = gtk_table_new(arraysize - i, r=TableWidth(option + i), FALSE);
             top = 0;

-        }                
+        }

         if(!SameRow(&option[i])) {
            if(SameRow(&option[i+1])) {
                GtkAttachOptions x = GTK_FILL;
         if(!SameRow(&option[i])) {
            if(SameRow(&option[i+1])) {
                GtkAttachOptions x = GTK_FILL;


@@ -1177,7 +1202,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
            } else hbox = NULL; //and also make sure no hbox exists if only singl option on row
         } else top--;
         switch(option[i].type) {
            } else hbox = NULL; //and also make sure no hbox exists if only singl option on row
         } else top--;
         switch(option[i].type) {

-          case Fractional:           
+          case Fractional:

            snprintf(def, MSG_SIZ,  "%.2f", *(float*)option[i].target);
            option[i].value = *(float*)option[i].target;
             goto tBox;
            snprintf(def, MSG_SIZ,  "%.2f", *(float*)option[i].target);
            option[i].value = *(float*)option[i].target;
             goto tBox;


@@ -1185,7 +1210,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
             if(!currentCps) option[i].value = *(int*)option[i].target;
             snprintf(def, MSG_SIZ,  "%d", option[i].value);
           case TextBox:
             if(!currentCps) option[i].value = *(int*)option[i].target;
             snprintf(def, MSG_SIZ,  "%d", option[i].value);
           case TextBox:

-         case FileName:            
+         case FileName:

          case PathName:
           tBox:
             label = gtk_label_new(option[i].name);
          case PathName:
           tBox:
             label = gtk_label_new(option[i].name);


@@ -1197,7 +1222,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
            if(option[i].type == FileName || option[i].type == PathName) w -= 55;
 
             if (option[i].type==TextBox && option[i].value > 80){
            if(option[i].type == FileName || option[i].type == PathName) w -= 55;
 
             if (option[i].type==TextBox && option[i].value > 80){

-                textview = gtk_text_view_new();                
+                textview = gtk_text_view_new();

                 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), option[i].min & T_WRAP ? GTK_WRAP_WORD : GTK_WRAP_NONE);
 #ifdef TODO_GTK
                if(option[i].min & T_FILL)  { XtSetArg(args[j], XtNautoFill, True);  j++; }
                 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), option[i].min & T_WRAP ? GTK_WRAP_WORD : GTK_WRAP_NONE);
 #ifdef TODO_GTK
                if(option[i].min & T_FILL)  { XtSetArg(args[j], XtNautoFill, True);  j++; }


@@ -1211,9 +1236,9 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
                 gtk_container_add(GTK_CONTAINER(sw), textview);
                 gtk_widget_set_size_request(GTK_WIDGET(sw), w, -1);
                 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_OUT);
                 gtk_container_add(GTK_CONTAINER(sw), textview);
                 gtk_widget_set_size_request(GTK_WIDGET(sw), w, -1);
                 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_OUT);

- 
-                textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));                
-                /* check if label is empty */ 
+
+                textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
+                /* check if label is empty */

                 if (strcmp(option[i].name,"") != 0) {
                     gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1);
                     Pack(hbox, table, sw, left+1, left+r, top, 0);
                 if (strcmp(option[i].name,"") != 0) {
                     gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1);
                     Pack(hbox, table, sw, left+1, left+r, top, 0);


@@ -1221,11 +1246,11 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
                 else {
                     /* no label so let textview occupy all columns */
                     Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND);
                 else {
                     /* no label so let textview occupy all columns */
                     Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND);

-                } 
+                }

                 if ( *(char**)option[i].target != NULL )
                     gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
                 else
                 if ( *(char**)option[i].target != NULL )
                     gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
                 else

-                    gtk_text_buffer_set_text (textbuffer, "", -1); 
+                    gtk_text_buffer_set_text (textbuffer, "", -1);

                 option[i].handle = (void*)textbuffer;
                 option[i].textValue = (char*)textview;
                if(option[i].choice) { // textviews can request a handler for mouse events in the choice field
                 option[i].handle = (void*)textbuffer;
                 option[i].textValue = (char*)textview;
                if(option[i].choice) { // textviews can request a handler for mouse events in the choice field


@@ -1233,7 +1258,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
                    g_signal_connect(textview, "button-release-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
                    g_signal_connect(textview, "motion-notify-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
                }
                    g_signal_connect(textview, "button-release-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
                    g_signal_connect(textview, "motion-notify-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
                }

-                break; 
+                break;

             }
 
             entry = gtk_entry_new();
             }
 
             entry = gtk_entry_new();


@@ -1243,7 +1268,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
             else if (currentCps)
                 gtk_entry_set_text (GTK_ENTRY (entry), option[i].textValue);
             else if ( *(char**)option[i].target != NULL )
             else if (currentCps)
                 gtk_entry_set_text (GTK_ENTRY (entry), option[i].textValue);
             else if ( *(char**)option[i].target != NULL )

-                gtk_entry_set_text (GTK_ENTRY (entry), *(char**)option[i].target);            
+                gtk_entry_set_text (GTK_ENTRY (entry), *(char**)option[i].target);

 
             //gtk_entry_set_width_chars (GTK_ENTRY (entry), 18);
             gtk_entry_set_max_length (GTK_ENTRY (entry), w);
 
             //gtk_entry_set_width_chars (GTK_ENTRY (entry), 18);
             gtk_entry_set_max_length (GTK_ENTRY (entry), w);


@@ -1252,7 +1277,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
             if (strcmp(option[i].name, "") != 0)
                 gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // leading names do not expand
 
             if (strcmp(option[i].name, "") != 0)
                 gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // leading names do not expand
 

-            if (option[i].type == Spin) {                
+            if (option[i].type == Spin) {

                 spinner_adj = (GtkAdjustment *) gtk_adjustment_new (option[i].value, option[i].min, option[i].max, 1.0, 0.0, 0.0);
                 spinner = gtk_spin_button_new (spinner_adj, 1.0, 0);
                 gtk_table_attach(GTK_TABLE(table), spinner, left+1, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);
                 spinner_adj = (GtkAdjustment *) gtk_adjustment_new (option[i].value, option[i].min, option[i].max, 1.0, 0.0, 0.0);
                 spinner = gtk_spin_button_new (spinner_adj, 1.0, 0);
                 gtk_table_attach(GTK_TABLE(table), spinner, left+1, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);


@@ -1263,26 +1288,26 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
                 button = gtk_button_new_with_label ("Browse");
                 gtk_table_attach(GTK_TABLE(table), button, left+2, left+r, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // Browse button does not expand
                 g_signal_connect (button, "clicked", G_CALLBACK (BrowseGTK), (gpointer)(intptr_t) i);
                 button = gtk_button_new_with_label ("Browse");
                 gtk_table_attach(GTK_TABLE(table), button, left+2, left+r, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // Browse button does not expand
                 g_signal_connect (button, "clicked", G_CALLBACK (BrowseGTK), (gpointer)(intptr_t) i);

-                option[i].handle = (void*)entry;                 
+                option[i].handle = (void*)entry;

             }
             else {
                 Pack(hbox, table, entry, left + (strcmp(option[i].name, "") != 0), left+r, top, 0);
                 option[i].handle = (void*)entry;
             }
             else {
                 Pack(hbox, table, entry, left + (strcmp(option[i].name, "") != 0), left+r, top, 0);
                 option[i].handle = (void*)entry;

-            }                                  
+            }

             break;
           case CheckBox:
             break;
           case CheckBox:

-            checkbutton = gtk_check_button_new_with_label(option[i].name);            
+            checkbutton = gtk_check_button_new_with_label(option[i].name);

             if(!currentCps) option[i].value = *(Boolean*)option[i].target;
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), option[i].value);
             gtk_table_attach(GTK_TABLE(table), checkbutton, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 0);
             if(!currentCps) option[i].value = *(Boolean*)option[i].target;
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), option[i].value);
             gtk_table_attach(GTK_TABLE(table), checkbutton, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 0);

-            option[i].handle = (void *)checkbutton;            
-            break; 
-         case Icon:            
+            option[i].handle = (void *)checkbutton;
+            break;
+         case Icon:

             option[i].handle = (void *) (label = gtk_image_new_from_pixbuf(NULL));
             gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1);
             Pack(hbox, table, label, left, left+2, top, 0);
             option[i].handle = (void *) (label = gtk_image_new_from_pixbuf(NULL));
             gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1);
             Pack(hbox, table, label, left, left+2, top, 0);

-            break; 
-         case Label:            
+            break;
+         case Label:

             option[i].handle = (void *) (label = gtk_label_new(option[i].name));
             /* Left Justify */
             gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
             option[i].handle = (void *) (label = gtk_label_new(option[i].name));
             /* Left Justify */
             gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);


@@ -1317,47 +1342,47 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
                 gdk_color_parse( option[i].textValue, &color );
                 gtk_widget_modify_bg ( GTK_WIDGET(button), GTK_STATE_NORMAL, &color );
                 gtk_widget_set_sensitive(button, appData.noChessProgram || option[i].value < 0
                 gdk_color_parse( option[i].textValue, &color );
                 gtk_widget_modify_bg ( GTK_WIDGET(button), GTK_STATE_NORMAL, &color );
                 gtk_widget_set_sensitive(button, appData.noChessProgram || option[i].value < 0

-                                        || strstr(first.variants, VariantName(option[i].value)));                 
+                                        || strstr(first.variants, VariantName(option[i].value)));

             }
             }

-            
+

             Pack(hbox, table, button, left, left+1, top, 0);
             Pack(hbox, table, button, left, left+1, top, 0);

-            g_signal_connect (button, "clicked", G_CALLBACK (GenericCallback), (gpointer)(intptr_t) i + (dlgNr<<16));           
-            option[i].handle = (void*)button;            
-            break;  
+            g_signal_connect (button, "clicked", G_CALLBACK (GenericCallback), (gpointer)(intptr_t) i + (dlgNr<<16));
+            option[i].handle = (void*)button;
+            break;

          case ComboBox:
             label = gtk_label_new(option[i].name);
             /* Left Justify */
             gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
             gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1);
 
          case ComboBox:
             label = gtk_label_new(option[i].name);
             /* Left Justify */
             gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
             gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1);
 

-            combobox = gtk_combo_box_new_text();            
+            combobox = gtk_combo_box_new_text();

 
             for(j=0;;j++) {
                if (  ((char **) option[i].textValue)[j] == NULL) break;
 
             for(j=0;;j++) {
                if (  ((char **) option[i].textValue)[j] == NULL) break;

-               gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), ((char **) option[i].choice)[j]);                          
+               gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), ((char **) option[i].choice)[j]);

             }
 
             if(currentCps)
                 option[i].choice = (char**) option[i].textValue;
             else {
             }
 
             if(currentCps)
                 option[i].choice = (char**) option[i].textValue;
             else {

-                for(j=0; option[i].choice[j]; j++) {                
+                for(j=0; option[i].choice[j]; j++) {

                     if(*(char**)option[i].target && !strcmp(*(char**)option[i].target, ((char**)(option[i].textValue))[j])) break;
                 }
                 /* If choice is NULL set to first */
                 if (option[i].choice[j] == NULL)
                    option[i].value = 0;
                     if(*(char**)option[i].target && !strcmp(*(char**)option[i].target, ((char**)(option[i].textValue))[j])) break;
                 }
                 /* If choice is NULL set to first */
                 if (option[i].choice[j] == NULL)
                    option[i].value = 0;

-                else 
+                else

                    option[i].value = j;
             }
 
                    option[i].value = j;
             }
 

-            //option[i].value = j + (option[i].choice[j] == NULL);            
-            gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), option[i].value); 
-            
+            //option[i].value = j + (option[i].choice[j] == NULL);
+            gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), option[i].value);
+

             Pack(hbox, table, combobox, left+1, left+r, top, 0);
             g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(ComboSelect), (gpointer) (intptr_t) (i + 256*dlgNr));
 
             option[i].handle = (void*)combobox;
             Pack(hbox, table, combobox, left+1, left+r, top, 0);
             g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(ComboSelect), (gpointer) (intptr_t) (i + 256*dlgNr));
 
             option[i].handle = (void*)combobox;

-            values[i] = option[i].value;            
+            values[i] = option[i].value;

             break;
          case ListBox:
             {
             break;
          case ListBox:
             {


@@ -1382,9 +1407,9 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
                 gtk_container_add(GTK_CONTAINER(sw), list);
                 gtk_widget_set_size_request(GTK_WIDGET(sw), option[i].max ? option[i].max : -1, option[i].value ? option[i].value : -1);
                 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_OUT);
                 gtk_container_add(GTK_CONTAINER(sw), list);
                 gtk_widget_set_size_request(GTK_WIDGET(sw), option[i].max ? option[i].max : -1, option[i].value ? option[i].value : -1);
                 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_OUT);

- 
+

                 if(option[i].textValue) // generic callback for double-clicking listbox item
                 if(option[i].textValue) // generic callback for double-clicking listbox item

-                    g_signal_connect(list, "button-press-event", G_CALLBACK(ListCallback), (gpointer) (dlgNr<<16 | i) );
+                    g_signal_connect(list, "button-press-event", G_CALLBACK(ListCallback), (gpointer) (intptr_t) (dlgNr<<16 | i) );

 
                 /* never has label, so let listbox occupy all columns */
                 Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND);
 
                 /* never has label, so let listbox occupy all columns */
                 Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND);


@@ -1449,7 +1474,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
          case BarEnd:
            top--;
             gtk_table_attach(GTK_TABLE(table), menuBar, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);
          case BarEnd:
            top--;
             gtk_table_attach(GTK_TABLE(table), menuBar, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);

-           
+

            if(option[i].target) ((ButtonCallback*)option[i].target)(boxStart); // callback that can make sizing decisions
            break;
          case BoxEnd:
            if(option[i].target) ((ButtonCallback*)option[i].target)(boxStart); // callback that can make sizing decisions
            break;
          case BoxEnd:


@@ -1461,15 +1486,15 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
          case Break:
             breakType = option[i].min & SAME_ROW;
            top = height; // force next option to start in a new table
          case Break:
             breakType = option[i].min & SAME_ROW;
            top = height; // force next option to start in a new table

-            break; 
+            break;

 
          case PopUp:
            top--;
 
          case PopUp:
            top--;

-            break; 
+            break;

        default:
            printf("GenericPopUp: unexpected case in switch. i=%d type=%d name=%s.\n", i, option[i].type, option[i].name);
            break;
        default:
            printf("GenericPopUp: unexpected case in switch. i=%d type=%d name=%s.\n", i, option[i].type, option[i].name);
            break;

-       }        
+       }

     }
 
     if(pane)
     }
 
     if(pane)


@@ -1481,31 +1506,35 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
     option[i].handle = (void *) table; // remember last table in EndMark handle (for hiding Engine-Output pane).
 
     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_NONE);
     option[i].handle = (void *) table; // remember last table in EndMark handle (for hiding Engine-Output pane).
 
     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_NONE);

+

     /* Show dialog */
     /* Show dialog */

-    gtk_widget_show_all( dialog );    
+    gtk_widget_show_all( dialog );

 
     /* hide OK/cancel buttons */
 
     /* hide OK/cancel buttons */

-    if((option[i].min & NO_OK)) {
-        actionarea = gtk_dialog_get_action_area(GTK_DIALOG(dialog));
-        gtk_widget_hide(actionarea);
-    } else if((option[i].min & NO_CANCEL)) {
-        button = gtk_dialog_get_widget_for_response(GTK_DIALOG(dialog), GTK_RESPONSE_REJECT);
-        gtk_widget_hide(button);
-    }
-
-    g_signal_connect (dialog, "response",
+    if(!topLevel)
+      {
+       if((option[i].min & NO_OK)) {
+         actionarea = gtk_dialog_get_action_area(GTK_DIALOG(dialog));
+         gtk_widget_hide(actionarea);
+       } else if((option[i].min & NO_CANCEL)) {
+         button = gtk_dialog_get_widget_for_response(GTK_DIALOG(dialog), GTK_RESPONSE_REJECT);
+         gtk_widget_hide(button);
+       }
+        g_signal_connect (dialog, "response",

                       G_CALLBACK (GenericPopDown),
                       (gpointer)(intptr_t) dlgNr);
                       G_CALLBACK (GenericPopDown),
                       (gpointer)(intptr_t) dlgNr);

+      }
+

     g_signal_connect (dialog, "delete-event",
                       G_CALLBACK (GenericPopDown),
                       (gpointer)(intptr_t) dlgNr);
     shellUp[dlgNr]++;
 
     g_signal_connect (dialog, "delete-event",
                       G_CALLBACK (GenericPopDown),
                       (gpointer)(intptr_t) dlgNr);
     shellUp[dlgNr]++;
 

-    if(dlgNr && wp[dlgNr] && wp[dlgNr]->width > 0) { // if persistent window-info available, reposition
+    if(dlgNr && wp[dlgNr]) { // if persistent window-info available, reposition
+      if(wp[dlgNr]->x > 0 && wp[dlgNr]->y > 0)

        gtk_window_move(GTK_WINDOW(dialog), wp[dlgNr]->x, wp[dlgNr]->y);
        gtk_window_move(GTK_WINDOW(dialog), wp[dlgNr]->x, wp[dlgNr]->y);

-//printf("moved %d to (%d,%d)\n", dlgNr, wp[dlgNr]->x, wp[dlgNr]->y);
+      if(wp[dlgNr]->width > 0 && wp[dlgNr]->height > 0)

        gtk_window_resize(GTK_WINDOW(dialog), wp[dlgNr]->width, wp[dlgNr]->height);
        gtk_window_resize(GTK_WINDOW(dialog), wp[dlgNr]->width, wp[dlgNr]->height);

-//printf("resized %d to %dx%d\n", dlgNr, wp[dlgNr]->width, wp[dlgNr]->height);

     }
 
     return 1; // tells caller he must do initialization (e.g. add specific event handlers)
     }
 
     return 1; // tells caller he must do initialization (e.g. add specific event handlers)


@@ -1547,13 +1576,8 @@ SendText (int n)
 void
 SetInsertPos (Option *opt, int pos)
 {
 void
 SetInsertPos (Option *opt, int pos)
 {

-#ifdef TODO_GTK
-    Arg args[16];
-    XtSetArg(args[0], XtNinsertPosition, pos);
-    XtSetValues(opt->handle, args, 1);
-//    SetFocus(opt->handle, shells[InputBoxDlg], NULL, False); // No idea why this does not work, and the following is needed:
-//    XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime);
-#endif
+    if(opt->value > 80) ScrollToCursor(opt, pos);
+    else gtk_editable_set_position(GTK_EDITABLE(opt->handle), pos);

 }
 
 void
 }
 
 void


@@ -1561,5 +1585,3 @@ HardSetFocus (Option *opt)
 {
     FocusOnWidget(opt, 0); // second arg not used in GDK
 }
 {
     FocusOnWidget(opt, 0); // second arg not used in GDK
 }

-
-