[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Main.pm

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.7 by root, Sat Dec 31 06:51:29 2011 UTC vs.
Revision 1.18 by root, Wed Jan 18 15:31:51 2012 UTC

…		…
18	}	18	}
19		19
20	use common::sense;	20	use common::sense;
21	use Carp 'verbose';	21	use Carp 'verbose';
22	use Cwd ();	22	use Cwd ();
		23	use Digest::MD5 ();
23	use EV;	24	use EV;
24	BEGIN { *time = \&EV::time }	25	BEGIN { *time = \&EV::time }
25		26
26	use List::Util qw(max min);	27	use List::Util qw(max min);
27		28
…		…
56	DC::fatal Carp::longmess "$_[0]";	57	DC::fatal Carp::longmess "$_[0]";
57	}	58	}
58	}	59	}
59		60
60	use DC::OpenGL ();	61	use DC::OpenGL ();
		62	use DC::Audio ();
61	use DC::Protocol;	63	use DC::Protocol;
62	use DC::DB;	64	use DC::DB;
63	use DC::UI;	65	use DC::UI;
64	use DC::UI::Canvas;	66	use DC::UI::Canvas;
65	use DC::UI::Inventory;	67	use DC::UI::Inventory;
…		…
195	AnyEvent::Util::fh_nonblocking $fh, 1;	197	AnyEvent::Util::fh_nonblocking $fh, 1;
196		198
197	$msg =~ s/\s+$//;	199	$msg =~ s/\s+$//;
198		200
199	# backtrace as second step, in case it crashes, too	201	# backtrace as second step, in case it crashes, too
200	crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"	202	crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated"
201	if $backtrace;	203	if $backtrace;
202	};	204	};
203		205
204	sub clienterror($;$) {	206	sub clienterror($;$) {
205	my ($msg, $backtrace) = @_;	207	my ($msg, $backtrace) = @_;
…		…
207	warn $msg;	209	warn $msg;
208		210
209	return unless $CONN;	211	return unless $CONN;
210		212
211	$CONN->send_exti_msg (clientlog => $msg);	213	$CONN->send_exti_msg (clientlog => $msg);
212	$CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;	214	$CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace;
213	}	215	}
214		216
215	#############################################################################	217	#############################################################################
216		218
217	sub status {	219	sub status {
…		…
472	audio_music_push;	474	audio_music_push;
473	}	475	}
474		476
475	sub audio_init {	477	sub audio_init {
476	if ($CFG->{audio_enable}) {	478	if ($CFG->{audio_enable}) {
477	if (length $CFG->{audio_driver}) {	479	DC::Audio::init $CFG->{audio_driver};
478	local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
479	DC::SDL_Init DC::SDL_INIT_AUDIO
480	and die "SDL::Init failed!\n";
481	} else {
482	DC::SDL_Init DC::SDL_INIT_AUDIO
483	and die "SDL::Init failed!\n";
484	}
485
486	$ENV{MIX_EFFECTSMAXSPEED} = 1;
487	$SDL_MIXER = !DC::Mix_OpenAudio
488	$CFG->{audio_hw_frequency},
489	DC::MIX_DEFAULT_FORMAT,
490	$CFG->{audio_hw_channels},
491	$CFG->{audio_hw_chunksize};
492		480
493	if ($SDL_MIXER) {	481	if ($SDL_MIXER) {
494	DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
495
496	audio_music_finished;	482	audio_music_finished;
497	} else {	483	} else {
498	status "Unable to open sound device: there will be no sound";	484	status "Unable to open sound device: there will be no sound";
499	}	485	}
500	} else {	486	} else {
…		…
522		508
523	DC::Mix_CloseAudio if $SDL_MIXER;	509	DC::Mix_CloseAudio if $SDL_MIXER;
524	undef $SDL_MIXER;	510	undef $SDL_MIXER;
525		511
526	DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;	512	DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
		513	}
		514
		515	#############################################################################
		516	# Over-the-air updates
		517
		518	sub ota_update {
		519	my ($face, $size, $md5) = @_;
		520
		521	my $coro = Coro::async_pool {
		522	my $override = "$Urlader::EXE_DIR/override";
		523
		524	$MESSAGE_DIST->add_channel ({
		525	id => "ota_update",
		526	title => "Update",
		527	tooltip => "<b>Software Update Log</b>",
		528	});
		529
		530	$MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." });
		531
		532	my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY \| IO::AIO::O_CREAT \| IO::AIO::O_TRUNC, 0777;
		533
		534	unless ($fh) {
		535	$MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") });
		536	return;
		537	}
		538
		539	$MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." });
		540
		541	my $cv = AE::cv;
		542	my $error;
		543
		544	$cv->begin (Coro::rouse_cb);
		545	$CONN->ask_face (
		546	$face,
		547	-1000,
		548	sub {
		549	$STATUSBOX->add (
		550	(sprintf "update download: %d/%d", $size - $_[1], $size),
		551	pri => -9, group => "ota_update", timeout => 60, fg => [1, 1, 0, 1]
		552	);
		553
		554	$cv->begin;
		555	my $len = length $_[2];
		556	IO::AIO::aio_write $fh, $_[1], $len, $_[2], undef, sub {
		557	$error \|\|= $_[0] != $len;
		558	$cv->end;
		559	};
		560	},
		561	sub {
		562	$cv->end;
		563	},
		564	);
		565
		566	Coro::rouse_wait;
		567
		568	$STATUSBOX->clr_group ("ota_update");
		569
		570	$error \|\|= Coro::AIO::aio_fsync $fh;
		571	$error \|\|= Coro::AIO::aio_close $fh;
		572
		573	if ($error) {
		574	$MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." });
		575	Coro::AIO::aio_unlink "$override.tmp";
		576	return;
		577	}
		578
		579	{
		580	$MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." });
		581
		582	my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
		583
		584	if ($fh) {
		585	$error \|\|= Coro::AIO::aio_stat "$override.tmp";
		586	$error \|\|= -s _ != $size;
		587	Coro::AIO::aio_readahead $fh, 0, $size;
		588
		589	my $f_md5 = new Digest::MD5;
		590	binmode $fh; # ugh :(
		591	$f_md5->addfile ($fh);
		592	$f_md5 = $f_md5->hexdigest;
		593	$error \|\|= $md5 ne $f_md5;
		594	}
		595	}
		596
		597	if ($error) {
		598	$MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." });
		599	Coro::AIO::aio_unlink "$override.tmp";
		600	return;
		601	}
		602
		603	$MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." });
		604
		605	if (Coro::AIO::aio_rename "$override.tmp", $override) {
		606	$MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." });
		607	Coro::AIO::aio_unlink "$override.tmp";
		608	}
		609
		610	$MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." });
		611	};
		612
		613	$CONN->{ota_update} = Guard::guard {
		614	$coro->cancel;
		615	};
		616	}
		617
		618	sub ota_update_ask {
		619	my ($ok, $face, $ver, $size, $md5, $changes) = @_;
		620
		621	$CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel
		622	x => "center",
		623	y => "center",
		624	z => 55,
		625	force_w => $::WIDTH * 0.7,
		626	force_h => $::HEIGHT * 0.7,
		627	title => "Software update available",
		628	child => my $vbox = new DC::UI::VBox,
		629	;
		630
		631	$vbox->add (new DC::UI::Label
		632	ellipsise => 0,
		633	text => "The server offers a software update, "
		634	. "do you want to start downloading this update in the background?",
		635	);
		636
		637	$vbox->add (new DC::UI::FancyFrame
		638	expand => 1,
		639	label => "Details",
		640	child => (new DC::UI::TextScroller
		641	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4,
		642	par => [{
		643	markup => "<tt>Old revision: $Urlader::EXE_VER\n"
		644	. "New revision: $ver\n"
		645	. "Download size: $size bytes</tt>\n\n"
		646	. "Changes:\n\n"
		647	. DC::asxml $changes
		648	}],
		649	),
		650	);
		651
		652	$vbox->add (my $hbox = new DC::UI::HBox);
		653
		654	$hbox->add (new DC::UI::Button
		655	expand => 1,
		656	text => "Not now",
		657	on_activate => sub {
		658	$dialog->destroy;
		659	0
		660	}
		661	);
		662	$hbox->add (new DC::UI::Button
		663	expand => 1,
		664	text => "Yes, start downloading",
		665	on_activate => sub {
		666	$dialog->destroy;
		667	ota_update $face, $size, $md5;
		668	0
		669	},
		670	);
		671
		672	$dialog->show;
		673	}
		674
		675	sub ota_update_check {
		676	return unless defined $Urlader::EXE_ID;
		677
		678	::message { markup => "Checking for software update..." };
		679
		680	$CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub {
		681	my ($ok, $face, $ver, $size, $md5, $changes) = @_;
		682
		683	if ($ok) {
		684	if (defined $ver) {
		685	::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." };
		686	&ota_update_ask;
		687	} else {
		688	::message { markup => "Server has no newer version." };
		689	}
		690	} else {
		691	::message { markup => "Server does not support software update." };
		692	}
		693
		694	# $self->register_face_handler ($exp_table, sub {
		695	# my ($face) = @_;
		696
		697	# $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		698	# $_->() for values %{ $self->{on_exp_update} \|\| {} };
		699	# });
		700
		701	()
		702	});
527	}	703	}
528		704
529	#############################################################################	705	#############################################################################
530		706
531	sub destroy_query_dialog {	707	sub destroy_query_dialog {
…		…
774	mapw => $mapw,	950	mapw => $mapw,
775	maph => $maph,	951	maph => $maph,
776		952
777	c_version => {	953	c_version => {
778	client => "deliantra",	954	client => "deliantra",
779	clientver => $DC::VERSION,	955	clientver => "$DC::VERSION$Urlader::EXE_VER",
780	gl_vendor => DC::OpenGL::gl_vendor,	956	gl_vendor => DC::OpenGL::gl_vendor,
781	gl_version => DC::OpenGL::gl_version,	957	gl_version => DC::OpenGL::gl_version,
782	},	958	},
783		959
784	map_widget => $MAPWIDGET,	960	map_widget => $MAPWIDGET,
…		…
792	},	968	},
793		969
794	on_connect => sub {	970	on_connect => sub {
795	if ($_[0]) {	971	if ($_[0]) {
796	DC::lowdelay fileno $CONN->{fh};	972	DC::lowdelay fileno $CONN->{fh};
		973
		974	ota_update_check;
797		975
798	status "successfully connected to the server";	976	status "successfully connected to the server";
799	} else {	977	} else {
800	undef $CONN;	978	undef $CONN;
801	status "unable to connect: $!";	979	status "unable to connect: $!";
…		…
1836	$table->add_at (2, $row++, new DC::UI::Button	2014	$table->add_at (2, $row++, new DC::UI::Button
1837	text => "Save Now",	2015	text => "Save Now",
1838	tooltip => "Use this to manually save configuration and UI layout when "	2016	tooltip => "Use this to manually save configuration and UI layout when "
1839	. "autosave is disabled.",	2017	. "autosave is disabled.",
1840	on_activate => sub {	2018	on_activate => sub {
1841	DC::write_cfg;	2019	DC::save_cfg;
1842	0	2020	0
1843	}	2021	}
1844	);	2022	);
1845	}	2023	}
1846		2024
…		…
1855	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");	2033	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");
1856	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");	2034	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");
1857	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");	2035	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");
1858	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");	2036	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");
1859	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");	2037	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");
1860	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Version (Prebuilt)");	2038	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Revision (Prebuilt)");
1861	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");	2039	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");
1862	}	2040	}
1863		2041
1864	$vbox	2042	$vbox
1865	}	2043	}
…		…
2279	sub open_quit_dialog {	2457	sub open_quit_dialog {
2280	unless ($QUIT_DIALOG) {	2458	unless ($QUIT_DIALOG) {
2281	$QUIT_DIALOG = new DC::UI::Toplevel	2459	$QUIT_DIALOG = new DC::UI::Toplevel
2282	x => "center",	2460	x => "center",
2283	y => "center",	2461	y => "center",
2284	z => 50,	2462	z => 60,
2285	title => "Really Quit?",	2463	title => "Really Quit?",
2286	on_key_down => sub {	2464	on_key_down => sub {
2287	my ($dialog, $ev) = @_;	2465	my ($dialog, $ev) = @_;
2288	$ev->{sym} == 27 and $dialog->hide;	2466	$ev->{sym} == 27 and $dialog->hide;
2289	}	2467	}
…		…
2505	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2683	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2506		2684
2507	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2685	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2508	$FULLSCREEN = $CFG->{fullscreen};	2686	$FULLSCREEN = $CFG->{fullscreen};
2509	$FAST = $CFG->{fast};	2687	$FAST = $CFG->{fast};
		2688
		2689	DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init
2510		2690
2511	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error	2691	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2512	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2692	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2513	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN	2693	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2514	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2694	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
…		…
2772	EV::unloop;	2952	EV::unloop;
2773	#d# TODO calling exit here hangs the process in some futex	2953	#d# TODO calling exit here hangs the process in some futex
2774	};	2954	};
2775		2955
2776	# due to mac os x + sdl combined braindamage, we need this contortion	2956	# due to mac os x + sdl combined braindamage, we need this contortion
2777	sub DC::Main::main {	2957	sub DC::Main::run {
2778	{	2958	DC::SDL_main_hack {
		2959	{
2779	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";	2960	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2780		2961
2781	if (-e "$Deliantra::VARDIR/client.cf") {	2962	DC::load_cfg;
2782	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2963	DC::upgrade_cfg;
2783	} else {
2784	#TODO: compatibility cruft
2785	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2786	print STDERR "INFO: used old configuration file\n";
2787	}
2788		2964
		2965	DC::Audio::probe;
		2966
2789	DC::DB::Server::run;	2967	DC::DB::Server::run;
2790		2968
2791	if ($CFG->{db_schema} < 1) {	2969	if ($CFG->{db_schema} < 1) {
2792	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";	2970	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2793	DC::DB::nuke_db;	2971	DC::DB::nuke_db;
2794	$CFG->{db_schema} = 1;	2972	$CFG->{db_schema} = 1;
2795	DC::write_cfg;	2973	DC::save_cfg;
2796	}
2797
2798	DC::DB::open_db;
2799
2800	DC::UI::set_layout ($::CFG->{layout});
2801
2802	my %DEF_CFG = (
2803	config_autosave => 1,
2804	sdl_mode => undef,
2805	fullscreen => 1,
2806	fast => 0,
2807	force_opengl11 => undef,
2808	disable_alpha => 0,
2809	smooth_movement => 1,
2810	smooth_transitions => 1,
2811	texture_compression => 1,
2812	map_scale => 1,
2813	fow_enable => 1,
2814	fow_intensity => 0,
2815	fow_texture => 0,
2816	map_smoothing => 1,
2817	gui_fontsize => 1,
2818	log_fontsize => 0.7,
2819	gauge_fontsize => 1,
2820	gauge_size => 0.35,
2821	stat_fontsize => 0.7,
2822	mapsize => 100,
2823	audio_enable => 1,
2824	audio_hw_channels => 0,
2825	audio_hw_frequency => 0,
2826	audio_hw_chunksize => 0,
2827	audio_mix_channels => 8,
2828	effects_enable => 1,
2829	effects_volume => 1,
2830	bgm_enable => 1,
2831	bgm_volume => 0.5,
2832	output_rate => "",
2833	pickup => PICKUP_SPELLBOOK \| PICKUP_SKILLSCROLL \| PICKUP_VALUABLES,
2834	inv_sort => "mtime",
2835	default => "profile", # default profile
2836	show_tips => 1,
2837	logview_max_par => 1000,
2838	shift_fire_stop => 0,
2839	uitheme => "wood",
2840	map_shift_x => -24, # arbitrary
2841	map_shift_y => +24, # arbitrary
2842	);
2843
2844	while (my ($k, $v) = each %DEF_CFG) {
2845	$CFG->{$k} = $v unless exists $CFG->{$k};
2846	}
2847
2848	my @args = @ARGV;
2849
2850	# OS X passes some process serial number of other shit. they
2851	# could have used an env var or any other sane mechanism. but
2852	# would it be os x then? no...
2853	shift @args if $args[0] =~ /^-psn_/;
2854
2855	my $profile = 'default';
2856
2857	for (my $i = 0; $i < @args; $i++) {
2858	if ($args[$i] =~ /^--?profile$/) {
2859	$profile = $args[$i + 1];
2860	splice @args, $i, 2, ();
2861	$i = 0;
2862	} elsif ($args[$i] =~ /^--?h/) {
2863	print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2864	exit 0;
2865	}	2974	}
2866	}
2867		2975
2868	$CFG->{profile}{$profile} \|\|= {};	2976	DC::DB::open_db;
2869	$PROFILE = $CFG->{profile}{$profile};
2870	$PROFILE->{host} \|\|= "gameserver.deliantra.net";
2871		2977
2872	$PROFILE->{host} = $args[0] if @args > 0;	2978	DC::UI::set_layout ($::CFG->{layout});
2873	$PROFILE->{user} = $args[1] if @args > 1;
2874	$PROFILE->{password} = $args[2] if @args > 2;
2875		2979
2876	# convert old bindings (only default profile matters)	2980	my @args = @ARGV;
2877	if (my $bindings = delete $PROFILE->{bindings}) {	2981
2878	while (my ($mod, $syms) = each %$bindings) {	2982	# OS X passes some process serial number of other shit. they
2879	while (my ($sym, $cmds) = each %$syms) {	2983	# could have used an env var or any other sane mechanism. but
2880	push @{ $PROFILE->{macro} }, {	2984	# would it be os x then? no...
2881	accelkey => [$mod1, $sym1],	2985	shift @args if $args[0] =~ /^-psn_/;
2882	action => $cmds,	2986
		2987	my $profile = 'default';
		2988
		2989	for (my $i = 0; $i < @args; $i++) {
		2990	if ($args[$i] =~ /^--?profile$/) {
		2991	$profile = $args[$i + 1];
		2992	splice @args, $i, 2, ();
2883	};	2993	$i = 0;
		2994	} elsif ($args[$i] =~ /^--?h/) {
		2995	print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
		2996	exit 0;
2884	}	2997	}
2885	}	2998	}
		2999
		3000	$CFG->{profile}{$profile} \|\|= {};
		3001	$PROFILE = $CFG->{profile}{$profile};
		3002	$PROFILE->{host} \|\|= "gameserver.deliantra.net";
		3003
		3004	$PROFILE->{host} = $args[0] if @args > 0;
		3005	$PROFILE->{user} = $args[1] if @args > 1;
		3006	$PROFILE->{password} = $args[2] if @args > 2;
		3007
		3008	# convert old bindings (only default profile matters)
		3009	if (my $bindings = delete $PROFILE->{bindings}) {
		3010	while (my ($mod, $syms) = each %$bindings) {
		3011	while (my ($sym, $cmds) = each %$syms) {
		3012	push @{ $PROFILE->{macro} }, {
		3013	accelkey => [$mod1, $sym1],
		3014	action => $cmds,
		3015	};
		3016	}
		3017	}
2886	}	3018	}
2887		3019
2888	# fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed	3020	# fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
2889	# these are ignored under windows, for some reason, and thus set in the loader	3021	# these are ignored under windows, for some reason, and thus set in the loader
2890	$ENV{FONTCONFIG_FILE} = "fonts.conf";	3022	$ENV{FONTCONFIG_FILE} = "fonts.conf";
2891	$ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";	3023	$ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
2892	$ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions	3024	$ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions
2893		3025
2894	{	3026	{
2895	my @fonts = map DC::find_rcfile "fonts/$_", qw(	3027	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2896	DejaVuSans.ttf	3028	DejaVuSans.ttf
2897	DejaVuSansMono.ttf	3029	DejaVuSansMono.ttf
2898	DejaVuSans-Bold.ttf	3030	DejaVuSans-Bold.ttf
2899	DejaVuSansMono-Bold.ttf	3031	DejaVuSansMono-Bold.ttf
2900	DejaVuSans-Oblique.ttf	3032	DejaVuSans-Oblique.ttf
2901	DejaVuSansMono-Oblique.ttf	3033	DejaVuSansMono-Oblique.ttf
2902	DejaVuSans-BoldOblique.ttf	3034	DejaVuSans-BoldOblique.ttf
2903	DejaVuSansMono-BoldOblique.ttf	3035	DejaVuSansMono-BoldOblique.ttf
2904	mona.ttf	3036	mona.ttf
2905	);	3037	);
2906		3038
2907	DC::add_font $_ for @fonts;	3039	DC::add_font $_ for @fonts;
2908		3040
2909	$FONT_PROP = new_from_file DC::Font $fonts[0];	3041	$FONT_PROP = new_from_file DC::Font $fonts[0];
2910	$FONT_FIXED = new_from_file DC::Font $fonts[1];	3042	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2911		3043
2912	$FONT_PROP->make_default;	3044	$FONT_PROP->make_default;
2913		3045
2914	DC::pango_init;	3046	DC::pango_init;
2915	}	3047	}
2916		3048
2917	# compare mono (ft) vs. rgba (cairo)	3049	# compare mono (ft) vs. rgba (cairo)
2918	# ft - 1.8s, cairo 3s, even in alpha-only mode	3050	# ft - 1.8s, cairo 3s, even in alpha-only mode
2919	# for my $rgba (0..1) {	3051	# for my $rgba (0..1) {
2920	# my $t1 = Time::HiRes::time;	3052	# my $t1 = Time::HiRes::time;
…		…
2925	# }	3057	# }
2926	# my $t2 = Time::HiRes::time;	3058	# my $t2 = Time::HiRes::time;
2927	# warn $t2-$t1;	3059	# warn $t2-$t1;
2928	# }	3060	# }
2929		3061
		3062	}
		3063
		3064	DC::SDL_Init 0;
2930	DC::IMG_Init; video_init;	3065	DC::IMG_Init; video_init;
2931	DC::Mix_Init; audio_init;	3066	DC::Mix_Init; audio_init;
2932	}
2933		3067
2934	show_tip_of_the_day if $CFG->{show_tips};	3068	show_tip_of_the_day if $CFG->{show_tips};
2935		3069
2936	my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub {	3070	my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub {
2937	undef $STARTUP_CANCEL;	3071	undef $STARTUP_CANCEL;
2938	(pop @::STARTUP_DONE)->()	3072	(pop @::STARTUP_DONE)->()
2939	while @::STARTUP_DONE;	3073	while @::STARTUP_DONE;
		3074	};
		3075
		3076	debug_toggle 0;
		3077
		3078	delete $SIG{__DIE__};
		3079	EV::loop;
		3080
		3081	DC::save_cfg if $CFG->{config_autosave};
		3082
		3083	#video_shutdown;
		3084	#audio_shutdown;
		3085
		3086	DC::OpenGL::quit;
		3087	DC::SDL_Quit;
		3088	DC::DB::Server::stop;
2940	};	3089	};
2941
2942	debug_toggle 0;
2943
2944	delete $SIG{__DIE__};
2945	EV::loop;
2946
2947	DC::write_cfg if $CFG->{config_autosave};
2948
2949	#video_shutdown;
2950	#audio_shutdown;
2951
2952	DC::OpenGL::quit;
2953	DC::SDL_Quit;
2954	DC::DB::Server::stop;
2955	}	3090	}
2956
2957	*DC::Main::run = \&DC::SDL_braino; # see sub above
2958		3091
2959	1	3092	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents): Revision 1.7 by root, Sat Dec 31 06:51:29 2011 UTC vs. Revision 1.18 by root, Wed Jan 18 15:31:51 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.7 by root, Sat Dec 31 06:51:29 2011 UTC vs.
Revision 1.18 by root, Wed Jan 18 15:31:51 2012 UTC