ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.56 by root, Sat Jul 19 20:33:47 2008 UTC vs.
Revision 1.61 by root, Fri Aug 22 18:20:17 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 existibg 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 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
1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1758 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1750 ["Ignore cursed" => PICKUP_NOT_CURSED], 1759 ["Ignore cursed" => PICKUP_NOT_CURSED],
1751 ["Jewelery" => PICKUP_JEWELS], 1760 ["Jewelery" => PICKUP_JEWELS],
1752 ["Flesh" => PICKUP_FLESH], 1761 ["Flesh" => PICKUP_FLESH],
1753 ], 1762 ],
1754 ["Weight/Value ratio", 2, 17] 1763 ["Value/Weight ratio", 2, 17]
1755 ) 1764 )
1756 { 1765 {
1757 my ($title, $x, $y, @bits) = @$_; 1766 my ($title, $x, $y, @bits) = @$_;
1758 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1767 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1759 1768
1784 } 1793 }
1785 1794
1786 $table->add_at (2, 18, new DC::UI::ValSlider 1795 $table->add_at (2, 18, new DC::UI::ValSlider
1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1796 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1788 template => ">= 99", 1797 template => ">= 99",
1798 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1789 to_value => sub { ">= " . 5 * $_[0] }, 1799 to_value => sub { ">= " . 5 * $_[0] },
1790 on_changed => sub { 1800 on_changed => sub {
1791 my ($slider, $value) = @_; 1801 my ($slider, $value) = @_;
1792 1802
1793 $::CFG->{pickup} &= ~0xF; 1803 $::CFG->{pickup} &= ~0xF;
1849 $::CFG->{inv_sort} = $_[1]; 1859 $::CFG->{inv_sort} = $_[1];
1850 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1860 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1851 }, 1861 },
1852 ); 1862 );
1853 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1863 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1854 #TODO# update to weigh/maxweight 1864 #TODO# update to weight/maxweight
1855 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1865 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1856 1866
1857 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1867 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1858 $sw1->add ($INV = new DC::UI::Inventory); 1868 $sw1->add ($INV = new DC::UI::Inventory);
1859 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1869 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2211 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @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)";
2203 2213
2204 @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;
2205 2215
2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0; 2217 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218
2219 # now choose biggets mode <= 1024x768
2208 for (reverse 0 .. $#SDL_MODES) { 2220 for (0 .. $#SDL_MODES) {
2209 $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 }
2210 } 2224 }
2211 } 2225 }
2212 2226
2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2227 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2214 2228
2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2229 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2216 $FULLSCREEN = $CFG->{fullscreen}; 2230 $FULLSCREEN = $CFG->{fullscreen};
2217 $FAST = $CFG->{fast}; 2231 $FAST = $CFG->{fast};
2218 2232
2233 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2219 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
2220 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2236 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2221 2237
2222 $SDL_ACTIVE = 1; 2238 $SDL_ACTIVE = 1;
2223 $LAST_REFRESH = time - 0.01; 2239 $LAST_REFRESH = time - 0.01;
2224 2240
2514$SIG{INT} = $SIG{TERM} = sub { 2530$SIG{INT} = $SIG{TERM} = sub {
2515 EV::unloop; 2531 EV::unloop;
2516 #d# TODO calling exit here hangs the process in some futex 2532 #d# TODO calling exit here hangs the process in some futex
2517}; 2533};
2518 2534
2519{ 2535# due to mac os x + sdl combined briandamage, we need this contortion
2536sub main {
2537 {
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521 2539
2522 if (-e "$Deliantra::VARDIR/client.cf") { 2540 if (-e "$Deliantra::VARDIR/client.cf") {
2523 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2541 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2524 } else { 2542 } else {
2525 #TODO: compatibility cruft 2543 #TODO: compatibility cruft
2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2544 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2527 print STDERR "INFO: used old configuration file\n"; 2545 print STDERR "INFO: used old configuration file\n";
2528 } 2546 }
2529 2547
2530 DC::DB::Server::run; 2548 DC::DB::Server::run;
2531 2549
2532 if ($CFG->{db_schema} < 1) { 2550 if ($CFG->{db_schema} < 1) {
2533 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";
2534 DC::DB::nuke_db; 2552 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1; 2553 $CFG->{db_schema} = 1;
2536 DC::write_cfg; 2554 DC::write_cfg;
2537 } 2555 }
2538 2556
2539 DC::DB::open_db; 2557 DC::DB::open_db;
2540 2558
2541 DC::UI::set_layout ($::CFG->{layout}); 2559 DC::UI::set_layout ($::CFG->{layout});
2542 2560
2543 my %DEF_CFG = ( 2561 my %DEF_CFG = (
2544 sdl_mode => 0, 2562 sdl_mode => undef,
2545 fullscreen => 1, 2563 fullscreen => 1,
2546 fast => 0, 2564 fast => 0,
2547 force_opengl11 => undef, 2565 force_opengl11 => undef,
2548 disable_alpha => 0, 2566 disable_alpha => 0,
2549 smooth_movement => 1, 2567 smooth_movement => 1,
2550 texture_compression => 1, 2568 texture_compression => 1,
2551 map_scale => 1, 2569 map_scale => 1,
2552 fow_enable => 1, 2570 fow_enable => 1,
2553 fow_intensity => 0, 2571 fow_intensity => 0,
2554 map_smoothing => 1, 2572 map_smoothing => 1,
2555 gui_fontsize => 1, 2573 gui_fontsize => 1,
2556 log_fontsize => 0.7, 2574 log_fontsize => 0.7,
2557 gauge_fontsize => 1, 2575 gauge_fontsize => 1,
2558 gauge_size => 0.35, 2576 gauge_size => 0.35,
2559 stat_fontsize => 0.7, 2577 stat_fontsize => 0.7,
2560 mapsize => 100, 2578 mapsize => 100,
2561 audio_enable => 1, 2579 audio_enable => 1,
2562 audio_hw_channels => 0, 2580 audio_hw_channels => 0,
2563 audio_hw_frequency => 0, 2581 audio_hw_frequency => 0,
2564 audio_hw_chunksize => 0, 2582 audio_hw_chunksize => 0,
2565 audio_mix_channels => 8, 2583 audio_mix_channels => 8,
2566 effects_enable => 1, 2584 effects_enable => 1,
2567 effects_volume => 1, 2585 effects_volume => 1,
2568 bgm_enable => 1, 2586 bgm_enable => 1,
2569 bgm_volume => 0.5, 2587 bgm_volume => 0.5,
2570 output_rate => "", 2588 output_rate => "",
2571 pickup => 0, 2589 pickup => 0,
2572 inv_sort => "mtime", 2590 inv_sort => "mtime",
2573 default => "profile", # default profile 2591 default => "profile", # default profile
2574 show_tips => 1, 2592 show_tips => 1,
2575 logview_max_par => 1000, 2593 logview_max_par => 1000,
2576 shift_fire_stop => 0, 2594 shift_fire_stop => 0,
2577 ); 2595 );
2578 2596
2579 while (my ($k, $v) = each %DEF_CFG) { 2597 while (my ($k, $v) = each %DEF_CFG) {
2580 $CFG->{$k} = $v unless exists $CFG->{$k}; 2598 $CFG->{$k} = $v unless exists $CFG->{$k};
2581 } 2599 }
2582 2600
2583 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2601 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2584 $PROFILE = $CFG->{profile}{default}; 2602 $PROFILE = $CFG->{profile}{default};
2585 2603
2586 # convert old bindings (only default profile matters) 2604 # convert old bindings (only default profile matters)
2587 if (my $bindings = delete $PROFILE->{bindings}) { 2605 if (my $bindings = delete $PROFILE->{bindings}) {
2588 while (my ($mod, $syms) = each %$bindings) { 2606 while (my ($mod, $syms) = each %$bindings) {
2589 while (my ($sym, $cmds) = each %$syms) { 2607 while (my ($sym, $cmds) = each %$syms) {
2590 push @{ $PROFILE->{macro} }, { 2608 push @{ $PROFILE->{macro} }, {
2591 accelkey => [$mod*1, $sym*1], 2609 accelkey => [$mod*1, $sym*1],
2592 action => $cmds, 2610 action => $cmds,
2611 };
2593 }; 2612 }
2594 } 2613 }
2595 } 2614 }
2596 }
2597 2615
2598 sdl_init; 2616 sdl_init;
2599 2617
2600 { 2618 {
2601 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2619 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2602 DejaVuSans.ttf 2620 DejaVuSans.ttf
2603 DejaVuSansMono.ttf 2621 DejaVuSansMono.ttf
2604 DejaVuSans-Bold.ttf 2622 DejaVuSans-Bold.ttf
2605 DejaVuSansMono-Bold.ttf 2623 DejaVuSansMono-Bold.ttf
2606 DejaVuSans-Oblique.ttf 2624 DejaVuSans-Oblique.ttf
2607 DejaVuSansMono-Oblique.ttf 2625 DejaVuSansMono-Oblique.ttf
2608 DejaVuSans-BoldOblique.ttf 2626 DejaVuSans-BoldOblique.ttf
2609 DejaVuSansMono-BoldOblique.ttf 2627 DejaVuSansMono-BoldOblique.ttf
2610 ); 2628 );
2611 2629
2612 DC::add_font $_ for @fonts; 2630 DC::add_font $_ for @fonts;
2613 2631
2614 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2632 $FONT_PROP = new_from_file DC::Font $fonts[0];
2615 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2633 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2616 2634
2617 $FONT_PROP->make_default; 2635 $FONT_PROP->make_default;
2618 2636
2619 DC::pango_init; 2637 DC::pango_init;
2620 } 2638 }
2621 2639
2622# compare mono (ft) vs. rgba (cairo) 2640# compare mono (ft) vs. rgba (cairo)
2623# ft - 1.8s, cairo 3s, even in alpha-only mode 2641# ft - 1.8s, cairo 3s, even in alpha-only mode
2624# for my $rgba (0..1) { 2642# for my $rgba (0..1) {
2625# my $t1 = Time::HiRes::time; 2643# my $t1 = Time::HiRes::time;
2630# } 2648# }
2631# my $t2 = Time::HiRes::time; 2649# my $t2 = Time::HiRes::time;
2632# warn $t2-$t1; 2650# warn $t2-$t1;
2633# } 2651# }
2634 2652
2635 video_init; 2653 video_init;
2636 audio_init; 2654 audio_init;
2637} 2655 }
2638 2656
2639show_tip_of_the_day if $CFG->{show_tips}; 2657 show_tip_of_the_day if $CFG->{show_tips};
2640 2658
2641our $STARTUP_CANCEL = EV::idle sub { 2659 our $STARTUP_CANCEL = EV::idle sub {
2642 undef $::STARTUP_CANCEL; 2660 undef $::STARTUP_CANCEL;
2643 $startup_done->(); 2661 $startup_done->();
2644}; 2662 };
2645 2663
2646delete $SIG{__DIE__}; 2664 delete $SIG{__DIE__};
2647EV::loop; 2665 EV::loop;
2648 2666
2649#video_shutdown; 2667#video_shutdown;
2650#audio_shutdown; 2668#audio_shutdown;
2651DC::OpenGL::quit; 2669 DC::OpenGL::quit;
2652DC::SDL_Quit; 2670 DC::SDL_Quit;
2653DC::DB::Server::stop; 2671 DC::DB::Server::stop;
2672}
2673
2674DC::SDL_braino; # see sub above
2654 2675
2655=head1 NAME 2676=head1 NAME
2656 2677
2657deliantra - A Deliantra MORPG game client 2678deliantra - A Deliantra MORPG game client
2658 2679
2675 4 show fps 2696 4 show fps
2676 8 suppress tooltips 2697 8 suppress tooltips
2677 2698
2678=head1 AUTHOR 2699=head1 AUTHOR
2679 2700
2680Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2701Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2681 2702
2682 2703
2683 2704

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines