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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.49 by root, Mon Jul 7 12:56:07 2008 UTC vs.
Revision 1.66 by root, Mon Sep 1 09:12:08 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	}
…		…
97	use List::Util qw(max min);	104	use List::Util qw(max min);
98		105
99	use Deliantra;	106	use Deliantra;
100	use Deliantra::Protocol::Constants;	107	use Deliantra::Protocol::Constants;
101		108
		109	use AnyEvent::Util ();
102	use AnyEvent::DNS;	110	use AnyEvent::DNS;
		111	use AnyEvent::Socket ();
103		112
104	use Compress::LZF;	113	use Compress::LZF;
		114	use JSON::XS;
105		115
106	use DC;	116	use DC;
107	BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }	117
		118	#############################################################################
		119
		120	our $CONN;
		121
		122	# write a crash message blockingly to the socket, if possible
		123	# this is a bit too complicated for my tastes, but it was easy.
		124	sub crash($;$) {
		125	my ($msg, $backtrace) = @_;
		126
		127	return unless $CONN;
		128
		129	my $fh = $CONN->{fh}
		130	or return;
		131
		132	my $buf = delete $CONN->{wbuf};
		133
		134	$buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
		135
		136	AnyEvent::Util::fh_nonblocking $fh, 0;
		137
		138	syswrite $fh, $buf;
		139	AnyEvent::Util::fh_nonblocking $fh, 1;
		140
		141	$msg =~ s/\s+$//;
		142
		143	# backtrace as second step, in case it crashes, too
		144	crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
		145	if $backtrace;
		146	}
		147
		148	#############################################################################
		149
		150	BEGIN {
		151	$SIG{__DIE__} = sub {
		152	return if $^S;
		153	crash ("CRASH/DIE: $_[0]" => 1);
		154	DC::fatal Carp::longmess "$_[0]";
		155	}
		156	}
		157
108	use DC::OpenGL ();	158	use DC::OpenGL ();
109	use DC::Protocol;	159	use DC::Protocol;
110	use DC::DB;	160	use DC::DB;
111	use DC::UI;	161	use DC::UI;
112	use DC::UI::Canvas;	162	use DC::UI::Canvas;
113	use DC::UI::Inventory;	163	use DC::UI::Inventory;
114	use DC::UI::SpellList;	164	use DC::UI::SpellList;
115	use DC::UI::Dockable;	165	use DC::UI::Dockable;
116	use DC::UI::Dockbar;	166	use DC::UI::Dockbar;
117	use DC::UI::MessageWindow;
118	use DC::UI::ChatView;	167	use DC::UI::ChatView;
119	use DC::MessageDistributor;	168	use DC::MessageDistributor;
120	use DC::Pod;	169	use DC::Pod;
121	use DC::MapWidget;	170	use DC::MapWidget;
122	use DC::Macro;	171	use DC::Macro;
123		172
124	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	173	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
125	$SIG{PIPE} = 'IGNORE';	174	$SIG{PIPE} = 'IGNORE';
126		175
127	$EV::DIED = sub {	176	$EV::DIED = sub {
		177	crash ("CRASH/EV::DIED: $@" => 1);
128	DC::fatal Carp::longmess $@;	178	DC::fatal Carp::longmess $@;
129	};	179	};
130		180
131	my $MAX_FPS = 60;	181	my $MAX_FPS = 60;
132		182
…		…
134		184
135	our $LAST_REFRESH;	185	our $LAST_REFRESH;
136	our $NOW;	186	our $NOW;
137		187
138	our $CFG;	188	our $CFG;
139	our $CONN;
140	our $PROFILE; # current profile	189	our $PROFILE; # current profile
141	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	190	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
142		191
143	our $WANT_REFRESH;	192	our $WANT_REFRESH;
144		193
		194	our $MODE_SLIDER;
		195	our $CAVEAT_LABEL;
		196
145	our @SDL_MODES;	197	our @SDL_MODES;
		198	our $SDL_REINIT = 1;
146	our $WIDTH;	199	our $WIDTH;
147	our $HEIGHT;	200	our $HEIGHT;
148	our $FULLSCREEN;	201	our $FULLSCREEN;
149	our $FONTSIZE;	202	our $FONTSIZE;
150		203
…		…
736	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	789	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
737		790
738	$CONN =	791	$CONN =
739	new DC::Protocol	792	new DC::Protocol
740	host => $host,	793	host => $host,
741	port => $port \|\| 13327,	794	port => $port,
742	user => $PROFILE->{user},	795	user => $PROFILE->{user},
743	pass => $PROFILE->{password},	796	pass => $PROFILE->{password},
744	mapw => $mapsize,	797	mapw => $mapsize,
745	maph => $mapsize,	798	maph => $mapsize,
746		799
…		…
774	status "logging in...";	827	status "logging in...";
775		828
776	$LOGIN_BUTTON->set_text ("Logout");	829	$LOGIN_BUTTON->set_text ("Logout");
777	$SETUP_DIALOG->hide;	830	$SETUP_DIALOG->hide;
778		831
779	my ($host, $port) = split /:/, $PROFILE->{host};	832	my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
780		833
781	$MAP = new DC::Map;	834	$MAP = new DC::Map;
782		835
783	# hack to make SURE we find the IP address all right	836	# hack to make SURE we find the IP address all right
784	# can be removed once AnyEvent::DNS is proven stable.	837	# can be removed once AnyEvent::DNS is proven stable.
…		…
795	dc_connect $host, $port;	848	dc_connect $host, $port;
796	}	849	}
797	}	850	}
798		851
799	sub stop_game {	852	sub stop_game {
		853	crash "stop_game";
		854
800	$LOGIN_BUTTON->set_text ("Login / Register");	855	$LOGIN_BUTTON->set_text ("Login / Register");
801	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);	856	$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
802	$SETUP_DIALOG->show;	857	$SETUP_DIALOG->show;
803	$PL_WINDOW->hide;	858	$PL_WINDOW->hide;
804	$SPELL_LIST->clear_spells;	859	$SPELL_LIST->clear_spells;
…		…
824		879
825	my $row = 0;	880	my $row = 0;
826		881
827	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");	882	$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,	883	$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,	884	can_events => 1,
830	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");	885	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
		886
		887	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
		888	$table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
		889	can_events => 1,
		890	tooltip => "This field shows any known issues with your config or driver, such as "
		891	. "a non-accelerated display format. You can try to work around these issues "
		892	. "by selecting a different video mode, changing the settings below or "
		893	. "by installing the right driver for your graphics card.");
831		894
832	my $vidmode_tooltip =	895	my $vidmode_tooltip =
833	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	896	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
834	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";	897	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
835		898
836	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");	899	$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);	900	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
838		901
839	$hbox->add (my $mode_slider = new DC::UI::Slider	902	$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],	903	force_w => $WIDTH * 0.1, expand => 1,
		904	range => [ ($CFG->{sdl_mode}) x 3 ],
