#include <cairo/cairo.h>
#include <cairo/cairo-xlib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
#include "common.h"
#include "backend.h"
filterTranslations, gameListTranslations, memoTranslations
};
+static gboolean
+ICSKeyEvent(GtkWidget *widget, GdkEventKey *event)
+{
+ switch(event->keyval) {
+ case GDK_Return: IcsKey(0); return TRUE;
+ case GDK_Up: IcsKey(1); return TRUE;
+ case GDK_Down: IcsKey(-1); return TRUE;
+ default: return FALSE;
+ }
+}
+
void
AddHandler (Option *opt, int nr)
{
-#ifdef TODO_GTK
switch(nr) {
- case
+ case 0:
+ case 1:
+ case 2: break;
+ case 3: g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (ICSKeyEvent), NULL); break;
+ case 4:
+ case 5:
+ case 6: break;
}
+#ifdef TODO_GTK
XtOverrideTranslations(opt->handle, XtParseTranslationTable(translationTable[nr]));
#endif
}
gtk_widget_hide(shells[n]);
shellUp[n]--; // count rather than clear
+
if(n == 0 || n >= PromoDlg) {
gtk_widget_destroy(shells[n]);
shells[n] = NULL;
- }
+ }
if(marked[n]) {
MarkMenuItem(marked[n], False);
return 1;
}
-gboolean GenericPopDown(w, event, gdata)
+/* GTK callback used when OK/cancel clicked in genericpopup for non-modal dialog */
+gboolean GenericPopDown(w, resptype, gdata)
GtkWidget *w;
- GdkEvent *event;
- gpointer gdata;
+ GtkResponseType resptype;
+ gpointer gdata;
{
- int dlg = (intptr_t) gdata; /* dialog number dlgnr */
-
+ DialogClass dlg = (intptr_t) gdata; /* dialog number dlgnr */
+ GtkWidget *sh = shells[dlg];
+
+ currentOption = dialogOptions[dlg];
+
#ifdef TODO_GTK
// I guess BrowserDlg will be abandoned, as GTK has a better browser of its own
- if(shellUp[BrowserDlg] && dlg != BrowserDlg || dialogError) return; // prevent closing dialog when it has an open file-browse daughter
+ if(shellUp[BrowserDlg] && dlg != BrowserDlg || dialogError) return True; // prevent closing dialog when it has an open file-browse daughter
#else
- if(browserUp || dialogError && dlg != FatalDlg) return True; // prevent closing dialog when it has an open file-browse daughter
+ if(browserUp || dialogError && dlg != FatalDlg) return True; // prevent closing dialog when it has an open file-browse or error-popup daughter
#endif
- GtkWidget *sh = shells[dlg];
-printf("popdown %d\n", dlg);
shells[dlg] = w; // make sure we pop down the right one in case of multiple instances
- PopDown(dlg);
+
+ /* OK pressed */
+ if (resptype == GTK_RESPONSE_ACCEPT) {
+ if (GenericReadout(currentOption, -1)) PopDown(dlg);
+ return TRUE;
+ } else
+ /* cancel pressed */
+ {
+ if(dlg == BoardWindow) ExitEvent(0);
+ PopDown(dlg);
+ }
shells[dlg] = sh; // restore
- if(dlg == BoardWindow) ExitEvent(0);
- return True; /* don't propagate to default handler */
+ return TRUE;
}
int AppendText(Option *opt, char *s)
*) &e, (gpointer) opt); // fake expose event
}
-/* GTK callback used when OK/cancel clicked in genericpopup for non-modal dialog */
-void GenericPopUpCallback(w, resptype, gdata)
- GtkWidget *w;
- GtkResponseType resptype;
- gpointer gdata;
-{
- int data = (intptr_t) gdata; /* dialog number dlgnr */
- DialogClass dlg;
-
- currentOption = dialogOptions[dlg=data>>16]; data &= 0xFFFF;
-
- /* OK pressed */
- if (resptype == GTK_RESPONSE_ACCEPT) {
- if (GenericReadout(currentOption, -1)) PopDown(data);
- return;
- }
-
- /* cancel pressed */
- PopDown(dlg);
-}
-
void GenericCallback(GtkWidget *widget, gpointer gdata)
{
const gchar *name;
sh = shells[dlg]; // make following line a no-op, as we haven't found out what the real shell is yet (breaks multiple popups of same type!)
#endif
oldSh = shells[dlg]; shells[dlg] = sh; // bow to reality
-
-#ifdef TODO_GTK
+
if (data == 30000) { // cancel
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
-#endif
if(currentCps) {
name = gtk_button_get_label (GTK_BUTTON(widget));
}
#endif
+static int
+SameRow (Option *opt)
+{
+ return (opt->min & SAME_ROW && (opt->type == Button || opt->type == SaveButton || opt->type == Label || opt->type == ListBox));
+}
+
+static void
+Pack (GtkWidget *hbox, GtkWidget *table, GtkWidget *entry, int left, int right, int top)
+{
+ if(hbox) gtk_box_pack_start(GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ else gtk_table_attach_defaults(GTK_TABLE(table), entry, left, right, top, top+1);
+}
+
int
GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int topLevel)
{
GtkWidget *box;
GtkWidget *checkbutton;
GtkWidget *entry;
- GtkWidget *hbox;
+ GtkWidget *hbox = NULL;
GtkWidget *button;
GtkWidget *table;
GtkWidget *spinner;
int i, j, arraysize, left, top, height=999, width=1, boxStart;
char def[MSG_SIZ], *msg, engineDlg = (currentCps != NULL && dlgNr != BrowserDlg);
-
+
if(dlgNr < PromoDlg && shellUp[dlgNr]) return 0; // already up
if(dlgNr && dlgNr < PromoDlg && shells[dlgNr]) { // reusable, and used before (but popped down)
left = left + 3;
gtk_table_resize(GTK_TABLE(table), height, left + 3);
}
+ if(!SameRow(&option[i])) {
+ if(SameRow(&option[i+1])) {
+ // make sure hbox is always available when we have more options on same row
+ hbox = gtk_hbox_new (option[i].type == Button && option[i].textValue, 0);
+ if (strcmp(option[i].name, "") == 0 || option[i].type == Label || option[i].type == Button)
+ // for Label and Button name is contained inside option
+ gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+3, top, top+1);
+ else
+ gtk_table_attach_defaults(GTK_TABLE(table), hbox, left+1, left+3, top, top+1);
+ } else hbox = NULL; //and also make sure no hbox exists if only singl option on row
+ }
switch(option[i].type) {
case Fractional:
snprintf(def, MSG_SIZ, "%.2f", *(float*)option[i].target);
/* check if label is empty */
if (strcmp(option[i].name,"") != 0) {
gtk_table_attach_defaults(GTK_TABLE(table), label, left, left+1, top, top+1);
- gtk_table_attach_defaults(GTK_TABLE(table), sw, left+1, left+3, top, top+1);
+ Pack(hbox, table, sw, left+1, left+3, top);
}
else {
/* no label so let textview occupy all columns */
- gtk_table_attach_defaults(GTK_TABLE(table), sw, left, left+3, top, top+1);
+ Pack(hbox, table, sw, left, left+3, top);
}
if ( *(char**)option[i].target != NULL )
gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
option[i].handle = (void*)entry;
}
else {
- hbox = gtk_hbox_new (FALSE, 0);
- if (strcmp(option[i].name, "") == 0)
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+3, top, top+1);
- else
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left+1, left+3, top, top+1);
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
- //gtk_table_attach_defaults(GTK_TABLE(table), entry, left+1, left+3, top, top+1);
+ Pack(hbox, table, entry, left + (strcmp(option[i].name, "") != 0), left+3, top);
option[i].handle = (void*)entry;
}
break;
gtk_container_add(GTK_CONTAINER(frame), label);
label = frame;
}
- gtk_table_attach_defaults(GTK_TABLE(table), label, left, left+3, top, top+1);
+ Pack(hbox, table, label, left, left+3, top);
break;
case SaveButton:
case Button:
|| strstr(first.variants, VariantName(option[i].value)));
}
- if (!(option[i].min & 1)) {
- if(option[i].textValue) // for new variant dialog give buttons equal space so they line up nicely
- hbox = gtk_hbox_new (TRUE, 0);
- else
- hbox = gtk_hbox_new (FALSE, 0);
- // if only 1 button then put it in 1st column of table only
- if ( (arraysize >= (i+1)) && option[i+1].type != Button )
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+1, top, top+1);
- else
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+3, top, top+1);
- }
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ Pack(hbox, table, button, left, left+1, top);
g_signal_connect (button, "clicked", G_CALLBACK (GenericCallback), (gpointer)(intptr_t) i + (dlgNr<<16));
option[i].handle = (void*)button;
break;
//option[i].value = j + (option[i].choice[j] == NULL);
gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), option[i].value);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left+1, left+3, top, top+1);
- gtk_box_pack_start (GTK_BOX (hbox), combobox, TRUE, TRUE, 0);
- //gtk_table_attach_defaults(GTK_TABLE(table), combobox, 1, 2, i, i+1);
-
+ Pack(hbox, table, combobox, left+1, left+3, top);
g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(ComboSelect), (gpointer) (intptr_t) (i + 256*dlgNr));
option[i].handle = (void*)combobox;
gtk_widget_set_size_request(GTK_WIDGET(sw), w, 300);
/* never has label, so let listbox occupy all columns */
- gtk_table_attach_defaults(GTK_TABLE(table), sw, left, left+3, top, top+1);
+ Pack(hbox, table, sw, left, left+3, top);
}
break;
case Graph:
}
g_signal_connect (dialog, "response",
- G_CALLBACK (GenericPopUpCallback),
- (gpointer)(intptr_t) (dlgNr<<16 | i));
- g_signal_connect (dialog, "delete-event",
G_CALLBACK (GenericPopDown),
(gpointer)(intptr_t) dlgNr);
- g_signal_connect (dialog, "destroy-event",
+ g_signal_connect (dialog, "delete-event",
G_CALLBACK (GenericPopDown),
(gpointer)(intptr_t) dlgNr);
shellUp[dlgNr]++;
projects / xboard.git / blobdiff