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.53 by root, Fri Jul 18 22:32:55 2008 UTC vs.
Revision 1.105 by root, Sat Apr 3 02:58:25 2010 UTC

…		…
17	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");	17	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18	}	18	}
19		19
20	require Win32::GUI::SplashScreen;	20	require Win32::GUI::SplashScreen;
21		21
		22	# initialise the resolver now, as vista forces us back to the desktop
		23	# when doing this.
		24	use AnyEvent::DNS ();
		25	AnyEvent::DNS::resolver;
		26
22	Win32::GUI::SplashScreen::Show (	27	Win32::GUI::SplashScreen::Show (
23	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",	28	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24	);	29	);
25		30
26	$startup_done = sub {	31	$startup_done = sub {
27	Win32::GUI::SplashScreen::Done (1);	32	Win32::GUI::SplashScreen::Done (1);
28	};	33	};
29	}	34	}
30	}	35	}
31		36
32	use strict;	37	use common::sense;
33	use utf8;
34		38
35	use Carp 'verbose';	39	use Carp 'verbose';
36		40
37	# do things only needed for single-binary version (par)	41	# do things only needed for single-binary version (par)
38	BEGIN {	42	BEGIN {
…		…
50	}	54	}
51		55
52	if ($^O eq "MSWin32") {	56	if ($^O eq "MSWin32") {
53	# pango is relocatable on win32	57	# pango is relocatable on win32
54	} else {	58	} else {
55	open my $fh, "<:perlio", "$root/pangoversion"	59	# OS X
56	or die "pangoversion: $!";
57	my $PANGO = <$fh>;
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"
60	or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61	local $/;
62	my $rc = <$fh>;
63	$rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65	mkdir "$root/pango-modules";
66	open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67	or die "$root/pango-modules/pango.modules: $!";
68	print $fh $rc;
69
70	$ENV{PANGO_RC_FILE} = "$root/pango.rc";	60	$ENV{PANGO_RC_FILE} = "$root/pango.rc";
71	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}	61	$ENV{DYLD_LIBRARY_PATH} = $root;
72	or die "$ENV{PANGO_RC_FILE}: $!";	62	chdir $root; # for pango modules, maybe other things
73	print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74	}	63	}
75		64
76	unshift @INC, $root;	65	unshift @INC, $root;
77	}	66	}
78	}	67	}
79		68
80	# prepend private library directory	69	# prepend private library directory and prepare env
81	BEGIN {	70	BEGIN {
82	for (grep !ref, @INC) {	71	for (grep !ref, @INC) {
83	my $path = "$_/Deliantra/Client/private";	72	my $path = "$_/Deliantra/Client/private";
84	if (-d $path) {	73	if (-d $path) {
85	unshift @INC, $path;	74	unshift @INC, $path;
…		…
90		79
91	# need to do it again because that pile of garbage called PAR nukes it before main	80	# need to do it again because that pile of garbage called PAR nukes it before main
92	unshift @INC, $ENV{PAR_TEMP}	81	unshift @INC, $ENV{PAR_TEMP}
93	if %PAR::LibCache;	82	if %PAR::LibCache;
94		83
95	use Time::HiRes 'time';
96	use EV;	84	use EV;
		85	BEGIN { *time = \&EV::time }
		86
97	use List::Util qw(max min);	87	use List::Util qw(max min);
98		88
99	use Deliantra;	89	use Deliantra;
100	use Deliantra::Protocol::Constants;	90	use Deliantra::Protocol::Constants;
101		91
102	use AnyEvent::DNS;	92	use AnyEvent::Util ();
103	use AnyEvent::Socket ();	93	use AnyEvent::Socket ();
		94	use AnyEvent::DNS ();
104		95
105	use Compress::LZF;	96	use Compress::LZF;
		97	use JSON::XS;
106		98
107	use DC;	99	use DC;
108	BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }	100
		101	sub crash($;$) {
		102	# nop during compiletime
		103	}
		104
		105	BEGIN {
		106	$SIG{__DIE__} = sub {
		107	return if $^S;
		108	crash "CRASH/DIE: $_[0]" => 1;
		109	DC::fatal Carp::longmess "$_[0]";
		110	}
		111	}
		112
109	use DC::OpenGL ();	113	use DC::OpenGL ();
110	use DC::Protocol;	114	use DC::Protocol;
111	use DC::DB;	115	use DC::DB;
112	use DC::UI;	116	use DC::UI;
113	use DC::UI::Canvas;	117	use DC::UI::Canvas;
114	use DC::UI::Inventory;	118	use DC::UI::Inventory;
115	use DC::UI::SpellList;	119	use DC::UI::SpellList;
116	use DC::UI::Dockable;	120	use DC::UI::Dockable;
117	use DC::UI::Dockbar;	121	use DC::UI::Dockbar;
118	use DC::UI::MessageWindow;
119	use DC::UI::ChatView;	122	use DC::UI::ChatView;
120	use DC::MessageDistributor;	123	use DC::MessageDistributor;
121	use DC::Pod;	124	use DC::Pod;
122	use DC::MapWidget;	125	use DC::MapWidget;
123	use DC::Macro;	126	use DC::Macro;
124		127
125	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	128	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126	$SIG{PIPE} = 'IGNORE';	129	$SIG{PIPE} = 'IGNORE';
127		130
128	$EV::DIED = sub {	131	$EV::DIED = sub {
		132	crash "CRASH/EV::DIED: $@" => 0;
129	DC::fatal Carp::longmess $@;	133	DC::fatal Carp::longmess $@;
130	};	134	};
131		135
132	my $MAX_FPS = 60;	136	my $MAX_FPS = 60;
133		137
		138	our $DEFAULT_SERVER = "gameserver.deliantra.net";
		139
134	our $META_SERVER = "http://metaserver.schmorp.de/current.json";	140	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
135		141
136	our $LAST_REFRESH;	142	our $LAST_REFRESH;
137	our $NOW;	143	our $NOW;
138		144
139	our $CFG;	145	our $CFG;
140	our $CONN;
141	our $PROFILE; # current profile	146	our $PROFILE; # current profile
142	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	147	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143		148
144	our $WANT_REFRESH;	149	our $WANT_REFRESH;
145		150
…		…
154	our $FONTSIZE;	159	our $FONTSIZE;
155		160
156	our $FONT_PROP;	161	our $FONT_PROP;
157	our $FONT_FIXED;	162	our $FONT_FIXED;
158		163
		164	our $CONN;
		165
159	our $MAP;	166	our $MAP;
160	our $MAPMAP;	167	our $MAPMAP;
161	our $MAPWIDGET;	168	our $MAPWIDGET;
162	our $COMPLETER;	169	our $COMPLETER;
163	our $BUTTONBAR;	170	our $MENUFRAME; # the rectangle at the top
		171	our $MENUBAR; # the hbox at the top
		172	our $MENUPOPUP;
		173	our $BUTTONBAR; # the menu buttons
164	our $METASERVER;	174	our $METASERVER;
165	our $LOGIN_BUTTON;	175	our $LOGIN_BUTTON;
166	our $QUIT_DIALOG;	176	our $QUIT_DIALOG;
167	our $HOST_ENTRY;	177	our $HOST_ENTRY;
168	our $FULLSCREEN_ENABLE;	178	our $FULLSCREEN_ENABLE;
…		…
194	our $FLOORBOX;	204	our $FLOORBOX;
195	our $GAUGES;	205	our $GAUGES;
196	our $STATWIDS;	206	our $STATWIDS;
197		207
198	our $SDL_ACTIVE;	208	our $SDL_ACTIVE;
199	our %SDL_CB;	209	our @SDL_CB;
200		210
201	our $ALT_ENTER_MESSAGE;	211	our $ALT_ENTER_MESSAGE;
202	our $STATUSBOX;	212	our $STATUSBOX;
203	our $MODBOX;	213	our $MODBOX;
204	our $DEBUG_STATUS;	214	our $DEBUG_STATUS;
205		215
206	our $INV;	216	our $INV;
207	our $INVR;	217	our $INVR;
208	our $INVR_HB;	218	our $INVR_HB;
		219
		220	#############################################################################
		221
		222	# write a crash message blockingly to the socket, if possible
		223	# this is a bit too complicated for my tastes, but it was easy.
		224	*crash = sub($;$) {
		225	my ($msg, $backtrace) = @_;
		226
		227	warn $msg;
		228
		229	return unless $CONN;
		230
		231	my $fh = $CONN->{fh}
		232	or return;
		233
		234	my $buf = delete $CONN->{wbuf};
		235
		236	$buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
		237
		238	AnyEvent::Util::fh_nonblocking $fh, 0;
		239	syswrite $fh, $buf;
		240	AnyEvent::Util::fh_nonblocking $fh, 1;
		241
		242	$msg =~ s/\s+$//;
		243
		244	# backtrace as second step, in case it crashes, too
		245	crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
		246	if $backtrace;
		247	};
		248
		249	sub clienterror($;$) {
		250	my ($msg, $backtrace) = @_;
		251
		252	warn $msg;
		253
		254	return unless $CONN;
		255
		256	$CONN->send_exti_msg (clientlog => $msg);
		257	$CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
		258	}
209		259
210	#############################################################################	260	#############################################################################
211		261
212	sub status {	262	sub status {
213	$STATUSBOX->add (DC::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]);
…		…
295	or return;	345	or return;
296		346
297	$meta->{data}	347	$meta->{data}
298	or return;	348	or return;
299		349
300	# if its a jingle, play it as ambient music	350	# if it's a jingle, play it as ambient music
301	if ($meta->{data}{jingle}) {	351	if ($meta->{data}{jingle}) {
302	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue	352	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
303	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue	353	push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
304	&audio_music_push ($face);	354	&audio_music_push ($face);
305	}	355	}
306	} else {	356	} else {
307	# fetch from database	357	# fetch from database
308	DC::DB::get res_data => $meta->{name}, sub {	358	DC::DB::get res_data => $meta->{name}, sub {
309	my $rwops = new DC::RW $_[0];	359	my $rwops = new DC::RW $_[0];
310	my $chunk = new DC::MixChunk $rwops	360	my $chunk = new DC::MixChunk $rwops
311	or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;	361	or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
312	$chunk->volume (($meta->{data}{volume} || 1) * 128);	362	$chunk->volume (($meta->{data}{volume} || 1) * 128);
313	$AUDIO_CHUNK{$face} = $chunk;	363	$AUDIO_CHUNK{$face} = $chunk;
314		364
315	audio_sound_push ($face);	365	audio_sound_push ($face);
316	};	366	};
…		…
363		413
364	audio_music_update_volume;	414	audio_music_update_volume;
365		415
366	$MUSIC_PLAYING_DATA = \$_[0];	416	$MUSIC_PLAYING_DATA = \$_[0];
367		417
		418	$meta->{path} or length $_[0]
		419	or return clienterror "empty music face from res_data ($meta->{face})";#d#
		420
368	my $rwops = $meta->{path}	421	my $rwops = $meta->{path}
369	? new_from_file DC::RW $meta->{path}	422	? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
370	: new DC::RW $$MUSIC_PLAYING_DATA;	423	: new DC::RW $$MUSIC_PLAYING_DATA;
371		424
372	$MUSIC_PLAYER = new DC::MixMusic $rwops	425	$MUSIC_PLAYER = new DC::MixMusic $rwops
373	or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;	426	or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
374		427
375	my $NOW = time;	428	my $NOW = time;
376		429
377	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {	430	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
378	my $pos = $MUSIC_PLAYING_META->{stop_pos};	431	my $pos = $MUSIC_PLAYING_META->{stop_pos};
…		…
487	sub audio_tab_update;	540	sub audio_tab_update;
488	audio_tab_update;	541	audio_tab_update;
489	}	542	}
490		543
491	sub audio_shutdown {	544	sub audio_shutdown {
		545	if ($SDL_MIXER) {
		546	DC::MixMusic::halt;
		547	DC::Mix_AllocateChannels 0;
		548	}
		549
492	undef $MUSIC_PLAYER;	550	undef $MUSIC_PLAYER;
493	undef $MUSIC_PLAYING_META;	551	undef $MUSIC_PLAYING_META;
494	undef $MUSIC_PLAYING_DATA;	552	undef $MUSIC_PLAYING_DATA;
495		553
496	$MUSIC_WANT = [];	554	$MUSIC_WANT = [];
…		…
736	}	794	}
737		795
738	sub dc_connect {	796	sub dc_connect {
739	my ($host, $port) = @_;	797	my ($host, $port) = @_;
740		798
741	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	799	my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		800	my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742		801
743	$CONN =	802	$CONN =
744	new DC::Protocol	803	new DC::Protocol
745	host => $host,	804	host => $host,
746	port => $port,	805	port => $port,
747	user => $PROFILE->{user},	806	user => $PROFILE->{user},
748	pass => $PROFILE->{password},	807	pass => $PROFILE->{password},
749	mapw => $mapsize,	808	mapw => $mapw,
750	maph => $mapsize,	809	maph => $maph,
751		810
752	client => "$DC::VERSION $] $^O",	811	client => "$DC::VERSION $] $^O",
753		812
754	map_widget => $MAPWIDGET,	813	map_widget => $MAPWIDGET,
755	statusbox => $STATUSBOX,	814	statusbox => $STATUSBOX,
…		…
763		822
764	on_connect => sub {	823	on_connect => sub {
765	if ($_[0]) {	824	if ($_[0]) {
766	DC::lowdelay fileno $CONN->{fh};	825	DC::lowdelay fileno $CONN->{fh};
767		826
768	status "login successful";	827	status "successfully connected to the server";
769	} else {	828	} else {
770	undef $CONN;	829	undef $CONN;
771	status "unable to connect: $!";	830	status "unable to connect: $!";
772	stop_game();	831	stop_game();
773	}	832	}
…		…
775	;	834	;
776	}	835	}
777		836
778	sub start_game {	837	sub start_game {
779	status "logging in...";	838	status "logging in...";
		839
		840	my $server = $PROFILE->{host} || $DEFAULT_SERVER;
		841	my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
		842	or return status "$server: unable to parse server address, try an empty field.";
780		843
781	$LOGIN_BUTTON->set_text ("Logout");	844	$LOGIN_BUTTON->set_text ("Logout");
782	$SETUP_DIALOG->hide;	845	$SETUP_DIALOG->hide;
783
784	my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785		846
786	$MAP = new DC::Map;	847	$MAP = new DC::Map;
787		848
788	# hack to make SURE we find the IP address all right	849	# hack to make SURE we find the IP address all right
789	# can be removed once AnyEvent::DNS is proven stable.	850	# can be removed once AnyEvent::DNS is proven stable.
790	if ($host eq "gameserver.deliantra.net") {	851	if ($host eq "gameserver.deliantra.net") {
791	AnyEvent::DNS::a "dnstest.deliantra.net", sub {	852	AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792	if ($_[0] ne "80.101.114.108") { # Perl	853	if ($_[0] ne "80.101.114.108") { # Perl
		854	status "dns failure, trying differently";
		855	$host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
		856	unless (defined $host) {
793	status "dns failure, using hardcoded address";	857	status "dns failure, using hardcoded address";
794	$host = "129.13.162.95";	858	$host = "129.13.162.95";
		859	}
795	}	860	}
796		861
797	dc_connect $host, $port;	862	dc_connect $host, $port;
798	};	863	};
799	} else {	864	} else {
800	dc_connect $host, $port;	865	dc_connect $host, $port;
801	}	866	}
802	}	867	}
803		868
804	sub stop_game {	869	sub stop_game {
		870	crash "stop_game";
		871
805	$LOGIN_BUTTON->set_text ("Login / Register");	872	$LOGIN_BUTTON->set_text ("Login / Register");
806	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	873	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807	$SETUP_DIALOG->show;	874	$SETUP_DIALOG->show;
808	$PL_WINDOW->hide;	875	$PL_WINDOW->hide;
809	$SPELL_LIST->clear_spells;	876	$SPELL_LIST->clear_spells;
…		…
823	}	890	}
824		891
825	sub graphics_setup {	892	sub graphics_setup {
826	my $vbox = new DC::UI::VBox;	893	my $vbox = new DC::UI::VBox;
827		894
		895	{
		896	$vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
		897
828	$vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);	898	$frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829		899
830	my $row = 0;	900	my $row = 0;
831		901
832	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");	902	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833	$table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,	903	$table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834	can_events => 1,	904	can_events => 1,
835	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");	905	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836		906
837	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");	907	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838	$table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,	908	$table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839	can_events => 1,	909	can_events => 1,
840	tooltip => "This field shows any known issues with your config or driver, such as "	910	tooltip => "This field shows any known issues with your config or driver, such as "
841	. "a non-accelerated display format. You can try to work around these issues "	911	. "a non-accelerated display format. You can try to work around these issues "
842	. "by selecting a different video mode, changing the settings below or "	912	. "by selecting a different video mode, changing the settings below or "
843	. "by installing the right driver for your graphics card.");	913	. "by installing the right driver for your graphics card.");
844		914
		915	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
		916	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
		917	value => $CFG->{uitheme},
		918	options => [
		919	[wood => "Wood (the default)"],
		920	[plain => "Plain (very)"],
		921	[blue => "Blue (dark)"],
		922	[metal => "Metal (light)"],
		923	],
		924	tooltip => "Choose the User Interface theme that you like most :)",
		925	on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
		926	);
		927
845	my $vidmode_tooltip =	928	my $vidmode_tooltip =
846	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	929	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
847	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";	930	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848		931
849	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");	932	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);	933	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851		934
852	$hbox->add ($MODE_SLIDER = new DC::UI::Slider	935	$hbox->add ($MODE_SLIDER = new DC::UI::Slider
		936	c_rescale => 1,
853	force_w => $WIDTH * 0.1, expand => 1,	937	force_w => $WIDTH * 0.1, expand => 1,
		938	range => [ ($CFG->{sdl_mode}) x 3 ],
854	tooltip => $vidmode_tooltip);	939	tooltip => $vidmode_tooltip);
855	$hbox->add (my $mode_label = new DC::UI::Label	940	$hbox->add (my $mode_label = new DC::UI::Label
856	height => 0.8, template => "9999x9999@9+9",	941	height => 0.8, template => "9999x9999@9+9",
857	can_events => 1, tooltip => $vidmode_tooltip);	942	can_events => 1, tooltip => $vidmode_tooltip);
858		943
859	$MODE_SLIDER->connect (changed => sub {	944	$MODE_SLIDER->connect (changed => sub {
860	my ($self, $value) = @_;
861
862	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
863	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
864	});
865	$MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
866
867	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
868	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
869	state => $CFG->{fullscreen},
870	tooltip => "Bring the client into fullscreen mode.",
871	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
872	);
873
874	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
875	$table->add_at (1, $row++, new DC::UI::CheckBox
876	state => $CFG->{force_opengl11},
877	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
878	. "higher memory usage and slower performance. It will, however, help tremendously on "
879	. "cards that claim to support a feature but fall back to software rendering. "
880	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
881	. "but cards and drivers from other vendors (ATI) are often just as bad. "
882	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
883	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
884	);
885
886	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887	$table->add_at (1, $row++, new DC::UI::CheckBox
888	state => $CFG->{disable_alpha},
889	tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890	. "by disabling a number of textures and transparency effects. Normally, these "
891	. "effects do not cost a lot of resources, but some graphics cards might fall "
892	. "back to etxremely slow rendering if this is enabled. If disabling this option "
893	. "noticably improves the framerate of the client please report this! "
894	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895	on_changed => sub {
896	my ($self, $value) = @_;	945	my ($self, $value) = @_;
		946
		947	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		948	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
		949	});
		950	$MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
		951
		952	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
		953	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
		954	state => $CFG->{fullscreen},
		955	tooltip => "Bring the client into fullscreen mode.",
		956	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
		957	);
		958
		959	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
		960	$table->add_at (1, $row++, new DC::UI::CheckBox
		961	state => $CFG->{force_opengl11},
		962	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
		963	. "higher memory usage and slower performance. It will, however, help tremendously on "
		964	. "cards that claim to support a feature but fall back to software rendering. "
		965	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
		966	. "but cards and drivers from other vendors (ATI) are often just as bad. "
		967	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
		968	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		969	);
		970
		971	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
		972	$table->add_at (1, $row++, new DC::UI::CheckBox
		973	state => $CFG->{disable_alpha},
		974	tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
		975	. "by disabling a number of textures and transparency effects. Normally, these "
		976	. "effects do not cost a lot of resources, but some graphics cards might fall "
		977	. "back to extremely slow rendering if this is enabled. If disabling this option "
		978	. "noticably improves the framerate of the client please report this! "
		979	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
		980	on_changed => sub {
		981	my ($self, $value) = @_;
897	$CFG->{disable_alpha} = $value;	982	$CFG->{disable_alpha} = $value;
898	$SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes	983	$SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
		984	0
899	0	985	}
900	}	986	);
901	);
902		987
903	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");	988	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
904	$table->add_at (1, $row++, new DC::UI::CheckBox	989	$table->add_at (1, $row++, new DC::UI::CheckBox
905	state => $CFG->{texture_compression},	990	state => $CFG->{texture_compression},
906	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	991	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
907	. "will save a lot of memory and increase performance. The compression algorithm "	992	. "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
908	. "can differ form card to card, so your mileage may vary. This setting is ignored in "	993	. "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
909	. "forced OpenGL 1.1 mode.",	994	. "forced OpenGL 1.1 mode and when using the Apple renderer.",
910	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	995	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911	);	996	);
912		997
913	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");	998	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
914	$table->add_at (1, $row++, new DC::UI::CheckBox	999	$table->add_at (1, $row++, new DC::UI::CheckBox
915	state => $CFG->{fast},	1000	state => $CFG->{fast},
916	tooltip => "Lower the visual quality considerably to speed up rendering.",	1001	tooltip => "Lower the visual quality considerably to speed up rendering.",
917	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	1002	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
918	);	1003	);
919		1004
920	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");	1005	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
921	$table->add_at (1, $row++, new DC::UI::Slider	1006	$table->add_at (1, $row++, new DC::UI::Slider
922	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	1007	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
923	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	1008	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
924	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	1009	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
925	);	1010	);
926		1011
927	$table->add_at (1, $row++, new DC::UI::Button	1012	$table->add_at (1, $row++, new DC::UI::Button
928	expand => 1, text => "Apply",	1013	expand => 1, text => "Apply",
929	tooltip => "Apply the video settings above.",	1014	tooltip => "Apply the video settings above.",
930	on_activate => sub {	1015	on_activate => sub {
931	video_shutdown ();	1016	video_shutdown ();
932	video_init ();	1017	video_init ();
		1018	0
933	0	1019	}
934	}	1020	);
		1021	}
		1022
		1023	{
		1024	$vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
		1025
		1026	$frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
		1027
		1028	my $row = 0;
		1029	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
		1030	$table->add_at (1, $row++, new DC::UI::CheckBox
		1031	state => $CFG->{smooth_movement},
		1032	tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
		1033	. "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
		1034	. "then disable this option. Changes take effect immdiately.",
		1035	on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
935	);	1036	);
936		1037
		1038	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
		1039	$table->add_at (1, $row++, new DC::UI::CheckBox
		1040	state => $CFG->{smooth_transitions},
		1041	tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
		1042	. "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
		1043	. "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
		1044	on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
		1045	);
		1046
		1047
937	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");	1048	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
938	$table->add_at (1, $row++, new DC::UI::Slider	1049	$table->add_at (1, $row++, new DC::UI::Slider
939	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	1050	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
940	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	1051	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
941	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	1052	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
942	);	1053	);
943		1054
944	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");	1055	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
945	$table->add_at (1, $row++, new DC::UI::CheckBox	1056	$table->add_at (1, $row++, new DC::UI::CheckBox
946	state => $CFG->{map_smoothing},	1057	state => $CFG->{map_smoothing},
947	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	1058	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
948	. "This increases load on the graphics subsystem and works only with TRT servers. "	1059	. "This increases load on the graphics subsystem and works only with TRT servers. "
949	. "Changes take effect at next login only.",	1060	. "Changes take effect at next login only.",
950	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	1061	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
951	);	1062	);
952		1063
953	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");	1064	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
954	$table->add_at (1, $row++, new DC::UI::CheckBox	1065	$table->add_at (1, $row++, new DC::UI::CheckBox
955	state => $CFG->{fow_enable},	1066	state => $CFG->{fow_enable},
956	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	1067	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
957	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	1068	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
958	);	1069	);
959		1070
		1071	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
		1072	$table->add_at (1, $row++, new DC::UI::ImageButton
		1073	tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
		1074	bg => [0.3, 0.3, 0.2],
		1075	force_w => 64,
		1076	force_h => 64,
		1077	tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
		1078	on_activate => sub {
		1079	my ($self) = @_;
		1080	$CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
		1081	$self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
		1082	$MAPWIDGET->update;
		1083	}
		1084	);
		1085
960	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");	1086	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
961	$table->add_at (1, $row++, new DC::UI::Slider	1087	$table->add_at (1, $row++, new DC::UI::Slider
962	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	1088	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
963	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	1089	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
964	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	1090	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
965	);	1091	);
966		1092
967	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");	1093	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
968	$table->add_at (1, $row++, new DC::UI::Slider	1094	$table->add_at (1, $row++, new DC::UI::Slider
969	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	1095	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
970	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "	1096	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
971	. "but you still need to press apply to correctly re-layout the widget.",	1097	. "but you still need to press apply to correctly re-layout the widget.",
972	on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	1098	on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
973	);	1099	);
974		1100
975	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");	1101	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
976	$table->add_at (1, $row++, new DC::UI::Slider	1102	$table->add_at (1, $row++, new DC::UI::Slider
977	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	1103	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
978	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	1104	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
979	on_changed => sub {	1105	on_changed => sub {
980	$CFG->{gauge_fontsize} = $_[1];	1106	$CFG->{gauge_fontsize} = $_[1];
981	&set_gauge_window_fontsize;	1107	&set_gauge_window_fontsize;
		1108	0
982	0	1109	}
983	}	1110	);
984	);
985		1111
986	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");	1112	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
987	$table->add_at (1, $row++, new DC::UI::Slider	1113	$table->add_at (1, $row++, new DC::UI::Slider
988	range => [$CFG->{gauge_size}, 0.2, 0.8],	1114	range => [$CFG->{gauge_size}, 0.2, 0.8],
989	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	1115	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
990	on_changed => sub {	1116	on_changed => sub {
991	$CFG->{gauge_size} = $_[1];	1117	$CFG->{gauge_size} = $_[1];
992	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	1118	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		1119	0
993	0	1120	}
994	}	1121	);
995	);	1122	}
996		1123
997	$vbox	1124	$vbox
998	}	1125	}
999		1126
1000	our $AUDIO_HW_CHUNKSIZE;	1127	our $AUDIO_HW_CHUNKSIZE;
…		…
1013		1140
1014	my $text = !$freq	1141	my $text = !$freq
1015	? "audio is off"	1142	? "audio is off"
1016	: "audio is enabled\n"	1143	: "audio is enabled\n"
1017	. "frequency (Hz): $freq\n"	1144	. "frequency (Hz): $freq\n"
1018	. "channels: $chans";	1145	. "channels: $chans\n"
		1146	. "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
		1147	. "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1019		1148
