GtkTextIter end;
if (GTK_IS_ENTRY(w)) {
- *buf = gtk_entry_get_text(GTK_ENTRY (w));
+ *buf = (char *) gtk_entry_get_text(GTK_ENTRY (w));
} else
if (GTK_IS_TEXT_BUFFER(w)) {
gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(w), &start);
void
HighlightItem (Option *opt, int index, int scroll)
{
- char *value, **data = (char **) (opt->target);
GtkWidget *list = (GtkWidget *) (opt->handle);
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
- GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
- GtkListStore *store = GTK_LIST_STORE(model);
GtkTreePath *path = gtk_tree_path_new_from_indices(index, -1);
- GtkTreeIter iter;
gtk_tree_selection_select_path(selection, path);
- if(scroll) gtk_tree_view_scroll_to_cell(list, path, NULL, 0, 0, 0);
+ if(scroll) gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(list), path, NULL, 0, 0, 0);
gtk_tree_path_free(path);
}
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(entry, True);
+ 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);
{ // handle mouse clicks on text widgets that need it
int w, h;
int button=10, f=1;
- Option *opt, *memo = (Option *) gdata;
+ Option *memo = (Option *) gdata;
MemoCallback *userHandler = (MemoCallback *) memo->choice;
GdkEventButton *bevent = (GdkEventButton *) event;
GdkEventMotion *mevent = (GdkEventMotion *) event;
shiftState = bevent->state & GDK_SHIFT_MASK;
controlState = bevent->state & GDK_CONTROL_MASK;
// GTK_TODO: is this really the most efficient way to get the character at the mouse cursor???
- gtk_text_view_window_to_buffer_coords(widget, GTK_TEXT_WINDOW_WIDGET, w, h, &x, &y);
- gtk_text_view_get_iter_at_location(widget, &start, x, y);
+ gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(widget), GTK_TEXT_WINDOW_WIDGET, w, h, &x, &y);
+ gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(widget), &start, x, y);
gtk_text_buffer_place_cursor(memo->handle, &start);
/* get cursor position into index */
g_object_get(memo->handle, "cursor-position", &index, NULL);
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, NULL, NULL, NULL, /*&wpMain*/ NULL
+ NULL, NULL, NULL, NULL, &wpMain
};
int
//Arg args[10];
if (!shellUp[n] || !shells[n]) return 0;
-#ifdef TODO_GTK
-// Not sure this is still used
if(n && wp[n]) { // remember position
- j = 0;
- XtSetArg(args[j], XtNx, &windowX); j++;
- XtSetArg(args[j], XtNy, &windowY); j++;
- XtSetArg(args[j], XtNheight, &windowH); j++;
- XtSetArg(args[j], XtNwidth, &windowW); j++;
- XtGetValues(shells[n], args, j);
- wp[n]->x = windowX;
- wp[n]->x = windowY;
- wp[n]->width = windowW;
- wp[n]->height = windowH;
+ GetActualPlacement(shells[n], wp[n]);
}
-#endif
gtk_widget_hide(shells[n]);
shellUp[n]--; // count rather than clear
GraphEventProc(GtkWidget *widget, GdkEvent *event, gpointer gdata)
{ // handle expose and mouse events on Graph widget
int w, h;
- int j, button=10, f=1, sizing=0;
+ int button=10, f=1, sizing=0;
Option *opt, *graph = (Option *) gdata;
PointerCallback *userHandler = graph->target;
GdkEventExpose *eevent = (GdkEventExpose *) event;
// to give drawing routines opportunity to use it before first expose event
// (which are only processed when main gets to the event loop, so after all init!)
// so only change when size is no longer good
-#ifdef TODO_GTK
if(graph->choice) cairo_surface_destroy((cairo_surface_t *) graph->choice);
graph->choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w, h);
-#endif
break;
}
w = eevent->area.width;
if(eevent->area.x + w > graph->max) w--; // cut off fudge pixel
cr = gdk_cairo_create(((GtkWidget *) (graph->handle))->window);
cairo_set_source_surface(cr, (cairo_surface_t *) graph->choice, 0, 0);
+//cairo_set_source_rgb(cr, 1, 0, 0);
cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
cairo_rectangle(cr, eevent->area.x, eevent->area.y, w, eevent->area.height);
cairo_fill(cr);
return TRUE;
}
+#ifdef TODO_GTK
+// This is needed for color pickers?
static char *oneLiner =
"<Key>Return: redraw-display() \n \
<Key>Tab: TabProc() \n ";
-static char scrollTranslations[] =
- "<Btn1Up>(2): WheelProc(0 0 A) \n \
- <Btn4Down>: WheelProc(-1) \n \
- <Btn5Down>: WheelProc(1) \n ";
+#endif
+#ifdef TODO_GTK
static void
SqueezeIntoBox (Option *opt, int nr, int width)
{ // size buttons in bar to fit, clipping button names where necessary
-#ifdef TODO_GTK
int i, wtot = 0;
Dimension widths[20], oldWidths[20];
Arg arg;
XtSetValues(opt[i].handle, &arg, 1);
}
opt->min = wtot;
-#endif
}
+#endif
#ifdef TODO_GTK
int
SameRow (Option *opt)
{
return (opt->min & SAME_ROW && (opt->type == Button || opt->type == SaveButton || opt->type == Label
- || opt->type == ListBox || opt->type == BoxBegin || opt->type == Icon));
+ || opt->type == ListBox || opt->type == BoxBegin || opt->type == Icon || opt->type == Graph));
}
static void
for (i=0;option[i].type != EndMark;i++) {
if(option[i].type == -1) continue;
top++;
-printf("option =%2d, top =%2d\n", i, top);
+//printf("option =%2d, top =%2d\n", i, top);
if (top >= height) {
gtk_table_resize(GTK_TABLE(table), height, r);
if(!pane) { // multi-column: put tables in intermediate hbox
if(SameRow(&option[i+1])) {
GtkAttachOptions x = GTK_FILL;
// 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);
+ hbox = gtk_hbox_new (option[i].type == Button && option[i].textValue || option[i].type == Graph, 0);
if(!currentCps && option[i].value > 80) x |= GTK_EXPAND; // only vertically extended widgets should size vertically
if (strcmp(option[i].name, "") == 0 || option[i].type == Label || option[i].type == Button)
// for Label and Button name is contained inside option
break;
case Graph:
option[i].handle = (void*) (graph = gtk_drawing_area_new());
- gtk_widget_set_size_request(graph, option[i].max, option[i].value);
- Pack(hbox, GTK_TABLE(table), graph, left, left+r, top, GTK_EXPAND);
+// gtk_widget_set_size_request(graph, option[i].max, option[i].value);
+ if(0){ GtkAllocation a;
+ a.x = 0; a.y = 0; a.width = option[i].max, a.height = option[i].value;
+ gtk_widget_set_allocation(graph, &a);
+ }
g_signal_connect (graph, "expose-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
gtk_widget_add_events(GTK_WIDGET(graph), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
g_signal_connect (graph, "button-press-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
g_signal_connect (graph, "button-release-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
g_signal_connect (graph, "motion-notify-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
+ if(option[i].min & FIX_H) { // logo
+ GtkWidget *frame = gtk_aspect_frame_new(NULL, 0.5, 0.5, option[i].max/(float)option[i].value, FALSE);
+ gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);
+ gtk_container_add(GTK_CONTAINER(frame), graph);
+ graph = frame;
+ }
+ Pack(hbox, table, graph, left, left+r, top, GTK_EXPAND);
#ifdef TODO_GTK
if(option[i].min & SAME_ROW) last = forelast, forelast = lastrow;
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 */
gtk_widget_show_all( dialog );
(gpointer)(intptr_t) dlgNr);
shellUp[dlgNr]++;
+ if(dlgNr && wp[dlgNr] && wp[dlgNr]->width > 0) { // if persistent window-info available, reposition
+ 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);
+ 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)
}
projects / xboard.git / blobdiff