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.32 by root, Tue Mar 25 19:28:56 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" };
122$EV::DIED = sub { 124$EV::DIED = sub {
123 DC::fatal Carp::longmess $@; 125 DC::fatal Carp::longmess $@;
124}; 126};
125 127
126my $MAX_FPS = 60; 128my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet
128 129
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 130our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 131
131our $LAST_REFRESH; 132our $LAST_REFRESH;
132our $NOW; 133our $NOW;
179our $SPELL_PAGE; 180our $SPELL_PAGE;
180our $SPELL_LIST; 181our $SPELL_LIST;
181 182
182our $HELP_WINDOW; 183our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 184our $MESSAGE_WINDOW;
185our $MESSAGE_DIST;
184our $FLOORBOX; 186our $FLOORBOX;
185our $GAUGES; 187our $GAUGES;
186our $STATWIDS; 188our $STATWIDS;
187 189
188our $SDL_ACTIVE; 190our $SDL_ACTIVE;
189our %SDL_CB; 191our %SDL_CB;
190 192
191our $ALT_ENTER_MESSAGE; 193our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 194our $STATUSBOX;
195our $MODBOX;
193our $DEBUG_STATUS; 196our $DEBUG_STATUS;
194 197
195our $INV; 198our $INV;
196our $INVR; 199our $INVR;
197our $INVR_HB; 200our $INVR_HB;
205sub debug { 208sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 209 $DEBUG_STATUS->set_text ($_[0]);
207} 210}
208 211
209sub message { 212sub message {
210 $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>");
211} 240}
212 241
213############################################################################# 242#############################################################################
214#TODO: maybe move into own audio module... 243#TODO: maybe move into own audio module...
215 244
654 [Cha => CS_STAT_CHA], 683 [Cha => CS_STAT_CHA],
655 ) { 684 ) {
656 my ($name, $id) = @$_; 685 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 686 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 687 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 688 expand => 1,
661 can_events => 1, 689 can_events => 1,
662 can_hover => 1, 690 can_hover => 1,
663 tooltip => "#stat_$name", 691 tooltip => "#stat_$name",
664 ); 692 );
719 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
721 mapw => $mapsize, 749 mapw => $mapsize,
722 maph => $mapsize, 750 maph => $mapsize,
723 751
724 client => "cfplus $DC::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
725 753
726 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
728 map => $MAP, 756 map => $MAP,
729 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
737 if ($CONN) { 765 if ($CONN) {
738 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
739 767
740 status "login successful"; 768 status "login successful";
741 } else { 769 } else {
770 warn $@;
742 status "unable to connect"; 771 status "unable to connect";
743 stop_game(); 772 stop_game();
744 } 773 }
745} 774}
746 775
770 799
771 $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]);
772 801
773 my $row = 0; 802 my $row = 0;
774 803
775 $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");
776 $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,
777 can_events => 1, 806 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 808
780 my $vidmode_tooltip = 809 my $vidmode_tooltip =
781 "<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). "
782 . "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>.";
783 812
784 $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");
785 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 814 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 815
787 $hbox->add (my $mode_slider = new DC::UI::Slider 816 $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], 817 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
789 tooltip => $vidmode_tooltip); 818 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 819 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 820 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 821 can_events => 1, tooltip => $vidmode_tooltip);
793 822
794 $mode_slider->connect (changed => sub { 823 $mode_slider->connect (changed => sub {
795 my ($self, $value) = @_; 824 my ($self, $value) = @_;
796 825
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $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]});
799 }); 828 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 829 $mode_slider->emit (changed => $mode_slider->{range}[0]);
801 830
802 $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");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 832 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 833 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 834 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 835 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 836 );
808 837
809 $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");
810 $table->add_at (1, $row++, new DC::UI::CheckBox 839 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 840 state => $CFG->{force_opengl11},
812 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 "
813 . "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 "
814 . "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. "
815 . "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, "
816 . "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 "
817 . "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>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 847 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 848 );
820 849
821 $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");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 851 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 852 state => $CFG->{texture_compression},
824 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 "
825 . "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 "
826 . "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 "
827 . "forced OpenGL 1.1 mode.", 856 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 857 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 858 );
830 859
831 $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");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 861 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 862 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 863 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 864 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 865 );
837 866
838 $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");
839 $table->add_at (1, $row++, new DC::UI::Slider 868 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 869 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.", 870 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 }, 871 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 872 );
844 873
845 $table->add_at (1, $row++, new DC::UI::Button 874 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 875 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 876 tooltip => "Apply the video settings above.",
848 on_activate => sub { 877 on_activate => sub {
849 video_shutdown (); 878 video_shutdown ();
850 video_init (); 879 video_init ();
851 0 880 0
852 } 881 }
853 ); 882 );
854 883
855 $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");
856 $table->add_at (1, $row++, new DC::UI::Slider 885 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 887 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 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 }
860 ); 889 );
861 890
862 $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");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 892 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 893 state => $CFG->{map_smoothing},
865 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. "
866 . "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. "
867 . "Changes take effect at next login only.", 896 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 897 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 898 );
870 899
871 $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");
872 $table->add_at (1, $row++, new DC::UI::CheckBox 901 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 902 state => $CFG->{fow_enable},
874 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.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 904 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 905 );
877 906
878 $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");
879 $table->add_at (1, $row++, new DC::UI::Slider 908 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 909 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.", 910 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 } 911 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 912 );
884 913
885 $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");
886 $table->add_at (1, $row++, new DC::UI::Slider 915 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 916 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, " 917 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.", 918 . "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 }, 919 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 920 );
892 921
893 $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");
894 $table->add_at (1, $row++, new DC::UI::Slider 923 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 924 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.", 925 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 926 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 927 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 928 &set_gauge_window_fontsize;
900 0 929 0
901 } 930 }
902 ); 931 );
903 932
904 $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");
905 $table->add_at (1, $row++, new DC::UI::Slider 934 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 935 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 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.",
908 on_changed => sub { 937 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 938 $CFG->{gauge_size} = $_[1];
943 972
944 $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]);
945 974
946 my $row = 0; 975 my $row = 0;
947 976
948 $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");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 979 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.", 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.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 981 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 982 );
954 983
955 $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");
956 $table->add_at (1, $row, new DC::UI::CheckBox 985 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 986 expand => 1, state => $CFG->{effects_enable},
958 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.",
959 on_changed => sub { 988 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 989 $CFG->{effects_enable} = $_[1];
967 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 "
968 . "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.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 998 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 999 );
971 1000
972 $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");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1002 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1003 expand => 1, state => $CFG->{bgm_enable},
975 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.",
976 on_changed => sub { 1005 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1006 $CFG->{bgm_enable} = $_[1];
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1013 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1014 tooltip => "The volume of the background music. Changes are instant.",
986 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 }
987 ); 1016 );
988 1017
989 $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");
990 $table->add_at (1, $row++, new DC::UI::Selector 1019 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1020 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1021 value => $CFG->{audio_hw_frequency},
993 options => [ 1022 options => [
994 [ 0, "default" , "Use System Default"], 1023 [ 0, "default" , "Use System Default"],
1003 audio_tab_update; 1032 audio_tab_update;
1004 1 1033 1
1005 } 1034 }
1006 ); 1035 );
1007 1036
1008 $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");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1038 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1039 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1040 value => $CFG->{audio_hw_channels},
1012 options => [ 1041 options => [
1013 [0, "default" , "Use System Default"], 1042 [0, "default" , "Use System Default"],
1022 audio_tab_update; 1051 audio_tab_update;
1023 1 1052 1
1024 } 1053 }
1025 ); 1054 );
1026 1055
1027 $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");
1028 $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
1029 c_colspan => 2, expand => 1, 1058 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1059 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 " 1060 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.", 1061 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1036 1 1065 1
1037 } 1066 }
1038 ); 1067 );
1039 1068
1040 # should really be a slider 1069 # should really be a slider
1041 $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");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1071 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1072 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.", 1073 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], 1074 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1075 template => ">= 99",
1052 1; 1081 1;
1053 } 1082 }
1054 ); 1083 );
1055 1084
1056 $table->add_at (1, $row++, new DC::UI::Button 1085 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1086 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1087 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1088 on_activate => sub {
1060 audio_shutdown (); 1089 audio_shutdown ();
1061 audio_init (); 1090 audio_init ();
1062 0 1091 0
1112 $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");
1113 $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");
1114 $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");
1115 $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");
1116 1145
1117 $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");
1118 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1147 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1148 $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"); 1149 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1150
1122 $GAUGES = { 1151 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1152 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1153 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1154 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 }); 1170 $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"); 1171 $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 }); 1172 $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() } ); 1173 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1174
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1175 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1176
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1177 $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); 1178 $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); 1179 $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); 1180 $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); 1181 $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"); 1182 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1183
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1184 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1185
1157 $c->add_items ({ 1186 $c->add_items ({
1191 $vb->add (new DC::UI::FancyFrame 1220 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1221 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1222 child => (my $pi = new DC::UI::VBox),
1194 ); 1223 );
1195 1224
1196 $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,
1197 can_hover => 1, can_events => 1, 1226 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."); 1227 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, 1228 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1229 can_hover => 1, can_events => 1,
1201 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).");
1202 1231
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1232 $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, 1233 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1234 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1235 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, 1236 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1237 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1238 tooltip => "The weight limit: you cannot carry more than this.");
1210 1239
1211 $vb->add (new DC::UI::FancyFrame 1240 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1241 label => "Primary/Secondary Statistics",
1233 [2, 5, st_wspd => "WSp", 10.54], 1262 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1263 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1264 my ($col, $row, $id, $label, $template) = @$_;
1236 1265
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1266 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1267 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1268 align => 1, template => $template, tooltip => "#stat_$label");
1240 $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
1241 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,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1271 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1272 }
1244 1273
1245 $vb->add (new DC::UI::FancyFrame 1274 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1275 label => "Resistancies",
1247 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]),
1248 ); 1277 );
1249 1278
1250 my $row = 0; 1279 my $row = 0;
1251 my $col = 0; 1280 my $col = 0;
1252 1281
1291 1320
1292 for (qw/slow holyw conf fire depl magic 1321 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1322 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1323 blind fear tund elec cold ghit/)
1295 { 1324 {
1296 $tbl2->add_at ($col, $row, 1325 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1326 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1327 new DC::UI::Label
1299 font => $FONT_FIXED, 1328 font => $FONT_FIXED,
1300 template => "-100%", 1329 template => "-100%",
1301 align => +1, 1330 align => 1,
1302 valign => 0,
1303 can_events => 1, 1331 can_events => 1,
1304 can_hover => 1, 1332 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1333 tooltip => $resist_names{$_}->[1],
1306 ); 1334 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1335 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1309 can_hover => 1, 1337 can_hover => 1,
1310 can_events => 1, 1338 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1339 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1340 tooltip => $resist_names{$_}->[1],
1313 ); 1341 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1342 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1343 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1344 font => $FONT_FIXED,
1345 align => 1,
1317 can_hover => 1, 1346 can_hover => 1,
1318 can_events => 1, 1347 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1348 tooltip => $resist_names{$_}->[1],
1320 ); 1349 );
1321 1350
1322 $row++; 1351 $row++;
1323 if ($row % 6 == 0) { 1352 if ($row % 6 == 0) {
1324 $col += 3; 1353 $col += 4;
1325 $row = 0; 1354 $row = 0;
1326 } 1355 }
1327 } 1356 }
1328 1357
1329 #update_stats_window ({}); 1358 #update_stats_window ({});
1375 "The time this server has been running without being restarted.", 1404 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1405 "Short information about this server provided by its admins.",
1377 ); 1406 );
1378 my @col = qw(#Users Host Uptime Version Description); 1407 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1408 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1409 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1410 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1411 for 0 .. $#col;
1384 1412
1385 my @align = qw(1 0 1 1 -1); 1413 my @align = qw(1 0.5 1 1 0);
1386 1414
1387 my $y = 0; 1415 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1416 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1417 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$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)};
1471 $vbox->add (new DC::UI::FancyFrame 1499 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1500 label => "Login Settings",
1473 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]),
1474 ); 1502 );
1475 1503
1476 $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");
1477 $table->add_at (1, 4, new DC::UI::Entry 1505 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1506 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1507 tooltip => "The name of your character on the server.",
1480 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 }
1481 ); 1509 );
1482 1510
1483 $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");
1484 $table->add_at (1, 5, new DC::UI::Entry 1512 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1513 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1514 hidden => 1,
1487 tooltip => "The password for your character.", 1515 tooltip => "The password for your character.",
1488 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 }
1489 ); 1517 );
1490 1518
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1519 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1520 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1521 text => "Login / Register",
1495 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.",
1496 on_activate => sub { 1523 on_activate => sub {
1497 $CONN ? stop_game 1524 $CONN ? stop_game
1498 : start_game; 1525 : start_game;
1501 ); 1528 );
1502 1529
1503 $vbox->add (new DC::UI::FancyFrame 1530 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1531 label => "Registering",
1505 min_h => 200, 1532 min_h => 200,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1533 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1534 markup =>
1508 "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 "
1509 . "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.",
1510 ), 1537 ),
1511 ); 1538 );
1521 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]),
1522 ); 1549 );
1523 1550
1524 my $row = 0; 1551 my $row = 0;
1525 1552
1526 $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");
1527 { 1554 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1555 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1556
1530 $vbox->add ( 1557 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1558 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1559 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1560 text => $CFG->{profile}{default}{host},
1534 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>)",
1535 on_changed => sub { 1562 on_changed => sub {
1536 my ($self, $value) = @_; 1563 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1564 $CFG->{profile}{default}{host} = $value;
1538 1 1565 1
1539 } 1566 }
1542 if (0) { #d# disabled 1569 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1570 $vbox->add (new DC::UI::Button
1544 expand => 1, 1571 expand => 1,
1545 text => "Server List", 1572 text => "Server List",
1546 other => $METASERVER, 1573 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1574 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1575 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1576 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1577 );
1551 }#d# 1578 }#d#
1552 } 1579 }
1553 1580
1554 $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");
1555 $table->add_at (1, $row, new DC::UI::Slider 1582 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1583 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1584 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 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. "
1559 . "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, "
1560 . "but you also increase bandwidth requirements and latency. " 1587 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1588 . "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 }, 1589 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1590 );
1564 1591
1565 $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");
1566 $table->add_at (1, $row, new DC::UI::Entry 1593 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1594 text => $CFG->{output_rate},
1568 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 "
1569 . "when sending data. When 0 or unset, the server " 1596 . "when sending data. When 0 or unset, the server "
1570 . "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 "
1583sub client_setup { 1610sub client_setup {
1584 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];
1585 1612
1586 my $row = 0; 1613 my $row = 0;
1587 1614
1588 $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");
1589 $table->add_at (1, $row++, new DC::UI::CheckBox 1616 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1617 state => $CFG->{show_tips},
1591 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?",
1592 on_changed => sub { 1619 on_changed => sub {
1593 my ($self, $value) = @_; 1620 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1621 $CFG->{show_tips} = $value;
1595 0 1622 0
1596 } 1623 }
1597 ); 1624 );
1598 1625
1599 $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");
1600 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1627 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1628 text => $CFG->{logview_max_par},
1602 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 "
1603 . "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 "
1604 . "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.",
1605 on_changed => sub { 1632 on_changed => sub {
1606 my ($self, $value) = @_; 1633 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1635 0
1609 }, 1636 },
1610 ); 1637 );
1611 1638
1612 $table 1639 $table
1738 1765
1739sub inventory_widget { 1766sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1767 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1768
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1769 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1770 $vb1->add (new DC::UI::Label text => "Player");
1744 1771
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1772 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1773
1747 use sort 'stable'; 1774 use sort 'stable';
1748 1775
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1785 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1786 },
1760 ); 1787 );
1761 $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);
1762 #TODO# update to weigh/maxweight 1789 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1791
1765 $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);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1793 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1795
1948 my @path = DC::Pod::full_path_of $node; 1975 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 1976 pop @path; # drop current node
1950 1977
1951 for my $node (@path) { 1978 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 1979 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 1980 text => $node->[DC::Pod::N_KW][0],
1954 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>",
1955 on_activate => sub { 1982 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1983 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 1984 $load_node->($node);
1958 }, 1985 },
1959 ); 1986 );
1960 $buttons->add (new DC::UI::Label text => "/"); 1987 $buttons->add (new DC::UI::Label text => "/");
1961 } 1988 }
1962 1989
1963 $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);
1964 1991
1965 $curnode = $node; 1992 $curnode = $node;
1966 1993
1967 $viewer->clear; 1994 $viewer->clear;
1968 $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);
2147 force_x => "max", 2174 force_x => "max",
2148 force_y => 0; 2175 force_y => 0;
2149 $DEBUG_STATUS->show; 2176 $DEBUG_STATUS->show;
2150 2177
2151 $STATUSBOX = new DC::UI::Statusbox; 2178 $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]); 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;
2153 2191
2154 (new DC::UI::Frame 2192 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2193 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2194 force_x => 0,
2157 force_y => "max", 2195 force_y => "max",
2158 child => $STATUSBOX, 2196 child => (my $LR = new DC::UI::VBox),
2159 )->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 );
2160 2207
2161 DC::UI::Toplevel->new ( 2208 DC::UI::Toplevel->new (
2162 title => "Minimap", 2209 title => "Minimap",
2163 name => "mapmap", 2210 name => "mapmap",
2164 x => 0, 2211 x => 0,
2172 2219
2173 $MAPWIDGET = new DC::MapWidget; 2220 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2221 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2222 my ($mapwidget, $preset) = @_;
2176 2223
2177 $MESSAGE_WINDOW->activate_console ($preset) 2224 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2225 if $MESSAGE_DIST;
2179 }); 2226 });
2180 $MAPWIDGET->show; 2227 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2228 $MAPWIDGET->grab_focus;
2182 2229
2183 $COMPLETER = new DC::MapWidget::Command:: 2230 $COMPLETER = new DC::MapWidget::Command::
2195 force_h => $::HEIGHT * 0.6, 2242 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2243 has_close_button => 1,
2197 ; 2244 ;
2198 2245
2199 $METASERVER = metaserver_dialog; 2246 $METASERVER = metaserver_dialog;
2200 $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;
2201 2249
2202 $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,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2252
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2294 $DC::UI::ROOT->draw; 2342 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2343 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2344 $LAST_REFRESH = $NOW;
2297} 2345}
2298 2346
2299my $want_refresh = EV::idle_ns \&force_refresh; 2347my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2348
2301my $input = EV::periodic 0, 1/60, undef, sub { 2349my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2350 $NOW = EV::now;
2303 2351
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2352 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2353 for DC::poll_events;
2306 2354
2307 if (%animate_object) { 2355 if (%animate_object) {
2345 # alt-enter 2393 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2394 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2395 video_shutdown;
2348 video_init; 2396 video_init;
2349 } else { 2397 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2398 &DC::UI::feed_sdl_key_down_event;
2351 } 2399 }
2400 update_modbox;
2352 }, 2401 },
2353 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 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2406 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2407 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2408 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2409 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2410 if ($_[0]{code} == 1) {
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2426 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2427 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2428 } else {
2377 #TODO: compatibility cruft 2429 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2431 print STDERR "INFO: used old configuration file\n";
2380 } 2432 }
2381 2433
2382 DC::DB::Server::run; 2434 DC::DB::Server::run;
2383 2435
2384 DC::UI::set_layout ($::CFG->{layout}); 2436 DC::UI::set_layout ($::CFG->{layout});
2457 DejaVuSansMono-BoldOblique.ttf 2509 DejaVuSansMono-BoldOblique.ttf
2458 ); 2510 );
2459 2511
2460 DC::add_font $_ for @fonts; 2512 DC::add_font $_ for @fonts;
2461 2513
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2514 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2515 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2516
2467 $FONT_PROP->make_default; 2517 $FONT_PROP->make_default;
2518
2519 DC::pango_init;
2468 } 2520 }
2469 2521
2470# compare mono (ft) vs. rgba (cairo) 2522# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2523# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2524# for my $rgba (0..1) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines