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.33 by root, Tue Mar 25 21:11:52 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 {
		770	warn $@;
722	status "unable to connect";	771	status "unable to connect";
723	stop_game();	772	stop_game();
724	}	773	}
725	}	774	}
726		775
…		…
728	$LOGIN_BUTTON->set_text ("Login / Register");	777	$LOGIN_BUTTON->set_text ("Login / Register");
729	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	778	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
730	$SETUP_DIALOG->show;	779	$SETUP_DIALOG->show;
731	$PL_WINDOW->hide;	780	$PL_WINDOW->hide;
732	$SPELL_LIST->clear_spells;	781	$SPELL_LIST->clear_spells;
733	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	782	$DC::UI::ROOT->emit (stop_game => ! ! $CONN);
734		783
735	&audio_music_set_ambient ([]);	784	&audio_music_set_ambient ([]);
736		785
737	return unless $CONN;	786	return unless $CONN;
738		787
…		…
744		793
745	undef $MAP;	794	undef $MAP;
746	}	795	}
747		796
748	sub graphics_setup {	797	sub graphics_setup {
749	my $vbox = new CFPlus::UI::VBox;	798	my $vbox = new DC::UI::VBox;
750		799
751	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	800	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
752		801
753	my $row = 0;	802	my $row = 0;
754		803
755	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");	804	$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,	805	$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,	806	can_events => 1,
758	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");	807	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
759		808
760	my $vidmode_tooltip =	809	my $vidmode_tooltip =
761	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	810	"<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>.";	811	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
763		812
764	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	813	$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);	814	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
766		815
767	$hbox->add (my $mode_slider = new CFPlus::UI::Slider	816	$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],	817	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
769	tooltip => $vidmode_tooltip);	818	tooltip => $vidmode_tooltip);
770	$hbox->add (my $mode_label = new CFPlus::UI::Label	819	$hbox->add (my $mode_label = new DC::UI::Label
771	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",	820	height => 0.8, template => "9999x9999@9+9",
772	can_events => 1, tooltip => $vidmode_tooltip);	821	can_events => 1, tooltip => $vidmode_tooltip);
773		822
774	$mode_slider->connect (changed => sub {	823	$mode_slider->connect (changed => sub {
775	my ($self, $value) = @_;	824	my ($self, $value) = @_;
776		825
777	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	826	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
778	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	827	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
779	});	828	});
780	$mode_slider->emit (changed => $mode_slider->{range}[0]);	829	$mode_slider->emit (changed => $mode_slider->{range}[0]);
781		830
782	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	831	$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	832	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
784	state => $CFG->{fullscreen},	833	state => $CFG->{fullscreen},
785	tooltip => "Bring the client into fullscreen mode.",	834	tooltip => "Bring the client into fullscreen mode.",
786	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	835	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
787	);	836	);
788		837
789	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");	838	$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	839	$table->add_at (1, $row++, new DC::UI::CheckBox
791	state => $CFG->{force_opengl11},	840	state => $CFG->{force_opengl11},
792	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "	841	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 "	842	. "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. "	843	. "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, "	844	. "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 "	845	. "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>",	846	. "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 }	847	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
799	);	848	);
800		849
801	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");	850	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
802	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	851	$table->add_at (1, $row++, new DC::UI::CheckBox
803	state => $CFG->{texture_compression},	852	state => $CFG->{texture_compression},
804	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	853	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 "	854	. "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 "	855	. "can differ form card to card, so your mileage may vary. This setting is ignored in "
807	. "forced OpenGL 1.1 mode.",	856	. "forced OpenGL 1.1 mode.",
808	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	857	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
809	);	858	);
810		859
811	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	860	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
812	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	861	$table->add_at (1, $row++, new DC::UI::CheckBox
813	state => $CFG->{fast},	862	state => $CFG->{fast},
814	tooltip => "Lower the visual quality considerably to speed up rendering.",	863	tooltip => "Lower the visual quality considerably to speed up rendering.",
815	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	864	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
816	);	865	);
817		866
818	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	867	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
819	$table->add_at (1, $row++, new CFPlus::UI::Slider	868	$table->add_at (1, $row++, new DC::UI::Slider
820	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	869	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.",	870	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 },	871	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
823	);	872	);
824		873
825	$table->add_at (1, $row++, new CFPlus::UI::Button	874	$table->add_at (1, $row++, new DC::UI::Button
826	expand => 1, align => 0, text => "Apply",	875	expand => 1, text => "Apply",
827	tooltip => "Apply the video settings above.",	876	tooltip => "Apply the video settings above.",
828	on_activate => sub {	877	on_activate => sub {
829	video_shutdown ();	878	video_shutdown ();
830	video_init ();	879	video_init ();
831	0	880	0
832	}	881	}
833	);	882	);
834		883
835	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	884	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
836	$table->add_at (1, $row++, new CFPlus::UI::Slider	885	$table->add_at (1, $row++, new DC::UI::Slider
837	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	886	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
838	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	887	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
839	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	888	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
840	);	889	);
841		890
842	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");	891	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
843	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	892	$table->add_at (1, $row++, new DC::UI::CheckBox
844	state => $CFG->{map_smoothing},	893	state => $CFG->{map_smoothing},
845	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	894	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. "	895	. "This increases load on the graphics subsystem and works only with TRT servers. "
847	. "Changes take effect at next login only.",	896	. "Changes take effect at next login only.",
848	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	897	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
849	);	898	);
850		899
851	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	900	$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	901	$table->add_at (1, $row++, new DC::UI::CheckBox
853	state => $CFG->{fow_enable},	902	state => $CFG->{fow_enable},
854	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	903	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 }	904	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
856	);	905	);
857		906
858	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	907	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
859	$table->add_at (1, $row++, new CFPlus::UI::Slider	908	$table->add_at (1, $row++, new DC::UI::Slider
860	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	909	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.",	910	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 }	911	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
863	);	912	);
864		913
865	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	914	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
866	$table->add_at (1, $row++, new CFPlus::UI::Slider	915	$table->add_at (1, $row++, new DC::UI::Slider
867	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	916	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, "	917	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.",	918	. "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 },	919	on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
871	);	920	);
872		921
873	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	922	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
874	$table->add_at (1, $row++, new CFPlus::UI::Slider	923	$table->add_at (1, $row++, new DC::UI::Slider
875	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	924	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.",	925	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
877	on_changed => sub {	926	on_changed => sub {
878	$CFG->{gauge_fontsize} = $_[1];	927	$CFG->{gauge_fontsize} = $_[1];
879	&set_gauge_window_fontsize;	928	&set_gauge_window_fontsize;
880	0	929	0
881	}	930	}
882	);	931	);
883		932
884	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	933	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
885	$table->add_at (1, $row++, new CFPlus::UI::Slider	934	$table->add_at (1, $row++, new DC::UI::Slider
886	range => [$CFG->{gauge_size}, 0.2, 0.8],	935	range => [$CFG->{gauge_size}, 0.2, 0.8],
887	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	936	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
888	on_changed => sub {	937	on_changed => sub {
889	$CFG->{gauge_size} = $_[1];	938	$CFG->{gauge_size} = $_[1];
890	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	939	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
…		…
897		946
898	our $AUDIO_HW_CHUNKSIZE;	947	our $AUDIO_HW_CHUNKSIZE;
899	our $AUDIO_INFO;	948	our $AUDIO_INFO;
900		949
901	sub audio_tab_update {	950	sub audio_tab_update {
902	my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;	951	my ($freq, $format, $chans) = DC::Mix_QuerySpec;
903		952
904	$AUDIO_HW_CHUNKSIZE->set_options ([	953	$AUDIO_HW_CHUNKSIZE->set_options ([
905	[0, "default", "Use System Default"],	954	[0, "default", "Use System Default"],
906	map {	955	map {
907	my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);	956	my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
…		…
917		966
918	$AUDIO_INFO->set_text ($text);	967	$AUDIO_INFO->set_text ($text);
919	}	968	}
920		969
921	sub audio_setup {	970	sub audio_setup {
922	my $vbox = new CFPlus::UI::VBox;	971	my $vbox = new DC::UI::VBox;
923		972
924	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);	973	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
925		974
926	my $row = 0;	975	my $row = 0;
927		976
928	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	977	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
929	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	978	$table->add_at (1, $row++, new DC::UI::CheckBox
930	state => $CFG->{audio_enable},	979	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.",	980	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 }	981	on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
933	);	982	);
934		983
935	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");	984	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
936	$table->add_at (1, $row, new CFPlus::UI::CheckBox	985	$table->add_at (1, $row, new DC::UI::CheckBox
937	expand => 1, state => $CFG->{effects_enable},	986	expand => 1, state => $CFG->{effects_enable},
938	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",	987	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
939	on_changed => sub {	988	on_changed => sub {
940	$CFG->{effects_enable} = $_[1];	989	$CFG->{effects_enable} = $_[1];
941	$CONN->update_fx_want if $CONN;	990	$CONN->update_fx_want if $CONN;
942	1	991	1
943	}	992	}
944	);	993	);
945	$table->add_at (2, $row++, new CFPlus::UI::Slider	994	$table->add_at (2, $row++, new DC::UI::Slider
946	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],	995	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 "	996	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.",	997	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
949	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }	998	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
950	);	999	);
951		1000
952	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	1001	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
953	$table->add_at (1, $row, new CFPlus::UI::CheckBox	1002	$table->add_at (1, $row, new DC::UI::CheckBox
954	expand => 1, state => $CFG->{bgm_enable},	1003	expand => 1, state => $CFG->{bgm_enable},
955	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	1004	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
956	on_changed => sub {	1005	on_changed => sub {
957	$CFG->{bgm_enable} = $_[1];	1006	$CFG->{bgm_enable} = $_[1];
958	$CONN->update_fx_want if $CONN;	1007	$CONN->update_fx_want if $CONN;
959	audio_music_push;	1008	audio_music_push;
960	1	1009	1
961	}	1010	}
962	);	1011	);
963	$table->add_at (2, $row++, new CFPlus::UI::Slider	1012	$table->add_at (2, $row++, new DC::UI::Slider
964	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	1013	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
965	tooltip => "The volume of the background music. Changes are instant.",	1014	tooltip => "The volume of the background music. Changes are instant.",
966	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }	1015	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
967	);	1016	);
968		1017
969	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");	1018	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
970	$table->add_at (1, $row++, new CFPlus::UI::Selector	1019	$table->add_at (1, $row++, new DC::UI::Selector
971	c_colspan => 2, expand => 1,	1020	c_colspan => 2, expand => 1,
972	value => $CFG->{audio_hw_frequency},	1021	value => $CFG->{audio_hw_frequency},
973	options => [	1022	options => [
974	[ 0, "default" , "Use System Default"],	1023	[ 0, "default" , "Use System Default"],
975	[11025, "11 kHz" , "11kHz (low quality)"],	1024	[11025, "11 kHz" , "11kHz (low quality)"],
…		…
983	audio_tab_update;	1032	audio_tab_update;
984	1	1033	1
985	}	1034	}
986	);	1035	);
987		1036
988	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");	1037	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
989	$table->add_at (1, $row++, new CFPlus::UI::Selector	1038	$table->add_at (1, $row++, new DC::UI::Selector
990	c_colspan => 2, expand => 1,	1039	c_colspan => 2, expand => 1,
991	value => $CFG->{audio_hw_channels},	1040	value => $CFG->{audio_hw_channels},
992	options => [	1041	options => [
993	[0, "default" , "Use System Default"],	1042	[0, "default" , "Use System Default"],
994	[1, "Mono" , "Mono (single channel, low quality)"],	1043	[1, "Mono" , "Mono (single channel, low quality)"],
995	[2, "Stereo" , "Stereo (dual channe, standard quality)"],	1044	[2, "Stereo" , "Stereo (dual channel, standard quality)"],
996	[4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],	1045	[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)"],	1046	[6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
998	],	1047	],
999	tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",	1048	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 {	1049	on_changed => sub {
…		…
1002	audio_tab_update;	1051	audio_tab_update;
1003	1	1052	1
1004	}	1053	}
1005	);	1054	);
1006		1055
1007	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");	1056	$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	1057	$table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1009	c_colspan => 2, expand => 1,	1058	c_colspan => 2, expand => 1,
1010	value => $CFG->{audio_hw_chunksize},	1059	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 "	1060	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.",	1061	. "is stuttering, increase this value. Values of 50-100ms are optimal.",
1013	on_changed => sub {	1062	on_changed => sub {
…		…
1016	1	1065	1
1017	}	1066	}
1018	);	1067	);
1019		1068
1020	# should really be a slider	1069	# should really be a slider
1021	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");	1070	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1022	$table->add_at (1, $row++, new CFPlus::UI::ValSlider	1071	$table->add_at (1, $row++, new DC::UI::ValSlider
1023	c_colspan => 2, expand => 1,	1072	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.",	1073	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],	1074	range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1026	template => ">= 99",	1075	template => ">= 99",
1027	on_changed => sub {	1076	on_changed => sub {
…		…
1031	if $value;	1080	if $value;
1032	1;	1081	1;
1033	}	1082	}
1034	);	1083	);
1035		1084
1036	$table->add_at (1, $row++, new CFPlus::UI::Button	1085	$table->add_at (1, $row++, new DC::UI::Button
1037	c_colspan => 2, expand => 1, align => 0, text => "Apply",	1086	c_colspan => 2, expand => 1, text => "Apply",
1038	tooltip => "Apply the audio settings",	1087	tooltip => "Apply the audio settings",
1039	on_activate => sub {	1088	on_activate => sub {
1040	audio_shutdown ();	1089	audio_shutdown ();
1041	audio_init ();	1090	audio_init ();
1042	0	1091	0
1043	}	1092	}
1044	);	1093	);
1045		1094
1046	$vbox->add (new CFPlus::UI::FancyFrame	1095	$vbox->add (new DC::UI::FancyFrame
1047	expand => 1,	1096	expand => 1,
1048	label => "Audio Info",	1097	label => "Audio Info",
1049	child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),	1098	child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1050	);	1099	);
1051		1100
1052	audio_tab_update;	1101	audio_tab_update;
1053		1102
1054	$vbox	1103	$vbox
…		…
1061	}	1110	}
1062		1111
1063	sub make_gauge_window {	1112	sub make_gauge_window {
1064	my $gh = int $HEIGHT * $CFG->{gauge_size};	1113	my $gh = int $HEIGHT * $CFG->{gauge_size};
1065		1114
1066	my $win = new CFPlus::UI::Frame (	1115	my $win = new DC::UI::Frame (
1067	force_x => 0,	1116	force_x => 0,
1068	force_y => "max",	1117	force_y => "max",
1069	force_w => $WIDTH,	1118	force_w => $WIDTH,
1070	force_h => $gh,	1119	force_h => $gh,
1071	);	1120	);
1072		1121
1073	$win->add (my $hbox = new CFPlus::UI::HBox	1122	$win->add (my $hbox = new DC::UI::HBox
1074	children => [	1123	children => [
1075	(new CFPlus::UI::HBox expand => 1),	1124	(new DC::UI::HBox expand => 1),
1076	(new CFPlus::UI::VBox children => [	1125	(new DC::UI::VBox children => [
1077	(new CFPlus::UI::Empty expand => 1),	1126	(new DC::UI::Empty expand => 1),
1078	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),	1127	(new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1079	]),	1128	]),
1080	(my $vbox = new CFPlus::UI::VBox),	1129	(my $vbox = new DC::UI::VBox),
1081	],	1130	],
1082	);	1131	);
1083		1132
1084	$vbox->add (new CFPlus::UI::HBox	1133	$vbox->add (new DC::UI::HBox
1085	expand => 1,	1134	expand => 1,
1086	children => [	1135	children => [
1087	(new CFPlus::UI::Empty expand => 1),	1136	(new DC::UI::Empty expand => 1),
1088	(my $hb = new CFPlus::UI::HBox),	1137	(my $hb = new DC::UI::HBox),
1089	],	1138	],
1090	);	1139	);
1091		1140
1092	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");	1141	$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");	1142	$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");	1143	$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");	1144	$hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1096		1145
1097	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");	1146	$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);	1147	$vbox->add (my $prg = new DC::UI::ExperienceProgress);
1099	$vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);	1148	$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");	1149	$vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1101		1150
1102	$GAUGES = {	1151	$GAUGES = {
1103	exp => $exp, prg => $prg, sklprg => $sklprg,	1152	exp => $exp, prg => $prg, sklprg => $sklprg,
1104	win => $win, range => $rng,	1153	win => $win, range => $rng,
1105	hp => $hg, mana => $mg, grace => $gg, food => $fg,	1154	hp => $hg, mana => $mg, grace => $gg, food => $fg,
…		…
1109		1158
1110	$win	1159	$win
1111	}	1160	}
1112		1161
1113	sub debug_setup {	1162	sub debug_setup {
1114	my $table = new CFPlus::UI::Table;	1163	my $table = new DC::UI::Table;
1115		1164
1116	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");	1165	$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 });	1166	$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");	1167	$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 });	1168	$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");	1169	$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 });	1170	$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");	1171	$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 });	1172	$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() } );	1173	$table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1125		1174
1126	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	1175	$table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1127		1176
1128	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);	1177	$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);	1178	$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);	1179	$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);	1180	$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);	1181	$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");	1182	$t->add_at (1,1, new DC::UI::Label text => "e");
1134		1183
1135	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);	1184	$table->add_at (7, 6, my $c = new DC::UI::Canvas);
1136		1185
1137	$c->add_items ({	1186	$c->add_items ({
1138	type => "line_loop",	1187	type => "line_loop",
1139	color => [0, 1, 0],	1188	color => [0, 1, 0],
1140	width => 9,	1189	width => 9,
…		…
1160		1209
1161	$table	1210	$table
1162	}	1211	}
1163		1212
1164	sub stats_window {	1213	sub stats_window {
1165	my $r = new CFPlus::UI::ScrolledWindow (	1214	my $r = new DC::UI::ScrolledWindow (
1166	expand => 1,	1215	expand => 1,
1167	scroll_y => 1	1216	scroll_y => 1
1168	);	1217	);
1169	$r->add (my $vb = new CFPlus::UI::VBox);	1218	$r->add (my $vb = new DC::UI::VBox);
1170		1219
1171	$vb->add (new CFPlus::UI::FancyFrame	1220	$vb->add (new DC::UI::FancyFrame
1172	label => "Player",	1221	label => "Player",
1173	child => (my $pi = new CFPlus::UI::VBox),	1222	child => (my $pi = new DC::UI::VBox),
1174	);	1223	);
1175		1224
1176	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	1225	$pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1177	can_hover => 1, can_events => 1,	1226	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.");	1227	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,	1228	$pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1180	can_hover => 1, can_events => 1,	1229	can_hover => 1, can_events => 1,
1181	tooltip => "The map you are currently on (if supported by the server).");	1230	tooltip => "The map you are currently on (if supported by the server).");
1182		1231
1183	$pi->add (my $hb0 = new CFPlus::UI::HBox);	1232	$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,	1233	$hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1185	can_hover => 1, can_events => 1,	1234	can_hover => 1, can_events => 1,
1186	tooltip => "The weight of the player including all inventory items.");	1235	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,	1236	$hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1188	can_hover => 1, can_events => 1,	1237	can_hover => 1, can_events => 1,
1189	tooltip => "The weight limit: you cannot carry more than this.");	1238	tooltip => "The weight limit: you cannot carry more than this.");
1190		1239
1191	$vb->add (new CFPlus::UI::FancyFrame	1240	$vb->add (new DC::UI::FancyFrame
1192	label => "Primary/Secondary Statistics",	1241	label => "Primary/Secondary Statistics",
1193	child => (my $hb = new CFPlus::UI::HBox expand => 1),	1242	child => (my $hb = new DC::UI::HBox expand => 1),
1194	);	1243	);
1195	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);	1244	$hb->add (my $tbl = new DC::UI::Table expand => 1);
1196		1245
1197	my $color2 = [1, 1, 0];	1246	my $color2 = [1, 1, 0];
1198		1247
1199	for (	1248	for (
1200	[0, 0, st_str => "Str", 30],	1249	[0, 0, st_str => "Str", 30],
…		…
1212	[2, 4, st_spd => "Spd", 10.54],	1261	[2, 4, st_spd => "Spd", 10.54],
1213	[2, 5, st_wspd => "WSp", 10.54],	1262	[2, 5, st_wspd => "WSp", 10.54],
1214	) {	1263	) {
1215	my ($col, $row, $id, $label, $template) = @$_;	1264	my ($col, $row, $id, $label, $template) = @$_;
1216		1265
1217	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1266	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1218	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1267	font => $FONT_FIXED, can_hover => 1, can_events => 1,
1219	align => +1, template => $template, tooltip => "#stat_$label");	1268	align => 1, template => $template, tooltip => "#stat_$label");
1220	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1269	$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,	1270	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1222	align => -1, text => $label, tooltip => "#stat_$label");	1271	align => 0, text => $label, tooltip => "#stat_$label");
1223	}	1272	}
1224		1273
1225	$vb->add (new CFPlus::UI::FancyFrame	1274	$vb->add (new DC::UI::FancyFrame
1226	label => "Resistancies",	1275	label => "Resistancies",
1227	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),	1276	child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1228	);	1277	);
1229		1278
1230	my $row = 0;	1279	my $row = 0;
1231	my $col = 0;	1280	my $col = 0;
1232		1281
…		…
1271		1320
1272	for (qw/slow holyw conf fire depl magic	1321	for (qw/slow holyw conf fire depl magic
1273	drain acid pois para deat phys	1322	drain acid pois para deat phys
1274	blind fear tund elec cold ghit/)	1323	blind fear tund elec cold ghit/)
1275	{	1324	{
1276	$tbl2->add_at ($col, $row,	1325	$tbl2->add_at ($col + 2, $row,
1277	$STATWIDS->{"res_$_"} =	1326	$STATWIDS->{"res_$_"} =
1278	new CFPlus::UI::Label	1327	new DC::UI::Label
1279	font => $FONT_FIXED,	1328	font => $FONT_FIXED,
1280	template => "-100%",	1329	template => "-100%",
1281	align => +1,	1330	align => 1,
1282	valign => 0,
1283	can_events => 1,	1331	can_events => 1,
1284	can_hover => 1,	1332	can_hover => 1,
1285	tooltip => $resist_names{$_}->[1],	1333	tooltip => $resist_names{$_}->[1],
1286	);	1334	);
1287	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image	1335	$tbl2->add_at ($col + 1, $row, new DC::UI::Image
1288	font => $FONT_FIXED,	1336	font => $FONT_FIXED,
1289	can_hover => 1,	1337	can_hover => 1,
1290	can_events => 1,	1338	can_events => 1,
1291	path => "ui/resist/resist_$_.png",	1339	path => "ui/resist/resist_$_.png",
1292	tooltip => $resist_names{$_}->[1],	1340	tooltip => $resist_names{$_}->[1],
1293	);	1341	);
1294	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label	1342	$tbl2->add_at ($col + 0, $row, new DC::UI::Label
1295	text => $resist_names{$_}->[0],	1343	text => $resist_names{$_}->[0],
1296	font => $FONT_FIXED,	1344	font => $FONT_FIXED,
		1345	align => 1,
1297	can_hover => 1,	1346	can_hover => 1,
1298	can_events => 1,	1347	can_events => 1,
1299	tooltip => $resist_names{$_}->[1],	1348	tooltip => $resist_names{$_}->[1],
1300	);	1349	);
1301		1350
1302	$row++;	1351	$row++;
1303	if ($row % 6 == 0) {	1352	if ($row % 6 == 0) {
1304	$col += 3;	1353	$col += 4;
1305	$row = 0;	1354	$row = 0;
1306	}	1355	}
1307	}	1356	}
1308		1357
1309	#update_stats_window ({});	1358	#update_stats_window ({});
1310		1359
1311	$r	1360	$r
1312	}	1361	}
1313		1362
1314	sub skill_window {	1363	sub skill_window {
1315	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);	1364	my $sw = new DC::UI::ScrolledWindow (expand => 1);
1316		1365
1317	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);	1366	$sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1318		1367
1319	$sw	1368	$sw
1320	}	1369	}
1321		1370
1322	sub formsep($) {	1371	sub formsep($) {
…		…
1334	return if $METASERVER_ATIME > time;	1383	return if $METASERVER_ATIME > time;
1335	$METASERVER_ATIME = time + 60;	1384	$METASERVER_ATIME = time + 60;
1336		1385
1337	my $table = $METASERVER->{table};	1386	my $table = $METASERVER->{table};
1338	$table->clear;	1387	$table->clear;
1339	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1388	$table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1340		1389
1341	my $ok = 0;	1390	my $ok = 0;
1342		1391
1343	CFPlus::background {	1392	DC::background {
1344	my $ua = CFPlus::lwp_useragent;	1393	my $ua = DC::lwp_useragent;
1345		1394
1346	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;	1395	DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1347	} sub {	1396	} sub {
1348	my ($msg) = @_;	1397	my ($msg) = @_;
1349	if ($msg) {	1398	if ($msg) {
1350	$table->clear;	1399	$table->clear;
1351		1400
…		…
1354	"The hostname of the server.",	1403	"The hostname of the server.",
1355	"The time this server has been running without being restarted.",	1404	"The time this server has been running without being restarted.",
1356	"Short information about this server provided by its admins.",	1405	"Short information about this server provided by its admins.",
1357	);	1406	);
1358	my @col = qw(#Users Host Uptime Version Description);	1407	my @col = qw(#Users Host Uptime Version Description);
1359	$table->add_at ($_, 0, new CFPlus::UI::Label	1408	$table->add_at ($_, 0, new DC::UI::Label
1360	can_hover => 1, can_events => 1,	1409	can_hover => 1, can_events => 1, fg => [1, 1, 0],
1361	align => 0, fg => [1, 1, 0],
1362	text => $col[$_], tooltip => $tip[$_])	1410	text => $col[$_], tooltip => $tip[$_])
1363	for 0 .. $#col;	1411	for 0 .. $#col;
1364		1412
1365	my @align = qw(1 0 1 1 -1);	1413	my @align = qw(1 0.5 1 1 0);
1366		1414
1367	my $y = 0;	1415	my $y = 0;
1368	for my $m (@{ $msg->{servers} }) {	1416	for my $m (@{ $msg->{servers} }) {
1369	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =	1417	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1370	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};	1418	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
…		…
1386		1434
1387	$m = [$users, $host, $uptime, $version, $desc];	1435	$m = [$users, $host, $uptime, $version, $desc];
1388		1436
1389	$y++;	1437	$y++;
1390		1438
1391	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [	1439	$table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1392	(new CFPlus::UI::Button	1440	(new DC::UI::Button
1393	text => "Use",	1441	text => "Use",
1394	tooltip => "Put this server into the <b>Host:Port</b> field",	1442	tooltip => "Put this server into the <b>Host:Port</b> field",
1395	on_activate => sub {	1443	on_activate => sub {
1396	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1444	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1397	$METASERVER->hide;	1445	$METASERVER->hide;
1398	0	1446	0
1399	},	1447	},
1400	),	1448	),
1401	(new CFPlus::UI::Empty expand => 1),	1449	(new DC::UI::Empty expand => 1),
1402	]);	1450	]);
1403		1451
1404	$table->add_at ($_, $y, new CFPlus::UI::Label	1452	$table->add_at ($_, $y, new DC::UI::Label
1405	max_w => $::WIDTH * 0.4,	1453	max_w => $::WIDTH * 0.4,
1406	ellipsise => 0,	1454	ellipsise => 0,
1407	align => $align[$_],	1455	align => $align[$_],
1408	text => $m->[$_],	1456	text => $m->[$_],
1409	tooltip => $tip[$_],	1457	tooltip => $tip[$_],
…		…
1419	};	1467	};
1420		1468
1421	}	1469	}
1422		1470
1423	sub metaserver_dialog {	1471	sub metaserver_dialog {
1424	my $vbox = new CFPlus::UI::VBox;	1472	my $vbox = new DC::UI::VBox;
1425	my $table = new CFPlus::UI::Table;	1473	my $table = new DC::UI::Table;
1426	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);	1474	$vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1427		1475
1428	my $dialog = new CFPlus::UI::Toplevel	1476	my $dialog = new DC::UI::Toplevel
1429	title => "Server List",	1477	title => "Server List",
1430	name => 'metaserver_dialog',	1478	name => 'metaserver_dialog',
1431	x => 'center',	1479	x => 'center',
1432	y => 'center',	1480	y => 'center',
1433	z => 3,	1481	z => 3,
…		…
1444		1492
1445	$dialog	1493	$dialog
1446	}	1494	}
1447		1495
1448	sub login_setup {	1496	sub login_setup {
1449	my $vbox = new CFPlus::UI::VBox;	1497	my $vbox = new DC::UI::VBox;
1450		1498
1451	$vbox->add (new CFPlus::UI::FancyFrame	1499	$vbox->add (new DC::UI::FancyFrame
1452	label => "Login Settings",	1500	label => "Login Settings",
1453	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1501	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1454	);	1502	);
1455		1503
1456	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1504	$table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1457	$table->add_at (1, 4, new CFPlus::UI::Entry	1505	$table->add_at (1, 4, new DC::UI::Entry
1458	text => $CFG->{profile}{default}{user},	1506	text => $CFG->{profile}{default}{user},
1459	tooltip => "The name of your character on the server.",	1507	tooltip => "The name of your character on the server.",
1460	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }	1508	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1461	);	1509	);
1462		1510
1463	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1511	$table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1464	$table->add_at (1, 5, new CFPlus::UI::Entry	1512	$table->add_at (1, 5, new DC::UI::Entry
1465	text => $CFG->{profile}{default}{password},	1513	text => $CFG->{profile}{default}{password},
1466	hidden => 1,	1514	hidden => 1,
1467	tooltip => "The password for your character.",	1515	tooltip => "The password for your character.",
1468	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }	1516	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1469	);	1517	);
1470		1518
1471	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button	1519	$table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1472	expand => 1,	1520	expand => 1,
1473	align => 0,
1474	text => "Login / Register",	1521	text => "Login / Register",
1475	tooltip => "This button will either login to the account configured above or register a new account.",	1522	tooltip => "This button will either login to the account configured above or register a new account.",
1476	on_activate => sub {	1523	on_activate => sub {
1477	$CONN ? stop_game	1524	$CONN ? stop_game
1478	: start_game;	1525	: start_game;
1479	1	1526	1
1480	},	1527	},
1481	);	1528	);
1482		1529
1483	$vbox->add (new CFPlus::UI::FancyFrame	1530	$vbox->add (new DC::UI::FancyFrame
1484	label => "Registering",	1531	label => "Registering",
1485	min_h => 200,	1532	min_h => 200,
1486	child => (new CFPlus::UI::Label valign => -1, ellipsise => 0,	1533	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1487	markup =>	1534	markup =>
1488	"To register a new account, choose a username that hasn't been taken yet and "	1535	"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.",	1536	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1490	),	1537	),
1491	);	1538	);
1492		1539
1493	$vbox	1540	$vbox
1494	}	1541	}
1495		1542
1496	sub server_setup {	1543	sub server_setup {
1497	my $vbox = new CFPlus::UI::VBox;	1544	my $vbox = new DC::UI::VBox;
1498		1545
1499	$vbox->add (new CFPlus::UI::FancyFrame	1546	$vbox->add (new DC::UI::FancyFrame
1500	label => "Connection Settings",	1547	label => "Connection Settings",
1501	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1548	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1502	);	1549	);
1503		1550
1504	my $row = 0;	1551	my $row = 0;
1505		1552
1506	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1553	$table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1507	{	1554	{
1508	$table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox);	1555	$table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1509		1556
1510	$vbox->add (	1557	$vbox->add (
1511	$HOST_ENTRY = new CFPlus::UI::Entry	1558	$HOST_ENTRY = new DC::UI::Entry
1512	expand => 1,	1559	expand => 1,
1513	text => $CFG->{profile}{default}{host},	1560	text => $CFG->{profile}{default}{host},
1514	tooltip => "The hostname or ip address of the Deliantra server to connect to",	1561	tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1515	on_changed => sub {	1562	on_changed => sub {
1516	my ($self, $value) = @_;	1563	my ($self, $value) = @_;
1517	$CFG->{profile}{default}{host} = $value;	1564	$CFG->{profile}{default}{host} = $value;
1518	1	1565	1
1519	}	1566	}
1520	);	1567	);
1521		1568
		1569	if (0) { #d# disabled
1522	$vbox->add (new CFPlus::UI::Button	1570	$vbox->add (new DC::UI::Button
1523	expand => 1,	1571	expand => 1,
1524	text => "Server List",	1572	text => "Server List",
1525	other => $METASERVER,	1573	other => $METASERVER,
1526	tooltip => "Show a list of available crossfire servers",	1574	tooltip => "Show a list of available Deliantra servers",
1527	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1575	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1528	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },	1576	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1529	);	1577	);
		1578	}#d#
1530	}	1579	}
1531		1580
1532	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1581	$table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1533	$table->add_at (1, $row, new CFPlus::UI::Slider	1582	$table->add_at (1, $row, new DC::UI::Slider
1534	force_w => 100,	1583	force_w => 100,
1535	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1584	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1536	tooltip => "This is the size of the portion of the map update the server sends you. "	1585	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, "	1586	. "If you set this to a high value you will be able to see further, "
1538	. "but you also increase bandwidth requirements and latency. "	1587	. "but you also increase bandwidth requirements and latency. "
1539	. "This option is only used once at log-in.",	1588	. "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 },	1589	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1541	);	1590	);
1542		1591
1543	$table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1592	$table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1544	$table->add_at (1, $row, new CFPlus::UI::Entry	1593	$table->add_at (1, $row, new DC::UI::Entry
1545	text => $CFG->{output_rate},	1594	text => $CFG->{output_rate},
1546	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "	1595	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1547	. "when sending data. When 0 or unset, the server "	1596	. "when sending data. When 0 or unset, the server "
1548	. "default will be used, which is usually around 100kb/s. Most servers will "	1597	. "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.",	1598	. "dynamically find an optimal rate, so adjust this only when necessary.",
1550	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },	1599	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1551	);	1600	);
1552		1601
1553	$vbox->add (new CFPlus::UI::FancyFrame	1602	$vbox->add (new DC::UI::FancyFrame
1554	label => "Server Info",	1603	label => "Server Info",
1555	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),	1604	child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1556	);	1605	);
1557		1606
1558	$vbox	1607	$vbox
1559	}	1608	}
1560		1609
1561	sub client_setup {	1610	sub client_setup {
1562	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];	1611	my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1563		1612
1564	my $row = 0;	1613	my $row = 0;
1565		1614
1566	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1615	$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	1616	$table->add_at (1, $row++, new DC::UI::CheckBox
1568	state => $CFG->{show_tips},	1617	state => $CFG->{show_tips},
1569	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1618	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1570	on_changed => sub {	1619	on_changed => sub {
1571	my ($self, $value) = @_;	1620	my ($self, $value) = @_;
1572	$CFG->{show_tips} = $value;	1621	$CFG->{show_tips} = $value;
1573	0	1622	0
1574	}	1623	}
1575	);	1624	);
1576		1625
1577	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");	1626	$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	1627	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1579	text => $CFG->{logview_max_par},	1628	text => $CFG->{logview_max_par},
1580	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1629	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 "	1630	. "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.",	1631	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1583	on_changed => sub {	1632	on_changed => sub {
1584	my ($self, $value) = @_;	1633	my ($self, $value) = @_;
1585	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);	1634	$MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1586	0	1635	0
1587	},	1636	},
1588	);	1637	);
1589		1638
1590	$table	1639	$table
1591	}	1640	}
1592		1641
1593	sub autopickup_setup {	1642	sub autopickup_setup {
1594	my $r = new CFPlus::UI::ScrolledWindow (	1643	my $r = new DC::UI::ScrolledWindow (
1595	expand => 1,	1644	expand => 1,
1596	scroll_y => 1	1645	scroll_y => 1
1597	);	1646	);
1598	$r->add (my $table = new CFPlus::UI::Table	1647	$r->add (my $table = new DC::UI::Table
1599	row_expand => [0],	1648	row_expand => [0],
1600	col_expand => [0, 1, 0, 1],	1649	col_expand => [0, 1, 0, 1],
1601	);	1650	);
1602		1651
1603	for (	1652	for (
…		…
1641	],	1690	],
1642	["Weight/Value ratio", 2, 17]	1691	["Weight/Value ratio", 2, 17]
1643	)	1692	)
1644	{	1693	{
1645	my ($title, $x, $y, @bits) = @$_;	1694	my ($title, $x, $y, @bits) = @$_;
1646	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1695	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1647		1696
1648	for (@bits) {	1697	for (@bits) {
1649	++$y;	1698	++$y;
1650		1699
1651	my $mask = $_->[1];	1700	my $mask = $_->[1];
1652	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1701	$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	1702	$table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1654	state => $::CFG->{pickup} & $mask,	1703	state => $::CFG->{pickup} & $mask,
1655	on_changed => sub {	1704	on_changed => sub {
1656	my ($box, $value) = @_;	1705	my ($box, $value) = @_;
1657		1706
1658	if ($value) {	1707	if ($value) {
…		…
1669		1718
1670	${$_->[2]} = $checkbox if $_->[2];	1719	${$_->[2]} = $checkbox if $_->[2];
1671	}	1720	}
1672	}	1721	}
1673		1722
1674	$table->add_at (2, 18, new CFPlus::UI::ValSlider	1723	$table->add_at (2, 18, new DC::UI::ValSlider
1675	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1724	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1676	template => ">= 99",	1725	template => ">= 99",
1677	to_value => sub { ">= " . 5 * $_[0] },	1726	to_value => sub { ">= " . 5 * $_[0] },
1678	on_changed => sub {	1727	on_changed => sub {
1679	my ($slider, $value) = @_;	1728	my ($slider, $value) = @_;
…		…
1682	$::CFG->{pickup} |= int $value	1731	$::CFG->{pickup} |= int $value
1683	if $value;	1732	if $value;
1684	1;	1733	1;
1685	});	1734	});
1686		1735
1687	$table->add_at (3, 18, new CFPlus::UI::Button	1736	$table->add_at (3, 18, new DC::UI::Button
1688	text => "set",	1737	text => "set",
1689	on_activate => sub {	1738	on_activate => sub {
1690	$::CONN->send_command ("pickup $::CFG->{pickup}")	1739	$::CONN->send_command ("pickup $::CFG->{pickup}")
1691	if defined $::CONN;	1740	if defined $::CONN;
1692	0	1741	0
…		…
1713	or $a->{type} <=> $b->{type}	1762	or $a->{type} <=> $b->{type}
1714	} @_ },	1763	} @_ },
1715	);	1764	);
1716		1765
1717	sub inventory_widget {	1766	sub inventory_widget {
1718	my $hb = new CFPlus::UI::HBox homogeneous => 1;	1767	my $hb = new DC::UI::HBox homogeneous => 1;
1719		1768
1720	$hb->add (my $vb1 = new CFPlus::UI::VBox);	1769	$hb->add (my $vb1 = new DC::UI::VBox);
1721	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");	1770	$vb1->add (new DC::UI::Label text => "Player");
1722		1771
1723	$vb1->add (my $hb1 = new CFPlus::UI::HBox);	1772	$vb1->add (my $hb1 = new DC::UI::HBox);
1724		1773
1725	use sort 'stable';	1774	use sort 'stable';
1726		1775
1727	$hb1->add (new CFPlus::UI::Selector	1776	$hb1->add (new DC::UI::Selector
1728	value => $::CFG->{inv_sort},	1777	value => $::CFG->{inv_sort},
1729	options => [	1778	options => [
1730	[type => "Type/Name"],	1779	[type => "Type/Name"],
1731	[mtime => "Recent/Normal/Locked"],	1780	[mtime => "Recent/Normal/Locked"],
1732	[weight => "Weight/Type"],	1781	[weight => "Weight/Type"],
…		…
1734	on_changed => sub {	1783	on_changed => sub {
1735	$::CFG->{inv_sort} = $_[1];	1784	$::CFG->{inv_sort} = $_[1];
1736	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1785	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1737	},	1786	},
1738	);	1787	);
1739	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);	1788	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1740	#TODO# update to weigh/maxweight	1789	#TODO# update to weigh/maxweight
1741	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);	1790	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1742		1791
1743	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1792	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1744	$sw1->add ($INV = new CFPlus::UI::Inventory);	1793	$sw1->add ($INV = new DC::UI::Inventory);
1745	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1794	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1746		1795
1747	$hb->add (my $vb2 = new CFPlus::UI::VBox);	1796	$hb->add (my $vb2 = new DC::UI::VBox);
1748		1797
1749	$vb2->add ($INVR_HB = new CFPlus::UI::HBox);	1798	$vb2->add ($INVR_HB = new DC::UI::HBox);
1750		1799
1751	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1800	$vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1752	$sw2->add ($INVR = new CFPlus::UI::Inventory);	1801	$sw2->add ($INVR = new DC::UI::Inventory);
1753		1802
1754	# XXX: Call after $INVR = ... because set_opencont sets the items	1803	# XXX: Call after $INVR = ... because set_opencont sets the items
1755	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1804	DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1756		1805
1757	$hb	1806	$hb
1758	}	1807	}
1759		1808
1760	sub media_window {	1809	sub media_window {
1761	my $vb = new CFPlus::UI::VBox;	1810	my $vb = new DC::UI::VBox;
1762		1811
1763	$vb->add (new CFPlus::UI::FancyFrame	1812	$vb->add (new DC::UI::FancyFrame
1764	label => "Currently playing music",	1813	label => "Currently playing music",
1765	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,	1814	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),	1815	child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1767	);	1816	);
1768		1817
1769	$vb->add (new CFPlus::UI::FancyFrame	1818	$vb->add (new DC::UI::FancyFrame
1770	label => "Other media used in this session",	1819	label => "Other media used in this session",
1771	expand => 1,	1820	expand => 1,
1772	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller	1821	child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1773	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),	1822	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1774	);	1823	);
1775		1824
1776	$vb	1825	$vb
1777	}	1826	}
…		…
1786	or return;	1835	or return;
1787		1836
1788	$LICENSE_WIDGET->add_paragraph ({	1837	$LICENSE_WIDGET->add_paragraph ({
1789	fg => [1, 1, 1, 1],	1838	fg => [1, 1, 1, 1],
1790	markup => "<small>"	1839	markup => "<small>"
1791	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"	1840	. "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1792	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"	1841	. "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1793	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"	1842	. "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1794	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"	1843	. "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1795	. "</small>",	1844	. "</small>",
1796	});	1845	});
1797	$LICENSE_WIDGET->scroll_to_bottom;	1846	$LICENSE_WIDGET->scroll_to_bottom;
1798	}	1847	}
1799		1848
…		…
1807	$PL_WINDOW->show;	1856	$PL_WINDOW->show;
1808	}	1857	}
1809	}	1858	}
1810		1859
1811	sub player_window {	1860	sub player_window {
1812	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel	1861	my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1813	x => "center",	1862	x => "center",
1814	y => "center",	1863	y => "center",
1815	force_w => $WIDTH * 9/10,	1864	force_w => $WIDTH * 9/10,
1816	force_h => $HEIGHT * 9/10,	1865	force_h => $HEIGHT * 9/10,
1817	title => "Player",	1866	title => "Player",
…		…
1819	has_close_button => 1	1868	has_close_button => 1
1820	;	1869	;
1821		1870
1822	my $ntb =	1871	my $ntb =
1823	$PL_NOTEBOOK =	1872	$PL_NOTEBOOK =
1824	new CFPlus::UI::Notebook expand => 1;	1873	new DC::UI::Notebook expand => 1;
1825		1874
1826	$ntb->add_tab (	1875	$ntb->add_tab (
1827	"Statistics (F2)" => $STATS_PAGE = stats_window,	1876	"Statistics (F2)" => $STATS_PAGE = stats_window,
1828	"Shows statistics, where all your Stats and Resistances are shown."	1877	"Shows statistics, where all your Stats and Resistances are shown."
1829	);	1878	);
1830	$ntb->add_tab (	1879	$ntb->add_tab (
1831	"Skills (F3)" => $SKILL_PAGE = skill_window,	1880	"Skills (F3)" => $SKILL_PAGE = skill_window,
1832	"Shows all your Skills."	1881	"Shows all your Skills."
1833	);	1882	);
1834		1883
1835	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1884	my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1836	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1885	$spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1837	$ntb->add_tab (	1886	$ntb->add_tab (
1838	"Spellbook (F4)" => $spellsw,	1887	"Spellbook (F4)" => $spellsw,
1839	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1888	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1840	);	1889	);
1841	$ntb->add_tab (	1890	$ntb->add_tab (
…		…
1854	$plwin->add ($ntb);	1903	$plwin->add ($ntb);
1855	$plwin	1904	$plwin
1856	}	1905	}
1857		1906
1858	sub keyboard_setup {	1907	sub keyboard_setup {
1859	CFPlus::Macro::keyboard_setup	1908	DC::Macro::keyboard_setup
1860	}	1909	}
1861		1910
1862	sub help_window {	1911	sub help_window {
1863	my $win = new CFPlus::UI::Toplevel	1912	my $win = new DC::UI::Toplevel
1864	x => 'center',	1913	x => 'center',
1865	y => 'center',	1914	y => 'center',
1866	z => 4,	1915	z => 4,
1867	name => 'doc_browser',	1916	name => 'doc_browser',
1868	force_w => int $WIDTH * 7/8,	1917	force_w => int $WIDTH * 7/8,
1869	force_h => int $HEIGHT * 7/8,	1918	force_h => int $HEIGHT * 7/8,
1870	title => "Help Browser",	1919	title => "Help Browser",
1871	has_close_button => 1;	1920	has_close_button => 1;
1872		1921
1873	$win->add (my $vbox = new CFPlus::UI::VBox);	1922	$win->add (my $vbox = new DC::UI::VBox);
1874		1923
1875	$vbox->add (new CFPlus::UI::FancyFrame	1924	$vbox->add (new DC::UI::FancyFrame
1876	label => "Navigation",	1925	label => "Navigation",
1877	child => (my $buttons = new CFPlus::UI::HBox),	1926	child => (my $buttons = new DC::UI::HBox),
1878	);	1927	);
1879	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	1928	$vbox->add (my $viewer = new DC::UI::TextScroller
1880	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	1929	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1881		1930
1882	my @history;	1931	my @history;
1883	my @future;	1932	my @future;
1884	my $curnode;	1933	my $curnode;
…		…
1886	my $load_node; $load_node = sub {	1935	my $load_node; $load_node = sub {
1887	my ($node, $para) = @_;	1936	my ($node, $para) = @_;
1888		1937
1889	$buttons->clear;	1938	$buttons->clear;
1890		1939
1891	$buttons->add (new CFPlus::UI::Button	1940	$buttons->add (new DC::UI::Button
1892	text => "⇤",	1941	text => "⇤",
1893	tooltip => "back to the starting page",	1942	tooltip => "back to the starting page",
1894	on_activate => sub {	1943	on_activate => sub {
1895	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;	1944	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1896	unshift @future, @history;	1945	unshift @future, @history;
…		…
1898	$load_node->(@{shift @future});	1947	$load_node->(@{shift @future});
1899	},	1948	},
1900	);	1949	);
1901		1950
1902	if (@history) {	1951	if (@history) {
1903	$buttons->add (new CFPlus::UI::Button	1952	$buttons->add (new DC::UI::Button
1904	text => "⋘",	1953	text => "⋘",
1905	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",	1954	tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1906	on_activate => sub {	1955	on_activate => sub {
1907	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;	1956	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1908	$load_node->(@{pop @history});	1957	$load_node->(@{pop @history});
1909	},	1958	},
1910	);	1959	);
1911	}	1960	}
1912		1961
1913	if (@future) {	1962	if (@future) {
1914	$buttons->add (new CFPlus::UI::Button	1963	$buttons->add (new DC::UI::Button
1915	text => "⋙",	1964	text => "⋙",
1916	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",	1965	tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1917	on_activate => sub {	1966	on_activate => sub {
1918	push @history, [$curnode, $viewer->current_paragraph];	1967	push @history, [$curnode, $viewer->current_paragraph];
1919	$load_node->(@{shift @future});	1968	$load_node->(@{shift @future});
1920	},	1969	},
1921	);	1970	);
1922	}	1971	}
1923		1972
1924	$buttons->add (new CFPlus::UI::Label text => " ");	1973	$buttons->add (new DC::UI::Label text => " ");
1925		1974
1926	my @path = CFPlus::Pod::full_path_of $node;	1975	my @path = DC::Pod::full_path_of $node;
1927	pop @path; # drop current node	1976	pop @path; # drop current node
1928		1977
1929	for my $node (@path) {	1978	for my $node (@path) {
1930	$buttons->add (new CFPlus::UI::Button	1979	$buttons->add (new DC::UI::Button
1931	text => $node->{kw}[0],	1980	text => $node->[DC::Pod::N_KW][0],
1932	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",	1981	tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1933	on_activate => sub {	1982	on_activate => sub {
1934	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	1983	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1935	$load_node->($node);	1984	$load_node->($node);
1936	},	1985	},
1937	);	1986	);
1938	$buttons->add (new CFPlus::UI::Label text => "/");	1987	$buttons->add (new DC::UI::Label text => "/");
1939	}	1988	}
1940		1989
1941	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);	1990	$buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1942		1991
1943	$curnode = $node;	1992	$curnode = $node;
1944		1993
1945	$viewer->clear;	1994	$viewer->clear;
1946	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);	1995	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1947	$viewer->scroll_to ($para);	1996	$viewer->scroll_to ($para);
1948	};	1997	};
1949		1998
1950	$load_node->(CFPlus::Pod::find pod => "mainpage");	1999	$load_node->(DC::Pod::find pod => "mainpage");
1951		2000
1952	$CFPlus::Pod::goto_document = sub {	2001	$DC::Pod::goto_document = sub {
1953	my (@path) = @_;	2002	my (@path) = @_;
1954		2003
1955	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	2004	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956		2005
1957	$load_node->((CFPlus::Pod::find @path)[0]);	2006	$load_node->((DC::Pod::find @path)[0]);
1958	$win->show;	2007	$win->show;
1959	};	2008	};
1960		2009
1961	$win	2010	$win
1962	}	2011	}
1963		2012
1964	sub open_string_query {	2013	sub open_string_query {
1965	my ($title, $cb, $txt, $tooltip) = @_;	2014	my ($title, $cb, $txt, $tooltip) = @_;
1966	my $dialog = new CFPlus::UI::Toplevel	2015	my $dialog = new DC::UI::Toplevel
1967	x => "center",	2016	x => "center",
1968	y => "center",	2017	y => "center",
1969	z => 50,	2018	z => 50,
1970	force_w => $WIDTH * 4/5,	2019	force_w => $WIDTH * 4/5,
1971	title => $title;	2020	title => $title;
1972		2021
1973	$dialog->add (	2022	$dialog->add (
1974	my $e = new CFPlus::UI::Entry	2023	my $e = new DC::UI::Entry
1975	on_activate => sub { $cb->(@_); $dialog->hide; 0 },	2024	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1976	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },	2025	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1977	tooltip => $tooltip	2026	tooltip => $tooltip
1978	);	2027	);
1979		2028
…		…
1982	$dialog->show;	2031	$dialog->show;
1983	}	2032	}
1984		2033
1985	sub open_quit_dialog {	2034	sub open_quit_dialog {
1986	unless ($QUIT_DIALOG) {	2035	unless ($QUIT_DIALOG) {
1987	$QUIT_DIALOG = new CFPlus::UI::Toplevel	2036	$QUIT_DIALOG = new DC::UI::Toplevel
1988	x => "center",	2037	x => "center",
1989	y => "center",	2038	y => "center",
1990	z => 50,	2039	z => 50,
1991	title => "Really Quit?",	2040	title => "Really Quit?",
1992	on_key_down => sub {	2041	on_key_down => sub {
1993	my ($dialog, $ev) = @_;	2042	my ($dialog, $ev) = @_;
1994	$ev->{sym} == 27 and $dialog->hide;	2043	$ev->{sym} == 27 and $dialog->hide;
1995	}	2044	}
1996	;	2045	;
1997		2046
1998	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);	2047	$QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
1999		2048
2000	$vb->add (new CFPlus::UI::Label	2049	$vb->add (new DC::UI::Label
2001	text => "You should find a savebed and apply it first!",	2050	text => "You should find a savebed and apply it first!",
2002	max_w => $WIDTH * 0.25,	2051	max_w => $WIDTH * 0.25,
2003	ellipsize => 0,	2052	ellipsize => 0,
2004	);	2053	);
2005	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);	2054	$vb->add (my $hb = new DC::UI::HBox expand => 1);
2006	$hb->add (new CFPlus::UI::Button	2055	$hb->add (new DC::UI::Button
2007	text => "Ok",	2056	text => "Ok",
2008	expand => 1,	2057	expand => 1,
2009	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2058	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2010	);	2059	);
2011	$hb->add (new CFPlus::UI::Button	2060	$hb->add (new DC::UI::Button
2012	text => "Quit anyway",	2061	text => "Quit anyway",
2013	expand => 1,	2062	expand => 1,
2014	on_activate => sub { EV::unloop EV::UNLOOP_ALL },	2063	on_activate => sub { EV::unloop EV::UNLOOP_ALL },
2015	);	2064	);
2016	}	2065	}
…		…
2019	$QUIT_DIALOG->grab_focus;	2068	$QUIT_DIALOG->grab_focus;
2020	}	2069	}
2021		2070
2022	sub show_tip_of_the_day {	2071	sub show_tip_of_the_day {
2023	# find all tips	2072	# find all tips
2024	my @tod = CFPlus::Pod::find tip_of_the_day => "*";	2073	my @tod = DC::Pod::find tip_of_the_day => "*";
2025		2074
2026	CFPlus::DB::get state => "tip_of_the_day", sub {	2075	DC::DB::get state => "tip_of_the_day", sub {
2027	my ($todindex) = @_;	2076	my ($todindex) = @_;
2028	$todindex = 0 if $todindex >= @tod;	2077	$todindex = 0 if $todindex >= @tod;
2029	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };	2078	DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2030		2079
2031	# create dialog	2080	# create dialog
2032	my $dialog;	2081	my $dialog;
2033		2082
2034	my $close = sub {	2083	my $close = sub {
2035	$dialog->destroy;	2084	$dialog->destroy;
2036	};	2085	};
2037		2086
2038	$dialog = new CFPlus::UI::Toplevel	2087	$dialog = new DC::UI::Toplevel
2039	x => "center",	2088	x => "center",
2040	y => "center",	2089	y => "center",
2041	z => 3,	2090	z => 3,
2042	name => 'tip_of_the_day',	2091	name => 'tip_of_the_day',
2043	force_w => int $WIDTH * 4/9,	2092	force_w => int $WIDTH * 4/9,
2044	force_h => int $WIDTH * 2/9,	2093	force_h => int $WIDTH * 2/9,
2045	title => "Tip of the day #" . (1 + $todindex),	2094	title => "Tip of the day #" . (1 + $todindex),
2046	child => my $vbox = new CFPlus::UI::VBox,	2095	child => my $vbox = new DC::UI::VBox,
2047	has_close_button => 1,	2096	has_close_button => 1,
2048	on_delete => $close,	2097	on_delete => $close,
2049	;	2098	;
2050		2099
2051	$vbox->add (my $viewer = new CFPlus::UI::TextScroller	2100	$vbox->add (my $viewer = new DC::UI::TextScroller
2052	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	2101	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]);	2102	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2054		2103
2055	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);	2104	$vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2056		2105
2057	$table->add_at (0, 0, new CFPlus::UI::Button	2106	$table->add_at (0, 0, new DC::UI::Button
2058	text => "Close",	2107	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>.",	2108	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,	2109	on_activate => $close,
2061	);	2110	);
2062		2111
2063	$table->add_at (2, 0, new CFPlus::UI::Button	2112	$table->add_at (2, 0, new DC::UI::Button
2064	text => "Next",	2113	text => "Next",
2065	tooltip => "Show the next <b>Tip of the day</b>.",	2114	tooltip => "Show the next <b>Tip of the day</b>.",
2066	on_activate => sub {	2115	on_activate => sub {
2067	$close->();	2116	$close->();
2068	&show_tip_of_the_day;	2117	&show_tip_of_the_day;
…		…
2072	$dialog->show;	2121	$dialog->show;
2073	};	2122	};
2074	}	2123	}
2075		2124
2076	sub sdl_init {	2125	sub sdl_init {
2077	CFPlus::SDL_Init	2126	DC::SDL_Init
2078	and die "SDL::Init failed!\n";	2127	and die "SDL::Init failed!\n";
2079	}	2128	}
2080		2129
2081	sub video_init {	2130	sub video_init {
2082	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	2131	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
…		…
2085		2134
2086	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2135	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2087	$FULLSCREEN = $CFG->{fullscreen};	2136	$FULLSCREEN = $CFG->{fullscreen};
2088	$FAST = $CFG->{fast};	2137	$FAST = $CFG->{fast};
2089		2138
2090	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2139	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2091	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	2140	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2092		2141
2093	$SDL_ACTIVE = 1;	2142	$SDL_ACTIVE = 1;
2094	$LAST_REFRESH = time - 0.01;	2143	$LAST_REFRESH = time - 0.01;
2095		2144
2096	CFPlus::OpenGL::init;	2145	DC::OpenGL::init;
2097	CFPlus::Macro::init;	2146	DC::Macro::init;
2098		2147
2099	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	2148	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2100		2149
2101	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	2150	$DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2102		2151
2103	#############################################################################	2152	#############################################################################
2104		2153
2105	if ($DEBUG_STATUS) {	2154	if ($DEBUG_STATUS) {
2106	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	2155	DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2107	} else {	2156	} else {
2108	# create/configure the widgets	2157	# create/configure the widgets
2109		2158
2110	$CFPlus::UI::ROOT->connect (key_down => sub {	2159	$DC::UI::ROOT->connect (key_down => sub {
2111	my (undef, $ev) = @_;	2160	my (undef, $ev) = @_;
2112		2161
2113	if (my @macros = CFPlus::Macro::find $ev) {	2162	if (my @macros = DC::Macro::find $ev) {
2114	CFPlus::Macro::execute $_ for @macros;	2163	DC::Macro::execute $_ for @macros;
2115		2164
2116	return 1;	2165	return 1;
2117	}	2166	}
2118		2167
2119	0	2168	0
2120	});	2169	});
2121		2170
2122	$DEBUG_STATUS = new CFPlus::UI::Label	2171	$DEBUG_STATUS = new DC::UI::Label
2123	padding => 0,	2172	padding => 0,
2124	z => 100,	2173	z => 100,
2125	force_x => "max",	2174	force_x => "max",
2126	force_y => 0;	2175	force_y => 0;
2127	$DEBUG_STATUS->show;	2176	$DEBUG_STATUS->show;
2128		2177
2129	$STATUSBOX = new CFPlus::UI::Statusbox;	2178	$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		2179
		2180	$MODBOX = new DC::UI::Label
		2181	can_events => 1,
		2182	can_hover => 1,
		2183	markup => "",
		2184	align => 0,
		2185	font => $FONT_FIXED,
		2186	tooltip => "#modifier_box",
		2187	tooltip_width => 0.67,
		2188	;
		2189
		2190	update_modbox;
		2191
2132	(new CFPlus::UI::Frame	2192	(new DC::UI::Frame
2133	bg => [0, 0, 0, 0.4],	2193	bg => [0, 0, 0, 0.4],
2134	force_x => 0,	2194	force_x => 0,
2135	force_y => "max",	2195	force_y => "max",
2136	child => $STATUSBOX,	2196	child => (my $LR = new DC::UI::VBox),
2137	)->show;	2197	)->show;
2138		2198
		2199	$LR->add ($STATUSBOX);
		2200	$LR->add ($MODBOX);
		2201	$LR->add (new DC::UI::Label
		2202	align => 0,
		2203	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
		2204	fontsize => 0.5,
		2205	fg => [1, 1, 0, 0.7],
		2206	);
		2207
2139	CFPlus::UI::Toplevel->new (	2208	DC::UI::Toplevel->new (
2140	title => "Minimap",	2209	title => "Minimap",
2141	name => "mapmap",	2210	name => "mapmap",
2142	x => 0,	2211	x => 0,
2143	y => $FONTSIZE + 8,	2212	y => $FONTSIZE + 8,
2144	border_bg => [1, 1, 1, 192/255],	2213	border_bg => [1, 1, 1, 192/255],
2145	bg => [1, 1, 1, 0],	2214	bg => [1, 1, 1, 0],
2146	child => ($MAPMAP = new CFPlus::MapWidget::MapMap	2215	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.",	2216	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2148	),	2217	),
2149	)->show;	2218	)->show;
2150		2219
2151	$MAPWIDGET = new CFPlus::MapWidget;	2220	$MAPWIDGET = new DC::MapWidget;
2152	$MAPWIDGET->connect (activate_console => sub {	2221	$MAPWIDGET->connect (activate_console => sub {
2153	my ($mapwidget, $preset) = @_;	2222	my ($mapwidget, $preset) = @_;
2154		2223
2155	$MESSAGE_WINDOW->activate_console ($preset)	2224	$MESSAGE_DIST->activate_console ($preset)
2156	if $MESSAGE_WINDOW;	2225	if $MESSAGE_DIST;
2157	});	2226	});
2158	$MAPWIDGET->show;	2227	$MAPWIDGET->show;
2159	$MAPWIDGET->grab_focus;	2228	$MAPWIDGET->grab_focus;
2160		2229
2161	$COMPLETER = new CFPlus::MapWidget::Command::	2230	$COMPLETER = new DC::MapWidget::Command::
2162	command => { },	2231	command => { },
2163	tooltip => "#completer_help",	2232	tooltip => "#completer_help",
2164	;	2233	;
2165		2234
2166	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2235	$SETUP_DIALOG = new DC::UI::Toplevel
2167	title => "Setup",	2236	title => "Setup",
2168	name => "setup_dialog",	2237	name => "setup_dialog",
2169	x => 'center',	2238	x => 'center',
2170	y => 'center',	2239	y => 'center',
2171	z => 2,	2240	z => 2,
…		…
2173	force_h => $::HEIGHT * 0.6,	2242	force_h => $::HEIGHT * 0.6,
2174	has_close_button => 1,	2243	has_close_button => 1,
2175	;	2244	;
2176		2245
2177	$METASERVER = metaserver_dialog;	2246	$METASERVER = metaserver_dialog;
2178	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;	2247	$MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages');
		2248	$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2179		2249
2180	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	2250	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
2181	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	2251	filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2182		2252
2183	$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,	2253	$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2184	"Configure the server to play on, your username and password.");	2254	"Configure the server to play on, your username and password.");
2185	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,	2255	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2186	"Configure other server related options.");	2256	"Configure other server related options.");
…		…
2198	. "After pressing the combo the binding will be saved automatically and the "	2268	. "After pressing the combo the binding will be saved automatically and the "
2199	. "binding editor closes");	2269	. "binding editor closes");
2200	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,	2270	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2201	"Some debuggin' options. Do not ask.");	2271	"Some debuggin' options. Do not ask.");
2202		2272
2203	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2273	$BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2204		2274
2205	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2275	$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.");	2276	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2207		2277
2208	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,	2278	$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.");	2279	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2210		2280
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	2281	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		2282
2213	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	2283	$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.");	2284	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2215		2285
2216	$BUTTONBAR->add (new CFPlus::UI::Button	2286	$BUTTONBAR->add (new DC::UI::Button
2217	text => "Save Config",	2287	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.",	2288	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 {	2289	on_activate => sub {
2220	$::CFG->{layout} = CFPlus::UI::get_layout;	2290	$::CFG->{layout} = DC::UI::get_layout;
2221	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";	2291	DC::write_cfg "$Deliantra::VARDIR/client.cf";
2222	status "Configuration Saved";	2292	status "Configuration Saved";
2223	0	2293	0
2224	},	2294	},
2225	);	2295	);
2226		2296
2227	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	2297	$BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2228	tooltip => "View Documentation");	2298	tooltip => "View Documentation");
2229		2299
2230		2300
2231	$BUTTONBAR->add (new CFPlus::UI::Button	2301	$BUTTONBAR->add (new DC::UI::Button
2232	text => "Quit",	2302	text => "Quit",
2233	tooltip => "Terminates the program",	2303	tooltip => "Terminates the program",
2234	on_activate => sub {	2304	on_activate => sub {
2235	if ($CONN) {	2305	if ($CONN) {
2236	open_quit_dialog;	2306	open_quit_dialog;
…		…
2248		2318
2249	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2319	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2250	}	2320	}
2251		2321
2252	sub video_shutdown {	2322	sub video_shutdown {
2253	CFPlus::OpenGL::shutdown;	2323	DC::OpenGL::shutdown;
2254		2324
2255	undef $SDL_ACTIVE;	2325	undef $SDL_ACTIVE;
2256	}	2326	}
2257		2327
2258	my %animate_object;	2328	my %animate_object;
2259	my $animate_timer;	2329	my $animate_timer;
2260		2330
2261	my $fps = 9;	2331	my $fps = 9;
2262		2332
2263	sub force_refresh {	2333	sub force_refresh {
2264	$WANT_REFRESH->stop;
2265
2266	if ($ENV{CFPLUS_DEBUG} & 4) {	2334	if ($ENV{CFPLUS_DEBUG} & 4) {
2267	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;	2335	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2268	debug sprintf "%3.2f", $fps;	2336	debug sprintf "%3.2f", $fps;
2269	}	2337	}
2270		2338
		2339	undef $WANT_REFRESH;
		2340	$_[0]->stop;
		2341
2271	$CFPlus::UI::ROOT->draw;	2342	$DC::UI::ROOT->draw;
2272	CFPlus::SDL_GL_SwapBuffers;	2343	DC::SDL_GL_SwapBuffers;
2273	$LAST_REFRESH = $NOW;	2344	$LAST_REFRESH = $NOW;
2274	}	2345	}
2275		2346
2276	$WANT_REFRESH = EV::idle_ns \&force_refresh;	2347	my $want_refresh = EV::prepare_ns \&force_refresh;
2277		2348
2278	my $input = EV::timer 0, 1/60, sub {	2349	my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2279	$NOW = time;	2350	$NOW = EV::now;
2280		2351
2281	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2352	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2282	for CFPlus::poll_events;	2353	for DC::poll_events;
2283		2354
2284	if (%animate_object) {	2355	if (%animate_object) {
2285	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2356	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2286	$WANT_REFRESH->start;	2357	$WANT_REFRESH = 1;
2287	}	2358	}
		2359
		2360	$want_refresh->start
		2361	if $WANT_REFRESH;
2288	};	2362	};
2289		2363
2290	sub animation_start {	2364	sub animation_start {
2291	my ($widget) = @_;	2365	my ($widget) = @_;
2292	$animate_object{$widget} = $widget;	2366	$animate_object{$widget} = $widget;
…		…
2296	my ($widget) = @_;	2370	my ($widget) = @_;
2297	delete $animate_object{$widget};	2371	delete $animate_object{$widget};
2298	}	2372	}
2299		2373
2300	%SDL_CB = (	2374	%SDL_CB = (
2301	CFPlus::SDL_QUIT => sub {	2375	DC::SDL_QUIT => sub {
2302	EV::unloop EV::UNLOOP_ALL;	2376	EV::unloop EV::UNLOOP_ALL;
2303	},	2377	},
2304	CFPlus::SDL_VIDEORESIZE => sub {	2378	DC::SDL_VIDEORESIZE => sub {
2305	},	2379	},
2306	CFPlus::SDL_VIDEOEXPOSE => sub {	2380	DC::SDL_VIDEOEXPOSE => sub {
2307	CFPlus::UI::full_refresh;	2381	DC::UI::full_refresh;
2308	},	2382	},
2309	CFPlus::SDL_ACTIVEEVENT => sub {	2383	DC::SDL_ACTIVEEVENT => sub {
2310	# not useful, as APPACTIVE include sonly iconified state, not unmapped	2384	# 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#	2385	# 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#	2386	# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2313	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;	2387	# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2314	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;	2388	# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2315	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;	2389	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2316	},	2390	},
2317	CFPlus::SDL_KEYDOWN => sub {	2391	DC::SDL_KEYDOWN => sub {
2318	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {	2392	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2319	# alt-enter	2393	# alt-enter
2320	$FULLSCREEN_ENABLE->toggle;	2394	$FULLSCREEN_ENABLE->toggle;
2321	video_shutdown;	2395	video_shutdown;
2322	video_init;	2396	video_init;
2323	} else {	2397	} else {
2324	CFPlus::UI::feed_sdl_key_down_event ($_[0]);	2398	&DC::UI::feed_sdl_key_down_event;
2325	}	2399	}
		2400	update_modbox;
2326	},	2401	},
2327	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,	2402	DC::SDL_KEYUP => sub {
		2403	&DC::UI::feed_sdl_key_up_event;
		2404	update_modbox;
		2405	},
2328	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,	2406	DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2329	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,	2407	DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2330	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,	2408	DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2331	CFPlus::SDL_USEREVENT => sub {	2409	DC::SDL_USEREVENT => sub {
2332	if ($_[0]{code} == 1) {	2410	if ($_[0]{code} == 1) {
2333	audio_channel_finished $_[0]{data1};	2411	audio_channel_finished $_[0]{data1};
2334	} elsif ($_[0]{code} == 0) {	2412	} elsif ($_[0]{code} == 0) {
2335	audio_music_finished;	2413	audio_music_finished;
2336	}	2414	}
2337	},	2415	},
2338	);	2416	);
2339		2417
2340	#############################################################################	2418	#############################################################################
2341		2419
2342	$SIG{INT} = $SIG{TERM} = sub { exit };	2420	$SIG{INT} = $SIG{TERM} = sub {
		2421	EV::unloop;
		2422	#d# TODO calling exit here hangs the process in some futex
		2423	};
2343		2424
2344	{	2425	{
2345	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";	2426	if (-e "$Deliantra::VARDIR/client.cf") {
		2427	DC::read_cfg "$Deliantra::VARDIR/client.cf";
		2428	} else {
		2429	#TODO: compatibility cruft
		2430	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
		2431	print STDERR "INFO: used old configuration file\n";
		2432	}
		2433
2346	CFPlus::DB::Server::run;	2434	DC::DB::Server::run;
		2435	DC::DB::open_db;
2347		2436
2348	CFPlus::UI::set_layout ($::CFG->{layout});	2437	DC::UI::set_layout ($::CFG->{layout});
2349		2438
2350	my %DEF_CFG = (	2439	my %DEF_CFG = (
2351	sdl_mode => 0,	2440	sdl_mode => 0,
2352	fullscreen => 1,	2441	fullscreen => 1,
2353	fast => 0,	2442	fast => 0,
…		…
2399	}	2488	}
2400	}	2489	}
2401		2490
2402	sdl_init;	2491	sdl_init;
2403		2492
2404	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;	2493	@SDL_MODES = DC::SDL_ListModes 8, 8;
2405	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;	2494	@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)";	2495	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2407		2496
2408	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;	2497	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2409		2498
2410	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2499	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2411		2500
2412	{	2501	{
2413	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2502	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2414	DejaVuSans.ttf	2503	DejaVuSans.ttf
2415	DejaVuSansMono.ttf	2504	DejaVuSansMono.ttf
2416	DejaVuSans-Bold.ttf	2505	DejaVuSans-Bold.ttf
2417	DejaVuSansMono-Bold.ttf	2506	DejaVuSansMono-Bold.ttf
2418	DejaVuSans-Oblique.ttf	2507	DejaVuSans-Oblique.ttf
2419	DejaVuSansMono-Oblique.ttf	2508	DejaVuSansMono-Oblique.ttf
2420	DejaVuSans-BoldOblique.ttf	2509	DejaVuSans-BoldOblique.ttf
2421	DejaVuSansMono-BoldOblique.ttf	2510	DejaVuSansMono-BoldOblique.ttf
2422	);	2511	);
2423		2512
2424	CFPlus::add_font $_ for @fonts;	2513	DC::add_font $_ for @fonts;
2425		2514
2426	CFPlus::pango_init;
2427
2428	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];	2515	$FONT_PROP = new_from_file DC::Font $fonts[0];
2429	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];	2516	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2430		2517
2431	$FONT_PROP->make_default;	2518	$FONT_PROP->make_default;
		2519
		2520	DC::pango_init;
