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

Diff Legend

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