ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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