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

Diff Legend

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