1020	$AUDIO_INFO->set_text ($text);	1149	$AUDIO_INFO->set_text ($text);
1021	}	1150	}
1022		1151
1023	sub audio_setup {	1152	sub audio_setup {
…		…
1163	}	1292	}
1164		1293
1165	sub make_gauge_window {	1294	sub make_gauge_window {
1166	my $gh = int $HEIGHT * $CFG->{gauge_size};	1295	my $gh = int $HEIGHT * $CFG->{gauge_size};
1167		1296
1168	my $win = new DC::UI::Frame (	1297	$GAUGES->{win} = my $win = new DC::UI::Frame (
1169	force_x => 0,	1298	force_x => 0,
1170	force_y => "max",	1299	force_y => "max",
1171	force_w => $WIDTH,	1300	force_w => $WIDTH,
1172	force_h => $gh,	1301	force_h => $gh,
1173	);	1302	);
…		…
1189	(new DC::UI::Empty expand => 1),	1318	(new DC::UI::Empty expand => 1),
1190	(my $hb = new DC::UI::HBox),	1319	(my $hb = new DC::UI::HBox),
1191	],	1320	],
1192	);	1321	);
1193		1322
1194	$hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");	1323	$hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1195	$hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");	1324	$hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1196	$hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");	1325	$hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1197	$hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");	1326	$hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1198
1199	$vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1200	$vbox->add (my $prg = new DC::UI::ExperienceProgress);
1201	$vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1202	$vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1203
1204	$GAUGES = {
1205	exp => $exp, prg => $prg, sklprg => $sklprg,
1206	win => $win, range => $rng,
1207	hp => $hg, mana => $mg, grace => $gg, food => $fg,
1208	};
1209		1327
1210	&set_gauge_window_fontsize;	1328	&set_gauge_window_fontsize;
1211		1329
1212	$win	1330	$win
1213	}	1331	}
…		…
1554	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),	1672	child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1555	);	1673	);
1556		1674
1557	$table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");	1675	$table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1558	$table->add_at (1, 4, new DC::UI::Entry	1676	$table->add_at (1, 4, new DC::UI::Entry
1559	text => $CFG->{profile}{default}{user},	1677	text => $PROFILE->{user},
1560	tooltip => "The name of your character on the server.",	1678	tooltip => "The name of your character on the server. The name is case-sensitive!",
1561	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }	1679	on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1562	);	1680	);
1563		1681
1564	$table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");	1682	$table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1565	$table->add_at (1, 5, new DC::UI::Entry	1683	$table->add_at (1, 5, new DC::UI::Entry
1566	text => $CFG->{profile}{default}{password},	1684	text => $PROFILE->{password},
1567	hidden => 1,	1685	hidden => 1,
1568	tooltip => "The password for your character.",	1686	tooltip => "The password for your character.",
1569	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }	1687	on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1570	);	1688	);
1571		1689
1572	$table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button	1690	$table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1573	expand => 1,	1691	expand => 1,
1574	text => "Login / Register",	1692	text => "Login / Register",
…		…
1579	1	1697	1
1580	},	1698	},
1581	);	1699	);
1582		1700
1583	$vbox->add (new DC::UI::FancyFrame	1701	$vbox->add (new DC::UI::FancyFrame
1584	label => "Registering",	1702	label => "How to Play",
1585	min_h => 200,	1703	min_h => 240,
1586	child => (new DC::UI::Label valign => 0, ellipsise => 0,	1704	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587	markup =>	1705	markup =>
		1706	"First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
		1707	. "Then register a new account (or use an existing one if you have one). "
1588	"To register a new account, choose a username that hasn't been taken yet and "	1708	. "To register an account, choose a username that hasn't been taken yet (just guess) and "
1589	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1709	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1590	),	1710	),
1591	);	1711	);
1592		1712
1593	$vbox	1713	$vbox
…		…
1608	$table->add_at (1, $row, my $vbox = new DC::UI::VBox);	1728	$table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1609		1729
1610	$vbox->add (	1730	$vbox->add (
1611	$HOST_ENTRY = new DC::UI::Entry	1731	$HOST_ENTRY = new DC::UI::Entry
1612	expand => 1,	1732	expand => 1,
1613	text => $CFG->{profile}{default}{host},	1733	text => $PROFILE->{host},
1614	tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",	1734	tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1615	on_changed => sub {	1735	on_changed => sub {
1616	my ($self, $value) = @_;	1736	my ($self, $value) = @_;
1617	$CFG->{profile}{default}{host} = $value;	1737	$PROFILE->{host} = $value;
1618	1	1738	1
1619	}	1739	}
1620	);	1740	);
1621		1741
1622	if (0) { #d# disabled	1742	if (0) { #d# disabled
…		…
1665		1785
1666	my $row = 0;	1786	my $row = 0;
1667		1787
1668	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");	1788	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1669	$table->add_at (1, $row++, new DC::UI::CheckBox	1789	$table->add_at (1, $row++, new DC::UI::CheckBox
		1790	c_colspan => 2,
1670	state => $CFG->{show_tips},	1791	state => $CFG->{show_tips},
1671	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1792	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1672	on_changed => sub {	1793	on_changed => sub {
1673	my ($self, $value) = @_;	1794	my ($self, $value) = @_;
1674	$CFG->{show_tips} = $value;	1795	$CFG->{show_tips} = $value;
…		…
1676	}	1797	}
1677	);	1798	);
1678		1799
1679	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");	1800	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1680	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry	1801	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
		1802	c_colspan => 2,
1681	text => $CFG->{logview_max_par},	1803	text => $CFG->{logview_max_par},
1682	tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "	1804	tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1683	. "sends more messages than this number, older messages get removed to save memory and "	1805	. "sends more messages than this number, older messages get removed to save memory and "
1684	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1806	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1685	on_changed => sub {	1807	on_changed => sub {
…		…
1687	$MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);	1809	$MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1688	0	1810	0
1689	},	1811	},
1690	);	1812	);
1691		1813
		1814	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
		1815	$table->add_at (1, $row, new DC::UI::CheckBox
		1816	state => $CFG->{config_autosave},
		1817	tooltip => "Normally, configuration settings and the user interface layout "
		1818	. "are saved on client exit. You can disable this behaviour by "
		1819	. "unchecking this checkbox.",
		1820	on_changed => sub {
		1821	my ($self, $value) = @_;
		1822	$CFG->{config_autosave} = $value;
		1823	0
		1824	}
		1825	);
		1826	$table->add_at (2, $row++, new DC::UI::Button
		1827	text => "Save Now",
		1828	tooltip => "Use this to manually save configuration and UI layout when "
		1829	. "autosave is disabled.",
		1830	on_activate => sub {
		1831	DC::write_cfg;
		1832	0
		1833	}
		1834	);
		1835
1692	$table	1836	$table
1693	}	1837	}
1694		1838
1695	sub autopickup_setup {	1839	sub autopickup_setup {
1696	my $r = new DC::UI::ScrolledWindow (	1840	my $r = new DC::UI::ScrolledWindow (
…		…
1702	col_expand => [0, 1, 0, 1],	1846	col_expand => [0, 1, 0, 1],
1703	);	1847	);
1704		1848
1705	for (	1849	for (
1706	["General", 0, 0,	1850	["General", 0, 0,
1707	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1708	["Inhibit autopickup" => PICKUP_INHIBIT],	1851	# ["Inhibit autopickup" => PICKUP_INHIBIT],
1709	["Stop before pickup" => PICKUP_STOP],	1852	["Stop before pickup" => PICKUP_STOP],
1710	["Debug autopickup" => PICKUP_DEBUG],	1853	["Debug autopickup" => PICKUP_DEBUG],
1711	],	1854	],
1712	["Weapons", 0, 6,	1855	["Weapons", 0, 6,
1713	["All weapons" => PICKUP_ALLWEAPON],	1856	["All weapons" => PICKUP_ALLWEAPON],
…		…
1739	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1882	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740	["Ignore cursed" => PICKUP_NOT_CURSED],	1883	["Ignore cursed" => PICKUP_NOT_CURSED],
1741	["Jewelery" => PICKUP_JEWELS],	1884	["Jewelery" => PICKUP_JEWELS],
1742	["Flesh" => PICKUP_FLESH],	1885	["Flesh" => PICKUP_FLESH],
1743	],	1886	],
1744	["Weight/Value ratio", 2, 17]	1887	["Value/Weight ratio", 2, 17]
1745	)	1888	)
1746	{	1889	{
1747	my ($title, $x, $y, @bits) = @$_;	1890	my ($title, $x, $y, @bits) = @$_;
1748	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1891	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1749		1892
…		…
1761	$::CFG->{pickup} |= $mask;	1904	$::CFG->{pickup} |= $mask;
1762	} else {	1905	} else {
1763	$::CFG->{pickup} &= ~$mask;	1906	$::CFG->{pickup} &= ~$mask;
1764	}	1907	}
1765		1908
1766	$::CONN->send_command ("pickup $::CFG->{pickup}")	1909	$::CONN->send_pickup ($::CFG->{pickup})
1767	if defined $::CONN;	1910	if defined $::CONN;
1768		1911
1769	0	1912	0
1770	});	1913	});
1771		1914
…		…
1774	}	1917	}
1775		1918
1776	$table->add_at (2, 18, new DC::UI::ValSlider	1919	$table->add_at (2, 18, new DC::UI::ValSlider
1777	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1920	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778	template => ">= 99",	1921	template => ">= 99",
		1922	tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1779	to_value => sub { ">= " . 5 * $_[0] },	1923	to_value => sub { ">= " . 5 * $_[0] },
1780	on_changed => sub {	1924	on_changed => sub {
1781	my ($slider, $value) = @_;	1925	my ($slider, $value) = @_;
1782		1926
1783	$::CFG->{pickup} &= ~0xF;	1927	$::CFG->{pickup} &= ~0xF;
…		…
1787	});	1931	});
1788		1932
1789	$table->add_at (3, 18, new DC::UI::Button	1933	$table->add_at (3, 18, new DC::UI::Button
1790	text => "set",	1934	text => "set",
1791	on_activate => sub {	1935	on_activate => sub {
1792	$::CONN->send_command ("pickup $::CFG->{pickup}")	1936	$::CONN->send_pickup ($::CFG->{pickup})
1793	if defined $::CONN;	1937	if defined $::CONN;
1794	0	1938	0
1795	});	1939	});
1796		1940
1797	$r	1941	$r
…		…
1839	$::CFG->{inv_sort} = $_[1];	1983	$::CFG->{inv_sort} = $_[1];
1840	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1984	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1841	},	1985	},
1842	);	1986	);
1843	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);	1987	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1844	#TODO# update to weigh/maxweight	1988	#TODO# update to weight/maxweight
1845	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);	1989	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846		1990
1847	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);	1991	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1848	$sw1->add ($INV = new DC::UI::Inventory);	1992	$sw1->add ($INV = new DC::UI::Inventory);
1849	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1993	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
…		…
1910	$PL_NOTEBOOK->set_current_page ($widget);	2054	$PL_NOTEBOOK->set_current_page ($widget);
1911	$PL_WINDOW->show;	2055	$PL_WINDOW->show;
1912	}	2056	}
1913	}	2057	}
1914		2058
1915	sub player_window {	2059	sub make_playerbook {
1916	my $plwin = $PL_WINDOW = new DC::UI::Toplevel	2060	my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1917	x => "center",	2061	x => "center",
1918	y => "center",	2062	y => "center",
1919	force_w => $WIDTH * 9/10,	2063	force_w => $WIDTH * 9/10,
1920	force_h => $HEIGHT * 9/10,	2064	force_h => $HEIGHT * 9/10,
…		…
1954	"License, Author and Source info for media sent by the server.");	2098	"License, Author and Source info for media sent by the server.");
1955		2099
1956	$ntb->set_current_page ($INVENTORY_PAGE);	2100	$ntb->set_current_page ($INVENTORY_PAGE);
1957		2101
1958	$plwin->add ($ntb);	2102	$plwin->add ($ntb);
1959	$plwin
1960	}	2103	}
1961		2104
1962	sub keyboard_setup {	2105	sub keyboard_setup {
1963	DC::Macro::keyboard_setup	2106	DC::Macro::keyboard_setup
1964	}	2107	}
1965		2108
1966	sub help_window {	2109	sub make_help_window {
1967	my $win = new DC::UI::Toplevel	2110	my $win = new DC::UI::Toplevel
1968	x => 'center',	2111	x => 'center',
1969	y => 'center',	2112	y => 'center',
1970	z => 4,	2113	z => 4,
1971	name => 'doc_browser',	2114	name => 'doc_browser',
…		…
2060		2203
2061	$load_node->((DC::Pod::find @path)[0]);	2204	$load_node->((DC::Pod::find @path)[0]);
2062	$win->show;	2205	$win->show;
2063	};	2206	};
2064		2207
2065	$win	2208	$HELP_WINDOW = $win;
2066	}
2067
2068	sub open_string_query {
2069	my ($title, $cb, $txt, $tooltip) = @_;
2070	my $dialog = new DC::UI::Toplevel
2071	x => "center",
2072	y => "center",
2073	z => 50,
2074	force_w => $WIDTH * 4/5,
2075	title => $title;
2076
2077	$dialog->add (
2078	my $e = new DC::UI::Entry
2079	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2080	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2081	tooltip => $tooltip
2082	);
2083
2084	$e->grab_focus;
2085	$e->set_text ($txt) if $txt;
2086	$dialog->show;
2087	}	2209	}
2088		2210
2089	sub open_quit_dialog {	2211	sub open_quit_dialog {
2090	unless ($QUIT_DIALOG) {	2212	unless ($QUIT_DIALOG) {
2091	$QUIT_DIALOG = new DC::UI::Toplevel	2213	$QUIT_DIALOG = new DC::UI::Toplevel
…		…
2113	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2235	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114	);	2236	);
2115	$hb->add (new DC::UI::Button	2237	$hb->add (new DC::UI::Button
2116	text => "Quit anyway",	2238	text => "Quit anyway",
2117	expand => 1,	2239	expand => 1,
2118	on_activate => sub { EV::unloop EV::UNLOOP_ALL },	2240	on_activate => sub {
		2241	crash "Quit anyway";
		2242	EV::unloop EV::UNLOOP_ALL;
		2243	},
2119	);	2244	);
2120	}	2245	}
2121		2246
2122	$QUIT_DIALOG->show;	2247	$QUIT_DIALOG->show;
2123	$QUIT_DIALOG->grab_focus;	2248	$QUIT_DIALOG->grab_focus;
		2249	}
		2250
		2251	sub make_menubar {
		2252	$MENUFRAME = new DC::UI::Toplevel
		2253	border => 0,
		2254	force_x => 0,
		2255	force_y => 0,
		2256	force_w => $::WIDTH,
		2257	child => ($MENUBAR = new DC::UI::HBox),
		2258	;
		2259
		2260	$MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
		2261
		2262	# XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
		2263	make_gauge_window->show;
		2264
		2265	# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
		2266	# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
		2267
		2268	make_playerbook;
		2269
		2270	$MENUPOPUP = DC::UI::Menu->new (items => [
		2271	["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
		2272	["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
		2273	["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
		2274	["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
		2275	["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
		2276	["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
		2277	["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
		2278	["Quit…" , sub {
		2279	if ($CONN) {
		2280	open_quit_dialog;
		2281	} else {
		2282	EV::unloop EV::UNLOOP_ALL;
		2283	}
		2284	}],
		2285	]);
		2286
		2287	$BUTTONBAR->add (new DC::UI::Button text => "Menu…",
		2288	tooltip => "Shows the main menu",
		2289	on_button_down => sub {
		2290	my ($self, $ev) = @_;
		2291	local $ev->{x} = 0;
		2292	local $ev->{y} = 0;
		2293	$MENUPOPUP->popup ($ev);
		2294	},
		2295	);
		2296
		2297	$MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
		2298	padding_x => 6,
		2299	padding_y => 3,
		2300	tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
		2301	template => " Exp: 888,888,888,888 (lvl 188) ",
		2302	);
		2303
		2304	$MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
		2305	tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
		2306	. "will automatically pick up items as defined by your item pickup settings "
		2307	. "in the playerbook. Often (e.g. in apartments) you want to temporarily "
		2308	. "disable autopickup by disabling this checkbox.",
		2309	state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
		2310	on_changed => sub {
		2311	my ($self, $value) = @_;
		2312	$CFG->{pickup} &= ~PICKUP_INHIBIT;
		2313	$CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
		2314	$CONN->send_pickup ($CFG->{pickup})
		2315	if $CONN;
		2316	},
		2317	);
		2318
		2319	$MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
		2320	c_rescale => 1,
		2321	padding_x => 6,
		2322	padding_y => 3,
		2323	force_w => $::WIDTH * 0.2,
		2324	tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
		2325	template => "two handed weapons 99%",
		2326	);
		2327
		2328	$MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
		2329	expand => 1,
		2330	align => 1, can_hover => 1, can_events => 1,
		2331	text => "Range and Combat Slots",
		2332	tooltip => "#stat_ranged",
		2333	);
		2334
		2335	$MENUFRAME->show;
		2336	}
		2337
		2338	sub open_string_query {
		2339	my ($title, $cb, $txt, $tooltip) = @_;
		2340	my $dialog = new DC::UI::Toplevel
		2341	x => "center",
		2342	y => "center",
		2343	z => 50,
		2344	force_w => $WIDTH * 4/5,
		2345	title => $title;
		2346
		2347	$dialog->add (
		2348	my $e = new DC::UI::Entry
		2349	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		2350	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		2351	tooltip => $tooltip
		2352	);
		2353
		2354	$e->grab_focus;
		2355	$e->set_text ($txt) if $txt;
		2356	$dialog->show;
2124	}	2357	}
2125		2358
2126	sub show_tip_of_the_day {	2359	sub show_tip_of_the_day {
2127	# find all tips	2360	# find all tips
2128	my @tod = DC::Pod::find tip_of_the_day => "*";	2361	my @tod = DC::Pod::find tip_of_the_day => "*";
…		…
2181	DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE	2414	DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2182	and die "SDL::Init failed!\n";	2415	and die "SDL::Init failed!\n";
2183	}	2416	}
2184		2417
2185	sub video_init {	2418	sub video_init {
		2419	DC::set_theme $CFG->{uitheme};
		2420
2186	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;	2421	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187	$SDL_REINIT = 0;	2422	$SDL_REINIT = 0;
2188		2423
2189	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;	2424	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;	2425	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;	2426	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2427	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193		2428
2194	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;	2429	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195		2430
2196	if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {	2431	if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197	$CFG->{sdl_mode} = 0;	2432	$CFG->{sdl_mode} = 0; # lowest resolution by default
		2433
		2434	# now choose biggest mode <= 1024x768
2198	for (reverse 0 .. $#SDL_MODES) {	2435	for (0 .. $#SDL_MODES) {
2199	$CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;	2436	if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
		2437	$CFG->{sdl_mode} = $_;
		2438	}
2200	}	2439	}
2201	}	2440	}
2202		2441
2203	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2442	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204		2443
2205	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2444	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206	$FULLSCREEN = $CFG->{fullscreen};	2445	$FULLSCREEN = $CFG->{fullscreen};
2207	$FAST = $CFG->{fast};	2446	$FAST = $CFG->{fast};
2208		2447
		2448	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2209	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2449	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
		2450	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2210	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2451	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211		2452
2212	$SDL_ACTIVE = 1;	2453	$SDL_ACTIVE = 1;
2213	$LAST_REFRESH = time - 0.01;	2454	$LAST_REFRESH = time - 0.01;
2214		2455
…		…
2261		2502
2262	(new DC::UI::Frame	2503	(new DC::UI::Frame
2263	bg => [0, 0, 0, 0.4],	2504	bg => [0, 0, 0, 0.4],
2264	force_x => 0,	2505	force_x => 0,
2265	force_y => "max",	2506	force_y => "max",
2266	child => (my $LR = new DC::UI::VBox),	2507	child => (my $LL = new DC::UI::VBox),
2267	)->show;	2508	)->show;
2268		2509
2269	$LR->add ($STATUSBOX);	2510	$LL->add ($STATUSBOX);
2270	$LR->add ($MODBOX);	2511	$LL->add ($MODBOX);
2271	$LR->add (new DC::UI::Label	2512	$LL->add (new DC::UI::Label
2272	align => 0,	2513	align => 0,
2273	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",	2514	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2274	fontsize => 0.5,	2515	fontsize => 0.5,
2275	fg => [1, 1, 0, 0.7],	2516	fg => [1, 1, 0, 0.7],
2276	);	2517	);
2277		2518
2278	DC::UI::Toplevel->new (	2519	DC::UI::Toplevel->new (
2279	title => "Minimap",	2520	title => "Minimap",
2280	name => "mapmap",	2521	name => "mapmap",
2281	x => 0,	2522	x => 0,
2282	y => $FONTSIZE + 8,	2523	y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2283	border_bg => [1, 1, 1, 192/255],	2524	border_bg => [1, 1, 1, 192/255],
2284	bg => [1, 1, 1, 0],	2525	bg => [1, 1, 1, 0],
2285	child => ($MAPMAP = new DC::MapWidget::MapMap	2526	child => ($MAPMAP = new DC::MapWidget::MapMap
2286	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	2527	tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2287	),	2528	),
2288	)->show;	2529	)->show;
2289		2530
2290	$MAPWIDGET = new DC::MapWidget;	2531	$MAPWIDGET = new DC::MapWidget;
2291	$MAPWIDGET->connect (activate_console => sub {	2532	$MAPWIDGET->connect (activate_console => sub {
…		…
2316	$METASERVER = metaserver_dialog;	2557	$METASERVER = metaserver_dialog;
2317	# the name is changed to not conflict with the older name as users could have hidden it	2558	# the name is changed to not conflict with the older name as users could have hidden it
2318	$MESSAGE_WINDOW = new DC::UI::Dockbar	2559	$MESSAGE_WINDOW = new DC::UI::Dockbar
2319	name => "message_window2",	2560	name => "message_window2",
2320	title => 'Messages',	2561	title => 'Messages',
		2562	y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2321	force_w => $::WIDTH * 0.6,	2563	force_w => $::WIDTH * 0.6,
2322	force_h => $::HEIGHT * 0.25,	2564	force_h => $::HEIGHT * 0.25,
2323	;	2565	;
2324		2566
2325	$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;	2567	$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
…		…
2345	. "After pressing the combo the binding will be saved automatically and the "	2587	. "After pressing the combo the binding will be saved automatically and the "
2346	. "binding editor closes");	2588	. "binding editor closes");
2347	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,	2589	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2348	"Some debuggin' options. Do not ask.");	2590	"Some debuggin' options. Do not ask.");
2349		2591
2350	$BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2592	make_help_window;
		2593	make_menubar;
2351		2594
2352	$BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2353	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2354
2355	# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2356	# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2357
2358	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
2359
2360	$BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2361	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2362
2363	$BUTTONBAR->add (new DC::UI::Button
2364	text => "Save Config",
2365	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2366	on_activate => sub {
2367	$::CFG->{layout} = DC::UI::get_layout;
2368	DC::write_cfg;
2369	status "Configuration Saved";
2370	0
2371	},
2372	);
2373
2374	$BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2375	tooltip => "View Documentation");
2376
2377	$BUTTONBAR->add (new DC::UI::Button
2378	text => "Quit",
2379	tooltip => "Terminates the program",
2380	on_activate => sub {
2381	if ($CONN) {
2382	open_quit_dialog;
2383	} else {
2384	EV::unloop EV::UNLOOP_ALL;
2385	}
2386	0
2387	},
2388	);
2389
2390	$BUTTONBAR->show;
2391	$SETUP_DIALOG->show;	2595	$SETUP_DIALOG->show;
2392	$MESSAGE_WINDOW->show;	2596	$MESSAGE_WINDOW->show;
2393	}	2597	}
2394		2598
2395	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);	2599	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2396	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});	2600	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397		2601
2398	$CAVEAT_LABEL->set_text ("None :)");	2602	$CAVEAT_LABEL->set_text ("None :)");
2399	$CAVEAT_LABEL->set_text ("Non-accelerated video mode")	2603	$CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
		2604	if $DC::OpenGL::APPLE_NVIDIA_BUG;
		2605	$CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;	2606	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401		2607
