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:
+53
-56
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 gnplayer.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.6 gnplayer.c $NHDT-Date: 1431192773 2015/05/09 17:32:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.9 $ */
|
||||
/* NetHack 3.6 gnplayer.c $Date: 2009/05/06 10:57:42 $ $Revision: 1.6 $ */
|
||||
/* SCCS Id: @(#)gnplayer.c 3.5 2000/07/16 */
|
||||
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
|
||||
@@ -11,95 +11,92 @@
|
||||
#include "hack.h"
|
||||
|
||||
static gint role_number;
|
||||
static GtkWidget* clist;
|
||||
static GtkWidget *clist;
|
||||
|
||||
static void
|
||||
player_sel_key_hit (GtkWidget *widget, GdkEventKey *event, gpointer data)
|
||||
player_sel_key_hit(GtkWidget *widget, GdkEventKey *event, gpointer data)
|
||||
{
|
||||
const char** roles = data;
|
||||
const char **roles = data;
|
||||
int i;
|
||||
for (i = 0; roles[i] != 0; ++i) {
|
||||
if (tolower(roles[i][0]) == tolower(event->keyval)) {
|
||||
role_number = i;
|
||||
gtk_clist_select_row( GTK_CLIST (clist), i, 0);
|
||||
if (gtk_clist_row_is_visible(GTK_CLIST(clist),
|
||||
i) != GTK_VISIBILITY_FULL)
|
||||
gtk_clist_moveto(GTK_CLIST(clist), i, 0, 0.5, 0);
|
||||
}
|
||||
if (tolower(roles[i][0]) == tolower(event->keyval)) {
|
||||
role_number = i;
|
||||
gtk_clist_select_row(GTK_CLIST(clist), i, 0);
|
||||
if (gtk_clist_row_is_visible(GTK_CLIST(clist), i)
|
||||
!= GTK_VISIBILITY_FULL)
|
||||
gtk_clist_moveto(GTK_CLIST(clist), i, 0, 0.5, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
player_sel_row_selected (GtkCList *clist, int row, int col, GdkEvent *event)
|
||||
player_sel_row_selected(GtkCList *clist, int row, int col, GdkEvent *event)
|
||||
{
|
||||
role_number = row;
|
||||
}
|
||||
|
||||
int
|
||||
ghack_player_sel_dialog(const char** choices,
|
||||
const gchar* title,
|
||||
const gchar* prompt)
|
||||
ghack_player_sel_dialog(const char **choices, const gchar *title,
|
||||
const gchar *prompt)
|
||||
{
|
||||
int i;
|
||||
static GtkWidget* dialog;
|
||||
static GtkWidget* swin;
|
||||
static GtkWidget* frame1;
|
||||
static GtkWidget *dialog;
|
||||
static GtkWidget *swin;
|
||||
static GtkWidget *frame1;
|
||||
|
||||
dialog = gnome_dialog_new(title,
|
||||
GNOME_STOCK_BUTTON_OK,
|
||||
_("Random"),
|
||||
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 (player_sel_key_hit), choices );
|
||||
dialog = gnome_dialog_new(title, GNOME_STOCK_BUTTON_OK, _("Random"),
|
||||
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(player_sel_key_hit), choices);
|
||||
|
||||
frame1 = gtk_frame_new(prompt);
|
||||
gtk_object_set_data (GTK_OBJECT (dialog), "frame1", frame1);
|
||||
gtk_widget_show (frame1);
|
||||
gtk_container_border_width (GTK_CONTAINER (frame1), 3);
|
||||
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 (player_sel_row_selected), NULL );
|
||||
gtk_signal_connect(GTK_OBJECT(clist), "select_row",
|
||||
GTK_SIGNAL_FUNC(player_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 roles into the list here... */
|
||||
for (i=0; choices[i]; i++) {
|
||||
gchar accelBuf[BUFSZ];
|
||||
const char *text[3]={accelBuf, choices[i],NULL};
|
||||
sprintf( accelBuf, "%c ", tolower(choices[i][0]));
|
||||
gtk_clist_insert (GTK_CLIST (clist), i, (char**)text);
|
||||
for (i = 0; choices[i]; i++) {
|
||||
gchar accelBuf[BUFSZ];
|
||||
const char *text[3] = { accelBuf, choices[i], NULL };
|
||||
sprintf(accelBuf, "%c ", tolower(choices[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_and_close(GNOME_DIALOG(dialog));
|
||||
|
||||
/* Quit on button 2 or error */
|
||||
if (i < 0 || i > 1) {
|
||||
return(ROLE_NONE);
|
||||
if (i < 0 || i > 1) {
|
||||
return (ROLE_NONE);
|
||||
}
|
||||
/* Random is button 1*/
|
||||
if (i == 1 ) {
|
||||
return(ROLE_RANDOM);
|
||||
if (i == 1) {
|
||||
return (ROLE_RANDOM);
|
||||
}
|
||||
return ( role_number);
|
||||
return (role_number);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user