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.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.54 by root, Fri Jul 18 22:56:11 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
… …
232 240
233 $markup .= $mod & DC::KMOD_NUM 241 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]" 242 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]"; 243 : "[<span foreground='#888'>num</span>]";
236 244
245 # <tt> around next statement works around some bug that keeps the
246 # "font =>" from being used on windows
237 $MODBOX->set_markup ($markup); 247 $MODBOX->set_markup ("<tt>$markup</tt>");
238} 248}
239 249
240############################################################################# 250#############################################################################
241#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
242 252
… …
662 # right: accept 672 # right: accept
663 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
664 text => "Accept", 674 text => "Accept",
665 on_activate => sub { 675 on_activate => sub {
666 $conn->send ("reply n"); 676 $conn->send ("reply n");
667 $STATS_PAGE->hide;
668 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
669 0 678 0
670 }, 679 },
671 ); 680 );
672 681
… …
724 733
725 $vbox->add (@dialog); 734 $vbox->add (@dialog);
726 $dialog->show; 735 $dialog->show;
727} 736}
728 737
729sub start_game { 738sub dc_connect {
730 status "logging in..."; 739 my ($host, $port) = @_;
731
732 $LOGIN_BUTTON->set_text ("Logout");
733 $SETUP_DIALOG->hide;
734 740
735 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;
736 742
737 my ($host, $port) = split /:/, $PROFILE->{host};
738
739 $MAP = new DC::Map;
740
741 $CONN = eval { 743 $CONN =
742 new DC::Protocol 744 new DC::Protocol
743 host => $host, 745 host => $host,
744 port => $port || 13327, 746 port => $port,
745 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
746 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
747 mapw => $mapsize, 749 mapw => $mapsize,
748 maph => $mapsize, 750 maph => $mapsize,
749 751
… …
756 query => \&server_query, 758 query => \&server_query,
757 759
758 setup_req => { 760 setup_req => {
759 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
760 }, 762 },
761 };
762 763
763 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
764 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
765 767
766 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 };
767 } else { 799 } else {
768 status "unable to connect"; 800 dc_connect $host, $port;
769 stop_game();
770 } 801 }
771} 802}
772 803
773sub stop_game { 804sub stop_game {
774 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
801 $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");
802 $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,
803 can_events => 1, 834 can_events => 1,
804 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
805 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
806 my $vidmode_tooltip = 845 my $vidmode_tooltip =
807 "<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). "
808 . "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>.";
809 848
810 $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");
811 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
812 851
813 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
814 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 853 force_w => $WIDTH * 0.1, expand => 1,
815 tooltip => $vidmode_tooltip); 854 tooltip => $vidmode_tooltip);
816 $hbox->add (my $mode_label = new DC::UI::Label 855 $hbox->add (my $mode_label = new DC::UI::Label
817 height => 0.8, template => "9999x9999@9+9", 856 height => 0.8, template => "9999x9999@9+9",
818 can_events => 1, tooltip => $vidmode_tooltip); 857 can_events => 1, tooltip => $vidmode_tooltip);
819 858
820 $mode_slider->connect (changed => sub { 859 $MODE_SLIDER->connect (changed => sub {
821 my ($self, $value) = @_; 860 my ($self, $value) = @_;
822 861
823 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
824 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 863 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
825 }); 864 });
826 $mode_slider->emit (changed => $mode_slider->{range}[0]); 865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
827 866
828 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
829 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
830 state => $CFG->{fullscreen}, 869 state => $CFG->{fullscreen},
831 tooltip => "Bring the client into fullscreen mode.", 870 tooltip => "Bring the client into fullscreen mode.",
… …
837 state => $CFG->{force_opengl11}, 876 state => $CFG->{force_opengl11},
838 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 877 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
839 . "higher memory usage and slower performance. It will, however, help tremendously on " 878 . "higher memory usage and slower performance. It will, however, help tremendously on "
840 . "cards that claim to support a feature but fall back to software rendering. " 879 . "cards that claim to support a feature but fall back to software rendering. "
841 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 880 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
842 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 881 . "but cards and drivers from other vendors (ATI) are often just as bad. "
843 . "experience extremely low framerates and your card should do better, try this option.</b>", 882 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
844 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 883 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
884 );
885
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887 $table->add_at (1, $row++, new DC::UI::CheckBox
888 state => $CFG->{disable_alpha},
889 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890 . "by disabling a number of textures and transparency effects. Normally, these "
891 . "effects do not cost a lot of resources, but some graphics cards might fall "
892 . "back to etxremely slow rendering if this is enabled. If disabling this option "
893 . "noticably improves the framerate of the client please report this! "
894 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895 on_changed => sub {
896 my ($self, $value) = @_;
897 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
899 0
900 }
845 ); 901 );
846 902
847 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
848 $table->add_at (1, $row++, new DC::UI::CheckBox 904 $table->add_at (1, $row++, new DC::UI::CheckBox
849 state => $CFG->{texture_compression}, 905 state => $CFG->{texture_compression},
… …
1618 $CFG->{show_tips} = $value; 1674 $CFG->{show_tips} = $value;
1619 0 1675 0
1620 } 1676 }
1621 ); 1677 );
1622 1678
1623 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1679 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1624 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1680 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1625 text => $CFG->{logview_max_par}, 1681 text => $CFG->{logview_max_par},
1626 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1682 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1627 . "sends more messages than this number, older messages get removed to save memory and " 1683 . "sends more messages than this number, older messages get removed to save memory and "
1628 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1684 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1629 on_changed => sub { 1685 on_changed => sub {
1630 my ($self, $value) = @_; 1686 my ($self, $value) = @_;
1631 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1687 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1740 1796
1741 $r 1797 $r
1742} 1798}
1743 1799
1744my %SORT_ORDER = ( 1800my %SORT_ORDER = (
1745 type => undef, 1801 type => sub {
1802 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1803 },
1746 mtime => sub { 1804 mtime => sub {
1747 my $NOW = time; 1805 my $NOW = time;
1748 sort { 1806 sort {
1749 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1807 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1750 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1808 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1972 my @path = DC::Pod::full_path_of $node; 2030 my @path = DC::Pod::full_path_of $node;
1973 pop @path; # drop current node 2031 pop @path; # drop current node
1974 2032
1975 for my $node (@path) { 2033 for my $node (@path) {
1976 $buttons->add (new DC::UI::Button 2034 $buttons->add (new DC::UI::Button
1977 text => $node->{kw}[0], 2035 text => $node->[DC::Pod::N_KW][0],
1978 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2036 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1979 on_activate => sub { 2037 on_activate => sub {
1980 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2038 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1981 $load_node->($node); 2039 $load_node->($node);
1982 }, 2040 },
1983 ); 2041 );
1984 $buttons->add (new DC::UI::Label text => "/"); 2042 $buttons->add (new DC::UI::Label text => "/");
1985 } 2043 }
1986 2044
1987 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2045 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1988 2046
1989 $curnode = $node; 2047 $curnode = $node;
1990 2048
1991 $viewer->clear; 2049 $viewer->clear;
1992 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2050 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2118 $dialog->show; 2176 $dialog->show;
2119 }; 2177 };
2120} 2178}
2121 2179
2122sub sdl_init { 2180sub sdl_init {
2123 DC::SDL_Init 2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2124 and die "SDL::Init failed!\n"; 2182 and die "SDL::Init failed!\n";
2125} 2183}
2126 2184
2127sub video_init { 2185sub video_init {
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0;
2188
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193
2194 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195
2128 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {
2197 $CFG->{sdl_mode} = 0;
2198 for (reverse 0 .. $#SDL_MODES) {
2199 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2200 }
2201 }
2129 2202
2130 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2131 2204
2132 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2133 $FULLSCREEN = $CFG->{fullscreen}; 2206 $FULLSCREEN = $CFG->{fullscreen};
… …
2178 can_events => 1, 2251 can_events => 1,
2179 can_hover => 1, 2252 can_hover => 1,
2180 markup => "", 2253 markup => "",
2181 align => 0, 2254 align => 0,
2182 font => $FONT_FIXED, 2255 font => $FONT_FIXED,
2183 tooltip => "#modifier_box"; 2256 tooltip => "#modifier_box",
2257 tooltip_width => 0.67,
2258 ;
2184 2259
2185 update_modbox; 2260 update_modbox;
2186 2261
2187 (new DC::UI::Frame 2262 (new DC::UI::Frame
2188 bg => [0, 0, 0, 0.4], 2263 bg => [0, 0, 0, 0.4],
… …
2237 force_h => $::HEIGHT * 0.6, 2312 force_h => $::HEIGHT * 0.6,
2238 has_close_button => 1, 2313 has_close_button => 1,
2239 ; 2314 ;
2240 2315
2241 $METASERVER = metaserver_dialog; 2316 $METASERVER = metaserver_dialog;
2242 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2317 # the name is changed to not conflict with the older name as users could have hidden it
2318 $MESSAGE_WINDOW = new DC::UI::Dockbar
2319 name => "message_window2",
2320 title => 'Messages',
2321 force_w => $::WIDTH * 0.6,
2322 force_h => $::HEIGHT * 0.25,
2323 ;
2324
2243 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2325 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2244 2326
2245 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2327 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2246 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2328 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2247 2329
2248 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2330 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2249 "Configure the server to play on, your username and password."); 2331 "Configure the server to play on, your username and password.");
2250 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2332 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2268 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2350 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2269 2351
2270 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2352 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2271 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2353 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2272 2354
2273 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2355# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2274 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2356# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2275 2357
2276 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 2358 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
2277 2359
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2360 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2279 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2361 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2281 $BUTTONBAR->add (new DC::UI::Button 2363 $BUTTONBAR->add (new DC::UI::Button
2282 text => "Save Config", 2364 text => "Save Config",
2283 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2365 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2284 on_activate => sub { 2366 on_activate => sub {
2285 $::CFG->{layout} = DC::UI::get_layout; 2367 $::CFG->{layout} = DC::UI::get_layout;
2286 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2368 DC::write_cfg;
2287 status "Configuration Saved"; 2369 status "Configuration Saved";
2288 0 2370 0
2289 }, 2371 },
2290 ); 2372 );
2291 2373
2292 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2374 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2293 tooltip => "View Documentation"); 2375 tooltip => "View Documentation");
2294
2295 2376
2296 $BUTTONBAR->add (new DC::UI::Button 2377 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Quit", 2378 text => "Quit",
2298 tooltip => "Terminates the program", 2379 tooltip => "Terminates the program",
2299 on_activate => sub { 2380 on_activate => sub {
… …
2309 $BUTTONBAR->show; 2390 $BUTTONBAR->show;
2310 $SETUP_DIALOG->show; 2391 $SETUP_DIALOG->show;
2311 $MESSAGE_WINDOW->show; 2392 $MESSAGE_WINDOW->show;
2312 } 2393 }
2313 2394
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397
2398 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Sofwtare Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401
2314 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2315} 2403}
2316 2404
2317sub video_shutdown { 2405sub video_shutdown {
2318 DC::OpenGL::shutdown; 2406 DC::OpenGL::shutdown;
2407 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2319 2408
2320 undef $SDL_ACTIVE; 2409 undef $SDL_ACTIVE;
2321} 2410}
2322 2411
2323my %animate_object; 2412my %animate_object;
… …
2384# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2473# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2385 }, 2474 },
2386 DC::SDL_KEYDOWN => sub { 2475 DC::SDL_KEYDOWN => sub {
2387 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2476 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2388 # alt-enter 2477 # alt-enter
2478 video_shutdown;
2389 $FULLSCREEN_ENABLE->toggle; 2479 $FULLSCREEN_ENABLE->toggle;
2390 video_shutdown;
2391 video_init; 2480 video_init;
2392 } else { 2481 } else {
2393 &DC::UI::feed_sdl_key_down_event; 2482 &DC::UI::feed_sdl_key_down_event;
2394 } 2483 }
2395 update_modbox; 2484 update_modbox;
… …
2416 EV::unloop; 2505 EV::unloop;
2417 #d# TODO calling exit here hangs the process in some futex 2506 #d# TODO calling exit here hangs the process in some futex
2418}; 2507};
2419 2508
2420{ 2509{
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511
2421 if (-e "$Deliantra::VARDIR/client.cf") { 2512 if (-e "$Deliantra::VARDIR/client.cf") {
2422 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2513 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2423 } else { 2514 } else {
2424 #TODO: compatibility cruft 2515 #TODO: compatibility cruft
2425 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2426 print STDERR "INFO: used old configuration file\n"; 2517 print STDERR "INFO: used old configuration file\n";
2427 } 2518 }
2428 2519
2429 DC::DB::Server::run; 2520 DC::DB::Server::run;
2430 2521
2522 if ($CFG->{db_schema} < 1) {
2523 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2524 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1;
2526 DC::write_cfg;
2527 }
2528
2529 DC::DB::open_db;
2530
2431 DC::UI::set_layout ($::CFG->{layout}); 2531 DC::UI::set_layout ($::CFG->{layout});
2432 2532
2433 my %DEF_CFG = ( 2533 my %DEF_CFG = (
2434 sdl_mode => 0, 2534 sdl_mode => 0,
2435 fullscreen => 1, 2535 fullscreen => 1,
2436 fast => 0, 2536 fast => 0,
2437 force_opengl11 => undef, 2537 force_opengl11 => undef,
2538 disable_alpha => 0,
2438 texture_compression => 1, 2539 texture_compression => 1,
2439 map_scale => 1, 2540 map_scale => 1,
2440 fow_enable => 1, 2541 fow_enable => 1,
2441 fow_intensity => 0, 2542 fow_intensity => 0,
2442 map_smoothing => 1, 2543 map_smoothing => 1,
… …
2459 pickup => 0, 2560 pickup => 0,
2460 inv_sort => "mtime", 2561 inv_sort => "mtime",
2461 default => "profile", # default profile 2562 default => "profile", # default profile
2462 show_tips => 1, 2563 show_tips => 1,
2463 logview_max_par => 1000, 2564 logview_max_par => 1000,
2565 shift_fire_stop => 0,
2464 ); 2566 );
2465 2567
2466 while (my ($k, $v) = each %DEF_CFG) { 2568 while (my ($k, $v) = each %DEF_CFG) {
2467 $CFG->{$k} = $v unless exists $CFG->{$k}; 2569 $CFG->{$k} = $v unless exists $CFG->{$k};
2468 } 2570 }
… …
2481 } 2583 }
2482 } 2584 }
2483 } 2585 }
2484 2586
2485 sdl_init; 2587 sdl_init;
2486
2487 @SDL_MODES = DC::SDL_ListModes 8, 8;
2488 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2489 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2490
2491 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2492
2493 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2494 2588
2495 { 2589 {
2496 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2590 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2497 DejaVuSans.ttf 2591 DejaVuSans.ttf
2498 DejaVuSansMono.ttf 2592 DejaVuSansMono.ttf
… …
2504 DejaVuSansMono-BoldOblique.ttf 2598 DejaVuSansMono-BoldOblique.ttf
2505 ); 2599 );
2506 2600
2507 DC::add_font $_ for @fonts; 2601 DC::add_font $_ for @fonts;
2508 2602
2509 DC::pango_init;
2510
2511 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2603 $FONT_PROP = new_from_file DC::Font $fonts[0];
2512 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2604 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2513 2605
2514 $FONT_PROP->make_default; 2606 $FONT_PROP->make_default;
2607
2608 DC::pango_init;
2515 } 2609 }
2516 2610
2517# compare mono (ft) vs. rgba (cairo) 2611# compare mono (ft) vs. rgba (cairo)
2518# ft - 1.8s, cairo 3s, even in alpha-only mode 2612# ft - 1.8s, cairo 3s, even in alpha-only mode
2519# for my $rgba (0..1) { 2613# for my $rgba (0..1) {
… …
2536our $STARTUP_CANCEL = EV::idle sub { 2630our $STARTUP_CANCEL = EV::idle sub {
2537 undef $::STARTUP_CANCEL; 2631 undef $::STARTUP_CANCEL;
2538 $startup_done->(); 2632 $startup_done->();
2539}; 2633};
2540 2634
2635delete $SIG{__DIE__};
2541EV::loop; 2636EV::loop;
2542 2637
2543#video_shutdown; 2638#video_shutdown;
2544#audio_shutdown; 2639#audio_shutdown;
2545DC::OpenGL::quit; 2640DC::OpenGL::quit;

Diff Legend

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