mainwin.c: consistent indentation

This commit is contained in:
wdlkmpx 2021-01-14 21:58:11 +08:00
parent 04665b6453
commit 3588163047

View File

@ -38,7 +38,7 @@ void mw_small_balls_add(GtkWidget *child) {
} }
void mw_show_hide_next_balls(gboolean show) { void mw_show_hide_next_balls(gboolean show) {
if(show) { if (show) {
gtk_widget_show_all(_small_balls_box); gtk_widget_show_all(_small_balls_box);
} else { } else {
gtk_widget_hide(_small_balls_box); gtk_widget_hide(_small_balls_box);
@ -60,7 +60,7 @@ void mw_set_user_score(gint score) {
gchar *str; gchar *str;
game_set_score(score); game_set_score(score);
if(score > game_get_hi_score()) { if (score > game_get_hi_score()) {
mw_set_hi_score(score); mw_set_hi_score(score);
} }
str = g_strdup_printf(_("Your score: %i"), score); str = g_strdup_printf(_("Your score: %i"), score);
@ -68,22 +68,23 @@ void mw_set_user_score(gint score) {
g_free(str); g_free(str);
} }
gboolean _countdown_timer(gpointer data) { gboolean _countdown_timer(gpointer data)
{
gchar *text; gchar *text;
GtkLabel *label = data; GtkLabel *label = data;
gint trem; gint trem;
if(child_writer_dead_handler()) { if (child_writer_dead_handler()) {
ut_simple_message_box_with_title(_("Score writer process died unexpectedly. No scores will be writen!\n" \ ut_simple_message_box_with_title(_("Score writer process died unexpectedly. No scores will be writen!\n" \
"Save your game and restart programm.\n"), "Save your game and restart programm.\n"),
_("Who Killed Bambi?")); _("Who Killed Bambi?"));
} }
if(!timer_is_running()) { if (!timer_is_running()) {
gtk_label_set_text(label, _("Time is unlimited")); gtk_label_set_text(label, _("Time is unlimited"));
return TRUE; return TRUE;
} }
if(timer_is_expired()) { if (timer_is_expired()) {
new_turn(rules_get_next(), FALSE); new_turn(rules_get_next(), FALSE);
} }
trem = timer_get_remaining(); trem = timer_get_remaining();
@ -94,40 +95,41 @@ gboolean _countdown_timer(gpointer data) {
return TRUE; return TRUE;
} }
gint _user_action_event(GtkWidget *w, GdkEvent *ev) { gint _user_action_event(GtkWidget *w, GdkEvent *ev)
if(ev->type == GDK_MOTION_NOTIFY) { {
if (ev->type == GDK_MOTION_NOTIFY) {
move_pointer_to(gtkb_theme_get_coord_at_x(ev->motion.x), move_pointer_to(gtkb_theme_get_coord_at_x(ev->motion.x),
gtkb_theme_get_coord_at_y(ev->motion.y)); gtkb_theme_get_coord_at_y(ev->motion.y));
} }
if(ev->type == GDK_KEY_PRESS) { if (ev->type == GDK_KEY_PRESS) {
if(ev->key.keyval == GDK_Left || ev->key.keyval == GDK_KP_Left) { if (ev->key.keyval == GDK_Left || ev->key.keyval == GDK_KP_Left) {
move_pointer(DIR_LEFT); move_pointer(DIR_LEFT);
} else if(ev->key.keyval == GDK_Right || ev->key.keyval == GDK_KP_Right) { } else if (ev->key.keyval == GDK_Right || ev->key.keyval == GDK_KP_Right) {
move_pointer(DIR_RIGHT); move_pointer(DIR_RIGHT);
} else if(ev->key.keyval == GDK_Up || ev->key.keyval == GDK_KP_Up) { } else if (ev->key.keyval == GDK_Up || ev->key.keyval == GDK_KP_Up) {
move_pointer(DIR_UP); move_pointer(DIR_UP);
} else if(ev->key.keyval == GDK_Down || ev->key.keyval == GDK_KP_Down) { } else if (ev->key.keyval == GDK_Down || ev->key.keyval == GDK_KP_Down) {
move_pointer(DIR_DOWN); move_pointer(DIR_DOWN);
} else if(ev->key.keyval == GDK_KP_Home) { } else if (ev->key.keyval == GDK_KP_Home) {
move_pointer(DIR_UP_LEFT); move_pointer(DIR_UP_LEFT);
} else if(ev->key.keyval == GDK_KP_Page_Up) { } else if (ev->key.keyval == GDK_KP_Page_Up) {
move_pointer(DIR_UP_RIGHT); move_pointer(DIR_UP_RIGHT);
} else if(ev->key.keyval == GDK_KP_End) { } else if (ev->key.keyval == GDK_KP_End) {
move_pointer(DIR_DOWN_LEFT); move_pointer(DIR_DOWN_LEFT);
} else if(ev->key.keyval == GDK_KP_Page_Down) { } else if (ev->key.keyval == GDK_KP_Page_Down) {
move_pointer(DIR_DOWN_RIGHT); move_pointer(DIR_DOWN_RIGHT);
} else if(ev->key.keyval == GDK_Return || } else if (ev->key.keyval == GDK_Return ||
ev->key.keyval == GDK_KP_Space || ev->key.keyval == GDK_KP_Space ||
ev->key.keyval == GDK_KP_Enter || ev->key.keyval == GDK_KP_Enter ||
ev->key.keyval == GDK_space) { ev->key.keyval == GDK_space) {
if(is_actions_locked()) { if (is_actions_locked()) {
return FALSE; return FALSE;
} }
pointer_pressed(-1, -1); pointer_pressed(-1, -1);
} }
} else if(ev->type == GDK_BUTTON_PRESS && ev->button.button == 1) { } else if (ev->type == GDK_BUTTON_PRESS && ev->button.button == 1) {
if(is_actions_locked()) { if (is_actions_locked()) {
return FALSE; return FALSE;
} }
pointer_pressed(gtkb_theme_get_coord_at_x(ev->button.x), pointer_pressed(gtkb_theme_get_coord_at_x(ev->button.x),
@ -137,65 +139,68 @@ gint _user_action_event(GtkWidget *w, GdkEvent *ev) {
return FALSE; return FALSE;
} }
static void main_window_destroy_cb (GtkWidget * w, gpointer user_data) static void main_window_destroy_cb (GtkWidget * w, gpointer user_data)
{ {
gtkb_theme_free_handler (NULL, NULL); gtkb_theme_free_handler (NULL, NULL);
gtk_main_quit (); gtk_main_quit ();
} }
void mw_create(gint da_width, gint da_height) {
GtkWidget *mainwin;
GtkWidget *menubar;
GtkWidget *vbox, *hbox, *hbox1, *drawing_area_box;
GtkWidget *timer_label;
GdkPixbuf *icon;
GError *error=NULL;
mainwin = ut_window_new(_("GtkBalls"), "GtkBalls_Main", "GtkBalls", FALSE, FALSE, FALSE, 0); void mw_create(gint da_width, gint da_height)
{
GtkWidget * mainwin;
GtkWidget * menubar;
GtkWidget * vbox, * hbox, * hbox1, * drawing_area_box;
GtkWidget * timer_label;
GdkPixbuf * icon;
GError *error = NULL;
mainwin = ut_window_new (_("GtkBalls"), "GtkBalls_Main", "GtkBalls", FALSE, FALSE, FALSE, 0);
main_window = GTK_WINDOW (mainwin); main_window = GTK_WINDOW (mainwin);
g_signal_connect (G_OBJECT(mainwin), "destroy", G_CALLBACK(main_window_destroy_cb), mainwin); g_signal_connect (G_OBJECT (mainwin), "destroy", G_CALLBACK(main_window_destroy_cb), mainwin);
icon = gdk_pixbuf_new_from_file(DATADIR "/gtkballs/gtkballs_16x16.png", &error); icon = gdk_pixbuf_new_from_file (DATADIR "/gtkballs/gtkballs_16x16.png", &error);
if(icon) { if (icon) {
gtk_window_set_icon(GTK_WINDOW(mainwin), icon); gtk_window_set_icon (GTK_WINDOW(mainwin), icon);
} else { } else {
g_error_free(error); g_error_free (error);
} }
vbox = gtk_vbox_new(FALSE, 5); vbox = gtk_vbox_new (FALSE, 5);
gtk_container_add(GTK_CONTAINER(mainwin), vbox); gtk_container_add (GTK_CONTAINER(mainwin), vbox);
menu_get_main(mainwin, &menubar); menu_get_main (mainwin, &menubar);
menu_set_sensitive_undo(FALSE); menu_set_sensitive_undo (FALSE);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new (FALSE, 0);
_hi_score_label = gtk_label_new(""); _hi_score_label = gtk_label_new ("");
gtk_box_pack_start(GTK_BOX(hbox), _hi_score_label, FALSE, FALSE, 5); gtk_box_pack_start (GTK_BOX(hbox), _hi_score_label, FALSE, FALSE, 5);
_user_score_label = gtk_label_new(""); _user_score_label = gtk_label_new("");
gtk_box_pack_end(GTK_BOX(hbox), _user_score_label, FALSE, FALSE, 5); gtk_box_pack_end (GTK_BOX(hbox), _user_score_label, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox), FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(vbox), GTK_WIDGET(hbox), FALSE, FALSE, 0);
_small_balls_box = gtk_hbox_new(TRUE, 0); _small_balls_box = gtk_hbox_new(TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), _small_balls_box, TRUE, FALSE, 0); gtk_box_pack_start (GTK_BOX(hbox), _small_balls_box, TRUE, FALSE, 0);
hbox1 = gtk_hbox_new(FALSE, 0); hbox1 = gtk_hbox_new (FALSE, 0);
timer_label = gtk_label_new(NULL); timer_label = gtk_label_new (NULL);
gtk_box_pack_start(GTK_BOX(hbox1), timer_label, TRUE, TRUE, 5); gtk_box_pack_start (GTK_BOX(hbox1), timer_label, TRUE, TRUE, 5);
g_timeout_add(250, _countdown_timer, timer_label); g_timeout_add(250, _countdown_timer, timer_label);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox1), FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(vbox), GTK_WIDGET(hbox1), FALSE, FALSE, 0);
drawing_area_box = gtk_hbox_new(FALSE, 0); drawing_area_box = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), drawing_area_box, FALSE, FALSE, 10); gtk_box_pack_start (GTK_BOX(vbox), drawing_area_box, FALSE, FALSE, 10);
_drawing_area = gtk_drawing_area_new(); _drawing_area = gtk_drawing_area_new();
gtk_widget_set_size_request(_drawing_area, da_width, da_height); gtk_widget_set_size_request (_drawing_area, da_width, da_height);
gtk_box_pack_start(GTK_BOX(drawing_area_box), _drawing_area, TRUE, FALSE, 10); gtk_box_pack_start (GTK_BOX(drawing_area_box), _drawing_area, TRUE, FALSE, 10);
gtk_widget_set_events(_drawing_area, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_POINTER_MOTION_MASK); gtk_widget_set_events (_drawing_area, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_POINTER_MOTION_MASK);
g_signal_connect(G_OBJECT(_drawing_area), "expose_event", G_CALLBACK(expose_event), NULL); g_signal_connect (G_OBJECT(_drawing_area), "expose_event", G_CALLBACK(expose_event), NULL);
g_signal_connect(G_OBJECT(_drawing_area), "button_press_event", G_CALLBACK(_user_action_event), NULL); g_signal_connect (G_OBJECT(_drawing_area), "button_press_event", G_CALLBACK(_user_action_event), NULL);
g_signal_connect(G_OBJECT(_drawing_area), "motion_notify_event", G_CALLBACK(_user_action_event), NULL); g_signal_connect (G_OBJECT(_drawing_area), "motion_notify_event", G_CALLBACK(_user_action_event), NULL);
/* FIXME: imho catching keypress on whole window is stupid... */ /* FIXME: imho catching keypress on whole window is stupid... */
g_signal_connect(G_OBJECT(mainwin), "key_press_event", G_CALLBACK(_user_action_event), NULL); g_signal_connect (G_OBJECT(mainwin), "key_press_event", G_CALLBACK(_user_action_event), NULL);
gtk_widget_show_all(mainwin); gtk_widget_show_all (mainwin);
} }