[ViewVC] Diff of: 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.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;
103	use AnyEvent::Socket ();	112	use AnyEvent::Socket ();
104		113
105	use Compress::LZF;	114	use Compress::LZF;
		115	use JSON::XS;
106		116
107	use DC;	117	use DC;
108	BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" 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
109	use DC::OpenGL ();	131	use DC::OpenGL ();
110	use DC::Protocol;	132	use DC::Protocol;
111	use DC::DB;	133	use DC::DB;
112	use DC::UI;	134	use DC::UI;
113	use DC::UI::Canvas;	135	use DC::UI::Canvas;
114	use DC::UI::Inventory;	136	use DC::UI::Inventory;
115	use DC::UI::SpellList;	137	use DC::UI::SpellList;
116	use DC::UI::Dockable;	138	use DC::UI::Dockable;
117	use DC::UI::Dockbar;	139	use DC::UI::Dockbar;
118	use DC::UI::MessageWindow;
119	use DC::UI::ChatView;	140	use DC::UI::ChatView;
120	use DC::MessageDistributor;	141	use DC::MessageDistributor;
121	use DC::Pod;	142	use DC::Pod;
122	use DC::MapWidget;	143	use DC::MapWidget;
123	use DC::Macro;	144	use DC::Macro;
124		145
125	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	146	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126	$SIG{PIPE} = 'IGNORE';	147	$SIG{PIPE} = 'IGNORE';
127		148
128	$EV::DIED = sub {	149	$EV::DIED = sub {
		150	crash "CRASH/EV::DIED: $@" => 1;
129	DC::fatal Carp::longmess $@;	151	DC::fatal Carp::longmess $@;
130	};	152	};
131		153
132	my $MAX_FPS = 60;	154	my $MAX_FPS = 60;
133		155
…		…
135		157
136	our $LAST_REFRESH;	158	our $LAST_REFRESH;
137	our $NOW;	159	our $NOW;
138		160
139	our $CFG;	161	our $CFG;
140	our $CONN;
141	our $PROFILE; # current profile	162	our $PROFILE; # current profile
142	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	163	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143		164
144	our $WANT_REFRESH;	165	our $WANT_REFRESH;
145		166
…		…
153	our $FULLSCREEN;	174	our $FULLSCREEN;
154	our $FONTSIZE;	175	our $FONTSIZE;
155		176
156	our $FONT_PROP;	177	our $FONT_PROP;
157	our $FONT_FIXED;	178	our $FONT_FIXED;
		179
		180	our $CONN;
158		181
159	our $MAP;	182	our $MAP;
160	our $MAPMAP;	183	our $MAPMAP;
161	our $MAPWIDGET;	184	our $MAPWIDGET;
162	our $COMPLETER;	185	our $COMPLETER;
…		…
204	our $DEBUG_STATUS;	227	our $DEBUG_STATUS;
205		228
206	our $INV;	229	our $INV;
207	our $INVR;	230	our $INVR;
208	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	};
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]);
…		…
800	dc_connect $host, $port;	850	dc_connect $host, $port;
801	}	851	}
802	}	852	}
803		853
804	sub stop_game {	854	sub stop_game {
		855	crash "stop_game";
		856
805	$LOGIN_BUTTON->set_text ("Login / Register");	857	$LOGIN_BUTTON->set_text ("Login / Register");
806	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	858	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807	$SETUP_DIALOG->show;	859	$SETUP_DIALOG->show;
808	$PL_WINDOW->hide;	860	$PL_WINDOW->hide;
809	$SPELL_LIST->clear_spells;	861	$SPELL_LIST->clear_spells;
…		…
829		881
830	my $row = 0;	882	my $row = 0;
831		883
832	$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");
833	$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,
834	can_events => 1,	886	can_events => 1,
835	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");	887	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836		888
837	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");	889	$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,	890	$table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839	can_events => 1,	891	can_events => 1,
840	tooltip => "This field shows any known issues with your config or driver, such as "	892	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 "	893	. "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 "	894	. "by selecting a different video mode, changing the settings below or "
843	. "by installing the right driver for your graphics card.");	895	. "by installing the right driver for your graphics card.");
844		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	);
		908
845	my $vidmode_tooltip =	909	my $vidmode_tooltip =
846	"<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). "
847	. "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>.";
848		912
849	$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");
850	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);	914	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851		915
852	$hbox->add ($MODE_SLIDER = new DC::UI::Slider	916	$hbox->add ($MODE_SLIDER = new DC::UI::Slider
853	force_w => $WIDTH * 0.1, expand => 1,	917	force_w => $WIDTH * 0.1, expand => 1,
		918	range => [ ($CFG->{sdl_mode}) x 3 ],
854	tooltip => $vidmode_tooltip);	919	tooltip => $vidmode_tooltip);
855	$hbox->add (my $mode_label = new DC::UI::Label	920	$hbox->add (my $mode_label = new DC::UI::Label
856	height => 0.8, template => "9999x9999@9+9",	921	height => 0.8, template => "9999x9999@9+9",
857	can_events => 1, tooltip => $vidmode_tooltip);	922	can_events => 1, tooltip => $vidmode_tooltip);
858		923
…		…
902		967
903	$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");
904	$table->add_at (1, $row++, new DC::UI::CheckBox	969	$table->add_at (1, $row++, new DC::UI::CheckBox
905	state => $CFG->{texture_compression},	970	state => $CFG->{texture_compression},
906	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 "
907	. "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). "
908	. "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 "
909	. "forced OpenGL 1.1 mode.",	974	. "forced OpenGL 1.1 mode and when using the Apple renderer.",
910	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	975	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911	);	976	);
912		977
913	$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");
914	$table->add_at (1, $row++, new DC::UI::CheckBox	979	$table->add_at (1, $row++, new DC::UI::CheckBox
…		…
930	on_activate => sub {	995	on_activate => sub {
931	video_shutdown ();	996	video_shutdown ();
932	video_init ();	997	video_init ();
933	0	998	0
934	}	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 }
935	);	1009	);
936		1010
937	$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");
938	$table->add_at (1, $row++, new DC::UI::Slider	1012	$table->add_at (1, $row++, new DC::UI::Slider
939	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	1013	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
…		…
1579	1	1653	1
1580	},	1654	},
1581	);	1655	);
1582		1656
1583	$vbox->add (new DC::UI::FancyFrame	1657	$vbox->add (new DC::UI::FancyFrame
1584	label => "Registering",	1658	label => "How to Play",
1585	min_h => 200,	1659	min_h => 240,
1586	child => (new DC::UI::Label valign => 0, ellipsise => 0,	1660	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587	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). "
1588	"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 "
1589	. "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.",
1590	),	1666	),
1591	);	1667	);
1592		1668
1593	$vbox	1669	$vbox
…		…
1739	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1815	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740	["Ignore cursed" => PICKUP_NOT_CURSED],	1816	["Ignore cursed" => PICKUP_NOT_CURSED],
1741	["Jewelery" => PICKUP_JEWELS],	1817	["Jewelery" => PICKUP_JEWELS],
1742	["Flesh" => PICKUP_FLESH],	1818	["Flesh" => PICKUP_FLESH],
1743	],	1819	],
1744	["Weight/Value ratio", 2, 17]	1820	["Value/Weight ratio", 2, 17]
1745	)	1821	)
1746	{	1822	{
1747	my ($title, $x, $y, @bits) = @$_;	1823	my ($title, $x, $y, @bits) = @$_;
1748	$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]);
1749		1825
…		…
1774	}	1850	}
1775		1851
1776	$table->add_at (2, 18, new DC::UI::ValSlider	1852	$table->add_at (2, 18, new DC::UI::ValSlider
1777	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1853	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778	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).",
1779	to_value => sub { ">= " . 5 * $_[0] },	1856	to_value => sub { ">= " . 5 * $_[0] },
1780	on_changed => sub {	1857	on_changed => sub {
1781	my ($slider, $value) = @_;	1858	my ($slider, $value) = @_;
1782		1859
1783	$::CFG->{pickup} &= ~0xF;	1860	$::CFG->{pickup} &= ~0xF;
…		…
1839	$::CFG->{inv_sort} = $_[1];	1916	$::CFG->{inv_sort} = $_[1];
1840	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1917	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1841	},	1918	},
1842	);	1919	);
1843	$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);
1844	#TODO# update to weigh/maxweight	1921	#TODO# update to weight/maxweight
1845	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);	1922	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846		1923
1847	$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);
1848	$sw1->add ($INV = new DC::UI::Inventory);	1925	$sw1->add ($INV = new DC::UI::Inventory);
1849	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1926	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
…		…
2113	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2190	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114	);	2191	);
2115	$hb->add (new DC::UI::Button	2192	$hb->add (new DC::UI::Button
2116	text => "Quit anyway",	2193	text => "Quit anyway",
2117	expand => 1,	2194	expand => 1,
2118	on_activate => sub { EV::unloop EV::UNLOOP_ALL },	2195	on_activate => sub {
		2196	crash "Quit anyway";
		2197	EV::unloop EV::UNLOOP_ALL;
		2198	},
2119	);	2199	);
2120	}	2200	}
2121		2201
2122	$QUIT_DIALOG->show;	2202	$QUIT_DIALOG->show;
2123	$QUIT_DIALOG->grab_focus;	2203	$QUIT_DIALOG->grab_focus;
…		…
2181	DC::SDL_Init DC::SDL_INIT_AUDIO #\| DC::SDL_NOPARACHUTE	2261	DC::SDL_Init DC::SDL_INIT_AUDIO #\| DC::SDL_NOPARACHUTE
2182	and die "SDL::Init failed!\n";	2262	and die "SDL::Init failed!\n";
2183	}	2263	}
2184		2264
2185	sub video_init {	2265	sub video_init {
		2266	DC::set_theme $CFG->{uitheme};
		2267
2186	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;	2268	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187	$SDL_REINIT = 0;	2269	$SDL_REINIT = 0;
2188		2270
2189	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;	2271	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;	2272	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;	2273	@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)";	2274	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193		2275
2194	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;	2276	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195		2277
2196	if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {	2278	if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197	$CFG->{sdl_mode} = 0;	2279	$CFG->{sdl_mode} = 0; # lowest resolution by default
		2280
		2281	# now choose biggest mode <= 1024x768
2198	for (reverse 0 .. $#SDL_MODES) {	2282	for (0 .. $#SDL_MODES) {
2199	$CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;	2283	if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
		2284	$CFG->{sdl_mode} = $_;
		2285	}
2200	}	2286	}
2201	}	2287	}
2202		2288
2203	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2289	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204		2290
2205	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2291	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206	$FULLSCREEN = $CFG->{fullscreen};	2292	$FULLSCREEN = $CFG->{fullscreen};
2207	$FAST = $CFG->{fast};	2293	$FAST = $CFG->{fast};
2208		2294
		2295	# 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	2296	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
		2297	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2210	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2298	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211		2299
2212	$SDL_ACTIVE = 1;	2300	$SDL_ACTIVE = 1;
2213	$LAST_REFRESH = time - 0.01;	2301	$LAST_REFRESH = time - 0.01;
2214		2302
…		…
2281	x => 0,	2369	x => 0,
2282	y => $FONTSIZE + 8,	2370	y => $FONTSIZE + 8,
2283	border_bg => [1, 1, 1, 192/255],	2371	border_bg => [1, 1, 1, 192/255],
2284	bg => [1, 1, 1, 0],	2372	bg => [1, 1, 1, 0],
2285	child => ($MAPMAP = new DC::MapWidget::MapMap	2373	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.",	2374	tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2287	),	2375	),
2288	)->show;	2376	)->show;
2289		2377
2290	$MAPWIDGET = new DC::MapWidget;	2378	$MAPWIDGET = new DC::MapWidget;
2291	$MAPWIDGET->connect (activate_console => sub {	2379	$MAPWIDGET->connect (activate_console => sub {
…		…
2390	$BUTTONBAR->show;	2478	$BUTTONBAR->show;
2391	$SETUP_DIALOG->show;	2479	$SETUP_DIALOG->show;
2392	$MESSAGE_WINDOW->show;	2480	$MESSAGE_WINDOW->show;
2393	}	2481	}
2394		2482
2395	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);	2483	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2396	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});	2484	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397		2485
2398	$CAVEAT_LABEL->set_text ("None :)");	2486	$CAVEAT_LABEL->set_text ("None :)");
2399	$CAVEAT_LABEL->set_text ("Non-accelerated video mode")	2487	$CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;	2488	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401		2489
2402	$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]);
2403	}	2491	}
2404		2492
…		…
2455	delete $animate_object{$widget};	2543	delete $animate_object{$widget};
2456	}	2544	}
2457		2545
2458	%SDL_CB = (	2546	%SDL_CB = (
2459	DC::SDL_QUIT => sub {	2547	DC::SDL_QUIT => sub {
		2548	crash "SDL_QUIT";
2460	EV::unloop EV::UNLOOP_ALL;	2549	EV::unloop EV::UNLOOP_ALL;
2461	},	2550	},
2462	DC::SDL_VIDEORESIZE => sub {	2551	DC::SDL_VIDEORESIZE => sub {
2463	},	2552	},
2464	DC::SDL_VIDEOEXPOSE => sub {	2553	DC::SDL_VIDEOEXPOSE => sub {
…		…
2504	$SIG{INT} = $SIG{TERM} = sub {	2593	$SIG{INT} = $SIG{TERM} = sub {
2505	EV::unloop;	2594	EV::unloop;
2506	#d# TODO calling exit here hangs the process in some futex	2595	#d# TODO calling exit here hangs the process in some futex
2507	};	2596	};
2508		2597
2509	{	2598	# due to mac os x + sdl combined briandamage, we need this contortion
		2599	sub main {
		2600	{
2510	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";	2601	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511		2602
2512	if (-e "$Deliantra::VARDIR/client.cf") {	2603	if (-e "$Deliantra::VARDIR/client.cf") {
2513	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2604	DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514	} else {	2605	} else {
2515	#TODO: compatibility cruft	2606	#TODO: compatibility cruft
2516	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";	2607	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517	print STDERR "INFO: used old configuration file\n";	2608	print STDERR "INFO: used old configuration file\n";
2518	}	2609	}
2519		2610
2520	DC::DB::Server::run;	2611	DC::DB::Server::run;
2521		2612
2522	if ($CFG->{db_schema} < 1) {	2613	if ($CFG->{db_schema} < 1) {
2523	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";
2524	DC::DB::nuke_db;	2615	DC::DB::nuke_db;
2525	$CFG->{db_schema} = 1;	2616	$CFG->{db_schema} = 1;
2526	DC::write_cfg;	2617	DC::write_cfg;
2527	}	2618	}
2528		2619
2529	DC::DB::open_db;	2620	DC::DB::open_db;
2530		2621
2531	DC::UI::set_layout ($::CFG->{layout});	2622	DC::UI::set_layout ($::CFG->{layout});
2532		2623
2533	my %DEF_CFG = (	2624	my %DEF_CFG = (
2534	sdl_mode => 0,	2625	sdl_mode => undef,
2535	fullscreen => 1,	2626	fullscreen => 1,
2536	fast => 0,	2627	fast => 0,
2537	force_opengl11 => undef,	2628	force_opengl11 => undef,
2538	disable_alpha => 0,	2629	disable_alpha => 0,
		2630	smooth_movement => 1,
2539	texture_compression => 1,	2631	texture_compression => 1,
2540	map_scale => 1,	2632	map_scale => 1,
2541	fow_enable => 1,	2633	fow_enable => 1,
2542	fow_intensity => 0,	2634	fow_intensity => 0,
2543	map_smoothing => 1,	2635	map_smoothing => 1,
2544	gui_fontsize => 1,	2636	gui_fontsize => 1,
2545	log_fontsize => 0.7,	2637	log_fontsize => 0.7,
2546	gauge_fontsize => 1,	2638	gauge_fontsize => 1,
2547	gauge_size => 0.35,	2639	gauge_size => 0.35,
2548	stat_fontsize => 0.7,	2640	stat_fontsize => 0.7,
2549	mapsize => 100,	2641	mapsize => 100,
2550	audio_enable => 1,	2642	audio_enable => 1,
2551	audio_hw_channels => 0,	2643	audio_hw_channels => 0,
2552	audio_hw_frequency => 0,	2644	audio_hw_frequency => 0,
2553	audio_hw_chunksize => 0,	2645	audio_hw_chunksize => 0,
2554	audio_mix_channels => 8,	2646	audio_mix_channels => 8,
2555	effects_enable => 1,	2647	effects_enable => 1,
2556	effects_volume => 1,	2648	effects_volume => 1,
2557	bgm_enable => 1,	2649	bgm_enable => 1,
2558	bgm_volume => 0.5,	2650	bgm_volume => 0.5,
2559	output_rate => "",	2651	output_rate => "",
2560	pickup => 0,	2652	pickup => 0,
2561	inv_sort => "mtime",	2653	inv_sort => "mtime",
2562	default => "profile", # default profile	2654	default => "profile", # default profile
2563	show_tips => 1,	2655	show_tips => 1,
2564	logview_max_par => 1000,	2656	logview_max_par => 1000,
2565	shift_fire_stop => 0,	2657	shift_fire_stop => 0,
		2658	uitheme => "wood",
2566	);	2659	);
2567		2660
2568	while (my ($k, $v) = each %DEF_CFG) {	2661	while (my ($k, $v) = each %DEF_CFG) {
2569	$CFG->{$k} = $v unless exists $CFG->{$k};	2662	$CFG->{$k} = $v unless exists $CFG->{$k};
2570	}	2663	}
2571		2664
2572	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";	2665	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";
2573	$PROFILE = $CFG->{profile}{default};	2666	$PROFILE = $CFG->{profile}{default};
2574		2667
2575	# convert old bindings (only default profile matters)	2668	# convert old bindings (only default profile matters)
2576	if (my $bindings = delete $PROFILE->{bindings}) {	2669	if (my $bindings = delete $PROFILE->{bindings}) {
2577	while (my ($mod, $syms) = each %$bindings) {	2670	while (my ($mod, $syms) = each %$bindings) {
2578	while (my ($sym, $cmds) = each %$syms) {	2671	while (my ($sym, $cmds) = each %$syms) {
2579	push @{ $PROFILE->{macro} }, {	2672	push @{ $PROFILE->{macro} }, {
2580	accelkey => [$mod1, $sym1],	2673	accelkey => [$mod1, $sym1],
2581	action => $cmds,	2674	action => $cmds,
		2675	};
2582	};	2676	}
2583	}	2677	}
2584	}	2678	}
2585	}
2586		2679
2587	sdl_init;	2680	sdl_init;
2588		2681
2589	{	2682	{
2590	my @fonts = map DC::find_rcfile "fonts/$_", qw(	2683	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591	DejaVuSans.ttf	2684	DejaVuSans.ttf
2592	DejaVuSansMono.ttf	2685	DejaVuSansMono.ttf
2593	DejaVuSans-Bold.ttf	2686	DejaVuSans-Bold.ttf
2594	DejaVuSansMono-Bold.ttf	2687	DejaVuSansMono-Bold.ttf
2595	DejaVuSans-Oblique.ttf	2688	DejaVuSans-Oblique.ttf
2596	DejaVuSansMono-Oblique.ttf	2689	DejaVuSansMono-Oblique.ttf
2597	DejaVuSans-BoldOblique.ttf	2690	DejaVuSans-BoldOblique.ttf
2598	DejaVuSansMono-BoldOblique.ttf	2691	DejaVuSansMono-BoldOblique.ttf
2599	);	2692	);
2600		2693
2601	DC::add_font $_ for @fonts;	2694	DC::add_font $_ for @fonts;
2602		2695
2603	$FONT_PROP = new_from_file DC::Font $fonts[0];	2696	$FONT_PROP = new_from_file DC::Font $fonts[0];
2604	$FONT_FIXED = new_from_file DC::Font $fonts[1];	2697	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2605		2698
2606	$FONT_PROP->make_default;	2699	$FONT_PROP->make_default;
2607		2700
2608	DC::pango_init;	2701	DC::pango_init;
2609	}	2702	}
2610		2703
2611	# compare mono (ft) vs. rgba (cairo)	2704	# compare mono (ft) vs. rgba (cairo)
2612	# ft - 1.8s, cairo 3s, even in alpha-only mode	2705	# ft - 1.8s, cairo 3s, even in alpha-only mode
2613	# for my $rgba (0..1) {	2706	# for my $rgba (0..1) {
2614	# my $t1 = Time::HiRes::time;	2707	# my $t1 = Time::HiRes::time;
…		…
2619	# }	2712	# }
2620	# my $t2 = Time::HiRes::time;	2713	# my $t2 = Time::HiRes::time;
2621	# warn $t2-$t1;	2714	# warn $t2-$t1;
2622	# }	2715	# }
2623		2716
2624	video_init;	2717	video_init;
2625	audio_init;	2718	audio_init;
2626	}	2719	}
2627		2720
2628	show_tip_of_the_day if $CFG->{show_tips};	2721	show_tip_of_the_day if $CFG->{show_tips};
2629		2722
2630	our $STARTUP_CANCEL = EV::idle sub {	2723	our $STARTUP_CANCEL = EV::idle sub {
2631	undef $::STARTUP_CANCEL;	2724	undef $::STARTUP_CANCEL;
2632	$startup_done->();	2725	$startup_done->();
2633	};	2726	};
2634		2727
2635	delete $SIG{__DIE__};	2728	delete $SIG{__DIE__};
2636	EV::loop;	2729	EV::loop;
2637		2730
2638	#video_shutdown;	2731	#video_shutdown;
2639	#audio_shutdown;	2732	#audio_shutdown;
2640	DC::OpenGL::quit;	2733	DC::OpenGL::quit;
2641	DC::SDL_Quit;	2734	DC::SDL_Quit;
2642	DC::DB::Server::stop;	2735	DC::DB::Server::stop;
		2736	}
		2737
		2738	DC::SDL_braino; # see sub above
2643		2739
2644	=head1 NAME	2740	=head1 NAME
2645		2741
2646	deliantra - A Deliantra MORPG game client	2742	deliantra - A Deliantra MORPG game client
2647		2743
…		…
2664	4 show fps	2760	4 show fps
2665	8 suppress tooltips	2761	8 suppress tooltips
2666		2762
2667	=head1 AUTHOR	2763	=head1 AUTHOR
2668		2764
2669	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	2765	Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670		2766
2671		2767
2672		2768

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.53 by root, Fri Jul 18 22:32:55 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.53 by root, Fri Jul 18 22:32:55 2008 UTC vs.
Revision 1.75 by root, Wed Sep 3 10:08:18 2008 UTC