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.58 by root, Sun Aug 17 01:27:33 2008 UTC vs.
Revision 1.65 by root, Sat Aug 30 06:49:05 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}
… …
113use DC::UI::Canvas; 120use DC::UI::Canvas;
114use DC::UI::Inventory; 121use DC::UI::Inventory;
115use DC::UI::SpellList; 122use DC::UI::SpellList;
116use DC::UI::Dockable; 123use DC::UI::Dockable;
117use DC::UI::Dockbar; 124use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 125use DC::UI::ChatView;
120use DC::MessageDistributor; 126use DC::MessageDistributor;
121use DC::Pod; 127use DC::Pod;
122use DC::MapWidget; 128use DC::MapWidget;
123use DC::Macro; 129use DC::Macro;
… …
829 835
830 my $row = 0; 836 my $row = 0;
831 837
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 839 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 840 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 842
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 843 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 844 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 845 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 846 tooltip => "This field shows any known issues with your config or driver, such as "
… …
903 909
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 910 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 911 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 912 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 913 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 914 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 915 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 916 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 918 );
913 919
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 921 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
1589 1 1595 1
1590 }, 1596 },
1591 ); 1597 );
1592 1598
1593 $vbox->add (new DC::UI::FancyFrame 1599 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1600 label => "How to Play",
1595 min_h => 200, 1601 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1602 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1603 markup =>
1604 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1605 . "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 " 1606 . "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.", 1607 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1608 ),
1601 ); 1609 );
1602 1610
1603 $vbox 1611 $vbox
… …
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2210 @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)"; 2211 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2212
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2213 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206 2214
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2216 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217
2218 # now choose biggets mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2219 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_;
2222 }
2211 } 2223 }
2212 } 2224 }
2213 2225
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2226 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2227
2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2228 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2217 $FULLSCREEN = $CFG->{fullscreen}; 2229 $FULLSCREEN = $CFG->{fullscreen};
2218 $FAST = $CFG->{fast}; 2230 $FAST = $CFG->{fast};
2219 2231
2232 # 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 2233 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2234 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2221 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2235 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2222 2236
2223 $SDL_ACTIVE = 1; 2237 $SDL_ACTIVE = 1;
2224 $LAST_REFRESH = time - 0.01; 2238 $LAST_REFRESH = time - 0.01;
2225 2239
… …
2515$SIG{INT} = $SIG{TERM} = sub { 2529$SIG{INT} = $SIG{TERM} = sub {
2516 EV::unloop; 2530 EV::unloop;
2517 #d# TODO calling exit here hangs the process in some futex 2531 #d# TODO calling exit here hangs the process in some futex
2518}; 2532};
2519 2533
2520{ 2534# due to mac os x + sdl combined briandamage, we need this contortion
2535sub main {
2536 {
2521 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2537 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522 2538
2523 if (-e "$Deliantra::VARDIR/client.cf") { 2539 if (-e "$Deliantra::VARDIR/client.cf") {
2524 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2540 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2525 } else { 2541 } else {
2526 #TODO: compatibility cruft 2542 #TODO: compatibility cruft
2527 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2543 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2528 print STDERR "INFO: used old configuration file\n"; 2544 print STDERR "INFO: used old configuration file\n";
2529 } 2545 }
2530 2546
2531 DC::DB::Server::run; 2547 DC::DB::Server::run;
2532 2548
2533 if ($CFG->{db_schema} < 1) { 2549 if ($CFG->{db_schema} < 1) {
2534 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2550 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535 DC::DB::nuke_db; 2551 DC::DB::nuke_db;
2536 $CFG->{db_schema} = 1; 2552 $CFG->{db_schema} = 1;
2537 DC::write_cfg; 2553 DC::write_cfg;
2538 } 2554 }
2539 2555
2540 DC::DB::open_db; 2556 DC::DB::open_db;
2541 2557
2542 DC::UI::set_layout ($::CFG->{layout}); 2558 DC::UI::set_layout ($::CFG->{layout});
2543 2559
2544 my %DEF_CFG = ( 2560 my %DEF_CFG = (
2545 sdl_mode => 0, 2561 sdl_mode => undef,
2546 fullscreen => 1, 2562 fullscreen => 1,
2547 fast => 0, 2563 fast => 0,
2548 force_opengl11 => undef, 2564 force_opengl11 => undef,
2549 disable_alpha => 0, 2565 disable_alpha => 0,
2550 smooth_movement => 1, 2566 smooth_movement => 1,
2551 texture_compression => 1, 2567 texture_compression => 1,
2552 map_scale => 1, 2568 map_scale => 1,
2553 fow_enable => 1, 2569 fow_enable => 1,
2554 fow_intensity => 0, 2570 fow_intensity => 0,
2555 map_smoothing => 1, 2571 map_smoothing => 1,
2556 gui_fontsize => 1, 2572 gui_fontsize => 1,
2557 log_fontsize => 0.7, 2573 log_fontsize => 0.7,
2558 gauge_fontsize => 1, 2574 gauge_fontsize => 1,
2559 gauge_size => 0.35, 2575 gauge_size => 0.35,
2560 stat_fontsize => 0.7, 2576 stat_fontsize => 0.7,
2561 mapsize => 100, 2577 mapsize => 100,
2562 audio_enable => 1, 2578 audio_enable => 1,
2563 audio_hw_channels => 0, 2579 audio_hw_channels => 0,
2564 audio_hw_frequency => 0, 2580 audio_hw_frequency => 0,
2565 audio_hw_chunksize => 0, 2581 audio_hw_chunksize => 0,
2566 audio_mix_channels => 8, 2582 audio_mix_channels => 8,
2567 effects_enable => 1, 2583 effects_enable => 1,
2568 effects_volume => 1, 2584 effects_volume => 1,
2569 bgm_enable => 1, 2585 bgm_enable => 1,
2570 bgm_volume => 0.5, 2586 bgm_volume => 0.5,
2571 output_rate => "", 2587 output_rate => "",
2572 pickup => 0, 2588 pickup => 0,
2573 inv_sort => "mtime", 2589 inv_sort => "mtime",
2574 default => "profile", # default profile 2590 default => "profile", # default profile
2575 show_tips => 1, 2591 show_tips => 1,
2576 logview_max_par => 1000, 2592 logview_max_par => 1000,
2577 shift_fire_stop => 0, 2593 shift_fire_stop => 0,
2578 ); 2594 );
2579 2595
2580 while (my ($k, $v) = each %DEF_CFG) { 2596 while (my ($k, $v) = each %DEF_CFG) {
2581 $CFG->{$k} = $v unless exists $CFG->{$k}; 2597 $CFG->{$k} = $v unless exists $CFG->{$k};
2582 } 2598 }
2583 2599
2584 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2600 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2585 $PROFILE = $CFG->{profile}{default}; 2601 $PROFILE = $CFG->{profile}{default};
2586 2602
2587 # convert old bindings (only default profile matters) 2603 # convert old bindings (only default profile matters)
2588 if (my $bindings = delete $PROFILE->{bindings}) { 2604 if (my $bindings = delete $PROFILE->{bindings}) {
2589 while (my ($mod, $syms) = each %$bindings) { 2605 while (my ($mod, $syms) = each %$bindings) {
2590 while (my ($sym, $cmds) = each %$syms) { 2606 while (my ($sym, $cmds) = each %$syms) {
2591 push @{ $PROFILE->{macro} }, { 2607 push @{ $PROFILE->{macro} }, {
2592 accelkey => [$mod*1, $sym*1], 2608 accelkey => [$mod*1, $sym*1],
2593 action => $cmds, 2609 action => $cmds,
2610 };
2594 }; 2611 }
2595 } 2612 }
2596 } 2613 }
2597 }
2598 2614
2599 sdl_init; 2615 sdl_init;
2600 2616
2601 { 2617 {
2602 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2618 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2603 DejaVuSans.ttf 2619 DejaVuSans.ttf
2604 DejaVuSansMono.ttf 2620 DejaVuSansMono.ttf
2605 DejaVuSans-Bold.ttf 2621 DejaVuSans-Bold.ttf
2606 DejaVuSansMono-Bold.ttf 2622 DejaVuSansMono-Bold.ttf
2607 DejaVuSans-Oblique.ttf 2623 DejaVuSans-Oblique.ttf
2608 DejaVuSansMono-Oblique.ttf 2624 DejaVuSansMono-Oblique.ttf
2609 DejaVuSans-BoldOblique.ttf 2625 DejaVuSans-BoldOblique.ttf
2610 DejaVuSansMono-BoldOblique.ttf 2626 DejaVuSansMono-BoldOblique.ttf
2611 ); 2627 );
2612 2628
2613 DC::add_font $_ for @fonts; 2629 DC::add_font $_ for @fonts;
2614 2630
2615 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2631 $FONT_PROP = new_from_file DC::Font $fonts[0];
2616 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2632 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2617 2633
2618 $FONT_PROP->make_default; 2634 $FONT_PROP->make_default;
2619 2635
2620 DC::pango_init; 2636 DC::pango_init;
2621 } 2637 }
2622 2638
2623# compare mono (ft) vs. rgba (cairo) 2639# compare mono (ft) vs. rgba (cairo)
2624# ft - 1.8s, cairo 3s, even in alpha-only mode 2640# ft - 1.8s, cairo 3s, even in alpha-only mode
2625# for my $rgba (0..1) { 2641# for my $rgba (0..1) {
2626# my $t1 = Time::HiRes::time; 2642# my $t1 = Time::HiRes::time;
… …
2631# } 2647# }
2632# my $t2 = Time::HiRes::time; 2648# my $t2 = Time::HiRes::time;
2633# warn $t2-$t1; 2649# warn $t2-$t1;
2634# } 2650# }
2635 2651
2636 video_init; 2652 video_init;
2637 audio_init; 2653 audio_init;
2638} 2654 }
2639 2655
2640show_tip_of_the_day if $CFG->{show_tips}; 2656 show_tip_of_the_day if $CFG->{show_tips};
2641 2657
2642our $STARTUP_CANCEL = EV::idle sub { 2658 our $STARTUP_CANCEL = EV::idle sub {
2643 undef $::STARTUP_CANCEL; 2659 undef $::STARTUP_CANCEL;
2644 $startup_done->(); 2660 $startup_done->();
2645}; 2661 };
2646 2662
2647delete $SIG{__DIE__}; 2663 delete $SIG{__DIE__};
2648EV::loop; 2664 EV::loop;
2649 2665
2650#video_shutdown; 2666#video_shutdown;
2651#audio_shutdown; 2667#audio_shutdown;
2652DC::OpenGL::quit; 2668 DC::OpenGL::quit;
2653DC::SDL_Quit; 2669 DC::SDL_Quit;
2654DC::DB::Server::stop; 2670 DC::DB::Server::stop;
2671}
2672
2673DC::SDL_braino; # see sub above
2655 2674
2656=head1 NAME 2675=head1 NAME
2657 2676
2658deliantra - A Deliantra MORPG game client 2677deliantra - A Deliantra MORPG game client
2659 2678

Diff Legend

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