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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.76 by root, Wed Sep 3 12:50:43 2008 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.51 by root, Thu Jul 17 15:23:43 2008 UTC vs. Revision 1.76 by root, Wed Sep 3 12:50:43 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.76 by root, Wed Sep 3 12:50:43 2008 UTC