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.53 by root, Fri Jul 18 22:32:55 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
190our $SDL_ACTIVE; 198our $SDL_ACTIVE;
191our %SDL_CB; 199our %SDL_CB;
192 200
193our $ALT_ENTER_MESSAGE; 201our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 202our $STATUSBOX;
203our $MODBOX;
195our $DEBUG_STATUS; 204our $DEBUG_STATUS;
196 205
197our $INV; 206our $INV;
198our $INVR; 207our $INVR;
199our $INVR_HB; 208our $INVR_HB;
208 $DEBUG_STATUS->set_text ($_[0]); 217 $DEBUG_STATUS->set_text ($_[0]);
209} 218}
210 219
211sub message { 220sub message {
212 $MESSAGE_DIST->message (@_); 221 $MESSAGE_DIST->message (@_);
222}
223
224sub update_modbox {
225 my $mod = DC::SDL_GetModState;
226
227 my $markup;
228
229 $markup .= $mod & DC::KMOD_CTRL
230 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
231 : "[<span foreground='#888'> once </span>]";
232
233 $markup .= $mod & DC::KMOD_SHIFT
234 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
235 : "[<span foreground='#888'>move</span>]";
236
237 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
238 ? "[ALT]"
239 : "[<span foreground='#888'>alt</span>]";
240
241 $markup .= $mod & DC::KMOD_NUM
242 ? "[NUM]"
243 : "[<span foreground='#888'>num</span>]";
244
245 # <tt> around next statement works around some bug that keeps the
246 # "font =>" from being used on windows
247 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 248}
214 249
215############################################################################# 250#############################################################################
216#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
217 252
637 # right: accept 672 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 674 text => "Accept",
640 on_activate => sub { 675 on_activate => sub {
641 $conn->send ("reply n"); 676 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
644 0 678 0
645 }, 679 },
646 ); 680 );
647 681
699 733
700 $vbox->add (@dialog); 734 $vbox->add (@dialog);
701 $dialog->show; 735 $dialog->show;
702} 736}
703 737
704sub start_game { 738sub dc_connect {
705 status "logging in..."; 739 my ($host, $port) = @_;
706
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709 740
710 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;
711 742
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 743 $CONN =
717 new DC::Protocol 744 new DC::Protocol
718 host => $host, 745 host => $host,
719 port => $port || 13327, 746 port => $port,
720 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
722 mapw => $mapsize, 749 mapw => $mapsize,
723 maph => $mapsize, 750 maph => $mapsize,
724 751
725 client => "cfplus $DC::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
726 753
727 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
729 map => $MAP, 756 map => $MAP,
730 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
731 query => \&server_query, 758 query => \&server_query,
732 759
733 setup_req => { 760 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
735 }, 762 },
736 };
737 763
738 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
740 767
741 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 };
742 } else { 799 } else {
743 status "unable to connect"; 800 dc_connect $host, $port;
744 stop_game();
745 } 801 }
746} 802}
747 803
748sub stop_game { 804sub stop_game {
749 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
776 $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");
777 $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,
778 can_events => 1, 834 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
780 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
781 my $vidmode_tooltip = 845 my $vidmode_tooltip =
782 "<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). "
783 . "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>.";
784 848
785 $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");
786 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 851
788 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
789 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 853 force_w => $WIDTH * 0.1, expand => 1,
790 tooltip => $vidmode_tooltip); 854 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 855 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 856 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 857 can_events => 1, tooltip => $vidmode_tooltip);
794 858
795 $mode_slider->connect (changed => sub { 859 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 860 my ($self, $value) = @_;
797 861
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $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]});
800 }); 864 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 866
803 $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");
804 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 869 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 870 tooltip => "Bring the client into fullscreen mode.",
812 state => $CFG->{force_opengl11}, 876 state => $CFG->{force_opengl11},
813 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 "
814 . "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 "
815 . "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. "
816 . "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, "
817 . "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. "
818 . "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>",
819 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 }
820 ); 901 );
821 902
822 $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");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 904 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 905 state => $CFG->{texture_compression},
1528 1609
1529 $vbox->add ( 1610 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1611 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1612 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1613 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1614 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1615 on_changed => sub {
1535 my ($self, $value) = @_; 1616 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1617 $CFG->{profile}{default}{host} = $value;
1537 1 1618 1
1538 } 1619 }
1541 if (0) { #d# disabled 1622 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1623 $vbox->add (new DC::UI::Button
1543 expand => 1, 1624 expand => 1,
1544 text => "Server List", 1625 text => "Server List",
1545 other => $METASERVER, 1626 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1627 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1628 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1629 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1630 );
1550 }#d# 1631 }#d#
1551 } 1632 }
1593 $CFG->{show_tips} = $value; 1674 $CFG->{show_tips} = $value;
1594 0 1675 0
1595 } 1676 }
1596 ); 1677 );
1597 1678
1598 $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");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1680 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1681 text => $CFG->{logview_max_par},
1601 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 "
1602 . "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 "
1603 . "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.",
1604 on_changed => sub { 1685 on_changed => sub {
1605 my ($self, $value) = @_; 1686 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1687 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1688 0
1608 }, 1689 },
1609 ); 1690 );
1610 1691
1611 $table 1692 $table
1715 1796
1716 $r 1797 $r
1717} 1798}
1718 1799
1719my %SORT_ORDER = ( 1800my %SORT_ORDER = (
1720 type => undef, 1801 type => sub {
1802 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1803 },
1721 mtime => sub { 1804 mtime => sub {
1722 my $NOW = time; 1805 my $NOW = time;
1723 sort { 1806 sort {
1724 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;
1725 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;
1947 my @path = DC::Pod::full_path_of $node; 2030 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2031 pop @path; # drop current node
1949 2032
1950 for my $node (@path) { 2033 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2034 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2035 text => $node->[DC::Pod::N_KW][0],
1953 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>",
1954 on_activate => sub { 2037 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2038 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2039 $load_node->($node);
1957 }, 2040 },
1958 ); 2041 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2042 $buttons->add (new DC::UI::Label text => "/");
1960 } 2043 }
1961 2044
1962 $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);
1963 2046
1964 $curnode = $node; 2047 $curnode = $node;
1965 2048
1966 $viewer->clear; 2049 $viewer->clear;
1967 $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);
2093 $dialog->show; 2176 $dialog->show;
2094 }; 2177 };
2095} 2178}
2096 2179
2097sub sdl_init { 2180sub sdl_init {
2098 DC::SDL_Init 2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2182 and die "SDL::Init failed!\n";
2100} 2183}
2101 2184
2102sub 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
2103 $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 }
2104 2202
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2204
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2206 $FULLSCREEN = $CFG->{fullscreen};
2146 force_x => "max", 2244 force_x => "max",
2147 force_y => 0; 2245 force_y => 0;
2148 $DEBUG_STATUS->show; 2246 $DEBUG_STATUS->show;
2149 2247
2150 $STATUSBOX = new DC::UI::Statusbox; 2248 $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]); 2249
2250 $MODBOX = new DC::UI::Label
2251 can_events => 1,
2252 can_hover => 1,
2253 markup => "",
2254 align => 0,
2255 font => $FONT_FIXED,
2256 tooltip => "#modifier_box",
2257 tooltip_width => 0.67,
2258 ;
2259
2260 update_modbox;
2152 2261
2153 (new DC::UI::Frame 2262 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2263 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2264 force_x => 0,
2156 force_y => "max", 2265 force_y => "max",
2157 child => $STATUSBOX, 2266 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2267 )->show;
2268
2269 $LR->add ($STATUSBOX);
2270 $LR->add ($MODBOX);
2271 $LR->add (new DC::UI::Label
2272 align => 0,
2273 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2274 fontsize => 0.5,
2275 fg => [1, 1, 0, 0.7],
2276 );
2159 2277
2160 DC::UI::Toplevel->new ( 2278 DC::UI::Toplevel->new (
2161 title => "Minimap", 2279 title => "Minimap",
2162 name => "mapmap", 2280 name => "mapmap",
2163 x => 0, 2281 x => 0,
2194 force_h => $::HEIGHT * 0.6, 2312 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2313 has_close_button => 1,
2196 ; 2314 ;
2197 2315
2198 $METASERVER = metaserver_dialog; 2316 $METASERVER = metaserver_dialog;
2199 $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
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2325 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2326
2202 $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,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2328 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2329
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2330 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2331 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2332 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2225 $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
2226 2351
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2352 $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."); 2353 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2354
2230 $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,
2231 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.");
2232 2357
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 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
2234 2359
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2360 $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."); 2361 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2238 $BUTTONBAR->add (new DC::UI::Button 2363 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2364 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.", 2365 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 { 2366 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2367 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2368 DC::write_cfg;
2244 status "Configuration Saved"; 2369 status "Configuration Saved";
2245 0 2370 0
2246 }, 2371 },
2247 ); 2372 );
2248 2373
2249 $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,
2250 tooltip => "View Documentation"); 2375 tooltip => "View Documentation");
2251
2252 2376
2253 $BUTTONBAR->add (new DC::UI::Button 2377 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2378 text => "Quit",
2255 tooltip => "Terminates the program", 2379 tooltip => "Terminates the program",
2256 on_activate => sub { 2380 on_activate => sub {
2266 $BUTTONBAR->show; 2390 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2391 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2392 $MESSAGE_WINDOW->show;
2269 } 2393 }
2270 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 ("Non-accelerated video mode")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401
2271 $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]);
2272} 2403}
2273 2404
2274sub video_shutdown { 2405sub video_shutdown {
2275 DC::OpenGL::shutdown; 2406 DC::OpenGL::shutdown;
2407 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2408
2277 undef $SDL_ACTIVE; 2409 undef $SDL_ACTIVE;
2278} 2410}
2279 2411
2280my %animate_object; 2412my %animate_object;
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2473# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2474 },
2343 DC::SDL_KEYDOWN => sub { 2475 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2476 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2477 # alt-enter
2478 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2479 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2480 video_init;
2349 } else { 2481 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2482 &DC::UI::feed_sdl_key_down_event;
2351 } 2483 }
2484 update_modbox;
2352 }, 2485 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2486 DC::SDL_KEYUP => sub {
2487 &DC::UI::feed_sdl_key_up_event;
2488 update_modbox;
2489 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2490 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2491 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2492 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2493 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2494 if ($_[0]{code} == 1) {
2369 EV::unloop; 2505 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2506 #d# TODO calling exit here hangs the process in some futex
2371}; 2507};
2372 2508
2373{ 2509{
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2512 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2513 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2514 } else {
2377 #TODO: compatibility cruft 2515 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2517 print STDERR "INFO: used old configuration file\n";
2380 } 2518 }
2381 2519
2382 DC::DB::Server::run; 2520 DC::DB::Server::run;
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;
2383 2530
2384 DC::UI::set_layout ($::CFG->{layout}); 2531 DC::UI::set_layout ($::CFG->{layout});
2385 2532
2386 my %DEF_CFG = ( 2533 my %DEF_CFG = (
2387 sdl_mode => 0, 2534 sdl_mode => 0,
2388 fullscreen => 1, 2535 fullscreen => 1,
2389 fast => 0, 2536 fast => 0,
2390 force_opengl11 => undef, 2537 force_opengl11 => undef,
2538 disable_alpha => 0,
2391 texture_compression => 1, 2539 texture_compression => 1,
2392 map_scale => 1, 2540 map_scale => 1,
2393 fow_enable => 1, 2541 fow_enable => 1,
2394 fow_intensity => 0, 2542 fow_intensity => 0,
2395 map_smoothing => 1, 2543 map_smoothing => 1,
2412 pickup => 0, 2560 pickup => 0,
2413 inv_sort => "mtime", 2561 inv_sort => "mtime",
2414 default => "profile", # default profile 2562 default => "profile", # default profile
2415 show_tips => 1, 2563 show_tips => 1,
2416 logview_max_par => 1000, 2564 logview_max_par => 1000,
2565 shift_fire_stop => 0,
2417 ); 2566 );
2418 2567
2419 while (my ($k, $v) = each %DEF_CFG) { 2568 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2569 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2570 }
2434 } 2583 }
2435 } 2584 }
2436 } 2585 }
2437 2586
2438 sdl_init; 2587 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 2588
2448 { 2589 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2590 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2591 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2592 DejaVuSansMono.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2598 DejaVuSansMono-BoldOblique.ttf
2458 ); 2599 );
2459 2600
2460 DC::add_font $_ for @fonts; 2601 DC::add_font $_ for @fonts;
2461 2602
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2603 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2604 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2605
2467 $FONT_PROP->make_default; 2606 $FONT_PROP->make_default;
2607
2608 DC::pango_init;
2468 } 2609 }
2469 2610
2470# compare mono (ft) vs. rgba (cairo) 2611# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2612# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2613# for my $rgba (0..1) {
2489our $STARTUP_CANCEL = EV::idle sub { 2630our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2631 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2632 $startup_done->();
2492}; 2633};
2493 2634
2635delete $SIG{__DIE__};
2494EV::loop; 2636EV::loop;
2495 2637
2496#video_shutdown; 2638#video_shutdown;
2497#audio_shutdown; 2639#audio_shutdown;
2498DC::OpenGL::quit; 2640DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines