From 83e68d362c47f927ead4f1bee272f27e0710ed9d Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Mon, 29 Oct 2012 14:18:33 +0100
Subject: [PATCH] Fix clock clicking with GtkEventBox
Like in WinBoard the button-3 case is now handled in the primary
event handler (and communicated to it in a kludgy way). It would be
better if this was absorbed in ClockClick().
---
dialogs.c | 6 ++++++
gtk/xoptions.c | 12 +++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dialogs.c b/dialogs.c
index 800e109..475f6e6 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -2052,6 +2052,12 @@ static void
CCB (int n)
{
shiftKey = (ShiftKeys() & 3) != 0;
+ if(n < 0) { // button != 1
+ n = -n;
+ if(shiftKey && (gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack)) {
+ AdjustClock(n == W_BLACK, 1);
+ }
+ } else
ClockClick(n == W_BLACK);
}
diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 01775e8..5f4711f 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -566,8 +566,6 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
gboolean res;
gint index, x, y;
- if(memo->type == Label) { ((ButtonCallback*) memo->target)(memo->value); return TRUE; } // only clock widgets use this
-
switch(event->type) { // figure out what's up
case GDK_MOTION_NOTIFY:
f = 0;
@@ -583,6 +581,10 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
button = bevent->button;
shiftState = bevent->state & GDK_SHIFT_MASK;
controlState = bevent->state & GDK_CONTROL_MASK;
+ if(memo->type == Label) { // only clock widgets use this
+ ((ButtonCallback*) memo->target)(button == 1 ? memo->value : -memo->value);
+ return TRUE;
+ }
// GTK_TODO: is this really the most efficient way to get the character at the mouse cursor???
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);
@@ -1298,11 +1300,15 @@ printf("n=%d, h=%d, w=%d\n",n,height,width);
label = frame;
}
gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1);
- Pack(hbox, table, label, left, left+2, top, 0);
if(option[i].target) { // allow user to specify event handler for button presses
+ button = gtk_event_box_new();
+ gtk_container_add(GTK_CONTAINER(button), label);
+ label = button;
gtk_widget_add_events(GTK_WIDGET(label), GDK_BUTTON_PRESS_MASK);
g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
+ gtk_widget_set_sensitive(label, TRUE);
}
+ Pack(hbox, table, label, left, left+2, top, 0);
break;
case SaveButton:
case Button:
--
1.7.0.4