[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
43		42
		43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		44
44	$Event::DIED = sub {	45	$Event::DIED = sub {
45	# TODO: display dialog box or so	46	# TODO: display dialog box or so
		47	Carp::confess $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];	48	CFClient::error $_[1];
47	};	49	};
48		50
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	51	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50		52
…		…
81	our $LOGVIEW;	83	our $LOGVIEW;
82	our $CONSOLE;	84	our $CONSOLE;
83	our $METASERVER;	85	our $METASERVER;
84	our $LOGIN_BUTTON;	86	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	87	our $QUIT_DIALOG;
86	our $SERVER_SETUP;	88	our $HOST_ENTRY;
87		89
		90	our $SETUP_DIALOG;
		91	our $SETUP_NOTEBOOK;
		92	our $SETUP_SERVER;
		93	our $SETUP_KEYBOARD;
		94	our $SETUP_SPELLS;
		95
		96	our $STATS_WINDOW;
		97	our $MESSAGE_WINDOW;
88	our $FLOORBOX;	98	our $FLOORBOX;
89	our $GAUGES;	99	our $GAUGES;
90	our $STATWIDS;	100	our $STATWIDS;
91		101
92	our $SDL_ACTIVE;	102	our $SDL_ACTIVE;
…		…
101	our $DEBUG_STATUS;	111	our $DEBUG_STATUS;
102		112
103	our $INV_WINDOW;	113	our $INV_WINDOW;
104	our $INV;	114	our $INV;
105	our $INVR;	115	our $INVR;
106	our $INVR_LBL;	116	our $INV_RIGHT_HB;
		117
		118	our $BIND_EDITOR;
		119
		120	our $PICKUP_CFG;
107		121
108	sub status {	122	sub status {
109	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110	}	124	}
111		125
112	sub debug {	126	sub debug {
113	$DEBUG_STATUS->set_text ($_[0]);	127	$DEBUG_STATUS->set_text ($_[0]);
114	my ($w, $h) = $DEBUG_STATUS->size_request;	128	}
115	$DEBUG_STATUS->move ($WIDTH - $w, 0);	129
		130	sub destroy_query_dialog {
		131	(delete $_[0]{query_dialog})->destroy
		132	if $_[0]{query_dialog};
		133	}
		134
		135	# server query dialog
		136	sub server_query {
		137	my ($conn, $flags, $prompt) = @_;
		138
		139	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
		140	x => "center",
		141	y => "center",
		142	title => "Server Query",
		143	child => my $vbox = new CFClient::UI::VBox,
		144	;
		145
		146	my @dialog = my $label = new CFClient::UI::Label
		147	max_w => $::WIDTH * 0.4,
		148	ellipsise => 0,
		149	text => $prompt;
		150
		151	if ($flags & CS_QUERY_YESNO) {
		152	push @dialog, my $hbox = new CFClient::UI::HBox;
		153
		154	$hbox->add (new CFClient::UI::Button
		155	text => "No",
		156	on_activate => sub {
		157	$conn->send ("reply n");
		158	$dialog->destroy;
		159	}
		160	);
		161	$hbox->add (new CFClient::UI::Button
		162	text => "Yes",
		163	on_activate => sub {
		164	$conn->send ("reply y");
		165	destroy_query_dialog $conn;
		166	},
		167	);
		168
		169	$dialog->focus_in;
		170
		171	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		173
		174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
		175	$MESSAGE_WINDOW->show;
		176
		177	unshift @dialog, new CFClient::UI::Label
		178	max_w => $::WIDTH * 0.4,
		179	ellipsise => 0,
		180	markup => "\nOr use your keyboard:\n";
		181
		182	unshift @dialog, my $table = new CFClient::UI::Table;
		183
		184	$table->add (0, 0, new CFClient::UI::Button
		185	text => "Next Race",
		186	on_activate => sub {
		187	$conn->send ("reply n");
		188	destroy_query_dialog $conn;
		189	},
		190	);
		191	$table->add (2, 0, new CFClient::UI::Button
		192	text => "Accept",
		193	on_activate => sub {
		194	$conn->send ("reply d");
		195	destroy_query_dialog $conn;
		196	},
		197	);
		198
		199	unshift @dialog, new CFClient::UI::Label
		200	max_w => $::WIDTH * 0.4,
		201	ellipsise => 0,
		202	markup =>
		203	"<big><b>Character Creation: Race</b></big>\n\n"
		204	. "Look at the <b>Messages</b> window to see a description of this race "
		205	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
		206	. "and the center of the screen to see how this race looks like "
		207	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
		208	. "You can look at another race, or accept this race (you will come back to this race eventually, "
		209	. "so you can take your time making this important choice."
		210	;
		211
		212	} elsif ($prompt =~ /roll new stats/) {
		213	if (my $stat = delete $conn->{stat_change_with}) {
		214	$conn->send ("reply $stat");
		215	destroy_query_dialog $conn;
		216	return;
		217	}
		218
		219	$STATS_WINDOW->show;
		220	$MESSAGE_WINDOW->hide;
		221
		222	unshift @dialog, new CFClient::UI::Label
		223	max_w => $::WIDTH * 0.4,
		224	ellipsise => 0,
		225	markup => "\nOr use your keyboard:\n";
		226
		227	unshift @dialog, my $table = new CFClient::UI::Table;
		228
		229	# left: re-roll
		230	$table->add (0, 0, new CFClient::UI::Button
		231	text => "Roll Again",
		232	on_activate => sub {
		233	$conn->send ("reply y");
		234	destroy_query_dialog $conn;
		235	},
		236	);
		237
		238	# center: swap stats
		239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
		240	value => $_,
		241	options => [
		242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
		243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
		248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		249	],
		250	), 1 .. 2;
		251
		252	$table->add (2, 0, new CFClient::UI::Button
		253	text => "Swap Stats",
		254	on_activate => sub {
		255	$conn->{stat_change_with} = $sw2->{value};
		256	$conn->send ("reply $sw1->{value}");
		257	destroy_query_dialog $conn;
		258	},
		259	);
		260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
		261
		262	# right: accept
		263	$table->add (4, 0, new CFClient::UI::Button
		264	text => "Accept",
		265	on_activate => sub {
		266	$conn->send ("reply n");
		267	$STATS_WINDOW->hide;
		268	destroy_query_dialog $conn;
		269	},
		270	);
		271
		272	unshift @dialog, new CFClient::UI::Label
		273	max_w => $::WIDTH * 0.4,
		274	ellipsise => 0,
		275	markup =>
		276	"<big><b>Character Creation: Stats</b></big>\n\n"
		277	. "Look at the <b>Stats</b> window to see your basic stats "
		278	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
		279	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
		280	. "Race selection will influence those values later on."
		281	;
		282	}
		283
		284	push @dialog, my $entry = new CFClient::UI::Entry
		285	on_changed => sub {
		286	$conn->send ("reply $_[1]");
		287	destroy_query_dialog $conn;
		288	},
		289	;
		290
		291	$entry->focus_in;
		292
		293	} else {
		294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		295
		296	push @dialog, my $entry = new CFClient::UI::Entry
		297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		298	on_activate => sub {
		299	$conn->send ("reply $_[1]");
		300	destroy_query_dialog $conn;
		301	},
		302	;
		303
		304	$entry->focus_in;
		305	}
		306
		307	$vbox->add (@dialog);
		308	$dialog->show;
116	}	309	}
117		310
118	sub start_game {	311	sub start_game {
119	status "logging in...";	312	status "logging in...";
120		313
121	$LOGIN_BUTTON->set_text ("Logout");	314	$LOGIN_BUTTON->set_text ("Logout");
122	$SERVER_SETUP->hide;	315	$SETUP_DIALOG->hide;
123		316
124	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	317	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125		318
126	my ($host, $port) = split /:/, $CFG->{host};	319	my ($host, $port) = split /:/, $CFG->{host};
127		320
…		…
139	map_widget => $MAPWIDGET,	332	map_widget => $MAPWIDGET,
140	logview => $LOGVIEW,	333	logview => $LOGVIEW,
141	statusbox => $STATUSBOX,	334	statusbox => $STATUSBOX,
142	map => $MAP,	335	map => $MAP,
143	mapmap => $MAPMAP,	336	mapmap => $MAPMAP,
		337	query => \&server_query,
144		338
145	sound_play => sub {	339	sound_play => sub {
146	my ($x, $y, $soundnum, $type) = @_;	340	my ($x, $y, $soundnum, $type) = @_;
147		341
148	$SDL_MIXER	342	$SDL_MIXER
…		…
165	}	359	}
166	}	360	}
167		361
168	sub stop_game {	362	sub stop_game {
169	$LOGIN_BUTTON->set_text ("Login");	363	$LOGIN_BUTTON->set_text ("Login");
170	$SERVER_SETUP->show;	364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		365	$SETUP_DIALOG->show;
171	$INV_WINDOW->hide;	366	$INV_WINDOW->hide;
172	$LOGVIEW->hide;
173		367
174	return unless $CONN;	368	return unless $CONN;
175		369
176	status "connection closed";	370	status "connection closed";
177		371
		372	destroy_query_dialog $CONN;
178	$CONN->destroy;	373	$CONN->destroy;
179	$CONN = 0; # false, does not autovivify	374	$CONN = 0; # false, does not autovivify
180	}	375	}
181		376
182	sub client_setup {	377	sub graphics_setup {
183	my $dialog = new CFClient::UI::FancyFrame
184	req_x => 1,
185	req_y => $HEIGHT * (1/8),
186	name => "client_setup",
187	title => "Client Setup",
188	child => (my $vbox = new CFClient::UI::VBox);	378	my $vbox = new CFClient::UI::VBox;
		379
189	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	380	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
190		381
191	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	382	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
192	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	383	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193		384
194	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	385	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
195	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	386	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196		387
197	$mode_slider->connect (changed => sub {	388	$mode_slider->connect (changed => sub {
198	my ($self, $value) = @_;	389	my ($self, $value) = @_;
199		390
…		…
316	on_activate => sub {	507	on_activate => sub {
317	video_shutdown ();	508	video_shutdown ();
318	video_init ();	509	video_init ();
319	}	510	}
320	);	511	);
		512
		513	$vbox
		514	}
		515
		516	sub audio_setup {
		517	my $vbox = new CFClient::UI::VBox;
		518
		519	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		520
		521	my $row = 0;
321		522
322	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
323	$table->add (1, $row++, new CFClient::UI::CheckBox	524	$table->add (1, $row++, new CFClient::UI::CheckBox
324	state => $CFG->{audio_enable},	525	state => $CFG->{audio_enable},
325	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	526	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
…		…
356	audio_shutdown ();	557	audio_shutdown ();
357	audio_init ();	558	audio_init ();
358	}	559	}
359	);	560	);
360		561
361	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	562	$vbox
362	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
363	text => $CFG->{say_command},
364	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
365	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
366	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
367	on_changed => sub {
368	my ($self, $value) = @_;
369	$CFG->{say_command} = $value;
370	}
371	);
372
373	$dialog
374	}	563	}
375		564
376	sub set_stats_window_fontsize {	565	sub set_stats_window_fontsize {
377	for (values %{$STATWIDS}) {	566	for (values %{$STATWIDS}) {
378	$_->set_fontsize ($::CFG->{stat_fontsize});	567	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
387		576
388	sub make_gauge_window {	577	sub make_gauge_window {
389	my $gh = int $HEIGHT * $CFG->{gauge_size};	578	my $gh = int $HEIGHT * $CFG->{gauge_size};
390		579
391	my $win = new CFClient::UI::Frame (	580	my $win = new CFClient::UI::Frame (
392	req_x => 0,	581	force_x => 0,
393	req_y => -1,	582	force_y => "max",
394	def_w => $WIDTH,	583	force_w => $WIDTH,
395	def_h => $gh,	584	force_h => $gh,
396	);	585	);
397		586
398	$win->add (my $hbox = new CFClient::UI::HBox	587	$win->add (my $hbox = new CFClient::UI::HBox
399	children => [	588	children => [
400	(new CFClient::UI::HBox expand => 1),	589	(new CFClient::UI::HBox expand => 1),
…		…
436	&set_gauge_window_fontsize;	625	&set_gauge_window_fontsize;
437		626
438	$win	627	$win
439	}	628	}
440		629
		630
441	sub make_stats_window {	631	sub stats_window {
442	my $tgw = new CFClient::UI::FancyFrame	632	my $tgw = new CFClient::UI::FancyFrame
443	req_y => $HEIGHT * (2/8),	633	y => $HEIGHT * (2/8),
444	req_x => -1,	634	x => "max",
445	title => "Stats",	635	title => "Stats",
446	name => "stats_window";	636	name => "stats_window";
447		637
448	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	638	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
449	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	639	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450	can_hover => 1, can_events => 1,	640	can_hover => 1, can_events => 1,
451	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	641	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
550	update_stats_window ({});	740	update_stats_window ({});
551		741
552	$tgw	742	$tgw
553	}	743	}
554		744
555	sub formsep {	745	sub formsep($) {
556	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	746	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
557	}	747	}
558		748
559	sub update_stats_window {	749	sub update_stats_window {
560	my ($stats) = @_;	750	my ($stats) = @_;
561		751
…		…
623		813
624	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	814	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625	for keys %tbl;	815	for keys %tbl;
626	}	816	}
627		817
628	sub metaserver_dialog {
629	my $dialog = new CFClient::UI::FancyFrame
630	title => "Server List",
631	child => (my $vbox = new CFClient::UI::VBox);
632
633	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635	$dialog
636	}
637
638	my $METASERVER_ATIME;	818	my $METASERVER_ATIME;
639		819
640	sub update_metaserver {	820	sub update_metaserver {
641	my ($HOST) = @_;
642
643	return if $METASERVER_ATIME > time;	821	return if $METASERVER_ATIME > time;
644	$METASERVER_ATIME = time + 60;	822	$METASERVER_ATIME = time + 60;
645		823
646	my $table = $METASERVER->{table};	824	my $table = $METASERVER->{table};
647	$table->clear;	825	$table->clear;
…		…
699		877
700	$y++;	878	$y++;
701		879
702	$table->add (0, $y, new CFClient::UI::VBox children => [	880	$table->add (0, $y, new CFClient::UI::VBox children => [
703	(new CFClient::UI::Button text => "Use", on_activate => sub {	881	(new CFClient::UI::Button text => "Use", on_activate => sub {
704	$HOST->set_text ($CFG->{host} = $host);	882	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		883	$METASERVER->toggle_visibility;
705	}),	884	}),
706	(new CFClient::UI::Empty expand => 1),	885	(new CFClient::UI::Empty expand => 1),
707	]);	886	]);
708		887
709	$table->add ($_ + 1, $y, new CFClient::UI::Label	888	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
712	}	891	}
713	}	892	}
714	});	893	});
715	}	894	}
716		895
717	sub server_setup {	896	sub metaserver_dialog {
718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	897	my $dialog = new CFClient::UI::FancyFrame
719	x => $WIDTH * (1/3),	898	title => "Server List",
720	y => $HEIGHT * (1/8),	899	name => 'metaserver_dialog',
721	name => "server_setup",	900	x => 'center',
722	title => "Server Setup",	901	y => 'center',
		902	z => 3,
723	child => (my $vbox = new CFClient::UI::VBox),	903	child => (my $vbox = new CFClient::UI::VBox),
724	on_visibility_change => sub {	904	on_visibility_change => sub {
725	my ($self, $visible) = @_;	905	update_metaserver if $_[1];
726	$self->center if $visible;
727	},	906	},
728	;	907	;
729		908
		909	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		910
		911	$dialog
		912	}
		913
		914	sub server_setup {
		915	my $vbox = new CFClient::UI::VBox;
		916
730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	917	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
731	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	918	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732		919
733	{	920	{
734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	921	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735		922
736	$vbox->add (	923	$vbox->add (
737	my $HOST = new CFClient::UI::Entry	924	$HOST_ENTRY = new CFClient::UI::Entry
738	expand => 1,	925	expand => 1,
739	text => $CFG->{host},	926	text => $CFG->{host},
740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	927	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741	on_changed => sub {	928	on_changed => sub {
742	my ($self, $value) = @_;	929	my ($self, $value) = @_;
…		…
744	}	931	}
745	);	932	);
746		933
747	$METASERVER = metaserver_dialog;	934	$METASERVER = metaserver_dialog;
748		935
749	$vbox->add (new CFClient::UI::Flopper	936	$vbox->add (new CFClient::UI::Button
750	expand => 1,	937	expand => 1,
751	text => "Server List",	938	text => "Server List",
752	other => $METASERVER,	939	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	940	tooltip => "Show a list of available crossfire servers",
754	on_open => sub {	941	on_activate => sub { $METASERVER->toggle_visibility },
755	update_metaserver $HOST;
756	}
757	);	942	);
758	}	943	}
759		944
760	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	945	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761	$table->add (1, 4, new CFClient::UI::Entry	946	$table->add (1, 4, new CFClient::UI::Entry
…		…
778	}	963	}
779	);	964	);
780		965
781	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	966	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782	$table->add (1, 7, new CFClient::UI::Slider	967	$table->add (1, 7, new CFClient::UI::Slider
783	req_w => 100,	968	force_w => 100,
784	range => [$CFG->{mapsize}, 10, 100, 0, 1],	969	range => [$CFG->{mapsize}, 10, 100, 0, 1],
785	tooltip => "This is the size of the portion of the map update the server sends you. "	970	tooltip => "This is the size of the portion of the map update the server sends you. "
786	. "If you set this to a high value you will be able to see further, "	971	. "If you set this to a high value you will be able to see further, "
787	. "but you also increase bandwidth requirements and latency. "	972	. "but you also increase bandwidth requirements and latency. "
788	. "This option is only used once at log-in.",	973	. "This option is only used once at log-in.",
…		…
828	$CONN ? stop_game	1013	$CONN ? stop_game
829	: start_game;	1014	: start_game;
830	},	1015	},
831	);	1016	);
832		1017
833	$dialog	1018	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
		1019	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
		1020	text => $CFG->{say_command},
		1021	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
		1022	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		1023	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
		1024	on_changed => sub {
		1025	my ($self, $value) = @_;
		1026	$CFG->{say_command} = $value;
		1027	}
		1028	);
		1029
		1030	$vbox
834	}	1031	}
835		1032
836	sub message_window {	1033	sub message_window {
837	my $window = new CFClient::UI::FancyFrame	1034	my $window = new CFClient::UI::FancyFrame
838	name => "message_window",	1035	name => "message_window",
839	title => "Messages",	1036	title => "Messages",
840	border_bg => [1, 1, 1, 1],	1037	border_bg => [1, 1, 1, 1],
841	bg => [0, 0, 0, 0.75],	1038	bg => [0, 0, 0, 0.75],
842	req_x => -1,	1039	x => "max",
843	req_y => 0,	1040	y => 0,
844	def_w => int $::WIDTH / 3,	1041	force_w => $::WIDTH * 0.4,
845	def_h => int $::HEIGHT / 5,	1042	force_h => $::HEIGHT * 0.5,
846	child => (my $vbox = new CFClient::UI::VBox);	1043	child => (my $vbox = new CFClient::UI::VBox);
847		1044
848	$vbox->add ($LOGVIEW);	1045	$vbox->add ($LOGVIEW);
849		1046
850	$vbox->add (my $input = new CFClient::UI::Entry	1047	$vbox->add (my $input = new CFClient::UI::Entry
…		…
882	},	1079	},
883	);	1080	);
884		1081
885	$CONSOLE = {	1082	$CONSOLE = {
886	window => $window,	1083	window => $window,
887	input => $input	1084	input => $input,
888	};	1085	};
889		1086
890	$window	1087	$window
891	}	1088	}
892		1089
893	sub open_quit_dialog {	1090	sub open_quit_dialog {
894	unless ($QUIT_DIALOG) {	1091	unless ($QUIT_DIALOG) {
895	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	1092	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		1093	x => "center",
		1094	y => "center",
		1095	z => 50,
		1096	title => "Really Quit?",
		1097	;
896		1098
897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1099	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898		1100
899	$vb->add (new CFClient::UI::Label	1101	$vb->add (new CFClient::UI::Label
900	text => "You should find a savebed and apply it first!",	1102	text => "You should find a savebed and apply it first!",
…		…
913	on_activate => sub { exit },	1115	on_activate => sub { exit },
914	);	1116	);
915	}	1117	}
916		1118
917	$QUIT_DIALOG->show;	1119	$QUIT_DIALOG->show;
918	$QUIT_DIALOG->center;
919	}	1120	}
920		1121
		1122	sub autopickup_setup {
		1123	my $table = new CFClient::UI::Table;
		1124
		1125	for (
		1126	["General", 0, 0,
		1127	["Enable autopickup" => PICKUP_NEWMODE],
		1128	["Inhibit autopickup" => PICKUP_INHIBIT],
		1129	["Stop before pickup" => PICKUP_STOP],
		1130	["Debug autopickup" => PICKUP_DEBUG],
		1131	],
		1132	["Weapons", 0, 6,
		1133	["All weapons" => PICKUP_ALLWEAPON],
		1134	["Missile weapons" => PICKUP_MISSILEWEAPON],
		1135	["Bows" => PICKUP_BOW],
		1136	["Arrows" => PICKUP_ARROW],
		1137	],
		1138	["Armour", 0, 12,
		1139	["Helmets" => PICKUP_HELMET],
		1140	["Shields" => PICKUP_SHIELD],
		1141	["Body Armour" => PICKUP_ARMOUR],
		1142	["Boots" => PICKUP_BOOTS],
		1143	["Gloves" => PICKUP_GLOVES],
		1144	["Cloaks" => PICKUP_CLOAK],
		1145	],
		1146
		1147	["Readables", 2, 2,
		1148	["Spellbooks" => PICKUP_SPELLBOOK],
		1149	["Skillscrolls" => PICKUP_SKILLSCROLL],
		1150	["Normal Books/Scrolls" => PICKUP_READABLES],
		1151	],
		1152	["Misc", 2, 7,
		1153	["Food" => PICKUP_FOOD],
		1154	["Drinks" => PICKUP_DRINK],
		1155	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
		1156	["Keys" => PICKUP_KEY],
		1157	["Magical Items" => PICKUP_MAGICAL],
		1158	["Potions" => PICKUP_POTION],
		1159	["Magic Devices" => PICKUP_MAGIC_DEVICE],
		1160	["Ignore cursed" => PICKUP_NOT_CURSED],
		1161	["Jewelery" => PICKUP_JEWELS],
		1162	],
		1163	)
		1164	{
		1165	my ($title, $x, $y, @bits) = @$_;
		1166	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
		1167
		1168	for (@bits) {
		1169	++$y;
		1170
		1171	my $mask = $_->[1];
		1172	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		1173	$table->add ($x+1, $y, new CFClient::UI::CheckBox
		1174	state => $CFG->{pickup} & $mask,
		1175	on_changed => sub {
		1176	my ($box, $value) = @_;
		1177	if ($value) {
		1178	$::CFG->{pickup} \|= $mask;
		1179	} else {
		1180	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		1181	}
		1182	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		1183	if defined $::CONN;
		1184	});
		1185	}
		1186	}
		1187
		1188	$table
		1189	}
		1190
921	sub make_inventory_window {	1191	sub inventory_window {
922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1192	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1193	x => "center",
		1194	y => "center",
923	def_w => $WIDTH * 7/8,	1195	force_w => $WIDTH * 9/10,
924	def_h => $HEIGHT * 7/8,	1196	force_h => $HEIGHT * 9/10,
925	title => "Inventory",	1197	title => "Inventory",
926	name => "inventory_window",
927	on_visibility_change => sub {
928	my ($self, $visible) = @_;
929	$self->center if $visible;
930	},
931	;	1198	;
932		1199
933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1200	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934		1201
935	$hb->add (my $vb1 = new CFClient::UI::VBox);	1202	$hb->add (my $vb1 = new CFClient::UI::VBox);
936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1203	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1204	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938		1205
939	$hb->add (my $vb2 = new CFClient::UI::VBox);	1206	$hb->add (my $vb2 = new CFClient::UI::VBox);
940		1207
		1208	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1209
		1210	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1211
		1212	# XXX: Call after $INVR = ... because set_opencont sets the items
		1213	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1214
		1215	$invwin
		1216	}
		1217
		1218	sub spell_setup {
		1219	new CFClient::UI::SpellList
		1220	}
		1221
		1222	sub keyboard_setup {
		1223	my $binding_list = new CFClient::UI::VBox;
		1224
		1225	my $refresh;
		1226	$refresh = sub {
		1227	$binding_list->clear ();
		1228
		1229	for my $mod (keys %{$::CFG->{bindings}}) {
		1230	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1231	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1232	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1233
		1234	my $lbl = join "; ", @$cmds;
		1235	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1236	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1237	$hb->add (new CFClient::UI::Button
		1238	text => "delete",
		1239	tooltip => "Deletes the binding",
		1240	on_activate => sub {
		1241	$binding_list->remove ($hb);
		1242	delete $::CFG->{bindings}->{$mod}->{$sym};
		1243	});
		1244
		1245	$hb->add (new CFClient::UI::Button
		1246	text => "edit",
		1247	tooltip => "Edits the binding",
		1248	on_activate => sub {
		1249	$::BIND_EDITOR->set_binding (
		1250	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1251	sub {
		1252	my ($nmod, $nsym, $ncmds) = @_;
		1253	delete $::CFG->{bindings}->{$mod}->{$sym};
		1254	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1255	$refresh->();
		1256	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1257	$SETUP_DIALOG->show;
		1258	},
		1259	sub {
		1260	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1261	$SETUP_DIALOG->show;
		1262	});
		1263	$::BIND_EDITOR->show;
		1264	$SETUP_DIALOG->hide;
		1265	});
		1266
		1267	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1268	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1269	}
		1270	}
		1271	};
		1272
		1273	my $vb = new CFClient::UI::VBox;
		1274	$vb->add ($binding_list);
941	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1275	$vb->add (my $hb = new CFClient::UI::HBox);
942	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");	1276
943	$hb2->add (new CFClient::UI::Button	1277	$hb->add (new CFClient::UI::Button
944	text => "Close",	1278	text => "record new",
945	tooltip => "Close the currently open container (if one is open)",	1279	expand => 1,
		1280	tooltip => "This button opens the binding editor with an empty binding.",
946	on_activate => sub {	1281	on_activate => sub {
947	$CONN->send ("apply $CONN->{open_container}")	1282	$::BIND_EDITOR->set_binding (undef, undef, [],
948	if $CONN->{open_container} != 0;	1283	sub {
		1284	my ($mod, $sym, $cmds) = @_;
		1285	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1286	$refresh->();
		1287	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1288	$SETUP_DIALOG->show;
		1289	},
		1290	sub {
		1291	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1292	$SETUP_DIALOG->show;
		1293	},
		1294	);
		1295	$SETUP_DIALOG->hide;
		1296	$::BIND_EDITOR->show;
949	},	1297	},
950	);	1298	);
951		1299
952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1300	$hb->add (new CFClient::UI::Button
		1301	text => "close",
		1302	tooltip => "Closes the binding window",
		1303	expand => 1,
		1304	on_activate => sub {
		1305	$SETUP_DIALOG->hide;
		1306	}
		1307	);
953		1308
954	$invwin	1309	$refresh->();
		1310
		1311	$vb
955	}	1312	}
956		1313
957	sub make_help_window {	1314	sub make_help_window {
958	my $win = new CFClient::UI::FancyFrame	1315	my $win = new CFClient::UI::FancyFrame
		1316	x => 'center',
		1317	y => 'center',
		1318	z => 2,
		1319	name => 'doc_browser',
959	def_w => int $WIDTH * 7/8,	1320	force_w => int $WIDTH * 7/8,
960	def_h => int $HEIGHT * 7/8,	1321	force_h => int $HEIGHT * 7/8,
961	title => "Documentation";	1322	title => "Documentation";
962		1323
963	$win->add (my $vbox = new CFClient::UI::VBox);	1324	$win->add (my $vbox = new CFClient::UI::VBox);
964		1325
965	$vbox->add (my $buttons = new CFClient::UI::HBox);	1326	$vbox->add (my $buttons = new CFClient::UI::HBox);
966	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1327	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
974	my ($pod, $label) = @$_;	1335	my ($pod, $label) = @$_;
975		1336
976	$buttons->add (new CFClient::UI::Button	1337	$buttons->add (new CFClient::UI::Button
977	text => $label,	1338	text => $label,
978	on_activate => sub {	1339	on_activate => sub {
979	my $parser = new Pod::POM;	1340	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
980	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1341	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
981		1342
982	$viewer->clear;	1343	$viewer->clear;
983		1344
984	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1345	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
985	for @{ CFClient::pod_to_pango_list $pom };	1346	for @$pom;
986		1347
987	$viewer->set_offset (0);	1348	$viewer->set_offset (0);
988	},	1349	},
989	);	1350	);
990	}	1351	}
…		…
1027	if ($DEBUG_STATUS) {	1388	if ($DEBUG_STATUS) {
1028	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1389	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029	} else {	1390	} else {
1030	# create the widgets	1391	# create the widgets
1031		1392
1032	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1393	$DEBUG_STATUS = new CFClient::UI::Label
		1394	padding => 0,
		1395	z => 100,
		1396	force_x => "max",
		1397	force_y => 0;
1033	$DEBUG_STATUS->show;	1398	$DEBUG_STATUS->show;
1034		1399
		1400	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1401
1035	$STATUSBOX = new CFClient::UI::Statusbox;	1402	$STATUSBOX = new CFClient::UI::Statusbox;
1036	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1403	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1037		1404
1038	(new CFClient::UI::Frame	1405	(new CFClient::UI::Frame
1039	bg => [0, 0, 0, 0.4],	1406	bg => [0, 0, 0, 0.4],
1040	req_y => -1,	1407	force_x => 0,
		1408	force_y => "max",
1041	child => $STATUSBOX,	1409	child => $STATUSBOX,
1042	)->show;	1410	)->show;
1043		1411
1044	CFClient::UI::FancyFrame->new (	1412	CFClient::UI::FancyFrame->new (
		1413	title => "Map",
		1414	name => "mapmap",
		1415	x => 0,
		1416	y => $FONTSIZE + 8,
1045	border_bg => [1, 1, 1, 192/255],	1417	border_bg => [1, 1, 1, 192/255],
1046	bg => [1, 1, 1, 0],	1418	bg => [1, 1, 1, 0],
1047	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1419	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1420	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049	),	1421	),
…		…
1067		1439
1068	$LOGVIEW = new CFClient::UI::TextView	1440	$LOGVIEW = new CFClient::UI::TextView
1069	expand => 1,	1441	expand => 1,
1070	font => $FONT_FIXED,	1442	font => $FONT_FIXED,
1071	fontsize => $::CFG->{log_fontsize},	1443	fontsize => $::CFG->{log_fontsize},
		1444	indent => -4,
1072	can_hover => 1,	1445	can_hover => 1,
1073	can_events => 1,	1446	can_events => 1,
1074	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1447	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075	;	1448	;
1076		1449
1077	$BUTTONBAR = new CFClient::UI::HBox;	1450	$SETUP_DIALOG = new CFClient::UI::FancyFrame
		1451	title => "Setup",
		1452	name => "setup_dialog",
		1453	x => 'center',
		1454	y => 'center',
		1455	z => 2,
		1456	force_w => $::WIDTH * 0.6,
		1457	force_h => $::HEIGHT * 0.6,
		1458	;
1078		1459
		1460	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1461	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1462
		1463	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
		1464	"Configure the server to play on, your username, password and other server-related options.");
		1465	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
		1466	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1467	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
		1468	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
		1469	$SETUP_NOTEBOOK->add (Audio => audio_setup,
		1470	"Configure the use of audio, sound effects and background music.");
		1471	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
		1472	"Lets you define, edit and delete bindings."
		1473	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
		1474	. "with nothing set and the recording started. After doing the actions you "
		1475	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
		1476	. "After pressing the combo the binding will be saved automatically and the "
		1477	. "binding editor closes");
		1478	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
		1479	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1480
		1481	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
		1482
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1483	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1080	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1484	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1081	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1485
1082	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1083	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1486	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1084	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1487	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1085		1488
1086	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1489	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1087		1490
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1491	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1089	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1492	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1493	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1091	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1494	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
		1495	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1092		1496
1093	$BUTTONBAR->add (new CFClient::UI::Button	1497	$BUTTONBAR->add (new CFClient::UI::Button
1094	text => "Save Config",	1498	text => "Save Config",
1095	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1499	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096	on_activate => sub {	1500	on_activate => sub {
1097	$::CFG->{layout} = CFClient::UI::get_layout;	1501	$::CFG->{layout} = CFClient::UI::get_layout;
1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1502	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099	status "Configuration Saved";	1503	status "Configuration Saved";
1100	},	1504	},
1101	);	1505	);
1102		1506
1103	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1507	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
…		…
1114	}	1518	}
1115	},	1519	},
1116	);	1520	);
1117		1521
1118	$BUTTONBAR->show;	1522	$BUTTONBAR->show;
1119		1523	$SETUP_DIALOG->show;
1120	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122	$SERVER_SETUP->show;
1123	}	1524	}
		1525
		1526	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124	}	1527	}
1125		1528
1126	sub video_shutdown {	1529	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1530	undef $SDL_ACTIVE;
1128	}	1531	}
…		…
1195		1598
1196	my %demo;#d#	1599	my %demo;#d#
1197		1600
1198	sub force_refresh {	1601	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1602	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1603	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1604
1202	$CFClient::UI::ROOT->draw;	1605	$CFClient::UI::ROOT->draw;
1203		1606
1204	$WANT_REFRESH = 0;	1607	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1608	$CAN_REFRESH = 0;
…		…
1260	};	1663	};
1261		1664
1262	CFClient::SDL_GL_SwapBuffers;	1665	CFClient::SDL_GL_SwapBuffers;
1263	}	1666	}
1264		1667
1265	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1668	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266	$NOW = time;	1669	$NOW = time;
1267		1670
1268	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1671	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1269	for CFClient::SDL_PollEvent;	1672	for CFClient::SDL_PollEvent;
1270		1673
…		…
1337	#############################################################################	1740	#############################################################################
1338		1741
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1742	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1743
1341	{	1744	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1745	local $SIG{__DIE__} = sub {
		1746	return unless defined $^S && !$^S;
		1747	Carp::confess $_[1];#d#TODO: remove when stable
		1748	CFClient::fatal $_[0];
		1749	};
1343		1750
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1751	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1752	CFClient::UI::set_layout ($::CFG->{layout});
1346		1753
1347	my %DEF_CFG = (	1754	my %DEF_CFG = (
1348	sdl_mode => 0,	1755	sdl_mode => 0,
1349	width => 640,	1756	width => 640,
…		…
1353	map_scale => 1,	1760	map_scale => 1,
1354	fow_enable => 1,	1761	fow_enable => 1,
1355	fow_intensity => 0.45,	1762	fow_intensity => 0.45,
1356	fow_smooth => 0,	1763	fow_smooth => 0,
1357	gui_fontsize => 1,	1764	gui_fontsize => 1,
1358	log_fontsize => 1,	1765	log_fontsize => 0.7,
1359	gauge_fontsize=> 1,	1766	gauge_fontsize=> 1,
1360	gauge_size => 0.35,	1767	gauge_size => 0.35,
1361	stat_fontsize => 1,	1768	stat_fontsize => 0.7,
1362	mapsize => 100,	1769	mapsize => 100,
1363	host => "crossfire.schmorp.de",	1770	host => "crossfire.schmorp.de",
1364	say_command => 'say',	1771	say_command => 'say',
1365	audio_enable => 1,	1772	audio_enable => 1,
1366	bgm_enable => 1,	1773	bgm_enable => 1,
…		…
1427		1834
1428	END { CFClient::SDL_Quit }	1835	END { CFClient::SDL_Quit }
1429		1836
1430	=head1 NAME	1837	=head1 NAME
1431		1838
1432	pclient - A Crossfire+ and Crossfire game client	1839	cfplus - A Crossfire+ and Crossfire game client
1433		1840
1434	=head1 SYNOPSIS	1841	=head1 SYNOPSIS
1435		1842
1436	Just run it - no commandline arguments are supported.	1843	Just run it - no commandline arguments are supported.
1437		1844
1438	=head1 USAGE	1845	=head1 USAGE
1439		1846
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1847	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1848	fullscreen and interactively.
1442		1849
		1850	=head1 DEBUGGING
		1851
		1852
		1853	CFPLUS_DEBUG - environment variable
		1854
		1855	1 draw borders around widgets
		1856	2 add low-level widget info to tooltips
		1857	4 show fps
		1858	8 suppress tooltips
		1859
1443	=head1 AUTHOR	1860	=head1 AUTHOR
1444		1861
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1862	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1863
1447		1864

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs. Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC