X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=c7e7535e0c1f98565c4e640aaa2307406276eb87;hb=e6df7a018a00f4f5ed8c20882af27c9033d6aa5b;hp=5f4711f4662668fcfbfc97f2c64713e643559386;hpb=83e68d362c47f927ead4f1bee272f27e0710ed9d;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 5f4711f..c7e7535 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -244,7 +244,10 @@ SetWidgetState (Option *opt, int state)
 void
 SetWidgetLabel (Option *opt, char *buf)
 {
-    gtk_label_set_text(opt->handle, buf);
+    if(opt->type == Button) // Chat window uses this routine for changing button labels
+	gtk_button_set_label(opt->handle, buf);
+    else
+	gtk_label_set_text(opt->handle, buf);
 }
 
 void
@@ -438,7 +441,7 @@ CreateMenuPopup (Option *opt, int n, int def)
       return menu;
 }
 
-Option *typeIn; // kludge to distinguish type-in callback from input-box callback
+Option *icsBox; // kludge to distinguish type-in callback from input-box callback
 
 void
 CursorAtEnd (Option *opt)
@@ -447,21 +450,9 @@ CursorAtEnd (Option *opt)
 }
 
 static gboolean
-ICSKeyEvent(GtkWidget *widget, GdkEventKey *event, gpointer g)
-{
-    Option *opt = (Option *) g;
-    if(opt == typeIn) {
-	if(event->keyval == GDK_Return) {
-	    char *val;
-	    GetWidgetText(opt, &val);
-	    TypeInDoneEvent(val);
-	    PopDown(TransientDlg);
-	    return TRUE;
-	}
-	return FALSE;
-    }
-
-    switch(event->keyval) {
+ICSKeyEvent (int keyval)
+{   // TODO_GTK: arrow-handling should really be integrated in type-in proc, and this should be a backe-end OK handler
+    switch(keyval) {
       case GDK_Return: IcsKey(0); return TRUE;
       case GDK_Up:     IcsKey(1); return TRUE;
       case GDK_Down:  IcsKey(-1); return TRUE;
@@ -613,10 +604,10 @@ AddHandler (Option *opt, DialogClass dlg, int nr)
       case 0: // history (now uses generic textview callback)
       case 1: // comment (likewise)
 	break;
-      case 2: // move type-in
-	typeIn = opt;
       case 3: // input box
-	g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (ICSKeyEvent), (gpointer) opt);
+	icsBox = opt;
+      case 2: // move type-in
+	g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (TypeInProc), (gpointer) (dlg<<16 | (opt - dialogOptions[dlg])));
 	break;
       case 5: // game list
 	g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 );
@@ -1492,9 +1483,12 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
     gtk_widget_show_all( dialog );    
 
     /* hide OK/cancel buttons */
-    if((option[i].min & 2)) {
+    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",
@@ -1563,9 +1557,7 @@ SetInsertPos (Option *opt, int pos)
 void
 HardSetFocus (Option *opt)
 {
-#ifdef TODO_GTK
-    XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime);
-#endif
+    FocusOnWidget(opt, 0); // second arg not used in GDK
 }