ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.6 by root, Mon Dec 3 22:37:10 2007 UTC vs.
Revision 1.19 by root, Thu Dec 27 18:35:56 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	if ($ENV{DELIANTRA_CORO_DEBUG}) {
		4	eval '
		5	use Coro;
		6	use Coro::EV;
		7	use Coro::Debug;
		8	our $debug = new_unix_server Coro::Debug "/tmp/dc";
		9	';
		10	}
2		11
3	# do splash-screen thingy on win32	12	# do splash-screen thingy on win32
4	my $startup_done = sub { };	13	my $startup_done = sub { };
5	BEGIN {	14	BEGIN {
6	if (%PAR::LibCache && $^O eq "MSWin32") {	15	if (%PAR::LibCache && $^O eq "MSWin32") {
…		…
66		75
67	unshift @INC, $root;	76	unshift @INC, $root;
68	}	77	}
69	}	78	}
70		79
		80	# prepend private library directory
		81	BEGIN {
		82	for (grep !ref, @INC) {
		83	my $path = "$_/Deliantra/Client/private/dc";
		84	if (-d $path) {
		85	unshift @INC, $path;
		86	last;
		87	}
		88	}
		89	}
		90
71	# need to do it again because that pile of garbage called PAR nukes it before main	91	# need to do it again because that pile of garbage called PAR nukes it before main
72	unshift @INC, $ENV{PAR_TEMP}	92	unshift @INC, $ENV{PAR_TEMP}
73	if %PAR::LibCache;	93	if %PAR::LibCache;
74		94
75	use Time::HiRes 'time';	95	use Time::HiRes 'time';
76	use EV;	96	use EV;
77	use List::Util qw(max min);	97	use List::Util qw(max min);
78		98
79	use Crossfire;	99	use Deliantra;
80	use Crossfire::Protocol::Constants;	100	use Deliantra::Protocol::Constants;
81		101
82	use Compress::LZF;	102	use Compress::LZF;
83		103
84	use CFPlus;	104	use DC;
85	use CFPlus::OpenGL ();	105	use DC::OpenGL ();
86	use CFPlus::Protocol;	106	use DC::Protocol;
87	use CFPlus::DB;	107	use DC::DB;
88	use CFPlus::UI;	108	use DC::UI;
89	use CFPlus::UI::Canvas;	109	use DC::UI::Canvas;
90	use CFPlus::UI::Inventory;	110	use DC::UI::Inventory;
91	use CFPlus::UI::SpellList;	111	use DC::UI::SpellList;
92	use CFPlus::UI::Dockable;	112	use DC::UI::Dockable;
93	use CFPlus::UI::MessageWindow;	113	use DC::UI::MessageWindow;
94	use CFPlus::UI::ChatView;	114	use DC::UI::ChatView;
95	use CFPlus::Pod;	115	use DC::Pod;
96	use CFPlus::MapWidget;	116	use DC::MapWidget;
97	use CFPlus::Macro;	117	use DC::Macro;
98		118
99	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	119	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
100	$SIG{PIPE} = 'IGNORE';	120	$SIG{PIPE} = 'IGNORE';
101		121
102	$EV::DIED = sub {	122	$EV::DIED = sub {
103	CFPlus::fatal Carp::longmess $@;	123	DC::fatal Carp::longmess $@;
104	};	124	};
105		125
106	my $MAX_FPS = 60;	126	my $MAX_FPS = 60;
107	my $MIN_FPS = 5; # unused as of yet
108		127
109	our $META_SERVER = "http://metaserver.schmorp.de/current.json";	128	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
110		129
111	our $LAST_REFRESH;	130	our $LAST_REFRESH;
112	our $NOW;	131	our $NOW;
…		…
177	our $INVR_HB;	196	our $INVR_HB;
178		197
179	#############################################################################	198	#############################################################################
180		199
181	sub status {	200	sub status {
182	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	201	$STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
183	}	202	}
184		203
185	sub debug {	204	sub debug {
186	$DEBUG_STATUS->set_text ($_[0]);	205	$DEBUG_STATUS->set_text ($_[0]);
187	}	206	}
…		…
225		244
226	if (my $chunk = $AUDIO_CHUNK{$face}) {	245	if (my $chunk = $AUDIO_CHUNK{$face}) {
227	for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {	246	for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
228	my (undef, $dx, $dy, $vol) = @$_;	247	my (undef, $dx, $dy, $vol) = @$_;
229		248
230	my $channel = CFPlus::Channel::find;	249	my $channel = DC::Channel::find;
231	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);	250	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
232	$channel->set_position_r ($dx, $dy, 20);	251	$channel->set_position_r ($dx, $dy, 20);
233	$chunk->play ($channel);	252	$chunk->play ($channel);
234	}	253	}
235	} else {	254	} else {
…		…
246	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue	265	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
247	&audio_music_push ($face);	266	&audio_music_push ($face);
248	}	267	}
249	} else {	268	} else {
250	# fetch from database	269	# fetch from database
251	CFPlus::DB::get res_data => $meta->{name}, sub {	270	DC::DB::get res_data => $meta->{name}, sub {
252	my $rwops = new CFPlus::RW $_[0];	271	my $rwops = new DC::RW $_[0];
253	my $chunk = new CFPlus::MixChunk $rwops	272	my $chunk = new DC::MixChunk $rwops
254	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;	273	or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;
255	$chunk->volume (($meta->{data}{volume} || 1) * 128);	274	$chunk->volume (($meta->{data}{volume} || 1) * 128);
256	$AUDIO_CHUNK{$face} = $chunk;	275	$AUDIO_CHUNK{$face} = $chunk;
257		276
258	audio_sound_push ($face);	277	audio_sound_push ($face);
259	};	278	};
…		…
278	sub audio_music_set_meta {	297	sub audio_music_set_meta {
279	my ($meta) = @_;	298	my ($meta) = @_;
280		299
281	$MUSIC_PLAYING_META = $meta;	300	$MUSIC_PLAYING_META = $meta;
282	$MUSIC_PLAYING_WIDGET->set_markup (	301	$MUSIC_PLAYING_WIDGET->set_markup (
283	"<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"	302	"<b>Name</b>: " . (DC::asxml $meta->{data}{name}) . "\n"
284	. "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"	303	. "<b>Author</b>: " . (DC::asxml $meta->{data}{author}) . "\n"
285	. "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"	304	. "<b>Source</b>: " . (DC::asxml $meta->{data}{source}) . "\n"
286	. "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})	305	. "<b>License</b>: " . (DC::asxml $meta->{data}{license})
287	);	306	);
288	}	307	}
289		308
290	sub audio_music_update_volume {	309	sub audio_music_update_volume {
291	return unless $MUSIC_PLAYING_META;	310	return unless $MUSIC_PLAYING_META;
292	my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;	311	my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
293	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};	312	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
294	CFPlus::MixMusic::volume $base * $volume * 128;	313	DC::MixMusic::volume $base * $volume * 128;
295	}	314	}
296		315
297	sub audio_music_start {	316	sub audio_music_start {
298	my $meta = $MUSIC_PLAYING_META;	317	my $meta = $MUSIC_PLAYING_META;
299		318
300	CFPlus::DB::get res_data => $meta->{name}, sub {	319	DC::DB::get res_data => $meta->{name}, sub {
301	return unless $SDL_MIXER;	320	return unless $SDL_MIXER;
302		321
303	# music might have changed...	322	# music might have changed...
304	$meta eq $MUSIC_PLAYING_META	323	$meta eq $MUSIC_PLAYING_META
305	or return &audio_music_start ();	324	or return &audio_music_start ();
…		…
307	audio_music_update_volume;	326	audio_music_update_volume;
308		327
309	$MUSIC_PLAYING_DATA = \$_[0];	328	$MUSIC_PLAYING_DATA = \$_[0];
310		329
311	my $rwops = $meta->{path}	330	my $rwops = $meta->{path}
312	? new_from_file CFPlus::RW $meta->{path}	331	? new_from_file DC::RW $meta->{path}
313	: new CFPlus::RW $$MUSIC_PLAYING_DATA;	332	: new DC::RW $$MUSIC_PLAYING_DATA;
314		333
315	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops	334	$MUSIC_PLAYER = new DC::MixMusic $rwops
316	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;	335	or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
317		336
318	my $NOW = time;	337	my $NOW = time;
319		338
320	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {	339	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
321	my $pos = $MUSIC_PLAYING_META->{stop_pos};	340	my $pos = $MUSIC_PLAYING_META->{stop_pos};
…		…
335	return unless $SDL_MIXER;	354	return unless $SDL_MIXER;
336		355
337	my $fade_out;	356	my $fade_out;
338		357
339	if (@MUSIC_JINGLE) {	358	if (@MUSIC_JINGLE) {
		359	$fade_out = 333;
340	@MUSIC_HAVE = $MUSIC_JINGLE[0];	360	@MUSIC_HAVE = $MUSIC_JINGLE[0];
341	$fade_out = 333;	361
342	} else {	362	} else {
343	return unless $CFG->{bgm_enable};	363	return unless $CFG->{bgm_enable};
344		364
345	my @have =	365	$fade_out = 700;
		366
		367	@MUSIC_HAVE =
346	grep $_ && $_->{data},	368	grep $_ && $_->{data},
347	map $CONN->{face}[$_],	369	map $CONN->{face}[$_],
348	@$MUSIC_WANT;	370	@$MUSIC_WANT;
349		371
350	# randomize music a bit so that the order is not always the same	372	# randomize music a bit so that the order is not always the same
351	$_->{stop_time} ||= rand for @have;	373	$_->{stop_time} ||= rand for @MUSIC_HAVE;
352
353	@MUSIC_HAVE = @have
354	if @have;
355		374
356	# default MUSIC_HAVE == MUSIC_DEFAULT	375	# default MUSIC_HAVE == MUSIC_DEFAULT
357	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;	376	@MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
358	$fade_out = 700;	377	unless @MUSIC_HAVE;
359	}	378	}
360		379
361	# if the currently playing song is acceptable, let it continue	380	# if the currently playing song is acceptable, let it continue
362	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;	381	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
363		382
364	my $NOW = time;	383	my $NOW = time;
365		384
366	if ($MUSIC_PLAYING_META) {	385	if ($MUSIC_PLAYING_META) {
367	$MUSIC_PLAYING_META->{stop_time} = $NOW;	386	$MUSIC_PLAYING_META->{stop_time} = $NOW;
368	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;	387	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
369	CFPlus::MixMusic::fade_out $fade_out;	388	DC::MixMusic::fade_out $fade_out;
370	} else {	389	} else {
371	# sort by stop time, oldest first	390	# sort by stop time, oldest first
372	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;	391	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
373		392
374	# if the most recently-played piece played very recently,	393	# if the most recently-played piece played very recently,
…		…
408	}	427	}
409		428
410	sub audio_init {	429	sub audio_init {
411	if ($CFG->{audio_enable}) {	430	if ($CFG->{audio_enable}) {
412	$ENV{MIX_EFFECTSMAXSPEED} = 1;	431	$ENV{MIX_EFFECTSMAXSPEED} = 1;
413	$SDL_MIXER = !CFPlus::Mix_OpenAudio	432	$SDL_MIXER = !DC::Mix_OpenAudio
414	$CFG->{audio_hw_frequency},	433	$CFG->{audio_hw_frequency},
415	CFPlus::MIX_DEFAULT_FORMAT,	434	DC::MIX_DEFAULT_FORMAT,
416	$CFG->{audio_hw_channels},	435	$CFG->{audio_hw_channels},
417	$CFG->{audio_hw_chunksize};	436	$CFG->{audio_hw_chunksize};
418		437
419	if ($SDL_MIXER) {	438	if ($SDL_MIXER) {
420	CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};	439	DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
421		440
422	audio_music_finished;	441	audio_music_finished;
423	} else {	442	} else {
424	status "Unable to open sound device: there will be no sound";	443	status "Unable to open sound device: there will be no sound";
425	}	444	}
…		…
439	$MUSIC_WANT = [];	458	$MUSIC_WANT = [];
440	@MUSIC_JINGLE = ();	459	@MUSIC_JINGLE = ();
441	%AUDIO_PLAY = ();	460	%AUDIO_PLAY = ();
442	%AUDIO_CHUNK = ();	461	%AUDIO_CHUNK = ();
443		462
444	CFPlus::Mix_CloseAudio if $SDL_MIXER;	463	DC::Mix_CloseAudio if $SDL_MIXER;
445	undef $SDL_MIXER;	464	undef $SDL_MIXER;
446	}	465	}
447		466
448	#############################################################################	467	#############################################################################
449		468
…		…
460	my ($conn, $flags, $prompt) = @_;	479	my ($conn, $flags, $prompt) = @_;
461		480
462	# FIXME: a very ugly hack to wait for stat update #d#	481	# FIXME: a very ugly hack to wait for stat update #d#
463	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {	482	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
464	unless ($QUERY_TIMER) {	483	unless ($QUERY_TIMER) {
465	$QUERY_TIMER =
466	EV::timer 1, 0, sub {	484	$QUERY_TIMER = EV::timer 1, 0, sub {
467	server_query ($conn, $flags, $prompt, 1);	485	server_query ($conn, $flags, $prompt, 1);
468	$QUERY_TIMER = undef	486	$QUERY_TIMER = undef
469	};	487	};
		488
470	return;	489	return;
471	}	490	}
472	}	491	}
473		492
474	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel	493	$conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
475	x => "center",	494	x => "center",
476	y => "center",	495	y => "center",
477	title => "Server Query",	496	title => "Server Query",
478	child => my $vbox = new CFPlus::UI::VBox,	497	child => my $vbox = new DC::UI::VBox,
479	;	498	;
480		499
481	my @dialog = my $label = new CFPlus::UI::Label	500	my @dialog = my $label = new DC::UI::Label
482	max_w => $::WIDTH * 0.8,	501	max_w => $::WIDTH * 0.8,
483	ellipsise => 0,	502	ellipsise => 0,
484	text => $prompt;	503	text => $prompt;
485		504
486	if ($flags & CS_QUERY_YESNO) {	505	if ($flags & CS_QUERY_YESNO) {
487	push @dialog, my $hbox = new CFPlus::UI::HBox;	506	push @dialog, my $hbox = new DC::UI::HBox;
488		507
489	$hbox->add (new CFPlus::UI::Button	508	$hbox->add (new DC::UI::Button
490	text => "No",	509	text => "No",
491	on_activate => sub {	510	on_activate => sub {
492	$conn->send ("reply n");	511	$conn->send ("reply n");
493	$dialog->destroy;	512	$dialog->destroy;
494	0	513	0
495	}	514	}
496	);	515	);
497	$hbox->add (new CFPlus::UI::Button	516	$hbox->add (new DC::UI::Button
498	text => "Yes",	517	text => "Yes",
499	on_activate => sub {	518	on_activate => sub {
500	$conn->send ("reply y");	519	$conn->send ("reply y");
501	destroy_query_dialog $conn;	520	destroy_query_dialog $conn;
502	0	521	0
…		…
507		526
508	} elsif ($flags & CS_QUERY_SINGLECHAR) {	527	} elsif ($flags & CS_QUERY_SINGLECHAR) {
509	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	528	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
510	$dialog->{tooltip} = "#charcreation_focus";	529	$dialog->{tooltip} = "#charcreation_focus";
511		530
512	unshift @dialog, new CFPlus::UI::Label	531	unshift @dialog, new DC::UI::Label
513	max_w => $::WIDTH * 0.8,	532	max_w => $::WIDTH * 0.8,
514	ellipsise => 0,	533	ellipsise => 0,
515	markup => "\nOr use your keyboard and the text entry below:\n";	534	markup => "\nOr use your keyboard and the text entry below:\n";
516		535
517	unshift @dialog, my $table = new CFPlus::UI::Table;	536	unshift @dialog, my $table = new DC::UI::Table;
518		537
519	$table->add_at (0, 0, new CFPlus::UI::Button	538	$table->add_at (0, 0, new DC::UI::Button
520	text => "Next Race",	539	text => "Next Race",
521	on_activate => sub {	540	on_activate => sub {
522	$conn->send ("reply n");	541	$conn->send ("reply n");
523	destroy_query_dialog $conn;	542	destroy_query_dialog $conn;
524	0	543	0
525	},	544	},
526	);	545	);
527	$table->add_at (2, 0, new CFPlus::UI::Button	546	$table->add_at (2, 0, new DC::UI::Button
528	text => "Accept",	547	text => "Accept",
529	on_activate => sub {	548	on_activate => sub {
530	$conn->send ("reply d");	549	$conn->send ("reply d");
531	destroy_query_dialog $conn;	550	destroy_query_dialog $conn;
532	0	551	0
533	},	552	},
534	);	553	);
535		554
536	if ($conn->{chargen_race_description}) {	555	if ($conn->{chargen_race_description}) {
537	unshift @dialog, new CFPlus::UI::Label	556	unshift @dialog, new DC::UI::Label
538	max_w => $::WIDTH * 0.8,	557	max_w => $::WIDTH * 0.8,
539	ellipsise => 0,	558	ellipsise => 0,
540	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",	559	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
541	;	560	;
542	}	561	}
543		562
544	unshift @dialog, new CFPlus::UI::Face	563	unshift @dialog, new DC::UI::Face
545	face => $conn->{player}{face},	564	face => $conn->{player}{face},
546	bg => [.2, .2, .2, 1],	565	bg => [.2, .2, .2, 1],
547	min_w => 64,	566	min_w => 64,
548	min_h => 64,	567	min_h => 64,
549	;	568	;
550		569
551	if ($conn->{chargen_race_title}) {	570	if ($conn->{chargen_race_title}) {
552	unshift @dialog, new CFPlus::UI::Label	571	unshift @dialog, new DC::UI::Label
553	allign => 1,	572	allign => 1,
554	ellipsise => 0,	573	ellipsise => 0,
555	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",	574	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
556	;	575	;
557	}	576	}
558		577
559	unshift @dialog, new CFPlus::UI::Label	578	unshift @dialog, new DC::UI::Label
560	max_w => $::WIDTH * 0.4,	579	max_w => $::WIDTH * 0.4,
561	ellipsise => 0,	580	ellipsise => 0,
562	markup => (CFPlus::Pod::section_label ui => "chargen_race"),	581	markup => (DC::Pod::section_label ui => "chargen_race"),
563	;	582	;
564		583
565	} elsif ($prompt =~ /roll new stats/) {	584	} elsif ($prompt =~ /roll new stats/) {
566	if (my $stat = delete $conn->{stat_change_with}) {	585	if (my $stat = delete $conn->{stat_change_with}) {
567	$conn->send ("reply $stat");	586	$conn->send ("reply $stat");
568	destroy_query_dialog $conn;	587	destroy_query_dialog $conn;
569	return;	588	return;
570	}	589	}
571		590
572	unshift @dialog, new CFPlus::UI::Label	591	unshift @dialog, new DC::UI::Label
573	max_w => $::WIDTH * 0.4,	592	max_w => $::WIDTH * 0.4,
574	ellipsise => 0,	593	ellipsise => 0,
575	markup => "\nOr use your keyboard and the text entry below:\n";	594	markup => "\nOr use your keyboard and the text entry below:\n";
576		595
577	unshift @dialog, my $table = new CFPlus::UI::Table;	596	unshift @dialog, my $table = new DC::UI::Table;
578		597
579	# left: re-roll	598	# left: re-roll
580	$table->add_at (0, 0, new CFPlus::UI::Button	599	$table->add_at (0, 0, new DC::UI::Button
581	text => "Roll Again",	600	text => "Roll Again",
582	on_activate => sub {	601	on_activate => sub {
583	$conn->send ("reply y");	602	$conn->send ("reply y");
584	destroy_query_dialog $conn;	603	destroy_query_dialog $conn;
585	0	604	0
586	},	605	},
587	);	606	);
588		607
589	# center: swap stats	608	# center: swap stats
590	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector	609	my ($sw1, $sw2) = map +(new DC::UI::Selector
591	expand => 1,	610	expand => 1,
592	value => $_,	611	value => $_,
593	options => [	612	options => [
594	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	613	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
595	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	614	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
599	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	618	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
600	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	619	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
601	],	620	],
602	), 1 .. 2;	621	), 1 .. 2;
603		622
604	$table->add_at (2, 0, new CFPlus::UI::Button	623	$table->add_at (2, 0, new DC::UI::Button
605	text => "Swap Stats",	624	text => "Swap Stats",
606	on_activate => sub {	625	on_activate => sub {
607	$conn->{stat_change_with} = $sw2->{value};	626	$conn->{stat_change_with} = $sw2->{value};
608	$conn->send ("reply $sw1->{value}");	627	$conn->send ("reply $sw1->{value}");
609	destroy_query_dialog $conn;	628	destroy_query_dialog $conn;
610	0	629	0
611	},	630	},
612	);	631	);
613	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	632	$table->add_at (2, 1, new DC::UI::HBox children => [$sw1, $sw2]);
614		633
615	# right: accept	634	# right: accept
616	$table->add_at (4, 0, new CFPlus::UI::Button	635	$table->add_at (4, 0, new DC::UI::Button
617	text => "Accept",	636	text => "Accept",
618	on_activate => sub {	637	on_activate => sub {
619	$conn->send ("reply n");	638	$conn->send ("reply n");
620	$STATS_PAGE->hide;	639	$STATS_PAGE->hide;
621	destroy_query_dialog $conn;	640	destroy_query_dialog $conn;
622	0	641	0
623	},	642	},
624	);	643	);
625		644
626	unshift @dialog, my $hbox = new CFPlus::UI::HBox;	645	unshift @dialog, my $hbox = new DC::UI::HBox;
627	for (	646	for (
628	[Str => CS_STAT_STR],	647	[Str => CS_STAT_STR],
629	[Dex => CS_STAT_DEX],	648	[Dex => CS_STAT_DEX],
630	[Con => CS_STAT_CON],	649	[Con => CS_STAT_CON],
631	[Int => CS_STAT_INT],	650	[Int => CS_STAT_INT],
632	[Wis => CS_STAT_WIS],	651	[Wis => CS_STAT_WIS],
633	[Pow => CS_STAT_POW],	652	[Pow => CS_STAT_POW],
634	[Cha => CS_STAT_CHA],	653	[Cha => CS_STAT_CHA],
635	) {	654	) {
636	my ($name, $id) = @$_;	655	my ($name, $id) = @$_;
637	$hbox->add (new CFPlus::UI::Label	656	$hbox->add (new DC::UI::Label
638	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	657	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
639	align => 0,	658	align => 0,
640	expand => 1,	659	expand => 1,
641	can_events => 1,	660	can_events => 1,
642	can_hover => 1,	661	can_hover => 1,
643	tooltip => "#stat_$name",	662	tooltip => "#stat_$name",
644	);	663	);
645	}	664	}
646		665
647	unshift @dialog, new CFPlus::UI::Label	666	unshift @dialog, new DC::UI::Label
648	max_w => $::WIDTH * 0.4,	667	max_w => $::WIDTH * 0.4,
649	ellipsise => 0,	668	ellipsise => 0,
650	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),	669	markup => (DC::Pod::section_label ui => "chargen_stats"),
651	;	670	;
652	}	671	}
653		672
654	push @dialog, my $entry = new CFPlus::UI::Entry	673	push @dialog, my $entry = new DC::UI::Entry
655	on_changed => sub {	674	on_changed => sub {
656	$conn->send ("reply $_[1]");	675	$conn->send ("reply $_[1]");
657	destroy_query_dialog $conn;	676	destroy_query_dialog $conn;
658	0	677	0
659	},	678	},
…		…
662	$entry->grab_focus;	681	$entry->grab_focus;
663		682
664	} else {	683	} else {
665	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	684	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
666		685
667	push @dialog, my $entry = new CFPlus::UI::Entry	686	push @dialog, my $entry = new DC::UI::Entry
668	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	687	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
669	on_activate => sub {	688	on_activate => sub {
670	$conn->send ("reply $_[1]");	689	$conn->send ("reply $_[1]");
671	destroy_query_dialog $conn;	690	destroy_query_dialog $conn;
672	0	691	0
…		…
688		707
689	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	708	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
690		709
691	my ($host, $port) = split /:/, $PROFILE->{host};	710	my ($host, $port) = split /:/, $PROFILE->{host};
692		711
693	$MAP = new CFPlus::Map;	712	$MAP = new DC::Map;
694		713
695	$CONN = eval {	714	$CONN = eval {
696	new CFPlus::Protocol	715	new DC::Protocol
697	host => $host,	716	host => $host,
698	port => $port || 13327,	717	port => $port || 13327,
699	user => $PROFILE->{user},	718	user => $PROFILE->{user},
700	pass => $PROFILE->{password},	719	pass => $PROFILE->{password},
701	mapw => $mapsize,	720	mapw => $mapsize,
702	maph => $mapsize,	721	maph => $mapsize,
703		722
704	client => "cfplus $CFPlus::VERSION $] $^O",	723	client => "cfplus $DC::VERSION $] $^O",
705		724
706	map_widget => $MAPWIDGET,	725	map_widget => $MAPWIDGET,
707	statusbox => $STATUSBOX,	726	statusbox => $STATUSBOX,
708	map => $MAP,	727	map => $MAP,
709	mapmap => $MAPMAP,	728	mapmap => $MAPMAP,
…		…
713	smoothing => $CFG->{map_smoothing}*1,	732	smoothing => $CFG->{map_smoothing}*1,
714	},	733	},
715	};	734	};
716		735
717	if ($CONN) {	736	if ($CONN) {
718	CFPlus::lowdelay fileno $CONN->{fh};	737	DC::lowdelay fileno $CONN->{fh};
719		738
720	status "login successful";	739	status "login successful";
721	} else {	740	} else {
722	status "unable to connect";	741	status "unable to connect";
723	stop_game();	742	stop_game();
…		…
728	$LOGIN_BUTTON->set_text ("Login / Register");	747	$LOGIN_BUTTON->set_text ("Login / Register");
729	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	748	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
730	$SETUP_DIALOG->show;	749	$SETUP_DIALOG->show;
731	$PL_WINDOW->hide;	750	$PL_WINDOW->hide;
732	$SPELL_LIST->clear_spells;	751	$SPELL_LIST->clear_spells;
733	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	752	$DC::UI::ROOT->emit (stop_game => ! ! $CONN);
734		753
735	&audio_music_set_ambient ([]);	754	&audio_music_set_ambient ([]);
736		755
737	return unless $CONN;	756	return unless $CONN;
738		757
…		…
744		763
745	undef $MAP;	764	undef $MAP;
746	}	765	}
747		766
748	sub graphics_setup {	767	sub graphics_setup {
749	my $vbox = new CFPlus::UI::VBox;	768	my $vbox = new DC::UI::VBox;
750		769
751	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	770	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
752		771
753	my $row = 0;	772	my $row = 0;
754		773
755	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");	774	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info");
756	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,	775	$table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
757	can_events => 1,	776	can_events => 1,
758	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");	777	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
759		778
760	my $vidmode_tooltip =	779	my $vidmode_tooltip =
761	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	780	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
762	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";	781	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
763		782
764	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	783	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode");
765	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);	784	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
766		785
767	$hbox->add (my $mode_slider = new CFPlus::UI::Slider	786	$hbox->add (my $mode_slider = new DC::UI::Slider
768	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],	787	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
769	tooltip => $vidmode_tooltip);	788	tooltip => $vidmode_tooltip);
770	$hbox->add (my $mode_label = new CFPlus::UI::Label	789	$hbox->add (my $mode_label = new DC::UI::Label
771	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",	790	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
772	can_events => 1, tooltip => $vidmode_tooltip);	791	can_events => 1, tooltip => $vidmode_tooltip);
773		792
774	$mode_slider->connect (changed => sub {	793	$mode_slider->connect (changed => sub {
775	my ($self, $value) = @_;	794	my ($self, $value) = @_;
…		…
777	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	796	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
778	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	797	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
779	});	798	});
780	$mode_slider->emit (changed => $mode_slider->{range}[0]);	799	$mode_slider->emit (changed => $mode_slider->{range}[0]);
781		800
782	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	801	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen");
783	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	802	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
784	state => $CFG->{fullscreen},	803	state => $CFG->{fullscreen},
785	tooltip => "Bring the client into fullscreen mode.",	804	tooltip => "Bring the client into fullscreen mode.",
786	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	805	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
787	);	806	);
788		807
789	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");	808	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
790	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	809	$table->add_at (1, $row++, new DC::UI::CheckBox
791	state => $CFG->{force_opengl11},	810	state => $CFG->{force_opengl11},
792	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "	811	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
793	. "higher memory usage and slower performance. It will, however, help tremendously on "	812	. "higher memory usage and slower performance. It will, however, help tremendously on "
794	. "cards that claim to support a feature but fall back to software rendering. "	813	. "cards that claim to support a feature but fall back to software rendering. "
795	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "	814	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
796	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "	815	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
797	. "experience extremely low framerates and your card should do better, try this option.</b>",	816	. "experience extremely low framerates and your card should do better, try this option.</b>",
798	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }	817	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
799	);	818	);
800		819
801	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");	820	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures");
802	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	821	$table->add_at (1, $row++, new DC::UI::CheckBox
803	state => $CFG->{texture_compression},	822	state => $CFG->{texture_compression},
804	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	823	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
805	. "will save a lot of memory and increase performance. The compression algorithm "	824	. "will save a lot of memory and increase performance. The compression algorithm "
806	. "can differ form card to card, so your mileage may vary. This setting is ignored in "	825	. "can differ form card to card, so your mileage may vary. This setting is ignored in "
807	. "forced OpenGL 1.1 mode.",	826	. "forced OpenGL 1.1 mode.",
808	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	827	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
809	);	828	);
810		829
811	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	830	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
812	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	831	$table->add_at (1, $row++, new DC::UI::CheckBox
813	state => $CFG->{fast},	832	state => $CFG->{fast},
814	tooltip => "Lower the visual quality considerably to speed up rendering.",	833	tooltip => "Lower the visual quality considerably to speed up rendering.",
815	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	834	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
816	);	835	);
817		836
818	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	837	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
819	$table->add_at (1, $row++, new CFPlus::UI::Slider	838	$table->add_at (1, $row++, new DC::UI::Slider
820	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	839	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
821	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	840	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
822	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	841	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
823	);	842	);
824		843
825	$table->add_at (1, $row++, new CFPlus::UI::Button	844	$table->add_at (1, $row++, new DC::UI::Button
826	expand => 1, align => 0, text => "Apply",	845	expand => 1, align => 0, text => "Apply",
827	tooltip => "Apply the video settings above.",	846	tooltip => "Apply the video settings above.",
828	on_activate => sub {	847	on_activate => sub {
829	video_shutdown ();	848	video_shutdown ();
830	video_init ();	849	video_init ();
831	0	850	0
832	}	851	}
833	);	852	);
834		853
835	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	854	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale");
836	$table->add_at (1, $row++, new CFPlus::UI::Slider	855	$table->add_at (1, $row++, new DC::UI::Slider
837	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	856	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
838	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	857	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
839	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	858	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
840	);	859	);
841		860
842	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");	861	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing");
843	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	862	$table->add_at (1, $row++, new DC::UI::CheckBox
844	state => $CFG->{map_smoothing},	863	state => $CFG->{map_smoothing},
845	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	864	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
846	. "This increases load on the graphics subsystem and works only with TRT servers. "	865	. "This increases load on the graphics subsystem and works only with TRT servers. "
847	. "Changes take effect at next login only.",	866	. "Changes take effect at next login only.",
848	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	867	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
849	);	868	);
850		869
851	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	870	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War");
852	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	871	$table->add_at (1, $row++, new DC::UI::CheckBox
853	state => $CFG->{fow_enable},	872	state => $CFG->{fow_enable},
854	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	873	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
855	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	874	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
856	);	875	);
857		876
858	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	877	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity");
859	$table->add_at (1, $row++, new CFPlus::UI::Slider	878	$table->add_at (1, $row++, new DC::UI::Slider
860	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	879	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
861	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	880	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
862	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	881	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
863	);	882	);
864		883
865	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	884	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize");
866	$table->add_at (1, $row++, new CFPlus::UI::Slider	885	$table->add_at (1, $row++, new DC::UI::Slider
867	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	886	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
868	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "	887	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
869	. "but you still need to press apply to correctly re-layout the widget.",	888	. "but you still need to press apply to correctly re-layout the widget.",
870	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	889	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
871	);	890	);
872		891
873	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	892	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
874	$table->add_at (1, $row++, new CFPlus::UI::Slider	893	$table->add_at (1, $row++, new DC::UI::Slider
875	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	894	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
876	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	895	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
877	on_changed => sub {	896	on_changed => sub {
878	$CFG->{gauge_fontsize} = $_[1];	897	$CFG->{gauge_fontsize} = $_[1];
879	&set_gauge_window_fontsize;	898	&set_gauge_window_fontsize;
880	0	899	0
881	}	900	}
882	);	901	);
883		902
884	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	903	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size");
885	$table->add_at (1, $row++, new CFPlus::UI::Slider	904	$table->add_at (1, $row++, new DC::UI::Slider
886	range => [$CFG->{gauge_size}, 0.2, 0.8],	905	range => [$CFG->{gauge_size}, 0.2, 0.8],
887	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	906	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
888	on_changed => sub {	907	on_changed => sub {
889	$CFG->{gauge_size} = $_[1];	908	$CFG->{gauge_size} = $_[1];
890	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	909	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
…		…
897		916
898	our $AUDIO_HW_CHUNKSIZE;	917	our $AUDIO_HW_CHUNKSIZE;
899	our $AUDIO_INFO;	918	our $AUDIO_INFO;
900		919
901	sub audio_tab_update {	920	sub audio_tab_update {
902	my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;	921	my ($freq, $format, $chans) = DC::Mix_QuerySpec;
903		922
904	$AUDIO_HW_CHUNKSIZE->set_options ([	923	$AUDIO_HW_CHUNKSIZE->set_options ([
905	[0, "default", "Use System Default"],	924	[0, "default", "Use System Default"],
906	map {	925	map {
907	my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);	926	my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
…		…
917		936
918	$AUDIO_INFO->set_text ($text);	937	$AUDIO_INFO->set_text ($text);
919	}	938	}
920		939
921	sub audio_setup {	940	sub audio_setup {
922	my $vbox = new CFPlus::UI::VBox;	941	my $vbox = new DC::UI::VBox;
923		942
924	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);	943	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
925		944
926	my $row = 0;	945	my $row = 0;
927		946
928	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	947	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable");
929	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	948	$table->add_at (1, $row++, new DC::UI::CheckBox
930	state => $CFG->{audio_enable},	949	state => $CFG->{audio_enable},
931	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.",	950	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.",
932	on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }	951	on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
933	);	952	);
934		953
935	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");	954	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects");
936	$table->add_at (1, $row, new CFPlus::UI::CheckBox	955	$table->add_at (1, $row, new DC::UI::CheckBox
937	expand => 1, state => $CFG->{effects_enable},	956	expand => 1, state => $CFG->{effects_enable},
938	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",	957	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
939	on_changed => sub {	958	on_changed => sub {
940	$CFG->{effects_enable} = $_[1];	959	$CFG->{effects_enable} = $_[1];
941	$CONN->update_fx_want if $CONN;	960	$CONN->update_fx_want if $CONN;
942	1	961	1
943	}	962	}
944	);	963	);
945	$table->add_at (2, $row++, new CFPlus::UI::Slider	964	$table->add_at (2, $row++, new DC::UI::Slider
946	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],	965	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
947	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "	966	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
948	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",	967	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
949	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }	968	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
950	);	969	);
951		970
952	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	971	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music");
953	$table->add_at (1, $row, new CFPlus::UI::CheckBox	972	$table->add_at (1, $row, new DC::UI::CheckBox
954	expand => 1, state => $CFG->{bgm_enable},	973	expand => 1, state => $CFG->{bgm_enable},
955	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	974	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
956	on_changed => sub {	975	on_changed => sub {
957	$CFG->{bgm_enable} = $_[1];	976	$CFG->{bgm_enable} = $_[1];
958	$CONN->update_fx_want if $CONN;	977	$CONN->update_fx_want if $CONN;
959	audio_music_push;	978	audio_music_push;
960	1	979	1
961	}	980	}
962	);	981	);
963	$table->add_at (2, $row++, new CFPlus::UI::Slider	982	$table->add_at (2, $row++, new DC::UI::Slider
964	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	983	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
965	tooltip => "The volume of the background music. Changes are instant.",	984	tooltip => "The volume of the background music. Changes are instant.",
966	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }	985	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
967	);	986	);
968		987
969	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");	988	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency");
970	$table->add_at (1, $row++, new CFPlus::UI::Selector	989	$table->add_at (1, $row++, new DC::UI::Selector
971	c_colspan => 2, expand => 1,	990	c_colspan => 2, expand => 1,
972	value => $CFG->{audio_hw_frequency},	991	value => $CFG->{audio_hw_frequency},
973	options => [	992	options => [
974	[ 0, "default" , "Use System Default"],	993	[ 0, "default" , "Use System Default"],
975	[11025, "11 kHz" , "11kHz (low quality)"],	994	[11025, "11 kHz" , "11kHz (low quality)"],
…		…
983	audio_tab_update;	1002	audio_tab_update;
984	1	1003	1
985	}	1004	}
986	);	1005	);
987		1006
988	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");	1007	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels");
989	$table->add_at (1, $row++, new CFPlus::UI::Selector	1008	$table->add_at (1, $row++, new DC::UI::Selector
990	c_colspan => 2, expand => 1,	1009	c_colspan => 2, expand => 1,
991	value => $CFG->{audio_hw_channels},	1010	value => $CFG->{audio_hw_channels},
992	options => [	1011	options => [
993	[0, "default" , "Use System Default"],	1012	[0, "default" , "Use System Default"],
994	[1, "Mono" , "Mono (single channel, low quality)"],	1013	[1, "Mono" , "Mono (single channel, low quality)"],
…		…
1002	audio_tab_update;	1021	audio_tab_update;
1003	1	1022	1
1004	}	1023	}
1005	);	1024	);
1006		1025
1007	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");	1026	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency");
1008	$table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector	1027	$table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1009	c_colspan => 2, expand => 1,	1028	c_colspan => 2, expand => 1,
1010	value => $CFG->{audio_hw_chunksize},	1029	value => $CFG->{audio_hw_chunksize},
1011	tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "	1030	tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1012	. "is stuttering, increase this value. Values of 50-100ms are optimal.",	1031	. "is stuttering, increase this value. Values of 50-100ms are optimal.",
1013	on_changed => sub {	1032	on_changed => sub {
…		…
1016	1	1035	1
1017	}	1036	}
1018	);	1037	);
1019		1038
1020	# should really be a slider	1039	# should really be a slider
1021	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");	1040	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1022	$table->add_at (1, $row++, new CFPlus::UI::ValSlider	1041	$table->add_at (1, $row++, new DC::UI::ValSlider
1023	c_colspan => 2, expand => 1,	1042	c_colspan => 2, expand => 1,
1024	tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",	1043	tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1025	range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],	1044	range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1026	template => ">= 99",	1045	template => ">= 99",
1027	on_changed => sub {	1046	on_changed => sub {
…		…
1031	if $value;	1050	if $value;
1032	1;	1051	1;
1033	}	1052	}
1034	);	1053	);
1035		1054
1036	$table->add_at (1, $row++, new CFPlus::UI::Button	1055	$table->add_at (1, $row++, new DC::UI::Button
1037	c_colspan => 2, expand => 1, align => 0, text => "Apply",	1056	c_colspan => 2, expand => 1, align => 0, text => "Apply",
1038	tooltip => "Apply the audio settings",	1057	tooltip => "Apply the audio settings",
1039	on_activate => sub {	1058	on_activate => sub {
1040	audio_shutdown ();	1059	audio_shutdown ();
1041	audio_init ();	1060	audio_init ();
1042	0	1061	0
1043	}	1062	}
1044	);	1063	);
1045		1064
1046	$vbox->add (new CFPlus::UI::FancyFrame	1065	$vbox->add (new DC::UI::FancyFrame
1047	expand => 1,	1066	expand => 1,
1048	label => "Audio Info",	1067	label => "Audio Info",
1049	child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),	1068	child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1050	);	1069	);
1051		1070
1052	audio_tab_update;	1071	audio_tab_update;
1053		1072
1054	$vbox	1073	$vbox
…		…
1061	}	1080	}
1062		1081
1063	sub make_gauge_window {	1082	sub make_gauge_window {
1064	my $gh = int $HEIGHT * $CFG->{gauge_size};	1083	my $gh = int $HEIGHT * $CFG->{gauge_size};
1065		1084
1066	my $win = new CFPlus::UI::Frame (	1085	my $win = new DC::UI::Frame (
1067	force_x => 0,	1086	force_x => 0,
1068	force_y => "max",	1087	force_y => "max",
1069	force_w => $WIDTH,	1088	force_w => $WIDTH,
1070	force_h => $gh,	1089	force_h => $gh,
1071	);	1090	);
1072		1091
1073	$win->add (my $hbox = new CFPlus::UI::HBox	1092	$win->add (my $hbox = new DC::UI::HBox
1074	children => [	1093	children => [
1075	(new CFPlus::UI::HBox expand => 1),	1094	(new DC::UI::HBox expand => 1),
1076	(new CFPlus::UI::VBox children => [	1095	(new DC::UI::VBox children => [
1077	(new CFPlus::UI::Empty expand => 1),	1096	(new DC::UI::Empty expand => 1),
1078	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),	1097	(new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1079	]),	1098	]),
1080	(my $vbox = new CFPlus::UI::VBox),	1099	(my $vbox = new DC::UI::VBox),
1081	],	1100	],
1082	);	1101	);
1083		1102
1084	$vbox->add (new CFPlus::UI::HBox	1103	$vbox->add (new DC::UI::HBox
1085	expand => 1,	1104	expand => 1,
1086	children => [	1105	children => [
1087	(new CFPlus::UI::Empty expand => 1),	1106	(new DC::UI::Empty expand => 1),
1088	(my $hb = new CFPlus::UI::HBox),	1107	(my $hb = new DC::UI::HBox),
1089	],	1108	],
1090	);	1109	);
1091		1110
1092	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");	1111	$hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1093	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");	1112	$hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1094	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");	1113	$hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1095	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");	1114	$hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1096		1115
1097	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");	1116	$vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1098	$vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);	1117	$vbox->add (my $prg = new DC::UI::ExperienceProgress);
1099	$vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);	1118	$vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1100	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");	1119	$vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1101		1120
1102	$GAUGES = {	1121	$GAUGES = {
1103	exp => $exp, prg => $prg, sklprg => $sklprg,	1122	exp => $exp, prg => $prg, sklprg => $sklprg,
1104	win => $win, range => $rng,	1123	win => $win, range => $rng,
1105	hp => $hg, mana => $mg, grace => $gg, food => $fg,	1124	hp => $hg, mana => $mg, grace => $gg, food => $fg,
…		…
1109		1128
1110	$win	1129	$win
1111	}	1130	}
1112		1131
1113	sub debug_setup {	1132	sub debug_setup {
1114	my $table = new CFPlus::UI::Table;	1133	my $table = new DC::UI::Table;
1115		1134
1116	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");	1135	$table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1117	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	1136	$table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
1118	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	1137	$table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1119	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	1138	$table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
1120	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");	1139	$table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1121	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	1140	$table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1122	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	1141	$table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1123	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	1142	$table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1124	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );	1143	$table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1125		1144
1126	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	1145	$table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d#
1127		1146
1128	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);	1147	$table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1129	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);	1148	$t->add_at (0,0, new DC::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1130	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);	1149	$t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1131	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);	1150	$t->add_at (1,2, new DC::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1132	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);	1151	$t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1133	$t->add_at (1,1, new CFPlus::UI::Label text => "e");	1152	$t->add_at (1,1, new DC::UI::Label text => "e");
1134		1153
1135	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);	1154	$table->add_at (7, 6, my $c = new DC::UI::Canvas);
1136		1155
1137	$c->add_items ({	1156	$c->add_items ({
1138	type => "line_loop",	1157	type => "line_loop",
1139	color => [0, 1, 0],	1158	color => [0, 1, 0],
1140	width => 9,	1159	width => 9,
…		…
1160		1179
1161	$table	1180	$table
1162	}	1181	}
1163		1182
1164	sub stats_window {	1183	sub stats_window {
1165	my $r = new CFPlus::UI::ScrolledWindow (	1184	my $r = new DC::UI::ScrolledWindow (
1166	expand => 1,	1185	expand => 1,
1167	scroll_y => 1	1186	scroll_y => 1
1168	);	1187	);
1169	$r->add (my $vb = new CFPlus::UI::VBox);	1188	$r->add (my $vb = new DC::UI::VBox);
1170		1189
1171	$vb->add (new CFPlus::UI::FancyFrame	1190	$vb->add (new DC::UI::FancyFrame
1172	label => "Player",	1191	label => "Player",
1173	child => (my $pi = new CFPlus::UI::VBox),	1192	child => (my $pi = new DC::UI::VBox),
1174	);	1193	);
1175		1194
1176	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	1195	$pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
1177	can_hover => 1, can_events => 1,	1196	can_hover => 1, can_events => 1,
1178	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	1197	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1179	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	1198	$pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
1180	can_hover => 1, can_events => 1,	1199	can_hover => 1, can_events => 1,
1181	tooltip => "The map you are currently on (if supported by the server).");	1200	tooltip => "The map you are currently on (if supported by the server).");
1182		1201
1183	$pi->add (my $hb0 = new CFPlus::UI::HBox);	1202	$pi->add (my $hb0 = new DC::UI::HBox);
1184	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	1203	$hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
1185	can_hover => 1, can_events => 1,	1204	can_hover => 1, can_events => 1,
1186	tooltip => "The weight of the player including all inventory items.");	1205	tooltip => "The weight of the player including all inventory items.");
1187	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	1206	$hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
1188	can_hover => 1, can_events => 1,	1207	can_hover => 1, can_events => 1,
1189	tooltip => "The weight limit: you cannot carry more than this.");	1208	tooltip => "The weight limit: you cannot carry more than this.");
1190		1209
1191	$vb->add (new CFPlus::UI::FancyFrame	1210	$vb->add (new DC::UI::FancyFrame
1192	label => "Primary/Secondary Statistics",	1211	label => "Primary/Secondary Statistics",
1193	child => (my $hb = new CFPlus::UI::HBox expand => 1),	1212	child => (my $hb = new DC::UI::HBox expand => 1),
1194	);	1213	);
1195	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);	1214	$hb->add (my $tbl = new DC::UI::Table expand => 1);
1196		1215
1197	my $color2 = [1, 1, 0];	1216	my $color2 = [1, 1, 0];
1198		1217
1199	for (	1218	for (
1200	[0, 0, st_str => "Str", 30],	1219	[0, 0, st_str => "Str", 30],
…		…
1212	[2, 4, st_spd => "Spd", 10.54],	1231	[2, 4, st_spd => "Spd", 10.54],
1213	[2, 5, st_wspd => "WSp", 10.54],	1232	[2, 5, st_wspd => "WSp", 10.54],
1214	) {	1233	) {
1215	my ($col, $row, $id, $label, $template) = @$_;	1234	my ($col, $row, $id, $label, $template) = @$_;
1216		1235
1217	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1236	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1218	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1237	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
1219	align => +1, template => $template, tooltip => "#stat_$label");	1238	align => +1, template => $template, tooltip => "#stat_$label");
1220	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1239	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1221	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	1240	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
1222	align => -1, text => $label, tooltip => "#stat_$label");	1241	align => -1, text => $label, tooltip => "#stat_$label");
1223	}	1242	}
1224		1243
1225	$vb->add (new CFPlus::UI::FancyFrame	1244	$vb->add (new DC::UI::FancyFrame
1226	label => "Resistancies",	1245	label => "Resistancies",
1227	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),	1246	child => (my $tbl2 = new DC::UI::Table expand => 1),
1228	);	1247	);
1229		1248
1230	my $row = 0;	1249	my $row = 0;
1231	my $col = 0;	1250	my $col = 0;
1232		1251
…		…
1273	drain acid pois para deat phys	1292	drain acid pois para deat phys
1274	blind fear tund elec cold ghit/)	1293	blind fear tund elec cold ghit/)
1275	{	1294	{
1276	$tbl2->add_at ($col, $row,	1295	$tbl2->add_at ($col, $row,
1277	$STATWIDS->{"res_$_"} =	1296	$STATWIDS->{"res_$_"} =
1278	new CFPlus::UI::Label	1297	new DC::UI::Label
1279	font => $FONT_FIXED,	1298	font => $FONT_FIXED,
1280	template => "-100%",	1299	template => "-100%",
1281	align => +1,	1300	align => +1,
1282	valign => 0,	1301	valign => 0,
1283	can_events => 1,	1302	can_events => 1,
1284	can_hover => 1,	1303	can_hover => 1,
1285	tooltip => $resist_names{$_}->[1],	1304	tooltip => $resist_names{$_}->[1],
1286	);	1305	);
1287	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image	1306	$tbl2->add_at ($col + 1, $row, new DC::UI::Image
1288	font => $FONT_FIXED,	1307	font => $FONT_FIXED,
1289	can_hover => 1,	1308	can_hover => 1,
1290	can_events => 1,	1309	can_events => 1,
1291	path => "ui/resist/resist_$_.png",	1310	path => "ui/resist/resist_$_.png",
1292	tooltip => $resist_names{$_}->[1],	1311	tooltip => $resist_names{$_}->[1],
1293	);	1312	);
1294	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label	1313	$tbl2->add_at ($col + 2, $row, new DC::UI::Label
1295	text => $resist_names{$_}->[0],	1314	text => $resist_names{$_}->[0],
1296	font => $FONT_FIXED,	1315	font => $FONT_FIXED,
1297	can_hover => 1,	1316	can_hover => 1,
1298	can_events => 1,	1317	can_events => 1,
1299	tooltip => $resist_names{$_}->[1],	1318	tooltip => $resist_names{$_}->[1],
…		…
1310		1329
1311	$r	1330	$r
1312	}	1331	}
1313		1332
1314	sub skill_window {	1333	sub skill_window {
1315	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);	1334	my $sw = new DC::UI::ScrolledWindow (expand => 1);
1316		1335
1317	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);	1336	$sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1318		1337
1319	$sw	1338	$sw
1320	}	1339	}
1321		1340
1322	sub formsep($) {	1341	sub formsep($) {
…		…
1334	return if $METASERVER_ATIME > time;	1353	return if $METASERVER_ATIME > time;
1335	$METASERVER_ATIME = time + 60;	1354	$METASERVER_ATIME = time + 60;
1336		1355
1337	my $table = $METASERVER->{table};	1356	my $table = $METASERVER->{table};
1338	$table->clear;	1357	$table->clear;
1339	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1358	$table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1340		1359
1341	my $ok = 0;	1360	my $ok = 0;
1342		1361
1343	CFPlus::background {	1362	DC::background {
1344	my $ua = CFPlus::lwp_useragent;	1363	my $ua = DC::lwp_useragent;
1345		1364
1346	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;	1365	DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1347	} sub {	1366	} sub {
1348	my ($msg) = @_;	1367	my ($msg) = @_;
1349	if ($msg) {	1368	if ($msg) {
1350	$table->clear;	1369	$table->clear;
1351		1370
…		…
1354	"The hostname of the server.",	1373	"The hostname of the server.",
1355	"The time this server has been running without being restarted.",	1374	"The time this server has been running without being restarted.",
1356	"Short information about this server provided by its admins.",	1375	"Short information about this server provided by its admins.",
1357	);	1376	);
1358	my @col = qw(#Users Host Uptime Version Description);	1377	my @col = qw(#Users Host Uptime Version Description);
1359	$table->add_at ($_, 0, new CFPlus::UI::Label	1378	$table->add_at ($_, 0, new DC::UI::Label
1360	can_hover => 1, can_events => 1,	1379	can_hover => 1, can_events => 1,
1361	align => 0, fg => [1, 1, 0],	1380	align => 0, fg => [1, 1, 0],
1362	text => $col[$_], tooltip => $tip[$_])	1381	text => $col[$_], tooltip => $tip[$_])
1363	for 0 .. $#col;	1382	for 0 .. $#col;
1364		1383
…		…
1386		1405
1387	$m = [$users, $host, $uptime, $version, $desc];	1406	$m = [$users, $host, $uptime, $version, $desc];
1388		1407
1389	$y++;	1408	$y++;
1390		1409
1391	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [	1410	$table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1392	(new CFPlus::UI::Button	1411	(new DC::UI::Button
1393	text => "Use",	1412	text => "Use",
1394	tooltip => "Put this server into the <b>Host:Port</b> field",	1413	tooltip => "Put this server into the <b>Host:Port</b> field",
1395	on_activate => sub {	1414	on_activate => sub {
1396	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1415	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1397	$METASERVER->hide;	1416	$METASERVER->hide;
1398	0	1417	0
1399	},	1418	},
1400	),	1419	),
1401	(new CFPlus::UI::Empty expand => 1),	1420	(new DC::UI::Empty expand => 1),
1402	]);	1421	]);
1403		1422
1404	$table->add_at ($_, $y, new CFPlus::UI::Label	1423	$table->add_at ($_, $y, new DC::UI::Label
1405	max_w => $::WIDTH * 0.4,	1424	max_w => $::WIDTH * 0.4,
1406	ellipsise => 0,	1425	ellipsise => 0,
1407	align => $align[$_],	1426	align => $align[$_],
1408	text => $m->[$_],	1427	text => $m->[$_],
1409	tooltip => $tip[$_],	1428	tooltip => $tip[$_],
…		…
1419	};	1438	};
1420		1439
1421	}	1440	}
1422		1441
1423	sub metaserver_dialog {	1442	sub metaserver_dialog {
1424	my $vbox = new CFPlus::UI::VBox;	1443	my $vbox = new DC::UI::VBox;
1425	my $table = new CFPlus::UI::Table;	1444	my $table = new DC::UI::Table;
1426	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);	1445	$vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1427		1446
1428	my $dialog = new CFPlus::UI::Toplevel	1447	my $dialog = new DC::UI::Toplevel
1429	title => "Server List",	1448	title => "Server List",
1430	name => 'metaserver_dialog',	1449	name => 'metaserver_dialog',
1431	x => 'center',	1450	x => 'center',
1432	y => 'center',	1451	y => 'center',
1433	z => 3,	1452	z => 3,
…		…
1444		1463
1445	$dialog	1464	$dialog
1446	}	1465	}
1447		1466
1448	sub login_setup {	1467	sub login_setup {
1449	my $vbox = new CFPlus::UI::VBox;	1468	my $vbox = new DC::UI::VBox;
1450		1469
1451	$vbox->add (new CFPlus::UI::FancyFrame	1470	$vbox->add (new DC::UI::FancyFrame
1452	label => "Login Settings",	1471	label => "Login Settings",
1453	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1472	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1454	);	1473	);
1455		1474
1456	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1475	$table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username");
1457	$table->add_at (1, 4, new CFPlus::UI::Entry	1476	$table->add_at (1, 4, new DC::UI::Entry
1458	text => $CFG->{profile}{default}{user},	1477	text => $CFG->{profile}{default}{user},
1459	tooltip => "The name of your character on the server.",	1478	tooltip => "The name of your character on the server.",
1460	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }	1479	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1461	);	1480	);
1462		1481
1463	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1482	$table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password");
1464	$table->add_at (1, 5, new CFPlus::UI::Entry	1483	$table->add_at (1, 5, new DC::UI::Entry
1465	text => $CFG->{profile}{default}{password},	1484	text => $CFG->{profile}{default}{password},
1466	hidden => 1,	1485	hidden => 1,
1467	tooltip => "The password for your character.",	1486	tooltip => "The password for your character.",
1468	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }	1487	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1469	);	1488	);
1470		1489
1471	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button	1490	$table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1472	expand => 1,	1491	expand => 1,
1473	align => 0,	1492	align => 0,
1474	text => "Login / Register",	1493	text => "Login / Register",
1475	tooltip => "This button will either login to the account configured above or register a new account.",	1494	tooltip => "This button will either login to the account configured above or register a new account.",
1476	on_activate => sub {	1495	on_activate => sub {
…		…
1478	: start_game;	1497	: start_game;
1479	1	1498	1
1480	},	1499	},
1481	);	1500	);
1482		1501
1483	$vbox->add (new CFPlus::UI::FancyFrame	1502	$vbox->add (new DC::UI::FancyFrame
1484	label => "Registering",	1503	label => "Registering",
1485	min_h => 200,	1504	min_h => 200,
1486	child => (new CFPlus::UI::Label valign => -1, ellipsise => 0,	1505	child => (new DC::UI::Label valign => -1, ellipsise => 0,
1487	markup =>	1506	markup =>
1488	"To register a new account, choose a username that hasn't been taken yet and "	1507	"To register a new account, choose a username that hasn't been taken yet and "
1489	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1508	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1490	),	1509	),
1491	);	1510	);
1492		1511
1493	$vbox	1512	$vbox
1494	}	1513	}
1495		1514
1496	sub server_setup {	1515	sub server_setup {
1497	my $vbox = new CFPlus::UI::VBox;	1516	my $vbox = new DC::UI::VBox;
1498		1517
1499	$vbox->add (new CFPlus::UI::FancyFrame	1518	$vbox->add (new DC::UI::FancyFrame
1500	label => "Connection Settings",	1519	label => "Connection Settings",
1501	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1520	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1502	);	1521	);
1503		1522
1504	my $row = 0;	1523	my $row = 0;
1505		1524
1506	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1525	$table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port");
1507	{	1526	{
1508	$table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox);	1527	$table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1509		1528
1510	$vbox->add (	1529	$vbox->add (
1511	$HOST_ENTRY = new CFPlus::UI::Entry	1530	$HOST_ENTRY = new DC::UI::Entry
1512	expand => 1,	1531	expand => 1,
1513	text => $CFG->{profile}{default}{host},	1532	text => $CFG->{profile}{default}{host},
1514	tooltip => "The hostname or ip address of the Deliantra server to connect to",	1533	tooltip => "The hostname or ip address of the Deliantra server to connect to",
1515	on_changed => sub {	1534	on_changed => sub {
1516	my ($self, $value) = @_;	1535	my ($self, $value) = @_;
…		…
1518	1	1537	1
1519	}	1538	}
1520	);	1539	);
1521		1540
1522	if (0) { #d# disabled	1541	if (0) { #d# disabled
1523	$vbox->add (new CFPlus::UI::Button	1542	$vbox->add (new DC::UI::Button
1524	expand => 1,	1543	expand => 1,
1525	text => "Server List",	1544	text => "Server List",
1526	other => $METASERVER,	1545	other => $METASERVER,
1527	tooltip => "Show a list of available crossfire servers",	1546	tooltip => "Show a list of available crossfire servers",
1528	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1547	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1529	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },	1548	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1530	);	1549	);
1531	}#d#	1550	}#d#
1532	}	1551	}
1533		1552
1534	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1553	$table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size");
1535	$table->add_at (1, $row, new CFPlus::UI::Slider	1554	$table->add_at (1, $row, new DC::UI::Slider
1536	force_w => 100,	1555	force_w => 100,
1537	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1556	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1538	tooltip => "This is the size of the portion of the map update the server sends you. "	1557	tooltip => "This is the size of the portion of the map update the server sends you. "
1539	. "If you set this to a high value you will be able to see further, "	1558	. "If you set this to a high value you will be able to see further, "
1540	. "but you also increase bandwidth requirements and latency. "	1559	. "but you also increase bandwidth requirements and latency. "
1541	. "This option is only used once at log-in.",	1560	. "This option is only used once at log-in.",
1542	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },	1561	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1543	);	1562	);
1544		1563
1545	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1564	$table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate");
1546	$table->add_at (1, $row, new CFPlus::UI::Entry	1565	$table->add_at (1, $row, new DC::UI::Entry
1547	text => $CFG->{output_rate},	1566	text => $CFG->{output_rate},
1548	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "	1567	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1549	. "when sending data. When 0 or unset, the server "	1568	. "when sending data. When 0 or unset, the server "
1550	. "default will be used, which is usually around 100kb/s. Most servers will "	1569	. "default will be used, which is usually around 100kb/s. Most servers will "
1551	. "dynamically find an optimal rate, so adjust this only when necessary.",	1570	. "dynamically find an optimal rate, so adjust this only when necessary.",
1552	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },	1571	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1553	);	1572	);
1554		1573
1555	$vbox->add (new CFPlus::UI::FancyFrame	1574	$vbox->add (new DC::UI::FancyFrame
1556	label => "Server Info",	1575	label => "Server Info",
1557	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),	1576	child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1558	);	1577	);
1559		1578
1560	$vbox	1579	$vbox
1561	}	1580	}
1562		1581
1563	sub client_setup {	1582	sub client_setup {
1564	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];	1583	my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1565		1584
1566	my $row = 0;	1585	my $row = 0;
1567		1586
1568	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1587	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day");
1569	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	1588	$table->add_at (1, $row++, new DC::UI::CheckBox
1570	state => $CFG->{show_tips},	1589	state => $CFG->{show_tips},
1571	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1590	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1572	on_changed => sub {	1591	on_changed => sub {
1573	my ($self, $value) = @_;	1592	my ($self, $value) = @_;
1574	$CFG->{show_tips} = $value;	1593	$CFG->{show_tips} = $value;
1575	0	1594	0
1576	}	1595	}
1577	);	1596	);
1578		1597
1579	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");	1598	$table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1580	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry	1599	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1581	text => $CFG->{logview_max_par},	1600	text => $CFG->{logview_max_par},
1582	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1601	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1583	. "sends more messages than this number, older messages get removed to save memory and "	1602	. "sends more messages than this number, older messages get removed to save memory and "
1584	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1603	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1585	on_changed => sub {	1604	on_changed => sub {
…		…
1591		1610
1592	$table	1611	$table
1593	}	1612	}
1594		1613
1595	sub autopickup_setup {	1614	sub autopickup_setup {
1596	my $r = new CFPlus::UI::ScrolledWindow (	1615	my $r = new DC::UI::ScrolledWindow (
1597	expand => 1,	1616	expand => 1,
1598	scroll_y => 1	1617	scroll_y => 1
1599	);	1618	);
1600	$r->add (my $table = new CFPlus::UI::Table	1619	$r->add (my $table = new DC::UI::Table
1601	row_expand => [0],	1620	row_expand => [0],
1602	col_expand => [0, 1, 0, 1],	1621	col_expand => [0, 1, 0, 1],
1603	);	1622	);
1604		1623
1605	for (	1624	for (
…		…
1643	],	1662	],
1644	["Weight/Value ratio", 2, 17]	1663	["Weight/Value ratio", 2, 17]
1645	)	1664	)
1646	{	1665	{
1647	my ($title, $x, $y, @bits) = @$_;	1666	my ($title, $x, $y, @bits) = @$_;
1648	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1667	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1649		1668
1650	for (@bits) {	1669	for (@bits) {
1651	++$y;	1670	++$y;
1652		1671
1653	my $mask = $_->[1];	1672	my $mask = $_->[1];
1654	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1673	$table->add_at ($x , $y, new DC::UI::Label text => $_->[0], align => 1, expand => 1);
1655	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1674	$table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1656	state => $::CFG->{pickup} & $mask,	1675	state => $::CFG->{pickup} & $mask,
1657	on_changed => sub {	1676	on_changed => sub {
1658	my ($box, $value) = @_;	1677	my ($box, $value) = @_;
1659		1678
1660	if ($value) {	1679	if ($value) {
…		…
1671		1690
1672	${$_->[2]} = $checkbox if $_->[2];	1691	${$_->[2]} = $checkbox if $_->[2];
1673	}	1692	}
1674	}	1693	}
1675		1694
1676	$table->add_at (2, 18, new CFPlus::UI::ValSlider	1695	$table->add_at (2, 18, new DC::UI::ValSlider
1677	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1696	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1678	template => ">= 99",	1697	template => ">= 99",
1679	to_value => sub { ">= " . 5 * $_[0] },	1698	to_value => sub { ">= " . 5 * $_[0] },
1680	on_changed => sub {	1699	on_changed => sub {
1681	my ($slider, $value) = @_;	1700	my ($slider, $value) = @_;
…		…
1684	$::CFG->{pickup} |= int $value	1703	$::CFG->{pickup} |= int $value
1685	if $value;	1704	if $value;
1686	1;	1705	1;
1687	});	1706	});
1688		1707
1689	$table->add_at (3, 18, new CFPlus::UI::Button	1708	$table->add_at (3, 18, new DC::UI::Button
1690	text => "set",	1709	text => "set",
1691	on_activate => sub {	1710	on_activate => sub {
1692	$::CONN->send_command ("pickup $::CFG->{pickup}")	1711	$::CONN->send_command ("pickup $::CFG->{pickup}")
1693	if defined $::CONN;	1712	if defined $::CONN;
1694	0	1713	0
…		…
1715	or $a->{type} <=> $b->{type}	1734	or $a->{type} <=> $b->{type}
1716	} @_ },	1735	} @_ },
1717	);	1736	);
1718		1737
1719	sub inventory_widget {	1738	sub inventory_widget {
1720	my $hb = new CFPlus::UI::HBox homogeneous => 1;	1739	my $hb = new DC::UI::HBox homogeneous => 1;
1721		1740
1722	$hb->add (my $vb1 = new CFPlus::UI::VBox);	1741	$hb->add (my $vb1 = new DC::UI::VBox);
1723	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");	1742	$vb1->add (new DC::UI::Label align => 0, text => "Player");
1724		1743
1725	$vb1->add (my $hb1 = new CFPlus::UI::HBox);	1744	$vb1->add (my $hb1 = new DC::UI::HBox);
1726		1745
1727	use sort 'stable';	1746	use sort 'stable';
1728		1747
1729	$hb1->add (new CFPlus::UI::Selector	1748	$hb1->add (new DC::UI::Selector
1730	value => $::CFG->{inv_sort},	1749	value => $::CFG->{inv_sort},
1731	options => [	1750	options => [
1732	[type => "Type/Name"],	1751	[type => "Type/Name"],
1733	[mtime => "Recent/Normal/Locked"],	1752	[mtime => "Recent/Normal/Locked"],
1734	[weight => "Weight/Type"],	1753	[weight => "Weight/Type"],
…		…
1736	on_changed => sub {	1755	on_changed => sub {
1737	$::CFG->{inv_sort} = $_[1];	1756	$::CFG->{inv_sort} = $_[1];
1738	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1757	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1739	},	1758	},
1740	);	1759	);
1741	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);	1760	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1742	#TODO# update to weigh/maxweight	1761	#TODO# update to weigh/maxweight
1743	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);	1762	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1);
1744		1763
1745	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1764	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1746	$sw1->add ($INV = new CFPlus::UI::Inventory);	1765	$sw1->add ($INV = new DC::UI::Inventory);
1747	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1766	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1748		1767
1749	$hb->add (my $vb2 = new CFPlus::UI::VBox);	1768	$hb->add (my $vb2 = new DC::UI::VBox);
1750		1769
1751	$vb2->add ($INVR_HB = new CFPlus::UI::HBox);	1770	$vb2->add ($INVR_HB = new DC::UI::HBox);
1752		1771
1753	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1772	$vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1754	$sw2->add ($INVR = new CFPlus::UI::Inventory);	1773	$sw2->add ($INVR = new DC::UI::Inventory);
1755		1774
1756	# XXX: Call after $INVR = ... because set_opencont sets the items	1775	# XXX: Call after $INVR = ... because set_opencont sets the items
1757	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1776	DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1758		1777
1759	$hb	1778	$hb
1760	}	1779	}
1761		1780
1762	sub media_window {	1781	sub media_window {
1763	my $vb = new CFPlus::UI::VBox;	1782	my $vb = new DC::UI::VBox;
1764		1783
1765	$vb->add (new CFPlus::UI::FancyFrame	1784	$vb->add (new DC::UI::FancyFrame
1766	label => "Currently playing music",	1785	label => "Currently playing music",
1767	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,	1786	child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1768	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),	1787	child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1769	);	1788	);
1770		1789
1771	$vb->add (new CFPlus::UI::FancyFrame	1790	$vb->add (new DC::UI::FancyFrame
1772	label => "Other media used in this session",	1791	label => "Other media used in this session",
1773	expand => 1,	1792	expand => 1,
1774	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller	1793	child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1775	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),	1794	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1776	);	1795	);
1777		1796
1778	$vb	1797	$vb
1779	}	1798	}
…		…
1788	or return;	1807	or return;
1789		1808
1790	$LICENSE_WIDGET->add_paragraph ({	1809	$LICENSE_WIDGET->add_paragraph ({
1791	fg => [1, 1, 1, 1],	1810	fg => [1, 1, 1, 1],
1792	markup => "<small>"	1811	markup => "<small>"
1793	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"	1812	. "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1794	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"	1813	. "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1795	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"	1814	. "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1796	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"	1815	. "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1797	. "</small>",	1816	. "</small>",
1798	});	1817	});
1799	$LICENSE_WIDGET->scroll_to_bottom;	1818	$LICENSE_WIDGET->scroll_to_bottom;
1800	}	1819	}
1801		1820
…		…
1809	$PL_WINDOW->show;	1828	$PL_WINDOW->show;
1810	}	1829	}
1811	}	1830	}
1812		1831
1813	sub player_window {	1832	sub player_window {
1814	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel	1833	my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1815	x => "center",	1834	x => "center",
1816	y => "center",	1835	y => "center",
1817	force_w => $WIDTH * 9/10,	1836	force_w => $WIDTH * 9/10,
1818	force_h => $HEIGHT * 9/10,	1837	force_h => $HEIGHT * 9/10,
1819	title => "Player",	1838	title => "Player",
…		…
1821	has_close_button => 1	1840	has_close_button => 1
1822	;	1841	;
1823		1842
1824	my $ntb =	1843	my $ntb =
1825	$PL_NOTEBOOK =	1844	$PL_NOTEBOOK =
1826	new CFPlus::UI::Notebook expand => 1;	1845	new DC::UI::Notebook expand => 1;
1827		1846
1828	$ntb->add_tab (	1847	$ntb->add_tab (
1829	"Statistics (F2)" => $STATS_PAGE = stats_window,	1848	"Statistics (F2)" => $STATS_PAGE = stats_window,
1830	"Shows statistics, where all your Stats and Resistances are shown."	1849	"Shows statistics, where all your Stats and Resistances are shown."
1831	);	1850	);
1832	$ntb->add_tab (	1851	$ntb->add_tab (
1833	"Skills (F3)" => $SKILL_PAGE = skill_window,	1852	"Skills (F3)" => $SKILL_PAGE = skill_window,
1834	"Shows all your Skills."	1853	"Shows all your Skills."
1835	);	1854	);
1836		1855
1837	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1856	my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1838	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1857	$spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1839	$ntb->add_tab (	1858	$ntb->add_tab (
1840	"Spellbook (F4)" => $spellsw,	1859	"Spellbook (F4)" => $spellsw,
1841	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1860	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1842	);	1861	);
1843	$ntb->add_tab (	1862	$ntb->add_tab (
…		…
1856	$plwin->add ($ntb);	1875	$plwin->add ($ntb);
1857	$plwin	1876	$plwin
1858	}	1877	}
1859		1878
1860	sub keyboard_setup {	1879	sub keyboard_setup {
1861	CFPlus::Macro::keyboard_setup	1880	DC::Macro::keyboard_setup
1862	}	1881	}
1863		1882
1864	sub help_window {	1883	sub help_window {
1865	my $win = new CFPlus::UI::Toplevel	1884	my $win = new DC::UI::Toplevel
1866	x => 'center',	1885	x => 'center',
1867	y => 'center',	1886	y => 'center',
1868	z => 4,	1887	z => 4,
1869	name => 'doc_browser',	1888	name => 'doc_browser',
1870	force_w => int $WIDTH * 7/8,	1889	force_w => int $WIDTH * 7/8,
1871	force_h => int $HEIGHT * 7/8,	1890	force_h => int $HEIGHT * 7/8,
1872	title => "Help Browser",	1891	title => "Help Browser",
1873	has_close_button => 1;	1892	has_close_button => 1;
1874		1893
1875	$win->add (my $vbox = new CFPlus::UI::VBox);	1894	$win->add (my $vbox = new DC::UI::VBox);
1876		1895
1877	$vbox->add (new CFPlus::UI::FancyFrame	1896	$vbox->add (new DC::UI::FancyFrame
1878	label => "Navigation",	1897	label => "Navigation",
1879	child => (my $buttons = new CFPlus::UI::HBox),	1898	child => (my $buttons = new DC::UI::HBox),
1880	);	1899	);
1881	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	1900	$vbox->add (my $viewer = new DC::UI::TextScroller
1882	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	1901	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1883		1902
1884	my @history;	1903	my @history;
1885	my @future;	1904	my @future;
1886	my $curnode;	1905	my $curnode;
…		…
1888	my $load_node; $load_node = sub {	1907	my $load_node; $load_node = sub {
1889	my ($node, $para) = @_;	1908	my ($node, $para) = @_;
1890		1909
1891	$buttons->clear;	1910	$buttons->clear;
1892		1911
1893	$buttons->add (new CFPlus::UI::Button	1912	$buttons->add (new DC::UI::Button
1894	text => "⇤",	1913	text => "⇤",
1895	tooltip => "back to the starting page",	1914	tooltip => "back to the starting page",
1896	on_activate => sub {	1915	on_activate => sub {
1897	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;	1916	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1898	unshift @future, @history;	1917	unshift @future, @history;
…		…
1900	$load_node->(@{shift @future});	1919	$load_node->(@{shift @future});
1901	},	1920	},
1902	);	1921	);
1903		1922
1904	if (@history) {	1923	if (@history) {
1905	$buttons->add (new CFPlus::UI::Button	1924	$buttons->add (new DC::UI::Button
1906	text => "⋘",	1925	text => "⋘",
1907	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",	1926	tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1908	on_activate => sub {	1927	on_activate => sub {
1909	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;	1928	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1910	$load_node->(@{pop @history});	1929	$load_node->(@{pop @history});
1911	},	1930	},
1912	);	1931	);
1913	}	1932	}
1914		1933
1915	if (@future) {	1934	if (@future) {
1916	$buttons->add (new CFPlus::UI::Button	1935	$buttons->add (new DC::UI::Button
1917	text => "⋙",	1936	text => "⋙",
1918	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",	1937	tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1919	on_activate => sub {	1938	on_activate => sub {
1920	push @history, [$curnode, $viewer->current_paragraph];	1939	push @history, [$curnode, $viewer->current_paragraph];
1921	$load_node->(@{shift @future});	1940	$load_node->(@{shift @future});
1922	},	1941	},
1923	);	1942	);
1924	}	1943	}
1925		1944
1926	$buttons->add (new CFPlus::UI::Label text => " ");	1945	$buttons->add (new DC::UI::Label text => " ");
1927		1946
1928	my @path = CFPlus::Pod::full_path_of $node;	1947	my @path = DC::Pod::full_path_of $node;
1929	pop @path; # drop current node	1948	pop @path; # drop current node
1930		1949
1931	for my $node (@path) {	1950	for my $node (@path) {
1932	$buttons->add (new CFPlus::UI::Button	1951	$buttons->add (new DC::UI::Button
1933	text => $node->{kw}[0],	1952	text => $node->{kw}[0],
1934	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",	1953	tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1935	on_activate => sub {	1954	on_activate => sub {
1936	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	1955	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1937	$load_node->($node);	1956	$load_node->($node);
1938	},	1957	},
1939	);	1958	);
1940	$buttons->add (new CFPlus::UI::Label text => "/");	1959	$buttons->add (new DC::UI::Label text => "/");
1941	}	1960	}
1942		1961
1943	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);	1962	$buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1944		1963
1945	$curnode = $node;	1964	$curnode = $node;
1946		1965
1947	$viewer->clear;	1966	$viewer->clear;
1948	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);	1967	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1949	$viewer->scroll_to ($para);	1968	$viewer->scroll_to ($para);
1950	};	1969	};
1951		1970
1952	$load_node->(CFPlus::Pod::find pod => "mainpage");	1971	$load_node->(DC::Pod::find pod => "mainpage");
1953		1972
1954	$CFPlus::Pod::goto_document = sub {	1973	$DC::Pod::goto_document = sub {
1955	my (@path) = @_;	1974	my (@path) = @_;
1956		1975
1957	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	1976	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1958		1977
1959	$load_node->((CFPlus::Pod::find @path)[0]);	1978	$load_node->((DC::Pod::find @path)[0]);
1960	$win->show;	1979	$win->show;
1961	};	1980	};
1962		1981
1963	$win	1982	$win
1964	}	1983	}
1965		1984
1966	sub open_string_query {	1985	sub open_string_query {
1967	my ($title, $cb, $txt, $tooltip) = @_;	1986	my ($title, $cb, $txt, $tooltip) = @_;
1968	my $dialog = new CFPlus::UI::Toplevel	1987	my $dialog = new DC::UI::Toplevel
1969	x => "center",	1988	x => "center",
1970	y => "center",	1989	y => "center",
1971	z => 50,	1990	z => 50,
1972	force_w => $WIDTH * 4/5,	1991	force_w => $WIDTH * 4/5,
1973	title => $title;	1992	title => $title;
1974		1993
1975	$dialog->add (	1994	$dialog->add (
1976	my $e = new CFPlus::UI::Entry	1995	my $e = new DC::UI::Entry
1977	on_activate => sub { $cb->(@_); $dialog->hide; 0 },	1996	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1978	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },	1997	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1979	tooltip => $tooltip	1998	tooltip => $tooltip
1980	);	1999	);
1981		2000
…		…
1984	$dialog->show;	2003	$dialog->show;
1985	}	2004	}
1986		2005
1987	sub open_quit_dialog {	2006	sub open_quit_dialog {
1988	unless ($QUIT_DIALOG) {	2007	unless ($QUIT_DIALOG) {
1989	$QUIT_DIALOG = new CFPlus::UI::Toplevel	2008	$QUIT_DIALOG = new DC::UI::Toplevel
1990	x => "center",	2009	x => "center",
1991	y => "center",	2010	y => "center",
1992	z => 50,	2011	z => 50,
1993	title => "Really Quit?",	2012	title => "Really Quit?",
1994	on_key_down => sub {	2013	on_key_down => sub {
1995	my ($dialog, $ev) = @_;	2014	my ($dialog, $ev) = @_;
1996	$ev->{sym} == 27 and $dialog->hide;	2015	$ev->{sym} == 27 and $dialog->hide;
1997	}	2016	}
1998	;	2017	;
1999		2018
2000	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);	2019	$QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2001		2020
2002	$vb->add (new CFPlus::UI::Label	2021	$vb->add (new DC::UI::Label
2003	text => "You should find a savebed and apply it first!",	2022	text => "You should find a savebed and apply it first!",
2004	max_w => $WIDTH * 0.25,	2023	max_w => $WIDTH * 0.25,
2005	ellipsize => 0,	2024	ellipsize => 0,
2006	);	2025	);
2007	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);	2026	$vb->add (my $hb = new DC::UI::HBox expand => 1);
2008	$hb->add (new CFPlus::UI::Button	2027	$hb->add (new DC::UI::Button
2009	text => "Ok",	2028	text => "Ok",
2010	expand => 1,	2029	expand => 1,
2011	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2030	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2012	);	2031	);
2013	$hb->add (new CFPlus::UI::Button	2032	$hb->add (new DC::UI::Button
2014	text => "Quit anyway",	2033	text => "Quit anyway",
2015	expand => 1,	2034	expand => 1,
2016	on_activate => sub { EV::unloop EV::UNLOOP_ALL },	2035	on_activate => sub { EV::unloop EV::UNLOOP_ALL },
2017	);	2036	);
2018	}	2037	}
…		…
2021	$QUIT_DIALOG->grab_focus;	2040	$QUIT_DIALOG->grab_focus;
2022	}	2041	}
2023		2042
2024	sub show_tip_of_the_day {	2043	sub show_tip_of_the_day {
2025	# find all tips	2044	# find all tips
2026	my @tod = CFPlus::Pod::find tip_of_the_day => "*";	2045	my @tod = DC::Pod::find tip_of_the_day => "*";
2027		2046
2028	CFPlus::DB::get state => "tip_of_the_day", sub {	2047	DC::DB::get state => "tip_of_the_day", sub {
2029	my ($todindex) = @_;	2048	my ($todindex) = @_;
2030	$todindex = 0 if $todindex >= @tod;	2049	$todindex = 0 if $todindex >= @tod;
2031	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };	2050	DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2032		2051
2033	# create dialog	2052	# create dialog
2034	my $dialog;	2053	my $dialog;
2035		2054
2036	my $close = sub {	2055	my $close = sub {
2037	$dialog->destroy;	2056	$dialog->destroy;
2038	};	2057	};
2039		2058
2040	$dialog = new CFPlus::UI::Toplevel	2059	$dialog = new DC::UI::Toplevel
2041	x => "center",	2060	x => "center",
2042	y => "center",	2061	y => "center",
2043	z => 3,	2062	z => 3,
2044	name => 'tip_of_the_day',	2063	name => 'tip_of_the_day',
2045	force_w => int $WIDTH * 4/9,	2064	force_w => int $WIDTH * 4/9,
2046	force_h => int $WIDTH * 2/9,	2065	force_h => int $WIDTH * 2/9,
2047	title => "Tip of the day #" . (1 + $todindex),	2066	title => "Tip of the day #" . (1 + $todindex),
2048	child => my $vbox = new CFPlus::UI::VBox,	2067	child => my $vbox = new DC::UI::VBox,
2049	has_close_button => 1,	2068	has_close_button => 1,
2050	on_delete => $close,	2069	on_delete => $close,
2051	;	2070	;
2052		2071
2053	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	2072	$vbox->add (my $viewer = new DC::UI::TextScroller
2054	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	2073	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2055	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);	2074	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2056		2075
2057	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);	2076	$vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2058		2077
2059	$table->add_at (0, 0, new CFPlus::UI::Button	2078	$table->add_at (0, 0, new DC::UI::Button
2060	text => "Close",	2079	text => "Close",
2061	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>.",	2080	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>.",
2062	on_activate => $close,	2081	on_activate => $close,
2063	);	2082	);
2064		2083
2065	$table->add_at (2, 0, new CFPlus::UI::Button	2084	$table->add_at (2, 0, new DC::UI::Button
2066	text => "Next",	2085	text => "Next",
2067	tooltip => "Show the next <b>Tip of the day</b>.",	2086	tooltip => "Show the next <b>Tip of the day</b>.",
2068	on_activate => sub {	2087	on_activate => sub {
2069	$close->();	2088	$close->();
2070	&show_tip_of_the_day;	2089	&show_tip_of_the_day;
…		…
2074	$dialog->show;	2093	$dialog->show;
2075	};	2094	};
2076	}	2095	}
2077		2096
2078	sub sdl_init {	2097	sub sdl_init {
2079	CFPlus::SDL_Init	2098	DC::SDL_Init
2080	and die "SDL::Init failed!\n";	2099	and die "SDL::Init failed!\n";
2081	}	2100	}
2082		2101
2083	sub video_init {	2102	sub video_init {
2084	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	2103	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
…		…
2087		2106
2088	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2107	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2089	$FULLSCREEN = $CFG->{fullscreen};	2108	$FULLSCREEN = $CFG->{fullscreen};
2090	$FAST = $CFG->{fast};	2109	$FAST = $CFG->{fast};
2091		2110
2092	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2111	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2093	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	2112	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2094		2113
2095	$SDL_ACTIVE = 1;	2114	$SDL_ACTIVE = 1;
2096	$LAST_REFRESH = time - 0.01;	2115	$LAST_REFRESH = time - 0.01;
2097		2116
2098	CFPlus::OpenGL::init;	2117	DC::OpenGL::init;
2099	CFPlus::Macro::init;	2118	DC::Macro::init;
2100		2119
2101	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	2120	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2102		2121
2103	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	2122	$DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2104		2123
2105	#############################################################################	2124	#############################################################################
2106		2125
2107	if ($DEBUG_STATUS) {	2126	if ($DEBUG_STATUS) {
2108	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	2127	DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2109	} else {	2128	} else {
2110	# create/configure the widgets	2129	# create/configure the widgets
2111		2130
2112	$CFPlus::UI::ROOT->connect (key_down => sub {	2131	$DC::UI::ROOT->connect (key_down => sub {
2113	my (undef, $ev) = @_;	2132	my (undef, $ev) = @_;
2114		2133
2115	if (my @macros = CFPlus::Macro::find $ev) {	2134	if (my @macros = DC::Macro::find $ev) {
2116	CFPlus::Macro::execute $_ for @macros;	2135	DC::Macro::execute $_ for @macros;
2117		2136
2118	return 1;	2137	return 1;
2119	}	2138	}
2120		2139
2121	0	2140	0
2122	});	2141	});
2123		2142
2124	$DEBUG_STATUS = new CFPlus::UI::Label	2143	$DEBUG_STATUS = new DC::UI::Label
2125	padding => 0,	2144	padding => 0,
2126	z => 100,	2145	z => 100,
2127	force_x => "max",	2146	force_x => "max",
2128	force_y => 0;	2147	force_y => 0;
2129	$DEBUG_STATUS->show;	2148	$DEBUG_STATUS->show;
2130		2149
2131	$STATUSBOX = new CFPlus::UI::Statusbox;	2150	$STATUSBOX = new DC::UI::Statusbox;
2132	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	2151	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
2133		2152
2134	(new CFPlus::UI::Frame	2153	(new DC::UI::Frame
2135	bg => [0, 0, 0, 0.4],	2154	bg => [0, 0, 0, 0.4],
2136	force_x => 0,	2155	force_x => 0,
2137	force_y => "max",	2156	force_y => "max",
2138	child => $STATUSBOX,	2157	child => $STATUSBOX,
2139	)->show;	2158	)->show;
2140		2159
2141	CFPlus::UI::Toplevel->new (	2160	DC::UI::Toplevel->new (
2142	title => "Minimap",	2161	title => "Minimap",
2143	name => "mapmap",	2162	name => "mapmap",
2144	x => 0,	2163	x => 0,
2145	y => $FONTSIZE + 8,	2164	y => $FONTSIZE + 8,
2146	border_bg => [1, 1, 1, 192/255],	2165	border_bg => [1, 1, 1, 192/255],
2147	bg => [1, 1, 1, 0],	2166	bg => [1, 1, 1, 0],
2148	child => ($MAPMAP = new CFPlus::MapWidget::MapMap	2167	child => ($MAPMAP = new DC::MapWidget::MapMap
2149	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	2168	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2150	),	2169	),
2151	)->show;	2170	)->show;
2152		2171
2153	$MAPWIDGET = new CFPlus::MapWidget;	2172	$MAPWIDGET = new DC::MapWidget;
2154	$MAPWIDGET->connect (activate_console => sub {	2173	$MAPWIDGET->connect (activate_console => sub {
2155	my ($mapwidget, $preset) = @_;	2174	my ($mapwidget, $preset) = @_;
2156		2175
2157	$MESSAGE_WINDOW->activate_console ($preset)	2176	$MESSAGE_WINDOW->activate_console ($preset)
2158	if $MESSAGE_WINDOW;	2177	if $MESSAGE_WINDOW;
2159	});	2178	});
2160	$MAPWIDGET->show;	2179	$MAPWIDGET->show;
2161	$MAPWIDGET->grab_focus;	2180	$MAPWIDGET->grab_focus;
2162		2181
2163	$COMPLETER = new CFPlus::MapWidget::Command::	2182	$COMPLETER = new DC::MapWidget::Command::
2164	command => { },	2183	command => { },
2165	tooltip => "#completer_help",	2184	tooltip => "#completer_help",
2166	;	2185	;
2167		2186
2168	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2187	$SETUP_DIALOG = new DC::UI::Toplevel
2169	title => "Setup",	2188	title => "Setup",
2170	name => "setup_dialog",	2189	name => "setup_dialog",
2171	x => 'center',	2190	x => 'center',
2172	y => 'center',	2191	y => 'center',
2173	z => 2,	2192	z => 2,
…		…
2175	force_h => $::HEIGHT * 0.6,	2194	force_h => $::HEIGHT * 0.6,
2176	has_close_button => 1,	2195	has_close_button => 1,
2177	;	2196	;
2178		2197
2179	$METASERVER = metaserver_dialog;	2198	$METASERVER = metaserver_dialog;
2180	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;	2199	$MESSAGE_WINDOW = new DC::UI::MessageWindow;
2181		2200
2182	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	2201	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
2183	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	2202	filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2184		2203
2185	$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,	2204	$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2186	"Configure the server to play on, your username and password.");	2205	"Configure the server to play on, your username and password.");
2187	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,	2206	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2188	"Configure other server related options.");	2207	"Configure other server related options.");
…		…
2200	. "After pressing the combo the binding will be saved automatically and the "	2219	. "After pressing the combo the binding will be saved automatically and the "
2201	. "binding editor closes");	2220	. "binding editor closes");
2202	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,	2221	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2203	"Some debuggin' options. Do not ask.");	2222	"Some debuggin' options. Do not ask.");
2204		2223
2205	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2224	$BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2206		2225
2207	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2226	$BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2208	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2227	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2209		2228
2210	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,	2229	$BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2211	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2230	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2212		2231
2213	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	2232	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
2214		2233
2215	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	2234	$BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2216	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	2235	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2217		2236
2218	$BUTTONBAR->add (new CFPlus::UI::Button	2237	$BUTTONBAR->add (new DC::UI::Button
2219	text => "Save Config",	2238	text => "Save Config",
2220	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	2239	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2221	on_activate => sub {	2240	on_activate => sub {
2222	$::CFG->{layout} = CFPlus::UI::get_layout;	2241	$::CFG->{layout} = DC::UI::get_layout;
2223	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";	2242	DC::write_cfg "$Deliantra::VARDIR/client.cf";
2224	status "Configuration Saved";	2243	status "Configuration Saved";
2225	0	2244	0
2226	},	2245	},
2227	);	2246	);
2228		2247
2229	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	2248	$BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2230	tooltip => "View Documentation");	2249	tooltip => "View Documentation");
2231		2250
2232		2251
2233	$BUTTONBAR->add (new CFPlus::UI::Button	2252	$BUTTONBAR->add (new DC::UI::Button
2234	text => "Quit",	2253	text => "Quit",
2235	tooltip => "Terminates the program",	2254	tooltip => "Terminates the program",
2236	on_activate => sub {	2255	on_activate => sub {
2237	if ($CONN) {	2256	if ($CONN) {
2238	open_quit_dialog;	2257	open_quit_dialog;
…		…
2250		2269
2251	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2270	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2252	}	2271	}
2253		2272
2254	sub video_shutdown {	2273	sub video_shutdown {
2255	CFPlus::OpenGL::shutdown;	2274	DC::OpenGL::shutdown;
2256		2275
2257	undef $SDL_ACTIVE;	2276	undef $SDL_ACTIVE;
2258	}	2277	}
2259		2278
2260	my %animate_object;	2279	my %animate_object;
2261	my $animate_timer;	2280	my $animate_timer;
2262		2281
2263	my $fps = 9;	2282	my $fps = 9;
2264		2283
2265	sub force_refresh {	2284	sub force_refresh {
2266	$WANT_REFRESH->stop;
2267
2268	if ($ENV{CFPLUS_DEBUG} & 4) {	2285	if ($ENV{CFPLUS_DEBUG} & 4) {
2269	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;	2286	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2270	debug sprintf "%3.2f", $fps;	2287	debug sprintf "%3.2f", $fps;
2271	}	2288	}
2272		2289
		2290	undef $WANT_REFRESH;
		2291	$_[0]->stop;
		2292
2273	$CFPlus::UI::ROOT->draw;	2293	$DC::UI::ROOT->draw;
2274	CFPlus::SDL_GL_SwapBuffers;	2294	DC::SDL_GL_SwapBuffers;
2275	$LAST_REFRESH = $NOW;	2295	$LAST_REFRESH = $NOW;
2276	}	2296	}
2277		2297
2278	$WANT_REFRESH = EV::idle_ns \&force_refresh;	2298	my $want_refresh = EV::prepare_ns \&force_refresh;
2279		2299
2280	my $input = EV::timer 0, 1/60, sub {	2300	my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2281	$NOW = time;	2301	$NOW = EV::now;
2282		2302
2283	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2303	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2284	for CFPlus::poll_events;	2304	for DC::poll_events;
2285		2305
2286	if (%animate_object) {	2306	if (%animate_object) {
2287	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2307	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2288	$WANT_REFRESH->start;	2308	$WANT_REFRESH = 1;
2289	}	2309	}
		2310
		2311	$want_refresh->start
		2312	if $WANT_REFRESH;
2290	};	2313	};
2291		2314
2292	sub animation_start {	2315	sub animation_start {
2293	my ($widget) = @_;	2316	my ($widget) = @_;
2294	$animate_object{$widget} = $widget;	2317	$animate_object{$widget} = $widget;
…		…
2298	my ($widget) = @_;	2321	my ($widget) = @_;
2299	delete $animate_object{$widget};	2322	delete $animate_object{$widget};
2300	}	2323	}
2301		2324
2302	%SDL_CB = (	2325	%SDL_CB = (
2303	CFPlus::SDL_QUIT => sub {	2326	DC::SDL_QUIT => sub {
2304	EV::unloop EV::UNLOOP_ALL;	2327	EV::unloop EV::UNLOOP_ALL;
2305	},	2328	},
2306	CFPlus::SDL_VIDEORESIZE => sub {	2329	DC::SDL_VIDEORESIZE => sub {
2307	},	2330	},
2308	CFPlus::SDL_VIDEOEXPOSE => sub {	2331	DC::SDL_VIDEOEXPOSE => sub {
2309	CFPlus::UI::full_refresh;	2332	DC::UI::full_refresh;
2310	},	2333	},
2311	CFPlus::SDL_ACTIVEEVENT => sub {	2334	DC::SDL_ACTIVEEVENT => sub {
2312	# not useful, as APPACTIVE include sonly iconified state, not unmapped	2335	# not useful, as APPACTIVE includes only iconified state, not unmapped
2313	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#	2336	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2314	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#	2337	# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2315	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;	2338	# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2316	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;	2339	# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2317	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;	2340	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2318	},	2341	},
2319	CFPlus::SDL_KEYDOWN => sub {	2342	DC::SDL_KEYDOWN => sub {
2320	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {	2343	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2321	# alt-enter	2344	# alt-enter
2322	$FULLSCREEN_ENABLE->toggle;	2345	$FULLSCREEN_ENABLE->toggle;
2323	video_shutdown;	2346	video_shutdown;
2324	video_init;	2347	video_init;
2325	} else {	2348	} else {
2326	CFPlus::UI::feed_sdl_key_down_event ($_[0]);	2349	DC::UI::feed_sdl_key_down_event ($_[0]);
2327	}	2350	}
2328	},	2351	},
2329	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,	2352	DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event,
2330	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,	2353	DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2331	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,	2354	DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2332	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,	2355	DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2333	CFPlus::SDL_USEREVENT => sub {	2356	DC::SDL_USEREVENT => sub {
2334	if ($_[0]{code} == 1) {	2357	if ($_[0]{code} == 1) {
2335	audio_channel_finished $_[0]{data1};	2358	audio_channel_finished $_[0]{data1};
2336	} elsif ($_[0]{code} == 0) {	2359	} elsif ($_[0]{code} == 0) {
2337	audio_music_finished;	2360	audio_music_finished;
2338	}	2361	}
2339	},	2362	},
2340	);	2363	);
2341		2364
2342	#############################################################################	2365	#############################################################################
2343		2366
2344	$SIG{INT} = $SIG{TERM} = sub { exit };	2367	$SIG{INT} = $SIG{TERM} = sub {
		2368	EV::unloop;
		2369	#d# TODO calling exit here hangs the process in some futex
		2370	};
2345		2371
2346	{	2372	{
2347	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";	2373	if (-e "$Deliantra::VARDIR/client.cf") {
		2374	DC::read_cfg "$Deliantra::VARDIR/client.cf";
		2375	} else {
		2376	#TODO: compatibility cruft
		2377	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
		2378	print STDERR "INFO: used old configuratrion file\n";
		2379	}
		2380
2348	CFPlus::DB::Server::run;	2381	DC::DB::Server::run;
2349		2382
2350	CFPlus::UI::set_layout ($::CFG->{layout});	2383	DC::UI::set_layout ($::CFG->{layout});
2351		2384
2352	my %DEF_CFG = (	2385	my %DEF_CFG = (
2353	sdl_mode => 0,	2386	sdl_mode => 0,
2354	fullscreen => 1,	2387	fullscreen => 1,
2355	fast => 0,	2388	fast => 0,
…		…
2401	}	2434	}
2402	}	2435	}
2403		2436
2404	sdl_init;	2437	sdl_init;
2405		2438
2406	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;	2439	@SDL_MODES = DC::SDL_ListModes 8, 8;
2407	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;	2440	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2408	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2441	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2409		2442
2410	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;	2443	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2411		2444
2412	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2445	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2413		2446
2414	{	2447	{
2415	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2448	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2416	DejaVuSans.ttf	2449	DejaVuSans.ttf
2417	DejaVuSansMono.ttf	2450	DejaVuSansMono.ttf
2418	DejaVuSans-Bold.ttf	2451	DejaVuSans-Bold.ttf
2419	DejaVuSansMono-Bold.ttf	2452	DejaVuSansMono-Bold.ttf
2420	DejaVuSans-Oblique.ttf	2453	DejaVuSans-Oblique.ttf
2421	DejaVuSansMono-Oblique.ttf	2454	DejaVuSansMono-Oblique.ttf
2422	DejaVuSans-BoldOblique.ttf	2455	DejaVuSans-BoldOblique.ttf
2423	DejaVuSansMono-BoldOblique.ttf	2456	DejaVuSansMono-BoldOblique.ttf
2424	);	2457	);
2425		2458
2426	CFPlus::add_font $_ for @fonts;	2459	DC::add_font $_ for @fonts;
2427		2460
2428	CFPlus::pango_init;	2461	DC::pango_init;
2429		2462
2430	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];	2463	$FONT_PROP = new_from_file DC::Font $fonts[0];
2431	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];	2464	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2432		2465
2433	$FONT_PROP->make_default;	2466	$FONT_PROP->make_default;
2434	}	2467	}
2435		2468
2436	# compare mono (ft) vs. rgba (cairo)	2469	# compare mono (ft) vs. rgba (cairo)
2437	# ft - 1.8s, cairo 3s, even in alpha-only mode	2470	# ft - 1.8s, cairo 3s, even in alpha-only mode
2438	# for my $rgba (0..1) {	2471	# for my $rgba (0..1) {
2439	# my $t1 = Time::HiRes::time;	2472	# my $t1 = Time::HiRes::time;
2440	# for (1..1000) {	2473	# for (1..1000) {
2441	# my $layout = CFPlus::Layout->new ($rgba);	2474	# my $layout = DC::Layout->new ($rgba);
2442	# $layout->set_text ("hallo" x 100);	2475	# $layout->set_text ("hallo" x 100);
2443	# $layout->render;	2476	# $layout->render;
2444	# }	2477	# }
2445	# my $t2 = Time::HiRes::time;	2478	# my $t2 = Time::HiRes::time;
2446	# warn $t2-$t1;	2479	# warn $t2-$t1;
…		…
2459		2492
2460	EV::loop;	2493	EV::loop;
2461		2494
2462	#video_shutdown;	2495	#video_shutdown;
2463	#audio_shutdown;	2496	#audio_shutdown;
		2497	DC::OpenGL::quit;
2464	CFPlus::SDL_Quit;	2498	DC::SDL_Quit;
2465	CFPlus::DB::Server::stop;	2499	DC::DB::Server::stop;
2466		2500
2467	=head1 NAME	2501	=head1 NAME
2468		2502
2469	deliantra - A Deliantra MORPG game client	2503	deliantra - A Deliantra MORPG game client
2470		2504

Diff Legend

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