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.51 by root, Thu Jul 17 15:23:43 2008 UTC

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

Diff Legend

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