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

Diff Legend

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