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.22 by root, Sat Dec 29 13:44:31 2007 UTC vs.
Revision 1.56 by root, Sat Jul 19 20:33:47 2008 UTC

… …
78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
… …
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;
110use DC::UI::Inventory; 114use DC::UI::Inventory;
111use DC::UI::SpellList; 115use DC::UI::SpellList;
112use DC::UI::Dockable; 116use DC::UI::Dockable;
117use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 118use DC::UI::MessageWindow;
114use DC::UI::ChatView; 119use DC::UI::ChatView;
120use DC::MessageDistributor;
115use DC::Pod; 121use DC::Pod;
116use DC::MapWidget; 122use DC::MapWidget;
117use DC::Macro; 123use DC::Macro;
118 124
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 125$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
135our $PROFILE; # current profile 141our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 142our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 143
138our $WANT_REFRESH; 144our $WANT_REFRESH;
139 145
146our $MODE_SLIDER;
147our $CAVEAT_LABEL;
148
140our @SDL_MODES; 149our @SDL_MODES;
150our $SDL_REINIT = 1;
141our $WIDTH; 151our $WIDTH;
142our $HEIGHT; 152our $HEIGHT;
143our $FULLSCREEN; 153our $FULLSCREEN;
144our $FONTSIZE; 154our $FONTSIZE;
145 155
… …
178our $SPELL_PAGE; 188our $SPELL_PAGE;
179our $SPELL_LIST; 189our $SPELL_LIST;
180 190
181our $HELP_WINDOW; 191our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 192our $MESSAGE_WINDOW;
193our $MESSAGE_DIST;
183our $FLOORBOX; 194our $FLOORBOX;
184our $GAUGES; 195our $GAUGES;
185our $STATWIDS; 196our $STATWIDS;
186 197
187our $SDL_ACTIVE; 198our $SDL_ACTIVE;
188our %SDL_CB; 199our %SDL_CB;
189 200
190our $ALT_ENTER_MESSAGE; 201our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 202our $STATUSBOX;
203our $MODBOX;
192our $DEBUG_STATUS; 204our $DEBUG_STATUS;
193 205
194our $INV; 206our $INV;
195our $INVR; 207our $INVR;
196our $INVR_HB; 208our $INVR_HB;
… …
204sub debug { 216sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 217 $DEBUG_STATUS->set_text ($_[0]);
206} 218}
207 219
208sub message { 220sub message {
209 $MESSAGE_WINDOW->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>");
210} 248}
211 249
212############################################################################# 250#############################################################################
213#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
214 252
… …
634 # right: accept 672 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 674 text => "Accept",
637 on_activate => sub { 675 on_activate => sub {
638 $conn->send ("reply n"); 676 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
641 0 678 0
642 }, 679 },
643 ); 680 );
644 681
… …
696 733
697 $vbox->add (@dialog); 734 $vbox->add (@dialog);
698 $dialog->show; 735 $dialog->show;
699} 736}
700 737
701sub start_game { 738sub dc_connect {
702 status "logging in..."; 739 my ($host, $port) = @_;
703
704 $LOGIN_BUTTON->set_text ("Logout");
705 $SETUP_DIALOG->hide;
706 740
707 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;
708 742
709 my ($host, $port) = split /:/, $PROFILE->{host};
710
711 $MAP = new DC::Map;
712
713 $CONN = eval { 743 $CONN =
714 new DC::Protocol 744 new DC::Protocol
715 host => $host, 745 host => $host,
716 port => $port || 13327, 746 port => $port,
717 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
718 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
719 mapw => $mapsize, 749 mapw => $mapsize,
720 maph => $mapsize, 750 maph => $mapsize,
721 751
722 client => "cfplus $DC::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
723 753
724 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
725 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
726 map => $MAP, 756 map => $MAP,
727 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
728 query => \&server_query, 758 query => \&server_query,
729 759
730 setup_req => { 760 setup_req => {
731 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
732 }, 762 },
733 };
734 763
735 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
736 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
737 767
738 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 };
739 } else { 799 } else {
740 status "unable to connect"; 800 dc_connect $host, $port;
741 stop_game();
742 } 801 }
743} 802}
744 803
745sub stop_game { 804sub stop_game {
746 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
773 $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");
774 $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,
775 can_events => 1, 834 can_events => 1,
776 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
777 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
778 my $vidmode_tooltip = 845 my $vidmode_tooltip =
779 "<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). "
780 . "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>.";
781 848
782 $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");
783 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
784 851
785 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
786 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 ],
787 tooltip => $vidmode_tooltip); 855 tooltip => $vidmode_tooltip);
788 $hbox->add (my $mode_label = new DC::UI::Label 856 $hbox->add (my $mode_label = new DC::UI::Label
789 height => 0.8, template => "9999x9999@9+9", 857 height => 0.8, template => "9999x9999@9+9",
790 can_events => 1, tooltip => $vidmode_tooltip); 858 can_events => 1, tooltip => $vidmode_tooltip);
791 859
792 $mode_slider->connect (changed => sub { 860 $MODE_SLIDER->connect (changed => sub {
793 my ($self, $value) = @_; 861 my ($self, $value) = @_;
794 862
795 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
796 $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]});
797 }); 865 });
798 $mode_slider->emit (changed => $mode_slider->{range}[0]); 866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
799 867
800 $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");
801 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
802 state => $CFG->{fullscreen}, 870 state => $CFG->{fullscreen},
803 tooltip => "Bring the client into fullscreen mode.", 871 tooltip => "Bring the client into fullscreen mode.",
… …
805 ); 873 );
806 874
807 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
808 $table->add_at (1, $row++, new DC::UI::CheckBox 876 $table->add_at (1, $row++, new DC::UI::CheckBox
809 state => $CFG->{force_opengl11}, 877 state => $CFG->{force_opengl11},
810 tooltip => "Limit CFPlus 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 "
811 . "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 "
812 . "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. "
813 . "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, "
814 . "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. "
815 . "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>",
816 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 }
817 ); 902 );
818 903
819 $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");
820 $table->add_at (1, $row++, new DC::UI::CheckBox 905 $table->add_at (1, $row++, new DC::UI::CheckBox
821 state => $CFG->{texture_compression}, 906 state => $CFG->{texture_compression},
… …
848 video_init (); 933 video_init ();
849 0 934 0
850 } 935 }
851 ); 936 );
852 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 }
945 );
946
853 $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");
854 $table->add_at (1, $row++, new DC::UI::Slider 948 $table->add_at (1, $row++, new DC::UI::Slider
855 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
856 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
857 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
884 $table->add_at (1, $row++, new DC::UI::Slider 978 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
886 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
887 . "but you still need to press apply to correctly re-layout the widget.", 981 . "but you still need to press apply to correctly re-layout the widget.",
888 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
889 ); 983 );
890 984
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
892 $table->add_at (1, $row++, new DC::UI::Slider 986 $table->add_at (1, $row++, new DC::UI::Slider
893 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
… …
1525 1619
1526 $vbox->add ( 1620 $vbox->add (
1527 $HOST_ENTRY = new DC::UI::Entry 1621 $HOST_ENTRY = new DC::UI::Entry
1528 expand => 1, 1622 expand => 1,
1529 text => $CFG->{profile}{default}{host}, 1623 text => $CFG->{profile}{default}{host},
1530 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1624 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1531 on_changed => sub { 1625 on_changed => sub {
1532 my ($self, $value) = @_; 1626 my ($self, $value) = @_;
1533 $CFG->{profile}{default}{host} = $value; 1627 $CFG->{profile}{default}{host} = $value;
1534 1 1628 1
1535 } 1629 }
… …
1538 if (0) { #d# disabled 1632 if (0) { #d# disabled
1539 $vbox->add (new DC::UI::Button 1633 $vbox->add (new DC::UI::Button
1540 expand => 1, 1634 expand => 1,
1541 text => "Server List", 1635 text => "Server List",
1542 other => $METASERVER, 1636 other => $METASERVER,
1543 tooltip => "Show a list of available crossfire servers", 1637 tooltip => "Show a list of available Deliantra servers",
1544 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1638 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1545 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1639 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1546 ); 1640 );
1547 }#d# 1641 }#d#
1548 } 1642 }
… …
1590 $CFG->{show_tips} = $value; 1684 $CFG->{show_tips} = $value;
1591 0 1685 0
1592 } 1686 }
1593 ); 1687 );
1594 1688
1595 $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");
1596 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1597 text => $CFG->{logview_max_par}, 1691 text => $CFG->{logview_max_par},
1598 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 "
1599 . "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 "
1600 . "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.",
1601 on_changed => sub { 1695 on_changed => sub {
1602 my ($self, $value) = @_; 1696 my ($self, $value) = @_;
1603 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1604 0 1698 0
1605 }, 1699 },
1606 ); 1700 );
1607 1701
1608 $table 1702 $table
… …
1712 1806
1713 $r 1807 $r
1714} 1808}
1715 1809
1716my %SORT_ORDER = ( 1810my %SORT_ORDER = (
1717 type => undef, 1811 type => sub {
1812 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1813 },
1718 mtime => sub { 1814 mtime => sub {
1719 my $NOW = time; 1815 my $NOW = time;
1720 sort { 1816 sort {
1721 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1817 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1722 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1818 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1944 my @path = DC::Pod::full_path_of $node; 2040 my @path = DC::Pod::full_path_of $node;
1945 pop @path; # drop current node 2041 pop @path; # drop current node
1946 2042
1947 for my $node (@path) { 2043 for my $node (@path) {
1948 $buttons->add (new DC::UI::Button 2044 $buttons->add (new DC::UI::Button
1949 text => $node->{kw}[0], 2045 text => $node->[DC::Pod::N_KW][0],
1950 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2046 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1951 on_activate => sub { 2047 on_activate => sub {
1952 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2048 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1953 $load_node->($node); 2049 $load_node->($node);
1954 }, 2050 },
1955 ); 2051 );
1956 $buttons->add (new DC::UI::Label text => "/"); 2052 $buttons->add (new DC::UI::Label text => "/");
1957 } 2053 }
1958 2054
1959 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2055 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1960 2056
1961 $curnode = $node; 2057 $curnode = $node;
1962 2058
1963 $viewer->clear; 2059 $viewer->clear;
1964 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2060 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2090 $dialog->show; 2186 $dialog->show;
2091 }; 2187 };
2092} 2188}
2093 2189
2094sub sdl_init { 2190sub sdl_init {
2095 DC::SDL_Init 2191 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2096 and die "SDL::Init failed!\n"; 2192 and die "SDL::Init failed!\n";
2097} 2193}
2098 2194
2099sub video_init { 2195sub video_init {
2196 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2197 $SDL_REINIT = 0;
2198
2199 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2200 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2203
2204 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2205
2100 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0;
2208 for (reverse 0 .. $#SDL_MODES) {
2209 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2210 }
2211 }
2101 2212
2102 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2103 2214
2104 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2105 $FULLSCREEN = $CFG->{fullscreen}; 2216 $FULLSCREEN = $CFG->{fullscreen};
… …
2143 force_x => "max", 2254 force_x => "max",
2144 force_y => 0; 2255 force_y => 0;
2145 $DEBUG_STATUS->show; 2256 $DEBUG_STATUS->show;
2146 2257
2147 $STATUSBOX = new DC::UI::Statusbox; 2258 $STATUSBOX = new DC::UI::Statusbox;
2148 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2259
2260 $MODBOX = new DC::UI::Label
2261 can_events => 1,
2262 can_hover => 1,
2263 markup => "",
2264 align => 0,
2265 font => $FONT_FIXED,
2266 tooltip => "#modifier_box",
2267 tooltip_width => 0.67,
2268 ;
2269
2270 update_modbox;
2149 2271
2150 (new DC::UI::Frame 2272 (new DC::UI::Frame
2151 bg => [0, 0, 0, 0.4], 2273 bg => [0, 0, 0, 0.4],
2152 force_x => 0, 2274 force_x => 0,
2153 force_y => "max", 2275 force_y => "max",
2154 child => $STATUSBOX, 2276 child => (my $LR = new DC::UI::VBox),
2155 )->show; 2277 )->show;
2278
2279 $LR->add ($STATUSBOX);
2280 $LR->add ($MODBOX);
2281 $LR->add (new DC::UI::Label
2282 align => 0,
2283 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2284 fontsize => 0.5,
2285 fg => [1, 1, 0, 0.7],
2286 );
2156 2287
2157 DC::UI::Toplevel->new ( 2288 DC::UI::Toplevel->new (
2158 title => "Minimap", 2289 title => "Minimap",
2159 name => "mapmap", 2290 name => "mapmap",
2160 x => 0, 2291 x => 0,
… …
2168 2299
2169 $MAPWIDGET = new DC::MapWidget; 2300 $MAPWIDGET = new DC::MapWidget;
2170 $MAPWIDGET->connect (activate_console => sub { 2301 $MAPWIDGET->connect (activate_console => sub {
2171 my ($mapwidget, $preset) = @_; 2302 my ($mapwidget, $preset) = @_;
2172 2303
2173 $MESSAGE_WINDOW->activate_console ($preset) 2304 $MESSAGE_DIST->activate_console ($preset)
2174 if $MESSAGE_WINDOW; 2305 if $MESSAGE_DIST;
2175 }); 2306 });
2176 $MAPWIDGET->show; 2307 $MAPWIDGET->show;
2177 $MAPWIDGET->grab_focus; 2308 $MAPWIDGET->grab_focus;
2178 2309
2179 $COMPLETER = new DC::MapWidget::Command:: 2310 $COMPLETER = new DC::MapWidget::Command::
… …
2191 force_h => $::HEIGHT * 0.6, 2322 force_h => $::HEIGHT * 0.6,
2192 has_close_button => 1, 2323 has_close_button => 1,
2193 ; 2324 ;
2194 2325
2195 $METASERVER = metaserver_dialog; 2326 $METASERVER = metaserver_dialog;
2327 # the name is changed to not conflict with the older name as users could have hidden it
2196 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2328 $MESSAGE_WINDOW = new DC::UI::Dockbar
2329 name => "message_window2",
2330 title => 'Messages',
2331 force_w => $::WIDTH * 0.6,
2332 force_h => $::HEIGHT * 0.25,
2333 ;
2197 2334
2335 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2336
2198 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2337 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2199 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2338 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2200 2339
2201 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2340 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2202 "Configure the server to play on, your username and password."); 2341 "Configure the server to play on, your username and password.");
2203 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2342 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2221 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2360 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2222 2361
2223 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2362 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2224 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2363 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2225 2364
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2365# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2366# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228 2367
2229 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 2368 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
2230 2369
2231 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2370 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2232 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2371 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2234 $BUTTONBAR->add (new DC::UI::Button 2373 $BUTTONBAR->add (new DC::UI::Button
2235 text => "Save Config", 2374 text => "Save Config",
2236 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2375 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2237 on_activate => sub { 2376 on_activate => sub {
2238 $::CFG->{layout} = DC::UI::get_layout; 2377 $::CFG->{layout} = DC::UI::get_layout;
2239 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2378 DC::write_cfg;
2240 status "Configuration Saved"; 2379 status "Configuration Saved";
2241 0 2380 0
2242 }, 2381 },
2243 ); 2382 );
2244 2383
2245 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2384 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2246 tooltip => "View Documentation"); 2385 tooltip => "View Documentation");
2247
2248 2386
2249 $BUTTONBAR->add (new DC::UI::Button 2387 $BUTTONBAR->add (new DC::UI::Button
2250 text => "Quit", 2388 text => "Quit",
2251 tooltip => "Terminates the program", 2389 tooltip => "Terminates the program",
2252 on_activate => sub { 2390 on_activate => sub {
… …
2262 $BUTTONBAR->show; 2400 $BUTTONBAR->show;
2263 $SETUP_DIALOG->show; 2401 $SETUP_DIALOG->show;
2264 $MESSAGE_WINDOW->show; 2402 $MESSAGE_WINDOW->show;
2265 } 2403 }
2266 2404
2405 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2406 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2407
2408 $CAVEAT_LABEL->set_text ("None :)");
2409 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2410 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2411
2267 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2412 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2268} 2413}
2269 2414
2270sub video_shutdown { 2415sub video_shutdown {
2271 DC::OpenGL::shutdown; 2416 DC::OpenGL::shutdown;
2417 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2272 2418
2273 undef $SDL_ACTIVE; 2419 undef $SDL_ACTIVE;
2274} 2420}
2275 2421
2276my %animate_object; 2422my %animate_object;
… …
2337# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2483# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2338 }, 2484 },
2339 DC::SDL_KEYDOWN => sub { 2485 DC::SDL_KEYDOWN => sub {
2340 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2486 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2341 # alt-enter 2487 # alt-enter
2488 video_shutdown;
2342 $FULLSCREEN_ENABLE->toggle; 2489 $FULLSCREEN_ENABLE->toggle;
2343 video_shutdown;
2344 video_init; 2490 video_init;
2345 } else { 2491 } else {
2346 DC::UI::feed_sdl_key_down_event ($_[0]); 2492 &DC::UI::feed_sdl_key_down_event;
2347 } 2493 }
2494 update_modbox;
2348 }, 2495 },
2349 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2496 DC::SDL_KEYUP => sub {
2497 &DC::UI::feed_sdl_key_up_event;
2498 update_modbox;
2499 },
2350 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2500 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2351 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2501 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2352 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2502 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2353 DC::SDL_USEREVENT => sub { 2503 DC::SDL_USEREVENT => sub {
2354 if ($_[0]{code} == 1) { 2504 if ($_[0]{code} == 1) {
… …
2365 EV::unloop; 2515 EV::unloop;
2366 #d# TODO calling exit here hangs the process in some futex 2516 #d# TODO calling exit here hangs the process in some futex
2367}; 2517};
2368 2518
2369{ 2519{
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521
2370 if (-e "$Deliantra::VARDIR/client.cf") { 2522 if (-e "$Deliantra::VARDIR/client.cf") {
2371 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2523 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2372 } else { 2524 } else {
2373 #TODO: compatibility cruft 2525 #TODO: compatibility cruft
2374 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2375 print STDERR "INFO: used old configuratrion file\n"; 2527 print STDERR "INFO: used old configuration file\n";
2376 } 2528 }
2377 2529
2378 DC::DB::Server::run; 2530 DC::DB::Server::run;
2531
2532 if ($CFG->{db_schema} < 1) {
2533 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2534 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1;
2536 DC::write_cfg;
2537 }
2538
2539 DC::DB::open_db;
2379 2540
2380 DC::UI::set_layout ($::CFG->{layout}); 2541 DC::UI::set_layout ($::CFG->{layout});
2381 2542
2382 my %DEF_CFG = ( 2543 my %DEF_CFG = (
2383 sdl_mode => 0, 2544 sdl_mode => 0,
2384 fullscreen => 1, 2545 fullscreen => 1,
2385 fast => 0, 2546 fast => 0,
2386 force_opengl11 => undef, 2547 force_opengl11 => undef,
2548 disable_alpha => 0,
2549 smooth_movement => 1,
2387 texture_compression => 1, 2550 texture_compression => 1,
2388 map_scale => 1, 2551 map_scale => 1,
2389 fow_enable => 1, 2552 fow_enable => 1,
2390 fow_intensity => 0, 2553 fow_intensity => 0,
2391 map_smoothing => 1, 2554 map_smoothing => 1,
… …
2408 pickup => 0, 2571 pickup => 0,
2409 inv_sort => "mtime", 2572 inv_sort => "mtime",
2410 default => "profile", # default profile 2573 default => "profile", # default profile
2411 show_tips => 1, 2574 show_tips => 1,
2412 logview_max_par => 1000, 2575 logview_max_par => 1000,
2576 shift_fire_stop => 0,
2413 ); 2577 );
2414 2578
2415 while (my ($k, $v) = each %DEF_CFG) { 2579 while (my ($k, $v) = each %DEF_CFG) {
2416 $CFG->{$k} = $v unless exists $CFG->{$k}; 2580 $CFG->{$k} = $v unless exists $CFG->{$k};
2417 } 2581 }
… …
2430 } 2594 }
2431 } 2595 }
2432 } 2596 }
2433 2597
2434 sdl_init; 2598 sdl_init;
2435
2436 @SDL_MODES = DC::SDL_ListModes 8, 8;
2437 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2438 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2439
2440 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2441
2442 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2443 2599
2444 { 2600 {
2445 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2601 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2446 DejaVuSans.ttf 2602 DejaVuSans.ttf
2447 DejaVuSansMono.ttf 2603 DejaVuSansMono.ttf
… …
2453 DejaVuSansMono-BoldOblique.ttf 2609 DejaVuSansMono-BoldOblique.ttf
2454 ); 2610 );
2455 2611
2456 DC::add_font $_ for @fonts; 2612 DC::add_font $_ for @fonts;
2457 2613
2458 DC::pango_init;
2459
2460 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2614 $FONT_PROP = new_from_file DC::Font $fonts[0];
2461 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2615 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2462 2616
2463 $FONT_PROP->make_default; 2617 $FONT_PROP->make_default;
2618
2619 DC::pango_init;
2464 } 2620 }
2465 2621
2466# compare mono (ft) vs. rgba (cairo) 2622# compare mono (ft) vs. rgba (cairo)
2467# ft - 1.8s, cairo 3s, even in alpha-only mode 2623# ft - 1.8s, cairo 3s, even in alpha-only mode
2468# for my $rgba (0..1) { 2624# for my $rgba (0..1) {
… …
2485our $STARTUP_CANCEL = EV::idle sub { 2641our $STARTUP_CANCEL = EV::idle sub {
2486 undef $::STARTUP_CANCEL; 2642 undef $::STARTUP_CANCEL;
2487 $startup_done->(); 2643 $startup_done->();
2488}; 2644};
2489 2645
2646delete $SIG{__DIE__};
2490EV::loop; 2647EV::loop;
2491 2648
2492#video_shutdown; 2649#video_shutdown;
2493#audio_shutdown; 2650#audio_shutdown;
2494DC::OpenGL::quit; 2651DC::OpenGL::quit;

Diff Legend

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