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.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.63 by root, Tue Aug 26 00:12:37 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}
… …
103use AnyEvent::Socket (); 110use AnyEvent::Socket ();
104 111
105use Compress::LZF; 112use Compress::LZF;
106 113
107use DC; 114use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
109use DC::OpenGL (); 116use DC::OpenGL ();
110use DC::Protocol; 117use DC::Protocol;
111use DC::DB; 118use DC::DB;
112use DC::UI; 119use DC::UI;
113use DC::UI::Canvas; 120use DC::UI::Canvas;
… …
141our $PROFILE; # current profile 148our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 149our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 150
144our $WANT_REFRESH; 151our $WANT_REFRESH;
145 152
153our $MODE_SLIDER;
154our $CAVEAT_LABEL;
155
146our @SDL_MODES; 156our @SDL_MODES;
157our $SDL_REINIT = 1;
147our $WIDTH; 158our $WIDTH;
148our $HEIGHT; 159our $HEIGHT;
149our $FULLSCREEN; 160our $FULLSCREEN;
150our $FONTSIZE; 161our $FONTSIZE;
151 162
… …
828 $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");
829 $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,
830 can_events => 1, 841 can_events => 1,
831 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
832 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
833 my $vidmode_tooltip = 852 my $vidmode_tooltip =
834 "<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). "
835 . "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>.";
836 855
837 $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");
838 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
839 858
840 $hbox->add (my $mode_slider = new DC::UI::Slider 859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
841 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 ],
842 tooltip => $vidmode_tooltip); 862 tooltip => $vidmode_tooltip);
843 $hbox->add (my $mode_label = new DC::UI::Label 863 $hbox->add (my $mode_label = new DC::UI::Label
844 height => 0.8, template => "9999x9999@9+9", 864 height => 0.8, template => "9999x9999@9+9",
845 can_events => 1, tooltip => $vidmode_tooltip); 865 can_events => 1, tooltip => $vidmode_tooltip);
846 866
847 $mode_slider->connect (changed => sub { 867 $MODE_SLIDER->connect (changed => sub {
848 my ($self, $value) = @_; 868 my ($self, $value) = @_;
849 869
850 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
851 $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]});
852 }); 872 });
853 $mode_slider->emit (changed => $mode_slider->{range}[0]); 873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
854 874
855 $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");
856 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
857 state => $CFG->{fullscreen}, 877 state => $CFG->{fullscreen},
858 tooltip => "Bring the client into fullscreen mode.", 878 tooltip => "Bring the client into fullscreen mode.",
… …
864 state => $CFG->{force_opengl11}, 884 state => $CFG->{force_opengl11},
865 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 "
866 . "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 "
867 . "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. "
868 . "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, "
869 . "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. "
870 . "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>",
871 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 }
872 ); 909 );
873 910
874 $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");
875 $table->add_at (1, $row++, new DC::UI::CheckBox 912 $table->add_at (1, $row++, new DC::UI::CheckBox
876 state => $CFG->{texture_compression}, 913 state => $CFG->{texture_compression},
… …
901 on_activate => sub { 938 on_activate => sub {
902 video_shutdown (); 939 video_shutdown ();
903 video_init (); 940 video_init ();
904 0 941 0
905 } 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 }
906 ); 952 );
907 953
908 $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");
909 $table->add_at (1, $row++, new DC::UI::Slider 955 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1550 1 1596 1
1551 }, 1597 },
1552 ); 1598 );
1553 1599
1554 $vbox->add (new DC::UI::FancyFrame 1600 $vbox->add (new DC::UI::FancyFrame
1555 label => "Registering", 1601 label => "How to Play",
1556 min_h => 200, 1602 min_h => 200,
1557 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1603 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1558 markup => 1604 markup =>
1605 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1606 . "Then register a new account (or use an existing one if you have one). "
1559 "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 "
1560 . "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.",
1561 ), 1609 ),
1562 ); 1610 );
1563 1611
1564 $vbox 1612 $vbox
… …
1710 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1758 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1711 ["Ignore cursed" => PICKUP_NOT_CURSED], 1759 ["Ignore cursed" => PICKUP_NOT_CURSED],
1712 ["Jewelery" => PICKUP_JEWELS], 1760 ["Jewelery" => PICKUP_JEWELS],
1713 ["Flesh" => PICKUP_FLESH], 1761 ["Flesh" => PICKUP_FLESH],
1714 ], 1762 ],
1715 ["Weight/Value ratio", 2, 17] 1763 ["Value/Weight ratio", 2, 17]
1716 ) 1764 )
1717 { 1765 {
1718 my ($title, $x, $y, @bits) = @$_; 1766 my ($title, $x, $y, @bits) = @$_;
1719 $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]);
1720 1768
… …
1745 } 1793 }
1746 1794
1747 $table->add_at (2, 18, new DC::UI::ValSlider 1795 $table->add_at (2, 18, new DC::UI::ValSlider
1748 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1796 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1749 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).",
1750 to_value => sub { ">= " . 5 * $_[0] }, 1799 to_value => sub { ">= " . 5 * $_[0] },
1751 on_changed => sub { 1800 on_changed => sub {
1752 my ($slider, $value) = @_; 1801 my ($slider, $value) = @_;
1753 1802
1754 $::CFG->{pickup} &= ~0xF; 1803 $::CFG->{pickup} &= ~0xF;
… …
1810 $::CFG->{inv_sort} = $_[1]; 1859 $::CFG->{inv_sort} = $_[1];
1811 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1860 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1812 }, 1861 },
1813 ); 1862 );
1814 $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);
1815 #TODO# update to weigh/maxweight 1864 #TODO# update to weight/maxweight
1816 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1865 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1817 1866
1818 $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);
1819 $sw1->add ($INV = new DC::UI::Inventory); 1868 $sw1->add ($INV = new DC::UI::Inventory);
1820 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1869 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2147 $dialog->show; 2196 $dialog->show;
2148 }; 2197 };
2149} 2198}
2150 2199
2151sub sdl_init { 2200sub sdl_init {
2152 DC::SDL_Init 2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2153 and die "SDL::Init failed!\n"; 2202 and die "SDL::Init failed!\n";
2154} 2203}
2155 2204
2156sub video_init { 2205sub video_init {
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0;
2208
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2211 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2212 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2213
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215
2157 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218
2219 # now choose biggets mode <= 1024x768
2220 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_;
2223 }
2224 }
2225 }
2158 2226
2159 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2227 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2160 2228
2161 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2229 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2162 $FULLSCREEN = $CFG->{fullscreen}; 2230 $FULLSCREEN = $CFG->{fullscreen};
2163 $FAST = $CFG->{fast}; 2231 $FAST = $CFG->{fast};
2164 2232
2233 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2165 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
2166 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2236 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2167 2237
2168 $SDL_ACTIVE = 1; 2238 $SDL_ACTIVE = 1;
2169 $LAST_REFRESH = time - 0.01; 2239 $LAST_REFRESH = time - 0.01;
2170 2240
… …
2346 $BUTTONBAR->show; 2416 $BUTTONBAR->show;
2347 $SETUP_DIALOG->show; 2417 $SETUP_DIALOG->show;
2348 $MESSAGE_WINDOW->show; 2418 $MESSAGE_WINDOW->show;
2349 } 2419 }
2350 2420
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423
2424 $CAVEAT_LABEL->set_text ("None :)");
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2427
2351 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2428 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2352} 2429}
2353 2430
2354sub video_shutdown { 2431sub video_shutdown {
2355 DC::OpenGL::shutdown; 2432 DC::OpenGL::shutdown;
2433 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2356 2434
2357 undef $SDL_ACTIVE; 2435 undef $SDL_ACTIVE;
2358} 2436}
2359 2437
2360my %animate_object; 2438my %animate_object;
… …
2421# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2499# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2422 }, 2500 },
2423 DC::SDL_KEYDOWN => sub { 2501 DC::SDL_KEYDOWN => sub {
2424 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2502 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2425 # alt-enter 2503 # alt-enter
2504 video_shutdown;
2426 $FULLSCREEN_ENABLE->toggle; 2505 $FULLSCREEN_ENABLE->toggle;
2427 video_shutdown;
2428 video_init; 2506 video_init;
2429 } else { 2507 } else {
2430 &DC::UI::feed_sdl_key_down_event; 2508 &DC::UI::feed_sdl_key_down_event;
2431 } 2509 }
2432 update_modbox; 2510 update_modbox;
… …
2452$SIG{INT} = $SIG{TERM} = sub { 2530$SIG{INT} = $SIG{TERM} = sub {
2453 EV::unloop; 2531 EV::unloop;
2454 #d# TODO calling exit here hangs the process in some futex 2532 #d# TODO calling exit here hangs the process in some futex
2455}; 2533};
2456 2534
2457{ 2535# due to mac os x + sdl combined briandamage, we need this contortion
2536sub main {
2537 {
2458 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2459 2539
2460 if (-e "$Deliantra::VARDIR/client.cf") { 2540 if (-e "$Deliantra::VARDIR/client.cf") {
2461 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2541 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2462 } else { 2542 } else {
2463 #TODO: compatibility cruft 2543 #TODO: compatibility cruft
2464 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2544 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2465 print STDERR "INFO: used old configuration file\n"; 2545 print STDERR "INFO: used old configuration file\n";
2466 } 2546 }
2467 2547
2468 DC::DB::Server::run; 2548 DC::DB::Server::run;
2469 2549
2470 if ($CFG->{db_schema} < 1) { 2550 if ($CFG->{db_schema} < 1) {
2471 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";
2472 DC::DB::nuke_db; 2552 DC::DB::nuke_db;
2473 $CFG->{db_schema} = 1; 2553 $CFG->{db_schema} = 1;
2474 DC::write_cfg; 2554 DC::write_cfg;
2475 } 2555 }
2476 2556
2477 DC::DB::open_db; 2557 DC::DB::open_db;
2478 2558
2479 DC::UI::set_layout ($::CFG->{layout}); 2559 DC::UI::set_layout ($::CFG->{layout});
2480 2560
2481 my %DEF_CFG = ( 2561 my %DEF_CFG = (
2482 sdl_mode => 0, 2562 sdl_mode => undef,
2483 fullscreen => 1, 2563 fullscreen => 1,
2484 fast => 0, 2564 fast => 0,
2485 force_opengl11 => undef, 2565 force_opengl11 => undef,
2566 disable_alpha => 0,
2567 smooth_movement => 1,
2486 texture_compression => 1, 2568 texture_compression => 1,
2487 map_scale => 1, 2569 map_scale => 1,
2488 fow_enable => 1, 2570 fow_enable => 1,
2489 fow_intensity => 0, 2571 fow_intensity => 0,
2490 map_smoothing => 1, 2572 map_smoothing => 1,
2491 gui_fontsize => 1, 2573 gui_fontsize => 1,
2492 log_fontsize => 0.7, 2574 log_fontsize => 0.7,
2493 gauge_fontsize => 1, 2575 gauge_fontsize => 1,
2494 gauge_size => 0.35, 2576 gauge_size => 0.35,
2495 stat_fontsize => 0.7, 2577 stat_fontsize => 0.7,
2496 mapsize => 100, 2578 mapsize => 100,
2497 audio_enable => 1, 2579 audio_enable => 1,
2498 audio_hw_channels => 0, 2580 audio_hw_channels => 0,
2499 audio_hw_frequency => 0, 2581 audio_hw_frequency => 0,
2500 audio_hw_chunksize => 0, 2582 audio_hw_chunksize => 0,
2501 audio_mix_channels => 8, 2583 audio_mix_channels => 8,
2502 effects_enable => 1, 2584 effects_enable => 1,
2503 effects_volume => 1, 2585 effects_volume => 1,
2504 bgm_enable => 1, 2586 bgm_enable => 1,
2505 bgm_volume => 0.5, 2587 bgm_volume => 0.5,
2506 output_rate => "", 2588 output_rate => "",
2507 pickup => 0, 2589 pickup => 0,
2508 inv_sort => "mtime", 2590 inv_sort => "mtime",
2509 default => "profile", # default profile 2591 default => "profile", # default profile
2510 show_tips => 1, 2592 show_tips => 1,
2511 logview_max_par => 1000, 2593 logview_max_par => 1000,
2512 shift_fire_stop => 0, 2594 shift_fire_stop => 0,
2513 ); 2595 );
2514 2596
2515 while (my ($k, $v) = each %DEF_CFG) { 2597 while (my ($k, $v) = each %DEF_CFG) {
2516 $CFG->{$k} = $v unless exists $CFG->{$k}; 2598 $CFG->{$k} = $v unless exists $CFG->{$k};
2517 } 2599 }
2518 2600
2519 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2601 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2520 $PROFILE = $CFG->{profile}{default}; 2602 $PROFILE = $CFG->{profile}{default};
2521 2603
2522 # convert old bindings (only default profile matters) 2604 # convert old bindings (only default profile matters)
2523 if (my $bindings = delete $PROFILE->{bindings}) { 2605 if (my $bindings = delete $PROFILE->{bindings}) {
2524 while (my ($mod, $syms) = each %$bindings) { 2606 while (my ($mod, $syms) = each %$bindings) {
2525 while (my ($sym, $cmds) = each %$syms) { 2607 while (my ($sym, $cmds) = each %$syms) {
2526 push @{ $PROFILE->{macro} }, { 2608 push @{ $PROFILE->{macro} }, {
2527 accelkey => [$mod*1, $sym*1], 2609 accelkey => [$mod*1, $sym*1],
2528 action => $cmds, 2610 action => $cmds,
2611 };
2529 }; 2612 }
2530 } 2613 }
2531 } 2614 }
2532 }
2533 2615
2534 sdl_init; 2616 sdl_init;
2535 2617
2536 @SDL_MODES = DC::SDL_ListModes 8, 8; 2618 {
2537 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2538 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2539
2540 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2541
2542 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2543
2544 {
2545 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2619 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2546 DejaVuSans.ttf 2620 DejaVuSans.ttf
2547 DejaVuSansMono.ttf 2621 DejaVuSansMono.ttf
2548 DejaVuSans-Bold.ttf 2622 DejaVuSans-Bold.ttf
2549 DejaVuSansMono-Bold.ttf 2623 DejaVuSansMono-Bold.ttf
2550 DejaVuSans-Oblique.ttf 2624 DejaVuSans-Oblique.ttf
2551 DejaVuSansMono-Oblique.ttf 2625 DejaVuSansMono-Oblique.ttf
2552 DejaVuSans-BoldOblique.ttf 2626 DejaVuSans-BoldOblique.ttf
2553 DejaVuSansMono-BoldOblique.ttf 2627 DejaVuSansMono-BoldOblique.ttf
2554 ); 2628 );
2555 2629
2556 DC::add_font $_ for @fonts; 2630 DC::add_font $_ for @fonts;
2557 2631
2558 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2632 $FONT_PROP = new_from_file DC::Font $fonts[0];
2559 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2633 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2560 2634
2561 $FONT_PROP->make_default; 2635 $FONT_PROP->make_default;
2562 2636
2563 DC::pango_init; 2637 DC::pango_init;
2564 } 2638 }
2565 2639
2566# compare mono (ft) vs. rgba (cairo) 2640# compare mono (ft) vs. rgba (cairo)
2567# ft - 1.8s, cairo 3s, even in alpha-only mode 2641# ft - 1.8s, cairo 3s, even in alpha-only mode
2568# for my $rgba (0..1) { 2642# for my $rgba (0..1) {
2569# my $t1 = Time::HiRes::time; 2643# my $t1 = Time::HiRes::time;
… …
2574# } 2648# }
2575# my $t2 = Time::HiRes::time; 2649# my $t2 = Time::HiRes::time;
2576# warn $t2-$t1; 2650# warn $t2-$t1;
2577# } 2651# }
2578 2652
2579 video_init; 2653 video_init;
2580 audio_init; 2654 audio_init;
2581} 2655 }
2582 2656
2583show_tip_of_the_day if $CFG->{show_tips}; 2657 show_tip_of_the_day if $CFG->{show_tips};
2584 2658
2585our $STARTUP_CANCEL = EV::idle sub { 2659 our $STARTUP_CANCEL = EV::idle sub {
2586 undef $::STARTUP_CANCEL; 2660 undef $::STARTUP_CANCEL;
2587 $startup_done->(); 2661 $startup_done->();
2588}; 2662 };
2589 2663
2590delete $SIG{__DIE__}; 2664 delete $SIG{__DIE__};
2591EV::loop; 2665 EV::loop;
2592 2666
2593#video_shutdown; 2667#video_shutdown;
2594#audio_shutdown; 2668#audio_shutdown;
2595DC::OpenGL::quit; 2669 DC::OpenGL::quit;
2596DC::SDL_Quit; 2670 DC::SDL_Quit;
2597DC::DB::Server::stop; 2671 DC::DB::Server::stop;
2672}
2673
2674DC::SDL_braino; # see sub above
2598 2675
2599=head1 NAME 2676=head1 NAME
2600 2677
2601deliantra - A Deliantra MORPG game client 2678deliantra - A Deliantra MORPG game client
2602 2679
… …
2619 4 show fps 2696 4 show fps
2620 8 suppress tooltips 2697 8 suppress tooltips
2621 2698
2622=head1 AUTHOR 2699=head1 AUTHOR
2623 2700
2624Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2701Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2625 2702
2626 2703
2627 2704

Diff Legend

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