841	tooltip => $vidmode_tooltip);	905	tooltip => $vidmode_tooltip);
842	$hbox->add (my $mode_label = new DC::UI::Label	906	$hbox->add (my $mode_label = new DC::UI::Label
843	height => 0.8, template => "9999x9999@9+9",	907	height => 0.8, template => "9999x9999@9+9",
844	can_events => 1, tooltip => $vidmode_tooltip);	908	can_events => 1, tooltip => $vidmode_tooltip);
845		909
846	$mode_slider->connect (changed => sub {	910	$MODE_SLIDER->connect (changed => sub {
847	my ($self, $value) = @_;	911	my ($self, $value) = @_;
848		912
849	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	913	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
850	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	914	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
851	});	915	});
852	$mode_slider->emit (changed => $mode_slider->{range}[0]);	916	$MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
853		917
854	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");	918	$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	919	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
856	state => $CFG->{fullscreen},	920	state => $CFG->{fullscreen},
857	tooltip => "Bring the client into fullscreen mode.",	921	tooltip => "Bring the client into fullscreen mode.",
…		…
863	state => $CFG->{force_opengl11},	927	state => $CFG->{force_opengl11},
864	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "	928	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
865	. "higher memory usage and slower performance. It will, however, help tremendously on "	929	. "higher memory usage and slower performance. It will, however, help tremendously on "
866	. "cards that claim to support a feature but fall back to software rendering. "	930	. "cards that claim to support a feature but fall back to software rendering. "
867	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "	931	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
868	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "	932	. "but cards and drivers from other vendors (ATI) are often just as bad. "
869	. "experience extremely low framerates and your card should do better, try this option.</b>",	933	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
870	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }	934	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		935	);
		936
		937	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
		938	$table->add_at (1, $row++, new DC::UI::CheckBox
		939	state => $CFG->{disable_alpha},
		940	tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
		941	. "by disabling a number of textures and transparency effects. Normally, these "
		942	. "effects do not cost a lot of resources, but some graphics cards might fall "
		943	. "back to etxremely slow rendering if this is enabled. If disabling this option "
		944	. "noticably improves the framerate of the client please report this! "
		945	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
		946	on_changed => sub {
		947	my ($self, $value) = @_;
		948	$CFG->{disable_alpha} = $value;
		949	$SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
		950	0
		951	}
871	);	952	);
872		953
873	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");	954	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
874	$table->add_at (1, $row++, new DC::UI::CheckBox	955	$table->add_at (1, $row++, new DC::UI::CheckBox
875	state => $CFG->{texture_compression},	956	state => $CFG->{texture_compression},
876	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	957	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
877	. "will save a lot of memory and increase performance. The compression algorithm "	958	. "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
878	. "can differ form card to card, so your mileage may vary. This setting is ignored in "	959	. "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
879	. "forced OpenGL 1.1 mode.",	960	. "forced OpenGL 1.1 mode and when using the Apple renderer.",
880	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	961	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
881	);	962	);
882		963
883	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");	964	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
884	$table->add_at (1, $row++, new DC::UI::CheckBox	965	$table->add_at (1, $row++, new DC::UI::CheckBox
…		…
900	on_activate => sub {	981	on_activate => sub {
901	video_shutdown ();	982	video_shutdown ();
902	video_init ();	983	video_init ();
903	0	984	0
904	}	985	}
		986	);
		987
		988	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
		989	$table->add_at (1, $row++, new DC::UI::CheckBox
		990	state => $CFG->{smooth_movement},
		991	tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
		992	. "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
		993	. "then disable this option. Changes take effect immdiately.",
		994	on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
905	);	995	);
906		996
907	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");	997	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
908	$table->add_at (1, $row++, new DC::UI::Slider	998	$table->add_at (1, $row++, new DC::UI::Slider
909	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	999	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
…		…
1549	1	1639	1
1550	},	1640	},
1551	);	1641	);
1552		1642
1553	$vbox->add (new DC::UI::FancyFrame	1643	$vbox->add (new DC::UI::FancyFrame
1554	label => "Registering",	1644	label => "How to Play",
1555	min_h => 200,	1645	min_h => 240,
1556	child => (new DC::UI::Label valign => 0, ellipsise => 0,	1646	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1557	markup =>	1647	markup =>
		1648	"First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
		1649	. "Then register a new account (or use an existing one if you have one). "
1558	"To register a new account, choose a username that hasn't been taken yet and "	1650	. "To register an account, choose a username that hasn't been taken yet (just guess) and "
1559	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1651	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1560	),	1652	),
1561	);	1653	);
1562		1654
1563	$vbox	1655	$vbox
…		…
1709	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1801	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1710	["Ignore cursed" => PICKUP_NOT_CURSED],	1802	["Ignore cursed" => PICKUP_NOT_CURSED],
1711	["Jewelery" => PICKUP_JEWELS],	1803	["Jewelery" => PICKUP_JEWELS],
1712	["Flesh" => PICKUP_FLESH],	1804	["Flesh" => PICKUP_FLESH],
1713	],	1805	],
1714	["Weight/Value ratio", 2, 17]	1806	["Value/Weight ratio", 2, 17]
1715	)	1807	)
1716	{	1808	{
1717	my ($title, $x, $y, @bits) = @$_;	1809	my ($title, $x, $y, @bits) = @$_;
1718	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1810	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1719		1811
…		…
1744	}	1836	}
1745		1837
1746	$table->add_at (2, 18, new DC::UI::ValSlider	1838	$table->add_at (2, 18, new DC::UI::ValSlider
1747	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1839	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1748	template => ">= 99",	1840	template => ">= 99",
		1841	tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1749	to_value => sub { ">= " . 5 * $_[0] },	1842	to_value => sub { ">= " . 5 * $_[0] },
1750	on_changed => sub {	1843	on_changed => sub {
1751	my ($slider, $value) = @_;	1844	my ($slider, $value) = @_;
1752		1845
1753	$::CFG->{pickup} &= ~0xF;	1846	$::CFG->{pickup} &= ~0xF;
…		…
1809	$::CFG->{inv_sort} = $_[1];	1902	$::CFG->{inv_sort} = $_[1];
1810	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1903	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1811	},	1904	},
1812	);	1905	);
1813	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);	1906	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1814	#TODO# update to weigh/maxweight	1907	#TODO# update to weight/maxweight
1815	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);	1908	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1816		1909
1817	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);	1910	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1818	$sw1->add ($INV = new DC::UI::Inventory);	1911	$sw1->add ($INV = new DC::UI::Inventory);
1819	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1912	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
…		…
2083	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2176	on_activate => sub { $QUIT_DIALOG->hide; 0 },
2084	);	2177	);
2085	$hb->add (new DC::UI::Button	2178	$hb->add (new DC::UI::Button
2086	text => "Quit anyway",	2179	text => "Quit anyway",
2087	expand => 1,	2180	expand => 1,
2088	on_activate => sub { EV::unloop EV::UNLOOP_ALL },	2181	on_activate => sub {
		2182	crash "Quit anyway";
		2183	EV::unloop EV::UNLOOP_ALL;
		2184	},
2089	);	2185	);
2090	}	2186	}
2091		2187
2092	$QUIT_DIALOG->show;	2188	$QUIT_DIALOG->show;
2093	$QUIT_DIALOG->grab_focus;	2189	$QUIT_DIALOG->grab_focus;
…		…
2146	$dialog->show;	2242	$dialog->show;
2147	};	2243	};
2148	}	2244	}
2149		2245
2150	sub sdl_init {	2246	sub sdl_init {
2151	DC::SDL_Init	2247	DC::SDL_Init DC::SDL_INIT_AUDIO #\| DC::SDL_NOPARACHUTE
2152	and die "SDL::Init failed!\n";	2248	and die "SDL::Init failed!\n";
2153	}	2249	}
2154		2250
2155	sub video_init {	2251	sub video_init {
		2252	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
		2253	$SDL_REINIT = 0;
		2254
		2255	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
		2256	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
		2257	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
		2258	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2259
		2260	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
		2261
2156	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	2262	if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
		2263	$CFG->{sdl_mode} = 0; # lowest resolution by default
		2264
		2265	# now choose biggets mode <= 1024x768
		2266	for (0 .. $#SDL_MODES) {
		2267	if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
		2268	$CFG->{sdl_mode} = $_;
		2269	}
		2270	}
		2271	}
2157		2272
2158	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2273	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2159		2274
2160	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2275	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2161	$FULLSCREEN = $CFG->{fullscreen};	2276	$FULLSCREEN = $CFG->{fullscreen};
2162	$FAST = $CFG->{fast};	2277	$FAST = $CFG->{fast};
2163		2278
		2279	# 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	2280	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
		2281	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2165	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2282	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2166		2283
2167	$SDL_ACTIVE = 1;	2284	$SDL_ACTIVE = 1;
2168	$LAST_REFRESH = time - 0.01;	2285	$LAST_REFRESH = time - 0.01;
2169		2286
…		…
2345	$BUTTONBAR->show;	2462	$BUTTONBAR->show;
2346	$SETUP_DIALOG->show;	2463	$SETUP_DIALOG->show;
2347	$MESSAGE_WINDOW->show;	2464	$MESSAGE_WINDOW->show;
2348	}	2465	}
2349		2466
		2467	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
		2468	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
		2469
		2470	$CAVEAT_LABEL->set_text ("None :)");
		2471	$CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
		2472	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
		2473
2350	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2474	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2351	}	2475	}
2352		2476
2353	sub video_shutdown {	2477	sub video_shutdown {
2354	DC::OpenGL::shutdown;	2478	DC::OpenGL::shutdown;
		2479	DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2355		2480
2356	undef $SDL_ACTIVE;	2481	undef $SDL_ACTIVE;
2357	}	2482	}
2358		2483
2359	my %animate_object;	2484	my %animate_object;
…		…
2402	delete $animate_object{$widget};	2527	delete $animate_object{$widget};
2403	}	2528	}
2404		2529
2405	%SDL_CB = (	2530	%SDL_CB = (
2406	DC::SDL_QUIT => sub {	2531	DC::SDL_QUIT => sub {
		2532	crash "SDL_QUIT";
2407	EV::unloop EV::UNLOOP_ALL;	2533	EV::unloop EV::UNLOOP_ALL;
2408	},	2534	},
2409	DC::SDL_VIDEORESIZE => sub {	2535	DC::SDL_VIDEORESIZE => sub {
2410	},	2536	},
2411	DC::SDL_VIDEOEXPOSE => sub {	2537	DC::SDL_VIDEOEXPOSE => sub {
…		…
2420	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;	2546	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2421	},	2547	},
2422	DC::SDL_KEYDOWN => sub {	2548	DC::SDL_KEYDOWN => sub {
2423	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {	2549	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2424	# alt-enter	2550	# alt-enter
		2551	video_shutdown;
2425	$FULLSCREEN_ENABLE->toggle;	2552	$FULLSCREEN_ENABLE->toggle;
2426	video_shutdown;
2427	video_init;	2553	video_init;
2428	} else {	2554	} else {
2429	&DC::UI::feed_sdl_key_down_event;	2555	&DC::UI::feed_sdl_key_down_event;
2430	}	2556	}
2431	update_modbox;	2557	update_modbox;
…		…
2451	$SIG{INT} = $SIG{TERM} = sub {	2577	$SIG{INT} = $SIG{TERM} = sub {
2452	EV::unloop;	2578	EV::unloop;
2453	#d# TODO calling exit here hangs the process in some futex	2579	#d# TODO calling exit here hangs the process in some futex
2454	};	2580	};
2455		2581
2456	{	2582	# due to mac os x + sdl combined briandamage, we need this contortion
		2583	sub main {
		2584	{
2457	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";	2585	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458		2586
2459	if (-e "$Deliantra::VARDIR/client.cf") {	2587	if (-e "$Deliantra::VARDIR/client.cf") {
2460	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2588	DC::read_cfg "$Deliantra::VARDIR/client.cf";
2461	} else {	2589	} else {
2462	#TODO: compatibility cruft	2590	#TODO: compatibility cruft
2463	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";	2591	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2464	print STDERR "INFO: used old configuration file\n";	2592	print STDERR "INFO: used old configuration file\n";
2465	}	2593	}
2466		2594
2467	DC::DB::Server::run;	2595	DC::DB::Server::run;
2468		2596
2469	if ($CFG->{db_schema} < 1) {	2597	if ($CFG->{db_schema} < 1) {
2470	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";	2598	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471	DC::DB::nuke_db;	2599	DC::DB::nuke_db;
2472	$CFG->{db_schema} = 1;	2600	$CFG->{db_schema} = 1;
2473	DC::write_cfg;	2601	DC::write_cfg;
2474	}	2602	}
2475		2603
2476	DC::DB::open_db;	2604	DC::DB::open_db;
2477		2605
2478	DC::UI::set_layout ($::CFG->{layout});	2606	DC::UI::set_layout ($::CFG->{layout});
2479		2607
2480	my %DEF_CFG = (	2608	my %DEF_CFG = (
2481	sdl_mode => 0,	2609	sdl_mode => undef,
2482	fullscreen => 1,	2610	fullscreen => 1,
2483	fast => 0,	2611	fast => 0,
2484	force_opengl11 => undef,	2612	force_opengl11 => undef,
		2613	disable_alpha => 0,
		2614	smooth_movement => 1,
2485	texture_compression => 1,	2615	texture_compression => 1,
2486	map_scale => 1,	2616	map_scale => 1,
2487	fow_enable => 1,	2617	fow_enable => 1,
2488	fow_intensity => 0,	2618	fow_intensity => 0,
2489	map_smoothing => 1,	2619	map_smoothing => 1,
2490	gui_fontsize => 1,	2620	gui_fontsize => 1,
2491	log_fontsize => 0.7,	2621	log_fontsize => 0.7,
2492	gauge_fontsize => 1,	2622	gauge_fontsize => 1,
2493	gauge_size => 0.35,	2623	gauge_size => 0.35,
2494	stat_fontsize => 0.7,	2624	stat_fontsize => 0.7,
2495	mapsize => 100,	2625	mapsize => 100,
2496	audio_enable => 1,	2626	audio_enable => 1,
2497	audio_hw_channels => 0,	2627	audio_hw_channels => 0,
2498	audio_hw_frequency => 0,	2628	audio_hw_frequency => 0,
2499	audio_hw_chunksize => 0,	2629	audio_hw_chunksize => 0,
2500	audio_mix_channels => 8,	2630	audio_mix_channels => 8,
2501	effects_enable => 1,	2631	effects_enable => 1,
2502	effects_volume => 1,	2632	effects_volume => 1,
2503	bgm_enable => 1,	2633	bgm_enable => 1,
2504	bgm_volume => 0.5,	2634	bgm_volume => 0.5,
2505	output_rate => "",	2635	output_rate => "",
2506	pickup => 0,	2636	pickup => 0,
2507	inv_sort => "mtime",	2637	inv_sort => "mtime",
2508	default => "profile", # default profile	2638	default => "profile", # default profile
2509	show_tips => 1,	2639	show_tips => 1,
2510	logview_max_par => 1000,	2640	logview_max_par => 1000,
2511	shift_fire_stop => 0,	2641	shift_fire_stop => 0,
2512	);	2642	);
2513		2643
2514	while (my ($k, $v) = each %DEF_CFG) {	2644	while (my ($k, $v) = each %DEF_CFG) {
2515	$CFG->{$k} = $v unless exists $CFG->{$k};	2645	$CFG->{$k} = $v unless exists $CFG->{$k};
2516	}	2646	}
2517		2647
2518	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";	2648	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";
2519	$PROFILE = $CFG->{profile}{default};	2649	$PROFILE = $CFG->{profile}{default};
2520		2650
2521	# convert old bindings (only default profile matters)	2651	# convert old bindings (only default profile matters)
2522	if (my $bindings = delete $PROFILE->{bindings}) {	2652	if (my $bindings = delete $PROFILE->{bindings}) {
2523	while (my ($mod, $syms) = each %$bindings) {	2653	while (my ($mod, $syms) = each %$bindings) {
2524	while (my ($sym, $cmds) = each %$syms) {	2654	while (my ($sym, $cmds) = each %$syms) {
2525	push @{ $PROFILE->{macro} }, {	2655	push @{ $PROFILE->{macro} }, {
2526	accelkey => [$mod1, $sym1],	2656	accelkey => [$mod1, $sym1],
2527	action => $cmds,	2657	action => $cmds,
		2658	};
2528	};	2659	}
2529	}	2660	}
2530	}	2661	}
2531	}
2532		2662
2533	sdl_init;	2663	sdl_init;
2534		2664
2535	@SDL_MODES = DC::SDL_ListModes 8, 8;	2665	{
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(	2666	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2545	DejaVuSans.ttf	2667	DejaVuSans.ttf
2546	DejaVuSansMono.ttf	2668	DejaVuSansMono.ttf
2547	DejaVuSans-Bold.ttf	2669	DejaVuSans-Bold.ttf
2548	DejaVuSansMono-Bold.ttf	2670	DejaVuSansMono-Bold.ttf
2549	DejaVuSans-Oblique.ttf	2671	DejaVuSans-Oblique.ttf
2550	DejaVuSansMono-Oblique.ttf	2672	DejaVuSansMono-Oblique.ttf
2551	DejaVuSans-BoldOblique.ttf	2673	DejaVuSans-BoldOblique.ttf
2552	DejaVuSansMono-BoldOblique.ttf	2674	DejaVuSansMono-BoldOblique.ttf
2553	);	2675	);
2554		2676
2555	DC::add_font $_ for @fonts;	2677	DC::add_font $_ for @fonts;
2556		2678
2557	$FONT_PROP = new_from_file DC::Font $fonts[0];	2679	$FONT_PROP = new_from_file DC::Font $fonts[0];
2558	$FONT_FIXED = new_from_file DC::Font $fonts[1];	2680	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2559		2681
2560	$FONT_PROP->make_default;	2682	$FONT_PROP->make_default;
2561		2683
2562	DC::pango_init;	2684	DC::pango_init;
2563	}	2685	}
2564		2686
2565	# compare mono (ft) vs. rgba (cairo)	2687	# compare mono (ft) vs. rgba (cairo)
2566	# ft - 1.8s, cairo 3s, even in alpha-only mode	2688	# ft - 1.8s, cairo 3s, even in alpha-only mode
2567	# for my $rgba (0..1) {	2689	# for my $rgba (0..1) {
2568	# my $t1 = Time::HiRes::time;	2690	# my $t1 = Time::HiRes::time;
…		…
2573	# }	2695	# }
2574	# my $t2 = Time::HiRes::time;	2696	# my $t2 = Time::HiRes::time;
2575	# warn $t2-$t1;	2697	# warn $t2-$t1;
2576	# }	2698	# }
2577		2699
2578	video_init;	2700	video_init;
2579	audio_init;	2701	audio_init;
2580	}	2702	}
2581		2703
2582	show_tip_of_the_day if $CFG->{show_tips};	2704	show_tip_of_the_day if $CFG->{show_tips};
2583		2705
2584	our $STARTUP_CANCEL = EV::idle sub {	2706	our $STARTUP_CANCEL = EV::idle sub {
2585	undef $::STARTUP_CANCEL;	2707	undef $::STARTUP_CANCEL;
2586	$startup_done->();	2708	$startup_done->();
2587	};	2709	};
2588		2710
2589	delete $SIG{__DIE__};	2711	delete $SIG{__DIE__};
2590	EV::loop;	2712	EV::loop;
2591		2713
2592	#video_shutdown;	2714	#video_shutdown;
2593	#audio_shutdown;	2715	#audio_shutdown;
2594	DC::OpenGL::quit;	2716	DC::OpenGL::quit;
2595	DC::SDL_Quit;	2717	DC::SDL_Quit;
2596	DC::DB::Server::stop;	2718	DC::DB::Server::stop;
		2719	}
		2720
		2721	DC::SDL_braino; # see sub above
2597		2722
2598	=head1 NAME	2723	=head1 NAME
2599		2724
2600	deliantra - A Deliantra MORPG game client	2725	deliantra - A Deliantra MORPG game client
2601		2726
…		…
2618	4 show fps	2743	4 show fps
2619	8 suppress tooltips	2744	8 suppress tooltips
2620		2745
2621	=head1 AUTHOR	2746	=head1 AUTHOR
2622		2747
2623	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	2748	Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2624		2749
2625		2750
2626		2751

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.49 by root, Mon Jul 7 12:56:07 2008 UTC vs. Revision 1.66 by root, Mon Sep 1 09:12:08 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.49 by root, Mon Jul 7 12:56:07 2008 UTC vs.
Revision 1.66 by root, Mon Sep 1 09:12:08 2008 UTC