ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.6 by root, Mon Dec 3 22:37:10 2007 UTC vs.
Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC

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

Diff Legend

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