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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.103 by root, Mon Jul 24 08:23:28 2006 UTC vs. Revision 1.200 by root, Thu Aug 2 14:35:21 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.200 by root, Thu Aug 2 14:35:21 2007 UTC