2402	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2608	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2403	}	2609	}
2404		2610
…		…
2431	my $want_refresh = EV::prepare_ns \&force_refresh;	2637	my $want_refresh = EV::prepare_ns \&force_refresh;
2432		2638
2433	my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {	2639	my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2434	$NOW = EV::now;	2640	$NOW = EV::now;
2435		2641
2436	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2642	($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2437	for DC::poll_events;	2643	for DC::poll_events;
2438		2644
2439	if (%animate_object) {	2645	if (%animate_object) {
2440	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2646	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2441	$WANT_REFRESH = 1;	2647	$WANT_REFRESH = 1;
…		…
2453	sub animation_stop {	2659	sub animation_stop {
2454	my ($widget) = @_;	2660	my ($widget) = @_;
2455	delete $animate_object{$widget};	2661	delete $animate_object{$widget};
2456	}	2662	}
2457		2663
2458	%SDL_CB = (
2459	DC::SDL_QUIT => sub {	2664	$SDL_CB[DC::SDL_QUIT] = sub {
		2665	crash "SDL_QUIT";
2460	EV::unloop EV::UNLOOP_ALL;	2666	EV::unloop EV::UNLOOP_ALL;
2461	},	2667	};
2462	DC::SDL_VIDEORESIZE => sub {	2668	$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2463	},
2464	DC::SDL_VIDEOEXPOSE => sub {	2669	$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2465	DC::UI::full_refresh;	2670	DC::UI::full_refresh;
2466	},	2671	};
2467	DC::SDL_ACTIVEEVENT => sub {	2672	$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2468	# not useful, as APPACTIVE includes only iconified state, not unmapped	2673	# not useful, as APPACTIVE includes only iconified state, not unmapped
2469	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#	2674	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2470	# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#	2675	# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2471	# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;	2676	# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2472	# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;	2677	# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2473	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;	2678	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2474	},	2679	};
2475	DC::SDL_KEYDOWN => sub {	2680	$SDL_CB[DC::SDL_KEYDOWN] = sub {
2476	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {	2681	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2477	# alt-enter	2682	# alt-enter
2478	video_shutdown;	2683	video_shutdown;
2479	$FULLSCREEN_ENABLE->toggle;	2684	$FULLSCREEN_ENABLE->toggle;
2480	video_init;	2685	video_init;
2481	} else {	2686	} else {
2482	&DC::UI::feed_sdl_key_down_event;	2687	&DC::UI::feed_sdl_key_down_event;
2483	}	2688	}
2484	update_modbox;	2689	update_modbox;
2485	},	2690	};
2486	DC::SDL_KEYUP => sub {	2691	$SDL_CB[DC::SDL_KEYUP] = sub {
2487	&DC::UI::feed_sdl_key_up_event;	2692	&DC::UI::feed_sdl_key_up_event;
2488	update_modbox;	2693	update_modbox;
2489	},	2694	};
2490	DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,	2695	$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2491	DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,	2696	$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2492	DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,	2697	$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2493	DC::SDL_USEREVENT => sub {	2698	$SDL_CB[DC::SDL_USEREVENT] = sub {
2494	if ($_[0]{code} == 1) {	2699	if ($_[0]{code} == 1) {
2495	audio_channel_finished $_[0]{data1};	2700	audio_channel_finished $_[0]{data1};
2496	} elsif ($_[0]{code} == 0) {	2701	} elsif ($_[0]{code} == 0) {
2497	audio_music_finished;	2702	audio_music_finished;
2498	}
2499	},	2703	}
2500	);	2704	};
2501		2705
2502	#############################################################################	2706	#############################################################################
2503		2707
2504	$SIG{INT} = $SIG{TERM} = sub {	2708	$SIG{INT} = $SIG{TERM} = sub {
2505	EV::unloop;	2709	EV::unloop;
2506	#d# TODO calling exit here hangs the process in some futex	2710	#d# TODO calling exit here hangs the process in some futex
2507	};	2711	};
2508		2712
2509	{	2713	# due to mac os x + sdl combined braindamage, we need this contortion
		2714	sub main {
		2715	{
2510	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";	2716	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511		2717
2512	if (-e "$Deliantra::VARDIR/client.cf") {	2718	if (-e "$Deliantra::VARDIR/client.cf") {
2513	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2719	DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514	} else {	2720	} else {
2515	#TODO: compatibility cruft	2721	#TODO: compatibility cruft
2516	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";	2722	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517	print STDERR "INFO: used old configuration file\n";	2723	print STDERR "INFO: used old configuration file\n";
2518	}	2724	}
2519		2725
2520	DC::DB::Server::run;	2726	DC::DB::Server::run;
2521		2727
2522	if ($CFG->{db_schema} < 1) {	2728	if ($CFG->{db_schema} < 1) {
2523	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";	2729	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2524	DC::DB::nuke_db;	2730	DC::DB::nuke_db;
2525	$CFG->{db_schema} = 1;	2731	$CFG->{db_schema} = 1;
2526	DC::write_cfg;	2732	DC::write_cfg;
2527	}	2733	}
2528		2734
2529	DC::DB::open_db;	2735	DC::DB::open_db;
2530		2736
2531	DC::UI::set_layout ($::CFG->{layout});	2737	DC::UI::set_layout ($::CFG->{layout});
2532		2738
2533	my %DEF_CFG = (	2739	my %DEF_CFG = (
		2740	config_autosave => 1,
2534	sdl_mode => 0,	2741	sdl_mode => undef,
2535	fullscreen => 1,	2742	fullscreen => 1,
2536	fast => 0,	2743	fast => 0,
2537	force_opengl11 => undef,	2744	force_opengl11 => undef,
2538	disable_alpha => 0,	2745	disable_alpha => 0,
		2746	smooth_movement => 1,
		2747	smooth_transitions => 1,
2539	texture_compression => 1,	2748	texture_compression => 1,
2540	map_scale => 1,	2749	map_scale => 1,
2541	fow_enable => 1,	2750	fow_enable => 1,
2542	fow_intensity => 0,	2751	fow_intensity => 0,
		2752	fow_texture => 0,
2543	map_smoothing => 1,	2753	map_smoothing => 1,
2544	gui_fontsize => 1,	2754	gui_fontsize => 1,
2545	log_fontsize => 0.7,	2755	log_fontsize => 0.7,
2546	gauge_fontsize => 1,	2756	gauge_fontsize => 1,
2547	gauge_size => 0.35,	2757	gauge_size => 0.35,
2548	stat_fontsize => 0.7,	2758	stat_fontsize => 0.7,
2549	mapsize => 100,	2759	mapsize => 100,
2550	audio_enable => 1,	2760	audio_enable => 1,
2551	audio_hw_channels => 0,	2761	audio_hw_channels => 0,
2552	audio_hw_frequency => 0,	2762	audio_hw_frequency => 0,
2553	audio_hw_chunksize => 0,	2763	audio_hw_chunksize => 0,
2554	audio_mix_channels => 8,	2764	audio_mix_channels => 8,
2555	effects_enable => 1,	2765	effects_enable => 1,
2556	effects_volume => 1,	2766	effects_volume => 1,
2557	bgm_enable => 1,	2767	bgm_enable => 1,
2558	bgm_volume => 0.5,	2768	bgm_volume => 0.5,
2559	output_rate => "",	2769	output_rate => "",
2560	pickup => 0,	2770	pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2561	inv_sort => "mtime",	2771	inv_sort => "mtime",
2562	default => "profile", # default profile	2772	default => "profile", # default profile
2563	show_tips => 1,	2773	show_tips => 1,
2564	logview_max_par => 1000,	2774	logview_max_par => 1000,
2565	shift_fire_stop => 0,	2775	shift_fire_stop => 0,
		2776	uitheme => "wood",
		2777	map_shift_x => -24, # arbitrary
		2778	map_shift_y => +24, # arbitrary
2566	);	2779	);
2567		2780
2568	while (my ($k, $v) = each %DEF_CFG) {	2781	while (my ($k, $v) = each %DEF_CFG) {
2569	$CFG->{$k} = $v unless exists $CFG->{$k};	2782	$CFG->{$k} = $v unless exists $CFG->{$k};
2570	}	2783	}
2571		2784
2572	$CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";	2785	my @args = @ARGV;
2573	$PROFILE = $CFG->{profile}{default};
2574		2786
2575	# convert old bindings (only default profile matters)	2787	my $profile = 'default';
2576	if (my $bindings = delete $PROFILE->{bindings}) {	2788
2577	while (my ($mod, $syms) = each %$bindings) {	2789	for (my $i = 0; $i < @args; $i++) {
2578	while (my ($sym, $cmds) = each %$syms) {	2790	if ($args[$i] =~ /^--?profile$/) {
2579	push @{ $PROFILE->{macro} }, {	2791	$profile = $args[$i + 1];
2580	accelkey => [$mod*1, $sym*1],	2792	splice @args, $i, 2, ();
2581	action => $cmds,
2582	};	2793	$i = 0;
		2794	} elsif ($args[$i] =~ /^--?h/) {
		2795	print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
		2796	exit 0;
2583	}	2797	}
2584	}	2798	}
2585	}
2586		2799
		2800	$CFG->{profile}{$profile} ||= {};
		2801	$PROFILE = $CFG->{profile}{$profile};
		2802	$PROFILE->{host} ||= "gameserver.deliantra.net";
		2803
		2804	$PROFILE->{host} = $args[0] if @args > 0;
		2805	$PROFILE->{user} = $args[1] if @args > 1;
		2806	$PROFILE->{password} = $args[2] if @args > 2;
		2807
		2808	# convert old bindings (only default profile matters)
		2809	if (my $bindings = delete $PROFILE->{bindings}) {
		2810	while (my ($mod, $syms) = each %$bindings) {
		2811	while (my ($sym, $cmds) = each %$syms) {
		2812	push @{ $PROFILE->{macro} }, {
		2813	accelkey => [$mod*1, $sym*1],
		2814	action => $cmds,
		2815	};
		2816	}
		2817	}
		2818	}
		2819
2587	sdl_init;	2820	sdl_init;
2588		2821
2589	{	2822	$ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
		2823	$ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
		2824
		2825	{
2590	my @fonts = map DC::find_rcfile "fonts/$_", qw(	2826	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591	DejaVuSans.ttf	2827	DejaVuSans.ttf
2592	DejaVuSansMono.ttf	2828	DejaVuSansMono.ttf
2593	DejaVuSans-Bold.ttf	2829	DejaVuSans-Bold.ttf
2594	DejaVuSansMono-Bold.ttf	2830	DejaVuSansMono-Bold.ttf
2595	DejaVuSans-Oblique.ttf	2831	DejaVuSans-Oblique.ttf
2596	DejaVuSansMono-Oblique.ttf	2832	DejaVuSansMono-Oblique.ttf
2597	DejaVuSans-BoldOblique.ttf	2833	DejaVuSans-BoldOblique.ttf
2598	DejaVuSansMono-BoldOblique.ttf	2834	DejaVuSansMono-BoldOblique.ttf
		2835	mona.ttf
2599	);	2836	);
2600		2837
2601	DC::add_font $_ for @fonts;	2838	DC::add_font $_ for @fonts;
2602		2839
2603	$FONT_PROP = new_from_file DC::Font $fonts[0];	2840	$FONT_PROP = new_from_file DC::Font $fonts[0];
2604	$FONT_FIXED = new_from_file DC::Font $fonts[1];	2841	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2605		2842
2606	$FONT_PROP->make_default;	2843	$FONT_PROP->make_default;
2607		2844
2608	DC::pango_init;	2845	DC::pango_init;
2609	}	2846	}
2610		2847
2611	# compare mono (ft) vs. rgba (cairo)	2848	# compare mono (ft) vs. rgba (cairo)
2612	# ft - 1.8s, cairo 3s, even in alpha-only mode	2849	# ft - 1.8s, cairo 3s, even in alpha-only mode
2613	# for my $rgba (0..1) {	2850	# for my $rgba (0..1) {
2614	# my $t1 = Time::HiRes::time;	2851	# my $t1 = Time::HiRes::time;
…		…
2619	# }	2856	# }
2620	# my $t2 = Time::HiRes::time;	2857	# my $t2 = Time::HiRes::time;
2621	# warn $t2-$t1;	2858	# warn $t2-$t1;
2622	# }	2859	# }
2623		2860
2624	video_init;	2861	video_init;
2625	audio_init;	2862	audio_init;
2626	}	2863	}
2627		2864
2628	show_tip_of_the_day if $CFG->{show_tips};	2865	show_tip_of_the_day if $CFG->{show_tips};
2629		2866
2630	our $STARTUP_CANCEL = EV::idle sub {	2867	our $STARTUP_CANCEL = EV::idle sub {
2631	undef $::STARTUP_CANCEL;	2868	undef $::STARTUP_CANCEL;
2632	$startup_done->();	2869	$startup_done->();
2633	};	2870	};
2634		2871
2635	delete $SIG{__DIE__};	2872	delete $SIG{__DIE__};
2636	EV::loop;	2873	EV::loop;
2637		2874
		2875	DC::write_cfg if $CFG->{config_autosave};
		2876
2638	#video_shutdown;	2877	#video_shutdown;
2639	#audio_shutdown;	2878	#audio_shutdown;
		2879
2640	DC::OpenGL::quit;	2880	DC::OpenGL::quit;
2641	DC::SDL_Quit;	2881	DC::SDL_Quit;
2642	DC::DB::Server::stop;	2882	DC::DB::Server::stop;
		2883	}
		2884
		2885	DC::SDL_braino; # see sub above
2643		2886
2644	=head1 NAME	2887	=head1 NAME
2645		2888
2646	deliantra - A Deliantra MORPG game client	2889	deliantra - A Deliantra MORPG game client
2647		2890
2648	=head1 SYNOPSIS	2891	=head1 SYNOPSIS
2649		2892
2650	Just run it - no commandline arguments are supported.	2893	deliantra [--profile name] [host [user [password]]]
		2894	deliantra --help
2651		2895
2652	=head1 USAGE	2896	=head1 USAGE
2653		2897
2654	deliantra utilises OpenGL for all UI elements and the game. It is supposed to	2898	The deliantra client utilises OpenGL for all UI elements and the game. It
2655	be used in fullscreen mode and interactively.	2899	is supposed to be used in fullscreen mode and interactively.
2656		2900
2657	=head1 DEBUGGING	2901	=head1 DEBUGGING
2658
2659		2902
2660	CFPLUS_DEBUG - environment variable	2903	CFPLUS_DEBUG - environment variable
2661		2904
2662	1 draw borders around widgets	2905	1 draw borders around widgets
2663	2 add low-level widget info to tooltips	2906	2 add low-level widget info to tooltips
2664	4 show fps	2907	4 show fps
2665	8 suppress tooltips	2908	8 suppress tooltips
2666		2909
2667	=head1 AUTHOR	2910	=head1 AUTHOR
2668		2911
2669	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	2912	Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670		2913
2671		2914
2672		2915

Diff Legend

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