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.25 by elmex, Sun Jan 6 17:40:45 2008 UTC vs.
Revision 1.52 by root, Fri Jul 18 21:18:42 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;
… …
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
142our @SDL_MODES; 146our @SDL_MODES;
147our $SDL_REINIT = 1;
143our $WIDTH; 148our $WIDTH;
144our $HEIGHT; 149our $HEIGHT;
145our $FULLSCREEN; 150our $FULLSCREEN;
146our $FONTSIZE; 151our $FONTSIZE;
147 152
… …
190our $SDL_ACTIVE; 195our $SDL_ACTIVE;
191our %SDL_CB; 196our %SDL_CB;
192 197
193our $ALT_ENTER_MESSAGE; 198our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 199our $STATUSBOX;
200our $MODBOX;
195our $DEBUG_STATUS; 201our $DEBUG_STATUS;
196 202
197our $INV; 203our $INV;
198our $INVR; 204our $INVR;
199our $INVR_HB; 205our $INVR_HB;
… …
208 $DEBUG_STATUS->set_text ($_[0]); 214 $DEBUG_STATUS->set_text ($_[0]);
209} 215}
210 216
211sub message { 217sub message {
212 $MESSAGE_DIST->message (@_); 218 $MESSAGE_DIST->message (@_);
219}
220
221sub update_modbox {
222 my $mod = DC::SDL_GetModState;
223
224 my $markup;
225
226 $markup .= $mod & DC::KMOD_CTRL
227 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
228 : "[<span foreground='#888'> once </span>]";
229
230 $markup .= $mod & DC::KMOD_SHIFT
231 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
232 : "[<span foreground='#888'>move</span>]";
233
234 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
235 ? "[ALT]"
236 : "[<span foreground='#888'>alt</span>]";
237
238 $markup .= $mod & DC::KMOD_NUM
239 ? "[NUM]"
240 : "[<span foreground='#888'>num</span>]";
241
242 # <tt> around next statement works around some bug that keeps the
243 # "font =>" from being used on windows
244 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 245}
214 246
215############################################################################# 247#############################################################################
216#TODO: maybe move into own audio module... 248#TODO: maybe move into own audio module...
217 249
… …
637 # right: accept 669 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 670 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 671 text => "Accept",
640 on_activate => sub { 672 on_activate => sub {
641 $conn->send ("reply n"); 673 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 674 destroy_query_dialog $conn;
644 0 675 0
645 }, 676 },
646 ); 677 );
647 678
… …
699 730
700 $vbox->add (@dialog); 731 $vbox->add (@dialog);
701 $dialog->show; 732 $dialog->show;
702} 733}
703 734
704sub start_game { 735sub dc_connect {
705 status "logging in..."; 736 my ($host, $port) = @_;
706
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709 737
710 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 738 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
711 739
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 740 $CONN =
717 new DC::Protocol 741 new DC::Protocol
718 host => $host, 742 host => $host,
719 port => $port || 13327, 743 port => $port,
720 user => $PROFILE->{user}, 744 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 745 pass => $PROFILE->{password},
722 mapw => $mapsize, 746 mapw => $mapsize,
723 maph => $mapsize, 747 maph => $mapsize,
724 748
725 client => "cfplus $DC::VERSION $] $^O", 749 client => "$DC::VERSION $] $^O",
726 750
727 map_widget => $MAPWIDGET, 751 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 752 statusbox => $STATUSBOX,
729 map => $MAP, 753 map => $MAP,
730 mapmap => $MAPMAP, 754 mapmap => $MAPMAP,
731 query => \&server_query, 755 query => \&server_query,
732 756
733 setup_req => { 757 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 758 smoothing => $CFG->{map_smoothing}*1,
735 }, 759 },
736 };
737 760
738 if ($CONN) { 761 on_connect => sub {
762 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 763 DC::lowdelay fileno $CONN->{fh};
740 764
741 status "login successful"; 765 status "login successful";
766 } else {
767 undef $CONN;
768 status "unable to connect: $!";
769 stop_game();
770 }
771 },
772 ;
773}
774
775sub start_game {
776 status "logging in...";
777
778 $LOGIN_BUTTON->set_text ("Logout");
779 $SETUP_DIALOG->hide;
780
781 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
782
783 $MAP = new DC::Map;
784
785 # hack to make SURE we find the IP address all right
786 # can be removed once AnyEvent::DNS is proven stable.
787 if ($host eq "gameserver.deliantra.net") {
788 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
789 if ($_[0] ne "80.101.114.108") { # Perl
790 status "dns failure, using hardcoded address";
791 $host = "129.13.162.95";
792 }
793
794 dc_connect $host, $port;
795 };
742 } else { 796 } else {
743 status "unable to connect"; 797 dc_connect $host, $port;
744 stop_game();
745 } 798 }
746} 799}
747 800
748sub stop_game { 801sub stop_game {
749 $LOGIN_BUTTON->set_text ("Login / Register"); 802 $LOGIN_BUTTON->set_text ("Login / Register");
… …
812 state => $CFG->{force_opengl11}, 865 state => $CFG->{force_opengl11},
813 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 866 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
814 . "higher memory usage and slower performance. It will, however, help tremendously on " 867 . "higher memory usage and slower performance. It will, however, help tremendously on "
815 . "cards that claim to support a feature but fall back to software rendering. " 868 . "cards that claim to support a feature but fall back to software rendering. "
816 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 869 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
817 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 870 . "but cards and drivers from other vendors (ATI) are often just as bad. "
818 . "experience extremely low framerates and your card should do better, try this option.</b>", 871 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 872 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{disable_alpha},
878 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
879 . "by disabling a number of textures and transparency effects. Normally, these "
880 . "effects do not cost a lot of resources, but some graphics cards might fall "
881 . "back to etxremely slow rendering if this is enabled. If disabling this option "
882 . "noticably improves the framerate of the client please report this! "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub {
885 my ($self, $value) = @_;
886 $CFG->{disable_alpha} = $value;
887 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
888 0
889 }
820 ); 890 );
821 891
822 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 892 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 893 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 894 state => $CFG->{texture_compression},
… …
1528 1598
1529 $vbox->add ( 1599 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1600 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1601 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1602 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1603 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1604 on_changed => sub {
1535 my ($self, $value) = @_; 1605 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1606 $CFG->{profile}{default}{host} = $value;
1537 1 1607 1
1538 } 1608 }
… …
1541 if (0) { #d# disabled 1611 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1612 $vbox->add (new DC::UI::Button
1543 expand => 1, 1613 expand => 1,
1544 text => "Server List", 1614 text => "Server List",
1545 other => $METASERVER, 1615 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1616 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1617 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1618 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1619 );
1550 }#d# 1620 }#d#
1551 } 1621 }
… …
1593 $CFG->{show_tips} = $value; 1663 $CFG->{show_tips} = $value;
1594 0 1664 0
1595 } 1665 }
1596 ); 1666 );
1597 1667
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1668 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1669 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1670 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1671 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1672 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1673 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1674 on_changed => sub {
1605 my ($self, $value) = @_; 1675 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1676 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1677 0
1608 }, 1678 },
1609 ); 1679 );
1610 1680
1611 $table 1681 $table
… …
1715 1785
1716 $r 1786 $r
1717} 1787}
1718 1788
1719my %SORT_ORDER = ( 1789my %SORT_ORDER = (
1720 type => undef, 1790 type => sub {
1791 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1792 },
1721 mtime => sub { 1793 mtime => sub {
1722 my $NOW = time; 1794 my $NOW = time;
1723 sort { 1795 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1796 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1797 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1947 my @path = DC::Pod::full_path_of $node; 2019 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2020 pop @path; # drop current node
1949 2021
1950 for my $node (@path) { 2022 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2023 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2024 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2025 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2026 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2027 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2028 $load_node->($node);
1957 }, 2029 },
1958 ); 2030 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2031 $buttons->add (new DC::UI::Label text => "/");
1960 } 2032 }
1961 2033
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2034 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2035
1964 $curnode = $node; 2036 $curnode = $node;
1965 2037
1966 $viewer->clear; 2038 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2039 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2093 $dialog->show; 2165 $dialog->show;
2094 }; 2166 };
2095} 2167}
2096 2168
2097sub sdl_init { 2169sub sdl_init {
2098 DC::SDL_Init 2170 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2171 and die "SDL::Init failed!\n";
2100} 2172}
2101 2173
2102sub video_init { 2174sub video_init {
2175 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2176 $SDL_REINIT = 0;
2177
2178 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2179 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2180 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2181 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2182
2183 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2184
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2185 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {
2186 $CFG->{sdl_mode} = 0;
2187 for (reverse 0 .. $#SDL_MODES) {
2188 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2189 }
2190 }
2104 2191
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2192 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2193
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2194 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2195 $FULLSCREEN = $CFG->{fullscreen};
… …
2146 force_x => "max", 2233 force_x => "max",
2147 force_y => 0; 2234 force_y => 0;
2148 $DEBUG_STATUS->show; 2235 $DEBUG_STATUS->show;
2149 2236
2150 $STATUSBOX = new DC::UI::Statusbox; 2237 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2238
2239 $MODBOX = new DC::UI::Label
2240 can_events => 1,
2241 can_hover => 1,
2242 markup => "",
2243 align => 0,
2244 font => $FONT_FIXED,
2245 tooltip => "#modifier_box",
2246 tooltip_width => 0.67,
2247 ;
2248
2249 update_modbox;
2152 2250
2153 (new DC::UI::Frame 2251 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2252 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2253 force_x => 0,
2156 force_y => "max", 2254 force_y => "max",
2157 child => $STATUSBOX, 2255 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2256 )->show;
2257
2258 $LR->add ($STATUSBOX);
2259 $LR->add ($MODBOX);
2260 $LR->add (new DC::UI::Label
2261 align => 0,
2262 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2263 fontsize => 0.5,
2264 fg => [1, 1, 0, 0.7],
2265 );
2159 2266
2160 DC::UI::Toplevel->new ( 2267 DC::UI::Toplevel->new (
2161 title => "Minimap", 2268 title => "Minimap",
2162 name => "mapmap", 2269 name => "mapmap",
2163 x => 0, 2270 x => 0,
… …
2194 force_h => $::HEIGHT * 0.6, 2301 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2302 has_close_button => 1,
2196 ; 2303 ;
2197 2304
2198 $METASERVER = metaserver_dialog; 2305 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2306 # the name is changed to not conflict with the older name as users could have hidden it
2307 $MESSAGE_WINDOW = new DC::UI::Dockbar
2308 name => "message_window2",
2309 title => 'Messages',
2310 force_w => $::WIDTH * 0.6,
2311 force_h => $::HEIGHT * 0.25,
2312 ;
2313
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2314 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2315
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2316 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2317 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2318
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2319 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2320 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2321 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2339 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2340
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2341 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2342 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2343
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2344# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2345# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2346
2233 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 2347 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
2234 2348
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2349 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2350 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2352 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2353 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2354 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2355 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2356 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2357 DC::write_cfg;
2244 status "Configuration Saved"; 2358 status "Configuration Saved";
2245 0 2359 0
2246 }, 2360 },
2247 ); 2361 );
2248 2362
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2363 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2364 tooltip => "View Documentation");
2251
2252 2365
2253 $BUTTONBAR->add (new DC::UI::Button 2366 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2367 text => "Quit",
2255 tooltip => "Terminates the program", 2368 tooltip => "Terminates the program",
2256 on_activate => sub { 2369 on_activate => sub {
… …
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2384 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2385}
2273 2386
2274sub video_shutdown { 2387sub video_shutdown {
2275 DC::OpenGL::shutdown; 2388 DC::OpenGL::shutdown;
2389 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2390
2277 undef $SDL_ACTIVE; 2391 undef $SDL_ACTIVE;
2278} 2392}
2279 2393
2280my %animate_object; 2394my %animate_object;
… …
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2455# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2456 },
2343 DC::SDL_KEYDOWN => sub { 2457 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2458 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2459 # alt-enter
2460 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2461 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2462 video_init;
2349 } else { 2463 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2464 &DC::UI::feed_sdl_key_down_event;
2351 } 2465 }
2466 update_modbox;
2352 }, 2467 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2468 DC::SDL_KEYUP => sub {
2469 &DC::UI::feed_sdl_key_up_event;
2470 update_modbox;
2471 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2472 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2473 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2474 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2475 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2476 if ($_[0]{code} == 1) {
… …
2369 EV::unloop; 2487 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2488 #d# TODO calling exit here hangs the process in some futex
2371}; 2489};
2372 2490
2373{ 2491{
2492 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2493
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2494 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2495 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2496 } else {
2377 #TODO: compatibility cruft 2497 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2498 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2499 print STDERR "INFO: used old configuration file\n";
2380 } 2500 }
2381 2501
2382 DC::DB::Server::run; 2502 DC::DB::Server::run;
2503
2504 if ($CFG->{db_schema} < 1) {
2505 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2506 DC::DB::nuke_db;
2507 $CFG->{db_schema} = 1;
2508 DC::write_cfg;
2509 }
2510
2511 DC::DB::open_db;
2383 2512
2384 DC::UI::set_layout ($::CFG->{layout}); 2513 DC::UI::set_layout ($::CFG->{layout});
2385 2514
2386 my %DEF_CFG = ( 2515 my %DEF_CFG = (
2387 sdl_mode => 0, 2516 sdl_mode => 0,
2388 fullscreen => 1, 2517 fullscreen => 1,
2389 fast => 0, 2518 fast => 0,
2390 force_opengl11 => undef, 2519 force_opengl11 => undef,
2520 disable_alpha => 0,
2391 texture_compression => 1, 2521 texture_compression => 1,
2392 map_scale => 1, 2522 map_scale => 1,
2393 fow_enable => 1, 2523 fow_enable => 1,
2394 fow_intensity => 0, 2524 fow_intensity => 0,
2395 map_smoothing => 1, 2525 map_smoothing => 1,
… …
2412 pickup => 0, 2542 pickup => 0,
2413 inv_sort => "mtime", 2543 inv_sort => "mtime",
2414 default => "profile", # default profile 2544 default => "profile", # default profile
2415 show_tips => 1, 2545 show_tips => 1,
2416 logview_max_par => 1000, 2546 logview_max_par => 1000,
2547 shift_fire_stop => 0,
2417 ); 2548 );
2418 2549
2419 while (my ($k, $v) = each %DEF_CFG) { 2550 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2551 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2552 }
… …
2434 } 2565 }
2435 } 2566 }
2436 } 2567 }
2437 2568
2438 sdl_init; 2569 sdl_init;
2439
2440 @SDL_MODES = DC::SDL_ListModes 8, 8;
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447 2570
2448 { 2571 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2572 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2573 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2574 DejaVuSansMono.ttf
… …
2457 DejaVuSansMono-BoldOblique.ttf 2580 DejaVuSansMono-BoldOblique.ttf
2458 ); 2581 );
2459 2582
2460 DC::add_font $_ for @fonts; 2583 DC::add_font $_ for @fonts;
2461 2584
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2585 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2586 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2587
2467 $FONT_PROP->make_default; 2588 $FONT_PROP->make_default;
2589
2590 DC::pango_init;
2468 } 2591 }
2469 2592
2470# compare mono (ft) vs. rgba (cairo) 2593# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2594# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2595# for my $rgba (0..1) {
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2612our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2613 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2614 $startup_done->();
2492}; 2615};
2493 2616
2617delete $SIG{__DIE__};
2494EV::loop; 2618EV::loop;
2495 2619
2496#video_shutdown; 2620#video_shutdown;
2497#audio_shutdown; 2621#audio_shutdown;
2498DC::OpenGL::quit; 2622DC::OpenGL::quit;

Diff Legend

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