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.32 by root, Tue Mar 25 19:28:56 2008 UTC vs.
Revision 1.58 by root, Sun Aug 17 01:27:33 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 warn $@; 800 dc_connect $host, $port;
771 status "unable to connect";
772 stop_game();
773 } 801 }
774} 802}
775 803
776sub stop_game { 804sub stop_game {
777 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
804 $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");
805 $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,
806 can_events => 1, 834 can_events => 1,
807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
808 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
809 my $vidmode_tooltip = 845 my $vidmode_tooltip =
810 "<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). "
811 . "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>.";
812 848
813 $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");
814 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
815 851
816 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
817 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 ],
818 tooltip => $vidmode_tooltip); 855 tooltip => $vidmode_tooltip);
819 $hbox->add (my $mode_label = new DC::UI::Label 856 $hbox->add (my $mode_label = new DC::UI::Label
820 height => 0.8, template => "9999x9999@9+9", 857 height => 0.8, template => "9999x9999@9+9",
821 can_events => 1, tooltip => $vidmode_tooltip); 858 can_events => 1, tooltip => $vidmode_tooltip);
822 859
823 $mode_slider->connect (changed => sub { 860 $MODE_SLIDER->connect (changed => sub {
824 my ($self, $value) = @_; 861 my ($self, $value) = @_;
825 862
826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
827 $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]});
828 }); 865 });
829 $mode_slider->emit (changed => $mode_slider->{range}[0]); 866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
830 867
831 $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");
832 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
833 state => $CFG->{fullscreen}, 870 state => $CFG->{fullscreen},
834 tooltip => "Bring the client into fullscreen mode.", 871 tooltip => "Bring the client into fullscreen mode.",
… …
840 state => $CFG->{force_opengl11}, 877 state => $CFG->{force_opengl11},
841 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 "
842 . "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 "
843 . "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. "
844 . "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, "
845 . "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. "
846 . "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>",
847 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 }
848 ); 902 );
849 903
850 $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");
851 $table->add_at (1, $row++, new DC::UI::CheckBox 905 $table->add_at (1, $row++, new DC::UI::CheckBox
852 state => $CFG->{texture_compression}, 906 state => $CFG->{texture_compression},
… …
877 on_activate => sub { 931 on_activate => sub {
878 video_shutdown (); 932 video_shutdown ();
879 video_init (); 933 video_init ();
880 0 934 0
881 } 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 }
882 ); 945 );
883 946
884 $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");
885 $table->add_at (1, $row++, new DC::UI::Slider 948 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1621 $CFG->{show_tips} = $value; 1684 $CFG->{show_tips} = $value;
1622 0 1685 0
1623 } 1686 }
1624 ); 1687 );
1625 1688
1626 $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");
1627 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1628 text => $CFG->{logview_max_par}, 1691 text => $CFG->{logview_max_par},
1629 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 "
1630 . "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 "
1631 . "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.",
1632 on_changed => sub { 1695 on_changed => sub {
1633 my ($self, $value) = @_; 1696 my ($self, $value) = @_;
1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1686 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1687 ["Ignore cursed" => PICKUP_NOT_CURSED], 1750 ["Ignore cursed" => PICKUP_NOT_CURSED],
1688 ["Jewelery" => PICKUP_JEWELS], 1751 ["Jewelery" => PICKUP_JEWELS],
1689 ["Flesh" => PICKUP_FLESH], 1752 ["Flesh" => PICKUP_FLESH],
1690 ], 1753 ],
1691 ["Weight/Value ratio", 2, 17] 1754 ["Value/Weight ratio", 2, 17]
1692 ) 1755 )
1693 { 1756 {
1694 my ($title, $x, $y, @bits) = @$_; 1757 my ($title, $x, $y, @bits) = @$_;
1695 $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]);
1696 1759
… …
1721 } 1784 }
1722 1785
1723 $table->add_at (2, 18, new DC::UI::ValSlider 1786 $table->add_at (2, 18, new DC::UI::ValSlider
1724 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1725 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).",
1726 to_value => sub { ">= " . 5 * $_[0] }, 1790 to_value => sub { ">= " . 5 * $_[0] },
1727 on_changed => sub { 1791 on_changed => sub {
1728 my ($slider, $value) = @_; 1792 my ($slider, $value) = @_;
1729 1793
1730 $::CFG->{pickup} &= ~0xF; 1794 $::CFG->{pickup} &= ~0xF;
… …
1743 1807
1744 $r 1808 $r
1745} 1809}
1746 1810
1747my %SORT_ORDER = ( 1811my %SORT_ORDER = (
1748 type => undef, 1812 type => sub {
1813 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1814 },
1749 mtime => sub { 1815 mtime => sub {
1750 my $NOW = time; 1816 my $NOW = time;
1751 sort { 1817 sort {
1752 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;
1753 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;
… …
1784 $::CFG->{inv_sort} = $_[1]; 1850 $::CFG->{inv_sort} = $_[1];
1785 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1851 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1786 }, 1852 },
1787 ); 1853 );
1788 $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);
1789 #TODO# update to weigh/maxweight 1855 #TODO# update to weight/maxweight
1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1856 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1791 1857
1792 $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);
1793 $sw1->add ($INV = new DC::UI::Inventory); 1859 $sw1->add ($INV = new DC::UI::Inventory);
1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1860 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2121 $dialog->show; 2187 $dialog->show;
2122 }; 2188 };
2123} 2189}
2124 2190
2125sub sdl_init { 2191sub sdl_init {
2126 DC::SDL_Init 2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2127 and die "SDL::Init failed!\n"; 2193 and die "SDL::Init failed!\n";
2128} 2194}
2129 2195
2130sub 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
2131 $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 }
2132 2213
2133 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2134 2215
2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2136 $FULLSCREEN = $CFG->{fullscreen}; 2217 $FULLSCREEN = $CFG->{fullscreen};
… …
2242 force_h => $::HEIGHT * 0.6, 2323 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2324 has_close_button => 1,
2244 ; 2325 ;
2245 2326
2246 $METASERVER = metaserver_dialog; 2327 $METASERVER = metaserver_dialog;
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2328 # the name is changed to not conflict with the older name as users could have hidden it
2329 $MESSAGE_WINDOW = new DC::UI::Dockbar
2330 name => "message_window2",
2331 title => 'Messages',
2332 force_w => $::WIDTH * 0.6,
2333 force_h => $::HEIGHT * 0.25,
2334 ;
2335
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2336 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2337
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2338 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2339 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2340
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2341 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2342 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2343 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2361 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2274 2362
2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2363 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2276 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2364 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2277 2365
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2366# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2279 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2367# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2280 2368
2281 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 2369 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
2282 2370
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2371 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2284 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2372 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2286 $BUTTONBAR->add (new DC::UI::Button 2374 $BUTTONBAR->add (new DC::UI::Button
2287 text => "Save Config", 2375 text => "Save Config",
2288 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2376 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2289 on_activate => sub { 2377 on_activate => sub {
2290 $::CFG->{layout} = DC::UI::get_layout; 2378 $::CFG->{layout} = DC::UI::get_layout;
2291 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2379 DC::write_cfg;
2292 status "Configuration Saved"; 2380 status "Configuration Saved";
2293 0 2381 0
2294 }, 2382 },
2295 ); 2383 );
2296 2384
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2386 tooltip => "View Documentation");
2299
2300 2387
2301 $BUTTONBAR->add (new DC::UI::Button 2388 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2389 text => "Quit",
2303 tooltip => "Terminates the program", 2390 tooltip => "Terminates the program",
2304 on_activate => sub { 2391 on_activate => sub {
… …
2314 $BUTTONBAR->show; 2401 $BUTTONBAR->show;
2315 $SETUP_DIALOG->show; 2402 $SETUP_DIALOG->show;
2316 $MESSAGE_WINDOW->show; 2403 $MESSAGE_WINDOW->show;
2317 } 2404 }
2318 2405
2406 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2407 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2408
2409 $CAVEAT_LABEL->set_text ("None :)");
2410 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2411 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2412
2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2413 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2320} 2414}
2321 2415
2322sub video_shutdown { 2416sub video_shutdown {
2323 DC::OpenGL::shutdown; 2417 DC::OpenGL::shutdown;
2418 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2324 2419
2325 undef $SDL_ACTIVE; 2420 undef $SDL_ACTIVE;
2326} 2421}
2327 2422
2328my %animate_object; 2423my %animate_object;
… …
2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2484# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2390 }, 2485 },
2391 DC::SDL_KEYDOWN => sub { 2486 DC::SDL_KEYDOWN => sub {
2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2487 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2393 # alt-enter 2488 # alt-enter
2489 video_shutdown;
2394 $FULLSCREEN_ENABLE->toggle; 2490 $FULLSCREEN_ENABLE->toggle;
2395 video_shutdown;
2396 video_init; 2491 video_init;
2397 } else { 2492 } else {
2398 &DC::UI::feed_sdl_key_down_event; 2493 &DC::UI::feed_sdl_key_down_event;
2399 } 2494 }
2400 update_modbox; 2495 update_modbox;
… …
2421 EV::unloop; 2516 EV::unloop;
2422 #d# TODO calling exit here hangs the process in some futex 2517 #d# TODO calling exit here hangs the process in some futex
2423}; 2518};
2424 2519
2425{ 2520{
2521 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522
2426 if (-e "$Deliantra::VARDIR/client.cf") { 2523 if (-e "$Deliantra::VARDIR/client.cf") {
2427 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2524 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2428 } else { 2525 } else {
2429 #TODO: compatibility cruft 2526 #TODO: compatibility cruft
2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2527 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2431 print STDERR "INFO: used old configuration file\n"; 2528 print STDERR "INFO: used old configuration file\n";
2432 } 2529 }
2433 2530
2434 DC::DB::Server::run; 2531 DC::DB::Server::run;
2435 2532
2533 if ($CFG->{db_schema} < 1) {
2534 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535 DC::DB::nuke_db;
2536 $CFG->{db_schema} = 1;
2537 DC::write_cfg;
2538 }
2539
2540 DC::DB::open_db;
2541
2436 DC::UI::set_layout ($::CFG->{layout}); 2542 DC::UI::set_layout ($::CFG->{layout});
2437 2543
2438 my %DEF_CFG = ( 2544 my %DEF_CFG = (
2439 sdl_mode => 0, 2545 sdl_mode => 0,
2440 fullscreen => 1, 2546 fullscreen => 1,
2441 fast => 0, 2547 fast => 0,
2442 force_opengl11 => undef, 2548 force_opengl11 => undef,
2549 disable_alpha => 0,
2550 smooth_movement => 1,
2443 texture_compression => 1, 2551 texture_compression => 1,
2444 map_scale => 1, 2552 map_scale => 1,
2445 fow_enable => 1, 2553 fow_enable => 1,
2446 fow_intensity => 0, 2554 fow_intensity => 0,
2447 map_smoothing => 1, 2555 map_smoothing => 1,
… …
2464 pickup => 0, 2572 pickup => 0,
2465 inv_sort => "mtime", 2573 inv_sort => "mtime",
2466 default => "profile", # default profile 2574 default => "profile", # default profile
2467 show_tips => 1, 2575 show_tips => 1,
2468 logview_max_par => 1000, 2576 logview_max_par => 1000,
2577 shift_fire_stop => 0,
2469 ); 2578 );
2470 2579
2471 while (my ($k, $v) = each %DEF_CFG) { 2580 while (my ($k, $v) = each %DEF_CFG) {
2472 $CFG->{$k} = $v unless exists $CFG->{$k}; 2581 $CFG->{$k} = $v unless exists $CFG->{$k};
2473 } 2582 }
… …
2486 } 2595 }
2487 } 2596 }
2488 } 2597 }
2489 2598
2490 sdl_init; 2599 sdl_init;
2491
2492 @SDL_MODES = DC::SDL_ListModes 8, 8;
2493 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2494 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2495
2496 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2497
2498 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2499 2600
2500 { 2601 {
2501 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2602 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2502 DejaVuSans.ttf 2603 DejaVuSans.ttf
2503 DejaVuSansMono.ttf 2604 DejaVuSansMono.ttf
… …
2541our $STARTUP_CANCEL = EV::idle sub { 2642our $STARTUP_CANCEL = EV::idle sub {
2542 undef $::STARTUP_CANCEL; 2643 undef $::STARTUP_CANCEL;
2543 $startup_done->(); 2644 $startup_done->();
2544}; 2645};
2545 2646
2647delete $SIG{__DIE__};
2546EV::loop; 2648EV::loop;
2547 2649
2548#video_shutdown; 2650#video_shutdown;
2549#audio_shutdown; 2651#audio_shutdown;
2550DC::OpenGL::quit; 2652DC::OpenGL::quit;
… …
2574 4 show fps 2676 4 show fps
2575 8 suppress tooltips 2677 8 suppress tooltips
2576 2678
2577=head1 AUTHOR 2679=head1 AUTHOR
2578 2680
2579Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2681Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2580 2682
2581 2683
2582 2684

Diff Legend

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