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.31 by root, Tue Mar 25 02:12:35 2008 UTC vs.
Revision 1.59 by root, Tue Aug 19 17:38:30 2008 UTC

… …
97use List::Util qw(max min); 97use List::Util qw(max min);
98 98
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use AnyEvent::DNS;
103use AnyEvent::Socket ();
104
102use Compress::LZF; 105use Compress::LZF;
103 106
104use DC; 107use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 109use DC::OpenGL ();
106use DC::Protocol; 110use DC::Protocol;
107use DC::DB; 111use DC::DB;
108use DC::UI; 112use DC::UI;
109use DC::UI::Canvas; 113use DC::UI::Canvas;
… …
137our $PROFILE; # current profile 141our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 142our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 143
140our $WANT_REFRESH; 144our $WANT_REFRESH;
141 145
146our $MODE_SLIDER;
147our $CAVEAT_LABEL;
148
142our @SDL_MODES; 149our @SDL_MODES;
150our $SDL_REINIT = 1;
143our $WIDTH; 151our $WIDTH;
144our $HEIGHT; 152our $HEIGHT;
145our $FULLSCREEN; 153our $FULLSCREEN;
146our $FONTSIZE; 154our $FONTSIZE;
147 155
… …
664 # right: accept 672 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 674 text => "Accept",
667 on_activate => sub { 675 on_activate => sub {
668 $conn->send ("reply n"); 676 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
671 0 678 0
672 }, 679 },
673 ); 680 );
674 681
… …
726 733
727 $vbox->add (@dialog); 734 $vbox->add (@dialog);
728 $dialog->show; 735 $dialog->show;
729} 736}
730 737
731sub start_game { 738sub dc_connect {
732 status "logging in..."; 739 my ($host, $port) = @_;
733
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736 740
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
738 742
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 743 $CONN =
744 new DC::Protocol 744 new DC::Protocol
745 host => $host, 745 host => $host,
746 port => $port || 13327, 746 port => $port,
747 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
749 mapw => $mapsize, 749 mapw => $mapsize,
750 maph => $mapsize, 750 maph => $mapsize,
751 751
… …
758 query => \&server_query, 758 query => \&server_query,
759 759
760 setup_req => { 760 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
762 }, 762 },
763 };
764 763
765 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
767 767
768 status "login successful"; 768 status "login successful";
769 } else {
770 undef $CONN;
771 status "unable to connect: $!";
772 stop_game();
773 }
774 },
775 ;
776}
777
778sub start_game {
779 status "logging in...";
780
781 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785
786 $MAP = new DC::Map;
787
788 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl
793 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95";
795 }
796
797 dc_connect $host, $port;
798 };
769 } else { 799 } else {
770 status "unable to connect"; 800 dc_connect $host, $port;
771 stop_game();
772 } 801 }
773} 802}
774 803
775sub stop_game { 804sub stop_game {
776 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
805 can_events => 1, 834 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 836
837 $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,
839 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card.");
844
808 my $vidmode_tooltip = 845 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 848
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 851
815 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 853 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 855 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 856 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 857 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 858 can_events => 1, tooltip => $vidmode_tooltip);
821 859
822 $mode_slider->connect (changed => sub { 860 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 861 my ($self, $value) = @_;
824 862
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 865 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 867
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 870 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 871 tooltip => "Bring the client into fullscreen mode.",
… …
839 state => $CFG->{force_opengl11}, 877 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 879 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 880 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
900 0
901 }
847 ); 902 );
848 903
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 905 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 906 state => $CFG->{texture_compression},
… …
876 on_activate => sub { 931 on_activate => sub {
877 video_shutdown (); 932 video_shutdown ();
878 video_init (); 933 video_init ();
879 0 934 0
880 } 935 }
936 );
937
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 945 );
882 946
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 948 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1620 $CFG->{show_tips} = $value; 1684 $CFG->{show_tips} = $value;
1621 0 1685 0
1622 } 1686 }
1623 ); 1687 );
1624 1688
1625 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1689 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1627 text => $CFG->{logview_max_par}, 1691 text => $CFG->{logview_max_par},
1628 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1692 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1629 . "sends more messages than this number, older messages get removed to save memory and " 1693 . "sends more messages than this number, older messages get removed to save memory and "
1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1694 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1631 on_changed => sub { 1695 on_changed => sub {
1632 my ($self, $value) = @_; 1696 my ($self, $value) = @_;
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1750 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1751 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1752 ["Flesh" => PICKUP_FLESH],
1689 ], 1753 ],
1690 ["Weight/Value ratio", 2, 17] 1754 ["Value/Weight ratio", 2, 17]
1691 ) 1755 )
1692 { 1756 {
1693 my ($title, $x, $y, @bits) = @$_; 1757 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1758 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1759
… …
1720 } 1784 }
1721 1785
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1786 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1788 template => ">= 99",
1789 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1790 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1791 on_changed => sub {
1727 my ($slider, $value) = @_; 1792 my ($slider, $value) = @_;
1728 1793
1729 $::CFG->{pickup} &= ~0xF; 1794 $::CFG->{pickup} &= ~0xF;
… …
1742 1807
1743 $r 1808 $r
1744} 1809}
1745 1810
1746my %SORT_ORDER = ( 1811my %SORT_ORDER = (
1747 type => undef, 1812 type => sub {
1813 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1814 },
1748 mtime => sub { 1815 mtime => sub {
1749 my $NOW = time; 1816 my $NOW = time;
1750 sort { 1817 sort {
1751 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1818 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1752 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1819 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1783 $::CFG->{inv_sort} = $_[1]; 1850 $::CFG->{inv_sort} = $_[1];
1784 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1851 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1785 }, 1852 },
1786 ); 1853 );
1787 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1854 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1788 #TODO# update to weigh/maxweight 1855 #TODO# update to weight/maxweight
1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1856 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1790 1857
1791 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1858 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 $sw1->add ($INV = new DC::UI::Inventory); 1859 $sw1->add ($INV = new DC::UI::Inventory);
1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1860 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2120 $dialog->show; 2187 $dialog->show;
2121 }; 2188 };
2122} 2189}
2123 2190
2124sub sdl_init { 2191sub sdl_init {
2125 DC::SDL_Init 2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2126 and die "SDL::Init failed!\n"; 2193 and die "SDL::Init failed!\n";
2127} 2194}
2128 2195
2129sub video_init { 2196sub video_init {
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0;
2199
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @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)";
2204
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206
2130 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0;
2209 for (reverse 0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2211 }
2212 }
2131 2213
2132 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2133 2215
2134 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2135 $FULLSCREEN = $CFG->{fullscreen}; 2217 $FULLSCREEN = $CFG->{fullscreen};
2136 $FAST = $CFG->{fast}; 2218 $FAST = $CFG->{fast};
2137 2219
2220 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2138 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2221 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2222 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2139 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2223 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2140 2224
2141 $SDL_ACTIVE = 1; 2225 $SDL_ACTIVE = 1;
2142 $LAST_REFRESH = time - 0.01; 2226 $LAST_REFRESH = time - 0.01;
2143 2227
… …
2241 force_h => $::HEIGHT * 0.6, 2325 force_h => $::HEIGHT * 0.6,
2242 has_close_button => 1, 2326 has_close_button => 1,
2243 ; 2327 ;
2244 2328
2245 $METASERVER = metaserver_dialog; 2329 $METASERVER = metaserver_dialog;
2246 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2330 # the name is changed to not conflict with the older name as users could have hidden it
2331 $MESSAGE_WINDOW = new DC::UI::Dockbar
2332 name => "message_window2",
2333 title => 'Messages',
2334 force_w => $::WIDTH * 0.6,
2335 force_h => $::HEIGHT * 0.25,
2336 ;
2337
2247 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2338 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2248 2339
2249 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2340 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2250 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2341 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2251 2342
2252 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2343 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2253 "Configure the server to play on, your username and password."); 2344 "Configure the server to play on, your username and password.");
2254 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2345 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2272 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2363 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2273 2364
2274 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2365 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2275 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2366 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2276 2367
2277 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2368# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2278 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2369# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2279 2370
2280 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2371 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2281 2372
2282 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2373 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2283 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2374 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2285 $BUTTONBAR->add (new DC::UI::Button 2376 $BUTTONBAR->add (new DC::UI::Button
2286 text => "Save Config", 2377 text => "Save Config",
2287 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2378 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2288 on_activate => sub { 2379 on_activate => sub {
2289 $::CFG->{layout} = DC::UI::get_layout; 2380 $::CFG->{layout} = DC::UI::get_layout;
2290 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2381 DC::write_cfg;
2291 status "Configuration Saved"; 2382 status "Configuration Saved";
2292 0 2383 0
2293 }, 2384 },
2294 ); 2385 );
2295 2386
2296 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2387 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2297 tooltip => "View Documentation"); 2388 tooltip => "View Documentation");
2298
2299 2389
2300 $BUTTONBAR->add (new DC::UI::Button 2390 $BUTTONBAR->add (new DC::UI::Button
2301 text => "Quit", 2391 text => "Quit",
2302 tooltip => "Terminates the program", 2392 tooltip => "Terminates the program",
2303 on_activate => sub { 2393 on_activate => sub {
… …
2313 $BUTTONBAR->show; 2403 $BUTTONBAR->show;
2314 $SETUP_DIALOG->show; 2404 $SETUP_DIALOG->show;
2315 $MESSAGE_WINDOW->show; 2405 $MESSAGE_WINDOW->show;
2316 } 2406 }
2317 2407
2408 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2409 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2410
2411 $CAVEAT_LABEL->set_text ("None :)");
2412 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2413 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2414
2318 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2415 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2319} 2416}
2320 2417
2321sub video_shutdown { 2418sub video_shutdown {
2322 DC::OpenGL::shutdown; 2419 DC::OpenGL::shutdown;
2420 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2323 2421
2324 undef $SDL_ACTIVE; 2422 undef $SDL_ACTIVE;
2325} 2423}
2326 2424
2327my %animate_object; 2425my %animate_object;
… …
2388# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2486# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2389 }, 2487 },
2390 DC::SDL_KEYDOWN => sub { 2488 DC::SDL_KEYDOWN => sub {
2391 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2489 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2392 # alt-enter 2490 # alt-enter
2491 video_shutdown;
2393 $FULLSCREEN_ENABLE->toggle; 2492 $FULLSCREEN_ENABLE->toggle;
2394 video_shutdown;
2395 video_init; 2493 video_init;
2396 } else { 2494 } else {
2397 &DC::UI::feed_sdl_key_down_event; 2495 &DC::UI::feed_sdl_key_down_event;
2398 } 2496 }
2399 update_modbox; 2497 update_modbox;
… …
2419$SIG{INT} = $SIG{TERM} = sub { 2517$SIG{INT} = $SIG{TERM} = sub {
2420 EV::unloop; 2518 EV::unloop;
2421 #d# TODO calling exit here hangs the process in some futex 2519 #d# TODO calling exit here hangs the process in some futex
2422}; 2520};
2423 2521
2424{ 2522# due to mac os x + sdl combined briandamage, we need this contortion
2523sub main {
2524 {
2525 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2526
2425 if (-e "$Deliantra::VARDIR/client.cf") { 2527 if (-e "$Deliantra::VARDIR/client.cf") {
2426 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2528 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2427 } else { 2529 } else {
2428 #TODO: compatibility cruft 2530 #TODO: compatibility cruft
2429 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2531 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2430 print STDERR "INFO: used old configuration file\n"; 2532 print STDERR "INFO: used old configuration file\n";
2431 } 2533 }
2432 2534
2433 DC::DB::Server::run; 2535 DC::DB::Server::run;
2434 2536
2537 if ($CFG->{db_schema} < 1) {
2538 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2539 DC::DB::nuke_db;
2540 $CFG->{db_schema} = 1;
2541 DC::write_cfg;
2542 }
2543
2544 DC::DB::open_db;
2545
2435 DC::UI::set_layout ($::CFG->{layout}); 2546 DC::UI::set_layout ($::CFG->{layout});
2436 2547
2437 my %DEF_CFG = ( 2548 my %DEF_CFG = (
2438 sdl_mode => 0, 2549 sdl_mode => 0,
2439 fullscreen => 1, 2550 fullscreen => 1,
2440 fast => 0, 2551 fast => 0,
2441 force_opengl11 => undef, 2552 force_opengl11 => undef,
2553 disable_alpha => 0,
2554 smooth_movement => 1,
2442 texture_compression => 1, 2555 texture_compression => 1,
2443 map_scale => 1, 2556 map_scale => 1,
2444 fow_enable => 1, 2557 fow_enable => 1,
2445 fow_intensity => 0, 2558 fow_intensity => 0,
2446 map_smoothing => 1, 2559 map_smoothing => 1,
2447 gui_fontsize => 1, 2560 gui_fontsize => 1,
2448 log_fontsize => 0.7, 2561 log_fontsize => 0.7,
2449 gauge_fontsize => 1, 2562 gauge_fontsize => 1,
2450 gauge_size => 0.35, 2563 gauge_size => 0.35,
2451 stat_fontsize => 0.7, 2564 stat_fontsize => 0.7,
2452 mapsize => 100, 2565 mapsize => 100,
2453 audio_enable => 1, 2566 audio_enable => 1,
2454 audio_hw_channels => 0, 2567 audio_hw_channels => 0,
2455 audio_hw_frequency => 0, 2568 audio_hw_frequency => 0,
2456 audio_hw_chunksize => 0, 2569 audio_hw_chunksize => 0,
2457 audio_mix_channels => 8, 2570 audio_mix_channels => 8,
2458 effects_enable => 1, 2571 effects_enable => 1,
2459 effects_volume => 1, 2572 effects_volume => 1,
2460 bgm_enable => 1, 2573 bgm_enable => 1,
2461 bgm_volume => 0.5, 2574 bgm_volume => 0.5,
2462 output_rate => "", 2575 output_rate => "",
2463 pickup => 0, 2576 pickup => 0,
2464 inv_sort => "mtime", 2577 inv_sort => "mtime",
2465 default => "profile", # default profile 2578 default => "profile", # default profile
2466 show_tips => 1, 2579 show_tips => 1,
2467 logview_max_par => 1000, 2580 logview_max_par => 1000,
2581 shift_fire_stop => 0,
2468 ); 2582 );
2469 2583
2470 while (my ($k, $v) = each %DEF_CFG) { 2584 while (my ($k, $v) = each %DEF_CFG) {
2471 $CFG->{$k} = $v unless exists $CFG->{$k}; 2585 $CFG->{$k} = $v unless exists $CFG->{$k};
2472 } 2586 }
2473 2587
2474 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2588 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2475 $PROFILE = $CFG->{profile}{default}; 2589 $PROFILE = $CFG->{profile}{default};
2476 2590
2477 # convert old bindings (only default profile matters) 2591 # convert old bindings (only default profile matters)
2478 if (my $bindings = delete $PROFILE->{bindings}) { 2592 if (my $bindings = delete $PROFILE->{bindings}) {
2479 while (my ($mod, $syms) = each %$bindings) { 2593 while (my ($mod, $syms) = each %$bindings) {
2480 while (my ($sym, $cmds) = each %$syms) { 2594 while (my ($sym, $cmds) = each %$syms) {
2481 push @{ $PROFILE->{macro} }, { 2595 push @{ $PROFILE->{macro} }, {
2482 accelkey => [$mod*1, $sym*1], 2596 accelkey => [$mod*1, $sym*1],
2483 action => $cmds, 2597 action => $cmds,
2598 };
2484 }; 2599 }
2485 } 2600 }
2486 } 2601 }
2487 }
2488 2602
2489 sdl_init; 2603 sdl_init;
2490 2604
2491 @SDL_MODES = DC::SDL_ListModes 8, 8; 2605 {
2492 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2493 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2494
2495 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2496
2497 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2498
2499 {
2500 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2606 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2501 DejaVuSans.ttf 2607 DejaVuSans.ttf
2502 DejaVuSansMono.ttf 2608 DejaVuSansMono.ttf
2503 DejaVuSans-Bold.ttf 2609 DejaVuSans-Bold.ttf
2504 DejaVuSansMono-Bold.ttf 2610 DejaVuSansMono-Bold.ttf
2505 DejaVuSans-Oblique.ttf 2611 DejaVuSans-Oblique.ttf
2506 DejaVuSansMono-Oblique.ttf 2612 DejaVuSansMono-Oblique.ttf
2507 DejaVuSans-BoldOblique.ttf 2613 DejaVuSans-BoldOblique.ttf
2508 DejaVuSansMono-BoldOblique.ttf 2614 DejaVuSansMono-BoldOblique.ttf
2509 ); 2615 );
2510 2616
2511 DC::add_font $_ for @fonts; 2617 DC::add_font $_ for @fonts;
2512 2618
2513 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2619 $FONT_PROP = new_from_file DC::Font $fonts[0];
2514 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2620 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2515 2621
2516 $FONT_PROP->make_default; 2622 $FONT_PROP->make_default;
2517 2623
2518 DC::pango_init; 2624 DC::pango_init;
2519 } 2625 }
2520 2626
2521# compare mono (ft) vs. rgba (cairo) 2627# compare mono (ft) vs. rgba (cairo)
2522# ft - 1.8s, cairo 3s, even in alpha-only mode 2628# ft - 1.8s, cairo 3s, even in alpha-only mode
2523# for my $rgba (0..1) { 2629# for my $rgba (0..1) {
2524# my $t1 = Time::HiRes::time; 2630# my $t1 = Time::HiRes::time;
… …
2529# } 2635# }
2530# my $t2 = Time::HiRes::time; 2636# my $t2 = Time::HiRes::time;
2531# warn $t2-$t1; 2637# warn $t2-$t1;
2532# } 2638# }
2533 2639
2534 video_init; 2640 video_init;
2535 audio_init; 2641 audio_init;
2536} 2642 }
2537 2643
2538show_tip_of_the_day if $CFG->{show_tips}; 2644 show_tip_of_the_day if $CFG->{show_tips};
2539 2645
2540our $STARTUP_CANCEL = EV::idle sub { 2646 our $STARTUP_CANCEL = EV::idle sub {
2541 undef $::STARTUP_CANCEL; 2647 undef $::STARTUP_CANCEL;
2542 $startup_done->(); 2648 $startup_done->();
2543}; 2649 };
2544 2650
2651 delete $SIG{__DIE__};
2545EV::loop; 2652 EV::loop;
2546 2653
2547#video_shutdown; 2654#video_shutdown;
2548#audio_shutdown; 2655#audio_shutdown;
2549DC::OpenGL::quit; 2656 DC::OpenGL::quit;
2550DC::SDL_Quit; 2657 DC::SDL_Quit;
2551DC::DB::Server::stop; 2658 DC::DB::Server::stop;
2659}
2660
2661DC::SDL_braino; # see sub above
2552 2662
2553=head1 NAME 2663=head1 NAME
2554 2664
2555deliantra - A Deliantra MORPG game client 2665deliantra - A Deliantra MORPG game client
2556 2666
… …
2573 4 show fps 2683 4 show fps
2574 8 suppress tooltips 2684 8 suppress tooltips
2575 2685
2576=head1 AUTHOR 2686=head1 AUTHOR
2577 2687
2578Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2688Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2579 2689
2580 2690
2581 2691

Diff Legend

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