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.18 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.49 by root, Mon Jul 7 12:56:07 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;
103
102use Compress::LZF; 104use Compress::LZF;
103 105
104use DC; 106use DC;
107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 108use DC::OpenGL ();
106use DC::Protocol; 109use DC::Protocol;
107use DC::DB; 110use DC::DB;
108use DC::UI; 111use DC::UI;
109use DC::UI::Canvas; 112use DC::UI::Canvas;
110use DC::UI::Inventory; 113use DC::UI::Inventory;
111use DC::UI::SpellList; 114use DC::UI::SpellList;
112use DC::UI::Dockable; 115use DC::UI::Dockable;
116use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 117use DC::UI::MessageWindow;
114use DC::UI::ChatView; 118use DC::UI::ChatView;
119use DC::MessageDistributor;
115use DC::Pod; 120use DC::Pod;
116use DC::MapWidget; 121use DC::MapWidget;
117use DC::Macro; 122use DC::Macro;
118 123
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 124$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
122$EV::DIED = sub { 127$EV::DIED = sub {
123 DC::fatal Carp::longmess $@; 128 DC::fatal Carp::longmess $@;
124}; 129};
125 130
126my $MAX_FPS = 60; 131my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet
128 132
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 133our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 134
131our $LAST_REFRESH; 135our $LAST_REFRESH;
132our $NOW; 136our $NOW;
… …
179our $SPELL_PAGE; 183our $SPELL_PAGE;
180our $SPELL_LIST; 184our $SPELL_LIST;
181 185
182our $HELP_WINDOW; 186our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 187our $MESSAGE_WINDOW;
188our $MESSAGE_DIST;
184our $FLOORBOX; 189our $FLOORBOX;
185our $GAUGES; 190our $GAUGES;
186our $STATWIDS; 191our $STATWIDS;
187 192
188our $SDL_ACTIVE; 193our $SDL_ACTIVE;
189our %SDL_CB; 194our %SDL_CB;
190 195
191our $ALT_ENTER_MESSAGE; 196our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 197our $STATUSBOX;
198our $MODBOX;
193our $DEBUG_STATUS; 199our $DEBUG_STATUS;
194 200
195our $INV; 201our $INV;
196our $INVR; 202our $INVR;
197our $INVR_HB; 203our $INVR_HB;
… …
205sub debug { 211sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 212 $DEBUG_STATUS->set_text ($_[0]);
207} 213}
208 214
209sub message { 215sub message {
210 $MESSAGE_WINDOW->message (@_); 216 $MESSAGE_DIST->message (@_);
217}
218
219sub update_modbox {
220 my $mod = DC::SDL_GetModState;
221
222 my $markup;
223
224 $markup .= $mod & DC::KMOD_CTRL
225 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
226 : "[<span foreground='#888'> once </span>]";
227
228 $markup .= $mod & DC::KMOD_SHIFT
229 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
230 : "[<span foreground='#888'>move</span>]";
231
232 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
233 ? "[ALT]"
234 : "[<span foreground='#888'>alt</span>]";
235
236 $markup .= $mod & DC::KMOD_NUM
237 ? "[NUM]"
238 : "[<span foreground='#888'>num</span>]";
239
240 # <tt> around next statement works around some bug that keeps the
241 # "font =>" from being used on windows
242 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 243}
212 244
213############################################################################# 245#############################################################################
214#TODO: maybe move into own audio module... 246#TODO: maybe move into own audio module...
215 247
… …
635 # right: accept 667 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 668 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 669 text => "Accept",
638 on_activate => sub { 670 on_activate => sub {
639 $conn->send ("reply n"); 671 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 672 destroy_query_dialog $conn;
642 0 673 0
643 }, 674 },
644 ); 675 );
645 676
… …
654 [Cha => CS_STAT_CHA], 685 [Cha => CS_STAT_CHA],
655 ) { 686 ) {
656 my ($name, $id) = @$_; 687 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 688 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 689 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 690 expand => 1,
661 can_events => 1, 691 can_events => 1,
662 can_hover => 1, 692 can_hover => 1,
663 tooltip => "#stat_$name", 693 tooltip => "#stat_$name",
664 ); 694 );
… …
698 728
699 $vbox->add (@dialog); 729 $vbox->add (@dialog);
700 $dialog->show; 730 $dialog->show;
701} 731}
702 732
703sub start_game { 733sub dc_connect {
704 status "logging in..."; 734 my ($host, $port) = @_;
705
706 $LOGIN_BUTTON->set_text ("Logout");
707 $SETUP_DIALOG->hide;
708 735
709 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
710 737
711 my ($host, $port) = split /:/, $PROFILE->{host};
712
713 $MAP = new DC::Map;
714
715 $CONN = eval { 738 $CONN =
716 new DC::Protocol 739 new DC::Protocol
717 host => $host, 740 host => $host,
718 port => $port || 13327, 741 port => $port || 13327,
719 user => $PROFILE->{user}, 742 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 743 pass => $PROFILE->{password},
721 mapw => $mapsize, 744 mapw => $mapsize,
722 maph => $mapsize, 745 maph => $mapsize,
723 746
724 client => "cfplus $DC::VERSION $] $^O", 747 client => "$DC::VERSION $] $^O",
725 748
726 map_widget => $MAPWIDGET, 749 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 750 statusbox => $STATUSBOX,
728 map => $MAP, 751 map => $MAP,
729 mapmap => $MAPMAP, 752 mapmap => $MAPMAP,
730 query => \&server_query, 753 query => \&server_query,
731 754
732 setup_req => { 755 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 756 smoothing => $CFG->{map_smoothing}*1,
734 }, 757 },
735 };
736 758
737 if ($CONN) { 759 on_connect => sub {
760 if ($_[0]) {
738 DC::lowdelay fileno $CONN->{fh}; 761 DC::lowdelay fileno $CONN->{fh};
739 762
740 status "login successful"; 763 status "login successful";
764 } else {
765 undef $CONN;
766 status "unable to connect: $!";
767 stop_game();
768 }
769 },
770 ;
771}
772
773sub start_game {
774 status "logging in...";
775
776 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide;
778
779 my ($host, $port) = split /:/, $PROFILE->{host};
780
781 $MAP = new DC::Map;
782
783 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable.
785 if ($host eq "gameserver.deliantra.net") {
786 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
787 if ($_[0] ne "80.101.114.108") { # Perl
788 status "dns failure, using hardcoded address";
789 $host = "129.13.162.95";
790 }
791
792 dc_connect $host, $port;
793 };
741 } else { 794 } else {
742 status "unable to connect"; 795 dc_connect $host, $port;
743 stop_game();
744 } 796 }
745} 797}
746 798
747sub stop_game { 799sub stop_game {
748 $LOGIN_BUTTON->set_text ("Login / Register"); 800 $LOGIN_BUTTON->set_text ("Login / Register");
… …
770 822
771 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 823 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 824
773 my $row = 0; 825 my $row = 0;
774 826
775 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 827 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
776 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 828 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
777 can_events => 1, 829 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 830 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 831
780 my $vidmode_tooltip = 832 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 833 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
782 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 834 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 835
784 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 836 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
785 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 837 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 838
787 $hbox->add (my $mode_slider = new DC::UI::Slider 839 $hbox->add (my $mode_slider = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 840 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
789 tooltip => $vidmode_tooltip); 841 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 842 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 843 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 844 can_events => 1, tooltip => $vidmode_tooltip);
793 845
794 $mode_slider->connect (changed => sub { 846 $mode_slider->connect (changed => sub {
795 my ($self, $value) = @_; 847 my ($self, $value) = @_;
796 848
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 849 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 850 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 851 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 852 $mode_slider->emit (changed => $mode_slider->{range}[0]);
801 853
802 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 854 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 855 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 856 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 857 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 859 );
808 860
809 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 861 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
810 $table->add_at (1, $row++, new DC::UI::CheckBox 862 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 863 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 864 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
813 . "higher memory usage and slower performance. It will, however, help tremendously on " 865 . "higher memory usage and slower performance. It will, however, help tremendously on "
814 . "cards that claim to support a feature but fall back to software rendering. " 866 . "cards that claim to support a feature but fall back to software rendering. "
815 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 867 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
816 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 868 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
817 . "experience extremely low framerates and your card should do better, try this option.</b>", 869 . "experience extremely low framerates and your card should do better, try this option.</b>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 870 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 871 );
820 872
821 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 874 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 875 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 876 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
825 . "will save a lot of memory and increase performance. The compression algorithm " 877 . "will save a lot of memory and increase performance. The compression algorithm "
826 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 878 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 879 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 880 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 881 );
830 882
831 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 884 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 885 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 886 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 887 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 888 );
837 889
838 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new DC::UI::Slider 891 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 892 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
841 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 893 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
842 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 894 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 895 );
844 896
845 $table->add_at (1, $row++, new DC::UI::Button 897 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 898 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 899 tooltip => "Apply the video settings above.",
848 on_activate => sub { 900 on_activate => sub {
849 video_shutdown (); 901 video_shutdown ();
850 video_init (); 902 video_init ();
851 0 903 0
852 } 904 }
853 ); 905 );
854 906
855 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new DC::UI::Slider 908 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 909 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 910 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 911 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 912 );
861 913
862 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 915 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 916 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 917 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
866 . "This increases load on the graphics subsystem and works only with TRT servers. " 918 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 919 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 920 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 921 );
870 922
871 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 923 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
872 $table->add_at (1, $row++, new DC::UI::CheckBox 924 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 925 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 926 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 927 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 928 );
877 929
878 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new DC::UI::Slider 931 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 932 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
881 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 933 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
882 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 934 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 935 );
884 936
885 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new DC::UI::Slider 938 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 939 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
888 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 940 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
889 . "but you still need to press apply to correctly re-layout the widget.", 941 . "but you still need to press apply to correctly re-layout the widget.",
890 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 942 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 943 );
892 944
893 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new DC::UI::Slider 946 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 947 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
896 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 948 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 949 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 950 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 951 &set_gauge_window_fontsize;
900 0 952 0
901 } 953 }
902 ); 954 );
903 955
904 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new DC::UI::Slider 957 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 958 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 959 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 960 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 961 $CFG->{gauge_size} = $_[1];
… …
943 995
944 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 996 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 997
946 my $row = 0; 998 my $row = 0;
947 999
948 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 1001 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 1002 state => $CFG->{audio_enable},
951 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1003 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1004 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 1005 );
954 1006
955 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new DC::UI::CheckBox 1008 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 1009 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1010 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 1011 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 1012 $CFG->{effects_enable} = $_[1];
… …
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1019 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
968 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1020 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1021 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1022 );
971 1023
972 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1025 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1026 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1027 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1028 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1029 $CFG->{bgm_enable} = $_[1];
… …
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1036 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1037 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1038 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1039 );
988 1040
989 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new DC::UI::Selector 1042 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1043 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1044 value => $CFG->{audio_hw_frequency},
993 options => [ 1045 options => [
994 [ 0, "default" , "Use System Default"], 1046 [ 0, "default" , "Use System Default"],
… …
1003 audio_tab_update; 1055 audio_tab_update;
1004 1 1056 1
1005 } 1057 }
1006 ); 1058 );
1007 1059
1008 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1061 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1062 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1063 value => $CFG->{audio_hw_channels},
1012 options => [ 1064 options => [
1013 [0, "default" , "Use System Default"], 1065 [0, "default" , "Use System Default"],
… …
1022 audio_tab_update; 1074 audio_tab_update;
1023 1 1075 1
1024 } 1076 }
1025 ); 1077 );
1026 1078
1027 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1028 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1080 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1081 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1082 value => $CFG->{audio_hw_chunksize},
1031 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1083 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1032 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1084 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1036 1 1088 1
1037 } 1089 }
1038 ); 1090 );
1039 1091
1040 # should really be a slider 1092 # should really be a slider
1041 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1094 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1095 c_colspan => 2, expand => 1,
1044 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1096 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1045 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1097 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1098 template => ">= 99",
… …
1052 1; 1104 1;
1053 } 1105 }
1054 ); 1106 );
1055 1107
1056 $table->add_at (1, $row++, new DC::UI::Button 1108 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1109 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1110 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1111 on_activate => sub {
1060 audio_shutdown (); 1112 audio_shutdown ();
1061 audio_init (); 1113 audio_init ();
1062 0 1114 0
… …
1112 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1164 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1113 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1165 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1114 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1166 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1115 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1167 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116 1168
1117 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1169 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1118 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1170 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1171 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1172 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1173
1122 $GAUGES = { 1174 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1175 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1176 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1177 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1141 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1193 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1142 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1194 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1143 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1195 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1144 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1196 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1197
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1198 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1199
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1200 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1149 $t->add_at (0,0, new DC::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2); 1201 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1150 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1); 1202 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1151 $t->add_at (1,2, new DC::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2); 1203 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1152 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1204 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1153 $t->add_at (1,1, new DC::UI::Label text => "e"); 1205 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1206
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1207 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1208
1157 $c->add_items ({ 1209 $c->add_items ({
… …
1191 $vb->add (new DC::UI::FancyFrame 1243 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1244 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1245 child => (my $pi = new DC::UI::VBox),
1194 ); 1246 );
1195 1247
1196 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1248 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1249 can_hover => 1, can_events => 1,
1198 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1250 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1199 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1251 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1252 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1253 tooltip => "The map you are currently on (if supported by the server).");
1202 1254
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1255 $pi->add (my $hb0 = new DC::UI::HBox);
1204 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1256 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1257 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1258 tooltip => "The weight of the player including all inventory items.");
1207 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1259 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1260 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1261 tooltip => "The weight limit: you cannot carry more than this.");
1210 1262
1211 $vb->add (new DC::UI::FancyFrame 1263 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1264 label => "Primary/Secondary Statistics",
… …
1233 [2, 5, st_wspd => "WSp", 10.54], 1285 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1286 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1287 my ($col, $row, $id, $label, $template) = @$_;
1236 1288
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1289 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1290 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1291 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1292 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1241 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1293 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1294 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1295 }
1244 1296
1245 $vb->add (new DC::UI::FancyFrame 1297 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1298 label => "Resistancies",
1247 child => (my $tbl2 = new DC::UI::Table expand => 1), 1299 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1300 );
1249 1301
1250 my $row = 0; 1302 my $row = 0;
1251 my $col = 0; 1303 my $col = 0;
1252 1304
… …
1291 1343
1292 for (qw/slow holyw conf fire depl magic 1344 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1345 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1346 blind fear tund elec cold ghit/)
1295 { 1347 {
1296 $tbl2->add_at ($col, $row, 1348 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1349 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1350 new DC::UI::Label
1299 font => $FONT_FIXED, 1351 font => $FONT_FIXED,
1300 template => "-100%", 1352 template => "-100%",
1301 align => +1, 1353 align => 1,
1302 valign => 0,
1303 can_events => 1, 1354 can_events => 1,
1304 can_hover => 1, 1355 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1356 tooltip => $resist_names{$_}->[1],
1306 ); 1357 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1358 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1309 can_hover => 1, 1360 can_hover => 1,
1310 can_events => 1, 1361 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1362 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1363 tooltip => $resist_names{$_}->[1],
1313 ); 1364 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1365 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1366 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1367 font => $FONT_FIXED,
1368 align => 1,
1317 can_hover => 1, 1369 can_hover => 1,
1318 can_events => 1, 1370 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1371 tooltip => $resist_names{$_}->[1],
1320 ); 1372 );
1321 1373
1322 $row++; 1374 $row++;
1323 if ($row % 6 == 0) { 1375 if ($row % 6 == 0) {
1324 $col += 3; 1376 $col += 4;
1325 $row = 0; 1377 $row = 0;
1326 } 1378 }
1327 } 1379 }
1328 1380
1329 #update_stats_window ({}); 1381 #update_stats_window ({});
… …
1375 "The time this server has been running without being restarted.", 1427 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1428 "Short information about this server provided by its admins.",
1377 ); 1429 );
1378 my @col = qw(#Users Host Uptime Version Description); 1430 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1431 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1432 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1433 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1434 for 0 .. $#col;
1384 1435
1385 my @align = qw(1 0 1 1 -1); 1436 my @align = qw(1 0.5 1 1 0);
1386 1437
1387 my $y = 0; 1438 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1439 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1440 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1441 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1471 $vbox->add (new DC::UI::FancyFrame 1522 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1523 label => "Login Settings",
1473 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1524 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1525 );
1475 1526
1476 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1527 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new DC::UI::Entry 1528 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1529 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1530 tooltip => "The name of your character on the server.",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1531 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1532 );
1482 1533
1483 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1534 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new DC::UI::Entry 1535 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1536 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1537 hidden => 1,
1487 tooltip => "The password for your character.", 1538 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1539 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1540 );
1490 1541
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1542 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1543 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1544 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1545 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1546 on_activate => sub {
1497 $CONN ? stop_game 1547 $CONN ? stop_game
1498 : start_game; 1548 : start_game;
… …
1501 ); 1551 );
1502 1552
1503 $vbox->add (new DC::UI::FancyFrame 1553 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1554 label => "Registering",
1505 min_h => 200, 1555 min_h => 200,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1556 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1557 markup =>
1508 "To register a new account, choose a username that hasn't been taken yet and " 1558 "To register a new account, choose a username that hasn't been taken yet and "
1509 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1559 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1560 ),
1511 ); 1561 );
… …
1521 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1571 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1572 );
1523 1573
1524 my $row = 0; 1574 my $row = 0;
1525 1575
1526 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1576 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1577 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1578 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1579
1530 $vbox->add ( 1580 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1581 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1582 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1583 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1584 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1585 on_changed => sub {
1536 my ($self, $value) = @_; 1586 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1587 $CFG->{profile}{default}{host} = $value;
1538 1 1588 1
1539 } 1589 }
… …
1542 if (0) { #d# disabled 1592 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1593 $vbox->add (new DC::UI::Button
1544 expand => 1, 1594 expand => 1,
1545 text => "Server List", 1595 text => "Server List",
1546 other => $METASERVER, 1596 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1597 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1598 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1599 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1600 );
1551 }#d# 1601 }#d#
1552 } 1602 }
1553 1603
1554 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1604 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new DC::UI::Slider 1605 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1606 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1607 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1608 tooltip => "This is the size of the portion of the map update the server sends you. "
1559 . "If you set this to a high value you will be able to see further, " 1609 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1610 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1611 . "This option is only used once at log-in.",
1562 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1612 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1613 );
1564 1614
1565 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1615 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new DC::UI::Entry 1616 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1617 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1618 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1619 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1620 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1583sub client_setup { 1633sub client_setup {
1584 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1634 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1635
1586 my $row = 0; 1636 my $row = 0;
1587 1637
1588 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1638 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1589 $table->add_at (1, $row++, new DC::UI::CheckBox 1639 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1640 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1641 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1642 on_changed => sub {
1593 my ($self, $value) = @_; 1643 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1644 $CFG->{show_tips} = $value;
1595 0 1645 0
1596 } 1646 }
1597 ); 1647 );
1598 1648
1599 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1649 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1600 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1650 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1651 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1652 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1603 . "sends more messages than this number, older messages get removed to save memory and " 1653 . "sends more messages than this number, older messages get removed to save memory and "
1604 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1654 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1655 on_changed => sub {
1606 my ($self, $value) = @_; 1656 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1657 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1658 0
1609 }, 1659 },
1610 ); 1660 );
1611 1661
1612 $table 1662 $table
… …
1716 1766
1717 $r 1767 $r
1718} 1768}
1719 1769
1720my %SORT_ORDER = ( 1770my %SORT_ORDER = (
1721 type => undef, 1771 type => sub {
1772 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1773 },
1722 mtime => sub { 1774 mtime => sub {
1723 my $NOW = time; 1775 my $NOW = time;
1724 sort { 1776 sort {
1725 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1777 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1726 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1778 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1738 1790
1739sub inventory_widget { 1791sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1792 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1793
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1794 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1795 $vb1->add (new DC::UI::Label text => "Player");
1744 1796
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1797 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1798
1747 use sort 'stable'; 1799 use sort 'stable';
1748 1800
… …
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1810 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1811 },
1760 ); 1812 );
1761 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1813 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1814 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1815 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1816
1765 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1817 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1818 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1819 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1820
… …
1948 my @path = DC::Pod::full_path_of $node; 2000 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 2001 pop @path; # drop current node
1950 2002
1951 for my $node (@path) { 2003 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 2004 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 2005 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2006 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 2007 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2008 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 2009 $load_node->($node);
1958 }, 2010 },
1959 ); 2011 );
1960 $buttons->add (new DC::UI::Label text => "/"); 2012 $buttons->add (new DC::UI::Label text => "/");
1961 } 2013 }
1962 2014
1963 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2015 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 2016
1965 $curnode = $node; 2017 $curnode = $node;
1966 2018
1967 $viewer->clear; 2019 $viewer->clear;
1968 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2020 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2147 force_x => "max", 2199 force_x => "max",
2148 force_y => 0; 2200 force_y => 0;
2149 $DEBUG_STATUS->show; 2201 $DEBUG_STATUS->show;
2150 2202
2151 $STATUSBOX = new DC::UI::Statusbox; 2203 $STATUSBOX = new DC::UI::Statusbox;
2152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2204
2205 $MODBOX = new DC::UI::Label
2206 can_events => 1,
2207 can_hover => 1,
2208 markup => "",
2209 align => 0,
2210 font => $FONT_FIXED,
2211 tooltip => "#modifier_box",
2212 tooltip_width => 0.67,
2213 ;
2214
2215 update_modbox;
2153 2216
2154 (new DC::UI::Frame 2217 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2218 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2219 force_x => 0,
2157 force_y => "max", 2220 force_y => "max",
2158 child => $STATUSBOX, 2221 child => (my $LR = new DC::UI::VBox),
2159 )->show; 2222 )->show;
2223
2224 $LR->add ($STATUSBOX);
2225 $LR->add ($MODBOX);
2226 $LR->add (new DC::UI::Label
2227 align => 0,
2228 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2229 fontsize => 0.5,
2230 fg => [1, 1, 0, 0.7],
2231 );
2160 2232
2161 DC::UI::Toplevel->new ( 2233 DC::UI::Toplevel->new (
2162 title => "Minimap", 2234 title => "Minimap",
2163 name => "mapmap", 2235 name => "mapmap",
2164 x => 0, 2236 x => 0,
… …
2172 2244
2173 $MAPWIDGET = new DC::MapWidget; 2245 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2246 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2247 my ($mapwidget, $preset) = @_;
2176 2248
2177 $MESSAGE_WINDOW->activate_console ($preset) 2249 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2250 if $MESSAGE_DIST;
2179 }); 2251 });
2180 $MAPWIDGET->show; 2252 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2253 $MAPWIDGET->grab_focus;
2182 2254
2183 $COMPLETER = new DC::MapWidget::Command:: 2255 $COMPLETER = new DC::MapWidget::Command::
… …
2195 force_h => $::HEIGHT * 0.6, 2267 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2268 has_close_button => 1,
2197 ; 2269 ;
2198 2270
2199 $METASERVER = metaserver_dialog; 2271 $METASERVER = metaserver_dialog;
2272 # the name is changed to not conflict with the older name as users could have hidden it
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2273 $MESSAGE_WINDOW = new DC::UI::Dockbar
2274 name => "message_window2",
2275 title => 'Messages',
2276 force_w => $::WIDTH * 0.6,
2277 force_h => $::HEIGHT * 0.25,
2278 ;
2201 2279
2280 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2281
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2282 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2283 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2284
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2285 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2286 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2287 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2305 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2306
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2307 $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."); 2308 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2309
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2310# $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."); 2311# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2312
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 2313 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 2314
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2315 $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."); 2316 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2318 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2319 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.", 2320 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 { 2321 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2322 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2323 DC::write_cfg;
2244 status "Configuration Saved"; 2324 status "Configuration Saved";
2245 0 2325 0
2246 }, 2326 },
2247 ); 2327 );
2248 2328
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2329 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2330 tooltip => "View Documentation");
2251
2252 2331
2253 $BUTTONBAR->add (new DC::UI::Button 2332 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2333 text => "Quit",
2255 tooltip => "Terminates the program", 2334 tooltip => "Terminates the program",
2256 on_activate => sub { 2335 on_activate => sub {
… …
2294 $DC::UI::ROOT->draw; 2373 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2374 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2375 $LAST_REFRESH = $NOW;
2297} 2376}
2298 2377
2299my $want_refresh = EV::idle_ns \&force_refresh; 2378my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2379
2301my $input = EV::periodic 0, 1/60, undef, sub { 2380my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2381 $NOW = EV::now;
2303 2382
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2383 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2384 for DC::poll_events;
2306 2385
2307 if (%animate_object) { 2386 if (%animate_object) {
… …
2345 # alt-enter 2424 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2425 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2426 video_shutdown;
2348 video_init; 2427 video_init;
2349 } else { 2428 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2429 &DC::UI::feed_sdl_key_down_event;
2351 } 2430 }
2431 update_modbox;
2352 }, 2432 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2433 DC::SDL_KEYUP => sub {
2434 &DC::UI::feed_sdl_key_up_event;
2435 update_modbox;
2436 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2437 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2438 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2439 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2440 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2441 if ($_[0]{code} == 1) {
… …
2369 EV::unloop; 2452 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2453 #d# TODO calling exit here hangs the process in some futex
2371}; 2454};
2372 2455
2373{ 2456{
2457 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2459 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2460 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2461 } else {
2377 #TODO: compatibility cruft 2462 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2463 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2464 print STDERR "INFO: used old configuration file\n";
2380 } 2465 }
2381 2466
2382 DC::DB::Server::run; 2467 DC::DB::Server::run;
2468
2469 if ($CFG->{db_schema} < 1) {
2470 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471 DC::DB::nuke_db;
2472 $CFG->{db_schema} = 1;
2473 DC::write_cfg;
2474 }
2475
2476 DC::DB::open_db;
2383 2477
2384 DC::UI::set_layout ($::CFG->{layout}); 2478 DC::UI::set_layout ($::CFG->{layout});
2385 2479
2386 my %DEF_CFG = ( 2480 my %DEF_CFG = (
2387 sdl_mode => 0, 2481 sdl_mode => 0,
… …
2412 pickup => 0, 2506 pickup => 0,
2413 inv_sort => "mtime", 2507 inv_sort => "mtime",
2414 default => "profile", # default profile 2508 default => "profile", # default profile
2415 show_tips => 1, 2509 show_tips => 1,
2416 logview_max_par => 1000, 2510 logview_max_par => 1000,
2511 shift_fire_stop => 0,
2417 ); 2512 );
2418 2513
2419 while (my ($k, $v) = each %DEF_CFG) { 2514 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2515 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2516 }
… …
2457 DejaVuSansMono-BoldOblique.ttf 2552 DejaVuSansMono-BoldOblique.ttf
2458 ); 2553 );
2459 2554
2460 DC::add_font $_ for @fonts; 2555 DC::add_font $_ for @fonts;
2461 2556
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2557 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2558 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2559
2467 $FONT_PROP->make_default; 2560 $FONT_PROP->make_default;
2561
2562 DC::pango_init;
2468 } 2563 }
2469 2564
2470# compare mono (ft) vs. rgba (cairo) 2565# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2566# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2567# for my $rgba (0..1) {
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2584our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2585 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2586 $startup_done->();
2492}; 2587};
2493 2588
2589delete $SIG{__DIE__};
2494EV::loop; 2590EV::loop;
2495 2591
2496#video_shutdown; 2592#video_shutdown;
2497#audio_shutdown; 2593#audio_shutdown;
2498DC::OpenGL::quit; 2594DC::OpenGL::quit;

Diff Legend

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