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.15 by root, Wed Dec 26 18:20:46 2007 UTC vs.
Revision 1.76 by root, Wed Sep 3 12:50:43 2008 UTC

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

Diff Legend

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