[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/deliantra

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.46 by root, Tue Jun 24 21:44:50 2008 UTC vs.
Revision 1.75 by root, Wed Sep 3 10:08:18 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;
77	}	84	}
78	}	85	}
…		…
90		97
91	# 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
92	unshift @INC, $ENV{PAR_TEMP}	99	unshift @INC, $ENV{PAR_TEMP}
93	if %PAR::LibCache;	100	if %PAR::LibCache;
94		101
95	use Time::HiRes 'time';
96	use EV;	102	use EV;
		103	BEGIN { *time = \&EV::time }
		104
97	use List::Util qw(max min);	105	use List::Util qw(max min);
98		106
99	use Deliantra;	107	use Deliantra;
100	use Deliantra::Protocol::Constants;	108	use Deliantra::Protocol::Constants;
101		109
		110	use AnyEvent::Util ();
102	use AnyEvent::DNS;	111	use AnyEvent::DNS;
		112	use AnyEvent::Socket ();
103		113
104	use Compress::LZF;	114	use Compress::LZF;
		115	use JSON::XS;
105		116
106	use DC;	117	use DC;
107	BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }	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
108	use DC::OpenGL ();	131	use DC::OpenGL ();
109	use DC::Protocol;	132	use DC::Protocol;
110	use DC::DB;	133	use DC::DB;
111	use DC::UI;	134	use DC::UI;
112	use DC::UI::Canvas;	135	use DC::UI::Canvas;
113	use DC::UI::Inventory;	136	use DC::UI::Inventory;
114	use DC::UI::SpellList;	137	use DC::UI::SpellList;
115	use DC::UI::Dockable;	138	use DC::UI::Dockable;
116	use DC::UI::Dockbar;	139	use DC::UI::Dockbar;
117	use DC::UI::MessageWindow;
118	use DC::UI::ChatView;	140	use DC::UI::ChatView;
119	use DC::MessageDistributor;	141	use DC::MessageDistributor;
120	use DC::Pod;	142	use DC::Pod;
121	use DC::MapWidget;	143	use DC::MapWidget;
122	use DC::Macro;	144	use DC::Macro;
123		145
124	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	146	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
125	$SIG{PIPE} = 'IGNORE';	147	$SIG{PIPE} = 'IGNORE';
126		148
127	$EV::DIED = sub {	149	$EV::DIED = sub {
		150	crash "CRASH/EV::DIED: $@" => 1;
128	DC::fatal Carp::longmess $@;	151	DC::fatal Carp::longmess $@;
129	};	152	};
130		153
131	my $MAX_FPS = 60;	154	my $MAX_FPS = 60;
132		155
…		…
134		157
135	our $LAST_REFRESH;	158	our $LAST_REFRESH;
136	our $NOW;	159	our $NOW;
137		160
138	our $CFG;	161	our $CFG;
139	our $CONN;
140	our $PROFILE; # current profile	162	our $PROFILE; # current profile
141	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	163	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
142		164
143	our $WANT_REFRESH;	165	our $WANT_REFRESH;
144		166
		167	our $MODE_SLIDER;
		168	our $CAVEAT_LABEL;
		169
145	our @SDL_MODES;	170	our @SDL_MODES;
		171	our $SDL_REINIT = 1;
146	our $WIDTH;	172	our $WIDTH;
147	our $HEIGHT;	173	our $HEIGHT;
148	our $FULLSCREEN;	174	our $FULLSCREEN;
149	our $FONTSIZE;	175	our $FONTSIZE;
150		176
151	our $FONT_PROP;	177	our $FONT_PROP;
152	our $FONT_FIXED;	178	our $FONT_FIXED;
		179
		180	our $CONN;
153		181
154	our $MAP;	182	our $MAP;
155	our $MAPMAP;	183	our $MAPMAP;
156	our $MAPWIDGET;	184	our $MAPWIDGET;
157	our $COMPLETER;	185	our $COMPLETER;
…		…
199	our $DEBUG_STATUS;	227	our $DEBUG_STATUS;
200		228
201	our $INV;	229	our $INV;
202	our $INVR;	230	our $INVR;
203	our $INVR_HB;	231	our $INVR_HB;
		232
		233	#############################################################################
		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	};
204		259
205	#############################################################################	260	#############################################################################
206		261
207	sub status {	262	sub status {
208	$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]);
…		…
736	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;
737		792
738	$CONN =	793	$CONN =
739	new DC::Protocol	794	new DC::Protocol
740	host => $host,	795	host => $host,
741	port => $port \|\| 13327,	796	port => $port,
742	user => $PROFILE->{user},	797	user => $PROFILE->{user},
743	pass => $PROFILE->{password},	798	pass => $PROFILE->{password},
744	mapw => $mapsize,	799	mapw => $mapsize,
745	maph => $mapsize,	800	maph => $mapsize,
746		801
…		…
774	status "logging in...";	829	status "logging in...";
775		830
776	$LOGIN_BUTTON->set_text ("Logout");	831	$LOGIN_BUTTON->set_text ("Logout");
777	$SETUP_DIALOG->hide;	832	$SETUP_DIALOG->hide;
778		833
779	my ($host, $port) = split /:/, $PROFILE->{host};	834	my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
780		835
781	$MAP = new DC::Map;	836	$MAP = new DC::Map;
782		837
783	# hack to make SURE we find the IP address all right	838	# hack to make SURE we find the IP address all right
784	# can be removed once AnyEvent::DNS is proven stable.	839	# can be removed once AnyEvent::DNS is proven stable.
…		…
795	dc_connect $host, $port;	850	dc_connect $host, $port;
796	}	851	}
797	}	852	}
798		853
799	sub stop_game {	854	sub stop_game {
		855	crash "stop_game";
		856
800	$LOGIN_BUTTON->set_text ("Login / Register");	857	$LOGIN_BUTTON->set_text ("Login / Register");
801	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	858	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
802	$SETUP_DIALOG->show;	859	$SETUP_DIALOG->show;
803	$PL_WINDOW->hide;	860	$PL_WINDOW->hide;
804	$SPELL_LIST->clear_spells;	861	$SPELL_LIST->clear_spells;
…		…
824		881
825	my $row = 0;	882	my $row = 0;
826		883
827	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");	884	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
828	$table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::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,
829	can_events => 1,	886	can_events => 1,
830	tooltip => "<tt><span size='8192'>" . (DC::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"],
		904	],
		905	tooltip => "Choose the User Interface theme that you like most :)",
		906	on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
		907	);
831		908
832	my $vidmode_tooltip =	909	my $vidmode_tooltip =
833	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	910	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
834	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";	911	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
835		912
836	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");	913	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
837	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);	914	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
838		915
839	$hbox->add (my $mode_slider = new DC::UI::Slider	916	$hbox->add ($MODE_SLIDER = new DC::UI::Slider
840	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],	917	force_w => $WIDTH * 0.1, expand => 1,
		918	range => [ ($CFG->{sdl_mode}) x 3 ],
841	tooltip => $vidmode_tooltip);	919	tooltip => $vidmode_tooltip);
842	$hbox->add (my $mode_label = new DC::UI::Label	920	$hbox->add (my $mode_label = new DC::UI::Label
843	height => 0.8, template => "9999x9999@9+9",	921	height => 0.8, template => "9999x9999@9+9",
844	can_events => 1, tooltip => $vidmode_tooltip);	922	can_events => 1, tooltip => $vidmode_tooltip);
845		923
846	$mode_slider->connect (changed => sub {	924	$MODE_SLIDER->connect (changed => sub {
847	my ($self, $value) = @_;	925	my ($self, $value) = @_;
848		926
849	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	927	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
850	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	928	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
851	});	929	});
852	$mode_slider->emit (changed => $mode_slider->{range}[0]);	930	$MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
853		931
854	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");	932	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
855	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox	933	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
856	state => $CFG->{fullscreen},	934	state => $CFG->{fullscreen},
857	tooltip => "Bring the client into fullscreen mode.",	935	tooltip => "Bring the client into fullscreen mode.",
…		…
863	state => $CFG->{force_opengl11},	941	state => $CFG->{force_opengl11},
864	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "	942	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
865	. "higher memory usage and slower performance. It will, however, help tremendously on "	943	. "higher memory usage and slower performance. It will, however, help tremendously on "
866	. "cards that claim to support a feature but fall back to software rendering. "	944	. "cards that claim to support a feature but fall back to software rendering. "
867	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "	945	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
868	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "	946	. "but cards and drivers from other vendors (ATI) are often just as bad. "
869	. "experience extremely low framerates and your card should do better, try this option.</b>",	947	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
870	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }	948	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		949	);
		950
		951	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
		952	$table->add_at (1, $row++, new DC::UI::CheckBox
		953	state => $CFG->{disable_alpha},
		954	tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
		955	. "by disabling a number of textures and transparency effects. Normally, these "
		956	. "effects do not cost a lot of resources, but some graphics cards might fall "
		957	. "back to etxremely slow rendering if this is enabled. If disabling this option "
		958	. "noticably improves the framerate of the client please report this! "
		959	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
		960	on_changed => sub {
		961	my ($self, $value) = @_;
		962	$CFG->{disable_alpha} = $value;
		963	$SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
		964	0
		965	}
871	);	966	);
872		967
873	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");	968	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
874	$table->add_at (1, $row++, new DC::UI::CheckBox	969	$table->add_at (1, $row++, new DC::UI::CheckBox
875	state => $CFG->{texture_compression},	970	state => $CFG->{texture_compression},
876	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	971	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
877	. "will save a lot of memory and increase performance. The compression algorithm "	972	. "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
878	. "can differ form card to card, so your mileage may vary. This setting is ignored in "	973	. "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
879	. "forced OpenGL 1.1 mode.",	974	. "forced OpenGL 1.1 mode and when using the Apple renderer.",
880	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	975	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
881	);	976	);
882		977
883	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");	978	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
884	$table->add_at (1, $row++, new DC::UI::CheckBox	979	$table->add_at (1, $row++, new DC::UI::CheckBox
…		…
900	on_activate => sub {	995	on_activate => sub {
901	video_shutdown ();	996	video_shutdown ();
902	video_init ();	997	video_init ();
903	0	998	0
904	}	999	}
		1000	);
		1001
		1002	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
		1003	$table->add_at (1, $row++, new DC::UI::CheckBox
		1004	state => $CFG->{smooth_movement},
		1005	tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
		1006	. "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
		1007	. "then disable this option. Changes take effect immdiately.",
		1008	on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
905	);	1009	);
906		1010
907	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");	1011	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
908	$table->add_at (1, $row++, new DC::UI::Slider	1012	$table->add_at (1, $row++, new DC::UI::Slider
909	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	1013	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
…		…
1549	1	1653	1
1550	},	1654	},
1551	);	1655	);
1552		1656
1553	$vbox->add (new DC::UI::FancyFrame	1657	$vbox->add (new DC::UI::FancyFrame
1554	label => "Registering",	1658	label => "How to Play",
1555	min_h => 200,	1659	min_h => 240,
1556	child => (new DC::UI::Label valign => 0, ellipsise => 0,	1660	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1557	markup =>	1661	markup =>
		1662	"First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
		1663	. "Then register a new account (or use an existing one if you have one). "
1558	"To register a new account, choose a username that hasn't been taken yet and "	1664	. "To register an account, choose a username that hasn't been taken yet (just guess) and "
1559	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1665	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1560	),	1666	),
1561	);	1667	);
1562		1668
1563	$vbox	1669	$vbox
…		…
1709	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1815	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1710	["Ignore cursed" => PICKUP_NOT_CURSED],	1816	["Ignore cursed" => PICKUP_NOT_CURSED],
1711	["Jewelery" => PICKUP_JEWELS],	1817	["Jewelery" => PICKUP_JEWELS],
1712	["Flesh" => PICKUP_FLESH],	1818	["Flesh" => PICKUP_FLESH],
1713	],	1819	],
1714	["Weight/Value ratio", 2, 17]	1820	["Value/Weight ratio", 2, 17]
1715	)	1821	)
1716	{	1822	{
1717	my ($title, $x, $y, @bits) = @$_;	1823	my ($title, $x, $y, @bits) = @$_;
1718	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1824	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1719		1825
…		…
1744	}	1850	}
1745		1851
1746	$table->add_at (2, 18, new DC::UI::ValSlider	1852	$table->add_at (2, 18, new DC::UI::ValSlider
1747	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1853	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1748	template => ">= 99",	1854	template => ">= 99",
		1855	tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1749	to_value => sub { ">= " . 5 * $_[0] },	1856	to_value => sub { ">= " . 5 * $_[0] },
1750	on_changed => sub {	1857	on_changed => sub {
1751	my ($slider, $value) = @_;	1858	my ($slider, $value) = @_;
1752		1859
1753	$::CFG->{pickup} &= ~0xF;	1860	$::CFG->{pickup} &= ~0xF;
…		…
1809	$::CFG->{inv_sort} = $_[1];	1916	$::CFG->{inv_sort} = $_[1];
1810	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1917	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1811	},	1918	},
1812	);	1919	);
1813	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);	1920	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1814	#TODO# update to weigh/maxweight	1921	#TODO# update to weight/maxweight
1815	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);	1922	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1816		1923
1817	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);	1924	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1818	$sw1->add ($INV = new DC::UI::Inventory);	1925	$sw1->add ($INV = new DC::UI::Inventory);
1819	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1926	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
…		…
2083	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2190	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2084	);	2191	);
2085	$hb->add (new DC::UI::Button	2192	$hb->add (new DC::UI::Button
2086	text => "Quit anyway",	2193	text => "Quit anyway",
2087	expand => 1,	2194	expand => 1,
2088	on_activate => sub { EV::unloop EV::UNLOOP_ALL },	2195	on_activate => sub {
		2196	crash "Quit anyway";
		2197	EV::unloop EV::UNLOOP_ALL;
		2198	},
2089	);	2199	);
2090	}	2200	}
2091		2201
2092	$QUIT_DIALOG->show;	2202	$QUIT_DIALOG->show;
2093	$QUIT_DIALOG->grab_focus;	2203	$QUIT_DIALOG->grab_focus;
…		…
2146	$dialog->show;	2256	$dialog->show;
2147	};	2257	};
2148	}	2258	}
2149		2259
2150	sub sdl_init {	2260	sub sdl_init {
2151	DC::SDL_Init	2261	DC::SDL_Init DC::SDL_INIT_AUDIO #\| DC::SDL_NOPARACHUTE
2152	and die "SDL::Init failed!\n";	2262	and die "SDL::Init failed!\n";
2153	}	2263	}
2154		2264
2155	sub video_init {	2265	sub video_init {
		2266	DC::set_theme $CFG->{uitheme};
		2267
		2268	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
		2269	$SDL_REINIT = 0;
		2270
		2271	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
		2272	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
		2273	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
		2274	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2275
		2276	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
		2277
2156	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	2278	if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
		2279	$CFG->{sdl_mode} = 0; # lowest resolution by default
		2280
		2281	# now choose biggest mode <= 1024x768
		2282	for (0 .. $#SDL_MODES) {
		2283	if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
		2284	$CFG->{sdl_mode} = $_;
		2285	}
		2286	}
		2287	}
2157		2288
2158	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2289	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2159		2290
2160	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2291	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2161	$FULLSCREEN = $CFG->{fullscreen};	2292	$FULLSCREEN = $CFG->{fullscreen};
2162	$FAST = $CFG->{fast};	2293	$FAST = $CFG->{fast};
2163		2294
		2295	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2164	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2296	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
		2297	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2165	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2298	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2166		2299
2167	$SDL_ACTIVE = 1;	2300	$SDL_ACTIVE = 1;
2168	$LAST_REFRESH = time - 0.01;	2301	$LAST_REFRESH = time - 0.01;
2169		2302
…		…
2236	x => 0,	2369	x => 0,
2237	y => $FONTSIZE + 8,	2370	y => $FONTSIZE + 8,
2238	border_bg => [1, 1, 1, 192/255],	2371	border_bg => [1, 1, 1, 192/255],
2239	bg => [1, 1, 1, 0],	2372	bg => [1, 1, 1, 0],
2240	child => ($MAPMAP = new DC::MapWidget::MapMap	2373	child => ($MAPMAP = new DC::MapWidget::MapMap
2241	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	2374	tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2242	),	2375	),
2243	)->show;	2376	)->show;
2244		2377
2245	$MAPWIDGET = new DC::MapWidget;	2378	$MAPWIDGET = new DC::MapWidget;
2246	$MAPWIDGET->connect (activate_console => sub {	2379	$MAPWIDGET->connect (activate_console => sub {
…		…
2345	$BUTTONBAR->show;	2478	$BUTTONBAR->show;
2346	$SETUP_DIALOG->show;	2479	$SETUP_DIALOG->show;
2347	$MESSAGE_WINDOW->show;	2480	$MESSAGE_WINDOW->show;
2348	}	2481	}
2349		2482
		2483	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
		2484	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
		2485
		2486	$CAVEAT_LABEL->set_text ("None :)");
		2487	$CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
		2488	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
		2489
2350	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2490	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2351	}	2491	}
2352		2492
2353	sub video_shutdown {	2493	sub video_shutdown {
2354	DC::OpenGL::shutdown;	2494	DC::OpenGL::shutdown;
		2495	DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2355		2496
2356	undef $SDL_ACTIVE;	2497	undef $SDL_ACTIVE;
2357	}	2498	}
2358		2499
2359	my %animate_object;	2500	my %animate_object;
…		…
2402	delete $animate_object{$widget};	2543	delete $animate_object{$widget};
2403	}	2544	}
2404		2545
2405	%SDL_CB = (	2546	%SDL_CB = (
2406	DC::SDL_QUIT => sub {	2547	DC::SDL_QUIT => sub {
		2548	crash "SDL_QUIT";
2407	EV::unloop EV::UNLOOP_ALL;	2549	EV::unloop EV::UNLOOP_ALL;
2408	},	2550	},
2409	DC::SDL_VIDEORESIZE => sub {	2551	DC::SDL_VIDEORESIZE => sub {
2410	},	2552	},
2411	DC::SDL_VIDEOEXPOSE => sub {	2553	DC::SDL_VIDEOEXPOSE => sub {
…		…
2420	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;	2562	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2421	},	2563	},
2422	DC::SDL_KEYDOWN => sub {	2564	DC::SDL_KEYDOWN => sub {
2423	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {	2565	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2424	# alt-enter	2566	# alt-enter
		2567	video_shutdown;
2425	$FULLSCREEN_ENABLE->toggle;	2568	$FULLSCREEN_ENABLE->toggle;
2426	video_shutdown;
2427	video_init;	2569	video_init;
2428	} else {	2570	} else {
2429	&DC::UI::feed_sdl_key_down_event;	2571	&DC::UI::feed_sdl_key_down_event;
2430	}	2572	}
2431	update_modbox;	2573	update_modbox;
…		…
2451	$SIG{INT} = $SIG{TERM} = sub {	2593	$SIG{INT} = $SIG{TERM} = sub {
2452	EV::unloop;	2594	EV::unloop;
2453	#d# TODO calling exit here hangs the process in some futex	2595	#d# TODO calling exit here hangs the process in some futex
2454	};	2596	};
2455		2597
2456	{	2598	# due to mac os x + sdl combined briandamage, we need this contortion
		2599	sub main {
		2600	{
2457	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";	2601	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458		2602
2459	if (-e "$Deliantra::VARDIR/client.cf") {	2603	if (-e "$Deliantra::VARDIR/client.cf") {
2460	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2604	DC::read_cfg "$Deliantra::VARDIR/client.cf";
2461	} else {	2605	} else {
2462	#TODO: compatibility cruft	2606	#TODO: compatibility cruft
2463	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";	2607	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2464	print STDERR "INFO: used old configuration file\n";	2608	print STDERR "INFO: used old configuration file\n";
2465	}	2609	}
2466		2610
2467	DC::DB::Server::run;	2611	DC::DB::Server::run;
2468		2612
2469	if ($CFG->{db_schema} < 1) {	2613	if ($CFG->{db_schema} < 1) {
2470	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";	2614	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471	DC::DB::nuke_db;	2615	DC::DB::nuke_db;
2472	$CFG->{db_schema} = 1;	2616	$CFG->{db_schema} = 1;
2473	DC::write_cfg;	2617	DC::write_cfg;
2474	}	2618	}
2475		2619
2476	DC::DB::open_db;	2620	DC::DB::open_db;
2477		2621
2478	DC::UI::set_layout ($::CFG->{layout});	2622	DC::UI::set_layout ($::CFG->{layout});
2479		2623
2480	my %DEF_CFG = (	2624	my %DEF_CFG = (
2481	sdl_mode => 0,	2625	sdl_mode => undef,
2482	fullscreen => 1,	2626	fullscreen => 1,
2483	fast => 0,	2627	fast => 0,
2484	force_opengl11 => undef,	2628	force_opengl11 => undef,
		2629	disable_alpha => 0,
		2630	smooth_movement => 1,
2485	texture_compression => 1,	2631	texture_compression => 1,
2486	map_scale => 1,	2632	map_scale => 1,
2487	fow_enable => 1,	2633	fow_enable => 1,
2488	fow_intensity => 0,	2634	fow_intensity => 0,
2489	map_smoothing => 1,	2635	map_smoothing => 1,
2490	gui_fontsize => 1,	2636	gui_fontsize => 1,
2491	log_fontsize => 0.7,	2637	log_fontsize => 0.7,
2492	gauge_fontsize => 1,	2638	gauge_fontsize => 1,
2493	gauge_size => 0.35,	2639	gauge_size => 0.35,
2494	stat_fontsize => 0.7,	2640	stat_fontsize => 0.7,
2495	mapsize => 100,	2641	mapsize => 100,
2496	audio_enable => 1,	2642	audio_enable => 1,
2497	audio_hw_channels => 0,	2643	audio_hw_channels => 0,
2498	audio_hw_frequency => 0,	2644	audio_hw_frequency => 0,
2499	audio_hw_chunksize => 0,	2645	audio_hw_chunksize => 0,
2500	audio_mix_channels => 8,	2646	audio_mix_channels => 8,
2501	effects_enable => 1,	2647	effects_enable => 1,
2502	effects_volume => 1,	2648	effects_volume => 1,
2503	bgm_enable => 1,	2649	bgm_enable => 1,
2504	bgm_volume => 0.5,	2650	bgm_volume => 0.5,
2505	output_rate => "",	2651	output_rate => "",
2506	pickup => 0,	2652	pickup => 0,
2507	inv_sort => "mtime",	2653	inv_sort => "mtime",
2508	default => "profile", # default profile	2654	default => "profile", # default profile
2509	show_tips => 1,	2655	show_tips => 1,
2510	logview_max_par => 1000,	2656	logview_max_par => 1000,
2511	shift_fire_stop => 0,	2657	shift_fire_stop => 0,
		2658	uitheme => "wood",
2512	);	2659	);
2513		2660
2514	while (my ($k, $v) = each %DEF_CFG) {	2661	while (my ($k, $v) = each %DEF_CFG) {
2515	$CFG->{$k} = $v unless exists $CFG->{$k};	2662	$CFG->{$k} = $v unless exists $CFG->{$k};
2516	}	2663	}
2517		2664
2518	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";	2665	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";
2519	$PROFILE = $CFG->{profile}{default};	2666	$PROFILE = $CFG->{profile}{default};
2520		2667
2521	# convert old bindings (only default profile matters)	2668	# convert old bindings (only default profile matters)
2522	if (my $bindings = delete $PROFILE->{bindings}) {	2669	if (my $bindings = delete $PROFILE->{bindings}) {
2523	while (my ($mod, $syms) = each %$bindings) {	2670	while (my ($mod, $syms) = each %$bindings) {
2524	while (my ($sym, $cmds) = each %$syms) {	2671	while (my ($sym, $cmds) = each %$syms) {
2525	push @{ $PROFILE->{macro} }, {	2672	push @{ $PROFILE->{macro} }, {
2526	accelkey => [$mod1, $sym1],	2673	accelkey => [$mod1, $sym1],
2527	action => $cmds,	2674	action => $cmds,
		2675	};
2528	};	2676	}
2529	}	2677	}
2530	}	2678	}
2531	}
2532		2679
2533	sdl_init;	2680	sdl_init;
2534		2681
2535	@SDL_MODES = DC::SDL_ListModes 8, 8;	2682	{
2536	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2537	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2538
2539	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2540
2541	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2542
2543	{
2544	my @fonts = map DC::find_rcfile "fonts/$_", qw(	2683	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2545	DejaVuSans.ttf	2684	DejaVuSans.ttf
2546	DejaVuSansMono.ttf	2685	DejaVuSansMono.ttf
2547	DejaVuSans-Bold.ttf	2686	DejaVuSans-Bold.ttf
2548	DejaVuSansMono-Bold.ttf	2687	DejaVuSansMono-Bold.ttf
2549	DejaVuSans-Oblique.ttf	2688	DejaVuSans-Oblique.ttf
2550	DejaVuSansMono-Oblique.ttf	2689	DejaVuSansMono-Oblique.ttf
2551	DejaVuSans-BoldOblique.ttf	2690	DejaVuSans-BoldOblique.ttf
2552	DejaVuSansMono-BoldOblique.ttf	2691	DejaVuSansMono-BoldOblique.ttf
2553	);	2692	);
2554		2693
2555	DC::add_font $_ for @fonts;	2694	DC::add_font $_ for @fonts;
2556		2695
2557	$FONT_PROP = new_from_file DC::Font $fonts[0];	2696	$FONT_PROP = new_from_file DC::Font $fonts[0];
2558	$FONT_FIXED = new_from_file DC::Font $fonts[1];	2697	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2559		2698
2560	$FONT_PROP->make_default;	2699	$FONT_PROP->make_default;
2561		2700
2562	DC::pango_init;	2701	DC::pango_init;
2563	}	2702	}
2564		2703
2565	# compare mono (ft) vs. rgba (cairo)	2704	# compare mono (ft) vs. rgba (cairo)
2566	# ft - 1.8s, cairo 3s, even in alpha-only mode	2705	# ft - 1.8s, cairo 3s, even in alpha-only mode
2567	# for my $rgba (0..1) {	2706	# for my $rgba (0..1) {
2568	# my $t1 = Time::HiRes::time;	2707	# my $t1 = Time::HiRes::time;
…		…
2573	# }	2712	# }
2574	# my $t2 = Time::HiRes::time;	2713	# my $t2 = Time::HiRes::time;
2575	# warn $t2-$t1;	2714	# warn $t2-$t1;
2576	# }	2715	# }
2577		2716
2578	video_init;	2717	video_init;
2579	audio_init;	2718	audio_init;
2580	}	2719	}
2581		2720
2582	show_tip_of_the_day if $CFG->{show_tips};	2721	show_tip_of_the_day if $CFG->{show_tips};
2583		2722
2584	our $STARTUP_CANCEL = EV::idle sub {	2723	our $STARTUP_CANCEL = EV::idle sub {
2585	undef $::STARTUP_CANCEL;	2724	undef $::STARTUP_CANCEL;
2586	$startup_done->();	2725	$startup_done->();
2587	};	2726	};
2588		2727
2589	delete $SIG{__DIE__};	2728	delete $SIG{__DIE__};
2590	EV::loop;	2729	EV::loop;
2591		2730
2592	#video_shutdown;	2731	#video_shutdown;
2593	#audio_shutdown;	2732	#audio_shutdown;
2594	DC::OpenGL::quit;	2733	DC::OpenGL::quit;
2595	DC::SDL_Quit;	2734	DC::SDL_Quit;
2596	DC::DB::Server::stop;	2735	DC::DB::Server::stop;
		2736	}
		2737
		2738	DC::SDL_braino; # see sub above
2597		2739
2598	=head1 NAME	2740	=head1 NAME
2599		2741
2600	deliantra - A Deliantra MORPG game client	2742	deliantra - A Deliantra MORPG game client
2601		2743
…		…
2618	4 show fps	2760	4 show fps
2619	8 suppress tooltips	2761	8 suppress tooltips
2620		2762
2621	=head1 AUTHOR	2763	=head1 AUTHOR
2622		2764
2623	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	2765	Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2624		2766
2625		2767
2626		2768

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.46 by root, Tue Jun 24 21:44:50 2008 UTC vs. Revision 1.75 by root, Wed Sep 3 10:08:18 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.46 by root, Tue Jun 24 21:44:50 2008 UTC vs.
Revision 1.75 by root, Wed Sep 3 10:08:18 2008 UTC