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.57 by root, Wed Jul 23 03:38:34 2008 UTC

… …
78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
… …
97use List::Util qw(max min); 97use List::Util qw(max min);
98 98
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use AnyEvent::DNS;
103use AnyEvent::Socket ();
104
102use Compress::LZF; 105use Compress::LZF;
103 106
104use DC; 107use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 109use DC::OpenGL ();
106use DC::Protocol; 110use DC::Protocol;
107use DC::DB; 111use DC::DB;
108use DC::UI; 112use DC::UI;
109use DC::UI::Canvas; 113use DC::UI::Canvas;
110use DC::UI::Inventory; 114use DC::UI::Inventory;
111use DC::UI::SpellList; 115use DC::UI::SpellList;
112use DC::UI::Dockable; 116use DC::UI::Dockable;
117use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 118use DC::UI::MessageWindow;
114use DC::UI::ChatView; 119use DC::UI::ChatView;
120use DC::MessageDistributor;
115use DC::Pod; 121use DC::Pod;
116use DC::MapWidget; 122use DC::MapWidget;
117use DC::Macro; 123use DC::Macro;
118 124
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 125$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
122$EV::DIED = sub { 128$EV::DIED = sub {
123 DC::fatal Carp::longmess $@; 129 DC::fatal Carp::longmess $@;
124}; 130};
125 131
126my $MAX_FPS = 60; 132my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet
128 133
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 134our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 135
131our $LAST_REFRESH; 136our $LAST_REFRESH;
132our $NOW; 137our $NOW;
… …
136our $PROFILE; # current profile 141our $PROFILE; # current profile
137our $FAST; # fast, low-quality mode, possibly useful for software-rendering 142our $FAST; # fast, low-quality mode, possibly useful for software-rendering
138 143
139our $WANT_REFRESH; 144our $WANT_REFRESH;
140 145
146our $MODE_SLIDER;
147our $CAVEAT_LABEL;
148
141our @SDL_MODES; 149our @SDL_MODES;
150our $SDL_REINIT = 1;
142our $WIDTH; 151our $WIDTH;
143our $HEIGHT; 152our $HEIGHT;
144our $FULLSCREEN; 153our $FULLSCREEN;
145our $FONTSIZE; 154our $FONTSIZE;
146 155
… …
179our $SPELL_PAGE; 188our $SPELL_PAGE;
180our $SPELL_LIST; 189our $SPELL_LIST;
181 190
182our $HELP_WINDOW; 191our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 192our $MESSAGE_WINDOW;
193our $MESSAGE_DIST;
184our $FLOORBOX; 194our $FLOORBOX;
185our $GAUGES; 195our $GAUGES;
186our $STATWIDS; 196our $STATWIDS;
187 197
188our $SDL_ACTIVE; 198our $SDL_ACTIVE;
189our %SDL_CB; 199our %SDL_CB;
190 200
191our $ALT_ENTER_MESSAGE; 201our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 202our $STATUSBOX;
203our $MODBOX;
193our $DEBUG_STATUS; 204our $DEBUG_STATUS;
194 205
195our $INV; 206our $INV;
196our $INVR; 207our $INVR;
197our $INVR_HB; 208our $INVR_HB;
… …
205sub debug { 216sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 217 $DEBUG_STATUS->set_text ($_[0]);
207} 218}
208 219
209sub message { 220sub message {
210 $MESSAGE_WINDOW->message (@_); 221 $MESSAGE_DIST->message (@_);
222}
223
224sub update_modbox {
225 my $mod = DC::SDL_GetModState;
226
227 my $markup;
228
229 $markup .= $mod & DC::KMOD_CTRL
230 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
231 : "[<span foreground='#888'> once </span>]";
232
233 $markup .= $mod & DC::KMOD_SHIFT
234 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
235 : "[<span foreground='#888'>move</span>]";
236
237 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
238 ? "[ALT]"
239 : "[<span foreground='#888'>alt</span>]";
240
241 $markup .= $mod & DC::KMOD_NUM
242 ? "[NUM]"
243 : "[<span foreground='#888'>num</span>]";
244
245 # <tt> around next statement works around some bug that keeps the
246 # "font =>" from being used on windows
247 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 248}
212 249
213############################################################################# 250#############################################################################
214#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
215 252
… …
635 # right: accept 672 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 674 text => "Accept",
638 on_activate => sub { 675 on_activate => sub {
639 $conn->send ("reply n"); 676 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
642 0 678 0
643 }, 679 },
644 ); 680 );
645 681
… …
654 [Cha => CS_STAT_CHA], 690 [Cha => CS_STAT_CHA],
655 ) { 691 ) {
656 my ($name, $id) = @$_; 692 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 693 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 694 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 695 expand => 1,
661 can_events => 1, 696 can_events => 1,
662 can_hover => 1, 697 can_hover => 1,
663 tooltip => "#stat_$name", 698 tooltip => "#stat_$name",
664 ); 699 );
… …
698 733
699 $vbox->add (@dialog); 734 $vbox->add (@dialog);
700 $dialog->show; 735 $dialog->show;
701} 736}
702 737
703sub start_game { 738sub dc_connect {
704 status "logging in..."; 739 my ($host, $port) = @_;
705
706 $LOGIN_BUTTON->set_text ("Logout");
707 $SETUP_DIALOG->hide;
708 740
709 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
710 742
711 my ($host, $port) = split /:/, $PROFILE->{host};
712
713 $MAP = new DC::Map;
714
715 $CONN = eval { 743 $CONN =
716 new DC::Protocol 744 new DC::Protocol
717 host => $host, 745 host => $host,
718 port => $port || 13327, 746 port => $port,
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,
730 query => \&server_query, 758 query => \&server_query,
731 759
732 setup_req => { 760 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
734 }, 762 },
735 };
736 763
737 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
738 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
739 767
740 status "login successful"; 768 status "login successful";
769 } else {
770 undef $CONN;
771 status "unable to connect: $!";
772 stop_game();
773 }
774 },
775 ;
776}
777
778sub start_game {
779 status "logging in...";
780
781 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785
786 $MAP = new DC::Map;
787
788 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl
793 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95";
795 }
796
797 dc_connect $host, $port;
798 };
741 } else { 799 } else {
742 status "unable to connect"; 800 dc_connect $host, $port;
743 stop_game();
744 } 801 }
745} 802}
746 803
747sub stop_game { 804sub stop_game {
748 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
770 827
771 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 829
773 my $row = 0; 830 my $row = 0;
774 831
775 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 832 $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, 833 $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, 834 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card.");
779 844
780 my $vidmode_tooltip = 845 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
782 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 848
784 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 849 $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); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 851
787 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 853 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ],
789 tooltip => $vidmode_tooltip); 855 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 856 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 857 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 858 can_events => 1, tooltip => $vidmode_tooltip);
793 859
794 $mode_slider->connect (changed => sub { 860 $MODE_SLIDER->connect (changed => sub {
795 my ($self, $value) = @_; 861 my ($self, $value) = @_;
796 862
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 865 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
801 867
802 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 868 $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 869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 870 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 871 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 873 );
808 874
809 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 875 $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 876 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 877 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
813 . "higher memory usage and slower performance. It will, however, help tremendously on " 879 . "higher memory usage and slower performance. It will, however, help tremendously on "
814 . "cards that claim to support a feature but fall back to software rendering. " 880 . "cards that claim to support a feature but fall back to software rendering. "
815 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
816 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
817 . "experience extremely low framerates and your card should do better, try this option.</b>", 883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 885 );
820 886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
900 0
901 }
902 );
903
821 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 905 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 906 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 907 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 " 908 . "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 " 909 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 910 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 912 );
830 913
831 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 915 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 916 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 917 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 919 );
837 920
838 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new DC::UI::Slider 922 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 923 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.", 924 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 }, 925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 926 );
844 927
845 $table->add_at (1, $row++, new DC::UI::Button 928 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 929 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 930 tooltip => "Apply the video settings above.",
848 on_activate => sub { 931 on_activate => sub {
849 video_shutdown (); 932 video_shutdown ();
850 video_init (); 933 video_init ();
851 0 934 0
852 } 935 }
853 ); 936 );
854 937
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 );
946
855 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new DC::UI::Slider 948 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 952 );
861 953
862 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 955 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 956 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 957 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. " 958 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 959 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 961 );
870 962
871 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 963 $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 964 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 965 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 966 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 } 967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 968 );
877 969
878 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new DC::UI::Slider 971 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 972 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.", 973 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 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 975 );
884 976
885 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new DC::UI::Slider 978 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 979 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, " 980 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.", 981 . "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 }, 982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 983 );
892 984
893 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new DC::UI::Slider 986 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 987 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.", 988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 989 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 990 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 991 &set_gauge_window_fontsize;
900 0 992 0
901 } 993 }
902 ); 994 );
903 995
904 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new DC::UI::Slider 997 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 998 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 1000 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 1001 $CFG->{gauge_size} = $_[1];
… …
943 1035
944 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1036 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 1037
946 my $row = 0; 1038 my $row = 0;
947 1039
948 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 1041 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 1042 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.", 1043 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 } 1044 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 1045 );
954 1046
955 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1047 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new DC::UI::CheckBox 1048 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 1049 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1050 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 1051 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 1052 $CFG->{effects_enable} = $_[1];
… …
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1059 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.", 1060 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1061 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1062 );
971 1063
972 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1065 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1066 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1067 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1068 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1069 $CFG->{bgm_enable} = $_[1];
… …
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1076 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1077 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1078 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1079 );
988 1080
989 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new DC::UI::Selector 1082 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1083 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1084 value => $CFG->{audio_hw_frequency},
993 options => [ 1085 options => [
994 [ 0, "default" , "Use System Default"], 1086 [ 0, "default" , "Use System Default"],
… …
1003 audio_tab_update; 1095 audio_tab_update;
1004 1 1096 1
1005 } 1097 }
1006 ); 1098 );
1007 1099
1008 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1100 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1101 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1102 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1103 value => $CFG->{audio_hw_channels},
1012 options => [ 1104 options => [
1013 [0, "default" , "Use System Default"], 1105 [0, "default" , "Use System Default"],
… …
1022 audio_tab_update; 1114 audio_tab_update;
1023 1 1115 1
1024 } 1116 }
1025 ); 1117 );
1026 1118
1027 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1119 $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 1120 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1121 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1122 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 " 1123 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.", 1124 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1036 1 1128 1
1037 } 1129 }
1038 ); 1130 );
1039 1131
1040 # should really be a slider 1132 # should really be a slider
1041 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1133 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1134 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1135 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.", 1136 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], 1137 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1138 template => ">= 99",
… …
1052 1; 1144 1;
1053 } 1145 }
1054 ); 1146 );
1055 1147
1056 $table->add_at (1, $row++, new DC::UI::Button 1148 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1149 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1150 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1151 on_activate => sub {
1060 audio_shutdown (); 1152 audio_shutdown ();
1061 audio_init (); 1153 audio_init ();
1062 0 1154 0
… …
1112 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1204 $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"); 1205 $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"); 1206 $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"); 1207 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116 1208
1117 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1209 $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); 1210 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1211 $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"); 1212 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1213
1122 $GAUGES = { 1214 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1215 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1216 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1217 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 }); 1233 $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"); 1234 $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 }); 1235 $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() } ); 1236 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1237
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1238 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1239
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1240 $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); 1241 $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); 1242 $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); 1243 $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); 1244 $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"); 1245 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1246
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1247 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1248
1157 $c->add_items ({ 1249 $c->add_items ({
… …
1191 $vb->add (new DC::UI::FancyFrame 1283 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1284 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1285 child => (my $pi = new DC::UI::VBox),
1194 ); 1286 );
1195 1287
1196 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1288 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1289 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."); 1290 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, 1291 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1292 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1293 tooltip => "The map you are currently on (if supported by the server).");
1202 1294
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1295 $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, 1296 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1297 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1298 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, 1299 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1300 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1301 tooltip => "The weight limit: you cannot carry more than this.");
1210 1302
1211 $vb->add (new DC::UI::FancyFrame 1303 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1304 label => "Primary/Secondary Statistics",
… …
1233 [2, 5, st_wspd => "WSp", 10.54], 1325 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1326 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1327 my ($col, $row, $id, $label, $template) = @$_;
1236 1328
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1329 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1330 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1331 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1332 $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, 1333 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1334 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1335 }
1244 1336
1245 $vb->add (new DC::UI::FancyFrame 1337 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1338 label => "Resistancies",
1247 child => (my $tbl2 = new DC::UI::Table expand => 1), 1339 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1340 );
1249 1341
1250 my $row = 0; 1342 my $row = 0;
1251 my $col = 0; 1343 my $col = 0;
1252 1344
… …
1291 1383
1292 for (qw/slow holyw conf fire depl magic 1384 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1385 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1386 blind fear tund elec cold ghit/)
1295 { 1387 {
1296 $tbl2->add_at ($col, $row, 1388 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1389 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1390 new DC::UI::Label
1299 font => $FONT_FIXED, 1391 font => $FONT_FIXED,
1300 template => "-100%", 1392 template => "-100%",
1301 align => +1, 1393 align => 1,
1302 valign => 0,
1303 can_events => 1, 1394 can_events => 1,
1304 can_hover => 1, 1395 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1396 tooltip => $resist_names{$_}->[1],
1306 ); 1397 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1398 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1309 can_hover => 1, 1400 can_hover => 1,
1310 can_events => 1, 1401 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1402 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1403 tooltip => $resist_names{$_}->[1],
1313 ); 1404 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1405 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1406 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1407 font => $FONT_FIXED,
1408 align => 1,
1317 can_hover => 1, 1409 can_hover => 1,
1318 can_events => 1, 1410 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1411 tooltip => $resist_names{$_}->[1],
1320 ); 1412 );
1321 1413
1322 $row++; 1414 $row++;
1323 if ($row % 6 == 0) { 1415 if ($row % 6 == 0) {
1324 $col += 3; 1416 $col += 4;
1325 $row = 0; 1417 $row = 0;
1326 } 1418 }
1327 } 1419 }
1328 1420
1329 #update_stats_window ({}); 1421 #update_stats_window ({});
… …
1375 "The time this server has been running without being restarted.", 1467 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1468 "Short information about this server provided by its admins.",
1377 ); 1469 );
1378 my @col = qw(#Users Host Uptime Version Description); 1470 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1471 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1472 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1473 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1474 for 0 .. $#col;
1384 1475
1385 my @align = qw(1 0 1 1 -1); 1476 my @align = qw(1 0.5 1 1 0);
1386 1477
1387 my $y = 0; 1478 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1479 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1480 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1481 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1471 $vbox->add (new DC::UI::FancyFrame 1562 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1563 label => "Login Settings",
1473 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1564 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1565 );
1475 1566
1476 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1567 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new DC::UI::Entry 1568 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1569 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1570 tooltip => "The name of your character on the server.",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1571 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1572 );
1482 1573
1483 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1574 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new DC::UI::Entry 1575 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1576 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1577 hidden => 1,
1487 tooltip => "The password for your character.", 1578 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1579 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1580 );
1490 1581
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1582 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1583 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1584 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1585 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1586 on_activate => sub {
1497 $CONN ? stop_game 1587 $CONN ? stop_game
1498 : start_game; 1588 : start_game;
… …
1501 ); 1591 );
1502 1592
1503 $vbox->add (new DC::UI::FancyFrame 1593 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1594 label => "Registering",
1505 min_h => 200, 1595 min_h => 200,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1596 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1597 markup =>
1508 "To register a new account, choose a username that hasn't been taken yet and " 1598 "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.", 1599 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1600 ),
1511 ); 1601 );
… …
1521 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1611 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1612 );
1523 1613
1524 my $row = 0; 1614 my $row = 0;
1525 1615
1526 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1616 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1617 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1618 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1619
1530 $vbox->add ( 1620 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1621 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1622 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1623 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1624 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1625 on_changed => sub {
1536 my ($self, $value) = @_; 1626 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1627 $CFG->{profile}{default}{host} = $value;
1538 1 1628 1
1539 } 1629 }
… …
1542 if (0) { #d# disabled 1632 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1633 $vbox->add (new DC::UI::Button
1544 expand => 1, 1634 expand => 1,
1545 text => "Server List", 1635 text => "Server List",
1546 other => $METASERVER, 1636 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1637 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1638 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1639 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1640 );
1551 }#d# 1641 }#d#
1552 } 1642 }
1553 1643
1554 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1644 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new DC::UI::Slider 1645 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1646 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1647 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1648 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, " 1649 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1650 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1651 . "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 }, 1652 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1653 );
1564 1654
1565 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1655 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new DC::UI::Entry 1656 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1657 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1658 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1659 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1660 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1583sub client_setup { 1673sub client_setup {
1584 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1674 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1675
1586 my $row = 0; 1676 my $row = 0;
1587 1677
1588 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1678 $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 1679 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1680 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1681 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1682 on_changed => sub {
1593 my ($self, $value) = @_; 1683 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1684 $CFG->{show_tips} = $value;
1595 0 1685 0
1596 } 1686 }
1597 ); 1687 );
1598 1688
1599 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1689 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1600 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1691 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1692 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1603 . "sends more messages than this number, older messages get removed to save memory and " 1693 . "sends more messages than this number, older messages get removed to save memory and "
1604 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1694 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1695 on_changed => sub {
1606 my ($self, $value) = @_; 1696 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1698 0
1609 }, 1699 },
1610 ); 1700 );
1611 1701
1612 $table 1702 $table
… …
1716 1806
1717 $r 1807 $r
1718} 1808}
1719 1809
1720my %SORT_ORDER = ( 1810my %SORT_ORDER = (
1721 type => undef, 1811 type => sub {
1812 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1813 },
1722 mtime => sub { 1814 mtime => sub {
1723 my $NOW = time; 1815 my $NOW = time;
1724 sort { 1816 sort {
1725 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1817 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1726 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1818 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1738 1830
1739sub inventory_widget { 1831sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1832 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1833
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1834 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1835 $vb1->add (new DC::UI::Label text => "Player");
1744 1836
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1837 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1838
1747 use sort 'stable'; 1839 use sort 'stable';
1748 1840
… …
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1850 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1851 },
1760 ); 1852 );
1761 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1853 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1854 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1855 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1856
1765 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1857 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1858 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1859 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1860
… …
1948 my @path = DC::Pod::full_path_of $node; 2040 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 2041 pop @path; # drop current node
1950 2042
1951 for my $node (@path) { 2043 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 2044 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 2045 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2046 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 2047 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2048 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 2049 $load_node->($node);
1958 }, 2050 },
1959 ); 2051 );
1960 $buttons->add (new DC::UI::Label text => "/"); 2052 $buttons->add (new DC::UI::Label text => "/");
1961 } 2053 }
1962 2054
1963 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2055 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 2056
1965 $curnode = $node; 2057 $curnode = $node;
1966 2058
1967 $viewer->clear; 2059 $viewer->clear;
1968 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2060 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2094 $dialog->show; 2186 $dialog->show;
2095 }; 2187 };
2096} 2188}
2097 2189
2098sub sdl_init { 2190sub sdl_init {
2099 DC::SDL_Init 2191 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2100 and die "SDL::Init failed!\n"; 2192 and die "SDL::Init failed!\n";
2101} 2193}
2102 2194
2103sub video_init { 2195sub video_init {
2196 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2197 $SDL_REINIT = 0;
2198
2199 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2200 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2203
2204 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2205
2104 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0;
2208 for (reverse 0 .. $#SDL_MODES) {
2209 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2210 }
2211 }
2105 2212
2106 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2107 2214
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2216 $FULLSCREEN = $CFG->{fullscreen};
… …
2147 force_x => "max", 2254 force_x => "max",
2148 force_y => 0; 2255 force_y => 0;
2149 $DEBUG_STATUS->show; 2256 $DEBUG_STATUS->show;
2150 2257
2151 $STATUSBOX = new DC::UI::Statusbox; 2258 $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]); 2259
2260 $MODBOX = new DC::UI::Label
2261 can_events => 1,
2262 can_hover => 1,
2263 markup => "",
2264 align => 0,
2265 font => $FONT_FIXED,
2266 tooltip => "#modifier_box",
2267 tooltip_width => 0.67,
2268 ;
2269
2270 update_modbox;
2153 2271
2154 (new DC::UI::Frame 2272 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2273 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2274 force_x => 0,
2157 force_y => "max", 2275 force_y => "max",
2158 child => $STATUSBOX, 2276 child => (my $LR = new DC::UI::VBox),
2159 )->show; 2277 )->show;
2278
2279 $LR->add ($STATUSBOX);
2280 $LR->add ($MODBOX);
2281 $LR->add (new DC::UI::Label
2282 align => 0,
2283 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2284 fontsize => 0.5,
2285 fg => [1, 1, 0, 0.7],
2286 );
2160 2287
2161 DC::UI::Toplevel->new ( 2288 DC::UI::Toplevel->new (
2162 title => "Minimap", 2289 title => "Minimap",
2163 name => "mapmap", 2290 name => "mapmap",
2164 x => 0, 2291 x => 0,
… …
2172 2299
2173 $MAPWIDGET = new DC::MapWidget; 2300 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2301 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2302 my ($mapwidget, $preset) = @_;
2176 2303
2177 $MESSAGE_WINDOW->activate_console ($preset) 2304 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2305 if $MESSAGE_DIST;
2179 }); 2306 });
2180 $MAPWIDGET->show; 2307 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2308 $MAPWIDGET->grab_focus;
2182 2309
2183 $COMPLETER = new DC::MapWidget::Command:: 2310 $COMPLETER = new DC::MapWidget::Command::
… …
2195 force_h => $::HEIGHT * 0.6, 2322 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2323 has_close_button => 1,
2197 ; 2324 ;
2198 2325
2199 $METASERVER = metaserver_dialog; 2326 $METASERVER = metaserver_dialog;
2327 # the name is changed to not conflict with the older name as users could have hidden it
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2328 $MESSAGE_WINDOW = new DC::UI::Dockbar
2329 name => "message_window2",
2330 title => 'Messages',
2331 force_w => $::WIDTH * 0.6,
2332 force_h => $::HEIGHT * 0.25,
2333 ;
2201 2334
2335 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2336
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2337 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2338 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2339
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2340 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2341 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2342 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2360 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2361
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2362 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2363 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2364
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2365# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2366# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2367
2233 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2368 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2234 2369
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2370 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2371 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2373 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2374 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2375 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2376 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2377 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2378 DC::write_cfg;
2244 status "Configuration Saved"; 2379 status "Configuration Saved";
2245 0 2380 0
2246 }, 2381 },
2247 ); 2382 );
2248 2383
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2384 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2385 tooltip => "View Documentation");
2251
2252 2386
2253 $BUTTONBAR->add (new DC::UI::Button 2387 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2388 text => "Quit",
2255 tooltip => "Terminates the program", 2389 tooltip => "Terminates the program",
2256 on_activate => sub { 2390 on_activate => sub {
… …
2266 $BUTTONBAR->show; 2400 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2401 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2402 $MESSAGE_WINDOW->show;
2269 } 2403 }
2270 2404
2405 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2406 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2407
2408 $CAVEAT_LABEL->set_text ("None :)");
2409 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2410 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2411
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2412 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2413}
2273 2414
2274sub video_shutdown { 2415sub video_shutdown {
2275 DC::OpenGL::shutdown; 2416 DC::OpenGL::shutdown;
2417 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2418
2277 undef $SDL_ACTIVE; 2419 undef $SDL_ACTIVE;
2278} 2420}
2279 2421
2280my %animate_object; 2422my %animate_object;
… …
2294 $DC::UI::ROOT->draw; 2436 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2437 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2438 $LAST_REFRESH = $NOW;
2297} 2439}
2298 2440
2299my $want_refresh = EV::idle_ns \&force_refresh; 2441my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2442
2301my $input = EV::periodic 0, 1/60, undef, sub { 2443my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2444 $NOW = EV::now;
2303 2445
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2446 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2447 for DC::poll_events;
2306 2448
2307 if (%animate_object) { 2449 if (%animate_object) {
… …
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2483# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2484 },
2343 DC::SDL_KEYDOWN => sub { 2485 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2486 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2487 # alt-enter
2488 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2489 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2490 video_init;
2349 } else { 2491 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2492 &DC::UI::feed_sdl_key_down_event;
2351 } 2493 }
2494 update_modbox;
2352 }, 2495 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2496 DC::SDL_KEYUP => sub {
2497 &DC::UI::feed_sdl_key_up_event;
2498 update_modbox;
2499 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2500 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2501 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2502 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2503 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2504 if ($_[0]{code} == 1) {
… …
2369 EV::unloop; 2515 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2516 #d# TODO calling exit here hangs the process in some futex
2371}; 2517};
2372 2518
2373{ 2519{
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2522 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2523 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2524 } else {
2377 #TODO: compatibility cruft 2525 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2527 print STDERR "INFO: used old configuration file\n";
2380 } 2528 }
2381 2529
2382 DC::DB::Server::run; 2530 DC::DB::Server::run;
2531
2532 if ($CFG->{db_schema} < 1) {
2533 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2534 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1;
2536 DC::write_cfg;
2537 }
2538
2539 DC::DB::open_db;
2383 2540
2384 DC::UI::set_layout ($::CFG->{layout}); 2541 DC::UI::set_layout ($::CFG->{layout});
2385 2542
2386 my %DEF_CFG = ( 2543 my %DEF_CFG = (
2387 sdl_mode => 0, 2544 sdl_mode => 0,
2388 fullscreen => 1, 2545 fullscreen => 1,
2389 fast => 0, 2546 fast => 0,
2390 force_opengl11 => undef, 2547 force_opengl11 => undef,
2548 disable_alpha => 0,
2549 smooth_movement => 1,
2391 texture_compression => 1, 2550 texture_compression => 1,
2392 map_scale => 1, 2551 map_scale => 1,
2393 fow_enable => 1, 2552 fow_enable => 1,
2394 fow_intensity => 0, 2553 fow_intensity => 0,
2395 map_smoothing => 1, 2554 map_smoothing => 1,
… …
2412 pickup => 0, 2571 pickup => 0,
2413 inv_sort => "mtime", 2572 inv_sort => "mtime",
2414 default => "profile", # default profile 2573 default => "profile", # default profile
2415 show_tips => 1, 2574 show_tips => 1,
2416 logview_max_par => 1000, 2575 logview_max_par => 1000,
2576 shift_fire_stop => 0,
2417 ); 2577 );
2418 2578
2419 while (my ($k, $v) = each %DEF_CFG) { 2579 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2580 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2581 }
… …
2434 } 2594 }
2435 } 2595 }
2436 } 2596 }
2437 2597
2438 sdl_init; 2598 sdl_init;
2439
2440 @SDL_MODES = DC::SDL_ListModes 8, 8;
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447 2599
2448 { 2600 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2601 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2602 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2603 DejaVuSansMono.ttf
… …
2457 DejaVuSansMono-BoldOblique.ttf 2609 DejaVuSansMono-BoldOblique.ttf
2458 ); 2610 );
2459 2611
2460 DC::add_font $_ for @fonts; 2612 DC::add_font $_ for @fonts;
2461 2613
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2614 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2615 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2616
2467 $FONT_PROP->make_default; 2617 $FONT_PROP->make_default;
2618
2619 DC::pango_init;
2468 } 2620 }
2469 2621
2470# compare mono (ft) vs. rgba (cairo) 2622# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2623# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2624# for my $rgba (0..1) {
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2641our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2642 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2643 $startup_done->();
2492}; 2644};
2493 2645
2646delete $SIG{__DIE__};
2494EV::loop; 2647EV::loop;
2495 2648
2496#video_shutdown; 2649#video_shutdown;
2497#audio_shutdown; 2650#audio_shutdown;
2498DC::OpenGL::quit; 2651DC::OpenGL::quit;
… …
2522 4 show fps 2675 4 show fps
2523 8 suppress tooltips 2676 8 suppress tooltips
2524 2677
2525=head1 AUTHOR 2678=head1 AUTHOR
2526 2679
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2680Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2681
2529 2682
2530 2683

Diff Legend

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