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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.58 by root, Sun Aug 17 01:27:33 2008 UTC vs.
Revision 1.62 by root, Fri Aug 22 21:53:07 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	}
…		…
1589	1	1596	1
1590	},	1597	},
1591	);	1598	);
1592		1599
1593	$vbox->add (new DC::UI::FancyFrame	1600	$vbox->add (new DC::UI::FancyFrame
1594	label => "Registering",	1601	label => "How to Play",
1595	min_h => 200,	1602	min_h => 200,
1596	child => (new DC::UI::Label valign => 0, ellipsise => 0,	1603	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597	markup =>	1604	markup =>
		1605	"First select a suitable video resolution in the Graphics tab, above.\n\n"
		1606	. "Then register a new account (or use an existing one if you have one). "
1598	"To register a new account, choose a username that hasn't been taken yet and "	1607	. "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1608	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1600	),	1609	),
1601	);	1610	);
1602		1611
1603	$vbox	1612	$vbox
…		…
2202	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;	2211	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2203	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2212	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204		2213
2205	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;	2214	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206		2215
2207	if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {	2216	if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208	$CFG->{sdl_mode} = 0;	2217	$CFG->{sdl_mode} = 0; # lowest resolution by default
		2218
		2219	# now choose biggets mode <= 1024x768
2209	for (reverse 0 .. $#SDL_MODES) {	2220	for (0 .. $#SDL_MODES) {
2210	$CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;	2221	if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
		2222	$CFG->{sdl_mode} = $_;
		2223	}
2211	}	2224	}
2212	}	2225	}
2213		2226
2214	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2227	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215		2228
2216	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2229	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2217	$FULLSCREEN = $CFG->{fullscreen};	2230	$FULLSCREEN = $CFG->{fullscreen};
2218	$FAST = $CFG->{fast};	2231	$FAST = $CFG->{fast};
2219		2232
		2233	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2220	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2234	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
		2235	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2221	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2236	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2222		2237
2223	$SDL_ACTIVE = 1;	2238	$SDL_ACTIVE = 1;
2224	$LAST_REFRESH = time - 0.01;	2239	$LAST_REFRESH = time - 0.01;
2225		2240
…		…
2515	$SIG{INT} = $SIG{TERM} = sub {	2530	$SIG{INT} = $SIG{TERM} = sub {
2516	EV::unloop;	2531	EV::unloop;
2517	#d# TODO calling exit here hangs the process in some futex	2532	#d# TODO calling exit here hangs the process in some futex
2518	};	2533	};
2519		2534
2520	{	2535	# due to mac os x + sdl combined briandamage, we need this contortion
		2536	sub main {
		2537	{
2521	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";	2538	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522		2539
2523	if (-e "$Deliantra::VARDIR/client.cf") {	2540	if (-e "$Deliantra::VARDIR/client.cf") {
2524	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2541	DC::read_cfg "$Deliantra::VARDIR/client.cf";
2525	} else {	2542	} else {
2526	#TODO: compatibility cruft	2543	#TODO: compatibility cruft
2527	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";	2544	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2528	print STDERR "INFO: used old configuration file\n";	2545	print STDERR "INFO: used old configuration file\n";
2529	}	2546	}
2530		2547
2531	DC::DB::Server::run;	2548	DC::DB::Server::run;
2532		2549
2533	if ($CFG->{db_schema} < 1) {	2550	if ($CFG->{db_schema} < 1) {
2534	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";	2551	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535	DC::DB::nuke_db;	2552	DC::DB::nuke_db;
2536	$CFG->{db_schema} = 1;	2553	$CFG->{db_schema} = 1;
2537	DC::write_cfg;	2554	DC::write_cfg;
2538	}	2555	}
2539		2556
2540	DC::DB::open_db;	2557	DC::DB::open_db;
2541		2558
2542	DC::UI::set_layout ($::CFG->{layout});	2559	DC::UI::set_layout ($::CFG->{layout});
2543		2560
2544	my %DEF_CFG = (	2561	my %DEF_CFG = (
2545	sdl_mode => 0,	2562	sdl_mode => undef,
2546	fullscreen => 1,	2563	fullscreen => 1,
2547	fast => 0,	2564	fast => 0,
2548	force_opengl11 => undef,	2565	force_opengl11 => undef,
2549	disable_alpha => 0,	2566	disable_alpha => 0,
2550	smooth_movement => 1,	2567	smooth_movement => 1,
2551	texture_compression => 1,	2568	texture_compression => 1,
2552	map_scale => 1,	2569	map_scale => 1,
2553	fow_enable => 1,	2570	fow_enable => 1,
2554	fow_intensity => 0,	2571	fow_intensity => 0,
2555	map_smoothing => 1,	2572	map_smoothing => 1,
2556	gui_fontsize => 1,	2573	gui_fontsize => 1,
2557	log_fontsize => 0.7,	2574	log_fontsize => 0.7,
2558	gauge_fontsize => 1,	2575	gauge_fontsize => 1,
2559	gauge_size => 0.35,	2576	gauge_size => 0.35,
2560	stat_fontsize => 0.7,	2577	stat_fontsize => 0.7,
2561	mapsize => 100,	2578	mapsize => 100,
2562	audio_enable => 1,	2579	audio_enable => 1,
2563	audio_hw_channels => 0,	2580	audio_hw_channels => 0,
2564	audio_hw_frequency => 0,	2581	audio_hw_frequency => 0,
2565	audio_hw_chunksize => 0,	2582	audio_hw_chunksize => 0,
2566	audio_mix_channels => 8,	2583	audio_mix_channels => 8,
2567	effects_enable => 1,	2584	effects_enable => 1,
2568	effects_volume => 1,	2585	effects_volume => 1,
2569	bgm_enable => 1,	2586	bgm_enable => 1,
2570	bgm_volume => 0.5,	2587	bgm_volume => 0.5,
2571	output_rate => "",	2588	output_rate => "",
2572	pickup => 0,	2589	pickup => 0,
2573	inv_sort => "mtime",	2590	inv_sort => "mtime",
2574	default => "profile", # default profile	2591	default => "profile", # default profile
2575	show_tips => 1,	2592	show_tips => 1,
2576	logview_max_par => 1000,	2593	logview_max_par => 1000,
2577	shift_fire_stop => 0,	2594	shift_fire_stop => 0,
2578	);	2595	);
2579		2596
2580	while (my ($k, $v) = each %DEF_CFG) {	2597	while (my ($k, $v) = each %DEF_CFG) {
2581	$CFG->{$k} = $v unless exists $CFG->{$k};	2598	$CFG->{$k} = $v unless exists $CFG->{$k};
2582	}	2599	}
2583		2600
2584	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";	2601	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";
2585	$PROFILE = $CFG->{profile}{default};	2602	$PROFILE = $CFG->{profile}{default};
2586		2603
2587	# convert old bindings (only default profile matters)	2604	# convert old bindings (only default profile matters)
2588	if (my $bindings = delete $PROFILE->{bindings}) {	2605	if (my $bindings = delete $PROFILE->{bindings}) {
2589	while (my ($mod, $syms) = each %$bindings) {	2606	while (my ($mod, $syms) = each %$bindings) {
2590	while (my ($sym, $cmds) = each %$syms) {	2607	while (my ($sym, $cmds) = each %$syms) {
2591	push @{ $PROFILE->{macro} }, {	2608	push @{ $PROFILE->{macro} }, {
2592	accelkey => [$mod1, $sym1],	2609	accelkey => [$mod1, $sym1],
2593	action => $cmds,	2610	action => $cmds,
		2611	};
2594	};	2612	}
2595	}	2613	}
2596	}	2614	}
2597	}
2598		2615
2599	sdl_init;	2616	sdl_init;
2600		2617
2601	{	2618	{
2602	my @fonts = map DC::find_rcfile "fonts/$_", qw(	2619	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2603	DejaVuSans.ttf	2620	DejaVuSans.ttf
2604	DejaVuSansMono.ttf	2621	DejaVuSansMono.ttf
2605	DejaVuSans-Bold.ttf	2622	DejaVuSans-Bold.ttf
2606	DejaVuSansMono-Bold.ttf	2623	DejaVuSansMono-Bold.ttf
2607	DejaVuSans-Oblique.ttf	2624	DejaVuSans-Oblique.ttf
2608	DejaVuSansMono-Oblique.ttf	2625	DejaVuSansMono-Oblique.ttf
2609	DejaVuSans-BoldOblique.ttf	2626	DejaVuSans-BoldOblique.ttf
2610	DejaVuSansMono-BoldOblique.ttf	2627	DejaVuSansMono-BoldOblique.ttf
2611	);	2628	);
2612		2629
2613	DC::add_font $_ for @fonts;	2630	DC::add_font $_ for @fonts;
2614		2631
2615	$FONT_PROP = new_from_file DC::Font $fonts[0];	2632	$FONT_PROP = new_from_file DC::Font $fonts[0];
2616	$FONT_FIXED = new_from_file DC::Font $fonts[1];	2633	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2617		2634
2618	$FONT_PROP->make_default;	2635	$FONT_PROP->make_default;
2619		2636
2620	DC::pango_init;	2637	DC::pango_init;
2621	}	2638	}
2622		2639
2623	# compare mono (ft) vs. rgba (cairo)	2640	# compare mono (ft) vs. rgba (cairo)
2624	# ft - 1.8s, cairo 3s, even in alpha-only mode	2641	# ft - 1.8s, cairo 3s, even in alpha-only mode
2625	# for my $rgba (0..1) {	2642	# for my $rgba (0..1) {
2626	# my $t1 = Time::HiRes::time;	2643	# my $t1 = Time::HiRes::time;
…		…
2631	# }	2648	# }
2632	# my $t2 = Time::HiRes::time;	2649	# my $t2 = Time::HiRes::time;
2633	# warn $t2-$t1;	2650	# warn $t2-$t1;
2634	# }	2651	# }
2635		2652
2636	video_init;	2653	video_init;
2637	audio_init;	2654	audio_init;
2638	}	2655	}
2639		2656
2640	show_tip_of_the_day if $CFG->{show_tips};	2657	show_tip_of_the_day if $CFG->{show_tips};
2641		2658
2642	our $STARTUP_CANCEL = EV::idle sub {	2659	our $STARTUP_CANCEL = EV::idle sub {
2643	undef $::STARTUP_CANCEL;	2660	undef $::STARTUP_CANCEL;
2644	$startup_done->();	2661	$startup_done->();
2645	};	2662	};
2646		2663
2647	delete $SIG{__DIE__};	2664	delete $SIG{__DIE__};
2648	EV::loop;	2665	EV::loop;
2649		2666
2650	#video_shutdown;	2667	#video_shutdown;
2651	#audio_shutdown;	2668	#audio_shutdown;
2652	DC::OpenGL::quit;	2669	DC::OpenGL::quit;
2653	DC::SDL_Quit;	2670	DC::SDL_Quit;
2654	DC::DB::Server::stop;	2671	DC::DB::Server::stop;
		2672	}
		2673
		2674	DC::SDL_braino; # see sub above
2655		2675
2656	=head1 NAME	2676	=head1 NAME
2657		2677
2658	deliantra - A Deliantra MORPG game client	2678	deliantra - A Deliantra MORPG game client
2659		2679

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.58 by root, Sun Aug 17 01:27:33 2008 UTC vs. Revision 1.62 by root, Fri Aug 22 21:53:07 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.58 by root, Sun Aug 17 01:27:33 2008 UTC vs.
Revision 1.62 by root, Fri Aug 22 21:53:07 2008 UTC