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.49 by root, Mon Jul 7 12:56:07 2008 UTC vs.
Revision 1.60 by root, Tue Aug 19 21:48:28 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}
… …
98 105
99use Deliantra; 106use Deliantra;
100use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
101 108
102use AnyEvent::DNS; 109use AnyEvent::DNS;
110use AnyEvent::Socket ();
103 111
104use Compress::LZF; 112use Compress::LZF;
105 113
106use DC; 114use DC;
107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
108use DC::OpenGL (); 116use DC::OpenGL ();
109use DC::Protocol; 117use DC::Protocol;
110use DC::DB; 118use DC::DB;
111use DC::UI; 119use DC::UI;
112use DC::UI::Canvas; 120use DC::UI::Canvas;
… …
140our $PROFILE; # current profile 148our $PROFILE; # current profile
141our $FAST; # fast, low-quality mode, possibly useful for software-rendering 149our $FAST; # fast, low-quality mode, possibly useful for software-rendering
142 150
143our $WANT_REFRESH; 151our $WANT_REFRESH;
144 152
153our $MODE_SLIDER;
154our $CAVEAT_LABEL;
155
145our @SDL_MODES; 156our @SDL_MODES;
157our $SDL_REINIT = 1;
146our $WIDTH; 158our $WIDTH;
147our $HEIGHT; 159our $HEIGHT;
148our $FULLSCREEN; 160our $FULLSCREEN;
149our $FONTSIZE; 161our $FONTSIZE;
150 162
… …
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 748 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
737 749
738 $CONN = 750 $CONN =
739 new DC::Protocol 751 new DC::Protocol
740 host => $host, 752 host => $host,
741 port => $port || 13327, 753 port => $port,
742 user => $PROFILE->{user}, 754 user => $PROFILE->{user},
743 pass => $PROFILE->{password}, 755 pass => $PROFILE->{password},
744 mapw => $mapsize, 756 mapw => $mapsize,
745 maph => $mapsize, 757 maph => $mapsize,
746 758
… …
774 status "logging in..."; 786 status "logging in...";
775 787
776 $LOGIN_BUTTON->set_text ("Logout"); 788 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide; 789 $SETUP_DIALOG->hide;
778 790
779 my ($host, $port) = split /:/, $PROFILE->{host}; 791 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
780 792
781 $MAP = new DC::Map; 793 $MAP = new DC::Map;
782 794
783 # hack to make SURE we find the IP address all right 795 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable. 796 # can be removed once AnyEvent::DNS is proven stable.
… …
827 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
828 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 840 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
829 can_events => 1, 841 can_events => 1,
830 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
831 843
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card.");
851
832 my $vidmode_tooltip = 852 my $vidmode_tooltip =
833 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
834 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 854 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
835 855
836 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
837 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
838 858
839 $hbox->add (my $mode_slider = new DC::UI::Slider 859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
840 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 860 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ],
841 tooltip => $vidmode_tooltip); 862 tooltip => $vidmode_tooltip);
842 $hbox->add (my $mode_label = new DC::UI::Label 863 $hbox->add (my $mode_label = new DC::UI::Label
843 height => 0.8, template => "9999x9999@9+9", 864 height => 0.8, template => "9999x9999@9+9",
844 can_events => 1, tooltip => $vidmode_tooltip); 865 can_events => 1, tooltip => $vidmode_tooltip);
845 866
846 $mode_slider->connect (changed => sub { 867 $MODE_SLIDER->connect (changed => sub {
847 my ($self, $value) = @_; 868 my ($self, $value) = @_;
848 869
849 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
850 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 871 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
851 }); 872 });
852 $mode_slider->emit (changed => $mode_slider->{range}[0]); 873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
853 874
854 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
855 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
856 state => $CFG->{fullscreen}, 877 state => $CFG->{fullscreen},
857 tooltip => "Bring the client into fullscreen mode.", 878 tooltip => "Bring the client into fullscreen mode.",
… …
863 state => $CFG->{force_opengl11}, 884 state => $CFG->{force_opengl11},
864 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 885 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
865 . "higher memory usage and slower performance. It will, however, help tremendously on " 886 . "higher memory usage and slower performance. It will, however, help tremendously on "
866 . "cards that claim to support a feature but fall back to software rendering. " 887 . "cards that claim to support a feature but fall back to software rendering. "
867 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 888 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
868 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 889 . "but cards and drivers from other vendors (ATI) are often just as bad. "
869 . "experience extremely low framerates and your card should do better, try this option.</b>", 890 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
870 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 891 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
892 );
893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
895 $table->add_at (1, $row++, new DC::UI::CheckBox
896 state => $CFG->{disable_alpha},
897 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
898 . "by disabling a number of textures and transparency effects. Normally, these "
899 . "effects do not cost a lot of resources, but some graphics cards might fall "
900 . "back to etxremely slow rendering if this is enabled. If disabling this option "
901 . "noticably improves the framerate of the client please report this! "
902 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
903 on_changed => sub {
904 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
907 0
908 }
871 ); 909 );
872 910
873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
874 $table->add_at (1, $row++, new DC::UI::CheckBox 912 $table->add_at (1, $row++, new DC::UI::CheckBox
875 state => $CFG->{texture_compression}, 913 state => $CFG->{texture_compression},
… …
900 on_activate => sub { 938 on_activate => sub {
901 video_shutdown (); 939 video_shutdown ();
902 video_init (); 940 video_init ();
903 0 941 0
904 } 942 }
943 );
944
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
905 ); 952 );
906 953
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
908 $table->add_at (1, $row++, new DC::UI::Slider 955 $table->add_at (1, $row++, new DC::UI::Slider
909 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1709 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1756 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1710 ["Ignore cursed" => PICKUP_NOT_CURSED], 1757 ["Ignore cursed" => PICKUP_NOT_CURSED],
1711 ["Jewelery" => PICKUP_JEWELS], 1758 ["Jewelery" => PICKUP_JEWELS],
1712 ["Flesh" => PICKUP_FLESH], 1759 ["Flesh" => PICKUP_FLESH],
1713 ], 1760 ],
1714 ["Weight/Value ratio", 2, 17] 1761 ["Value/Weight ratio", 2, 17]
1715 ) 1762 )
1716 { 1763 {
1717 my ($title, $x, $y, @bits) = @$_; 1764 my ($title, $x, $y, @bits) = @$_;
1718 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1765 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1719 1766
… …
1744 } 1791 }
1745 1792
1746 $table->add_at (2, 18, new DC::UI::ValSlider 1793 $table->add_at (2, 18, new DC::UI::ValSlider
1747 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1794 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1748 template => ">= 99", 1795 template => ">= 99",
1796 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1749 to_value => sub { ">= " . 5 * $_[0] }, 1797 to_value => sub { ">= " . 5 * $_[0] },
1750 on_changed => sub { 1798 on_changed => sub {
1751 my ($slider, $value) = @_; 1799 my ($slider, $value) = @_;
1752 1800
1753 $::CFG->{pickup} &= ~0xF; 1801 $::CFG->{pickup} &= ~0xF;
… …
1809 $::CFG->{inv_sort} = $_[1]; 1857 $::CFG->{inv_sort} = $_[1];
1810 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1858 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1811 }, 1859 },
1812 ); 1860 );
1813 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1861 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1814 #TODO# update to weigh/maxweight 1862 #TODO# update to weight/maxweight
1815 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1863 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1816 1864
1817 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1865 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1818 $sw1->add ($INV = new DC::UI::Inventory); 1866 $sw1->add ($INV = new DC::UI::Inventory);
1819 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1867 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2146 $dialog->show; 2194 $dialog->show;
2147 }; 2195 };
2148} 2196}
2149 2197
2150sub sdl_init { 2198sub sdl_init {
2151 DC::SDL_Init 2199 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2152 and die "SDL::Init failed!\n"; 2200 and die "SDL::Init failed!\n";
2153} 2201}
2154 2202
2155sub video_init { 2203sub video_init {
2204 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2205 $SDL_REINIT = 0;
2206
2207 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2208 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2209 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2210 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2211
2212 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2213
2156 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2214 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2215 $CFG->{sdl_mode} = 0;
2216 for (reverse 0 .. $#SDL_MODES) {
2217 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2218 }
2219 }
2157 2220
2158 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2221 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2159 2222
2160 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2223 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2161 $FULLSCREEN = $CFG->{fullscreen}; 2224 $FULLSCREEN = $CFG->{fullscreen};
2162 $FAST = $CFG->{fast}; 2225 $FAST = $CFG->{fast};
2163 2226
2227 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2164 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2228 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2229 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2165 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2230 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2166 2231
2167 $SDL_ACTIVE = 1; 2232 $SDL_ACTIVE = 1;
2168 $LAST_REFRESH = time - 0.01; 2233 $LAST_REFRESH = time - 0.01;
2169 2234
… …
2345 $BUTTONBAR->show; 2410 $BUTTONBAR->show;
2346 $SETUP_DIALOG->show; 2411 $SETUP_DIALOG->show;
2347 $MESSAGE_WINDOW->show; 2412 $MESSAGE_WINDOW->show;
2348 } 2413 }
2349 2414
2415 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2416 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2417
2418 $CAVEAT_LABEL->set_text ("None :)");
2419 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2420 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2421
2350 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2422 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2351} 2423}
2352 2424
2353sub video_shutdown { 2425sub video_shutdown {
2354 DC::OpenGL::shutdown; 2426 DC::OpenGL::shutdown;
2427 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2355 2428
2356 undef $SDL_ACTIVE; 2429 undef $SDL_ACTIVE;
2357} 2430}
2358 2431
2359my %animate_object; 2432my %animate_object;
… …
2420# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2493# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2421 }, 2494 },
2422 DC::SDL_KEYDOWN => sub { 2495 DC::SDL_KEYDOWN => sub {
2423 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2496 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2424 # alt-enter 2497 # alt-enter
2498 video_shutdown;
2425 $FULLSCREEN_ENABLE->toggle; 2499 $FULLSCREEN_ENABLE->toggle;
2426 video_shutdown;
2427 video_init; 2500 video_init;
2428 } else { 2501 } else {
2429 &DC::UI::feed_sdl_key_down_event; 2502 &DC::UI::feed_sdl_key_down_event;
2430 } 2503 }
2431 update_modbox; 2504 update_modbox;
… …
2451$SIG{INT} = $SIG{TERM} = sub { 2524$SIG{INT} = $SIG{TERM} = sub {
2452 EV::unloop; 2525 EV::unloop;
2453 #d# TODO calling exit here hangs the process in some futex 2526 #d# TODO calling exit here hangs the process in some futex
2454}; 2527};
2455 2528
2456{ 2529# due to mac os x + sdl combined briandamage, we need this contortion
2530sub main {
2531 {
2457 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2532 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458 2533
2459 if (-e "$Deliantra::VARDIR/client.cf") { 2534 if (-e "$Deliantra::VARDIR/client.cf") {
2460 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2535 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2461 } else { 2536 } else {
2462 #TODO: compatibility cruft 2537 #TODO: compatibility cruft
2463 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2538 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2464 print STDERR "INFO: used old configuration file\n"; 2539 print STDERR "INFO: used old configuration file\n";
2465 } 2540 }
2466 2541
2467 DC::DB::Server::run; 2542 DC::DB::Server::run;
2468 2543
2469 if ($CFG->{db_schema} < 1) { 2544 if ($CFG->{db_schema} < 1) {
2470 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2545 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471 DC::DB::nuke_db; 2546 DC::DB::nuke_db;
2472 $CFG->{db_schema} = 1; 2547 $CFG->{db_schema} = 1;
2473 DC::write_cfg; 2548 DC::write_cfg;
2474 } 2549 }
2475 2550
2476 DC::DB::open_db; 2551 DC::DB::open_db;
2477 2552
2478 DC::UI::set_layout ($::CFG->{layout}); 2553 DC::UI::set_layout ($::CFG->{layout});
2479 2554
2480 my %DEF_CFG = ( 2555 my %DEF_CFG = (
2481 sdl_mode => 0, 2556 sdl_mode => 0,
2482 fullscreen => 1, 2557 fullscreen => 1,
2483 fast => 0, 2558 fast => 0,
2484 force_opengl11 => undef, 2559 force_opengl11 => undef,
2560 disable_alpha => 0,
2561 smooth_movement => 1,
2485 texture_compression => 1, 2562 texture_compression => 1,
2486 map_scale => 1, 2563 map_scale => 1,
2487 fow_enable => 1, 2564 fow_enable => 1,
2488 fow_intensity => 0, 2565 fow_intensity => 0,
2489 map_smoothing => 1, 2566 map_smoothing => 1,
2490 gui_fontsize => 1, 2567 gui_fontsize => 1,
2491 log_fontsize => 0.7, 2568 log_fontsize => 0.7,
2492 gauge_fontsize => 1, 2569 gauge_fontsize => 1,
2493 gauge_size => 0.35, 2570 gauge_size => 0.35,
2494 stat_fontsize => 0.7, 2571 stat_fontsize => 0.7,
2495 mapsize => 100, 2572 mapsize => 100,
2496 audio_enable => 1, 2573 audio_enable => 1,
2497 audio_hw_channels => 0, 2574 audio_hw_channels => 0,
2498 audio_hw_frequency => 0, 2575 audio_hw_frequency => 0,
2499 audio_hw_chunksize => 0, 2576 audio_hw_chunksize => 0,
2500 audio_mix_channels => 8, 2577 audio_mix_channels => 8,
2501 effects_enable => 1, 2578 effects_enable => 1,
2502 effects_volume => 1, 2579 effects_volume => 1,
2503 bgm_enable => 1, 2580 bgm_enable => 1,
2504 bgm_volume => 0.5, 2581 bgm_volume => 0.5,
2505 output_rate => "", 2582 output_rate => "",
2506 pickup => 0, 2583 pickup => 0,
2507 inv_sort => "mtime", 2584 inv_sort => "mtime",
2508 default => "profile", # default profile 2585 default => "profile", # default profile
2509 show_tips => 1, 2586 show_tips => 1,
2510 logview_max_par => 1000, 2587 logview_max_par => 1000,
2511 shift_fire_stop => 0, 2588 shift_fire_stop => 0,
2512 ); 2589 );
2513 2590
2514 while (my ($k, $v) = each %DEF_CFG) { 2591 while (my ($k, $v) = each %DEF_CFG) {
2515 $CFG->{$k} = $v unless exists $CFG->{$k}; 2592 $CFG->{$k} = $v unless exists $CFG->{$k};
2516 } 2593 }
2517 2594
2518 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2595 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2519 $PROFILE = $CFG->{profile}{default}; 2596 $PROFILE = $CFG->{profile}{default};
2520 2597
2521 # convert old bindings (only default profile matters) 2598 # convert old bindings (only default profile matters)
2522 if (my $bindings = delete $PROFILE->{bindings}) { 2599 if (my $bindings = delete $PROFILE->{bindings}) {
2523 while (my ($mod, $syms) = each %$bindings) { 2600 while (my ($mod, $syms) = each %$bindings) {
2524 while (my ($sym, $cmds) = each %$syms) { 2601 while (my ($sym, $cmds) = each %$syms) {
2525 push @{ $PROFILE->{macro} }, { 2602 push @{ $PROFILE->{macro} }, {
2526 accelkey => [$mod*1, $sym*1], 2603 accelkey => [$mod*1, $sym*1],
2527 action => $cmds, 2604 action => $cmds,
2605 };
2528 }; 2606 }
2529 } 2607 }
2530 } 2608 }
2531 }
2532 2609
2533 sdl_init; 2610 sdl_init;
2534 2611
2535 @SDL_MODES = DC::SDL_ListModes 8, 8; 2612 {
2536 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2537 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2538
2539 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2540
2541 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2542
2543 {
2544 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2613 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2545 DejaVuSans.ttf 2614 DejaVuSans.ttf
2546 DejaVuSansMono.ttf 2615 DejaVuSansMono.ttf
2547 DejaVuSans-Bold.ttf 2616 DejaVuSans-Bold.ttf
2548 DejaVuSansMono-Bold.ttf 2617 DejaVuSansMono-Bold.ttf
2549 DejaVuSans-Oblique.ttf 2618 DejaVuSans-Oblique.ttf
2550 DejaVuSansMono-Oblique.ttf 2619 DejaVuSansMono-Oblique.ttf
2551 DejaVuSans-BoldOblique.ttf 2620 DejaVuSans-BoldOblique.ttf
2552 DejaVuSansMono-BoldOblique.ttf 2621 DejaVuSansMono-BoldOblique.ttf
2553 ); 2622 );
2554 2623
2555 DC::add_font $_ for @fonts; 2624 DC::add_font $_ for @fonts;
2556 2625
2557 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2626 $FONT_PROP = new_from_file DC::Font $fonts[0];
2558 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2627 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2559 2628
2560 $FONT_PROP->make_default; 2629 $FONT_PROP->make_default;
2561 2630
2562 DC::pango_init; 2631 DC::pango_init;
2563 } 2632 }
2564 2633
2565# compare mono (ft) vs. rgba (cairo) 2634# compare mono (ft) vs. rgba (cairo)
2566# ft - 1.8s, cairo 3s, even in alpha-only mode 2635# ft - 1.8s, cairo 3s, even in alpha-only mode
2567# for my $rgba (0..1) { 2636# for my $rgba (0..1) {
2568# my $t1 = Time::HiRes::time; 2637# my $t1 = Time::HiRes::time;
… …
2573# } 2642# }
2574# my $t2 = Time::HiRes::time; 2643# my $t2 = Time::HiRes::time;
2575# warn $t2-$t1; 2644# warn $t2-$t1;
2576# } 2645# }
2577 2646
2578 video_init; 2647 video_init;
2579 audio_init; 2648 audio_init;
2580} 2649 }
2581 2650
2582show_tip_of_the_day if $CFG->{show_tips}; 2651 show_tip_of_the_day if $CFG->{show_tips};
2583 2652
2584our $STARTUP_CANCEL = EV::idle sub { 2653 our $STARTUP_CANCEL = EV::idle sub {
2585 undef $::STARTUP_CANCEL; 2654 undef $::STARTUP_CANCEL;
2586 $startup_done->(); 2655 $startup_done->();
2587}; 2656 };
2588 2657
2589delete $SIG{__DIE__}; 2658 delete $SIG{__DIE__};
2590EV::loop; 2659 EV::loop;
2591 2660
2592#video_shutdown; 2661#video_shutdown;
2593#audio_shutdown; 2662#audio_shutdown;
2594DC::OpenGL::quit; 2663 DC::OpenGL::quit;
2595DC::SDL_Quit; 2664 DC::SDL_Quit;
2596DC::DB::Server::stop; 2665 DC::DB::Server::stop;
2666}
2667
2668DC::SDL_braino; # see sub above
2597 2669
2598=head1 NAME 2670=head1 NAME
2599 2671
2600deliantra - A Deliantra MORPG game client 2672deliantra - A Deliantra MORPG game client
2601 2673
… …
2618 4 show fps 2690 4 show fps
2619 8 suppress tooltips 2691 8 suppress tooltips
2620 2692
2621=head1 AUTHOR 2693=head1 AUTHOR
2622 2694
2623Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2695Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2624 2696
2625 2697
2626 2698

Diff Legend

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