ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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