Reformat all C files.
I'll push a formatting guide at some point. There may still be outstanding changes, but please feel free to resolve those as you arrive a them. To the best of my knowledge, there is no changes to the actual code content, but the formatter does have the occasional bug. If you run into an issue, please fix it!
This commit is contained in:
Sean Hunt
+66
-69
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 gnopts.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.6 gnopts.c $NHDT-Date: 1431192772 2015/05/09 17:32:52 $ $NHDT-Branch: master $:$NHDT-Revision: 1.8 $ */
|
||||
/* NetHack 3.6 gnopts.c $Date: 2009/05/06 10:57:40 $ $Revision: 1.5 $ */
|
||||
/* SCCS Id: @(#)gnopts.c 3.5 2000/07/16 */
|
||||
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
|
||||
@@ -13,19 +13,19 @@
|
||||
#include "hack.h"
|
||||
|
||||
static gint tileset;
|
||||
static GtkWidget* clist;
|
||||
const char* tilesets[] = { "Traditional (16x16)", "Big (32x32)", 0 };
|
||||
static GtkWidget *clist;
|
||||
const char *tilesets[] = { "Traditional (16x16)", "Big (32x32)", 0 };
|
||||
|
||||
static void
|
||||
opt_sel_key_hit(GtkWidget *widget, GdkEventKey *event, gpointer data)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; tilesets[i] != 0; ++i) {
|
||||
if (tilesets[i][0] == toupper(event->keyval)) {
|
||||
tileset = i;
|
||||
gtk_clist_select_row( GTK_CLIST (clist), i, 0);
|
||||
}
|
||||
}
|
||||
int i;
|
||||
for (i = 0; tilesets[i] != 0; ++i) {
|
||||
if (tilesets[i][0] == toupper(event->keyval)) {
|
||||
tileset = i;
|
||||
gtk_clist_select_row(GTK_CLIST(clist), i, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -38,82 +38,79 @@ void
|
||||
ghack_settings_dialog()
|
||||
{
|
||||
int i;
|
||||
static GtkWidget* dialog;
|
||||
static GtkWidget* swin;
|
||||
static GtkWidget* frame1;
|
||||
static GtkWidget *dialog;
|
||||
static GtkWidget *swin;
|
||||
static GtkWidget *frame1;
|
||||
|
||||
dialog = gnome_dialog_new (_("GnomeHack Settings"),
|
||||
GNOME_STOCK_BUTTON_OK,
|
||||
GNOME_STOCK_BUTTON_CANCEL,
|
||||
NULL);
|
||||
gnome_dialog_close_hides (GNOME_DIALOG (dialog), FALSE);
|
||||
gtk_signal_connect (GTK_OBJECT (dialog), "key_press_event",
|
||||
GTK_SIGNAL_FUNC (opt_sel_key_hit), tilesets );
|
||||
dialog = gnome_dialog_new(_("GnomeHack Settings"), GNOME_STOCK_BUTTON_OK,
|
||||
GNOME_STOCK_BUTTON_CANCEL, NULL);
|
||||
gnome_dialog_close_hides(GNOME_DIALOG(dialog), FALSE);
|
||||
gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
|
||||
GTK_SIGNAL_FUNC(opt_sel_key_hit), tilesets);
|
||||
|
||||
frame1 = gtk_frame_new (_("Choose one of the following tilesets:"));
|
||||
gtk_object_set_data (GTK_OBJECT (dialog), "frame1", frame1);
|
||||
gtk_widget_show (frame1);
|
||||
gtk_container_border_width (GTK_CONTAINER (frame1), 3);
|
||||
frame1 = gtk_frame_new(_("Choose one of the following tilesets:"));
|
||||
gtk_object_set_data(GTK_OBJECT(dialog), "frame1", frame1);
|
||||
gtk_widget_show(frame1);
|
||||
gtk_container_border_width(GTK_CONTAINER(frame1), 3);
|
||||
|
||||
swin = gtk_scrolled_window_new (NULL, NULL);
|
||||
clist = gtk_clist_new (2);
|
||||
gtk_clist_column_titles_hide (GTK_CLIST (clist));
|
||||
gtk_widget_set_usize (GTK_WIDGET (clist), 100, 180);
|
||||
gtk_container_add (GTK_CONTAINER (swin), clist);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
|
||||
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
||||
swin = gtk_scrolled_window_new(NULL, NULL);
|
||||
clist = gtk_clist_new(2);
|
||||
gtk_clist_column_titles_hide(GTK_CLIST(clist));
|
||||
gtk_widget_set_usize(GTK_WIDGET(clist), 100, 180);
|
||||
gtk_container_add(GTK_CONTAINER(swin), clist);
|
||||
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
|
||||
GTK_POLICY_AUTOMATIC,
|
||||
GTK_POLICY_AUTOMATIC);
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (clist), "select_row",
|
||||
GTK_SIGNAL_FUNC (opt_sel_row_selected), NULL );
|
||||
gtk_signal_connect(GTK_OBJECT(clist), "select_row",
|
||||
GTK_SIGNAL_FUNC(opt_sel_row_selected), NULL);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (frame1), swin);
|
||||
gtk_box_pack_start_defaults (GTK_BOX (GNOME_DIALOG (dialog)->vbox), frame1);
|
||||
gtk_container_add(GTK_CONTAINER(frame1), swin);
|
||||
gtk_box_pack_start_defaults(GTK_BOX(GNOME_DIALOG(dialog)->vbox), frame1);
|
||||
|
||||
/* Add the tilesets into the list here... */
|
||||
for (i=0; tilesets[i]; i++) {
|
||||
gchar accelBuf[BUFSZ];
|
||||
const char *text[3]={accelBuf, tilesets[i],NULL};
|
||||
sprintf( accelBuf, "%c ", tolower(tilesets[i][0]));
|
||||
gtk_clist_insert (GTK_CLIST (clist), i, (char**)text);
|
||||
for (i = 0; tilesets[i]; i++) {
|
||||
gchar accelBuf[BUFSZ];
|
||||
const char *text[3] = { accelBuf, tilesets[i], NULL };
|
||||
sprintf(accelBuf, "%c ", tolower(tilesets[i][0]));
|
||||
gtk_clist_insert(GTK_CLIST(clist), i, (char **) text);
|
||||
}
|
||||
|
||||
|
||||
gtk_clist_columns_autosize (GTK_CLIST (clist));
|
||||
gtk_widget_show_all (swin);
|
||||
gtk_clist_columns_autosize(GTK_CLIST(clist));
|
||||
gtk_widget_show_all(swin);
|
||||
|
||||
/* Center the dialog over over parent */
|
||||
gnome_dialog_set_default( GNOME_DIALOG(dialog), 0);
|
||||
gtk_window_set_modal( GTK_WINDOW(dialog), TRUE);
|
||||
gnome_dialog_set_parent (GNOME_DIALOG (dialog),
|
||||
GTK_WINDOW (ghack_get_main_window ()) );
|
||||
gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
|
||||
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
|
||||
gnome_dialog_set_parent(GNOME_DIALOG(dialog),
|
||||
GTK_WINDOW(ghack_get_main_window()));
|
||||
|
||||
/* Run the dialog -- returning whichever button was pressed */
|
||||
i = gnome_dialog_run (GNOME_DIALOG (dialog));
|
||||
gnome_dialog_close (GNOME_DIALOG (dialog));
|
||||
i = gnome_dialog_run(GNOME_DIALOG(dialog));
|
||||
gnome_dialog_close(GNOME_DIALOG(dialog));
|
||||
|
||||
/* They hit Quit or error */
|
||||
if (i != 0 ) {
|
||||
return;
|
||||
if (i != 0) {
|
||||
return;
|
||||
}
|
||||
switch (tileset) {
|
||||
case 0:
|
||||
/* They selected traditional */
|
||||
ghack_free_glyphs();
|
||||
if (ghack_init_glyphs(HACKDIR "/x11tiles"))
|
||||
g_error ("ERROR: Could not initialize glyphs.\n");
|
||||
ghack_reinit_map_window();
|
||||
break;
|
||||
case 1:
|
||||
ghack_free_glyphs();
|
||||
if (ghack_init_glyphs(HACKDIR "/t32-1024.xpm"))
|
||||
g_error ("ERROR: Could not initialize glyphs.\n");
|
||||
ghack_reinit_map_window();
|
||||
case 0:
|
||||
/* They selected traditional */
|
||||
ghack_free_glyphs();
|
||||
if (ghack_init_glyphs(HACKDIR "/x11tiles"))
|
||||
g_error("ERROR: Could not initialize glyphs.\n");
|
||||
ghack_reinit_map_window();
|
||||
break;
|
||||
case 1:
|
||||
ghack_free_glyphs();
|
||||
if (ghack_init_glyphs(HACKDIR "/t32-1024.xpm"))
|
||||
g_error("ERROR: Could not initialize glyphs.\n");
|
||||
ghack_reinit_map_window();
|
||||
|
||||
/* They selected big */
|
||||
break;
|
||||
default:
|
||||
/* This shouldn't happen */
|
||||
g_warning("This shouldn't happen\n");
|
||||
/* They selected big */
|
||||
break;
|
||||
default:
|
||||
/* This shouldn't happen */
|
||||
g_warning("This shouldn't happen\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user