ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.3 by root, Sat Nov 3 12:08:44 2007 UTC vs.
Revision 1.34 by root, Sun Mar 30 00:25:13 2008 UTC

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

Diff Legend

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