From: Jordi Albornoz Date: Fri, 28 Jun 2002 21:33:26 +0000 (+0000) Subject: patch from Bastien Nocera which fixes focusing of the text entry when switching to... X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=ace24a1c87f0ab38d6f9eda0308dbc3e1c6dbb49;p=gtetrinet patch from Bastien Nocera which fixes focusing of the text entry when switching to the partyline page. --- diff --git a/ChangeLog b/ChangeLog index 5d7905a..a57d2b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-06-28 Jordi Mallach + + * src/gtetrinet.c, partyline.c, partyline.h, tetrinet.c: + patch from Bastien Nocera which fixes focusing of the text entry + when switching to the partyline page. + 2002-06-28 Jordi Mallach * autogen.sh: added. diff --git a/src/gtetrinet.c b/src/gtetrinet.c index 740587d..e6a7580 100644 --- a/src/gtetrinet.c +++ b/src/gtetrinet.c @@ -146,6 +146,11 @@ int main (int argc, char *argv[]) gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK(notebook), pwinlist, label); + /* add signal to focus the text entry when switching to the partyline page*/ + gtk_signal_connect (GTK_OBJECT (notebook), "switch_page", + GTK_SIGNAL_FUNC (partyline_switch_entryfocus), + NULL); + gtk_widget_show (notebook); gtk_widget_show (app); diff --git a/src/partyline.c b/src/partyline.c index 571329d..0c924df 100644 --- a/src/partyline.c +++ b/src/partyline.c @@ -197,6 +197,11 @@ void partyline_entryfocus (void) if (connected) gtk_widget_grab_focus (entrybox); } +void partyline_switch_entryfocus (void) +{ + if (connected) gtk_widget_grab_focus (entrybox); +} + void textentry (GtkWidget *widget, gpointer data) { char *text; diff --git a/src/partyline.h b/src/partyline.h index 2801381..7a39ab1 100644 --- a/src/partyline.h +++ b/src/partyline.h @@ -6,3 +6,4 @@ extern void partyline_status (char *status); extern void partyline_text (char *text); extern void partyline_playerlist (int *numbers, char **names, char **teams, int n, char **specs, int sn); extern void partyline_entryfocus (void); +void partyline_switch_entryfocus (void); diff --git a/src/tetrinet.c b/src/tetrinet.c index 1d78e55..cd57012 100644 --- a/src/tetrinet.c +++ b/src/tetrinet.c @@ -118,7 +118,7 @@ struct sb sbinfo[] = { }; static void tetrinet_updatelevels (void); -static void tetrinet_setspeciallabel (signed char sb); +static void tetrinet_setspeciallabel (int sb); static void tetrinet_dospecial (int from, int to, int type); static void tetrinet_specialkey (int pnum); static void tetrinet_shiftline (int l, int d, FIELD field); @@ -730,7 +730,7 @@ void tetrinet_redrawfields (void) fields_drawfield (playerfield(i), fields[i]); } -static void tetrinet_setspeciallabel (signed char sb) +static void tetrinet_setspeciallabel (int sb) { int sbnum; if (sb == -1) {