ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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