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.43 by root, Wed May 21 23:35:55 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}
… …
97use List::Util qw(max min); 104use List::Util qw(max min);
98 105
99use Deliantra; 106use Deliantra;
100use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
101 108
109use AnyEvent::DNS;
110use AnyEvent::Socket ();
111
102use Compress::LZF; 112use Compress::LZF;
103 113
114use DC;
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 116use DC::OpenGL ();
106use DC::Protocol; 117use DC::Protocol;
107use DC::DB; 118use DC::DB;
108use DC::UI; 119use DC::UI;
109use DC::UI::Canvas; 120use DC::UI::Canvas;
… …
137our $PROFILE; # current profile 148our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 149our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 150
140our $WANT_REFRESH; 151our $WANT_REFRESH;
141 152
153our $MODE_SLIDER;
154our $CAVEAT_LABEL;
155
142our @SDL_MODES; 156our @SDL_MODES;
157our $SDL_REINIT = 1;
143our $WIDTH; 158our $WIDTH;
144our $HEIGHT; 159our $HEIGHT;
145our $FULLSCREEN; 160our $FULLSCREEN;
146our $FONTSIZE; 161our $FONTSIZE;
147 162
… …
725 740
726 $vbox->add (@dialog); 741 $vbox->add (@dialog);
727 $dialog->show; 742 $dialog->show;
728} 743}
729 744
730sub start_game { 745sub dc_connect {
731 status "logging in..."; 746 my ($host, $port) = @_;
732
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735 747
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 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 750 $CONN =
743 local $SIG{__DIE__};
744
745 new DC::Protocol 751 new DC::Protocol
746 host => $host, 752 host => $host,
747 port => $port || 13327, 753 port => $port,
748 user => $PROFILE->{user}, 754 user => $PROFILE->{user},
749 pass => $PROFILE->{password}, 755 pass => $PROFILE->{password},
750 mapw => $mapsize, 756 mapw => $mapsize,
751 maph => $mapsize, 757 maph => $mapsize,
752 758
… …
759 query => \&server_query, 765 query => \&server_query,
760 766
761 setup_req => { 767 setup_req => {
762 smoothing => $CFG->{map_smoothing}*1, 768 smoothing => $CFG->{map_smoothing}*1,
763 }, 769 },
764 };
765 770
766 if ($CONN) { 771 on_connect => sub {
772 if ($_[0]) {
767 DC::lowdelay fileno $CONN->{fh}; 773 DC::lowdelay fileno $CONN->{fh};
768 774
769 status "login successful"; 775 status "login successful";
776 } else {
777 undef $CONN;
778 status "unable to connect: $!";
779 stop_game();
780 }
781 },
782 ;
783}
784
785sub start_game {
786 status "logging in...";
787
788 $LOGIN_BUTTON->set_text ("Logout");
789 $SETUP_DIALOG->hide;
790
791 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
792
793 $MAP = new DC::Map;
794
795 # hack to make SURE we find the IP address all right
796 # can be removed once AnyEvent::DNS is proven stable.
797 if ($host eq "gameserver.deliantra.net") {
798 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
799 if ($_[0] ne "80.101.114.108") { # Perl
800 status "dns failure, using hardcoded address";
801 $host = "129.13.162.95";
802 }
803
804 dc_connect $host, $port;
805 };
770 } else { 806 } else {
771 warn $@; 807 dc_connect $host, $port;
772 status "unable to connect";
773 stop_game();
774 } 808 }
775} 809}
776 810
777sub stop_game { 811sub stop_game {
778 $LOGIN_BUTTON->set_text ("Login / Register"); 812 $LOGIN_BUTTON->set_text ("Login / Register");
… …
805 $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");
806 $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,
807 can_events => 1, 841 can_events => 1,
808 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
809 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
810 my $vidmode_tooltip = 852 my $vidmode_tooltip =
811 "<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). "
812 . "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>.";
813 855
814 $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");
815 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
816 858
817 $hbox->add (my $mode_slider = new DC::UI::Slider 859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
818 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 ],
819 tooltip => $vidmode_tooltip); 862 tooltip => $vidmode_tooltip);
820 $hbox->add (my $mode_label = new DC::UI::Label 863 $hbox->add (my $mode_label = new DC::UI::Label
821 height => 0.8, template => "9999x9999@9+9", 864 height => 0.8, template => "9999x9999@9+9",
822 can_events => 1, tooltip => $vidmode_tooltip); 865 can_events => 1, tooltip => $vidmode_tooltip);
823 866
824 $mode_slider->connect (changed => sub { 867 $MODE_SLIDER->connect (changed => sub {
825 my ($self, $value) = @_; 868 my ($self, $value) = @_;
826 869
827 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
828 $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]});
829 }); 872 });
830 $mode_slider->emit (changed => $mode_slider->{range}[0]); 873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
831 874
832 $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");
833 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
834 state => $CFG->{fullscreen}, 877 state => $CFG->{fullscreen},
835 tooltip => "Bring the client into fullscreen mode.", 878 tooltip => "Bring the client into fullscreen mode.",
… …
841 state => $CFG->{force_opengl11}, 884 state => $CFG->{force_opengl11},
842 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 "
843 . "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 "
844 . "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. "
845 . "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, "
846 . "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. "
847 . "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>",
848 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 }
849 ); 909 );
850 910
851 $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");
852 $table->add_at (1, $row++, new DC::UI::CheckBox 912 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{texture_compression}, 913 state => $CFG->{texture_compression},
… …
878 on_activate => sub { 938 on_activate => sub {
879 video_shutdown (); 939 video_shutdown ();
880 video_init (); 940 video_init ();
881 0 941 0
882 } 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 }
883 ); 952 );
884 953
885 $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");
886 $table->add_at (1, $row++, new DC::UI::Slider 955 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1527 1 1596 1
1528 }, 1597 },
1529 ); 1598 );
1530 1599
1531 $vbox->add (new DC::UI::FancyFrame 1600 $vbox->add (new DC::UI::FancyFrame
1532 label => "Registering", 1601 label => "How to Play",
1533 min_h => 200, 1602 min_h => 200,
1534 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1603 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1535 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). "
1536 "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 "
1537 . "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.",
1538 ), 1609 ),
1539 ); 1610 );
1540 1611
1541 $vbox 1612 $vbox
… …
1687 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1758 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1688 ["Ignore cursed" => PICKUP_NOT_CURSED], 1759 ["Ignore cursed" => PICKUP_NOT_CURSED],
1689 ["Jewelery" => PICKUP_JEWELS], 1760 ["Jewelery" => PICKUP_JEWELS],
1690 ["Flesh" => PICKUP_FLESH], 1761 ["Flesh" => PICKUP_FLESH],
1691 ], 1762 ],
1692 ["Weight/Value ratio", 2, 17] 1763 ["Value/Weight ratio", 2, 17]
1693 ) 1764 )
1694 { 1765 {
1695 my ($title, $x, $y, @bits) = @$_; 1766 my ($title, $x, $y, @bits) = @$_;
1696 $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]);
1697 1768
… …
1722 } 1793 }
1723 1794
1724 $table->add_at (2, 18, new DC::UI::ValSlider 1795 $table->add_at (2, 18, new DC::UI::ValSlider
1725 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1796 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1726 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).",
1727 to_value => sub { ">= " . 5 * $_[0] }, 1799 to_value => sub { ">= " . 5 * $_[0] },
1728 on_changed => sub { 1800 on_changed => sub {
1729 my ($slider, $value) = @_; 1801 my ($slider, $value) = @_;
1730 1802
1731 $::CFG->{pickup} &= ~0xF; 1803 $::CFG->{pickup} &= ~0xF;
… …
1787 $::CFG->{inv_sort} = $_[1]; 1859 $::CFG->{inv_sort} = $_[1];
1788 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1860 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1789 }, 1861 },
1790 ); 1862 );
1791 $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);
1792 #TODO# update to weigh/maxweight 1864 #TODO# update to weight/maxweight
1793 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1865 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1794 1866
1795 $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);
1796 $sw1->add ($INV = new DC::UI::Inventory); 1868 $sw1->add ($INV = new DC::UI::Inventory);
1797 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1869 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2124 $dialog->show; 2196 $dialog->show;
2125 }; 2197 };
2126} 2198}
2127 2199
2128sub sdl_init { 2200sub sdl_init {
2129 DC::SDL_Init 2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2130 and die "SDL::Init failed!\n"; 2202 and die "SDL::Init failed!\n";
2131} 2203}
2132 2204
2133sub 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
2134 $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 }
2135 2226
2136 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2227 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2137 2228
2138 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2229 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2139 $FULLSCREEN = $CFG->{fullscreen}; 2230 $FULLSCREEN = $CFG->{fullscreen};
2140 $FAST = $CFG->{fast}; 2231 $FAST = $CFG->{fast};
2141 2232
2233 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2142 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
2143 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2236 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2144 2237
2145 $SDL_ACTIVE = 1; 2238 $SDL_ACTIVE = 1;
2146 $LAST_REFRESH = time - 0.01; 2239 $LAST_REFRESH = time - 0.01;
2147 2240
… …
2323 $BUTTONBAR->show; 2416 $BUTTONBAR->show;
2324 $SETUP_DIALOG->show; 2417 $SETUP_DIALOG->show;
2325 $MESSAGE_WINDOW->show; 2418 $MESSAGE_WINDOW->show;
2326 } 2419 }
2327 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
2328 $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]);
2329} 2429}
2330 2430
2331sub video_shutdown { 2431sub video_shutdown {
2332 DC::OpenGL::shutdown; 2432 DC::OpenGL::shutdown;
2433 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2333 2434
2334 undef $SDL_ACTIVE; 2435 undef $SDL_ACTIVE;
2335} 2436}
2336 2437
2337my %animate_object; 2438my %animate_object;
… …
2398# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2499# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2399 }, 2500 },
2400 DC::SDL_KEYDOWN => sub { 2501 DC::SDL_KEYDOWN => sub {
2401 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2502 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2402 # alt-enter 2503 # alt-enter
2504 video_shutdown;
2403 $FULLSCREEN_ENABLE->toggle; 2505 $FULLSCREEN_ENABLE->toggle;
2404 video_shutdown;
2405 video_init; 2506 video_init;
2406 } else { 2507 } else {
2407 &DC::UI::feed_sdl_key_down_event; 2508 &DC::UI::feed_sdl_key_down_event;
2408 } 2509 }
2409 update_modbox; 2510 update_modbox;
… …
2429$SIG{INT} = $SIG{TERM} = sub { 2530$SIG{INT} = $SIG{TERM} = sub {
2430 EV::unloop; 2531 EV::unloop;
2431 #d# TODO calling exit here hangs the process in some futex 2532 #d# TODO calling exit here hangs the process in some futex
2432}; 2533};
2433 2534
2434{ 2535# due to mac os x + sdl combined briandamage, we need this contortion
2536sub main {
2537 {
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436 2539
2437 if (-e "$Deliantra::VARDIR/client.cf") { 2540 if (-e "$Deliantra::VARDIR/client.cf") {
2438 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2541 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2439 } else { 2542 } else {
2440 #TODO: compatibility cruft 2543 #TODO: compatibility cruft
2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2544 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2442 print STDERR "INFO: used old configuration file\n"; 2545 print STDERR "INFO: used old configuration file\n";
2443 } 2546 }
2444 2547
2445 DC::DB::Server::run; 2548 DC::DB::Server::run;
2446 2549
2447 if ($CFG->{db_schema} < 1) { 2550 if ($CFG->{db_schema} < 1) {
2448 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";
2449 DC::DB::nuke_db; 2552 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1; 2553 $CFG->{db_schema} = 1;
2451 DC::write_cfg; 2554 DC::write_cfg;
2452 } 2555 }
2453 2556
2454 DC::DB::open_db; 2557 DC::DB::open_db;
2455 2558
2456 DC::UI::set_layout ($::CFG->{layout}); 2559 DC::UI::set_layout ($::CFG->{layout});
2457 2560
2458 my %DEF_CFG = ( 2561 my %DEF_CFG = (
2459 sdl_mode => 0, 2562 sdl_mode => undef,
2460 fullscreen => 1, 2563 fullscreen => 1,
2461 fast => 0, 2564 fast => 0,
2462 force_opengl11 => undef, 2565 force_opengl11 => undef,
2566 disable_alpha => 0,
2567 smooth_movement => 1,
2463 texture_compression => 1, 2568 texture_compression => 1,
2464 map_scale => 1, 2569 map_scale => 1,
2465 fow_enable => 1, 2570 fow_enable => 1,
2466 fow_intensity => 0, 2571 fow_intensity => 0,
2467 map_smoothing => 1, 2572 map_smoothing => 1,
2468 gui_fontsize => 1, 2573 gui_fontsize => 1,
2469 log_fontsize => 0.7, 2574 log_fontsize => 0.7,
2470 gauge_fontsize => 1, 2575 gauge_fontsize => 1,
2471 gauge_size => 0.35, 2576 gauge_size => 0.35,
2472 stat_fontsize => 0.7, 2577 stat_fontsize => 0.7,
2473 mapsize => 100, 2578 mapsize => 100,
2474 audio_enable => 1, 2579 audio_enable => 1,
2475 audio_hw_channels => 0, 2580 audio_hw_channels => 0,
2476 audio_hw_frequency => 0, 2581 audio_hw_frequency => 0,
2477 audio_hw_chunksize => 0, 2582 audio_hw_chunksize => 0,
2478 audio_mix_channels => 8, 2583 audio_mix_channels => 8,
2479 effects_enable => 1, 2584 effects_enable => 1,
2480 effects_volume => 1, 2585 effects_volume => 1,
2481 bgm_enable => 1, 2586 bgm_enable => 1,
2482 bgm_volume => 0.5, 2587 bgm_volume => 0.5,
2483 output_rate => "", 2588 output_rate => "",
2484 pickup => 0, 2589 pickup => 0,
2485 inv_sort => "mtime", 2590 inv_sort => "mtime",
2486 default => "profile", # default profile 2591 default => "profile", # default profile
2487 show_tips => 1, 2592 show_tips => 1,
2488 logview_max_par => 1000, 2593 logview_max_par => 1000,
2489 shift_fire_stop => 0, 2594 shift_fire_stop => 0,
2490 ); 2595 );
2491 2596
2492 while (my ($k, $v) = each %DEF_CFG) { 2597 while (my ($k, $v) = each %DEF_CFG) {
2493 $CFG->{$k} = $v unless exists $CFG->{$k}; 2598 $CFG->{$k} = $v unless exists $CFG->{$k};
2494 } 2599 }
2495 2600
2496 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2601 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2497 $PROFILE = $CFG->{profile}{default}; 2602 $PROFILE = $CFG->{profile}{default};
2498 2603
2499 # convert old bindings (only default profile matters) 2604 # convert old bindings (only default profile matters)
2500 if (my $bindings = delete $PROFILE->{bindings}) { 2605 if (my $bindings = delete $PROFILE->{bindings}) {
2501 while (my ($mod, $syms) = each %$bindings) { 2606 while (my ($mod, $syms) = each %$bindings) {
2502 while (my ($sym, $cmds) = each %$syms) { 2607 while (my ($sym, $cmds) = each %$syms) {
2503 push @{ $PROFILE->{macro} }, { 2608 push @{ $PROFILE->{macro} }, {
2504 accelkey => [$mod*1, $sym*1], 2609 accelkey => [$mod*1, $sym*1],
2505 action => $cmds, 2610 action => $cmds,
2611 };
2506 }; 2612 }
2507 } 2613 }
2508 } 2614 }
2509 }
2510 2615
2511 sdl_init; 2616 sdl_init;
2512 2617
2513 @SDL_MODES = DC::SDL_ListModes 8, 8; 2618 {
2514 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2515 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2516
2517 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2518
2519 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2520
2521 {
2522 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2619 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2523 DejaVuSans.ttf 2620 DejaVuSans.ttf
2524 DejaVuSansMono.ttf 2621 DejaVuSansMono.ttf
2525 DejaVuSans-Bold.ttf 2622 DejaVuSans-Bold.ttf
2526 DejaVuSansMono-Bold.ttf 2623 DejaVuSansMono-Bold.ttf
2527 DejaVuSans-Oblique.ttf 2624 DejaVuSans-Oblique.ttf
2528 DejaVuSansMono-Oblique.ttf 2625 DejaVuSansMono-Oblique.ttf
2529 DejaVuSans-BoldOblique.ttf 2626 DejaVuSans-BoldOblique.ttf
2530 DejaVuSansMono-BoldOblique.ttf 2627 DejaVuSansMono-BoldOblique.ttf
2531 ); 2628 );
2532 2629
2533 DC::add_font $_ for @fonts; 2630 DC::add_font $_ for @fonts;
2534 2631
2535 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2632 $FONT_PROP = new_from_file DC::Font $fonts[0];
2536 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2633 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2537 2634
2538 $FONT_PROP->make_default; 2635 $FONT_PROP->make_default;
2539 2636
2540 DC::pango_init; 2637 DC::pango_init;
2541 } 2638 }
2542 2639
2543# compare mono (ft) vs. rgba (cairo) 2640# compare mono (ft) vs. rgba (cairo)
2544# ft - 1.8s, cairo 3s, even in alpha-only mode 2641# ft - 1.8s, cairo 3s, even in alpha-only mode
2545# for my $rgba (0..1) { 2642# for my $rgba (0..1) {
2546# my $t1 = Time::HiRes::time; 2643# my $t1 = Time::HiRes::time;
… …
2551# } 2648# }
2552# my $t2 = Time::HiRes::time; 2649# my $t2 = Time::HiRes::time;
2553# warn $t2-$t1; 2650# warn $t2-$t1;
2554# } 2651# }
2555 2652
2556 video_init; 2653 video_init;
2557 audio_init; 2654 audio_init;
2558} 2655 }
2559 2656
2560show_tip_of_the_day if $CFG->{show_tips}; 2657 show_tip_of_the_day if $CFG->{show_tips};
2561 2658
2562our $STARTUP_CANCEL = EV::idle sub { 2659 our $STARTUP_CANCEL = EV::idle sub {
2563 undef $::STARTUP_CANCEL; 2660 undef $::STARTUP_CANCEL;
2564 $startup_done->(); 2661 $startup_done->();
2565}; 2662 };
2566 2663
2567delete $SIG{__DIE__}; 2664 delete $SIG{__DIE__};
2568EV::loop; 2665 EV::loop;
2569 2666
2570#video_shutdown; 2667#video_shutdown;
2571#audio_shutdown; 2668#audio_shutdown;
2572DC::OpenGL::quit; 2669 DC::OpenGL::quit;
2573DC::SDL_Quit; 2670 DC::SDL_Quit;
2574DC::DB::Server::stop; 2671 DC::DB::Server::stop;
2672}
2673
2674DC::SDL_braino; # see sub above
2575 2675
2576=head1 NAME 2676=head1 NAME
2577 2677
2578deliantra - A Deliantra MORPG game client 2678deliantra - A Deliantra MORPG game client
2579 2679
… …
2596 4 show fps 2696 4 show fps
2597 8 suppress tooltips 2697 8 suppress tooltips
2598 2698
2599=head1 AUTHOR 2699=head1 AUTHOR
2600 2700
2601Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2701Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2602 2702
2603 2703
2604 2704

Diff Legend

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