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.1 by root, Sun Oct 14 15:33:31 2007 UTC vs.
Revision 1.28 by root, Thu Mar 20 22:28:35 2008 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";
		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;
		113	use DC::UI::Dockbar;
93	use CFPlus::UI::MessageWindow;	114	use DC::UI::MessageWindow;
94	use CFPlus::UI::ChatView;	115	use DC::UI::ChatView;
		116	use DC::MessageDistributor;
95	use CFPlus::Pod;	117	use DC::Pod;
96	use CFPlus::MapWidget;	118	use DC::MapWidget;
97	use CFPlus::Macro;	119	use DC::Macro;
98		120
99	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	121	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
100	$SIG{PIPE} = 'IGNORE';	122	$SIG{PIPE} = 'IGNORE';
101		123
102	$Event::Eval = 1;
103	$Event::DIED = sub {	124	$EV::DIED = sub {
104	CFPlus::fatal Carp::longmess $_[1]	125	DC::fatal Carp::longmess $@;
105	};	126	};
106		127
107	my $MAX_FPS = 60;	128	my $MAX_FPS = 60;
108	my $MIN_FPS = 5; # unused as of yet
109		129
110	our $META_SERVER = "http://metaserver.schmorp.de/current.json";	130	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
111		131
112	our $LAST_REFRESH;	132	our $LAST_REFRESH;
113	our $NOW;	133	our $NOW;
…		…
160	our $SPELL_PAGE;	180	our $SPELL_PAGE;
161	our $SPELL_LIST;	181	our $SPELL_LIST;
162		182
163	our $HELP_WINDOW;	183	our $HELP_WINDOW;
164	our $MESSAGE_WINDOW;	184	our $MESSAGE_WINDOW;
		185	our $MESSAGE_DIST;
165	our $FLOORBOX;	186	our $FLOORBOX;
166	our $GAUGES;	187	our $GAUGES;
167	our $STATWIDS;	188	our $STATWIDS;
168		189
169	our $SDL_ACTIVE;	190	our $SDL_ACTIVE;
…		…
178	our $INVR_HB;	199	our $INVR_HB;
179		200
180	#############################################################################	201	#############################################################################
181		202
182	sub status {	203	sub status {
183	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	204	$STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
184	}	205	}
185		206
186	sub debug {	207	sub debug {
187	$DEBUG_STATUS->set_text ($_[0]);	208	$DEBUG_STATUS->set_text ($_[0]);
188	}	209	}
189		210
190	sub message {	211	sub message {
191	$MESSAGE_WINDOW->message (@_);	212	$MESSAGE_DIST->message (@_);
192	}	213	}
193		214
194	#############################################################################	215	#############################################################################
195	#TODO: maybe move into own audio module...	216	#TODO: maybe move into own audio module...
196		217
…		…
223		244
224	$AUDIO_PLAY{$face}	245	$AUDIO_PLAY{$face}
225	or return;	246	or return;
226		247
227	if (my $chunk = $AUDIO_CHUNK{$face}) {	248	if (my $chunk = $AUDIO_CHUNK{$face}) {
228	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {	249	for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
229	my (undef, $dx, $dy, $vol) = @$_;	250	my (undef, $dx, $dy, $vol) = @$_;
230		251
231	my $channel = CFPlus::Channel::find;	252	my $channel = DC::Channel::find;
232	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);	253	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
233	$channel->set_position_r ($dx, $dy, 20);	254	$channel->set_position_r ($dx, $dy, 20);
234	$chunk->play ($channel);	255	$chunk->play ($channel);
235	}	256	}
236	} else {	257	} else {
…		…
247	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue	268	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
248	&audio_music_push ($face);	269	&audio_music_push ($face);
249	}	270	}
250	} else {	271	} else {
251	# fetch from database	272	# fetch from database
252	CFPlus::DB::get res_data => $meta->{name}, sub {	273	DC::DB::get res_data => $meta->{name}, sub {
253	my $rwops = new CFPlus::RW $_[0];	274	my $rwops = new DC::RW $_[0];
254	my $chunk = new CFPlus::MixChunk $rwops	275	my $chunk = new DC::MixChunk $rwops
255	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;	276	or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;
256	$chunk->volume (($meta->{data}{volume} || 1) * 128);	277	$chunk->volume (($meta->{data}{volume} || 1) * 128);
257	$AUDIO_CHUNK{$face} = $chunk;	278	$AUDIO_CHUNK{$face} = $chunk;
258		279
259	audio_sound_push ($face);	280	audio_sound_push ($face);
260	};	281	};
…		…
269	or return;	290	or return;
270	$CFG->{effects_enable}	291	$CFG->{effects_enable}
271	or return;	292	or return;
272		293
273	my $queue = $AUDIO_PLAY{$face} ||= [];	294	my $queue = $AUDIO_PLAY{$face} ||= [];
274	push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events	295	push @$queue, [EV::now + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
275	audio_sound_push $face	296	audio_sound_push $face
276	unless @$queue > 1;	297	unless @$queue > 1;
277	}	298	}
278		299
279	sub audio_music_set_meta {	300	sub audio_music_set_meta {
280	my ($meta) = @_;	301	my ($meta) = @_;
281		302
282	$MUSIC_PLAYING_META = $meta;	303	$MUSIC_PLAYING_META = $meta;
283	$MUSIC_PLAYING_WIDGET->set_markup (	304	$MUSIC_PLAYING_WIDGET->set_markup (
284	"<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"	305	"<b>Name</b>: " . (DC::asxml $meta->{data}{name}) . "\n"
285	. "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"	306	. "<b>Author</b>: " . (DC::asxml $meta->{data}{author}) . "\n"
286	. "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"	307	. "<b>Source</b>: " . (DC::asxml $meta->{data}{source}) . "\n"
287	. "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})	308	. "<b>License</b>: " . (DC::asxml $meta->{data}{license})
288	);	309	);
289	}	310	}
290		311
291	sub audio_music_update_volume {	312	sub audio_music_update_volume {
292	return unless $MUSIC_PLAYING_META;	313	return unless $MUSIC_PLAYING_META;
293	my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;	314	my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
294	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};	315	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
295	CFPlus::MixMusic::volume $base * $volume * 128;	316	DC::MixMusic::volume $base * $volume * 128;
296	}	317	}
297		318
298	sub audio_music_start {	319	sub audio_music_start {
299	my $meta = $MUSIC_PLAYING_META;	320	my $meta = $MUSIC_PLAYING_META;
300		321
301	CFPlus::DB::get res_data => $meta->{name}, sub {	322	DC::DB::get res_data => $meta->{name}, sub {
302	return unless $SDL_MIXER;	323	return unless $SDL_MIXER;
303		324
304	# music might have changed...	325	# music might have changed...
305	$meta eq $MUSIC_PLAYING_META	326	$meta eq $MUSIC_PLAYING_META
306	or return &audio_music_start ();	327	or return &audio_music_start ();
…		…
308	audio_music_update_volume;	329	audio_music_update_volume;
309		330
310	$MUSIC_PLAYING_DATA = \$_[0];	331	$MUSIC_PLAYING_DATA = \$_[0];
311		332
312	my $rwops = $meta->{path}	333	my $rwops = $meta->{path}
313	? new_from_file CFPlus::RW $meta->{path}	334	? new_from_file DC::RW $meta->{path}
314	: new CFPlus::RW $$MUSIC_PLAYING_DATA;	335	: new DC::RW $$MUSIC_PLAYING_DATA;
315		336
316	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops	337	$MUSIC_PLAYER = new DC::MixMusic $rwops
317	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;	338	or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
318		339
319	my $NOW = time;	340	my $NOW = time;
320		341
321	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {	342	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
322	my $pos = $MUSIC_PLAYING_META->{stop_pos};	343	my $pos = $MUSIC_PLAYING_META->{stop_pos};
…		…
336	return unless $SDL_MIXER;	357	return unless $SDL_MIXER;
337		358
338	my $fade_out;	359	my $fade_out;
339		360
340	if (@MUSIC_JINGLE) {	361	if (@MUSIC_JINGLE) {
		362	$fade_out = 333;
341	@MUSIC_HAVE = $MUSIC_JINGLE[0];	363	@MUSIC_HAVE = $MUSIC_JINGLE[0];
342	$fade_out = 333;	364
343	} else {	365	} else {
344	return unless $CFG->{bgm_enable};	366	return unless $CFG->{bgm_enable};
345		367
346	my @have =	368	$fade_out = 700;
		369
		370	@MUSIC_HAVE =
347	grep $_ && $_->{data},	371	grep $_ && $_->{data},
348	map $CONN->{face}[$_],	372	map $CONN->{face}[$_],
349	@$MUSIC_WANT;	373	@$MUSIC_WANT;
350		374
351	# randomize music a bit so that the order is not always the same	375	# randomize music a bit so that the order is not always the same
352	$_->{stop_time} ||= rand for @have;	376	$_->{stop_time} ||= rand for @MUSIC_HAVE;
353
354	@MUSIC_HAVE = @have
355	if @have;
356		377
357	# default MUSIC_HAVE == MUSIC_DEFAULT	378	# default MUSIC_HAVE == MUSIC_DEFAULT
358	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;	379	@MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
359	$fade_out = 700;	380	unless @MUSIC_HAVE;
360	}	381	}
361		382
362	# if the currently playing song is acceptable, let it continue	383	# if the currently playing song is acceptable, let it continue
363	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;	384	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
364		385
365	my $NOW = time;	386	my $NOW = time;
366		387
367	if ($MUSIC_PLAYING_META) {	388	if ($MUSIC_PLAYING_META) {
368	$MUSIC_PLAYING_META->{stop_time} = $NOW;	389	$MUSIC_PLAYING_META->{stop_time} = $NOW;
369	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;	390	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
370	CFPlus::MixMusic::fade_out $fade_out;	391	DC::MixMusic::fade_out $fade_out;
371	} else {	392	} else {
372	# sort by stop time, oldest first	393	# sort by stop time, oldest first
373	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;	394	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
374		395
375	# if the most recently-played piece played very recently,	396	# if the most recently-played piece played very recently,
…		…
409	}	430	}
410		431
411	sub audio_init {	432	sub audio_init {
412	if ($CFG->{audio_enable}) {	433	if ($CFG->{audio_enable}) {
413	$ENV{MIX_EFFECTSMAXSPEED} = 1;	434	$ENV{MIX_EFFECTSMAXSPEED} = 1;
414	$SDL_MIXER = !CFPlus::Mix_OpenAudio	435	$SDL_MIXER = !DC::Mix_OpenAudio
415	$CFG->{audio_hw_frequency},	436	$CFG->{audio_hw_frequency},
416	CFPlus::MIX_DEFAULT_FORMAT,	437	DC::MIX_DEFAULT_FORMAT,
417	$CFG->{audio_hw_channels},	438	$CFG->{audio_hw_channels},
418	$CFG->{audio_hw_chunksize};	439	$CFG->{audio_hw_chunksize};
419		440
420	if ($SDL_MIXER) {	441	if ($SDL_MIXER) {
421	CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};	442	DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
422		443
423	audio_music_finished;	444	audio_music_finished;
424	} else {	445	} else {
425	status "Unable to open sound device: there will be no sound";	446	status "Unable to open sound device: there will be no sound";
426	}	447	}
…		…
440	$MUSIC_WANT = [];	461	$MUSIC_WANT = [];
441	@MUSIC_JINGLE = ();	462	@MUSIC_JINGLE = ();
442	%AUDIO_PLAY = ();	463	%AUDIO_PLAY = ();
443	%AUDIO_CHUNK = ();	464	%AUDIO_CHUNK = ();
444		465
445	CFPlus::Mix_CloseAudio if $SDL_MIXER;	466	DC::Mix_CloseAudio if $SDL_MIXER;
446	undef $SDL_MIXER;	467	undef $SDL_MIXER;
447	}	468	}
448		469
449	#############################################################################	470	#############################################################################
450		471
…		…
461	my ($conn, $flags, $prompt) = @_;	482	my ($conn, $flags, $prompt) = @_;
462		483
463	# FIXME: a very ugly hack to wait for stat update #d#	484	# FIXME: a very ugly hack to wait for stat update #d#
464	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {	485	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
465	unless ($QUERY_TIMER) {	486	unless ($QUERY_TIMER) {
466	$QUERY_TIMER =	487	$QUERY_TIMER = EV::timer 1, 0, sub {
467	Event->timer (
468	after => 1,
469	cb => sub {
470	server_query ($conn, $flags, $prompt, 1);	488	server_query ($conn, $flags, $prompt, 1);
471	$QUERY_TIMER = undef	489	$QUERY_TIMER = undef
472	}
473	);	490	};
		491
474	return;	492	return;
475	}	493	}
476	}	494	}
477		495
478	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel	496	$conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
479	x => "center",	497	x => "center",
480	y => "center",	498	y => "center",
481	title => "Server Query",	499	title => "Server Query",
482	child => my $vbox = new CFPlus::UI::VBox,	500	child => my $vbox = new DC::UI::VBox,
483	;	501	;
484		502
485	my @dialog = my $label = new CFPlus::UI::Label	503	my @dialog = my $label = new DC::UI::Label
486	max_w => $::WIDTH * 0.8,	504	max_w => $::WIDTH * 0.8,
487	ellipsise => 0,	505	ellipsise => 0,
488	text => $prompt;	506	text => $prompt;
489		507
490	if ($flags & CS_QUERY_YESNO) {	508	if ($flags & CS_QUERY_YESNO) {
491	push @dialog, my $hbox = new CFPlus::UI::HBox;	509	push @dialog, my $hbox = new DC::UI::HBox;
492		510
493	$hbox->add (new CFPlus::UI::Button	511	$hbox->add (new DC::UI::Button
494	text => "No",	512	text => "No",
495	on_activate => sub {	513	on_activate => sub {
496	$conn->send ("reply n");	514	$conn->send ("reply n");
497	$dialog->destroy;	515	$dialog->destroy;
498	0	516	0
499	}	517	}
500	);	518	);
501	$hbox->add (new CFPlus::UI::Button	519	$hbox->add (new DC::UI::Button
502	text => "Yes",	520	text => "Yes",
503	on_activate => sub {	521	on_activate => sub {
504	$conn->send ("reply y");	522	$conn->send ("reply y");
505	destroy_query_dialog $conn;	523	destroy_query_dialog $conn;
506	0	524	0
…		…
511		529
512	} elsif ($flags & CS_QUERY_SINGLECHAR) {	530	} elsif ($flags & CS_QUERY_SINGLECHAR) {
513	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	531	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
514	$dialog->{tooltip} = "#charcreation_focus";	532	$dialog->{tooltip} = "#charcreation_focus";
515		533
516	unshift @dialog, new CFPlus::UI::Label	534	unshift @dialog, new DC::UI::Label
517	max_w => $::WIDTH * 0.8,	535	max_w => $::WIDTH * 0.8,
518	ellipsise => 0,	536	ellipsise => 0,
519	markup => "\nOr use your keyboard and the text entry below:\n";	537	markup => "\nOr use your keyboard and the text entry below:\n";
520		538
521	unshift @dialog, my $table = new CFPlus::UI::Table;	539	unshift @dialog, my $table = new DC::UI::Table;
522		540
523	$table->add_at (0, 0, new CFPlus::UI::Button	541	$table->add_at (0, 0, new DC::UI::Button
524	text => "Next Race",	542	text => "Next Race",
525	on_activate => sub {	543	on_activate => sub {
526	$conn->send ("reply n");	544	$conn->send ("reply n");
527	destroy_query_dialog $conn;	545	destroy_query_dialog $conn;
528	0	546	0
529	},	547	},
530	);	548	);
531	$table->add_at (2, 0, new CFPlus::UI::Button	549	$table->add_at (2, 0, new DC::UI::Button
532	text => "Accept",	550	text => "Accept",
533	on_activate => sub {	551	on_activate => sub {
534	$conn->send ("reply d");	552	$conn->send ("reply d");
535	destroy_query_dialog $conn;	553	destroy_query_dialog $conn;
536	0	554	0
537	},	555	},
538	);	556	);
539		557
540	if ($conn->{chargen_race_description}) {	558	if ($conn->{chargen_race_description}) {
541	unshift @dialog, new CFPlus::UI::Label	559	unshift @dialog, new DC::UI::Label
542	max_w => $::WIDTH * 0.8,	560	max_w => $::WIDTH * 0.8,
543	ellipsise => 0,	561	ellipsise => 0,
544	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",	562	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
545	;	563	;
546	}	564	}
547		565
548	unshift @dialog, new CFPlus::UI::Face	566	unshift @dialog, new DC::UI::Face
549	face => $conn->{player}{face},	567	face => $conn->{player}{face},
550	bg => [.2, .2, .2, 1],	568	bg => [.2, .2, .2, 1],
551	min_w => 64,	569	min_w => 64,
552	min_h => 64,	570	min_h => 64,
553	;	571	;
554		572
555	if ($conn->{chargen_race_title}) {	573	if ($conn->{chargen_race_title}) {
556	unshift @dialog, new CFPlus::UI::Label	574	unshift @dialog, new DC::UI::Label
557	allign => 1,	575	allign => 1,
558	ellipsise => 0,	576	ellipsise => 0,
559	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",	577	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
560	;	578	;
561	}	579	}
562		580
563	unshift @dialog, new CFPlus::UI::Label	581	unshift @dialog, new DC::UI::Label
564	max_w => $::WIDTH * 0.4,	582	max_w => $::WIDTH * 0.4,
565	ellipsise => 0,	583	ellipsise => 0,
566	markup => (CFPlus::Pod::section_label ui => "chargen_race"),	584	markup => (DC::Pod::section_label ui => "chargen_race"),
567	;	585	;
568		586
569	} elsif ($prompt =~ /roll new stats/) {	587	} elsif ($prompt =~ /roll new stats/) {
570	if (my $stat = delete $conn->{stat_change_with}) {	588	if (my $stat = delete $conn->{stat_change_with}) {
571	$conn->send ("reply $stat");	589	$conn->send ("reply $stat");
572	destroy_query_dialog $conn;	590	destroy_query_dialog $conn;
573	return;	591	return;
574	}	592	}
575		593
576	unshift @dialog, new CFPlus::UI::Label	594	unshift @dialog, new DC::UI::Label
577	max_w => $::WIDTH * 0.4,	595	max_w => $::WIDTH * 0.4,
578	ellipsise => 0,	596	ellipsise => 0,
579	markup => "\nOr use your keyboard and the text entry below:\n";	597	markup => "\nOr use your keyboard and the text entry below:\n";
580		598
581	unshift @dialog, my $table = new CFPlus::UI::Table;	599	unshift @dialog, my $table = new DC::UI::Table;
582		600
583	# left: re-roll	601	# left: re-roll
584	$table->add_at (0, 0, new CFPlus::UI::Button	602	$table->add_at (0, 0, new DC::UI::Button
585	text => "Roll Again",	603	text => "Roll Again",
586	on_activate => sub {	604	on_activate => sub {
587	$conn->send ("reply y");	605	$conn->send ("reply y");
588	destroy_query_dialog $conn;	606	destroy_query_dialog $conn;
589	0	607	0
590	},	608	},
591	);	609	);
592		610
593	# center: swap stats	611	# center: swap stats
594	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector	612	my ($sw1, $sw2) = map +(new DC::UI::Selector
595	expand => 1,	613	expand => 1,
596	value => $_,	614	value => $_,
597	options => [	615	options => [
598	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	616	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
599	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	617	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
603	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	621	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
604	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	622	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
605	],	623	],
606	), 1 .. 2;	624	), 1 .. 2;
607		625
608	$table->add_at (2, 0, new CFPlus::UI::Button	626	$table->add_at (2, 0, new DC::UI::Button
609	text => "Swap Stats",	627	text => "Swap Stats",
610	on_activate => sub {	628	on_activate => sub {
611	$conn->{stat_change_with} = $sw2->{value};	629	$conn->{stat_change_with} = $sw2->{value};
612	$conn->send ("reply $sw1->{value}");	630	$conn->send ("reply $sw1->{value}");
613	destroy_query_dialog $conn;	631	destroy_query_dialog $conn;
614	0	632	0
615	},	633	},
616	);	634	);
617	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	635	$table->add_at (2, 1, new DC::UI::HBox children => [$sw1, $sw2]);
618		636
619	# right: accept	637	# right: accept
620	$table->add_at (4, 0, new CFPlus::UI::Button	638	$table->add_at (4, 0, new DC::UI::Button
621	text => "Accept",	639	text => "Accept",
622	on_activate => sub {	640	on_activate => sub {
623	$conn->send ("reply n");	641	$conn->send ("reply n");
624	$STATS_PAGE->hide;	642	$STATS_PAGE->hide;
625	destroy_query_dialog $conn;	643	destroy_query_dialog $conn;
626	0	644	0
627	},	645	},
628	);	646	);
629		647
630	unshift @dialog, my $hbox = new CFPlus::UI::HBox;	648	unshift @dialog, my $hbox = new DC::UI::HBox;
631	for (	649	for (
632	[Str => CS_STAT_STR],	650	[Str => CS_STAT_STR],
633	[Dex => CS_STAT_DEX],	651	[Dex => CS_STAT_DEX],
634	[Con => CS_STAT_CON],	652	[Con => CS_STAT_CON],
635	[Int => CS_STAT_INT],	653	[Int => CS_STAT_INT],
636	[Wis => CS_STAT_WIS],	654	[Wis => CS_STAT_WIS],
637	[Pow => CS_STAT_POW],	655	[Pow => CS_STAT_POW],
638	[Cha => CS_STAT_CHA],	656	[Cha => CS_STAT_CHA],
639	) {	657	) {
640	my ($name, $id) = @$_;	658	my ($name, $id) = @$_;
641	$hbox->add (new CFPlus::UI::Label	659	$hbox->add (new DC::UI::Label
642	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	660	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
643	align => 0,
644	expand => 1,	661	expand => 1,
645	can_events => 1,	662	can_events => 1,
646	can_hover => 1,	663	can_hover => 1,
647	tooltip => "#stat_$name",	664	tooltip => "#stat_$name",
648	);	665	);
649	}	666	}
650		667
651	unshift @dialog, new CFPlus::UI::Label	668	unshift @dialog, new DC::UI::Label
652	max_w => $::WIDTH * 0.4,	669	max_w => $::WIDTH * 0.4,
653	ellipsise => 0,	670	ellipsise => 0,
654	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),	671	markup => (DC::Pod::section_label ui => "chargen_stats"),
655	;	672	;
656	}	673	}
657		674
658	push @dialog, my $entry = new CFPlus::UI::Entry	675	push @dialog, my $entry = new DC::UI::Entry
659	on_changed => sub {	676	on_changed => sub {
660	$conn->send ("reply $_[1]");	677	$conn->send ("reply $_[1]");
661	destroy_query_dialog $conn;	678	destroy_query_dialog $conn;
662	0	679	0
663	},	680	},
…		…
666	$entry->grab_focus;	683	$entry->grab_focus;
667		684
668	} else {	685	} else {
669	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	686	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
670		687
671	push @dialog, my $entry = new CFPlus::UI::Entry	688	push @dialog, my $entry = new DC::UI::Entry
672	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	689	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
673	on_activate => sub {	690	on_activate => sub {
674	$conn->send ("reply $_[1]");	691	$conn->send ("reply $_[1]");
675	destroy_query_dialog $conn;	692	destroy_query_dialog $conn;
676	0	693	0
…		…
692		709
693	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	710	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
694		711
695	my ($host, $port) = split /:/, $PROFILE->{host};	712	my ($host, $port) = split /:/, $PROFILE->{host};
696		713
697	$MAP = new CFPlus::Map;	714	$MAP = new DC::Map;
698		715
699	$CONN = eval {	716	$CONN = eval {
700	new CFPlus::Protocol	717	new DC::Protocol
701	host => $host,	718	host => $host,
702	port => $port || 13327,	719	port => $port || 13327,
703	user => $PROFILE->{user},	720	user => $PROFILE->{user},
704	pass => $PROFILE->{password},	721	pass => $PROFILE->{password},
705	mapw => $mapsize,	722	mapw => $mapsize,
706	maph => $mapsize,	723	maph => $mapsize,
707		724
708	client => "cfplus $CFPlus::VERSION $] $^O",	725	client => "$DC::VERSION $] $^O",
709		726
710	map_widget => $MAPWIDGET,	727	map_widget => $MAPWIDGET,
711	statusbox => $STATUSBOX,	728	statusbox => $STATUSBOX,
712	map => $MAP,	729	map => $MAP,
713	mapmap => $MAPMAP,	730	mapmap => $MAPMAP,
…		…
717	smoothing => $CFG->{map_smoothing}*1,	734	smoothing => $CFG->{map_smoothing}*1,
718	},	735	},
719	};	736	};
720		737
721	if ($CONN) {	738	if ($CONN) {
722	CFPlus::lowdelay fileno $CONN->{fh};	739	DC::lowdelay fileno $CONN->{fh};
723		740
724	status "login successful";	741	status "login successful";
725	} else {	742	} else {
726	status "unable to connect";	743	status "unable to connect";
727	stop_game();	744	stop_game();
…		…
732	$LOGIN_BUTTON->set_text ("Login / Register");	749	$LOGIN_BUTTON->set_text ("Login / Register");
733	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	750	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
734	$SETUP_DIALOG->show;	751	$SETUP_DIALOG->show;
735	$PL_WINDOW->hide;	752	$PL_WINDOW->hide;
736	$SPELL_LIST->clear_spells;	753	$SPELL_LIST->clear_spells;
737	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	754	$DC::UI::ROOT->emit (stop_game => ! ! $CONN);
738		755
739	&audio_music_set_ambient ([]);	756	&audio_music_set_ambient ([]);
740		757
741	return unless $CONN;	758	return unless $CONN;
742		759
…		…
748		765
749	undef $MAP;	766	undef $MAP;
750	}	767	}
751		768
752	sub graphics_setup {	769	sub graphics_setup {
753	my $vbox = new CFPlus::UI::VBox;	770	my $vbox = new DC::UI::VBox;
754		771
755	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	772	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
756		773
757	my $row = 0;	774	my $row = 0;
758		775
759	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");	776	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
760	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,	777	$table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
761	can_events => 1,	778	can_events => 1,
762	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");	779	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
763		780
764	my $vidmode_tooltip =	781	my $vidmode_tooltip =
765	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	782	"<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>.";	783	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
767		784
768	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	785	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
769	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);	786	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
770		787
771	$hbox->add (my $mode_slider = new CFPlus::UI::Slider	788	$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],	789	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
773	tooltip => $vidmode_tooltip);	790	tooltip => $vidmode_tooltip);
774	$hbox->add (my $mode_label = new CFPlus::UI::Label	791	$hbox->add (my $mode_label = new DC::UI::Label
775	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",	792	height => 0.8, template => "9999x9999@9+9",
776	can_events => 1, tooltip => $vidmode_tooltip);	793	can_events => 1, tooltip => $vidmode_tooltip);
777		794
778	$mode_slider->connect (changed => sub {	795	$mode_slider->connect (changed => sub {
779	my ($self, $value) = @_;	796	my ($self, $value) = @_;
780		797
781	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	798	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
782	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	799	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
783	});	800	});
784	$mode_slider->emit (changed => $mode_slider->{range}[0]);	801	$mode_slider->emit (changed => $mode_slider->{range}[0]);
785		802
786	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	803	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
787	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	804	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
788	state => $CFG->{fullscreen},	805	state => $CFG->{fullscreen},
789	tooltip => "Bring the client into fullscreen mode.",	806	tooltip => "Bring the client into fullscreen mode.",
790	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	807	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
791	);	808	);
792		809
793	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");	810	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
794	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	811	$table->add_at (1, $row++, new DC::UI::CheckBox
795	state => $CFG->{force_opengl11},	812	state => $CFG->{force_opengl11},
796	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "	813	tooltip => "Limit Deliantra 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 "	814	. "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. "	815	. "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, "	816	. "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 "	817	. "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>",	818	. "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 }	819	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
803	);	820	);
804		821
805	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");	822	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
806	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	823	$table->add_at (1, $row++, new DC::UI::CheckBox
807	state => $CFG->{texture_compression},	824	state => $CFG->{texture_compression},
808	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	825	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 "	826	. "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 "	827	. "can differ form card to card, so your mileage may vary. This setting is ignored in "
811	. "forced OpenGL 1.1 mode.",	828	. "forced OpenGL 1.1 mode.",
812	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	829	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
813	);	830	);
814		831
815	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	832	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
816	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	833	$table->add_at (1, $row++, new DC::UI::CheckBox
817	state => $CFG->{fast},	834	state => $CFG->{fast},
818	tooltip => "Lower the visual quality considerably to speed up rendering.",	835	tooltip => "Lower the visual quality considerably to speed up rendering.",
819	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	836	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
820	);	837	);
821		838
822	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	839	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
823	$table->add_at (1, $row++, new CFPlus::UI::Slider	840	$table->add_at (1, $row++, new DC::UI::Slider
824	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	841	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.",	842	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 },	843	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
827	);	844	);
828		845
829	$table->add_at (1, $row++, new CFPlus::UI::Button	846	$table->add_at (1, $row++, new DC::UI::Button
830	expand => 1, align => 0, text => "Apply",	847	expand => 1, text => "Apply",
831	tooltip => "Apply the video settings above.",	848	tooltip => "Apply the video settings above.",
832	on_activate => sub {	849	on_activate => sub {
833	video_shutdown ();	850	video_shutdown ();
834	video_init ();	851	video_init ();
835	0	852	0
836	}	853	}
837	);	854	);
838		855
839	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	856	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
840	$table->add_at (1, $row++, new CFPlus::UI::Slider	857	$table->add_at (1, $row++, new DC::UI::Slider
841	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	858	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
842	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	859	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
843	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	860	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
844	);	861	);
845		862
846	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");	863	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
847	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	864	$table->add_at (1, $row++, new DC::UI::CheckBox
848	state => $CFG->{map_smoothing},	865	state => $CFG->{map_smoothing},
849	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	866	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. "	867	. "This increases load on the graphics subsystem and works only with TRT servers. "
851	. "Changes take effect at next login only.",	868	. "Changes take effect at next login only.",
852	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	869	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
853	);	870	);
854		871
855	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	872	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
856	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	873	$table->add_at (1, $row++, new DC::UI::CheckBox
857	state => $CFG->{fow_enable},	874	state => $CFG->{fow_enable},
858	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	875	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 }	876	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
860	);	877	);
861		878
862	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	879	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
863	$table->add_at (1, $row++, new CFPlus::UI::Slider	880	$table->add_at (1, $row++, new DC::UI::Slider
864	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	881	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.",	882	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 }	883	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
867	);	884	);
868		885
869	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	886	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
870	$table->add_at (1, $row++, new CFPlus::UI::Slider	887	$table->add_at (1, $row++, new DC::UI::Slider
871	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	888	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, "	889	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.",	890	. "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 },	891	on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
875	);	892	);
876		893
877	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	894	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
878	$table->add_at (1, $row++, new CFPlus::UI::Slider	895	$table->add_at (1, $row++, new DC::UI::Slider
879	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	896	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.",	897	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
881	on_changed => sub {	898	on_changed => sub {
882	$CFG->{gauge_fontsize} = $_[1];	899	$CFG->{gauge_fontsize} = $_[1];
883	&set_gauge_window_fontsize;	900	&set_gauge_window_fontsize;
884	0	901	0
885	}	902	}
886	);	903	);
887		904
888	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	905	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
889	$table->add_at (1, $row++, new CFPlus::UI::Slider	906	$table->add_at (1, $row++, new DC::UI::Slider
890	range => [$CFG->{gauge_size}, 0.2, 0.8],	907	range => [$CFG->{gauge_size}, 0.2, 0.8],
891	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	908	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
892	on_changed => sub {	909	on_changed => sub {
893	$CFG->{gauge_size} = $_[1];	910	$CFG->{gauge_size} = $_[1];
894	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	911	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
…		…
901		918
902	our $AUDIO_HW_CHUNKSIZE;	919	our $AUDIO_HW_CHUNKSIZE;
903	our $AUDIO_INFO;	920	our $AUDIO_INFO;
904		921
905	sub audio_tab_update {	922	sub audio_tab_update {
906	my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;	923	my ($freq, $format, $chans) = DC::Mix_QuerySpec;
907		924
908	$AUDIO_HW_CHUNKSIZE->set_options ([	925	$AUDIO_HW_CHUNKSIZE->set_options ([
909	[0, "default", "Use System Default"],	926	[0, "default", "Use System Default"],
910	map {	927	map {
911	my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);	928	my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
…		…
921		938
922	$AUDIO_INFO->set_text ($text);	939	$AUDIO_INFO->set_text ($text);
923	}	940	}
924		941
925	sub audio_setup {	942	sub audio_setup {
926	my $vbox = new CFPlus::UI::VBox;	943	my $vbox = new DC::UI::VBox;
927		944
928	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);	945	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
929		946
930	my $row = 0;	947	my $row = 0;
931		948
932	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	949	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
933	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	950	$table->add_at (1, $row++, new DC::UI::CheckBox
934	state => $CFG->{audio_enable},	951	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.",	952	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 }	953	on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
937	);	954	);
938		955
939	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");	956	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
940	$table->add_at (1, $row, new CFPlus::UI::CheckBox	957	$table->add_at (1, $row, new DC::UI::CheckBox
941	expand => 1, state => $CFG->{effects_enable},	958	expand => 1, state => $CFG->{effects_enable},
942	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",	959	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
943	on_changed => sub {	960	on_changed => sub {
944	$CFG->{effects_enable} = $_[1];	961	$CFG->{effects_enable} = $_[1];
945	$CONN->update_fx_want if $CONN;	962	$CONN->update_fx_want if $CONN;
946	1	963	1
947	}	964	}
948	);	965	);
949	$table->add_at (2, $row++, new CFPlus::UI::Slider	966	$table->add_at (2, $row++, new DC::UI::Slider
950	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],	967	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 "	968	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.",	969	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
953	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }	970	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
954	);	971	);
955		972
956	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	973	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
957	$table->add_at (1, $row, new CFPlus::UI::CheckBox	974	$table->add_at (1, $row, new DC::UI::CheckBox
958	expand => 1, state => $CFG->{bgm_enable},	975	expand => 1, state => $CFG->{bgm_enable},
959	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	976	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
960	on_changed => sub {	977	on_changed => sub {
961	$CFG->{bgm_enable} = $_[1];	978	$CFG->{bgm_enable} = $_[1];
962	$CONN->update_fx_want if $CONN;	979	$CONN->update_fx_want if $CONN;
963	audio_music_push;	980	audio_music_push;
964	1	981	1
965	}	982	}
966	);	983	);
967	$table->add_at (2, $row++, new CFPlus::UI::Slider	984	$table->add_at (2, $row++, new DC::UI::Slider
968	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	985	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
969	tooltip => "The volume of the background music. Changes are instant.",	986	tooltip => "The volume of the background music. Changes are instant.",
970	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }	987	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
971	);	988	);
972		989
973	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");	990	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
974	$table->add_at (1, $row++, new CFPlus::UI::Selector	991	$table->add_at (1, $row++, new DC::UI::Selector
975	c_colspan => 2, expand => 1,	992	c_colspan => 2, expand => 1,
976	value => $CFG->{audio_hw_frequency},	993	value => $CFG->{audio_hw_frequency},
977	options => [	994	options => [
978	[ 0, "default" , "Use System Default"],	995	[ 0, "default" , "Use System Default"],
979	[11025, "11 kHz" , "11kHz (low quality)"],	996	[11025, "11 kHz" , "11kHz (low quality)"],
…		…
987	audio_tab_update;	1004	audio_tab_update;
988	1	1005	1
989	}	1006	}
990	);	1007	);
991		1008
992	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");	1009	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
993	$table->add_at (1, $row++, new CFPlus::UI::Selector	1010	$table->add_at (1, $row++, new DC::UI::Selector
994	c_colspan => 2, expand => 1,	1011	c_colspan => 2, expand => 1,
995	value => $CFG->{audio_hw_channels},	1012	value => $CFG->{audio_hw_channels},
996	options => [	1013	options => [
997	[0, "default" , "Use System Default"],	1014	[0, "default" , "Use System Default"],
998	[1, "Mono" , "Mono (single channel, low quality)"],	1015	[1, "Mono" , "Mono (single channel, low quality)"],
999	[2, "Stereo" , "Stereo (dual channe, standard quality)"],	1016	[2, "Stereo" , "Stereo (dual channel, standard quality)"],
1000	[4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],	1017	[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)"],	1018	[6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1002	],	1019	],
1003	tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",	1020	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 {	1021	on_changed => sub {
…		…
1006	audio_tab_update;	1023	audio_tab_update;
1007	1	1024	1
1008	}	1025	}
1009	);	1026	);
1010		1027
1011	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");	1028	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1012	$table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector	1029	$table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1013	c_colspan => 2, expand => 1,	1030	c_colspan => 2, expand => 1,
1014	value => $CFG->{audio_hw_chunksize},	1031	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 "	1032	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.",	1033	. "is stuttering, increase this value. Values of 50-100ms are optimal.",
1017	on_changed => sub {	1034	on_changed => sub {
…		…
1020	1	1037	1
1021	}	1038	}
1022	);	1039	);
1023		1040
1024	# should really be a slider	1041	# should really be a slider
1025	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");	1042	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1026	$table->add_at (1, $row++, new CFPlus::UI::ValSlider	1043	$table->add_at (1, $row++, new DC::UI::ValSlider
1027	c_colspan => 2, expand => 1,	1044	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.",	1045	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],	1046	range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1030	template => ">= 99",	1047	template => ">= 99",
1031	on_changed => sub {	1048	on_changed => sub {
…		…
1035	if $value;	1052	if $value;
1036	1;	1053	1;
1037	}	1054	}
1038	);	1055	);
1039		1056
1040	$table->add_at (1, $row++, new CFPlus::UI::Button	1057	$table->add_at (1, $row++, new DC::UI::Button
1041	c_colspan => 2, expand => 1, align => 0, text => "Apply",	1058	c_colspan => 2, expand => 1, text => "Apply",
1042	tooltip => "Apply the audio settings",	1059	tooltip => "Apply the audio settings",
1043	on_activate => sub {	1060	on_activate => sub {
1044	audio_shutdown ();	1061	audio_shutdown ();
1045	audio_init ();	1062	audio_init ();
1046	0	1063	0
1047	}	1064	}
1048	);	1065	);
1049		1066
1050	$vbox->add (new CFPlus::UI::FancyFrame	1067	$vbox->add (new DC::UI::FancyFrame
1051	expand => 1,	1068	expand => 1,
1052	label => "Audio Info",	1069	label => "Audio Info",
1053	child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),	1070	child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1054	);	1071	);
1055		1072
1056	audio_tab_update;	1073	audio_tab_update;
1057		1074
1058	$vbox	1075	$vbox
…		…
1065	}	1082	}
1066		1083
1067	sub make_gauge_window {	1084	sub make_gauge_window {
1068	my $gh = int $HEIGHT * $CFG->{gauge_size};	1085	my $gh = int $HEIGHT * $CFG->{gauge_size};
1069		1086
1070	my $win = new CFPlus::UI::Frame (	1087	my $win = new DC::UI::Frame (
1071	force_x => 0,	1088	force_x => 0,
1072	force_y => "max",	1089	force_y => "max",
1073	force_w => $WIDTH,	1090	force_w => $WIDTH,
1074	force_h => $gh,	1091	force_h => $gh,
1075	);	1092	);
1076		1093
1077	$win->add (my $hbox = new CFPlus::UI::HBox	1094	$win->add (my $hbox = new DC::UI::HBox
1078	children => [	1095	children => [
1079	(new CFPlus::UI::HBox expand => 1),	1096	(new DC::UI::HBox expand => 1),
1080	(new CFPlus::UI::VBox children => [	1097	(new DC::UI::VBox children => [
1081	(new CFPlus::UI::Empty expand => 1),	1098	(new DC::UI::Empty expand => 1),
1082	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),	1099	(new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1083	]),	1100	]),
1084	(my $vbox = new CFPlus::UI::VBox),	1101	(my $vbox = new DC::UI::VBox),
1085	],	1102	],
1086	);	1103	);
1087		1104
1088	$vbox->add (new CFPlus::UI::HBox	1105	$vbox->add (new DC::UI::HBox
1089	expand => 1,	1106	expand => 1,
1090	children => [	1107	children => [
1091	(new CFPlus::UI::Empty expand => 1),	1108	(new DC::UI::Empty expand => 1),
1092	(my $hb = new CFPlus::UI::HBox),	1109	(my $hb = new DC::UI::HBox),
1093	],	1110	],
1094	);	1111	);
1095		1112
1096	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");	1113	$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");	1114	$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");	1115	$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");	1116	$hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1100		1117
1101	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");	1118	$vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1102	$vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);	1119	$vbox->add (my $prg = new DC::UI::ExperienceProgress);
1103	$vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);	1120	$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");	1121	$vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1105		1122
1106	$GAUGES = {	1123	$GAUGES = {
1107	exp => $exp, prg => $prg, sklprg => $sklprg,	1124	exp => $exp, prg => $prg, sklprg => $sklprg,
1108	win => $win, range => $rng,	1125	win => $win, range => $rng,
1109	hp => $hg, mana => $mg, grace => $gg, food => $fg,	1126	hp => $hg, mana => $mg, grace => $gg, food => $fg,
…		…
1113		1130
1114	$win	1131	$win
1115	}	1132	}
1116		1133
1117	sub debug_setup {	1134	sub debug_setup {
1118	my $table = new CFPlus::UI::Table;	1135	my $table = new DC::UI::Table;
1119		1136
1120	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");	1137	$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 });	1138	$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");	1139	$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 });	1140	$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");	1141	$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 });	1142	$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");	1143	$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 });	1144	$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() } );	1145	$table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1129		1146
1130	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	1147	$table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1131		1148
1132	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);	1149	$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);	1150	$t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1134	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);	1151	$t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1135	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);	1152	$t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1136	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);	1153	$t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1137	$t->add_at (1,1, new CFPlus::UI::Label text => "e");	1154	$t->add_at (1,1, new DC::UI::Label text => "e");
1138		1155
1139	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);	1156	$table->add_at (7, 6, my $c = new DC::UI::Canvas);
1140		1157
1141	$c->add_items ({	1158	$c->add_items ({
1142	type => "line_loop",	1159	type => "line_loop",
1143	color => [0, 1, 0],	1160	color => [0, 1, 0],
1144	width => 9,	1161	width => 9,
…		…
1164		1181
1165	$table	1182	$table
1166	}	1183	}
1167		1184
1168	sub stats_window {	1185	sub stats_window {
1169	my $r = new CFPlus::UI::ScrolledWindow (	1186	my $r = new DC::UI::ScrolledWindow (
1170	expand => 1,	1187	expand => 1,
1171	scroll_y => 1	1188	scroll_y => 1
1172	);	1189	);
1173	$r->add (my $vb = new CFPlus::UI::VBox);	1190	$r->add (my $vb = new DC::UI::VBox);
1174		1191
1175	$vb->add (new CFPlus::UI::FancyFrame	1192	$vb->add (new DC::UI::FancyFrame
1176	label => "Player",	1193	label => "Player",
1177	child => (my $pi = new CFPlus::UI::VBox),	1194	child => (my $pi = new DC::UI::VBox),
1178	);	1195	);
1179		1196
1180	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	1197	$pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1181	can_hover => 1, can_events => 1,	1198	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.");	1199	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,	1200	$pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1184	can_hover => 1, can_events => 1,	1201	can_hover => 1, can_events => 1,
1185	tooltip => "The map you are currently on (if supported by the server).");	1202	tooltip => "The map you are currently on (if supported by the server).");
1186		1203
1187	$pi->add (my $hb0 = new CFPlus::UI::HBox);	1204	$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,	1205	$hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1189	can_hover => 1, can_events => 1,	1206	can_hover => 1, can_events => 1,
1190	tooltip => "The weight of the player including all inventory items.");	1207	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,	1208	$hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1192	can_hover => 1, can_events => 1,	1209	can_hover => 1, can_events => 1,
1193	tooltip => "The weight limit: you cannot carry more than this.");	1210	tooltip => "The weight limit: you cannot carry more than this.");
1194		1211
1195	$vb->add (new CFPlus::UI::FancyFrame	1212	$vb->add (new DC::UI::FancyFrame
1196	label => "Primary/Secondary Statistics",	1213	label => "Primary/Secondary Statistics",
1197	child => (my $hb = new CFPlus::UI::HBox expand => 1),	1214	child => (my $hb = new DC::UI::HBox expand => 1),
1198	);	1215	);
1199	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);	1216	$hb->add (my $tbl = new DC::UI::Table expand => 1);
1200		1217
1201	my $color2 = [1, 1, 0];	1218	my $color2 = [1, 1, 0];
1202		1219
1203	for (	1220	for (
1204	[0, 0, st_str => "Str", 30],	1221	[0, 0, st_str => "Str", 30],
…		…
1216	[2, 4, st_spd => "Spd", 10.54],	1233	[2, 4, st_spd => "Spd", 10.54],
1217	[2, 5, st_wspd => "WSp", 10.54],	1234	[2, 5, st_wspd => "WSp", 10.54],
1218	) {	1235	) {
1219	my ($col, $row, $id, $label, $template) = @$_;	1236	my ($col, $row, $id, $label, $template) = @$_;
1220		1237
1221	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1238	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1222	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1239	font => $FONT_FIXED, can_hover => 1, can_events => 1,
1223	align => +1, template => $template, tooltip => "#stat_$label");	1240	align => 1, template => $template, tooltip => "#stat_$label");
1224	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1241	$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,	1242	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1226	align => -1, text => $label, tooltip => "#stat_$label");	1243	align => 0, text => $label, tooltip => "#stat_$label");
1227	}	1244	}
1228		1245
1229	$vb->add (new CFPlus::UI::FancyFrame	1246	$vb->add (new DC::UI::FancyFrame
1230	label => "Resistancies",	1247	label => "Resistancies",
1231	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),	1248	child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1232	);	1249	);
1233		1250
1234	my $row = 0;	1251	my $row = 0;
1235	my $col = 0;	1252	my $col = 0;
1236		1253
…		…
1275		1292
1276	for (qw/slow holyw conf fire depl magic	1293	for (qw/slow holyw conf fire depl magic
1277	drain acid pois para deat phys	1294	drain acid pois para deat phys
1278	blind fear tund elec cold ghit/)	1295	blind fear tund elec cold ghit/)
1279	{	1296	{
1280	$tbl2->add_at ($col, $row,	1297	$tbl2->add_at ($col + 2, $row,
1281	$STATWIDS->{"res_$_"} =	1298	$STATWIDS->{"res_$_"} =
1282	new CFPlus::UI::Label	1299	new DC::UI::Label
1283	font => $FONT_FIXED,	1300	font => $FONT_FIXED,
1284	template => "-100%",	1301	template => "-100%",
1285	align => +1,	1302	align => 1,
1286	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 + 0, $row, new DC::UI::Label
1299	text => $resist_names{$_}->[0],	1315	text => $resist_names{$_}->[0],
1300	font => $FONT_FIXED,	1316	font => $FONT_FIXED,
		1317	align => 1,
1301	can_hover => 1,	1318	can_hover => 1,
1302	can_events => 1,	1319	can_events => 1,
1303	tooltip => $resist_names{$_}->[1],	1320	tooltip => $resist_names{$_}->[1],
1304	);	1321	);
1305		1322
1306	$row++;	1323	$row++;
1307	if ($row % 6 == 0) {	1324	if ($row % 6 == 0) {
1308	$col += 3;	1325	$col += 4;
1309	$row = 0;	1326	$row = 0;
1310	}	1327	}
1311	}	1328	}
1312		1329
1313	#update_stats_window ({});	1330	#update_stats_window ({});
1314		1331
1315	$r	1332	$r
1316	}	1333	}
1317		1334
1318	sub skill_window {	1335	sub skill_window {
1319	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);	1336	my $sw = new DC::UI::ScrolledWindow (expand => 1);
1320		1337
1321	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);	1338	$sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1322		1339
1323	$sw	1340	$sw
1324	}	1341	}
1325		1342
1326	sub formsep($) {	1343	sub formsep($) {
…		…
1338	return if $METASERVER_ATIME > time;	1355	return if $METASERVER_ATIME > time;
1339	$METASERVER_ATIME = time + 60;	1356	$METASERVER_ATIME = time + 60;
1340		1357
1341	my $table = $METASERVER->{table};	1358	my $table = $METASERVER->{table};
1342	$table->clear;	1359	$table->clear;
1343	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1360	$table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1344		1361
1345	my $ok = 0;	1362	my $ok = 0;
1346		1363
1347	CFPlus::background {	1364	DC::background {
1348	my $ua = CFPlus::lwp_useragent;	1365	my $ua = DC::lwp_useragent;
1349		1366
1350	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;	1367	DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1351	} sub {	1368	} sub {
1352	my ($msg) = @_;	1369	my ($msg) = @_;
1353	if ($msg) {	1370	if ($msg) {
1354	$table->clear;	1371	$table->clear;
1355		1372
…		…
1358	"The hostname of the server.",	1375	"The hostname of the server.",
1359	"The time this server has been running without being restarted.",	1376	"The time this server has been running without being restarted.",
1360	"Short information about this server provided by its admins.",	1377	"Short information about this server provided by its admins.",
1361	);	1378	);
1362	my @col = qw(#Users Host Uptime Version Description);	1379	my @col = qw(#Users Host Uptime Version Description);
1363	$table->add_at ($_, 0, new CFPlus::UI::Label	1380	$table->add_at ($_, 0, new DC::UI::Label
1364	can_hover => 1, can_events => 1,	1381	can_hover => 1, can_events => 1, fg => [1, 1, 0],
1365	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
1369	my @align = qw(1 0 1 1 -1);	1385	my @align = qw(1 0.5 1 1 0);
1370		1386
1371	my $y = 0;	1387	my $y = 0;
1372	for my $m (@{ $msg->{servers} }) {	1388	for my $m (@{ $msg->{servers} }) {
1373	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =	1389	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1374	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};	1390	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
…		…
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 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 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,
1478	text => "Login / Register",	1493	text => "Login / Register",
1479	tooltip => "This button will either login to the account configured above or register a new account.",	1494	tooltip => "This button will either login to the account configured above or register a new account.",
1480	on_activate => sub {	1495	on_activate => sub {
1481	$CONN ? stop_game	1496	$CONN ? stop_game
1482	: start_game;	1497	: start_game;
1483	1	1498	1
1484	},	1499	},
1485	);	1500	);
1486		1501
1487	$vbox->add (new CFPlus::UI::FancyFrame	1502	$vbox->add (new DC::UI::FancyFrame
1488	label => "Registering",	1503	label => "Registering",
1489	min_h => 200,	1504	min_h => 200,
1490	child => (new CFPlus::UI::Label valign => -1, ellipsise => 0,	1505	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1491	markup =>	1506	markup =>
1492	"To register a new account, choose a username that hasn't been taken yet and "	1507	"To register a new account, choose a username that hasn't been taken yet and "
1493	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1508	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1494	),	1509	),
1495	);	1510	);
1496		1511
1497	$vbox	1512	$vbox
1498	}	1513	}
1499		1514
1500	sub server_setup {	1515	sub server_setup {
1501	my $vbox = new CFPlus::UI::VBox;	1516	my $vbox = new DC::UI::VBox;
1502		1517
1503	$vbox->add (new CFPlus::UI::FancyFrame	1518	$vbox->add (new DC::UI::FancyFrame
1504	label => "Connection Settings",	1519	label => "Connection Settings",
1505	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1520	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1506	);	1521	);
1507		1522
1508	my $row = 0;	1523	my $row = 0;
1509		1524
1510	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1525	$table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1511	{	1526	{
1512	$table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox);	1527	$table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1513		1528
1514	$vbox->add (	1529	$vbox->add (
1515	$HOST_ENTRY = new CFPlus::UI::Entry	1530	$HOST_ENTRY = new DC::UI::Entry
1516	expand => 1,	1531	expand => 1,
1517	text => $CFG->{profile}{default}{host},	1532	text => $CFG->{profile}{default}{host},
1518	tooltip => "The hostname or ip address of the Deliantra server to connect to",	1533	tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1519	on_changed => sub {	1534	on_changed => sub {
1520	my ($self, $value) = @_;	1535	my ($self, $value) = @_;
1521	$CFG->{profile}{default}{host} = $value;	1536	$CFG->{profile}{default}{host} = $value;
1522	1	1537	1
1523	}	1538	}
1524	);	1539	);
1525		1540
		1541	if (0) { #d# disabled
1526	$vbox->add (new CFPlus::UI::Button	1542	$vbox->add (new DC::UI::Button
1527	expand => 1,	1543	expand => 1,
1528	text => "Server List",	1544	text => "Server List",
1529	other => $METASERVER,	1545	other => $METASERVER,
1530	tooltip => "Show a list of available crossfire servers",	1546	tooltip => "Show a list of available Deliantra servers",
1531	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1547	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1532	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },	1548	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1533	);	1549	);
		1550	}#d#
1534	}	1551	}
1535		1552
1536	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1553	$table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1537	$table->add_at (1, $row, new CFPlus::UI::Slider	1554	$table->add_at (1, $row, new DC::UI::Slider
1538	force_w => 100,	1555	force_w => 100,
1539	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1556	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1540	tooltip => "This is the size of the portion of the map update the server sends you. "	1557	tooltip => "This is the size of the portion of the map update the server sends you. "
1541	. "If you set this to a high value you will be able to see further, "	1558	. "If you set this to a high value you will be able to see further, "
1542	. "but you also increase bandwidth requirements and latency. "	1559	. "but you also increase bandwidth requirements and latency. "
1543	. "This option is only used once at log-in.",	1560	. "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 },	1561	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1545	);	1562	);
1546		1563
1547	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1564	$table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1548	$table->add_at (1, $row, new CFPlus::UI::Entry	1565	$table->add_at (1, $row, new DC::UI::Entry
1549	text => $CFG->{output_rate},	1566	text => $CFG->{output_rate},
1550	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "	1567	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1551	. "when sending data. When 0 or unset, the server "	1568	. "when sending data. When 0 or unset, the server "
1552	. "default will be used, which is usually around 100kb/s. Most servers will "	1569	. "default will be used, which is usually around 100kb/s. Most servers will "
1553	. "dynamically find an optimal rate, so adjust this only when necessary.",	1570	. "dynamically find an optimal rate, so adjust this only when necessary.",
1554	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },	1571	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1555	);	1572	);
1556		1573
1557	$vbox->add (new CFPlus::UI::FancyFrame	1574	$vbox->add (new DC::UI::FancyFrame
1558	label => "Server Info",	1575	label => "Server Info",
1559	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),	1576	child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1560	);	1577	);
1561		1578
1562	$vbox	1579	$vbox
1563	}	1580	}
1564		1581
1565	sub client_setup {	1582	sub client_setup {
1566	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];	1583	my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1567		1584
1568	my $row = 0;	1585	my $row = 0;
1569		1586
1570	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1587	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1571	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	1588	$table->add_at (1, $row++, new DC::UI::CheckBox
1572	state => $CFG->{show_tips},	1589	state => $CFG->{show_tips},
1573	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1590	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1574	on_changed => sub {	1591	on_changed => sub {
1575	my ($self, $value) = @_;	1592	my ($self, $value) = @_;
1576	$CFG->{show_tips} = $value;	1593	$CFG->{show_tips} = $value;
1577	0	1594	0
1578	}	1595	}
1579	);	1596	);
1580		1597
1581	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");	1598	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size");
1582	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry	1599	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1583	text => $CFG->{logview_max_par},	1600	text => $CFG->{logview_max_par},
1584	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1601	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1585	. "sends more messages than this number, older messages get removed to save memory and "	1602	. "sends more messages than this number, older messages get removed to save memory and "
1586	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1603	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1587	on_changed => sub {	1604	on_changed => sub {
1588	my ($self, $value) = @_;	1605	my ($self, $value) = @_;
1589	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);	1606	$MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1590	0	1607	0
1591	},	1608	},
1592	);	1609	);
1593		1610
1594	$table	1611	$table
1595	}	1612	}
1596		1613
1597	sub autopickup_setup {	1614	sub autopickup_setup {
1598	my $r = new CFPlus::UI::ScrolledWindow (	1615	my $r = new DC::UI::ScrolledWindow (
1599	expand => 1,	1616	expand => 1,
1600	scroll_y => 1	1617	scroll_y => 1
1601	);	1618	);
1602	$r->add (my $table = new CFPlus::UI::Table	1619	$r->add (my $table = new DC::UI::Table
1603	row_expand => [0],	1620	row_expand => [0],
1604	col_expand => [0, 1, 0, 1],	1621	col_expand => [0, 1, 0, 1],
1605	);	1622	);
1606		1623
1607	for (	1624	for (
…		…
1645	],	1662	],
1646	["Weight/Value ratio", 2, 17]	1663	["Weight/Value ratio", 2, 17]
1647	)	1664	)
1648	{	1665	{
1649	my ($title, $x, $y, @bits) = @$_;	1666	my ($title, $x, $y, @bits) = @$_;
1650	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1667	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1651		1668
1652	for (@bits) {	1669	for (@bits) {
1653	++$y;	1670	++$y;
1654		1671
1655	my $mask = $_->[1];	1672	my $mask = $_->[1];
1656	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1673	$table->add_at ($x , $y, new DC::UI::Label text => $_->[0], align => 1, expand => 1);
1657	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1674	$table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1658	state => $::CFG->{pickup} & $mask,	1675	state => $::CFG->{pickup} & $mask,
1659	on_changed => sub {	1676	on_changed => sub {
1660	my ($box, $value) = @_;	1677	my ($box, $value) = @_;
1661		1678
1662	if ($value) {	1679	if ($value) {
…		…
1673		1690
1674	${$_->[2]} = $checkbox if $_->[2];	1691	${$_->[2]} = $checkbox if $_->[2];
1675	}	1692	}
1676	}	1693	}
1677		1694
1678	$table->add_at (2, 18, new CFPlus::UI::ValSlider	1695	$table->add_at (2, 18, new DC::UI::ValSlider
1679	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1696	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1680	template => ">= 99",	1697	template => ">= 99",
1681	to_value => sub { ">= " . 5 * $_[0] },	1698	to_value => sub { ">= " . 5 * $_[0] },
1682	on_changed => sub {	1699	on_changed => sub {
1683	my ($slider, $value) = @_;	1700	my ($slider, $value) = @_;
…		…
1686	$::CFG->{pickup} |= int $value	1703	$::CFG->{pickup} |= int $value
1687	if $value;	1704	if $value;
1688	1;	1705	1;
1689	});	1706	});
1690		1707
1691	$table->add_at (3, 18, new CFPlus::UI::Button	1708	$table->add_at (3, 18, new DC::UI::Button
1692	text => "set",	1709	text => "set",
1693	on_activate => sub {	1710	on_activate => sub {
1694	$::CONN->send_command ("pickup $::CFG->{pickup}")	1711	$::CONN->send_command ("pickup $::CFG->{pickup}")
1695	if defined $::CONN;	1712	if defined $::CONN;
1696	0	1713	0
…		…
1717	or $a->{type} <=> $b->{type}	1734	or $a->{type} <=> $b->{type}
1718	} @_ },	1735	} @_ },
1719	);	1736	);
1720		1737
1721	sub inventory_widget {	1738	sub inventory_widget {
1722	my $hb = new CFPlus::UI::HBox homogeneous => 1;	1739	my $hb = new DC::UI::HBox homogeneous => 1;
1723		1740
1724	$hb->add (my $vb1 = new CFPlus::UI::VBox);	1741	$hb->add (my $vb1 = new DC::UI::VBox);
1725	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");	1742	$vb1->add (new DC::UI::Label text => "Player");
1726		1743
1727	$vb1->add (my $hb1 = new CFPlus::UI::HBox);	1744	$vb1->add (my $hb1 = new DC::UI::HBox);
1728		1745
1729	use sort 'stable';	1746	use sort 'stable';
1730		1747
1731	$hb1->add (new CFPlus::UI::Selector	1748	$hb1->add (new DC::UI::Selector
1732	value => $::CFG->{inv_sort},	1749	value => $::CFG->{inv_sort},
1733	options => [	1750	options => [
1734	[type => "Type/Name"],	1751	[type => "Type/Name"],
1735	[mtime => "Recent/Normal/Locked"],	1752	[mtime => "Recent/Normal/Locked"],
1736	[weight => "Weight/Type"],	1753	[weight => "Weight/Type"],
…		…
1738	on_changed => sub {	1755	on_changed => sub {
1739	$::CFG->{inv_sort} = $_[1];	1756	$::CFG->{inv_sort} = $_[1];
1740	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1757	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1741	},	1758	},
1742	);	1759	);
1743	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);	1760	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1744	#TODO# update to weigh/maxweight	1761	#TODO# update to weigh/maxweight
1745	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);	1762	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1746		1763
1747	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1764	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1748	$sw1->add ($INV = new CFPlus::UI::Inventory);	1765	$sw1->add ($INV = new DC::UI::Inventory);
1749	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1766	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1750		1767
1751	$hb->add (my $vb2 = new CFPlus::UI::VBox);	1768	$hb->add (my $vb2 = new DC::UI::VBox);
1752		1769
1753	$vb2->add ($INVR_HB = new CFPlus::UI::HBox);	1770	$vb2->add ($INVR_HB = new DC::UI::HBox);
1754		1771
1755	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1772	$vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1756	$sw2->add ($INVR = new CFPlus::UI::Inventory);	1773	$sw2->add ($INVR = new DC::UI::Inventory);
1757		1774
1758	# XXX: Call after $INVR = ... because set_opencont sets the items	1775	# XXX: Call after $INVR = ... because set_opencont sets the items
1759	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1776	DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1760		1777
1761	$hb	1778	$hb
1762	}	1779	}
1763		1780
1764	sub media_window {	1781	sub media_window {
1765	my $vb = new CFPlus::UI::VBox;	1782	my $vb = new DC::UI::VBox;
1766		1783
1767	$vb->add (new CFPlus::UI::FancyFrame	1784	$vb->add (new DC::UI::FancyFrame
1768	label => "Currently playing music",	1785	label => "Currently playing music",
1769	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,	1786	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),	1787	child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1771	);	1788	);
1772		1789
1773	$vb->add (new CFPlus::UI::FancyFrame	1790	$vb->add (new DC::UI::FancyFrame
1774	label => "Other media used in this session",	1791	label => "Other media used in this session",
1775	expand => 1,	1792	expand => 1,
1776	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller	1793	child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1777	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),	1794	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1778	);	1795	);
1779		1796
1780	$vb	1797	$vb
1781	}	1798	}
…		…
1790	or return;	1807	or return;
1791		1808
1792	$LICENSE_WIDGET->add_paragraph ({	1809	$LICENSE_WIDGET->add_paragraph ({
1793	fg => [1, 1, 1, 1],	1810	fg => [1, 1, 1, 1],
1794	markup => "<small>"	1811	markup => "<small>"
1795	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"	1812	. "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1796	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"	1813	. "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1797	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"	1814	. "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1798	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"	1815	. "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1799	. "</small>",	1816	. "</small>",
1800	});	1817	});
1801	$LICENSE_WIDGET->scroll_to_bottom;	1818	$LICENSE_WIDGET->scroll_to_bottom;
1802	}	1819	}
1803		1820
…		…
1811	$PL_WINDOW->show;	1828	$PL_WINDOW->show;
1812	}	1829	}
1813	}	1830	}
1814		1831
1815	sub player_window {	1832	sub player_window {
1816	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel	1833	my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1817	x => "center",	1834	x => "center",
1818	y => "center",	1835	y => "center",
1819	force_w => $WIDTH * 9/10,	1836	force_w => $WIDTH * 9/10,
1820	force_h => $HEIGHT * 9/10,	1837	force_h => $HEIGHT * 9/10,
1821	title => "Player",	1838	title => "Player",
…		…
1823	has_close_button => 1	1840	has_close_button => 1
1824	;	1841	;
1825		1842
1826	my $ntb =	1843	my $ntb =
1827	$PL_NOTEBOOK =	1844	$PL_NOTEBOOK =
1828	new CFPlus::UI::Notebook expand => 1;	1845	new DC::UI::Notebook expand => 1;
1829		1846
1830	$ntb->add_tab (	1847	$ntb->add_tab (
1831	"Statistics (F2)" => $STATS_PAGE = stats_window,	1848	"Statistics (F2)" => $STATS_PAGE = stats_window,
1832	"Shows statistics, where all your Stats and Resistances are shown."	1849	"Shows statistics, where all your Stats and Resistances are shown."
1833	);	1850	);
1834	$ntb->add_tab (	1851	$ntb->add_tab (
1835	"Skills (F3)" => $SKILL_PAGE = skill_window,	1852	"Skills (F3)" => $SKILL_PAGE = skill_window,
1836	"Shows all your Skills."	1853	"Shows all your Skills."
1837	);	1854	);
1838		1855
1839	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1856	my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1840	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1857	$spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1841	$ntb->add_tab (	1858	$ntb->add_tab (
1842	"Spellbook (F4)" => $spellsw,	1859	"Spellbook (F4)" => $spellsw,
1843	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1860	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1844	);	1861	);
1845	$ntb->add_tab (	1862	$ntb->add_tab (
…		…
1858	$plwin->add ($ntb);	1875	$plwin->add ($ntb);
1859	$plwin	1876	$plwin
1860	}	1877	}
1861		1878
1862	sub keyboard_setup {	1879	sub keyboard_setup {
1863	CFPlus::Macro::keyboard_setup	1880	DC::Macro::keyboard_setup
1864	}	1881	}
1865		1882
1866	sub help_window {	1883	sub help_window {
1867	my $win = new CFPlus::UI::Toplevel	1884	my $win = new DC::UI::Toplevel
1868	x => 'center',	1885	x => 'center',
1869	y => 'center',	1886	y => 'center',
1870	z => 4,	1887	z => 4,
1871	name => 'doc_browser',	1888	name => 'doc_browser',
1872	force_w => int $WIDTH * 7/8,	1889	force_w => int $WIDTH * 7/8,
1873	force_h => int $HEIGHT * 7/8,	1890	force_h => int $HEIGHT * 7/8,
1874	title => "Help Browser",	1891	title => "Help Browser",
1875	has_close_button => 1;	1892	has_close_button => 1;
1876		1893
1877	$win->add (my $vbox = new CFPlus::UI::VBox);	1894	$win->add (my $vbox = new DC::UI::VBox);
1878		1895
1879	$vbox->add (new CFPlus::UI::FancyFrame	1896	$vbox->add (new DC::UI::FancyFrame
1880	label => "Navigation",	1897	label => "Navigation",
1881	child => (my $buttons = new CFPlus::UI::HBox),	1898	child => (my $buttons = new DC::UI::HBox),
1882	);	1899	);
1883	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	1900	$vbox->add (my $viewer = new DC::UI::TextScroller
1884	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	1901	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1885		1902
1886	my @history;	1903	my @history;
1887	my @future;	1904	my @future;
1888	my $curnode;	1905	my $curnode;
…		…
1890	my $load_node; $load_node = sub {	1907	my $load_node; $load_node = sub {
1891	my ($node, $para) = @_;	1908	my ($node, $para) = @_;
1892		1909
1893	$buttons->clear;	1910	$buttons->clear;
1894		1911
1895	$buttons->add (new CFPlus::UI::Button	1912	$buttons->add (new DC::UI::Button
1896	text => "⇤",	1913	text => "⇤",
1897	tooltip => "back to the starting page",	1914	tooltip => "back to the starting page",
1898	on_activate => sub {	1915	on_activate => sub {
1899	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;	1916	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1900	unshift @future, @history;	1917	unshift @future, @history;
…		…
1902	$load_node->(@{shift @future});	1919	$load_node->(@{shift @future});
1903	},	1920	},
1904	);	1921	);
1905		1922
1906	if (@history) {	1923	if (@history) {
1907	$buttons->add (new CFPlus::UI::Button	1924	$buttons->add (new DC::UI::Button
1908	text => "⋘",	1925	text => "⋘",
1909	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",	1926	tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1910	on_activate => sub {	1927	on_activate => sub {
1911	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;	1928	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1912	$load_node->(@{pop @history});	1929	$load_node->(@{pop @history});
1913	},	1930	},
1914	);	1931	);
1915	}	1932	}
1916		1933
1917	if (@future) {	1934	if (@future) {
1918	$buttons->add (new CFPlus::UI::Button	1935	$buttons->add (new DC::UI::Button
1919	text => "⋙",	1936	text => "⋙",
1920	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",	1937	tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1921	on_activate => sub {	1938	on_activate => sub {
1922	push @history, [$curnode, $viewer->current_paragraph];	1939	push @history, [$curnode, $viewer->current_paragraph];
1923	$load_node->(@{shift @future});	1940	$load_node->(@{shift @future});
1924	},	1941	},
1925	);	1942	);
1926	}	1943	}
1927		1944
1928	$buttons->add (new CFPlus::UI::Label text => " ");	1945	$buttons->add (new DC::UI::Label text => " ");
1929		1946
1930	my @path = CFPlus::Pod::full_path_of $node;	1947	my @path = DC::Pod::full_path_of $node;
1931	pop @path; # drop current node	1948	pop @path; # drop current node
1932		1949
1933	for my $node (@path) {	1950	for my $node (@path) {
1934	$buttons->add (new CFPlus::UI::Button	1951	$buttons->add (new DC::UI::Button
1935	text => $node->{kw}[0],	1952	text => $node->{kw}[0],
1936	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",	1953	tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1937	on_activate => sub {	1954	on_activate => sub {
1938	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	1955	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1939	$load_node->($node);	1956	$load_node->($node);
1940	},	1957	},
1941	);	1958	);
1942	$buttons->add (new CFPlus::UI::Label text => "/");	1959	$buttons->add (new DC::UI::Label text => "/");
1943	}	1960	}
1944		1961
1945	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);	1962	$buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1946		1963
1947	$curnode = $node;	1964	$curnode = $node;
1948		1965
1949	$viewer->clear;	1966	$viewer->clear;
1950	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);	1967	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1951	$viewer->scroll_to ($para);	1968	$viewer->scroll_to ($para);
1952	};	1969	};
1953		1970
1954	$load_node->(CFPlus::Pod::find pod => "mainpage");	1971	$load_node->(DC::Pod::find pod => "mainpage");
1955		1972
1956	$CFPlus::Pod::goto_document = sub {	1973	$DC::Pod::goto_document = sub {
1957	my (@path) = @_;	1974	my (@path) = @_;
1958		1975
1959	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	1976	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1960		1977
1961	$load_node->((CFPlus::Pod::find @path)[0]);	1978	$load_node->((DC::Pod::find @path)[0]);
1962	$win->show;	1979	$win->show;
1963	};	1980	};
1964		1981
1965	$win	1982	$win
1966	}	1983	}
1967		1984
1968	sub open_string_query {	1985	sub open_string_query {
1969	my ($title, $cb, $txt, $tooltip) = @_;	1986	my ($title, $cb, $txt, $tooltip) = @_;
1970	my $dialog = new CFPlus::UI::Toplevel	1987	my $dialog = new DC::UI::Toplevel
1971	x => "center",	1988	x => "center",
1972	y => "center",	1989	y => "center",
1973	z => 50,	1990	z => 50,
1974	force_w => $WIDTH * 4/5,	1991	force_w => $WIDTH * 4/5,
1975	title => $title;	1992	title => $title;
1976		1993
1977	$dialog->add (	1994	$dialog->add (
1978	my $e = new CFPlus::UI::Entry	1995	my $e = new DC::UI::Entry
1979	on_activate => sub { $cb->(@_); $dialog->hide; 0 },	1996	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1980	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },	1997	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1981	tooltip => $tooltip	1998	tooltip => $tooltip
1982	);	1999	);
1983		2000
…		…
1986	$dialog->show;	2003	$dialog->show;
1987	}	2004	}
1988		2005
1989	sub open_quit_dialog {	2006	sub open_quit_dialog {
1990	unless ($QUIT_DIALOG) {	2007	unless ($QUIT_DIALOG) {
1991	$QUIT_DIALOG = new CFPlus::UI::Toplevel	2008	$QUIT_DIALOG = new DC::UI::Toplevel
1992	x => "center",	2009	x => "center",
1993	y => "center",	2010	y => "center",
1994	z => 50,	2011	z => 50,
1995	title => "Really Quit?",	2012	title => "Really Quit?",
1996	on_key_down => sub {	2013	on_key_down => sub {
1997	my ($dialog, $ev) = @_;	2014	my ($dialog, $ev) = @_;
1998	$ev->{sym} == 27 and $dialog->hide;	2015	$ev->{sym} == 27 and $dialog->hide;
1999	}	2016	}
2000	;	2017	;
2001		2018
2002	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);	2019	$QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2003		2020
2004	$vb->add (new CFPlus::UI::Label	2021	$vb->add (new DC::UI::Label
2005	text => "You should find a savebed and apply it first!",	2022	text => "You should find a savebed and apply it first!",
2006	max_w => $WIDTH * 0.25,	2023	max_w => $WIDTH * 0.25,
2007	ellipsize => 0,	2024	ellipsize => 0,
2008	);	2025	);
2009	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);	2026	$vb->add (my $hb = new DC::UI::HBox expand => 1);
2010	$hb->add (new CFPlus::UI::Button	2027	$hb->add (new DC::UI::Button
2011	text => "Ok",	2028	text => "Ok",
2012	expand => 1,	2029	expand => 1,
2013	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2030	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2014	);	2031	);
2015	$hb->add (new CFPlus::UI::Button	2032	$hb->add (new DC::UI::Button
2016	text => "Quit anyway",	2033	text => "Quit anyway",
2017	expand => 1,	2034	expand => 1,
2018	on_activate => sub { Event::unloop_all },	2035	on_activate => sub { EV::unloop EV::UNLOOP_ALL },
2019	);	2036	);
2020	}	2037	}
2021		2038
2022	$QUIT_DIALOG->show;	2039	$QUIT_DIALOG->show;
2023	$QUIT_DIALOG->grab_focus;	2040	$QUIT_DIALOG->grab_focus;
2024	}	2041	}
2025		2042
2026	sub show_tip_of_the_day {	2043	sub show_tip_of_the_day {
2027	# find all tips	2044	# find all tips
2028	my @tod = CFPlus::Pod::find tip_of_the_day => "*";	2045	my @tod = DC::Pod::find tip_of_the_day => "*";
2029		2046
2030	CFPlus::DB::get state => "tip_of_the_day", sub {	2047	DC::DB::get state => "tip_of_the_day", sub {
2031	my ($todindex) = @_;	2048	my ($todindex) = @_;
2032	$todindex = 0 if $todindex >= @tod;	2049	$todindex = 0 if $todindex >= @tod;
2033	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };	2050	DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2034		2051
2035	# create dialog	2052	# create dialog
2036	my $dialog;	2053	my $dialog;
2037		2054
2038	my $close = sub {	2055	my $close = sub {
2039	$dialog->destroy;	2056	$dialog->destroy;
2040	};	2057	};
2041		2058
2042	$dialog = new CFPlus::UI::Toplevel	2059	$dialog = new DC::UI::Toplevel
2043	x => "center",	2060	x => "center",
2044	y => "center",	2061	y => "center",
2045	z => 3,	2062	z => 3,
2046	name => 'tip_of_the_day',	2063	name => 'tip_of_the_day',
2047	force_w => int $WIDTH * 4/9,	2064	force_w => int $WIDTH * 4/9,
2048	force_h => int $WIDTH * 2/9,	2065	force_h => int $WIDTH * 2/9,
2049	title => "Tip of the day #" . (1 + $todindex),	2066	title => "Tip of the day #" . (1 + $todindex),
2050	child => my $vbox = new CFPlus::UI::VBox,	2067	child => my $vbox = new DC::UI::VBox,
2051	has_close_button => 1,	2068	has_close_button => 1,
2052	on_delete => $close,	2069	on_delete => $close,
2053	;	2070	;
2054		2071
2055	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	2072	$vbox->add (my $viewer = new DC::UI::TextScroller
2056	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	2073	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]);	2074	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2058		2075
2059	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);	2076	$vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2060		2077
2061	$table->add_at (0, 0, new CFPlus::UI::Button	2078	$table->add_at (0, 0, new DC::UI::Button
2062	text => "Close",	2079	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>.",	2080	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
2064	on_activate => $close,	2081	on_activate => $close,
2065	);	2082	);
2066		2083
2067	$table->add_at (2, 0, new CFPlus::UI::Button	2084	$table->add_at (2, 0, new DC::UI::Button
2068	text => "Next",	2085	text => "Next",
2069	tooltip => "Show the next <b>Tip of the day</b>.",	2086	tooltip => "Show the next <b>Tip of the day</b>.",
2070	on_activate => sub {	2087	on_activate => sub {
2071	$close->();	2088	$close->();
2072	&show_tip_of_the_day;	2089	&show_tip_of_the_day;
…		…
2076	$dialog->show;	2093	$dialog->show;
2077	};	2094	};
2078	}	2095	}
2079		2096
2080	sub sdl_init {	2097	sub sdl_init {
2081	CFPlus::SDL_Init	2098	DC::SDL_Init
2082	and die "SDL::Init failed!\n";	2099	and die "SDL::Init failed!\n";
2083	}	2100	}
2084		2101
2085	sub video_init {	2102	sub video_init {
2086	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	2103	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
…		…
2089		2106
2090	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2107	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2091	$FULLSCREEN = $CFG->{fullscreen};	2108	$FULLSCREEN = $CFG->{fullscreen};
2092	$FAST = $CFG->{fast};	2109	$FAST = $CFG->{fast};
2093		2110
2094	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2111	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2095	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	2112	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2096		2113
2097	$SDL_ACTIVE = 1;	2114	$SDL_ACTIVE = 1;
2098	$LAST_REFRESH = time - 0.01;	2115	$LAST_REFRESH = time - 0.01;
2099		2116
2100	CFPlus::OpenGL::init;	2117	DC::OpenGL::init;
2101	CFPlus::Macro::init;	2118	DC::Macro::init;
2102		2119
2103	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	2120	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2104		2121
2105	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	2122	$DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2106		2123
2107	#############################################################################	2124	#############################################################################
2108		2125
2109	if ($DEBUG_STATUS) {	2126	if ($DEBUG_STATUS) {
2110	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	2127	DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2111	} else {	2128	} else {
2112	# create/configure the widgets	2129	# create/configure the widgets
2113		2130
2114	$CFPlus::UI::ROOT->connect (key_down => sub {	2131	$DC::UI::ROOT->connect (key_down => sub {
2115	my (undef, $ev) = @_;	2132	my (undef, $ev) = @_;
2116		2133
2117	if (my @macros = CFPlus::Macro::find $ev) {	2134	if (my @macros = DC::Macro::find $ev) {
2118	CFPlus::Macro::execute $_ for @macros;	2135	DC::Macro::execute $_ for @macros;
2119		2136
2120	return 1;	2137	return 1;
2121	}	2138	}
2122		2139
2123	0	2140	0
2124	});	2141	});
2125		2142
2126	$DEBUG_STATUS = new CFPlus::UI::Label	2143	$DEBUG_STATUS = new DC::UI::Label
2127	padding => 0,	2144	padding => 0,
2128	z => 100,	2145	z => 100,
2129	force_x => "max",	2146	force_x => "max",
2130	force_y => 0;	2147	force_y => 0;
2131	$DEBUG_STATUS->show;	2148	$DEBUG_STATUS->show;
2132		2149
2133	$STATUSBOX = new CFPlus::UI::Statusbox;	2150	$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]);	2151	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
2135		2152
2136	(new CFPlus::UI::Frame	2153	(new DC::UI::Frame
2137	bg => [0, 0, 0, 0.4],	2154	bg => [0, 0, 0, 0.4],
2138	force_x => 0,	2155	force_x => 0,
2139	force_y => "max",	2156	force_y => "max",
2140	child => $STATUSBOX,	2157	child => $STATUSBOX,
2141	)->show;	2158	)->show;
2142		2159
2143	CFPlus::UI::Toplevel->new (	2160	DC::UI::Toplevel->new (
2144	title => "Map",	2161	title => "Minimap",
2145	name => "mapmap",	2162	name => "mapmap",
2146	x => 0,	2163	x => 0,
2147	y => $FONTSIZE + 8,	2164	y => $FONTSIZE + 8,
2148	border_bg => [1, 1, 1, 192/255],	2165	border_bg => [1, 1, 1, 192/255],
2149	bg => [1, 1, 1, 0],	2166	bg => [1, 1, 1, 0],
2150	child => ($MAPMAP = new CFPlus::MapWidget::MapMap	2167	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.",	2168	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2152	),	2169	),
2153	)->show;	2170	)->show;
2154		2171
2155	$MAPWIDGET = new CFPlus::MapWidget;	2172	$MAPWIDGET = new DC::MapWidget;
2156	$MAPWIDGET->connect (activate_console => sub {	2173	$MAPWIDGET->connect (activate_console => sub {
2157	my ($mapwidget, $preset) = @_;	2174	my ($mapwidget, $preset) = @_;
2158		2175
2159	$MESSAGE_WINDOW->activate_console ($preset)	2176	$MESSAGE_DIST->activate_console ($preset)
2160	if $MESSAGE_WINDOW;	2177	if $MESSAGE_DIST;
2161	});	2178	});
2162	$MAPWIDGET->show;	2179	$MAPWIDGET->show;
2163	$MAPWIDGET->grab_focus;	2180	$MAPWIDGET->grab_focus;
2164		2181
2165	$COMPLETER = new CFPlus::MapWidget::Command::	2182	$COMPLETER = new DC::MapWidget::Command::
2166	command => { },	2183	command => { },
2167	tooltip => "#completer_help",	2184	tooltip => "#completer_help",
2168	;	2185	;
2169		2186
2170	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2187	$SETUP_DIALOG = new DC::UI::Toplevel
2171	title => "Setup",	2188	title => "Setup",
2172	name => "setup_dialog",	2189	name => "setup_dialog",
2173	x => 'center',	2190	x => 'center',
2174	y => 'center',	2191	y => 'center',
2175	z => 2,	2192	z => 2,
…		…
2177	force_h => $::HEIGHT * 0.6,	2194	force_h => $::HEIGHT * 0.6,
2178	has_close_button => 1,	2195	has_close_button => 1,
2179	;	2196	;
2180		2197
2181	$METASERVER = metaserver_dialog;	2198	$METASERVER = metaserver_dialog;
2182	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;	2199	$MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages');
		2200	$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
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::prepare_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 / $MAX_FPS, undef, sub {
2282	$NOW = time;	2302	$NOW = EV::now;
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 configuration 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;
		2498	DC::OpenGL::quit;
2465	CFPlus::SDL_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