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.4 by root, Mon Nov 12 23:25:37 2007 UTC vs.
Revision 1.30 by root, Mon Mar 24 01:15:22 2008 UTC

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

Diff Legend

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