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.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.34 by root, Sun Mar 30 00:25:13 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 }
108use DC::UI; 108use DC::UI;
109use DC::UI::Canvas; 109use DC::UI::Canvas;
110use DC::UI::Inventory; 110use DC::UI::Inventory;
111use DC::UI::SpellList; 111use DC::UI::SpellList;
112use DC::UI::Dockable; 112use DC::UI::Dockable;
113use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 114use DC::UI::MessageWindow;
114use DC::UI::ChatView; 115use DC::UI::ChatView;
116use DC::MessageDistributor;
115use DC::Pod; 117use DC::Pod;
116use DC::MapWidget; 118use DC::MapWidget;
117use DC::Macro; 119use DC::Macro;
118 120
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 121$SIG{QUIT} = sub { Carp::cluck "QUIT" };
178our $SPELL_PAGE; 180our $SPELL_PAGE;
179our $SPELL_LIST; 181our $SPELL_LIST;
180 182
181our $HELP_WINDOW; 183our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 184our $MESSAGE_WINDOW;
185our $MESSAGE_DIST;
183our $FLOORBOX; 186our $FLOORBOX;
184our $GAUGES; 187our $GAUGES;
185our $STATWIDS; 188our $STATWIDS;
186 189
187our $SDL_ACTIVE; 190our $SDL_ACTIVE;
188our %SDL_CB; 191our %SDL_CB;
189 192
190our $ALT_ENTER_MESSAGE; 193our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 194our $STATUSBOX;
195our $MODBOX;
192our $DEBUG_STATUS; 196our $DEBUG_STATUS;
193 197
194our $INV; 198our $INV;
195our $INVR; 199our $INVR;
196our $INVR_HB; 200our $INVR_HB;
204sub debug { 208sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 209 $DEBUG_STATUS->set_text ($_[0]);
206} 210}
207 211
208sub message { 212sub message {
209 $MESSAGE_WINDOW->message (@_); 213 $MESSAGE_DIST->message (@_);
214}
215
216sub update_modbox {
217 my $mod = DC::SDL_GetModState;
218
219 my $markup;
220
221 $markup .= $mod & DC::KMOD_CTRL
222 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
223 : "[<span foreground='#888'> once </span>]";
224
225 $markup .= $mod & DC::KMOD_SHIFT
226 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
227 : "[<span foreground='#888'>move</span>]";
228
229 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
230 ? "[ALT]"
231 : "[<span foreground='#888'>alt</span>]";
232
233 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]";
236
237 # <tt> around next statement works around some bug that keeps the
238 # "font =>" from being used on windows
239 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 240}
211 241
212############################################################################# 242#############################################################################
213#TODO: maybe move into own audio module... 243#TODO: maybe move into own audio module...
214 244
653 [Cha => CS_STAT_CHA], 683 [Cha => CS_STAT_CHA],
654 ) { 684 ) {
655 my ($name, $id) = @$_; 685 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 686 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 687 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 688 expand => 1,
660 can_events => 1, 689 can_events => 1,
661 can_hover => 1, 690 can_hover => 1,
662 tooltip => "#stat_$name", 691 tooltip => "#stat_$name",
663 ); 692 );
718 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
720 mapw => $mapsize, 749 mapw => $mapsize,
721 maph => $mapsize, 750 maph => $mapsize,
722 751
723 client => "cfplus $DC::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
724 753
725 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
727 map => $MAP, 756 map => $MAP,
728 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
736 if ($CONN) { 765 if ($CONN) {
737 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
738 767
739 status "login successful"; 768 status "login successful";
740 } else { 769 } else {
770 warn $@;
741 status "unable to connect"; 771 status "unable to connect";
742 stop_game(); 772 stop_game();
743 } 773 }
744} 774}
745 775
769 799
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 800 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 801
772 my $row = 0; 802 my $row = 0;
773 803
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 804 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 805 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
776 can_events => 1, 806 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 808
779 my $vidmode_tooltip = 809 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 810 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
781 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 811 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 812
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 814 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 815
786 $hbox->add (my $mode_slider = new DC::UI::Slider 816 $hbox->add (my $mode_slider = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 817 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
788 tooltip => $vidmode_tooltip); 818 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 819 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 820 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 821 can_events => 1, tooltip => $vidmode_tooltip);
792 822
793 $mode_slider->connect (changed => sub { 823 $mode_slider->connect (changed => sub {
794 my ($self, $value) = @_; 824 my ($self, $value) = @_;
795 825
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 827 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 828 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 829 $mode_slider->emit (changed => $mode_slider->{range}[0]);
800 830
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 832 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 833 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 834 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 835 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 836 );
807 837
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 839 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 840 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 841 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
812 . "higher memory usage and slower performance. It will, however, help tremendously on " 842 . "higher memory usage and slower performance. It will, however, help tremendously on "
813 . "cards that claim to support a feature but fall back to software rendering. " 843 . "cards that claim to support a feature but fall back to software rendering. "
814 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 844 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
815 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 845 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 846 . "experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 847 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 848 );
819 849
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 851 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 852 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 853 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
824 . "will save a lot of memory and increase performance. The compression algorithm " 854 . "will save a lot of memory and increase performance. The compression algorithm "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 855 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 856 . "forced OpenGL 1.1 mode.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 857 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 858 );
829 859
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 860 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 861 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 862 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 863 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 864 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 865 );
836 866
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 868 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 869 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 870 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 871 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 872 );
843 873
844 $table->add_at (1, $row++, new DC::UI::Button 874 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 875 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 876 tooltip => "Apply the video settings above.",
847 on_activate => sub { 877 on_activate => sub {
848 video_shutdown (); 878 video_shutdown ();
849 video_init (); 879 video_init ();
850 0 880 0
851 } 881 }
852 ); 882 );
853 883
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 885 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 887 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 888 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 889 );
860 890
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 892 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 893 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 894 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
865 . "This increases load on the graphics subsystem and works only with TRT servers. " 895 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 896 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 897 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 898 );
869 899
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 901 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 902 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 903 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 904 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 905 );
876 906
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 908 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 909 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 910 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 911 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 912 );
883 913
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 915 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 916 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 917 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
888 . "but you still need to press apply to correctly re-layout the widget.", 918 . "but you still need to press apply to correctly re-layout the widget.",
889 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 919 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 920 );
891 921
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 922 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 923 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 924 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 925 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 926 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 927 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 928 &set_gauge_window_fontsize;
899 0 929 0
900 } 930 }
901 ); 931 );
902 932
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 934 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 935 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 936 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 937 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 938 $CFG->{gauge_size} = $_[1];
942 972
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 973 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 974
945 my $row = 0; 975 my $row = 0;
946 976
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 979 state => $CFG->{audio_enable},
950 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.", 980 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.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 981 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 982 );
953 983
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 985 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 986 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 987 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 988 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 989 $CFG->{effects_enable} = $_[1];
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 996 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 997 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 998 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 999 );
970 1000
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1001 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1002 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1003 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1004 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1005 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1006 $CFG->{bgm_enable} = $_[1];
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1013 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1014 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1015 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1016 );
987 1017
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1019 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1020 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1021 value => $CFG->{audio_hw_frequency},
992 options => [ 1022 options => [
993 [ 0, "default" , "Use System Default"], 1023 [ 0, "default" , "Use System Default"],
1002 audio_tab_update; 1032 audio_tab_update;
1003 1 1033 1
1004 } 1034 }
1005 ); 1035 );
1006 1036
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1038 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1039 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1040 value => $CFG->{audio_hw_channels},
1011 options => [ 1041 options => [
1012 [0, "default" , "Use System Default"], 1042 [0, "default" , "Use System Default"],
1021 audio_tab_update; 1051 audio_tab_update;
1022 1 1052 1
1023 } 1053 }
1024 ); 1054 );
1025 1055
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1057 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1058 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1059 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1060 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1061 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1035 1 1065 1
1036 } 1066 }
1037 ); 1067 );
1038 1068
1039 # should really be a slider 1069 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1071 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1072 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1073 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1074 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1075 template => ">= 99",
1051 1; 1081 1;
1052 } 1082 }
1053 ); 1083 );
1054 1084
1055 $table->add_at (1, $row++, new DC::UI::Button 1085 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1086 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1087 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1088 on_activate => sub {
1059 audio_shutdown (); 1089 audio_shutdown ();
1060 audio_init (); 1090 audio_init ();
1061 0 1091 0
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1141 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1112 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1142 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1113 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1143 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1114 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1144 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1145
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1146 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1147 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1148 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1149 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1150
1121 $GAUGES = { 1151 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1152 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1153 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1154 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1190 $vb->add (new DC::UI::FancyFrame 1220 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1221 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1222 child => (my $pi = new DC::UI::VBox),
1193 ); 1223 );
1194 1224
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1225 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1226 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1227 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1228 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1229 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1230 tooltip => "The map you are currently on (if supported by the server).");
1201 1231
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1232 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1233 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1234 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1235 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1236 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1237 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1238 tooltip => "The weight limit: you cannot carry more than this.");
1209 1239
1210 $vb->add (new DC::UI::FancyFrame 1240 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1241 label => "Primary/Secondary Statistics",
1232 [2, 5, st_wspd => "WSp", 10.54], 1262 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1263 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1264 my ($col, $row, $id, $label, $template) = @$_;
1235 1265
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1266 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1267 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1268 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1269 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1270 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1271 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1272 }
1243 1273
1244 $vb->add (new DC::UI::FancyFrame 1274 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1275 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1276 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1277 );
1248 1278
1249 my $row = 0; 1279 my $row = 0;
1250 my $col = 0; 1280 my $col = 0;
1251 1281
1290 1320
1291 for (qw/slow holyw conf fire depl magic 1321 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1322 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1323 blind fear tund elec cold ghit/)
1294 { 1324 {
1295 $tbl2->add_at ($col, $row, 1325 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1326 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1327 new DC::UI::Label
1298 font => $FONT_FIXED, 1328 font => $FONT_FIXED,
1299 template => "-100%", 1329 template => "-100%",
1300 align => +1, 1330 align => 1,
1301 valign => 0,
1302 can_events => 1, 1331 can_events => 1,
1303 can_hover => 1, 1332 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1333 tooltip => $resist_names{$_}->[1],
1305 ); 1334 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1335 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 can_hover => 1, 1337 can_hover => 1,
1309 can_events => 1, 1338 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1339 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1340 tooltip => $resist_names{$_}->[1],
1312 ); 1341 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1342 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1343 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1344 font => $FONT_FIXED,
1345 align => 1,
1316 can_hover => 1, 1346 can_hover => 1,
1317 can_events => 1, 1347 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1348 tooltip => $resist_names{$_}->[1],
1319 ); 1349 );
1320 1350
1321 $row++; 1351 $row++;
1322 if ($row % 6 == 0) { 1352 if ($row % 6 == 0) {
1323 $col += 3; 1353 $col += 4;
1324 $row = 0; 1354 $row = 0;
1325 } 1355 }
1326 } 1356 }
1327 1357
1328 #update_stats_window ({}); 1358 #update_stats_window ({});
1374 "The time this server has been running without being restarted.", 1404 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1405 "Short information about this server provided by its admins.",
1376 ); 1406 );
1377 my @col = qw(#Users Host Uptime Version Description); 1407 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1408 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1409 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1410 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1411 for 0 .. $#col;
1383 1412
1384 my @align = qw(1 0 1 1 -1); 1413 my @align = qw(1 0.5 1 1 0);
1385 1414
1386 my $y = 0; 1415 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1416 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1417 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1418 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1470 $vbox->add (new DC::UI::FancyFrame 1499 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1500 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1501 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1502 );
1474 1503
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1504 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1505 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1506 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1507 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1508 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1509 );
1481 1510
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1511 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1512 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1513 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1514 hidden => 1,
1486 tooltip => "The password for your character.", 1515 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1516 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1517 );
1489 1518
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1519 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1520 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1521 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1522 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1523 on_activate => sub {
1496 $CONN ? stop_game 1524 $CONN ? stop_game
1497 : start_game; 1525 : start_game;
1500 ); 1528 );
1501 1529
1502 $vbox->add (new DC::UI::FancyFrame 1530 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1531 label => "Registering",
1504 min_h => 200, 1532 min_h => 200,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1533 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1534 markup =>
1507 "To register a new account, choose a username that hasn't been taken yet and " 1535 "To register a new account, choose a username that hasn't been taken yet and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1536 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1537 ),
1510 ); 1538 );
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1548 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1549 );
1522 1550
1523 my $row = 0; 1551 my $row = 0;
1524 1552
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1553 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1554 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1555 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1556
1529 $vbox->add ( 1557 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1558 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1559 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1560 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1561 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1562 on_changed => sub {
1535 my ($self, $value) = @_; 1563 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1564 $CFG->{profile}{default}{host} = $value;
1537 1 1565 1
1538 } 1566 }
1541 if (0) { #d# disabled 1569 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1570 $vbox->add (new DC::UI::Button
1543 expand => 1, 1571 expand => 1,
1544 text => "Server List", 1572 text => "Server List",
1545 other => $METASERVER, 1573 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1574 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1575 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1576 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1577 );
1550 }#d# 1578 }#d#
1551 } 1579 }
1552 1580
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1581 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1582 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1583 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1584 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1585 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1586 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1587 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1588 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1589 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1590 );
1563 1591
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1592 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1593 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1594 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1595 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1596 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1597 . "default will be used, which is usually around 100kb/s. Most servers will "
1582sub client_setup { 1610sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1611 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1612
1585 my $row = 0; 1613 my $row = 0;
1586 1614
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1615 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1616 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1617 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1618 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1619 on_changed => sub {
1592 my ($self, $value) = @_; 1620 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1621 $CFG->{show_tips} = $value;
1594 0 1622 0
1595 } 1623 }
1596 ); 1624 );
1597 1625
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1626 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1627 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1628 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1629 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1630 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1631 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1632 on_changed => sub {
1605 my ($self, $value) = @_; 1633 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1635 0
1608 }, 1636 },
1609 ); 1637 );
1610 1638
1611 $table 1639 $table
1737 1765
1738sub inventory_widget { 1766sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1767 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1768
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1769 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1770 $vb1->add (new DC::UI::Label text => "Player");
1743 1771
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1772 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1773
1746 use sort 'stable'; 1774 use sort 'stable';
1747 1775
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1785 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1786 },
1759 ); 1787 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1788 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1789 #TODO# update to weigh/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1791
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1792 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1793 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1795
1947 my @path = DC::Pod::full_path_of $node; 1975 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 1976 pop @path; # drop current node
1949 1977
1950 for my $node (@path) { 1978 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 1979 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 1980 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 1981 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 1982 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1983 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 1984 $load_node->($node);
1957 }, 1985 },
1958 ); 1986 );
1959 $buttons->add (new DC::UI::Label text => "/"); 1987 $buttons->add (new DC::UI::Label text => "/");
1960 } 1988 }
1961 1989
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1990 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 1991
1964 $curnode = $node; 1992 $curnode = $node;
1965 1993
1966 $viewer->clear; 1994 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 1995 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2146 force_x => "max", 2174 force_x => "max",
2147 force_y => 0; 2175 force_y => 0;
2148 $DEBUG_STATUS->show; 2176 $DEBUG_STATUS->show;
2149 2177
2150 $STATUSBOX = new DC::UI::Statusbox; 2178 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2179
2180 $MODBOX = new DC::UI::Label
2181 can_events => 1,
2182 can_hover => 1,
2183 markup => "",
2184 align => 0,
2185 font => $FONT_FIXED,
2186 tooltip => "#modifier_box",
2187 tooltip_width => 0.67,
2188 ;
2189
2190 update_modbox;
2152 2191
2153 (new DC::UI::Frame 2192 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2193 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2194 force_x => 0,
2156 force_y => "max", 2195 force_y => "max",
2157 child => $STATUSBOX, 2196 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2197 )->show;
2198
2199 $LR->add ($STATUSBOX);
2200 $LR->add ($MODBOX);
2201 $LR->add (new DC::UI::Label
2202 align => 0,
2203 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2204 fontsize => 0.5,
2205 fg => [1, 1, 0, 0.7],
2206 );
2159 2207
2160 DC::UI::Toplevel->new ( 2208 DC::UI::Toplevel->new (
2161 title => "Minimap", 2209 title => "Minimap",
2162 name => "mapmap", 2210 name => "mapmap",
2163 x => 0, 2211 x => 0,
2171 2219
2172 $MAPWIDGET = new DC::MapWidget; 2220 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2221 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2222 my ($mapwidget, $preset) = @_;
2175 2223
2176 $MESSAGE_WINDOW->activate_console ($preset) 2224 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2225 if $MESSAGE_DIST;
2178 }); 2226 });
2179 $MAPWIDGET->show; 2227 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2228 $MAPWIDGET->grab_focus;
2181 2229
2182 $COMPLETER = new DC::MapWidget::Command:: 2230 $COMPLETER = new DC::MapWidget::Command::
2194 force_h => $::HEIGHT * 0.6, 2242 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2243 has_close_button => 1,
2196 ; 2244 ;
2197 2245
2198 $METASERVER = metaserver_dialog; 2246 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages');
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2200 2249
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2252
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2344 # alt-enter 2393 # alt-enter
2345 $FULLSCREEN_ENABLE->toggle; 2394 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown; 2395 video_shutdown;
2347 video_init; 2396 video_init;
2348 } else { 2397 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2398 &DC::UI::feed_sdl_key_down_event;
2350 } 2399 }
2400 update_modbox;
2351 }, 2401 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2402 DC::SDL_KEYUP => sub {
2403 &DC::UI::feed_sdl_key_up_event;
2404 update_modbox;
2405 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2406 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2407 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2408 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2409 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2410 if ($_[0]{code} == 1) {
2368 EV::unloop; 2421 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2422 #d# TODO calling exit here hangs the process in some futex
2370}; 2423};
2371 2424
2372{ 2425{
2426 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2427
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2428 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2429 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2430 } else {
2376 #TODO: compatibility cruft 2431 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2432 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2433 print STDERR "INFO: used old configuration file\n";
2379 } 2434 }
2380 2435
2381 DC::DB::Server::run; 2436 DC::DB::Server::run;
2437 DC::DB::open_db;
2382 2438
2383 DC::UI::set_layout ($::CFG->{layout}); 2439 DC::UI::set_layout ($::CFG->{layout});
2384 2440
2385 my %DEF_CFG = ( 2441 my %DEF_CFG = (
2386 sdl_mode => 0, 2442 sdl_mode => 0,
2456 DejaVuSansMono-BoldOblique.ttf 2512 DejaVuSansMono-BoldOblique.ttf
2457 ); 2513 );
2458 2514
2459 DC::add_font $_ for @fonts; 2515 DC::add_font $_ for @fonts;
2460 2516
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2517 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2518 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2519
2466 $FONT_PROP->make_default; 2520 $FONT_PROP->make_default;
2521
2522 DC::pango_init;
2467 } 2523 }
2468 2524
2469# compare mono (ft) vs. rgba (cairo) 2525# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2526# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2527# for my $rgba (0..1) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines