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.44 by root, Mon May 26 03:34:02 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 }
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use Compress::LZF; 102use Compress::LZF;
103 103
104use DC; 104use DC;
105#d# BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 106use DC::OpenGL ();
106use DC::Protocol; 107use DC::Protocol;
107use DC::DB; 108use DC::DB;
108use DC::UI; 109use DC::UI;
109use DC::UI::Canvas; 110use DC::UI::Canvas;
110use DC::UI::Inventory; 111use DC::UI::Inventory;
111use DC::UI::SpellList; 112use DC::UI::SpellList;
112use DC::UI::Dockable; 113use DC::UI::Dockable;
114use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 115use DC::UI::MessageWindow;
114use DC::UI::ChatView; 116use DC::UI::ChatView;
117use DC::MessageDistributor;
115use DC::Pod; 118use DC::Pod;
116use DC::MapWidget; 119use DC::MapWidget;
117use DC::Macro; 120use DC::Macro;
118 121
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 122$SIG{QUIT} = sub { Carp::cluck "QUIT" };
178our $SPELL_PAGE; 181our $SPELL_PAGE;
179our $SPELL_LIST; 182our $SPELL_LIST;
180 183
181our $HELP_WINDOW; 184our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 185our $MESSAGE_WINDOW;
186our $MESSAGE_DIST;
183our $FLOORBOX; 187our $FLOORBOX;
184our $GAUGES; 188our $GAUGES;
185our $STATWIDS; 189our $STATWIDS;
186 190
187our $SDL_ACTIVE; 191our $SDL_ACTIVE;
188our %SDL_CB; 192our %SDL_CB;
189 193
190our $ALT_ENTER_MESSAGE; 194our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 195our $STATUSBOX;
196our $MODBOX;
192our $DEBUG_STATUS; 197our $DEBUG_STATUS;
193 198
194our $INV; 199our $INV;
195our $INVR; 200our $INVR;
196our $INVR_HB; 201our $INVR_HB;
204sub debug { 209sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 210 $DEBUG_STATUS->set_text ($_[0]);
206} 211}
207 212
208sub message { 213sub message {
209 $MESSAGE_WINDOW->message (@_); 214 $MESSAGE_DIST->message (@_);
215}
216
217sub update_modbox {
218 my $mod = DC::SDL_GetModState;
219
220 my $markup;
221
222 $markup .= $mod & DC::KMOD_CTRL
223 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
224 : "[<span foreground='#888'> once </span>]";
225
226 $markup .= $mod & DC::KMOD_SHIFT
227 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
228 : "[<span foreground='#888'>move</span>]";
229
230 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
231 ? "[ALT]"
232 : "[<span foreground='#888'>alt</span>]";
233
234 $markup .= $mod & DC::KMOD_NUM
235 ? "[NUM]"
236 : "[<span foreground='#888'>num</span>]";
237
238 # <tt> around next statement works around some bug that keeps the
239 # "font =>" from being used on windows
240 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 241}
211 242
212############################################################################# 243#############################################################################
213#TODO: maybe move into own audio module... 244#TODO: maybe move into own audio module...
214 245
634 # right: accept 665 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 666 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 667 text => "Accept",
637 on_activate => sub { 668 on_activate => sub {
638 $conn->send ("reply n"); 669 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 670 destroy_query_dialog $conn;
641 0 671 0
642 }, 672 },
643 ); 673 );
644 674
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 );
709 738
710 my ($host, $port) = split /:/, $PROFILE->{host}; 739 my ($host, $port) = split /:/, $PROFILE->{host};
711 740
712 $MAP = new DC::Map; 741 $MAP = new DC::Map;
713 742
714 $CONN = eval { 743 $CONN =
715 new DC::Protocol 744 new DC::Protocol
716 host => $host, 745 host => $host,
717 port => $port || 13327, 746 port => $port || 13327,
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,
729 query => \&server_query, 758 query => \&server_query,
730 759
731 setup_req => { 760 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
733 }, 762 },
734 };
735 763
736 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
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 undef $CONN;
741 status "unable to connect"; 771 status "unable to connect: $!";
742 stop_game(); 772 stop_game();
773 }
774 },
743 } 775 ;
744} 776}
745 777
746sub stop_game { 778sub stop_game {
747 $LOGIN_BUTTON->set_text ("Login / Register"); 779 $LOGIN_BUTTON->set_text ("Login / Register");
748 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 780 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
769 801
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 802 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 803
772 my $row = 0; 804 my $row = 0;
773 805
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 806 $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, 807 $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, 808 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 809 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 810
779 my $vidmode_tooltip = 811 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 812 "<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>."; 813 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 814
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 815 $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); 816 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 817
786 $hbox->add (my $mode_slider = new DC::UI::Slider 818 $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], 819 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
788 tooltip => $vidmode_tooltip); 820 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 821 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 822 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 823 can_events => 1, tooltip => $vidmode_tooltip);
792 824
793 $mode_slider->connect (changed => sub { 825 $mode_slider->connect (changed => sub {
794 my ($self, $value) = @_; 826 my ($self, $value) = @_;
795 827
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 828 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 829 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 830 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 831 $mode_slider->emit (changed => $mode_slider->{range}[0]);
800 832
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 833 $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 834 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 835 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 836 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 837 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 838 );
807 839
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 840 $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 841 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 842 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 843 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 " 844 . "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. " 845 . "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, " 846 . "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 " 847 . "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>", 848 . "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 } 849 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 850 );
819 851
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 852 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 853 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 854 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 855 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 " 856 . "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 " 857 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 858 . "forced OpenGL 1.1 mode.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 860 );
829 861
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 862 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 863 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 864 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 865 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 866 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 867 );
836 868
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 869 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 870 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 871 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.", 872 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 }, 873 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 874 );
843 875
844 $table->add_at (1, $row++, new DC::UI::Button 876 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 877 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 878 tooltip => "Apply the video settings above.",
847 on_activate => sub { 879 on_activate => sub {
848 video_shutdown (); 880 video_shutdown ();
849 video_init (); 881 video_init ();
850 0 882 0
851 } 883 }
852 ); 884 );
853 885
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 887 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 888 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 889 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 890 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 891 );
860 892
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 894 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 895 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 896 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. " 897 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 898 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 899 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 900 );
869 901
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 902 $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 903 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 904 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 905 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 } 906 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 907 );
876 908
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 910 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 911 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.", 912 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 } 913 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 914 );
883 915
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 917 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 918 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, " 919 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.", 920 . "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 }, 921 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 922 );
891 923
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 925 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 926 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.", 927 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 928 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 929 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 930 &set_gauge_window_fontsize;
899 0 931 0
900 } 932 }
901 ); 933 );
902 934
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 936 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 937 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 938 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 939 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 940 $CFG->{gauge_size} = $_[1];
942 974
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 975 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 976
945 my $row = 0; 977 my $row = 0;
946 978
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 979 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 980 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 981 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.", 982 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 } 983 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 984 );
953 985
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 987 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 988 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 989 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 990 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 991 $CFG->{effects_enable} = $_[1];
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 998 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.", 999 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1000 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1001 );
970 1002
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1004 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1005 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1006 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1007 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1008 $CFG->{bgm_enable} = $_[1];
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1015 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1016 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1017 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1018 );
987 1019
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1020 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1021 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1022 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1023 value => $CFG->{audio_hw_frequency},
992 options => [ 1024 options => [
993 [ 0, "default" , "Use System Default"], 1025 [ 0, "default" , "Use System Default"],
1002 audio_tab_update; 1034 audio_tab_update;
1003 1 1035 1
1004 } 1036 }
1005 ); 1037 );
1006 1038
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1040 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1041 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1042 value => $CFG->{audio_hw_channels},
1011 options => [ 1043 options => [
1012 [0, "default" , "Use System Default"], 1044 [0, "default" , "Use System Default"],
1021 audio_tab_update; 1053 audio_tab_update;
1022 1 1054 1
1023 } 1055 }
1024 ); 1056 );
1025 1057
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1058 $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 1059 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1060 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1061 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 " 1062 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.", 1063 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1035 1 1067 1
1036 } 1068 }
1037 ); 1069 );
1038 1070
1039 # should really be a slider 1071 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1073 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1074 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.", 1075 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], 1076 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1077 template => ">= 99",
1051 1; 1083 1;
1052 } 1084 }
1053 ); 1085 );
1054 1086
1055 $table->add_at (1, $row++, new DC::UI::Button 1087 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1088 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1089 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1090 on_activate => sub {
1059 audio_shutdown (); 1091 audio_shutdown ();
1060 audio_init (); 1092 audio_init ();
1061 0 1093 0
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1143 $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"); 1144 $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"); 1145 $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"); 1146 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1147
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1148 $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); 1149 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1150 $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"); 1151 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1152
1121 $GAUGES = { 1153 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1154 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1155 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1156 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1190 $vb->add (new DC::UI::FancyFrame 1222 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1223 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1224 child => (my $pi = new DC::UI::VBox),
1193 ); 1225 );
1194 1226
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1227 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1228 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."); 1229 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, 1230 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1231 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1232 tooltip => "The map you are currently on (if supported by the server).");
1201 1233
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1234 $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, 1235 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1236 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1237 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, 1238 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1239 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1240 tooltip => "The weight limit: you cannot carry more than this.");
1209 1241
1210 $vb->add (new DC::UI::FancyFrame 1242 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1243 label => "Primary/Secondary Statistics",
1232 [2, 5, st_wspd => "WSp", 10.54], 1264 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1265 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1266 my ($col, $row, $id, $label, $template) = @$_;
1235 1267
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1268 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1269 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1270 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1271 $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, 1272 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1273 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1274 }
1243 1275
1244 $vb->add (new DC::UI::FancyFrame 1276 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1277 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1278 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1279 );
1248 1280
1249 my $row = 0; 1281 my $row = 0;
1250 my $col = 0; 1282 my $col = 0;
1251 1283
1290 1322
1291 for (qw/slow holyw conf fire depl magic 1323 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1324 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1325 blind fear tund elec cold ghit/)
1294 { 1326 {
1295 $tbl2->add_at ($col, $row, 1327 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1328 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1329 new DC::UI::Label
1298 font => $FONT_FIXED, 1330 font => $FONT_FIXED,
1299 template => "-100%", 1331 template => "-100%",
1300 align => +1, 1332 align => 1,
1301 valign => 0,
1302 can_events => 1, 1333 can_events => 1,
1303 can_hover => 1, 1334 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1335 tooltip => $resist_names{$_}->[1],
1305 ); 1336 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1337 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 can_hover => 1, 1339 can_hover => 1,
1309 can_events => 1, 1340 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1341 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1342 tooltip => $resist_names{$_}->[1],
1312 ); 1343 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1344 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1345 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1346 font => $FONT_FIXED,
1347 align => 1,
1316 can_hover => 1, 1348 can_hover => 1,
1317 can_events => 1, 1349 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1350 tooltip => $resist_names{$_}->[1],
1319 ); 1351 );
1320 1352
1321 $row++; 1353 $row++;
1322 if ($row % 6 == 0) { 1354 if ($row % 6 == 0) {
1323 $col += 3; 1355 $col += 4;
1324 $row = 0; 1356 $row = 0;
1325 } 1357 }
1326 } 1358 }
1327 1359
1328 #update_stats_window ({}); 1360 #update_stats_window ({});
1374 "The time this server has been running without being restarted.", 1406 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1407 "Short information about this server provided by its admins.",
1376 ); 1408 );
1377 my @col = qw(#Users Host Uptime Version Description); 1409 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1410 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1411 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1412 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1413 for 0 .. $#col;
1383 1414
1384 my @align = qw(1 0 1 1 -1); 1415 my @align = qw(1 0.5 1 1 0);
1385 1416
1386 my $y = 0; 1417 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1418 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1419 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1420 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1470 $vbox->add (new DC::UI::FancyFrame 1501 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1502 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1503 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1504 );
1474 1505
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1506 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1507 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1508 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1509 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1510 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1511 );
1481 1512
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1513 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1514 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1515 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1516 hidden => 1,
1486 tooltip => "The password for your character.", 1517 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1518 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1519 );
1489 1520
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1521 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1522 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1523 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1524 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1525 on_activate => sub {
1496 $CONN ? stop_game 1526 $CONN ? stop_game
1497 : start_game; 1527 : start_game;
1500 ); 1530 );
1501 1531
1502 $vbox->add (new DC::UI::FancyFrame 1532 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1533 label => "Registering",
1504 min_h => 200, 1534 min_h => 200,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1535 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1536 markup =>
1507 "To register a new account, choose a username that hasn't been taken yet and " 1537 "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.", 1538 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1539 ),
1510 ); 1540 );
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1550 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1551 );
1522 1552
1523 my $row = 0; 1553 my $row = 0;
1524 1554
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1555 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1556 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1557 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1558
1529 $vbox->add ( 1559 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1560 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1561 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1562 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1563 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1564 on_changed => sub {
1535 my ($self, $value) = @_; 1565 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1566 $CFG->{profile}{default}{host} = $value;
1537 1 1567 1
1538 } 1568 }
1541 if (0) { #d# disabled 1571 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1572 $vbox->add (new DC::UI::Button
1543 expand => 1, 1573 expand => 1,
1544 text => "Server List", 1574 text => "Server List",
1545 other => $METASERVER, 1575 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1576 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1577 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1578 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1579 );
1550 }#d# 1580 }#d#
1551 } 1581 }
1552 1582
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1583 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1584 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1585 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1586 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1587 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, " 1588 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1589 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1590 . "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 }, 1591 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1592 );
1563 1593
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1594 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1595 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1596 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1597 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1598 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1599 . "default will be used, which is usually around 100kb/s. Most servers will "
1582sub client_setup { 1612sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1613 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1614
1585 my $row = 0; 1615 my $row = 0;
1586 1616
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1617 $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 1618 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1619 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1620 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1621 on_changed => sub {
1592 my ($self, $value) = @_; 1622 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1623 $CFG->{show_tips} = $value;
1594 0 1624 0
1595 } 1625 }
1596 ); 1626 );
1597 1627
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1628 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1629 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1630 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1631 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1632 . "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.", 1633 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1634 on_changed => sub {
1605 my ($self, $value) = @_; 1635 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1636 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1637 0
1608 }, 1638 },
1609 ); 1639 );
1610 1640
1611 $table 1641 $table
1715 1745
1716 $r 1746 $r
1717} 1747}
1718 1748
1719my %SORT_ORDER = ( 1749my %SORT_ORDER = (
1720 type => undef, 1750 type => sub {
1751 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1752 },
1721 mtime => sub { 1753 mtime => sub {
1722 my $NOW = time; 1754 my $NOW = time;
1723 sort { 1755 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1756 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1757 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1737 1769
1738sub inventory_widget { 1770sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1771 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1772
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1773 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1774 $vb1->add (new DC::UI::Label text => "Player");
1743 1775
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1776 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1777
1746 use sort 'stable'; 1778 use sort 'stable';
1747 1779
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1789 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1790 },
1759 ); 1791 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1792 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1793 #TODO# update to weigh/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1794 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1795
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1796 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1797 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1798 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1799
1947 my @path = DC::Pod::full_path_of $node; 1979 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 1980 pop @path; # drop current node
1949 1981
1950 for my $node (@path) { 1982 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 1983 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 1984 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 1985 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 1986 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1987 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 1988 $load_node->($node);
1957 }, 1989 },
1958 ); 1990 );
1959 $buttons->add (new DC::UI::Label text => "/"); 1991 $buttons->add (new DC::UI::Label text => "/");
1960 } 1992 }
1961 1993
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1994 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 1995
1964 $curnode = $node; 1996 $curnode = $node;
1965 1997
1966 $viewer->clear; 1998 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 1999 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2146 force_x => "max", 2178 force_x => "max",
2147 force_y => 0; 2179 force_y => 0;
2148 $DEBUG_STATUS->show; 2180 $DEBUG_STATUS->show;
2149 2181
2150 $STATUSBOX = new DC::UI::Statusbox; 2182 $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]); 2183
2184 $MODBOX = new DC::UI::Label
2185 can_events => 1,
2186 can_hover => 1,
2187 markup => "",
2188 align => 0,
2189 font => $FONT_FIXED,
2190 tooltip => "#modifier_box",
2191 tooltip_width => 0.67,
2192 ;
2193
2194 update_modbox;
2152 2195
2153 (new DC::UI::Frame 2196 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2197 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2198 force_x => 0,
2156 force_y => "max", 2199 force_y => "max",
2157 child => $STATUSBOX, 2200 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2201 )->show;
2202
2203 $LR->add ($STATUSBOX);
2204 $LR->add ($MODBOX);
2205 $LR->add (new DC::UI::Label
2206 align => 0,
2207 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2208 fontsize => 0.5,
2209 fg => [1, 1, 0, 0.7],
2210 );
2159 2211
2160 DC::UI::Toplevel->new ( 2212 DC::UI::Toplevel->new (
2161 title => "Minimap", 2213 title => "Minimap",
2162 name => "mapmap", 2214 name => "mapmap",
2163 x => 0, 2215 x => 0,
2171 2223
2172 $MAPWIDGET = new DC::MapWidget; 2224 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2225 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2226 my ($mapwidget, $preset) = @_;
2175 2227
2176 $MESSAGE_WINDOW->activate_console ($preset) 2228 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2229 if $MESSAGE_DIST;
2178 }); 2230 });
2179 $MAPWIDGET->show; 2231 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2232 $MAPWIDGET->grab_focus;
2181 2233
2182 $COMPLETER = new DC::MapWidget::Command:: 2234 $COMPLETER = new DC::MapWidget::Command::
2194 force_h => $::HEIGHT * 0.6, 2246 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2247 has_close_button => 1,
2196 ; 2248 ;
2197 2249
2198 $METASERVER = metaserver_dialog; 2250 $METASERVER = metaserver_dialog;
2251 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2252 $MESSAGE_WINDOW = new DC::UI::Dockbar
2253 name => "message_window2",
2254 title => 'Messages',
2255 force_w => $::WIDTH * 0.6,
2256 force_h => $::HEIGHT * 0.25,
2257 ;
2200 2258
2259 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2260
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2261 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2262 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2263
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2264 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2265 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2266 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2284 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2285
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2286 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2287 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2288
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2289# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2290# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2291
2232 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2292 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2233 2293
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2294 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2295 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237 $BUTTONBAR->add (new DC::UI::Button 2297 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2298 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2299 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub { 2300 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2301 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2302 DC::write_cfg;
2243 status "Configuration Saved"; 2303 status "Configuration Saved";
2244 0 2304 0
2245 }, 2305 },
2246 ); 2306 );
2247 2307
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2308 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2309 tooltip => "View Documentation");
2250
2251 2310
2252 $BUTTONBAR->add (new DC::UI::Button 2311 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2312 text => "Quit",
2254 tooltip => "Terminates the program", 2313 tooltip => "Terminates the program",
2255 on_activate => sub { 2314 on_activate => sub {
2344 # alt-enter 2403 # alt-enter
2345 $FULLSCREEN_ENABLE->toggle; 2404 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown; 2405 video_shutdown;
2347 video_init; 2406 video_init;
2348 } else { 2407 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2408 &DC::UI::feed_sdl_key_down_event;
2350 } 2409 }
2410 update_modbox;
2351 }, 2411 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2412 DC::SDL_KEYUP => sub {
2413 &DC::UI::feed_sdl_key_up_event;
2414 update_modbox;
2415 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2416 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2417 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2418 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2419 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2420 if ($_[0]{code} == 1) {
2368 EV::unloop; 2431 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2432 #d# TODO calling exit here hangs the process in some futex
2370}; 2433};
2371 2434
2372{ 2435{
2436 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2437
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2438 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2439 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2440 } else {
2376 #TODO: compatibility cruft 2441 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2442 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2443 print STDERR "INFO: used old configuration file\n";
2379 } 2444 }
2380 2445
2381 DC::DB::Server::run; 2446 DC::DB::Server::run;
2447
2448 if ($CFG->{db_schema} < 1) {
2449 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2450 DC::DB::nuke_db;
2451 $CFG->{db_schema} = 1;
2452 DC::write_cfg;
2453 }
2454
2455 DC::DB::open_db;
2382 2456
2383 DC::UI::set_layout ($::CFG->{layout}); 2457 DC::UI::set_layout ($::CFG->{layout});
2384 2458
2385 my %DEF_CFG = ( 2459 my %DEF_CFG = (
2386 sdl_mode => 0, 2460 sdl_mode => 0,
2411 pickup => 0, 2485 pickup => 0,
2412 inv_sort => "mtime", 2486 inv_sort => "mtime",
2413 default => "profile", # default profile 2487 default => "profile", # default profile
2414 show_tips => 1, 2488 show_tips => 1,
2415 logview_max_par => 1000, 2489 logview_max_par => 1000,
2490 shift_fire_stop => 0,
2416 ); 2491 );
2417 2492
2418 while (my ($k, $v) = each %DEF_CFG) { 2493 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2494 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2495 }
2456 DejaVuSansMono-BoldOblique.ttf 2531 DejaVuSansMono-BoldOblique.ttf
2457 ); 2532 );
2458 2533
2459 DC::add_font $_ for @fonts; 2534 DC::add_font $_ for @fonts;
2460 2535
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2536 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2537 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2538
2466 $FONT_PROP->make_default; 2539 $FONT_PROP->make_default;
2540
2541 DC::pango_init;
2467 } 2542 }
2468 2543
2469# compare mono (ft) vs. rgba (cairo) 2544# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2545# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2546# for my $rgba (0..1) {
2488our $STARTUP_CANCEL = EV::idle sub { 2563our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2564 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2565 $startup_done->();
2491}; 2566};
2492 2567
2568delete $SIG{__DIE__};
2493EV::loop; 2569EV::loop;
2494 2570
2495#video_shutdown; 2571#video_shutdown;
2496#audio_shutdown; 2572#audio_shutdown;
2497DC::OpenGL::quit; 2573DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines