ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4	our $PANGO = "1.5.0";
		5
		6	# do splash-screen thingy on win32
		7	BEGIN {
		8	if (%PAR::LibCache && $^O eq "MSWin32") {
		9	while (my ($filename, $zip) = each %PAR::LibCache) {
		10	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		11	}
		12
		13	require Win32::GUI::SplashScreen;
		14
		15	Win32::GUI::SplashScreen::Show (
		16	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		17	);
		18
		19	$startup_done = sub {
		20	Win32::GUI::SplashScreen::Done (1);
		21	};
		22	}
		23	}
2		24
3	use strict;	25	use strict;
4	use utf8;	26	use utf8;
		27
		28	use Carp 'verbose';
5		29
6	# do things only needed for single-binary version (par)	30	# do things only needed for single-binary version (par)
7	BEGIN {	31	BEGIN {
8	if (%PAR::LibCache) {	32	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	33	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		34
		35	my $tmp = $ENV{PAR_TEMP};
		36
11	while (my ($filename, $zip) = each %PAR::LibCache) {	37	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	38	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	39	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	40	$zip->extractMember ($_, "$tmp/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	41	unless -e "$tmp/$1";
16	}	42	}
17	}	43	}
18		44
19	# TODO: pango-rc file, anybody?	45	if ($^O eq "MSWin32") {
		46	# relocatable
		47	} else {
		48	# unix, need to patch pango rc file
		49	open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
		50	or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
		51	local $/;
		52	my $rc = <$fh>;
		53	$rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20		54
21	unshift @INC, $ENV{PAR_TEMP};	55	mkdir "$tmp/pango-modules";
		56	open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
		57	or die "$tmp/pango-modules/pango.modules: $!";
		58	print $fh $rc;
		59
		60	$ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
		61	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
		62	or die "$ENV{PANGO_RC_FILE}: $!";
		63	print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
		64	}
		65
		66	unshift @INC, $tmp;
22	}	67	}
23	}	68	}
24		69
25	# need to do it again because that pile of garbage called PAR nukes it before main	70	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	71	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	72	if %PAR::LibCache;
28		73
29	use Time::HiRes 'time';	74	use Time::HiRes 'time';
30	use Event;	75	use Event;
		76	use List::Util qw(max min);
31		77
32	use Crossfire;	78	use Crossfire;
33	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
34		80
35	use Compress::LZF;	81	use Compress::LZF;
36		82
37	use CFClient;	83	use CFPlus;
38	use CFClient::OpenGL ();	84	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	85	use CFPlus::Protocol;
		86	use CFPlus::DB;
40	use CFClient::UI;	87	use CFPlus::UI;
41	use CFClient::BindingEditor;	88	use CFPlus::UI::Canvas;
		89	use CFPlus::UI::Inventory;
		90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
		92	use CFPlus::Pod;
42	use CFClient::MapWidget;	93	use CFPlus::MapWidget;
		94	use CFPlus::Macro;
43		95
44	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45	$SIG{PIPE} = 'IGNORE';	97	$SIG{PIPE} = 'IGNORE';
46		98
		99	$Event::Eval = 1;
47	$Event::DIED = sub {	100	$Event::DIED = sub {
48	# TODO: display dialog box or so	101	CFPlus::fatal Carp::longmess $_[1]
49	Carp::confess $_[1];#d#TODO: remove when stable
50	CFClient::error $_[1];
51	};	102	};
52
53	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
54
55	our $VERSION = '0.1';
56		103
57	my $MAX_FPS = 60;	104	my $MAX_FPS = 60;
58	my $MIN_FPS = 5; # unused as of yet	105	my $MIN_FPS = 5; # unused as of yet
59		106
60	our $META_SERVER = "crossfire.real-time.com:13326";	107	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
61		108
62	our $LAST_REFRESH;	109	our $LAST_REFRESH;
63	our $NOW;	110	our $NOW;
64		111
65	our $CFG;	112	our $CFG;
66	our $CONN;	113	our $CONN;
		114	our $PROFILE; # current profile
67	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	115	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
68		116
69	our $WANT_REFRESH;	117	our $WANT_REFRESH;
70	our $CAN_REFRESH;
71		118
72	our @SDL_MODES;	119	our @SDL_MODES;
73	our $WIDTH;	120	our $WIDTH;
74	our $HEIGHT;	121	our $HEIGHT;
75	our $FULLSCREEN;	122	our $FULLSCREEN;
…		…
79	our $FONT_FIXED;	126	our $FONT_FIXED;
80		127
81	our $MAP;	128	our $MAP;
82	our $MAPMAP;	129	our $MAPMAP;
83	our $MAPWIDGET;	130	our $MAPWIDGET;
		131	our $COMPLETER;
84	our $BUTTONBAR;	132	our $BUTTONBAR;
85	our $LOGVIEW;
86	our $CONSOLE;
87	our $METASERVER;	133	our $METASERVER;
88	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
89	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
90	our $HOST_ENTRY;	136	our $HOST_ENTRY;
		137	our $FULLSCREEN_ENABLE;
91	our $PICKUP_ENABLE;	138	our $PICKUP_ENABLE;
92	our $SERVER_INFO;	139	our $SERVER_INFO;
93		140
94	our $SETUP_DIALOG;	141	our $SETUP_DIALOG;
95	our $SETUP_NOTEBOOK;	142	our $SETUP_NOTEBOOK;
…		…
97	our $SETUP_KEYBOARD;	144	our $SETUP_KEYBOARD;
98		145
99	our $PL_NOTEBOOK;	146	our $PL_NOTEBOOK;
100	our $PL_WINDOW;	147	our $PL_WINDOW;
101		148
		149	our $MUSIC_PLAYING_WIDGET;
		150	our $LICENSE_WIDGET;
		151
		152	our $PICKUP_PAGE;
102	our $INVENTORY_PAGE;	153	our $INVENTORY_PAGE;
103	our $STATS_PAGE;	154	our $STATS_PAGE;
		155	our $SKILL_PAGE;
104	our $SPELL_PAGE;	156	our $SPELL_PAGE;
		157	our $SPELL_LIST;
105		158
106	our $HELP_WINDOW;	159	our $HELP_WINDOW;
107	our $MESSAGE_WINDOW;	160	our $MESSAGE_WINDOW;
108	our $FLOORBOX;	161	our $FLOORBOX;
109	our $GAUGES;	162	our $GAUGES;
110	our $STATWIDS;	163	our $STATWIDS;
111		164
112	our $SDL_ACTIVE;	165	our $SDL_ACTIVE;
113	our %SDL_CB;	166	our %SDL_CB;
114		167
115	our $SDL_MIXER;
116	our @SOUNDS; # event => file mapping
117	our %AUDIO_CHUNKS; # audio files
118
119	our $ALT_ENTER_MESSAGE;	168	our $ALT_ENTER_MESSAGE;
120	our $STATUSBOX;	169	our $STATUSBOX;
121	our $DEBUG_STATUS;	170	our $DEBUG_STATUS;
122		171
123	our $INV;	172	our $INV;
124	our $INVR;	173	our $INVR;
125	our $INV_RIGHT_HB;	174	our $INVR_HB;
126		175
127	our $BIND_EDITOR;	176	#############################################################################
128	our $BIND_UPD_CB;
129
130	our $PICKUP_CFG;
131		177
132	sub status {	178	sub status {
133	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	179	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
134	}	180	}
135		181
136	sub debug {	182	sub debug {
137	$DEBUG_STATUS->set_text ($_[0]);	183	$DEBUG_STATUS->set_text ($_[0]);
138	}	184	}
		185
		186	sub message {
		187	my ($para) = @_;
		188	$MESSAGE_WINDOW->message ($para);
		189	}
		190
		191	#############################################################################
		192	#TODO: maybe move into own audio module...
		193
		194	our $SDL_MIXER;
		195
		196	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		197	our $MUSIC_WANT; # arryref of ambient music we want to play
		198	our @MUSIC_HAVE; # ambient music we have on disk
		199	our $MUSIC_START;
		200	our @MUSIC_JINGLE; # which jingles to play next
		201	our $MUSIC_PLAYING_DATA;
		202	our $MUSIC_PLAYING_META;
		203	our $MUSIC_PLAYER;
		204	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
		205
		206	our %AUDIO_CHUNK; # audio "files"
		207	our %AUDIO_PLAY; # which audio faces should be played
		208
		209	sub audio_channel_finished {
		210	my ($channel) = @_;
		211
		212	# warn "channel $channel finished\n";#d#
		213	}
		214
		215	sub audio_sound_push($) {
		216	my ($face) = @_;
		217
		218	$CFG->{effects_enable}
		219	or return;
		220
		221	$AUDIO_PLAY{$face}
		222	or return;
		223
		224	if (my $chunk = $AUDIO_CHUNK{$face}) {
		225	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
		226	my (undef, $dx, $dy, $vol) = @$_;
		227
		228	my $channel = CFPlus::Channel::find;
		229	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		230	$channel->set_position_r ($dx, $dy, 20);
		231	$chunk->play ($channel);
		232	}
		233	} else {
		234	# sound_meta not set means data is in flight either way
		235	my $meta = $CONN->{face}[$face]
		236	or return;
		237
		238	$meta->{data}
		239	or return;
		240
		241	# if its a jingle, play it as ambient music
		242	if ($meta->{data}{jingle}) {
		243	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
		244	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		245	&audio_music_push ($face);
		246	}
		247	} else {
		248	# fetch from database
		249	CFPlus::DB::get res_data => $meta->{name}, sub {
		250	my $rwops = new CFPlus::RW $_[0];
		251	my $chunk = new CFPlus::MixChunk $rwops
		252	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
		253	$chunk->volume (($meta->{data}{volume} || 1) * 128);
		254	$AUDIO_CHUNK{$face} = $chunk;
		255
		256	audio_sound_push ($face);
		257	};
		258	}
		259	}
		260	}
		261
		262	sub audio_sound_play {
		263	my ($face, $dx, $dy, $vol) = @_;
		264
		265	$SDL_MIXER
		266	or return;
		267	$CFG->{effects_enable}
		268	or return;
		269
		270	my $queue = $AUDIO_PLAY{$face} ||= [];
		271	push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
		272	audio_sound_push $face
		273	unless @$queue > 1;
		274	}
		275
		276	sub audio_music_set_meta {
		277	my ($meta) = @_;
		278
		279	$MUSIC_PLAYING_META = $meta;
		280	$MUSIC_PLAYING_WIDGET->set_markup (
		281	"<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
		282	. "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
		283	. "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
		284	. "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
		285	);
		286	}
		287
		288	sub audio_music_update_volume {
		289	return unless $MUSIC_PLAYING_META;
		290	my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
		291	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
		292	CFPlus::MixMusic::volume $base * $volume * 128;
		293	}
		294
		295	sub audio_music_start {
		296	my $meta = $MUSIC_PLAYING_META;
		297
		298	CFPlus::DB::get res_data => $meta->{name}, sub {
		299	return unless $SDL_MIXER;
		300
		301	# music might have changed...
		302	$meta eq $MUSIC_PLAYING_META
		303	or return &audio_music_start ();
		304
		305	audio_music_update_volume;
		306
		307	$MUSIC_PLAYING_DATA = \$_[0];
		308
		309	my $rwops = $meta->{path}
		310	? new_from_file CFPlus::RW $meta->{path}
		311	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		312
		313	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		314	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
		315
		316	my $NOW = time;
		317
		318	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		319	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		320	$MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
		321	$MUSIC_START = time - $pos;
		322	} else {
		323	$MUSIC_PLAYER->play (0);
		324	$MUSIC_START = time;
		325	}
		326
		327	delete $meta->{stop_time};
		328	delete $meta->{stop_pos};
		329	}
		330	}
		331
		332	sub audio_music_push {
		333	return unless $SDL_MIXER;
		334
		335	my $fade_out;
		336
		337	if (@MUSIC_JINGLE) {
		338	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		339	$fade_out = 333;
		340	} else {
		341	return unless $CFG->{bgm_enable};
		342
		343	my @have =
		344	grep $_ && $_->{data},
		345	map $CONN->{face}[$_],
		346	@$MUSIC_WANT;
		347
		348	# randomize music a bit so that the order is not always the same
		349	$_->{stop_time} ||= rand for @have;
		350
		351	@MUSIC_HAVE = @have
		352	if @have;
		353
		354	# default MUSIC_HAVE == MUSIC_DEFAULT
		355	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		356	$fade_out = 700;
		357	}
		358
		359	# if the currently playing song is acceptable, let it continue
		360	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		361
		362	my $NOW = time;
		363
		364	if ($MUSIC_PLAYING_META) {
		365	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		366	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		367	CFPlus::MixMusic::fade_out $fade_out;
		368	} else {
		369	# sort by stop time, oldest first
		370	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		371
		372	# if the most recently-played piece played very recently,
		373	# resume it, else choose the oldest piece for rotation.
		374	audio_music_set_meta
		375	$MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		376	? $MUSIC_HAVE[-1]
		377	: $MUSIC_HAVE[0];
		378
		379	audio_music_start;
		380	}
		381	}
		382
		383	sub audio_music_set_ambient {
		384	my ($songs) = @_;
		385
		386	$MUSIC_WANT = $songs;
		387	audio_music_push;
		388	}
		389
		390	sub audio_music_finished {
		391	if ($MUSIC_PLAYING_META) {
		392	$MUSIC_PLAYING_META->{stop_time} = time;
		393	}
		394
		395	# we compress multiple jingles of the same type
		396	shift @MUSIC_JINGLE
		397	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		398
		399	$MUSIC_PLAYING_WIDGET->clear;
		400
		401	undef $MUSIC_PLAYER;
		402	undef $MUSIC_PLAYING_META;
		403	undef $MUSIC_PLAYING_DATA;
		404
		405	audio_music_push;
		406	}
		407
		408	sub audio_init {
		409	if ($CFG->{audio_enable}) {
		410	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		411	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		412
		413	unless ($SDL_MIXER) {
		414	status "Unable to open sound device: there will be no sound";
		415	return;
		416	}
		417
		418	CFPlus::Mix_AllocateChannels 16;
		419
		420	audio_music_finished;
		421	} else {
		422	undef $SDL_MIXER;
		423	}
		424	}
		425
		426	sub audio_shutdown {
		427	undef $MUSIC_PLAYER;
		428	undef $MUSIC_PLAYING_META;
		429	undef $MUSIC_PLAYING_DATA;
		430
		431	$MUSIC_WANT = [];
		432	@MUSIC_JINGLE = ();
		433	%AUDIO_PLAY = ();
		434	%AUDIO_CHUNK = ();
		435
		436	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		437	undef $SDL_MIXER;
		438	}
		439
		440	#############################################################################
139		441
140	sub destroy_query_dialog {	442	sub destroy_query_dialog {
141	(delete $_[0]{query_dialog})->destroy	443	(delete $_[0]{query_dialog})->destroy
142	if $_[0]{query_dialog};	444	if $_[0]{query_dialog};
143	}	445	}
144		446
		447	# FIXME: a very ugly hack to wait for stat update look below! #d#
		448	our $QUERY_TIMER; #d#
		449
145	# server query dialog	450	# server query dialog
146	sub server_query {	451	sub server_query {
147	my ($conn, $flags, $prompt) = @_;	452	my ($conn, $flags, $prompt) = @_;
148		453
		454	# FIXME: a very ugly hack to wait for stat update #d#
		455	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
		456	unless ($QUERY_TIMER) {
		457	$QUERY_TIMER =
		458	Event->timer (
		459	after => 1,
		460	cb => sub {
		461	server_query ($conn, $flags, $prompt, 1);
		462	$QUERY_TIMER = undef
		463	}
		464	);
		465	return;
		466	}
		467	}
		468
149	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	469	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
150	x => "center",	470	x => "center",
151	y => "center",	471	y => "center",
152	title => "Server Query",	472	title => "Server Query",
153	child => my $vbox = new CFClient::UI::VBox,	473	child => my $vbox = new CFPlus::UI::VBox,
154	;	474	;
155		475
156	my @dialog = my $label = new CFClient::UI::Label	476	my @dialog = my $label = new CFPlus::UI::Label
157	max_w => $::WIDTH * 0.4,	477	max_w => $::WIDTH * 0.8,
158	ellipsise => 0,	478	ellipsise => 0,
159	text => $prompt;	479	text => $prompt;
160		480
161	if ($flags & CS_QUERY_YESNO) {	481	if ($flags & CS_QUERY_YESNO) {
162	push @dialog, my $hbox = new CFClient::UI::HBox;	482	push @dialog, my $hbox = new CFPlus::UI::HBox;
163		483
164	$hbox->add (new CFClient::UI::Button	484	$hbox->add (new CFPlus::UI::Button
165	text => "No",	485	text => "No",
166	on_activate => sub {	486	on_activate => sub {
167	$conn->send ("reply n");	487	$conn->send ("reply n");
168	$dialog->destroy;	488	$dialog->destroy;
169	0	489	0
170	}	490	}
171	);	491	);
172	$hbox->add (new CFClient::UI::Button	492	$hbox->add (new CFPlus::UI::Button
173	text => "Yes",	493	text => "Yes",
174	on_activate => sub {	494	on_activate => sub {
175	$conn->send ("reply y");	495	$conn->send ("reply y");
176	destroy_query_dialog $conn;	496	destroy_query_dialog $conn;
177	0	497	0
…		…
179	);	499	);
180		500
181	$dialog->grab_focus;	501	$dialog->grab_focus;
182		502
183	} elsif ($flags & CS_QUERY_SINGLECHAR) {	503	} elsif ($flags & CS_QUERY_SINGLECHAR) {
184	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
185
186	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	504	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
187	$MESSAGE_WINDOW->show;	505	$dialog->{tooltip} = "#charcreation_focus";
188		506
189	unshift @dialog, new CFClient::UI::Label	507	unshift @dialog, new CFPlus::UI::Label
190	max_w => $::WIDTH * 0.4,	508	max_w => $::WIDTH * 0.8,
191	ellipsise => 0,	509	ellipsise => 0,
192	markup => "\nOr use your keyboard:\n";	510	markup => "\nOr use your keyboard and the text entry below:\n";
193		511
194	unshift @dialog, my $table = new CFClient::UI::Table;	512	unshift @dialog, my $table = new CFPlus::UI::Table;
195		513
196	$table->add (0, 0, new CFClient::UI::Button	514	$table->add_at (0, 0, new CFPlus::UI::Button
197	text => "Next Race",	515	text => "Next Race",
198	on_activate => sub {	516	on_activate => sub {
199	$conn->send ("reply n");	517	$conn->send ("reply n");
200	destroy_query_dialog $conn;	518	destroy_query_dialog $conn;
201	0	519	0
202	},	520	},
203	);	521	);
204	$table->add (2, 0, new CFClient::UI::Button	522	$table->add_at (2, 0, new CFPlus::UI::Button
205	text => "Accept",	523	text => "Accept",
206	on_activate => sub {	524	on_activate => sub {
207	$conn->send ("reply d");	525	$conn->send ("reply d");
208	destroy_query_dialog $conn;	526	destroy_query_dialog $conn;
209	0	527	0
210	},	528	},
211	);	529	);
212		530
		531	if ($conn->{chargen_race_description}) {
		532	unshift @dialog, new CFPlus::UI::Label
		533	max_w => $::WIDTH * 0.8,
		534	ellipsise => 0,
		535	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		536	;
		537	}
		538
		539	unshift @dialog, new CFPlus::UI::Face
		540	face => $conn->{player}{face},
		541	bg => [.2, .2, .2, 1],
		542	min_w => 64,
		543	min_h => 64,
		544	;
		545
		546	if ($conn->{chargen_race_title}) {
		547	unshift @dialog, new CFPlus::UI::Label
		548	allign => 1,
		549	ellipsise => 0,
		550	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		551	;
		552	}
		553
213	unshift @dialog, new CFClient::UI::Label	554	unshift @dialog, new CFPlus::UI::Label
214	max_w => $::WIDTH * 0.4,	555	max_w => $::WIDTH * 0.4,
215	ellipsise => 0,	556	ellipsise => 0,
216	markup =>	557	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
217	"<big><b>Character Creation: Race</b></big>\n\n"
218	. "Look at the <b>Messages</b> window to see a description of this race "
219	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
220	. "and the center of the screen to see how this race looks like "
221	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
222	. "You can look at another race, or accept this race (you will come back to this race eventually, "
223	. "so you can take your time making this important choice."
224	;	558	;
225		559
226	} elsif ($prompt =~ /roll new stats/) {	560	} elsif ($prompt =~ /roll new stats/) {
227	if (my $stat = delete $conn->{stat_change_with}) {	561	if (my $stat = delete $conn->{stat_change_with}) {
228	$conn->send ("reply $stat");	562	$conn->send ("reply $stat");
229	destroy_query_dialog $conn;	563	destroy_query_dialog $conn;
230	return;	564	return;
231	}	565	}
232		566
233	$STATS_PAGE->show;
234	$MESSAGE_WINDOW->hide;
235
236	unshift @dialog, new CFClient::UI::Label	567	unshift @dialog, new CFPlus::UI::Label
237	max_w => $::WIDTH * 0.4,	568	max_w => $::WIDTH * 0.4,
238	ellipsise => 0,	569	ellipsise => 0,
239	markup => "\nOr use your keyboard:\n";	570	markup => "\nOr use your keyboard and the text entry below:\n";
240		571
241	unshift @dialog, my $table = new CFClient::UI::Table;	572	unshift @dialog, my $table = new CFPlus::UI::Table;
242		573
243	# left: re-roll	574	# left: re-roll
244	$table->add (0, 0, new CFClient::UI::Button	575	$table->add_at (0, 0, new CFPlus::UI::Button
245	text => "Roll Again",	576	text => "Roll Again",
246	on_activate => sub {	577	on_activate => sub {
247	$conn->send ("reply y");	578	$conn->send ("reply y");
248	destroy_query_dialog $conn;	579	destroy_query_dialog $conn;
249	0	580	0
250	},	581	},
251	);	582	);
252		583
253	# center: swap stats	584	# center: swap stats
254	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	585	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		586	expand => 1,
255	value => $_,	587	value => $_,
256	options => [	588	options => [
257	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	589	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
258	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	590	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
259	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],	591	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
…		…
262	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	594	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
263	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	595	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
264	],	596	],
265	), 1 .. 2;	597	), 1 .. 2;
266		598
267	$table->add (2, 0, new CFClient::UI::Button	599	$table->add_at (2, 0, new CFPlus::UI::Button
268	text => "Swap Stats",	600	text => "Swap Stats",
269	on_activate => sub {	601	on_activate => sub {
270	$conn->{stat_change_with} = $sw2->{value};	602	$conn->{stat_change_with} = $sw2->{value};
271	$conn->send ("reply $sw1->{value}");	603	$conn->send ("reply $sw1->{value}");
272	destroy_query_dialog $conn;	604	destroy_query_dialog $conn;
273	0	605	0
274	},	606	},
275	);	607	);
276	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	608	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
277		609
278	# right: accept	610	# right: accept
279	$table->add (4, 0, new CFClient::UI::Button	611	$table->add_at (4, 0, new CFPlus::UI::Button
280	text => "Accept",	612	text => "Accept",
281	on_activate => sub {	613	on_activate => sub {
282	$conn->send ("reply n");	614	$conn->send ("reply n");
283	$STATS_PAGE->hide;	615	$STATS_PAGE->hide;
284	destroy_query_dialog $conn;	616	destroy_query_dialog $conn;
285	0	617	0
286	},	618	},
287	);	619	);
288		620
		621	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
		622	for (
		623	[Str => CS_STAT_STR],
		624	[Dex => CS_STAT_DEX],
		625	[Con => CS_STAT_CON],
		626	[Int => CS_STAT_INT],
		627	[Wis => CS_STAT_WIS],
		628	[Pow => CS_STAT_POW],
		629	[Cha => CS_STAT_CHA],
		630	) {
		631	my ($name, $id) = @$_;
		632	$hbox->add (new CFPlus::UI::Label
		633	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		634	align => 0,
		635	expand => 1,
		636	can_events => 1,
		637	can_hover => 1,
		638	tooltip => "#stat_$name",
		639	);
		640	}
		641
289	unshift @dialog, new CFClient::UI::Label	642	unshift @dialog, new CFPlus::UI::Label
290	max_w => $::WIDTH * 0.4,	643	max_w => $::WIDTH * 0.4,
291	ellipsise => 0,	644	ellipsise => 0,
292	markup =>	645	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
293	"<big><b>Character Creation: Stats</b></big>\n\n"
294	. "Look at the <b>Stats</b> window to see your basic stats "
295	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
296	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
297	. "Race selection will influence those values later on."
298	;	646	;
299	}	647	}
300		648
301	push @dialog, my $entry = new CFClient::UI::Entry	649	push @dialog, my $entry = new CFPlus::UI::Entry
302	on_changed => sub {	650	on_changed => sub {
303	$conn->send ("reply $_[1]");	651	$conn->send ("reply $_[1]");
304	destroy_query_dialog $conn;	652	destroy_query_dialog $conn;
305	0	653	0
306	},	654	},
…		…
309	$entry->grab_focus;	657	$entry->grab_focus;
310		658
311	} else {	659	} else {
312	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	660	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
313		661
314	push @dialog, my $entry = new CFClient::UI::Entry	662	push @dialog, my $entry = new CFPlus::UI::Entry
315	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	663	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
316	on_activate => sub {	664	on_activate => sub {
317	$conn->send ("reply $_[1]");	665	$conn->send ("reply $_[1]");
318	destroy_query_dialog $conn;	666	destroy_query_dialog $conn;
319	0	667	0
…		…
333	$LOGIN_BUTTON->set_text ("Logout");	681	$LOGIN_BUTTON->set_text ("Logout");
334	$SETUP_DIALOG->hide;	682	$SETUP_DIALOG->hide;
335		683
336	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	684	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
337		685
338	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	686	my ($host, $port) = split /:/, $PROFILE->{host};
339		687
340	$MAP = new CFClient::Map $mapsize, $mapsize;	688	$MAP = new CFPlus::Map;
341		689
342	$CONN = eval {	690	$CONN = eval {
343	new CFClient::Protocol	691	new CFPlus::Protocol
344	host => $host,	692	host => $host,
345	port => $port || 13327,	693	port => $port || 13327,
346	user => $CFG->{profile}{default}{user},	694	user => $PROFILE->{user},
347	pass => $CFG->{profile}{default}{password},	695	pass => $PROFILE->{password},
348	mapw => $mapsize,	696	mapw => $mapsize,
349	maph => $mapsize,	697	maph => $mapsize,
350		698
		699	client => "cfplus $CFPlus::VERSION $] $^O",
		700
351	map_widget => $MAPWIDGET,	701	map_widget => $MAPWIDGET,
352	logview => $LOGVIEW,
353	statusbox => $STATUSBOX,	702	statusbox => $STATUSBOX,
354	map => $MAP,	703	map => $MAP,
355	mapmap => $MAPMAP,	704	mapmap => $MAPMAP,
356	query => \&server_query,	705	query => \&server_query,
357		706
358	sound_play => sub {	707	setup_req => {
359	my ($x, $y, $soundnum, $type) = @_;	708	smoothing => $CFG->{map_smoothing}*1,
360
361	$SDL_MIXER
362	or return;
363
364	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
365	or return;
366
367	$chunk->play;
368	},	709	},
369	};	710	};
370		711
371	if ($CONN) {	712	if ($CONN) {
372	CFClient::lowdelay fileno $CONN->{fh};	713	CFPlus::lowdelay fileno $CONN->{fh};
373		714
374	status "login successful";	715	status "login successful";
375	} else {	716	} else {
376	status "unable to connect";	717	status "unable to connect";
377	stop_game();	718	stop_game();
…		…
381	sub stop_game {	722	sub stop_game {
382	$LOGIN_BUTTON->set_text ("Login");	723	$LOGIN_BUTTON->set_text ("Login");
383	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	724	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
384	$SETUP_DIALOG->show;	725	$SETUP_DIALOG->show;
385	$PL_WINDOW->hide;	726	$PL_WINDOW->hide;
386	$SPELL_PAGE->clear_spells;	727	$SPELL_LIST->clear_spells;
		728	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		729
		730	&audio_music_set_ambient ([]);
387		731
388	return unless $CONN;	732	return unless $CONN;
389		733
390	status "connection closed";	734	status "connection closed";
391		735
…		…
395		739
396	undef $MAP;	740	undef $MAP;
397	}	741	}
398		742
399	sub graphics_setup {	743	sub graphics_setup {
400	my $vbox = new CFClient::UI::VBox;	744	my $vbox = new CFPlus::UI::VBox;
401		745
402	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	746	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
403		747
		748	my $row = 0;
		749
		750	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		751	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		752	can_events => 1,
		753	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		754
		755	my $vidmode_tooltip =
		756	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		757	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		758
404	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	759	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
405	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	760	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
406		761
		762	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
407	$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]);	763	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
408	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	764	tooltip => $vidmode_tooltip);
		765	$hbox->add (my $mode_label = new CFPlus::UI::Label
		766	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		767	can_events => 1, tooltip => $vidmode_tooltip);
409		768
410	$mode_slider->connect (changed => sub {	769	$mode_slider->connect (changed => sub {
411	my ($self, $value) = @_;	770	my ($self, $value) = @_;
412		771
413	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	772	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
414	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	773	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
415	});	774	});
416	$mode_slider->emit (changed => $mode_slider->{range}[0]);	775	$mode_slider->emit (changed => $mode_slider->{range}[0]);
417		776
418	my $row = 1;
419
420	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	777	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
421	$table->add (1, $row++, new CFClient::UI::CheckBox	778	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
422	state => $CFG->{fullscreen},	779	state => $CFG->{fullscreen},
423	tooltip => "Bring the client into fullscreen mode.",	780	tooltip => "Bring the client into fullscreen mode.",
424	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	781	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
425	);	782	);
426		783
		784	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
		785	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		786	state => $CFG->{force_opengl11},
		787	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
		788	. "higher memory usage and slower performance. It will, however, help tremendously on "
		789	. "cards that claim to support a feature but fall back to software rendering. "
		790	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
		791	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
		792	. "experience extremely low framerates and your card should do better, try this option.</b>",
		793	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		794	);
		795
		796	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
		797	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		798	state => $CFG->{texture_compression},
		799	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
		800	. "will save a lot of memory and increase performance. The compression algorithm "
		801	. "can differ form card to card, so your mileage may vary. This setting is ignored in "
		802	. "forced OpenGL 1.1 mode.",
		803	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
		804	);
		805
427	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	806	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
428	$table->add (1, $row++, new CFClient::UI::CheckBox	807	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
429	state => $CFG->{fast},	808	state => $CFG->{fast},
430	tooltip => "Lower the visual quality considerably to speed up rendering.",	809	tooltip => "Lower the visual quality considerably to speed up rendering.",
431	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	810	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
432	);	811	);
433		812
		813	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		814	$table->add_at (1, $row++, new CFPlus::UI::Slider
		815	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		816	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		817	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		818	);
		819
		820	$table->add_at (1, $row++, new CFPlus::UI::Button
		821	expand => 1, align => 0, text => "Apply",
		822	tooltip => "Apply the video settings above.",
		823	on_activate => sub {
		824	video_shutdown ();
		825	video_init ();
		826	0
		827	}
		828	);
		829
434	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	830	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
435	$table->add (1, $row++, new CFClient::UI::Slider	831	$table->add_at (1, $row++, new CFPlus::UI::Slider
436	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	832	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
437	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	833	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
438	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	834	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
439	);	835	);
440		836
		837	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
		838	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		839	state => $CFG->{map_smoothing},
		840	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		841	. "This increases load on the graphics subsystem and works only with TRT servers. "
		842	. "Changes take effect at next login only.",
		843	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		844	);
		845
441	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	846	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
442	$table->add (1, $row++, new CFClient::UI::CheckBox	847	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
443	state => $CFG->{fow_enable},	848	state => $CFG->{fow_enable},
444	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	849	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
445	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	850	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
446	);	851	);
447		852
448	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	853	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
449	$table->add (1, $row++, new CFClient::UI::Slider	854	$table->add_at (1, $row++, new CFPlus::UI::Slider
450	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	855	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
451	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	856	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
452	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	857	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
453	);	858	);
454		859
455	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
456	$table->add (1, $row++, new CFClient::UI::CheckBox
457	state => $CFG->{fow_smooth},
458	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
459	on_changed => sub {
460	my ($self, $value) = @_;
461	$CFG->{fow_smooth} = $value;
462	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
463	0
464	}
465	);
466
467	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
468	$table->add (1, $row++, new CFClient::UI::Slider
469	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
470	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
471	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
472	);
473
474	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	860	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
475	$table->add (1, $row++, new CFClient::UI::Slider	861	$table->add_at (1, $row++, new CFPlus::UI::Slider
476	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	862	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
477	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	863	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
		864	. "but you still need to press apply to correctly re-layout the widget.",
478	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	865	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
479	);	866	);
480		867
481	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	868	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
482	$table->add (1, $row++, new CFClient::UI::Slider	869	$table->add_at (1, $row++, new CFPlus::UI::Slider
483	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	870	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
484	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	871	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
485	on_changed => sub {	872	on_changed => sub {
486	$CFG->{gauge_fontsize} = $_[1];	873	$CFG->{gauge_fontsize} = $_[1];
487	&set_gauge_window_fontsize;	874	&set_gauge_window_fontsize;
488	0	875	0
489	}	876	}
490	);	877	);
491		878
492	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	879	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
493	$table->add (1, $row++, new CFClient::UI::Slider	880	$table->add_at (1, $row++, new CFPlus::UI::Slider
494	range => [$CFG->{gauge_size}, 0.2, 0.8],	881	range => [$CFG->{gauge_size}, 0.2, 0.8],
495	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	882	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
496	on_changed => sub {	883	on_changed => sub {
497	$CFG->{gauge_size} = $_[1];	884	$CFG->{gauge_size} = $_[1];
498	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	885	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499	0	886	0
500	}	887	}
501	);	888	);
502		889
503	$table->add (1, $row++, new CFClient::UI::Button
504	expand => 1, align => 0, text => "Apply",
505	tooltip => "Apply the video settings",
506	on_activate => sub {
507	video_shutdown ();
508	video_init ();
509	0
510	}
511	);
512
513	$vbox	890	$vbox
514	}	891	}
515		892
516	sub audio_setup {	893	sub audio_setup {
517	my $vbox = new CFClient::UI::VBox;	894	my $vbox = new CFPlus::UI::VBox;
518		895
519	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	896	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
520		897
521	my $row = 0;	898	my $row = 0;
522		899
523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	900	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
524	$table->add (1, $row++, new CFClient::UI::CheckBox	901	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
525	state => $CFG->{audio_enable},	902	state => $CFG->{audio_enable},
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.",	903	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.",
527	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	904	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528	);	905	);
529	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	906	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
530	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	907	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
531	# $CFG->{effects_volume} = $_[1];	908	# $CFG->{effects_volume} = $_[1];
532	# });	909	# });
		910
		911	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
		912	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		913	expand => 1, state => $CFG->{effects_enable},
		914	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		915	on_changed => sub {
		916	$CFG->{effects_enable} = $_[1];
		917	$CONN->update_fx_want if $CONN;
		918	0
		919	}
		920	);
		921	$table->add_at (2, $row++, new CFPlus::UI::Slider
		922	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		923	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		924	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
		925	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		926	);
		927
533	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	928	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
534	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	929	$table->add_at (1, $row, new CFPlus::UI::CheckBox
535	$hbox->add (new CFClient::UI::CheckBox
536	expand => 1, state => $CFG->{bgm_enable},	930	expand => 1, state => $CFG->{bgm_enable},
537	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	931	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
538	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	932	on_changed => sub {
		933	$CFG->{bgm_enable} = $_[1];
		934	$CONN->update_fx_want if $CONN;
		935	audio_music_push;
		936	0
		937	}
539	);	938	);
540	$hbox->add (new CFClient::UI::Slider	939	$table->add_at (2, $row++, new CFPlus::UI::Slider
541	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	940	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
542	tooltip => "The volume of the background music. Changes are instant.",	941	tooltip => "The volume of the background music. Changes are instant.",
543	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	942	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
544	);	943	);
545		944
546	$table->add (1, $row++, new CFClient::UI::Button	945	$table->add_at (1, $row++, new CFPlus::UI::Button
547	expand => 1, align => 0, text => "Apply",	946	c_colspan => 2, expand => 1, align => 0, text => "Apply",
548	tooltip => "Apply the audio settings",	947	tooltip => "Apply the audio settings",
549	on_activate => sub {	948	on_activate => sub {
550	audio_shutdown ();	949	audio_shutdown ();
551	audio_init ();	950	audio_init ();
552	0	951	0
…		…
563	}	962	}
564		963
565	sub make_gauge_window {	964	sub make_gauge_window {
566	my $gh = int $HEIGHT * $CFG->{gauge_size};	965	my $gh = int $HEIGHT * $CFG->{gauge_size};
567		966
568	my $win = new CFClient::UI::Frame (	967	my $win = new CFPlus::UI::Frame (
569	force_x => 0,	968	force_x => 0,
570	force_y => "max",	969	force_y => "max",
571	force_w => $WIDTH,	970	force_w => $WIDTH,
572	force_h => $gh,	971	force_h => $gh,
573	);	972	);
574		973
575	$win->add (my $hbox = new CFClient::UI::HBox	974	$win->add (my $hbox = new CFPlus::UI::HBox
576	children => [	975	children => [
577	(new CFClient::UI::HBox expand => 1),	976	(new CFPlus::UI::HBox expand => 1),
578	(new CFClient::UI::VBox children => [	977	(new CFPlus::UI::VBox children => [
579	(new CFClient::UI::Empty expand => 1),	978	(new CFPlus::UI::Empty expand => 1),
580	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	979	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
581	]),	980	]),
582	(my $vbox = new CFClient::UI::VBox),	981	(my $vbox = new CFPlus::UI::VBox),
583	],	982	],
584	);	983	);
585		984
586	$vbox->add (new CFClient::UI::HBox	985	$vbox->add (new CFPlus::UI::HBox
587	expand => 1,	986	expand => 1,
588	children => [	987	children => [
589	(new CFClient::UI::Empty expand => 1),	988	(new CFPlus::UI::Empty expand => 1),
590	(my $hb = new CFClient::UI::HBox),	989	(my $hb = new CFPlus::UI::HBox),
591	],	990	],
592	);	991	);
593		992
594	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	993	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
595	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
596	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	994	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
597	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
598	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	995	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
599	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
600	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	996	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
601	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
602		997
603	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	998	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
604	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");	999	$vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
		1000	$vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
605	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	1001	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
606	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
607		1002
608	$GAUGES = {	1003	$GAUGES = {
		1004	exp => $exp, prg => $prg, sklprg => $sklprg,
609	exp => $exp, win => $win, range => $rng,	1005	win => $win, range => $rng,
610	food => $fg, mana => $mg, hp => $hg, grace => $gg	1006	hp => $hg, mana => $mg, grace => $gg, food => $fg,
611	};	1007	};
612		1008
613	&set_gauge_window_fontsize;	1009	&set_gauge_window_fontsize;
614		1010
615	$win	1011	$win
616	}	1012	}
617		1013
618	sub debug_setup {	1014	sub debug_setup {
619	my $table = new CFClient::UI::Table;	1015	my $table = new CFPlus::UI::Table;
620		1016
621	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	1017	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
622	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	1018	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
623	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	1019	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
624	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	1020	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
625	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	1021	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
626	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	1022	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
627	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	1023	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
628	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	1024	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		1025	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
629		1026
630	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	1027	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
631		1028
632	for my $x (0..2) {	1029	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
633	for my $y (0 .. 2) {	1030	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
634	$table->add ($x + 3, $y,	1031	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
635	new CFClient::UI::Entry	1032	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
636	text => $default_smooth[$x * 3 + $y],	1033	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
637	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	1034	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
638	);	1035
639	}	1036	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		1037
		1038	$c->add_items ({
		1039	type => "line_loop",
		1040	color => [0, 1, 0],
		1041	width => 9,
		1042	coord_mode => "abs",
		1043	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
640	}	1044	});
641		1045
		1046	$c->add_items ({
		1047	type => "lines",
		1048	color => [1, 1, 0],
		1049	width => 2,
		1050	coord_mode => "rel",
		1051	coord => [[0,0], [1,1], [1,0], [0,1]],
		1052	});
		1053
		1054	$c->add_items ({
		1055	type => "polygon",
		1056	color => [0, 0.43, 0],
		1057	width => 2,
		1058	coord_mode => "rel",
		1059	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		1060	});
642		1061
643	$table	1062	$table
644	}	1063	}
645		1064
646	sub stats_window {	1065	sub stats_window {
		1066	my $r = new CFPlus::UI::ScrolledWindow (
		1067	expand => 1,
		1068	scroll_y => 1
		1069	);
647	my $vb = new CFClient::UI::VBox;	1070	$r->add (my $vb = new CFPlus::UI::VBox);
648		1071
		1072	$vb->add (new CFPlus::UI::FancyFrame
		1073	label => "Player",
		1074	child => (my $pi = new CFPlus::UI::VBox),
		1075	);
		1076
649	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	1077	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
650	can_hover => 1, can_events => 1,	1078	can_hover => 1, can_events => 1,
651	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	1079	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
652	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	1080	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
653	can_hover => 1, can_events => 1,	1081	can_hover => 1, can_events => 1,
654	tooltip => "The map you are currently on (if supported by the server).");	1082	tooltip => "The map you are currently on (if supported by the server).");
655		1083
656	$vb->add (my $hb0 = new CFClient::UI::HBox);	1084	$pi->add (my $hb0 = new CFPlus::UI::HBox);
657	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	1085	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
658	can_hover => 1, can_events => 1,	1086	can_hover => 1, can_events => 1,
659	tooltip => "The weight of the player including all inventory items.");	1087	tooltip => "The weight of the player including all inventory items.");
660	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	1088	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
661	can_hover => 1, can_events => 1,	1089	can_hover => 1, can_events => 1,
662	tooltip => "The weight limit: you cannot carry more than this.");	1090	tooltip => "The weight limit: you cannot carry more than this.");
663		1091
664		1092	$vb->add (new CFPlus::UI::FancyFrame
		1093	label => "Primary/Secondary Statistics",
665	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1094	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		1095	);
666	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	1096	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
667		1097
668	my $color2 = [1, 1, 0];	1098	my $color2 = [1, 1, 0];
669		1099
670	for (	1100	for (
671	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	1101	[0, 0, st_str => "Str", 30],
672	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	1102	[0, 1, st_dex => "Dex", 30],
673	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	1103	[0, 2, st_con => "Con", 30],
674	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	1104	[0, 3, st_int => "Int", 30],
675	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	1105	[0, 4, st_wis => "Wis", 30],
676	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	1106	[0, 5, st_pow => "Pow", 30],
677	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	1107	[0, 6, st_cha => "Cha", 30],
678		1108
679	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	1109	[2, 0, st_wc => "Wc", -120],
680	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	1110	[2, 1, st_ac => "Ac", -120],
681	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	1111	[2, 2, st_dam => "Dam", 120],
682	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],	1112	[2, 3, st_arm => "Arm", 120],
683	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	1113	[2, 4, st_spd => "Spd", 10.54],
684	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	1114	[2, 5, st_wspd => "WSp", 10.54],
685	) {	1115	) {
686	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	1116	my ($col, $row, $id, $label, $template) = @$_;
687		1117
688	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	1118	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
689	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	1119	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		1120	align => +1, template => $template, tooltip => "#stat_$label");
690	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	1121	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
691	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	1122	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		1123	align => -1, text => $label, tooltip => "#stat_$label");
692	}	1124	}
693		1125
		1126	$vb->add (new CFPlus::UI::FancyFrame
		1127	label => "Resistancies",
694	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	1128	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		1129	);
695		1130
696	my $row = 0;	1131	my $row = 0;
697	my $col = 0;	1132	my $col = 0;
698		1133
699	my %resist_names = (	1134	my %resist_names = (
…		…
732	cold => ["Cold",	1167	cold => ["Cold",
733	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1168	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
734	ghit => ["Ghost hit",	1169	ghit => ["Ghost hit",
735	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1170	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
736	);	1171	);
		1172
737	for (qw/slow holyw conf fire depl magic	1173	for (qw/slow holyw conf fire depl magic
738	drain acid pois para deat phys	1174	drain acid pois para deat phys
739	blind fear tund elec cold ghit/)	1175	blind fear tund elec cold ghit/)
740	{	1176	{
741	$tbl2->add ($col, $row,	1177	$tbl2->add_at ($col, $row,
742	$STATWIDS->{"res_$_"} =	1178	$STATWIDS->{"res_$_"} =
743	new CFClient::UI::Label	1179	new CFPlus::UI::Label
744	font => $FONT_FIXED,	1180	font => $FONT_FIXED,
745	template => "-100%",	1181	template => "-100%",
746	align => +1,	1182	align => +1,
747	valign => 0,	1183	valign => 0,
748	can_events => 1,	1184	can_events => 1,
749	can_hover => 1,	1185	can_hover => 1,
750	tooltip => $resist_names{$_}->[1],	1186	tooltip => $resist_names{$_}->[1],
751	);	1187	);
752	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	1188	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
753	font => $FONT_FIXED,	1189	font => $FONT_FIXED,
754	can_hover => 1,	1190	can_hover => 1,
755	can_events => 1,	1191	can_events => 1,
756	path => "ui/resist/resist_$_.png",	1192	path => "ui/resist/resist_$_.png",
757	tooltip => $resist_names{$_}->[1],	1193	tooltip => $resist_names{$_}->[1],
758	);	1194	);
759	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	1195	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
760	text => $resist_names{$_}->[0],	1196	text => $resist_names{$_}->[0],
761	font => $FONT_FIXED,	1197	font => $FONT_FIXED,
762	can_hover => 1,	1198	can_hover => 1,
763	can_events => 1,	1199	can_events => 1,
764	tooltip => $resist_names{$_}->[1],	1200	tooltip => $resist_names{$_}->[1],
…		…
769	$col += 3;	1205	$col += 3;
770	$row = 0;	1206	$row = 0;
771	}	1207	}
772	}	1208	}
773		1209
774	update_stats_window ({});	1210	#update_stats_window ({});
775		1211
776	$vb	1212	$r
777	}	1213	}
778		1214
779	sub skill_window {	1215	sub skill_window {
780	my ($self) = @_;	1216	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
781	$STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;	1217
		1218	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
		1219
		1220	$sw
782	}	1221	}
783		1222
784	sub formsep($) {	1223	sub formsep($) {
785	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	1224	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
786	}	1225	}
787		1226
788	sub update_stats_window {
789	my ($stats) = @_;
790
791	# I love text protocols...
792
793	my $hp = $stats->{+CS_STAT_HP} * 1;
794	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
795	my $sp = $stats->{+CS_STAT_SP} * 1;
796	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
797	my $fo = $stats->{+CS_STAT_FOOD} * 1;
798	my $fo_m = 999;
799	my $gr = $stats->{+CS_STAT_GRACE} * 1;
800	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
801
802	$GAUGES->{hp} ->set_value ($hp, $hp_m);
803	$GAUGES->{mana} ->set_value ($sp, $sp_m);
804	$GAUGES->{food} ->set_value ($fo, $fo_m);
805	$GAUGES->{grace} ->set_value ($gr, $gr_m);
806	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
807	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
808	my $rng = $stats->{+CS_STAT_RANGE};
809	$rng =~ s/^Range: //; # thank you so much dear server
810	$GAUGES->{range} ->set_text ("Rng: " . $rng);
811	my $title = $stats->{+CS_STAT_TITLE};
812	$title =~ s/^Player: //;
813	$STATWIDS->{title} ->set_text ("Title: " . $title);
814
815	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
816	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
817	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
818	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
819	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
820	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
821	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
822	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
823	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
824	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
825	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
826	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
827	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
828
829	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
830
831	my %tbl = (
832	phys => CS_STAT_RES_PHYS,
833	magic => CS_STAT_RES_MAG,
834	fire => CS_STAT_RES_FIRE,
835	elec => CS_STAT_RES_ELEC,
836	cold => CS_STAT_RES_COLD,
837	conf => CS_STAT_RES_CONF,
838	acid => CS_STAT_RES_ACID,
839	drain => CS_STAT_RES_DRAIN,
840	ghit => CS_STAT_RES_GHOSTHIT,
841	pois => CS_STAT_RES_POISON,
842	slow => CS_STAT_RES_SLOW,
843	para => CS_STAT_RES_PARA,
844	tund => CS_STAT_TURN_UNDEAD,
845	fear => CS_STAT_RES_FEAR,
846	depl => CS_STAT_RES_DEPLETE,
847	deat => CS_STAT_RES_DEATH,
848	holyw => CS_STAT_RES_HOLYWORD,
849	blind => CS_STAT_RES_BLIND,
850	);
851
852	if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
853	my $sktbl = $STATWIDS->{_skill_tbl};
854	$sktbl->clear;
855
856	$sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
857	$sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
858	$sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
859
860	my @skills;
861
862	for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
863	push @skills, [$i, $::CONN->{skill_info}{$i}];
864	}
865
866	my $y = 1;
867	for (sort { $a->[1] cmp $b->[1] } @skills) {
868	my ($idx, $name) = @$_;
869
870	unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
871	$sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
872	$sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873	$sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
874	}
875	}
876
877	$STATWIDS->{_skill_tbl_init} = 1;
878	}
879
880	for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
881	if (exists $stats->{$i}) {
882	$STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
883	if $STATWIDS->{"sk_xp_$i"};
884	$STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
885	if $STATWIDS->{"sk_lvl_$i"};
886	}
887	}
888
889	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
890	for keys %tbl;
891	}
892
893	my $METASERVER_ATIME;	1227	my $METASERVER_ATIME;
894		1228
895	sub update_metaserver {	1229	sub update_metaserver {
896	my ($metaserver_dialog) = @_;	1230	my ($metaserver_dialog) = @_;
897		1231
…		…
901	return if $METASERVER_ATIME > time;	1235	return if $METASERVER_ATIME > time;
902	$METASERVER_ATIME = time + 60;	1236	$METASERVER_ATIME = time + 60;
903		1237
904	my $table = $METASERVER->{table};	1238	my $table = $METASERVER->{table};
905	$table->clear;	1239	$table->clear;
906	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1240	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
907		1241
908	my $buf;	1242	my $ok = 0;
909		1243
910	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	1244	CFPlus::background {
		1245	my $ua = CFPlus::lwp_useragent;
911		1246
912	unless ($fh) {	1247	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
913	$label->set_text ("unable to contact metaserver: $!");	1248	} sub {
914	return;	1249	my ($msg) = @_;
915	}	1250	if ($msg) {
916
917	Event->io (fd => $fh, poll => 'r', cb => sub {
918	my $res = sysread $fh, $buf, 8192, length $buf;
919
920	if (!defined $res) {
921	$_[0]->w->cancel;
922	$label->set_text ("error while retrieving server list: $!");
923	} elsif ($res == 0) {
924	$_[0]->w->cancel;
925	status "server list retrieved";
926
927	utf8::decode $buf if utf8::valid $buf;
928
929	$table->clear;	1251	$table->clear;
930		1252
931	my @tip = (	1253	my @tip = (
932	"The current number of users logged in on the server.",	1254	"The current number of users logged in on the server.",
933	"The hostname of the server.",	1255	"The hostname of the server.",
934	"The time this server has been running without being restarted.",	1256	"The time this server has been running without being restarted.",
935	"The server software version - a '+' indicates a Crossfire+ server.",	1257	"The server software version - a '+' indicates a Crossfire+ server.",
936	"Short information about this server provided by its admins.",	1258	"Short information about this server provided by its admins.",
937	);	1259	);
938	my @col = qw(#Users Host Uptime Version Description);	1260	my @col = qw(#Users Host Uptime Version Description);
939	$table->add ($_, 0, new CFClient::UI::Label	1261	$table->add_at ($_, 0, new CFPlus::UI::Label
940	can_hover => 1, can_events => 1,	1262	can_hover => 1, can_events => 1,
941	align => 0, fg => [1, 1, 0],	1263	align => 0, fg => [1, 1, 0],
942	text => $col[$_], tooltip => $tip[$_])	1264	text => $col[$_], tooltip => $tip[$_])
943	for 0 .. $#col;	1265	for 0 .. $#col;
944		1266
945	my @align = qw(1 0 1 1 -1);	1267	my @align = qw(1 0 1 1 -1);
946		1268
947	my $y = 0;	1269	my $y = 0;
948	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	1270	for my $m (@{ $msg->{servers} }) {
949	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	1271	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		1272	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
950		1273
951	for ($desc) {	1274	for ($desc) {
952	s/<br>/\n/gi;	1275	s/<br>/\n/gi;
953	s/<li>/\n· /gi;	1276	s/<li>/\n· /gi;
954	s/<.*?>//sgi;	1277	s/<.*?>//sgi;
955	s/&/&amp;/g;	1278	s/&amp;/&/g;
956	s/</&lt;/g;	1279	s/&lt;/</g;
957	s/>/&gt;/g;	1280	s/&gt;/>/g;
958	}	1281	}
959		1282
960	$uptime = sprintf "%dd %02d:%02d:%02d",	1283	$uptime = sprintf "%dd %02d:%02d:%02d",
961	(int $m->[8] / 86400),	1284	(int $uptime / 86400),
962	(int $m->[8] / 3600) % 24,	1285	(int $uptime / 3600) % 24,
963	(int $m->[8] / 60) % 60,	1286	(int $uptime / 60) % 60,
964	$m->[8] % 60;	1287	$uptime % 60;
965		1288
966	$m = [$users, $host, $uptime, $version, $desc];	1289	$m = [$users, $host, $uptime, $version, $desc];
967		1290
968	$y++;	1291	$y++;
969		1292
970	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	1293	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
971	(new CFClient::UI::Button	1294	(new CFPlus::UI::Button
972	text => "Use",	1295	text => "Use",
973	tooltip => "Put this server into the <b>Host:Port</b> field",	1296	tooltip => "Put this server into the <b>Host:Port</b> field",
974	on_activate => sub {	1297	on_activate => sub {
975	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1298	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
976	$METASERVER->hide;	1299	$METASERVER->hide;
977	0	1300	0
978	},	1301	},
979	),	1302	),
980	(new CFClient::UI::Empty expand => 1),	1303	(new CFPlus::UI::Empty expand => 1),
981	]);	1304	]);
982		1305
983	$table->add ($_, $y, new CFClient::UI::Label	1306	$table->add_at ($_, $y, new CFPlus::UI::Label
		1307	max_w => $::WIDTH * 0.4,
984	ellipsise => 0,	1308	ellipsise => 0,
985	align => $align[$_],	1309	align => $align[$_],
986	text => $m->[$_],	1310	text => $m->[$_],
987	tooltip => $tip[$_],	1311	tooltip => $tip[$_],
		1312	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
988	can_hover => 1,	1313	can_hover => 1,
989	can_events => 1,	1314	can_events => 1,
990	fontsize => 0.8)	1315	fontsize => 0.8)
991	for 0 .. $#$m;	1316	for 0 .. $#$m;
992	}	1317	}
		1318	} else {
		1319	$ok or $label->set_text ("error while contacting metaserver");
993	}	1320	}
994	});	1321	};
		1322
995	}	1323	}
996		1324
997	sub metaserver_dialog {	1325	sub metaserver_dialog {
998	my $vbox = new CFClient::UI::VBox;	1326	my $vbox = new CFPlus::UI::VBox;
999	my $table = new CFClient::UI::Table;	1327	my $table = new CFPlus::UI::Table;
1000	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1328	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1001		1329
1002	my $dialog = new CFClient::UI::FancyFrame	1330	my $dialog = new CFPlus::UI::Toplevel
1003	title => "Server List",	1331	title => "Server List",
1004	name => 'metaserver_dialog',	1332	name => 'metaserver_dialog',
1005	x => 'center',	1333	x => 'center',
1006	y => 'center',	1334	y => 'center',
1007	z => 3,	1335	z => 3,
		1336	force_w => $::WIDTH * 0.9,
1008	force_h => $::HEIGHT * 0.4,	1337	force_h => $::HEIGHT * 0.7,
1009	child => $vbox,	1338	child => $vbox,
1010	has_close_button => 1,	1339	has_close_button => 1,
1011	table => $table,	1340	table => $table,
1012	on_visibility_change => sub {	1341	on_visibility_change => sub {
1013	update_metaserver ($_[0]) if $_[1];	1342	update_metaserver ($_[0]) if $_[1];
…		…
1017		1346
1018	$dialog	1347	$dialog
1019	}	1348	}
1020		1349
1021	sub server_setup {	1350	sub server_setup {
1022	my $vbox = new CFClient::UI::VBox;	1351	my $vbox = new CFPlus::UI::VBox;
1023		1352
		1353	$vbox->add (new CFPlus::UI::FancyFrame
		1354	label => "Connection Settings",
1024	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	1355	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		1356	);
1025	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	1357	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1026		1358
1027	{	1359	{
1028	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1360	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1029		1361
1030	$vbox->add (	1362	$vbox->add (
1031	$HOST_ENTRY = new CFClient::UI::Entry	1363	$HOST_ENTRY = new CFPlus::UI::Entry
1032	expand => 1,	1364	expand => 1,
1033	text => $CFG->{profile}{default}{host},	1365	text => $CFG->{profile}{default}{host},
1034	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1366	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1035	on_changed => sub {	1367	on_changed => sub {
1036	my ($self, $value) = @_;	1368	my ($self, $value) = @_;
1037	$CFG->{profile}{default}{host} = $value;	1369	$CFG->{profile}{default}{host} = $value;
1038	0	1370	1
1039	}	1371	}
1040	);	1372	);
1041		1373
1042	$vbox->add (new CFClient::UI::Button	1374	$vbox->add (new CFPlus::UI::Button
1043	expand => 1,	1375	expand => 1,
1044	text => "Server List",	1376	text => "Server List",
1045	other => $METASERVER,	1377	other => $METASERVER,
1046	tooltip => "Show a list of available crossfire servers",	1378	tooltip => "Show a list of available crossfire servers",
1047	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1379	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1048	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1380	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1049	);	1381	);
1050	}	1382	}
1051		1383
1052	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1384	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1053	$table->add (1, 4, new CFClient::UI::Entry	1385	$table->add_at (1, 4, new CFPlus::UI::Entry
1054	text => $CFG->{profile}{default}{user},	1386	text => $CFG->{profile}{default}{user},
1055	tooltip => "The name of your character on the server",	1387	tooltip => "The name of your character on the server",
1056	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1388	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1057	);	1389	);
1058		1390
1059	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1391	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1060	$table->add (1, 5, new CFClient::UI::Entry	1392	$table->add_at (1, 5, new CFPlus::UI::Entry
1061	text => $CFG->{profile}{default}{password},	1393	text => $CFG->{profile}{default}{password},
1062	hidden => 1,	1394	hidden => 1,
1063	tooltip => "The password for your character",	1395	tooltip => "The password for your character",
1064	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1396	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1065	);	1397	);
1066		1398
1067	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1399	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1068	$table->add (1, 7, new CFClient::UI::Slider	1400	$table->add_at (1, 7, new CFPlus::UI::Slider
1069	force_w => 100,	1401	force_w => 100,
1070	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1402	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1071	tooltip => "This is the size of the portion of the map update the server sends you. "	1403	tooltip => "This is the size of the portion of the map update the server sends you. "
1072	. "If you set this to a high value you will be able to see further, "	1404	. "If you set this to a high value you will be able to see further, "
1073	. "but you also increase bandwidth requirements and latency. "	1405	. "but you also increase bandwidth requirements and latency. "
1074	. "This option is only used once at log-in.",	1406	. "This option is only used once at log-in.",
1075	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1407	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1076	);	1408	);
1077		1409
1078	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1410	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1079	$table->add (1, 8, new CFClient::UI::CheckBox	1411	$table->add_at (1, 8, new CFPlus::UI::Entry
1080	state => $CFG->{face_prefetch},	1412	text => $CFG->{output_rate},
1081	tooltip => "<b>Background Image Prefetch</b>\n\n"	1413	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1082	. "If enabled, the client automatically pre-fetches images from the server. "	1414	. "when sending data. When 0 or unset, the server "
1083	. "This might increase or create lag, but increases the chances "	1415	. "default will be used, which is usually around 100kb/s. Most servers will "
1084	. "of faces being ready for display when you encounter them. "	1416	. "dynamically find an optimal rate, so adjust this only when necessary.",
1085	. "It also uses up server bandwidth on every connect, "
1086	. "so only set it if you really need to prefetch images. "
1087	. "This option can be set and unset any time.",
1088	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1417	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1089	);	1418	);
1090		1419
1091	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1420	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092	$table->add (1, 9, new CFClient::UI::Entry	1421	$table->add_at (1, 9, new CFPlus::UI::Entry
1093	text => $CFG->{output_count},	1422	text => $CFG->{output_count},
1094	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1423	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1095	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1424	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1096	);	1425	);
1097		1426
1098	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1427	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099	$table->add (1, 10, new CFClient::UI::Entry	1428	$table->add_at (1, 10, new CFPlus::UI::Entry
1100	text => $CFG->{output_sync},	1429	text => $CFG->{output_sync},
1101	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1430	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1431	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1103	);	1432	);
1104		1433
1105	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1434	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1106	expand => 1,	1435	expand => 1,
1107	align => 0,	1436	align => 0,
1108	text => "Login",	1437	text => "Login",
1109	on_activate => sub {	1438	on_activate => sub {
1110	$CONN ? stop_game	1439	$CONN ? stop_game
1111	: start_game;	1440	: start_game;
		1441	1
		1442	},
		1443	);
		1444
		1445	$vbox->add (new CFPlus::UI::FancyFrame
		1446	label => "Server Info",
		1447	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1448	);
		1449
		1450	$vbox
		1451	}
		1452
		1453	sub client_setup {
		1454	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1455
		1456	my $row = 0;
		1457
		1458	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1459	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		1460	state => $CFG->{show_tips},
		1461	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1462	on_changed => sub {
		1463	my ($self, $value) = @_;
		1464	$CFG->{show_tips} = $value;
		1465	0
		1466	}
		1467	);
		1468
		1469	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
		1470	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
		1471	text => $CFG->{logview_max_par},
		1472	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
		1473	. "sends more messages than this number, older messages get removed to save memory and "
		1474	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
		1475	on_changed => sub {
		1476	my ($self, $value) = @_;
		1477	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1112	0	1478	0
1113	},	1479	},
1114	);	1480	);
1115		1481
1116	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1482	$table
1117	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1118	text => $CFG->{say_command},
1119	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. "
1120	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1121	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1122	on_changed => sub {
1123	my ($self, $value) = @_;
1124	$CFG->{say_command} = $value;
1125	0
1126	}
1127	);
1128
1129	$vbox->add (new CFClient::UI::Label
1130	text => "Server Info",
1131	fontsize => 1.2,
1132	padding_y => 8,
1133	fg => [1, 1, 0, 1],
1134	);
1135
1136	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1137
1138	$vbox
1139	}
1140
1141	sub message_window {
1142	my $window = new CFClient::UI::FancyFrame
1143	name => "message_window",
1144	title => "Messages",
1145	border_bg => [1, 1, 1, 1],
1146	bg => [0, 0, 0, 0.75],
1147	x => "max",
1148	y => 0,
1149	force_w => $::WIDTH * 0.4,
1150	force_h => $::HEIGHT * 0.5,
1151	child => (my $vbox = new CFClient::UI::VBox),
1152	has_close_button => 1;
1153
1154	$vbox->add ($LOGVIEW);
1155
1156	$vbox->add (my $input = new CFClient::UI::Entry
1157	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1158	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1159	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1160	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1161	on_focus_in => sub {
1162	my ($input, $prev_focus) = @_;
1163
1164	delete $input->{refocus_map};
1165
1166	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1167	$input->{refocus_map} = 1;
1168	}
1169	delete $input->{auto_activated};
1170
1171	0
1172	},
1173	on_activate => sub {
1174	my ($input, $text) = @_;
1175	$input->set_text ('');
1176
1177	if ($text =~ /^\/(.*)/) {
1178	$::CONN->user_send ($1);
1179	} else {
1180	my $say_cmd = $::CFG->{say_command} || 'say';
1181	$::CONN->user_send ("$say_cmd $text");
1182	}
1183	if ($input->{refocus_map}) {
1184	delete $input->{refocus_map};
1185	$MAPWIDGET->focus_in
1186	}
1187
1188	0
1189	},
1190	on_escape => sub {
1191	$MAPWIDGET->grab_focus;
1192
1193	0
1194	},
1195	);
1196
1197	$CONSOLE = {
1198	window => $window,
1199	input => $input,
1200	};
1201
1202	$window
1203	}
1204
1205	sub open_quit_dialog {
1206	unless ($QUIT_DIALOG) {
1207	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1208	x => "center",
1209	y => "center",
1210	z => 50,
1211	title => "Really Quit?",
1212	;
1213
1214	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1215
1216	$vb->add (new CFClient::UI::Label
1217	text => "You should find a savebed and apply it first!",
1218	max_w => $WIDTH * 0.25,
1219	ellipsize => 0,
1220	);
1221	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1222	$hb->add (new CFClient::UI::Button
1223	text => "Ok",
1224	expand => 1,
1225	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1226	);
1227	$hb->add (new CFClient::UI::Button
1228	text => "Quit anyway",
1229	expand => 1,
1230	on_activate => sub { exit },
1231	);
1232	}
1233
1234	$QUIT_DIALOG->show;
1235	}	1483	}
1236		1484
1237	sub autopickup_setup {	1485	sub autopickup_setup {
		1486	my $r = new CFPlus::UI::ScrolledWindow (
		1487	expand => 1,
		1488	scroll_y => 1
		1489	);
1238	my $table = new CFClient::UI::Table;	1490	$r->add (my $table = new CFPlus::UI::Table
		1491	row_expand => [0],
		1492	col_expand => [0, 1, 0, 1],
		1493	);
1239		1494
1240	for (	1495	for (
1241	["General", 0, 0,	1496	["General", 0, 0,
1242	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1497	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1243	["Inhibit autopickup" => PICKUP_INHIBIT],	1498	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1257	["Boots" => PICKUP_BOOTS],	1512	["Boots" => PICKUP_BOOTS],
1258	["Gloves" => PICKUP_GLOVES],	1513	["Gloves" => PICKUP_GLOVES],
1259	["Cloaks" => PICKUP_CLOAK],	1514	["Cloaks" => PICKUP_CLOAK],
1260	],	1515	],
1261		1516
1262	["Readables", 2, 2,	1517	["Readables", 2, 0,
1263	["Spellbooks" => PICKUP_SPELLBOOK],	1518	["Spellbooks" => PICKUP_SPELLBOOK],
1264	["Skillscrolls" => PICKUP_SKILLSCROLL],	1519	["Skillscrolls" => PICKUP_SKILLSCROLL],
1265	["Normal Books/Scrolls" => PICKUP_READABLES],	1520	["Normal Books/Scrolls" => PICKUP_READABLES],
1266	],	1521	],
1267	["Misc", 2, 7,	1522	["Misc", 2, 5,
1268	["Food" => PICKUP_FOOD],	1523	["Food" => PICKUP_FOOD],
1269	["Drinks" => PICKUP_DRINK],	1524	["Drinks" => PICKUP_DRINK],
1270	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1525	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1271	["Keys" => PICKUP_KEY],	1526	["Keys" => PICKUP_KEY],
1272	["Magical Items" => PICKUP_MAGICAL],	1527	["Magical Items" => PICKUP_MAGICAL],
1273	["Potions" => PICKUP_POTION],	1528	["Potions" => PICKUP_POTION],
1274	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1529	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1275	["Ignore cursed" => PICKUP_NOT_CURSED],	1530	["Ignore cursed" => PICKUP_NOT_CURSED],
1276	["Jewelery" => PICKUP_JEWELS],	1531	["Jewelery" => PICKUP_JEWELS],
		1532	["Flesh" => PICKUP_FLESH],
1277	],	1533	],
1278	["Weight/Value ratio", 2, 17]	1534	["Weight/Value ratio", 2, 17]
1279	)	1535	)
1280	{	1536	{
1281	my ($title, $x, $y, @bits) = @$_;	1537	my ($title, $x, $y, @bits) = @$_;
1282	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1538	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1283		1539
1284	for (@bits) {	1540	for (@bits) {
1285	++$y;	1541	++$y;
1286		1542
1287	my $mask = $_->[1];	1543	my $mask = $_->[1];
1288	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1544	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1289	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1545	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1290	state => $::CFG->{pickup} & $mask,	1546	state => $::CFG->{pickup} & $mask,
1291	on_changed => sub {	1547	on_changed => sub {
1292	my ($box, $value) = @_;	1548	my ($box, $value) = @_;
1293		1549
1294	if ($value) {	1550	if ($value) {
…		…
1305		1561
1306	${$_->[2]} = $checkbox if $_->[2];	1562	${$_->[2]} = $checkbox if $_->[2];
1307	}	1563	}
1308	}	1564	}
1309		1565
1310	$table->add (2, 18, new CFClient::UI::ValSlider	1566	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1311	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1567	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312	template => ">= 99",	1568	template => ">= 99",
1313	to_value => sub { ">= " . 5 * $_[0] },	1569	to_value => sub { ">= " . 5 * $_[0] },
1314	on_changed => sub {	1570	on_changed => sub {
1315	my ($slider, $value) = @_;	1571	my ($slider, $value) = @_;
…		…
1318	$::CFG->{pickup} |= int $value	1574	$::CFG->{pickup} |= int $value
1319	if $value;	1575	if $value;
1320	1;	1576	1;
1321	});	1577	});
1322		1578
1323	$table->add (3, 18, new CFClient::UI::Button	1579	$table->add_at (3, 18, new CFPlus::UI::Button
1324	text => "set",	1580	text => "set",
1325	on_activate => sub {	1581	on_activate => sub {
1326	$::CONN->send_command ("pickup $::CFG->{pickup}")	1582	$::CONN->send_command ("pickup $::CFG->{pickup}")
1327	if defined $::CONN;	1583	if defined $::CONN;
1328	0	1584	0
1329	});	1585	});
1330		1586
1331	$table	1587	$r
1332	}	1588	}
		1589
		1590	my %SORT_ORDER = (
		1591	type => undef,
		1592	mtime => sub {
		1593	my $NOW = time;
		1594	sort {
		1595	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1596	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1597
		1598	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1599	or $btime <=> $atime
		1600	or $a->{type} <=> $b->{type}
		1601	} @_
		1602	},
		1603	weight => sub { sort {
		1604	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1605	or $a->{type} <=> $b->{type}
		1606	} @_ },
		1607	);
1333		1608
1334	sub inventory_widget {	1609	sub inventory_widget {
1335	my $hb = new CFClient::UI::HBox homogeneous => 1;	1610	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1336		1611
1337	$hb->add (my $vb1 = new CFClient::UI::VBox);	1612	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1338	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1613	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1614
		1615	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1616
		1617	use sort 'stable';
		1618
		1619	$hb1->add (new CFPlus::UI::Selector
		1620	value => $::CFG->{inv_sort},
		1621	options => [
		1622	[type => "Type/Name"],
		1623	[mtime => "Recent/Normal/Locked"],
		1624	[weight => "Weight/Type"],
		1625	],
		1626	on_changed => sub {
		1627	$::CFG->{inv_sort} = $_[1];
		1628	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1629	},
		1630	);
		1631	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1632	#TODO# update to weigh/maxweight
		1633	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1634
		1635	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1339	$vb1->add ($INV = new CFClient::UI::Inventory);	1636	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1637	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1340		1638
1341	$hb->add (my $vb2 = new CFClient::UI::VBox);	1639	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1342		1640
1343	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1641	$vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1344		1642
		1643	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1345	$vb2->add ($INVR = new CFClient::UI::Inventory);	1644	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1346		1645
1347	# XXX: Call after $INVR = ... because set_opencont sets the items	1646	# XXX: Call after $INVR = ... because set_opencont sets the items
1348	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1647	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1349		1648
1350	$hb	1649	$hb
		1650	}
		1651
		1652	sub media_window {
		1653	my $vb = new CFPlus::UI::VBox;
		1654
		1655	$vb->add (new CFPlus::UI::FancyFrame
		1656	label => "Currently playing music",
		1657	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1658	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1659	);
		1660
		1661	$vb->add (new CFPlus::UI::FancyFrame
		1662	label => "Other media used in this session",
		1663	expand => 1,
		1664	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1665	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1666	);
		1667
		1668	$vb
		1669	}
		1670
		1671	sub add_license {
		1672	my ($meta) = @_;
		1673
		1674	$meta = $meta->{data}
		1675	or return;
		1676
		1677	$meta->{license} || $meta->{author} || $meta->{source}
		1678	or return;
		1679
		1680	$LICENSE_WIDGET->add_paragraph ({
		1681	fg => [1, 1, 1, 1],
		1682	markup => "<small>"
		1683	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1684	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1685	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1686	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1687	. "</small>",
		1688	});
		1689	$LICENSE_WIDGET->scroll_to_bottom;
1351	}	1690	}
1352		1691
1353	sub toggle_player_page {	1692	sub toggle_player_page {
1354	my ($widget) = @_;	1693	my ($widget) = @_;
1355		1694
…		…
1360	$PL_WINDOW->show;	1699	$PL_WINDOW->show;
1361	}	1700	}
1362	}	1701	}
1363		1702
1364	sub player_window {	1703	sub player_window {
1365	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1704	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1366	x => "center",	1705	x => "center",
1367	y => "center",	1706	y => "center",
1368	force_w => $WIDTH * 9/10,	1707	force_w => $WIDTH * 9/10,
1369	force_h => $HEIGHT * 9/10,	1708	force_h => $HEIGHT * 9/10,
1370	title => "Player",	1709	title => "Player",
…		…
1372	has_close_button => 1	1711	has_close_button => 1
1373	;	1712	;
1374		1713
1375	my $ntb =	1714	my $ntb =
1376	$PL_NOTEBOOK =	1715	$PL_NOTEBOOK =
1377	new CFClient::UI::Notebook	1716	new CFPlus::UI::Notebook expand => 1;
1378	expand => 1,
1379	debug => 1,
1380	filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381	;
1382		1717
1383	$ntb->add (	1718	$ntb->add_tab (
1384	"Stats" => $STATS_PAGE = stats_window,	1719	"Statistics (F2)" => $STATS_PAGE = stats_window,
1385	"Shows statistics, where all your Stats and Resistances are shown."	1720	"Shows statistics, where all your Stats and Resistances are shown."
1386	);	1721	);
1387	$ntb->add (	1722	$ntb->add_tab (
1388	"Skills" => $STATS_PAGE = skill_window,	1723	"Skills (F3)" => $SKILL_PAGE = skill_window,
1389	"Shows all your Skills."	1724	"Shows all your Skills."
1390	);	1725	);
		1726
		1727	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1728	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1391	$ntb->add (	1729	$ntb->add_tab (
1392	Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,	1730	"Spellbook (F4)" => $spellsw,
1393	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1731	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1394	);	1732	);
1395	$ntb->add (	1733	$ntb->add_tab (
1396	Inventory => $INVENTORY_PAGE = inventory_widget,	1734	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1397	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1735	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1398	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1736	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399	);	1737	);
		1738	$ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
		1739	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1740
		1741	$ntb->add_tab (Media => media_window,
		1742	"License, Author and Source info for media sent by the server.");
1400		1743
1401	$ntb->set_current_page ($INVENTORY_PAGE);	1744	$ntb->set_current_page ($INVENTORY_PAGE);
1402		1745
1403	$plwin->add ($ntb);	1746	$plwin->add ($ntb);
1404	$plwin	1747	$plwin
1405	}	1748	}
1406		1749
1407	sub update_bindings {
1408	$BIND_UPD_CB->() if $BIND_UPD_CB;
1409	}
1410
1411	sub keyboard_setup {	1750	sub keyboard_setup {
1412	my $binding_list = new CFClient::UI::VBox;	1751	CFPlus::Macro::keyboard_setup
1413
1414	my $refresh;
1415	$refresh = $BIND_UPD_CB = sub {
1416	$binding_list->clear ();
1417
1418	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1419	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1420	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1421	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1422
1423	my $lbl = join "; ", @$cmds;
1424	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1425	$binding_list->add (my $hb = new CFClient::UI::HBox);
1426	$hb->add (new CFClient::UI::Button
1427	text => "delete",
1428	tooltip => "Deletes the binding",
1429	on_activate => sub {
1430	$binding_list->remove ($hb);
1431	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432	0
1433	});
1434
1435	$hb->add (new CFClient::UI::Button
1436	text => "edit",
1437	tooltip => "Edits the binding",
1438	on_activate => sub {
1439	$::BIND_EDITOR->set_binding (
1440	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1441	sub {
1442	my ($nmod, $nsym, $ncmds) = @_;
1443	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1444	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1445	$refresh->();
1446	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1447	$SETUP_DIALOG->show;
1448	},
1449	sub {
1450	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1451	$SETUP_DIALOG->show;
1452	});
1453	$::BIND_EDITOR->show;
1454	$SETUP_DIALOG->hide;
1455	0
1456	});
1457
1458	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1459	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1460	}
1461	}
1462	};
1463
1464	my $vb = new CFClient::UI::VBox;
1465	$vb->add (my $hb = new CFClient::UI::HBox);
1466	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1467	$hb->add (new CFClient::UI::CheckBox
1468	expand => 1,
1469	state => $CFG->{shift_fire_stop},
1470	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1471	on_changed => sub {
1472	my ($cbox, $value) = @_;
1473	$CFG->{shift_fire_stop} = $value;
1474	0
1475	});
1476
1477	$vb->add ($binding_list);
1478	$vb->add (my $hb = new CFClient::UI::HBox);
1479
1480	$hb->add (new CFClient::UI::Button
1481	text => "record new",
1482	expand => 1,
1483	tooltip => "This button opens the binding editor with an empty binding.",
1484	on_activate => sub {
1485	$::BIND_EDITOR->set_binding (undef, undef, [],
1486	sub {
1487	my ($mod, $sym, $cmds) = @_;
1488	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1489	$refresh->();
1490	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1491	$SETUP_DIALOG->show;
1492	},
1493	sub {
1494	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1495	$SETUP_DIALOG->show;
1496	},
1497	);
1498	$SETUP_DIALOG->hide;
1499	$::BIND_EDITOR->show;
1500	0
1501	},
1502	);
1503
1504	$hb->add (new CFClient::UI::Button
1505	text => "close",
1506	tooltip => "Closes the binding window",
1507	expand => 1,
1508	on_activate => sub {
1509	$SETUP_DIALOG->hide;
1510	0
1511	}
1512	);
1513
1514	$refresh->();
1515
1516	$vb
1517	}	1752	}
1518		1753
1519	sub help_window {	1754	sub help_window {
1520	my $win = new CFClient::UI::FancyFrame	1755	my $win = new CFPlus::UI::Toplevel
1521	x => 'center',	1756	x => 'center',
1522	y => 'center',	1757	y => 'center',
1523	z => 2,	1758	z => 4,
1524	name => 'doc_browser',	1759	name => 'doc_browser',
1525	force_w => int $WIDTH * 7/8,	1760	force_w => int $WIDTH * 7/8,
1526	force_h => int $HEIGHT * 7/8,	1761	force_h => int $HEIGHT * 7/8,
1527	title => "Help Browser",	1762	title => "Help Browser",
1528	has_close_button => 1;	1763	has_close_button => 1;
1529		1764
1530	$win->add (my $vbox = new CFClient::UI::VBox);	1765	$win->add (my $vbox = new CFPlus::UI::VBox);
1531		1766
1532	$vbox->add (my $buttons = new CFClient::UI::HBox);	1767	$vbox->add (new CFPlus::UI::FancyFrame
		1768	label => "Navigation",
		1769	child => (my $buttons = new CFPlus::UI::HBox),
		1770	);
1533	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1771	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1534	expand => 1, fontsize => 0.8, padding_x => 4);	1772	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1535		1773
1536	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1774	my @history;
1537	$buttons->add (my $combo = new CFClient::UI::Combobox	1775	my @future;
1538	value => undef,	1776	my $curnode;
1539	options => [	1777
1540	[intro => "Introduction"],	1778	my $load_node; $load_node = sub {
1541	[manual => "Main Manual"],	1779	my ($node, $para) = @_;
1542	[skill_help => "Skill Reference"],	1780
1543	[command_help => "Command Reference"],	1781	$buttons->clear;
1544	[dmcommand_help => "DM Commands"],	1782
1545	[COPYING => "License Terms"],	1783	$buttons->add (new CFPlus::UI::Button
1546	],	1784	text => "⇤",
		1785	tooltip => "back to the starting page",
1547	on_changed => sub {	1786	on_activate => sub {
1548	my ($self, $pod) = @_;	1787	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1549		1788	unshift @future, @history;
1550	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1789	@history = ();
1551	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1790	$load_node->(@{shift @future});
1552
1553	$viewer->clear;
1554
1555	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558	# ]);#d#
1559		1791	},
1560	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1792	);
1561	for @$pom;
1562		1793
1563	$viewer->set_offset (0);	1794	if (@history) {
1564		1795	$buttons->add (new CFPlus::UI::Button
		1796	text => "⋘",
		1797	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1798	on_activate => sub {
		1799	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1800	$load_node->(@{pop @history});
		1801	},
1565	0	1802	);
1566	},	1803	}
1567	on_visibility_change => sub {	1804
1568	my ($self, $visible) = @_;	1805	if (@future) {
1569	return unless $visible;	1806	$buttons->add (new CFPlus::UI::Button
1570	return if $self->{value};	1807	text => "⋙",
1571	$self->set_value ("intro");	1808	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1809	on_activate => sub {
		1810	push @history, [$curnode, $viewer->current_paragraph];
		1811	$load_node->(@{shift @future});
		1812	},
1572	0	1813	);
1573	},	1814	}
		1815
		1816	$buttons->add (new CFPlus::UI::Label text => " ");
		1817
		1818	my @path = CFPlus::Pod::full_path_of $node;
		1819	pop @path; # drop current node
		1820
		1821	for my $node (@path) {
		1822	$buttons->add (new CFPlus::UI::Button
		1823	text => $node->{kw}[0],
		1824	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1825	on_activate => sub {
		1826	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1827	$load_node->($node);
		1828	},
		1829	);
		1830	$buttons->add (new CFPlus::UI::Label text => "/");
		1831	}
		1832
		1833	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1834
		1835	$curnode = $node;
		1836
		1837	$viewer->clear;
		1838	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1839	$viewer->scroll_to ($para);
1574	);	1840	};
		1841
		1842	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1843
		1844	$CFPlus::Pod::goto_document = sub {
		1845	my (@path) = @_;
		1846
		1847	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1848
		1849	$load_node->((CFPlus::Pod::find @path)[0]);
		1850	$win->show;
		1851	};
1575		1852
1576	$win	1853	$win
1577	}	1854	}
1578		1855
		1856	sub open_string_query {
		1857	my ($title, $cb, $txt, $tooltip) = @_;
		1858	my $dialog = new CFPlus::UI::Toplevel
		1859	x => "center",
		1860	y => "center",
		1861	z => 50,
		1862	force_w => $WIDTH * 4/5,
		1863	title => $title;
		1864
		1865	$dialog->add (
		1866	my $e = new CFPlus::UI::Entry
		1867	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1868	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1869	tooltip => $tooltip
		1870	);
		1871
		1872	$e->grab_focus;
		1873	$e->set_text ($txt) if $txt;
		1874	$dialog->show;
		1875	}
		1876
		1877	sub open_quit_dialog {
		1878	unless ($QUIT_DIALOG) {
		1879	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1880	x => "center",
		1881	y => "center",
		1882	z => 50,
		1883	title => "Really Quit?",
		1884	on_key_down => sub {
		1885	my ($dialog, $ev) = @_;
		1886	$ev->{sym} == 27 and $dialog->hide;
		1887	}
		1888	;
		1889
		1890	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1891
		1892	$vb->add (new CFPlus::UI::Label
		1893	text => "You should find a savebed and apply it first!",
		1894	max_w => $WIDTH * 0.25,
		1895	ellipsize => 0,
		1896	);
		1897	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1898	$hb->add (new CFPlus::UI::Button
		1899	text => "Ok",
		1900	expand => 1,
		1901	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1902	);
		1903	$hb->add (new CFPlus::UI::Button
		1904	text => "Quit anyway",
		1905	expand => 1,
		1906	on_activate => sub { Event::unloop_all },
		1907	);
		1908	}
		1909
		1910	$QUIT_DIALOG->show;
		1911	$QUIT_DIALOG->grab_focus;
		1912	}
		1913
		1914	sub show_tip_of_the_day {
		1915	# find all tips
		1916	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1917
		1918	CFPlus::DB::get state => "tip_of_the_day", sub {
		1919	my ($todindex) = @_;
		1920	$todindex = 0 if $todindex >= @tod;
		1921	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1922
		1923	# create dialog
		1924	my $dialog;
		1925
		1926	my $close = sub {
		1927	$dialog->destroy;
		1928	};
		1929
		1930	$dialog = new CFPlus::UI::Toplevel
		1931	x => "center",
		1932	y => "center",
		1933	z => 3,
		1934	name => 'tip_of_the_day',
		1935	force_w => int $WIDTH * 4/9,
		1936	force_h => int $WIDTH * 2/9,
		1937	title => "Tip of the day #" . (1 + $todindex),
		1938	child => my $vbox = new CFPlus::UI::VBox,
		1939	has_close_button => 1,
		1940	on_delete => $close,
		1941	;
		1942
		1943	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1944	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1945	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1946
		1947	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1948
		1949	$table->add_at (0, 0, new CFPlus::UI::Button
		1950	text => "Close",
		1951	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1952	on_activate => $close,
		1953	);
		1954
		1955	$table->add_at (2, 0, new CFPlus::UI::Button
		1956	text => "Next",
		1957	tooltip => "Show the next <b>Tip of the day</b>.",
		1958	on_activate => sub {
		1959	$close->();
		1960	&show_tip_of_the_day;
		1961	},
		1962	);
		1963
		1964	$dialog->show;
		1965	};
		1966	}
		1967
1579	sub sdl_init {	1968	sub sdl_init {
1580	CFClient::SDL_Init	1969	CFPlus::SDL_Init
1581	and die "SDL::Init failed!\n";	1970	and die "SDL::Init failed!\n";
1582	}	1971	}
1583		1972
1584	sub video_init {	1973	sub video_init {
1585	sdl_init;
1586
1587	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1974	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1588		1975
1589	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1976	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1590		1977
1591	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1978	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1592	$FULLSCREEN = $CFG->{fullscreen};	1979	$FULLSCREEN = $CFG->{fullscreen};
1593	$FAST = $CFG->{fast};	1980	$FAST = $CFG->{fast};
1594		1981
1595	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1982	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1596	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1983	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1597		1984
1598	$SDL_ACTIVE = 1;	1985	$SDL_ACTIVE = 1;
1599	$LAST_REFRESH = time - 0.01;	1986	$LAST_REFRESH = time - 0.01;
1600		1987
1601	CFClient::OpenGL::init;	1988	CFPlus::OpenGL::init;
		1989	CFPlus::Macro::init;
1602		1990
1603	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1991	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1604		1992
1605	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1993	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1606		1994
1607	#############################################################################	1995	#############################################################################
1608		1996
1609	if ($DEBUG_STATUS) {	1997	if ($DEBUG_STATUS) {
1610	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1998	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1611	} else {	1999	} else {
1612	# create the widgets	2000	# create/configure the widgets
1613		2001
		2002	$CFPlus::UI::ROOT->connect (key_down => sub {
		2003	my (undef, $ev) = @_;
		2004
		2005	if (my @macros = CFPlus::Macro::find $ev) {
		2006	CFPlus::Macro::execute $_ for @macros;
		2007
		2008	return 1;
		2009	}
		2010
		2011	0
		2012	});
		2013
1614	$DEBUG_STATUS = new CFClient::UI::Label	2014	$DEBUG_STATUS = new CFPlus::UI::Label
1615	padding => 0,	2015	padding => 0,
1616	z => 100,	2016	z => 100,
1617	force_x => "max",	2017	force_x => "max",
1618	force_y => 0;	2018	force_y => 0;
1619	$DEBUG_STATUS->show;	2019	$DEBUG_STATUS->show;
1620		2020
1621	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1622
1623	$STATUSBOX = new CFClient::UI::Statusbox;	2021	$STATUSBOX = new CFPlus::UI::Statusbox;
1624	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	2022	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1625		2023
1626	(new CFClient::UI::Frame	2024	(new CFPlus::UI::Frame
1627	bg => [0, 0, 0, 0.4],	2025	bg => [0, 0, 0, 0.4],
1628	force_x => 0,	2026	force_x => 0,
1629	force_y => "max",	2027	force_y => "max",
1630	child => $STATUSBOX,	2028	child => $STATUSBOX,
1631	)->show;	2029	)->show;
1632		2030
1633	CFClient::UI::FancyFrame->new (	2031	CFPlus::UI::Toplevel->new (
1634	title => "Map",	2032	title => "Map",
1635	name => "mapmap",	2033	name => "mapmap",
1636	x => 0,	2034	x => 0,
1637	y => $FONTSIZE + 8,	2035	y => $FONTSIZE + 8,
1638	border_bg => [1, 1, 1, 192/255],	2036	border_bg => [1, 1, 1, 192/255],
1639	bg => [1, 1, 1, 0],	2037	bg => [1, 1, 1, 0],
1640	child => ($MAPMAP = new CFClient::MapWidget::MapMap	2038	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1641	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	2039	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1642	),	2040	),
1643	)->show;	2041	)->show;
1644		2042
1645	$MAPWIDGET = new CFClient::MapWidget;	2043	$MAPWIDGET = new CFPlus::MapWidget;
1646	$MAPWIDGET->connect (activate_console => sub {	2044	$MAPWIDGET->connect (activate_console => sub {
1647	my ($mapwidget, $preset) = @_;	2045	my ($mapwidget, $preset) = @_;
1648		2046
1649	if ($CONSOLE) {	2047	$MESSAGE_WINDOW->activate_console ($preset)
1650	$CONSOLE->{input}->{auto_activated} = 1;	2048	if $MESSAGE_WINDOW;
1651	$CONSOLE->{input}->grab_focus;
1652
1653	if ($preset && $CONSOLE->{input}->get_text eq '') {
1654	$CONSOLE->{input}->set_text ($preset);
1655	}
1656	}
1657	});	2049	});
1658	$MAPWIDGET->show;	2050	$MAPWIDGET->show;
1659	$MAPWIDGET->grab_focus;	2051	$MAPWIDGET->grab_focus;
1660		2052
1661	$LOGVIEW = new CFClient::UI::TextScroller	2053	$COMPLETER = new CFPlus::MapWidget::Command::
1662	expand => 1,	2054	command => { },
1663	font => $FONT_FIXED,	2055	tooltip => "#completer_help",
1664	fontsize => $::CFG->{log_fontsize},
1665	indent => -4,
1666	can_hover => 1,
1667	can_events => 1,
1668	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1669	;	2056	;
1670		2057
1671	$SETUP_DIALOG = new CFClient::UI::FancyFrame	2058	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1672	title => "Setup",	2059	title => "Setup",
1673	name => "setup_dialog",	2060	name => "setup_dialog",
1674	x => 'center',	2061	x => 'center',
1675	y => 'center',	2062	y => 'center',
1676	z => 2,	2063	z => 2,
…		…
1678	force_h => $::HEIGHT * 0.6,	2065	force_h => $::HEIGHT * 0.6,
1679	has_close_button => 1,	2066	has_close_button => 1,
1680	;	2067	;
1681		2068
1682	$METASERVER = metaserver_dialog;	2069	$METASERVER = metaserver_dialog;
		2070	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1683		2071
1684	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	2072	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1685	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	2073	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1686		2074
1687	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	2075	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1688	"Configure the server to play on, your username, password and other server-related options.");	2076	"Configure the server to play on, your username, password and other server-related options.");
1689	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	2077	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1690	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	2078	"Configure various client-specific settings.");
1691	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	2079	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1692	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	2080	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1693	$SETUP_NOTEBOOK->add (Audio => audio_setup,	2081	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1694	"Configure the use of audio, sound effects and background music.");	2082	"Configure the use of audio, sound effects and background music.");
1695	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	2083	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1696	"Lets you define, edit and delete key bindings."	2084	"Lets you define, edit and delete key bindings."
1697	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	2085	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1698	. "with nothing set and the recording started. After doing the actions you "	2086	. "with nothing set and the recording started. After doing the actions you "
1699	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	2087	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1700	. "After pressing the combo the binding will be saved automatically and the "	2088	. "After pressing the combo the binding will be saved automatically and the "
1701	. "binding editor closes");	2089	. "binding editor closes");
1702	$SETUP_NOTEBOOK->add (Debug => debug_setup,	2090	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1703	"Some debuggin' options. Do not ask.");	2091	"Some debuggin' options. Do not ask.");
1704		2092
1705	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2093	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1706		2094
1707	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2095	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1708	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2096	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1709		2097
1710	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	2098	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1711	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2099	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1712		2100
1713	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	2101	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
1714		2102
1715	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	2103	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1716	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	2104	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1717		2105
1718	$BUTTONBAR->add (new CFClient::UI::Button	2106	$BUTTONBAR->add (new CFPlus::UI::Button
1719	text => "Save Config",	2107	text => "Save Config",
1720	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	2108	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1721	on_activate => sub {	2109	on_activate => sub {
1722	$::CFG->{layout} = CFClient::UI::get_layout;	2110	$::CFG->{layout} = CFPlus::UI::get_layout;
1723	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	2111	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1724	status "Configuration Saved";	2112	status "Configuration Saved";
1725	0	2113	0
1726	},	2114	},
1727	);	2115	);
1728		2116
1729	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	2117	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1730	tooltip => "View Documentation");	2118	tooltip => "View Documentation");
1731		2119
		2120
1732	$BUTTONBAR->add (new CFClient::UI::Button	2121	$BUTTONBAR->add (new CFPlus::UI::Button
1733	text => "Quit",	2122	text => "Quit",
1734	tooltip => "Terminates the program",	2123	tooltip => "Terminates the program",
1735	on_activate => sub {	2124	on_activate => sub {
1736	if ($CONN) {	2125	if ($CONN) {
1737	open_quit_dialog;	2126	open_quit_dialog;
1738	} else {	2127	} else {
1739	exit;	2128	Event::unloop_all;
1740	}	2129	}
1741	0	2130	0
1742	},	2131	},
1743	);	2132	);
1744		2133
1745	$BUTTONBAR->show;	2134	$BUTTONBAR->show;
1746	$SETUP_DIALOG->show;	2135	$SETUP_DIALOG->show;
		2136	$MESSAGE_WINDOW->show;
1747	}	2137	}
1748		2138
1749	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2139	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1750	}	2140	}
1751		2141
1752	sub video_shutdown {	2142	sub video_shutdown {
1753	CFClient::OpenGL::shutdown;	2143	CFPlus::OpenGL::shutdown;
1754		2144
1755	undef $SDL_ACTIVE;	2145	undef $SDL_ACTIVE;
1756	}	2146	}
1757		2147
1758	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1759	my $bgmusic;#TODO#hack#d#
1760
1761	sub audio_channel_finished {
1762	my ($channel) = @_;
1763
1764	#warn "channel $channel finished\n";#d#
1765	}
1766
1767	sub audio_music_finished {
1768	return unless $CFG->{bgm_enable};
1769
1770	# TODO: hack, do play loop and mood music
1771	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1772	$bgmusic->play (0);
1773
1774	push @bgmusic, shift @bgmusic;
1775	}
1776
1777	sub audio_init {
1778	if ($CFG->{audio_enable}) {
1779	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
1780	$SDL_MIXER = !CFClient::Mix_OpenAudio;
1781
1782	unless ($SDL_MIXER) {
1783	status "Unable to open sound device: there will be no sound";
1784	return;
1785	}
1786
1787	CFClient::Mix_AllocateChannels 8;
1788	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1789
1790	audio_music_finished;
1791
1792	while (<$fh>) {
1793	next if /^\s*#/;
1794	next if /^\s*$/;
1795
1796	my ($file, $volume, $event) = split /\s+/, $_, 3;
1797
1798	push @SOUNDS, "$volume,$file";
1799
1800	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1801	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1802	$chunk->volume ($volume * 128 / 100);
1803	$chunk
1804	};
1805	}
1806	} else {
1807	status "unable to open sound config: $!";
1808	}
1809	}
1810	}
1811
1812	sub audio_shutdown {
1813	CFClient::Mix_CloseAudio if $SDL_MIXER;
1814	undef $SDL_MIXER;
1815	@SOUNDS = ();
1816	%AUDIO_CHUNKS = ();
1817	}
1818
1819	my %animate_object;	2148	my %animate_object;
1820	my $animate_timer;	2149	my $animate_timer;
1821		2150
1822	my $fps = 9;	2151	my $fps = 9;
1823		2152
1824	my %demo;#d#
1825
1826	sub force_refresh {	2153	sub force_refresh {
		2154	if ($ENV{CFPLUS_DEBUG} & 4) {
1827	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2155	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1828	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2156	debug sprintf "%3.2f", $fps;
		2157	}
1829		2158
1830	$CFClient::UI::ROOT->draw;	2159	$CFPlus::UI::ROOT->draw;
1831		2160	CFPlus::SDL_GL_SwapBuffers;
1832	$WANT_REFRESH = 0;
1833	$CAN_REFRESH = 0;
1834	$LAST_REFRESH = $NOW;	2161	$LAST_REFRESH = $NOW;
1835
1836	0 && do {
1837	# some weird model-drawing code, just a joke right now
1838	use CFClient::OpenGL;
1839
1840	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1841	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1842	$demo{r} ||= do {
1843	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1844	$mod->{v} = pack "f*", @{$mod->{v}};
1845	$_ = [scalar @$_, pack "S!*", @$_]
1846	for values %{$mod->{g}};
1847	$mod
1848	};
1849
1850	my $r = $demo{r} or die;
1851
1852	glDepthMask 1;
1853	glClear GL_DEPTH_BUFFER_BIT;
1854	glEnable GL_TEXTURE_2D;
1855	glEnable GL_DEPTH_TEST;
1856	glEnable GL_CULL_FACE;
1857	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1858
1859	glMatrixMode GL_PROJECTION;
1860	glLoadIdentity;
1861	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1862	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1863	glMatrixMode GL_MODELVIEW;
1864	glLoadIdentity;
1865
1866	glPushMatrix;
1867	glTranslate 0, 0, -800;
1868	glScale 1, -1, 1;
1869	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1870	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1871	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1872	glScale 50, 50, 50;
1873
1874	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1875	while (my ($k, $v) = each %{$r->{g}}) {
1876	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1877	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1878	}
1879
1880	glPopMatrix;
1881
1882	glShadeModel GL_FLAT;
1883	glDisable GL_DEPTH_TEST;
1884	glDisable GL_TEXTURE_2D;
1885	glDepthMask 0;
1886
1887	$WANT_REFRESH++;	2162	$WANT_REFRESH->stop;
1888	};
1889
1890	CFClient::SDL_GL_SwapBuffers;
1891	}	2163	}
1892		2164
		2165	$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
		2166
1893	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2167	my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1894	$NOW = time;	2168	$NOW = time;
1895		2169
1896	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2170	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1897	for CFClient::SDL_PollEvent;	2171	for CFPlus::poll_events;
1898		2172
1899	if (%animate_object) {	2173	if (%animate_object) {
1900	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2174	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1901	$WANT_REFRESH++;	2175	$WANT_REFRESH->start;
1902	}
1903
1904	if ($WANT_REFRESH) {
1905	force_refresh;
1906	} else {
1907	$CAN_REFRESH = 1;
1908	}	2176	}
1909	});	2177	});
1910		2178
1911	sub animation_start {	2179	sub animation_start {
1912	my ($widget) = @_;	2180	my ($widget) = @_;
…		…
1916	sub animation_stop {	2184	sub animation_stop {
1917	my ($widget) = @_;	2185	my ($widget) = @_;
1918	delete $animate_object{$widget};	2186	delete $animate_object{$widget};
1919	}	2187	}
1920		2188
1921	# check once/second for faces that need to be prefetched
1922	# this should, of course, only run on demand, but
1923	# SDL forces worse things on us....
1924
1925	Event->timer (after => 1, interval => 0.25, cb => sub {
1926	$CONN->face_prefetch
1927	if $CONN;
1928	});
1929
1930	%SDL_CB = (	2189	%SDL_CB = (
1931	CFClient::SDL_QUIT => sub {	2190	CFPlus::SDL_QUIT => sub {
1932	Event::unloop -1;	2191	Event::unloop_all;
1933	},	2192	},
1934	CFClient::SDL_VIDEORESIZE => sub {	2193	CFPlus::SDL_VIDEORESIZE => sub {
1935	},	2194	},
1936	CFClient::SDL_VIDEOEXPOSE => sub {	2195	CFPlus::SDL_VIDEOEXPOSE => sub {
1937	CFClient::UI::full_refresh;	2196	CFPlus::UI::full_refresh;
1938	},	2197	},
1939	CFClient::SDL_ACTIVEEVENT => sub {	2198	CFPlus::SDL_ACTIVEEVENT => sub {
1940	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2199	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2200	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2201	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2202	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2203	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2204	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1941	},	2205	},
1942	CFClient::SDL_KEYDOWN => sub {	2206	CFPlus::SDL_KEYDOWN => sub {
1943	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2207	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1944	# alt-enter	2208	# alt-enter
		2209	$FULLSCREEN_ENABLE->toggle;
1945	video_shutdown;	2210	video_shutdown;
1946	$CFG->{fullscreen} = !$CFG->{fullscreen};
1947	video_init;	2211	video_init;
1948	} else {	2212	} else {
1949	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2213	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1950	}	2214	}
1951	},	2215	},
1952	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2216	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1953	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2217	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1954	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2218	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1955	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2219	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1956	CFClient::SDL_USEREVENT => sub {	2220	CFPlus::SDL_USEREVENT => sub {
1957	if ($_[0]{code} == 1) {	2221	if ($_[0]{code} == 1) {
1958	audio_channel_finished $_[0]{data1};	2222	audio_channel_finished $_[0]{data1};
1959	} elsif ($_[0]{code} == 0) {	2223	} elsif ($_[0]{code} == 0) {
1960	audio_music_finished;	2224	audio_music_finished;
1961	}	2225	}
…		…
1965	#############################################################################	2229	#############################################################################
1966		2230
1967	$SIG{INT} = $SIG{TERM} = sub { exit };	2231	$SIG{INT} = $SIG{TERM} = sub { exit };
1968		2232
1969	{	2233	{
1970	local $SIG{__DIE__} = sub {
1971	return unless defined $^S && !$^S;
1972	Carp::confess $_[1];#d#TODO: remove when stable
1973	CFClient::fatal $_[0];
1974	};
1975
1976	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2234	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2235	CFPlus::DB::Server::run;
		2236
1977	CFClient::UI::set_layout ($::CFG->{layout});	2237	CFPlus::UI::set_layout ($::CFG->{layout});
1978		2238
1979	my %DEF_CFG = (	2239	my %DEF_CFG = (
1980	sdl_mode => 0,	2240	sdl_mode => 0,
1981	width => 640,
1982	height => 480,
1983	fullscreen => 0,	2241	fullscreen => 0,
1984	fast => 0,	2242	fast => 0,
		2243	force_opengl11 => undef,
		2244	texture_compression => 1,
1985	map_scale => 1,	2245	map_scale => 1,
1986	fow_enable => 1,	2246	fow_enable => 1,
1987	fow_intensity => 0.45,	2247	fow_intensity => 0,
1988	fow_smooth => 0,	2248	map_smoothing => 1,
1989	gui_fontsize => 1,	2249	gui_fontsize => 1,
1990	log_fontsize => 0.7,	2250	log_fontsize => 0.7,
1991	gauge_fontsize => 1,	2251	gauge_fontsize => 1,
1992	gauge_size => 0.35,	2252	gauge_size => 0.35,
1993	stat_fontsize => 0.7,	2253	stat_fontsize => 0.7,
1994	mapsize => 100,	2254	mapsize => 100,
1995	say_command => 'say',
1996	audio_enable => 1,	2255	audio_enable => 1,
		2256	effects_enable => 1,
		2257	effects_volume => 1,
1997	bgm_enable => 1,	2258	bgm_enable => 1,
1998	bgm_volume => 0.25,	2259	bgm_volume => 0.5,
1999	face_prefetch => 0,
2000	output_sync => 1,	2260	output_sync => 1,
2001	output_count => 1,	2261	output_count => 1,
		2262	output_rate => "",
2002	pickup => 0,	2263	pickup => 0,
		2264	inv_sort => "mtime",
2003	default => "profile", # default profile	2265	default => "profile", # default profile
		2266	show_tips => 1,
		2267	logview_max_par => 1000,
2004	);	2268	);
2005		2269
2006	while (my ($k, $v) = each %DEF_CFG) {	2270	while (my ($k, $v) = each %DEF_CFG) {
2007	$CFG->{$k} = $v unless exists $CFG->{$k};	2271	$CFG->{$k} = $v unless exists $CFG->{$k};
2008	}	2272	}
2009		2273
2010	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2274	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2275	$PROFILE = $CFG->{profile}{default};
		2276
		2277	# convert old bindings (only default profile matters)
		2278	if (my $bindings = delete $PROFILE->{bindings}) {
		2279	while (my ($mod, $syms) = each %$bindings) {
		2280	while (my ($sym, $cmds) = each %$syms) {
		2281	push @{ $PROFILE->{macro} }, {
		2282	accelkey => [$mod*1, $sym*1],
		2283	action => $cmds,
		2284	};
		2285	}
		2286	}
		2287	}
2011		2288
2012	sdl_init;	2289	sdl_init;
2013		2290
2014	@SDL_MODES = reverse	2291	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2015	grep $_->[0] >= 640 && $_->[1] >= 480,	2292	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2016	CFClient::SDL_ListModes;
2017
2018	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2293	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2294
		2295	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2019		2296
2020	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2297	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021		2298
2022	{	2299	{
2023	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2300	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024	DejaVuSans.ttf	2301	DejaVuSans.ttf
2025	DejaVuSansMono.ttf	2302	DejaVuSansMono.ttf
2026	DejaVuSans-Bold.ttf	2303	DejaVuSans-Bold.ttf
2027	DejaVuSansMono-Bold.ttf	2304	DejaVuSansMono-Bold.ttf
2028	DejaVuSans-Oblique.ttf	2305	DejaVuSans-Oblique.ttf
2029	DejaVuSansMono-Oblique.ttf	2306	DejaVuSansMono-Oblique.ttf
2030	DejaVuSans-BoldOblique.ttf	2307	DejaVuSans-BoldOblique.ttf
2031	DejaVuSansMono-BoldOblique.ttf	2308	DejaVuSansMono-BoldOblique.ttf
2032	);	2309	);
2033		2310
2034	CFClient::add_font $_ for @fonts;	2311	CFPlus::add_font $_ for @fonts;
2035		2312
2036	CFClient::pango_init;	2313	CFPlus::pango_init;
2037		2314
2038	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2315	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2316	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040		2317
2041	$FONT_PROP->make_default;	2318	$FONT_PROP->make_default;
2042	}	2319	}
2043		2320
2044	# compare mono (ft) vs. rgba (cairo)	2321	# compare mono (ft) vs. rgba (cairo)
2045	# ft - 1.8s, cairo 3s, even in alpha-only mode	2322	# ft - 1.8s, cairo 3s, even in alpha-only mode
2046	# for my $rgba (0..1) {	2323	# for my $rgba (0..1) {
2047	# my $t1 = Time::HiRes::time;	2324	# my $t1 = Time::HiRes::time;
2048	# for (1..1000) {	2325	# for (1..1000) {
2049	# my $layout = CFClient::Layout->new ($rgba);	2326	# my $layout = CFPlus::Layout->new ($rgba);
2050	# $layout->set_text ("hallo" x 100);	2327	# $layout->set_text ("hallo" x 100);
2051	# $layout->render;	2328	# $layout->render;
2052	# }	2329	# }
2053	# my $t2 = Time::HiRes::time;	2330	# my $t2 = Time::HiRes::time;
2054	# warn $t2-$t1;	2331	# warn $t2-$t1;
…		…
2056		2333
2057	video_init;	2334	video_init;
2058	audio_init;	2335	audio_init;
2059	}	2336	}
2060		2337
		2338	show_tip_of_the_day if $CFG->{show_tips};
		2339
		2340	Event->idle (cb => sub {
		2341	$_[0]->w->cancel;
		2342	$startup_done->();
		2343	});
		2344
2061	Event::loop;	2345	Event::loop;
		2346
		2347	#video_shutdown;
		2348	#audio_shutdown;
2062	#CFClient::SDL_Quit;	2349	CFPlus::SDL_Quit;
2063	#CFClient::_exit 0;	2350	CFPlus::DB::Server::stop;
2064
2065	END { CFClient::SDL_Quit }
2066		2351
2067	=head1 NAME	2352	=head1 NAME
2068		2353
2069	cfplus - A Crossfire+ and Crossfire game client	2354	cfplus - A Crossfire TRT and Crossfire game client
2070		2355
2071	=head1 SYNOPSIS	2356	=head1 SYNOPSIS
2072		2357
2073	Just run it - no commandline arguments are supported.	2358	Just run it - no commandline arguments are supported.
2074		2359
2075	=head1 USAGE	2360	=head1 USAGE
2076		2361
2077	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	2362	cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2078	fullscreen and interactively.	2363	be used in fullscreen mode and interactively.
2079		2364
2080	=head1 DEBUGGING	2365	=head1 DEBUGGING
2081		2366
2082		2367
2083	CFPLUS_DEBUG - environment variable	2368	CFPLUS_DEBUG - environment variable

Diff Legend

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