2432	}	2521	}
2433		2522
2434	# compare mono (ft) vs. rgba (cairo)	2523	# compare mono (ft) vs. rgba (cairo)
2435	# ft - 1.8s, cairo 3s, even in alpha-only mode	2524	# ft - 1.8s, cairo 3s, even in alpha-only mode
2436	# for my $rgba (0..1) {	2525	# for my $rgba (0..1) {
2437	# my $t1 = Time::HiRes::time;	2526	# my $t1 = Time::HiRes::time;
2438	# for (1..1000) {	2527	# for (1..1000) {
2439	# my $layout = CFPlus::Layout->new ($rgba);	2528	# my $layout = DC::Layout->new ($rgba);
2440	# $layout->set_text ("hallo" x 100);	2529	# $layout->set_text ("hallo" x 100);
2441	# $layout->render;	2530	# $layout->render;
2442	# }	2531	# }
2443	# my $t2 = Time::HiRes::time;	2532	# my $t2 = Time::HiRes::time;
2444	# warn $t2-$t1;	2533	# warn $t2-$t1;
…		…
2457		2546
2458	EV::loop;	2547	EV::loop;
2459		2548
2460	#video_shutdown;	2549	#video_shutdown;
2461	#audio_shutdown;	2550	#audio_shutdown;
		2551	DC::OpenGL::quit;
2462	CFPlus::SDL_Quit;	2552	DC::SDL_Quit;
2463	CFPlus::DB::Server::stop;	2553	DC::DB::Server::stop;
2464		2554
2465	=head1 NAME	2555	=head1 NAME
2466		2556
2467	deliantra - A Deliantra MORPG game client	2557	deliantra - A Deliantra MORPG game client
2468		2558

Diff Legend

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