ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.3 by root, Sat Nov 3 12:08:44 2007 UTC vs.
Revision 1.45 by root, Mon May 26 03:35:42 2008 UTC

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

Diff Legend

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