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.52 by root, Fri Jul 18 21:18:42 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;
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
141our @SDL_MODES; 146our @SDL_MODES;
147our $SDL_REINIT = 1;
142our $WIDTH; 148our $WIDTH;
143our $HEIGHT; 149our $HEIGHT;
144our $FULLSCREEN; 150our $FULLSCREEN;
145our $FONTSIZE; 151our $FONTSIZE;
146 152
179our $SPELL_PAGE; 185our $SPELL_PAGE;
180our $SPELL_LIST; 186our $SPELL_LIST;
181 187
182our $HELP_WINDOW; 188our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 189our $MESSAGE_WINDOW;
190our $MESSAGE_DIST;
184our $FLOORBOX; 191our $FLOORBOX;
185our $GAUGES; 192our $GAUGES;
186our $STATWIDS; 193our $STATWIDS;
187 194
188our $SDL_ACTIVE; 195our $SDL_ACTIVE;
189our %SDL_CB; 196our %SDL_CB;
190 197
191our $ALT_ENTER_MESSAGE; 198our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 199our $STATUSBOX;
200our $MODBOX;
193our $DEBUG_STATUS; 201our $DEBUG_STATUS;
194 202
195our $INV; 203our $INV;
196our $INVR; 204our $INVR;
197our $INVR_HB; 205our $INVR_HB;
205sub debug { 213sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 214 $DEBUG_STATUS->set_text ($_[0]);
207} 215}
208 216
209sub message { 217sub message {
210 $MESSAGE_WINDOW->message (@_); 218 $MESSAGE_DIST->message (@_);
219}
220
221sub update_modbox {
222 my $mod = DC::SDL_GetModState;
223
224 my $markup;
225
226 $markup .= $mod & DC::KMOD_CTRL
227 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
228 : "[<span foreground='#888'> once </span>]";
229
230 $markup .= $mod & DC::KMOD_SHIFT
231 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
232 : "[<span foreground='#888'>move</span>]";
233
234 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
235 ? "[ALT]"
236 : "[<span foreground='#888'>alt</span>]";
237
238 $markup .= $mod & DC::KMOD_NUM
239 ? "[NUM]"
240 : "[<span foreground='#888'>num</span>]";
241
242 # <tt> around next statement works around some bug that keeps the
243 # "font =>" from being used on windows
244 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 245}
212 246
213############################################################################# 247#############################################################################
214#TODO: maybe move into own audio module... 248#TODO: maybe move into own audio module...
215 249
635 # right: accept 669 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 670 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 671 text => "Accept",
638 on_activate => sub { 672 on_activate => sub {
639 $conn->send ("reply n"); 673 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 674 destroy_query_dialog $conn;
642 0 675 0
643 }, 676 },
644 ); 677 );
645 678
654 [Cha => CS_STAT_CHA], 687 [Cha => CS_STAT_CHA],
655 ) { 688 ) {
656 my ($name, $id) = @$_; 689 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 690 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 691 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 692 expand => 1,
661 can_events => 1, 693 can_events => 1,
662 can_hover => 1, 694 can_hover => 1,
663 tooltip => "#stat_$name", 695 tooltip => "#stat_$name",
664 ); 696 );
698 730
699 $vbox->add (@dialog); 731 $vbox->add (@dialog);
700 $dialog->show; 732 $dialog->show;
701} 733}
702 734
703sub start_game { 735sub dc_connect {
704 status "logging in..."; 736 my ($host, $port) = @_;
705
706 $LOGIN_BUTTON->set_text ("Logout");
707 $SETUP_DIALOG->hide;
708 737
709 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 738 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
710 739
711 my ($host, $port) = split /:/, $PROFILE->{host};
712
713 $MAP = new DC::Map;
714
715 $CONN = eval { 740 $CONN =
716 new DC::Protocol 741 new DC::Protocol
717 host => $host, 742 host => $host,
718 port => $port || 13327, 743 port => $port,
719 user => $PROFILE->{user}, 744 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 745 pass => $PROFILE->{password},
721 mapw => $mapsize, 746 mapw => $mapsize,
722 maph => $mapsize, 747 maph => $mapsize,
723 748
724 client => "cfplus $DC::VERSION $] $^O", 749 client => "$DC::VERSION $] $^O",
725 750
726 map_widget => $MAPWIDGET, 751 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 752 statusbox => $STATUSBOX,
728 map => $MAP, 753 map => $MAP,
729 mapmap => $MAPMAP, 754 mapmap => $MAPMAP,
730 query => \&server_query, 755 query => \&server_query,
731 756
732 setup_req => { 757 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 758 smoothing => $CFG->{map_smoothing}*1,
734 }, 759 },
735 };
736 760
737 if ($CONN) { 761 on_connect => sub {
762 if ($_[0]) {
738 DC::lowdelay fileno $CONN->{fh}; 763 DC::lowdelay fileno $CONN->{fh};
739 764
740 status "login successful"; 765 status "login successful";
766 } else {
767 undef $CONN;
768 status "unable to connect: $!";
769 stop_game();
770 }
771 },
772 ;
773}
774
775sub start_game {
776 status "logging in...";
777
778 $LOGIN_BUTTON->set_text ("Logout");
779 $SETUP_DIALOG->hide;
780
781 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
782
783 $MAP = new DC::Map;
784
785 # hack to make SURE we find the IP address all right
786 # can be removed once AnyEvent::DNS is proven stable.
787 if ($host eq "gameserver.deliantra.net") {
788 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
789 if ($_[0] ne "80.101.114.108") { # Perl
790 status "dns failure, using hardcoded address";
791 $host = "129.13.162.95";
792 }
793
794 dc_connect $host, $port;
795 };
741 } else { 796 } else {
742 status "unable to connect"; 797 dc_connect $host, $port;
743 stop_game();
744 } 798 }
745} 799}
746 800
747sub stop_game { 801sub stop_game {
748 $LOGIN_BUTTON->set_text ("Login / Register"); 802 $LOGIN_BUTTON->set_text ("Login / Register");
770 824
771 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 825 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 826
773 my $row = 0; 827 my $row = 0;
774 828
775 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 829 $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, 830 $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, 831 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 832 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 833
780 my $vidmode_tooltip = 834 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 835 "<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>."; 836 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 837
784 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 838 $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); 839 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 840
787 $hbox->add (my $mode_slider = new DC::UI::Slider 841 $hbox->add (my $mode_slider = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 842 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
789 tooltip => $vidmode_tooltip); 843 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 844 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 845 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 846 can_events => 1, tooltip => $vidmode_tooltip);
793 847
794 $mode_slider->connect (changed => sub { 848 $mode_slider->connect (changed => sub {
795 my ($self, $value) = @_; 849 my ($self, $value) = @_;
796 850
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 851 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 852 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 853 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 854 $mode_slider->emit (changed => $mode_slider->{range}[0]);
801 855
802 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 856 $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 857 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 858 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 859 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 860 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 861 );
808 862
809 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 863 $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 864 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 865 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 866 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 " 867 . "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. " 868 . "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, " 869 . "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 " 870 . "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>", 871 . "<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 } 872 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 873 );
820 874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{disable_alpha},
878 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
879 . "by disabling a number of textures and transparency effects. Normally, these "
880 . "effects do not cost a lot of resources, but some graphics cards might fall "
881 . "back to etxremely slow rendering if this is enabled. If disabling this option "
882 . "noticably improves the framerate of the client please report this! "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub {
885 my ($self, $value) = @_;
886 $CFG->{disable_alpha} = $value;
887 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
888 0
889 }
890 );
891
821 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 892 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 893 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 894 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 895 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 " 896 . "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 " 897 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 898 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 899 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 900 );
830 901
831 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 903 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 904 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 905 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 906 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 907 );
837 908
838 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new DC::UI::Slider 910 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 911 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.", 912 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 }, 913 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 914 );
844 915
845 $table->add_at (1, $row++, new DC::UI::Button 916 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 917 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 918 tooltip => "Apply the video settings above.",
848 on_activate => sub { 919 on_activate => sub {
849 video_shutdown (); 920 video_shutdown ();
850 video_init (); 921 video_init ();
851 0 922 0
852 } 923 }
853 ); 924 );
854 925
855 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new DC::UI::Slider 927 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 928 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 929 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 930 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 931 );
861 932
862 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 934 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 935 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 936 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. " 937 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 938 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 939 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 940 );
870 941
871 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 942 $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 943 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 944 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 945 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 } 946 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 947 );
877 948
878 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new DC::UI::Slider 950 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 951 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.", 952 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 } 953 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 954 );
884 955
885 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new DC::UI::Slider 957 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 958 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, " 959 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.", 960 . "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 }, 961 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 962 );
892 963
893 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new DC::UI::Slider 965 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 966 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.", 967 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 968 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 969 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 970 &set_gauge_window_fontsize;
900 0 971 0
901 } 972 }
902 ); 973 );
903 974
904 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 975 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new DC::UI::Slider 976 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 977 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 978 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 979 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 980 $CFG->{gauge_size} = $_[1];
943 1014
944 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1015 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 1016
946 my $row = 0; 1017 my $row = 0;
947 1018
948 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 1021 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.", 1022 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 } 1023 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 1024 );
954 1025
955 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new DC::UI::CheckBox 1027 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 1028 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1029 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 1030 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 1031 $CFG->{effects_enable} = $_[1];
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1038 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.", 1039 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1040 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1041 );
971 1042
972 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1044 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1045 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1046 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1047 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1048 $CFG->{bgm_enable} = $_[1];
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1055 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1056 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1057 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1058 );
988 1059
989 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new DC::UI::Selector 1061 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1062 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1063 value => $CFG->{audio_hw_frequency},
993 options => [ 1064 options => [
994 [ 0, "default" , "Use System Default"], 1065 [ 0, "default" , "Use System Default"],
1003 audio_tab_update; 1074 audio_tab_update;
1004 1 1075 1
1005 } 1076 }
1006 ); 1077 );
1007 1078
1008 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1080 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1081 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1082 value => $CFG->{audio_hw_channels},
1012 options => [ 1083 options => [
1013 [0, "default" , "Use System Default"], 1084 [0, "default" , "Use System Default"],
1022 audio_tab_update; 1093 audio_tab_update;
1023 1 1094 1
1024 } 1095 }
1025 ); 1096 );
1026 1097
1027 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1098 $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 1099 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1100 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1101 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 " 1102 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.", 1103 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1036 1 1107 1
1037 } 1108 }
1038 ); 1109 );
1039 1110
1040 # should really be a slider 1111 # should really be a slider
1041 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1112 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1113 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1114 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.", 1115 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], 1116 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1117 template => ">= 99",
1052 1; 1123 1;
1053 } 1124 }
1054 ); 1125 );
1055 1126
1056 $table->add_at (1, $row++, new DC::UI::Button 1127 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1128 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1129 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1130 on_activate => sub {
1060 audio_shutdown (); 1131 audio_shutdown ();
1061 audio_init (); 1132 audio_init ();
1062 0 1133 0
1112 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1183 $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"); 1184 $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"); 1185 $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"); 1186 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116 1187
1117 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1188 $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); 1189 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1190 $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"); 1191 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1192
1122 $GAUGES = { 1193 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1194 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1195 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1196 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 }); 1212 $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"); 1213 $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 }); 1214 $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() } ); 1215 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1216
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1217 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1218
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1219 $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); 1220 $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); 1221 $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); 1222 $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); 1223 $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"); 1224 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1225
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1226 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1227
1157 $c->add_items ({ 1228 $c->add_items ({
1191 $vb->add (new DC::UI::FancyFrame 1262 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1263 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1264 child => (my $pi = new DC::UI::VBox),
1194 ); 1265 );
1195 1266
1196 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1267 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1268 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."); 1269 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, 1270 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1271 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1272 tooltip => "The map you are currently on (if supported by the server).");
1202 1273
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1274 $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, 1275 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1276 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1277 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, 1278 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1279 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1280 tooltip => "The weight limit: you cannot carry more than this.");
1210 1281
1211 $vb->add (new DC::UI::FancyFrame 1282 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1283 label => "Primary/Secondary Statistics",
1233 [2, 5, st_wspd => "WSp", 10.54], 1304 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1305 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1306 my ($col, $row, $id, $label, $template) = @$_;
1236 1307
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1308 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1309 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1310 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1311 $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, 1312 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1313 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1314 }
1244 1315
1245 $vb->add (new DC::UI::FancyFrame 1316 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1317 label => "Resistancies",
1247 child => (my $tbl2 = new DC::UI::Table expand => 1), 1318 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1319 );
1249 1320
1250 my $row = 0; 1321 my $row = 0;
1251 my $col = 0; 1322 my $col = 0;
1252 1323
1291 1362
1292 for (qw/slow holyw conf fire depl magic 1363 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1364 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1365 blind fear tund elec cold ghit/)
1295 { 1366 {
1296 $tbl2->add_at ($col, $row, 1367 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1368 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1369 new DC::UI::Label
1299 font => $FONT_FIXED, 1370 font => $FONT_FIXED,
1300 template => "-100%", 1371 template => "-100%",
1301 align => +1, 1372 align => 1,
1302 valign => 0,
1303 can_events => 1, 1373 can_events => 1,
1304 can_hover => 1, 1374 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1375 tooltip => $resist_names{$_}->[1],
1306 ); 1376 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1377 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1309 can_hover => 1, 1379 can_hover => 1,
1310 can_events => 1, 1380 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1381 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1382 tooltip => $resist_names{$_}->[1],
1313 ); 1383 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1384 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1385 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1386 font => $FONT_FIXED,
1387 align => 1,
1317 can_hover => 1, 1388 can_hover => 1,
1318 can_events => 1, 1389 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1390 tooltip => $resist_names{$_}->[1],
1320 ); 1391 );
1321 1392
1322 $row++; 1393 $row++;
1323 if ($row % 6 == 0) { 1394 if ($row % 6 == 0) {
1324 $col += 3; 1395 $col += 4;
1325 $row = 0; 1396 $row = 0;
1326 } 1397 }
1327 } 1398 }
1328 1399
1329 #update_stats_window ({}); 1400 #update_stats_window ({});
1375 "The time this server has been running without being restarted.", 1446 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1447 "Short information about this server provided by its admins.",
1377 ); 1448 );
1378 my @col = qw(#Users Host Uptime Version Description); 1449 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1450 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1451 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1452 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1453 for 0 .. $#col;
1384 1454
1385 my @align = qw(1 0 1 1 -1); 1455 my @align = qw(1 0.5 1 1 0);
1386 1456
1387 my $y = 0; 1457 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1458 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1459 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1460 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1471 $vbox->add (new DC::UI::FancyFrame 1541 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1542 label => "Login Settings",
1473 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1543 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1544 );
1475 1545
1476 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1546 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new DC::UI::Entry 1547 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1548 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1549 tooltip => "The name of your character on the server.",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1550 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1551 );
1482 1552
1483 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1553 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new DC::UI::Entry 1554 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1555 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1556 hidden => 1,
1487 tooltip => "The password for your character.", 1557 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1558 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1559 );
1490 1560
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1561 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1562 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1563 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1564 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1565 on_activate => sub {
1497 $CONN ? stop_game 1566 $CONN ? stop_game
1498 : start_game; 1567 : start_game;
1501 ); 1570 );
1502 1571
1503 $vbox->add (new DC::UI::FancyFrame 1572 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1573 label => "Registering",
1505 min_h => 200, 1574 min_h => 200,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1575 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1576 markup =>
1508 "To register a new account, choose a username that hasn't been taken yet and " 1577 "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.", 1578 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1579 ),
1511 ); 1580 );
1521 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1590 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1591 );
1523 1592
1524 my $row = 0; 1593 my $row = 0;
1525 1594
1526 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1595 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1596 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1597 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1598
1530 $vbox->add ( 1599 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1600 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1601 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1602 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1603 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1604 on_changed => sub {
1536 my ($self, $value) = @_; 1605 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1606 $CFG->{profile}{default}{host} = $value;
1538 1 1607 1
1539 } 1608 }
1542 if (0) { #d# disabled 1611 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1612 $vbox->add (new DC::UI::Button
1544 expand => 1, 1613 expand => 1,
1545 text => "Server List", 1614 text => "Server List",
1546 other => $METASERVER, 1615 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1616 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1617 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1618 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1619 );
1551 }#d# 1620 }#d#
1552 } 1621 }
1553 1622
1554 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1623 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new DC::UI::Slider 1624 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1625 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1626 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1627 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, " 1628 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1629 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1630 . "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 }, 1631 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1632 );
1564 1633
1565 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1634 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new DC::UI::Entry 1635 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1636 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1637 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1638 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1639 . "default will be used, which is usually around 100kb/s. Most servers will "
1583sub client_setup { 1652sub client_setup {
1584 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1653 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1654
1586 my $row = 0; 1655 my $row = 0;
1587 1656
1588 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1657 $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 1658 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1659 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1660 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1661 on_changed => sub {
1593 my ($self, $value) = @_; 1662 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1663 $CFG->{show_tips} = $value;
1595 0 1664 0
1596 } 1665 }
1597 ); 1666 );
1598 1667
1599 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1668 $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 1669 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1670 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1671 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 " 1672 . "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.", 1673 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1674 on_changed => sub {
1606 my ($self, $value) = @_; 1675 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1676 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1677 0
1609 }, 1678 },
1610 ); 1679 );
1611 1680
1612 $table 1681 $table
1716 1785
1717 $r 1786 $r
1718} 1787}
1719 1788
1720my %SORT_ORDER = ( 1789my %SORT_ORDER = (
1721 type => undef, 1790 type => sub {
1791 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1792 },
1722 mtime => sub { 1793 mtime => sub {
1723 my $NOW = time; 1794 my $NOW = time;
1724 sort { 1795 sort {
1725 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1796 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; 1797 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1738 1809
1739sub inventory_widget { 1810sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1811 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1812
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1813 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1814 $vb1->add (new DC::UI::Label text => "Player");
1744 1815
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1816 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1817
1747 use sort 'stable'; 1818 use sort 'stable';
1748 1819
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1829 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1830 },
1760 ); 1831 );
1761 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1832 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1833 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1834 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1835
1765 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1836 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1837 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1838 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1839
1948 my @path = DC::Pod::full_path_of $node; 2019 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 2020 pop @path; # drop current node
1950 2021
1951 for my $node (@path) { 2022 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 2023 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 2024 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2025 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 2026 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2027 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 2028 $load_node->($node);
1958 }, 2029 },
1959 ); 2030 );
1960 $buttons->add (new DC::UI::Label text => "/"); 2031 $buttons->add (new DC::UI::Label text => "/");
1961 } 2032 }
1962 2033
1963 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2034 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 2035
1965 $curnode = $node; 2036 $curnode = $node;
1966 2037
1967 $viewer->clear; 2038 $viewer->clear;
1968 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2039 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2094 $dialog->show; 2165 $dialog->show;
2095 }; 2166 };
2096} 2167}
2097 2168
2098sub sdl_init { 2169sub sdl_init {
2099 DC::SDL_Init 2170 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2100 and die "SDL::Init failed!\n"; 2171 and die "SDL::Init failed!\n";
2101} 2172}
2102 2173
2103sub video_init { 2174sub video_init {
2175 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2176 $SDL_REINIT = 0;
2177
2178 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2179 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2180 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2181 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2182
2183 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2184
2104 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2185 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {
2186 $CFG->{sdl_mode} = 0;
2187 for (reverse 0 .. $#SDL_MODES) {
2188 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2189 }
2190 }
2105 2191
2106 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2192 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2107 2193
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2194 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2195 $FULLSCREEN = $CFG->{fullscreen};
2147 force_x => "max", 2233 force_x => "max",
2148 force_y => 0; 2234 force_y => 0;
2149 $DEBUG_STATUS->show; 2235 $DEBUG_STATUS->show;
2150 2236
2151 $STATUSBOX = new DC::UI::Statusbox; 2237 $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]); 2238
2239 $MODBOX = new DC::UI::Label
2240 can_events => 1,
2241 can_hover => 1,
2242 markup => "",
2243 align => 0,
2244 font => $FONT_FIXED,
2245 tooltip => "#modifier_box",
2246 tooltip_width => 0.67,
2247 ;
2248
2249 update_modbox;
2153 2250
2154 (new DC::UI::Frame 2251 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2252 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2253 force_x => 0,
2157 force_y => "max", 2254 force_y => "max",
2158 child => $STATUSBOX, 2255 child => (my $LR = new DC::UI::VBox),
2159 )->show; 2256 )->show;
2257
2258 $LR->add ($STATUSBOX);
2259 $LR->add ($MODBOX);
2260 $LR->add (new DC::UI::Label
2261 align => 0,
2262 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2263 fontsize => 0.5,
2264 fg => [1, 1, 0, 0.7],
2265 );
2160 2266
2161 DC::UI::Toplevel->new ( 2267 DC::UI::Toplevel->new (
2162 title => "Minimap", 2268 title => "Minimap",
2163 name => "mapmap", 2269 name => "mapmap",
2164 x => 0, 2270 x => 0,
2172 2278
2173 $MAPWIDGET = new DC::MapWidget; 2279 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2280 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2281 my ($mapwidget, $preset) = @_;
2176 2282
2177 $MESSAGE_WINDOW->activate_console ($preset) 2283 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2284 if $MESSAGE_DIST;
2179 }); 2285 });
2180 $MAPWIDGET->show; 2286 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2287 $MAPWIDGET->grab_focus;
2182 2288
2183 $COMPLETER = new DC::MapWidget::Command:: 2289 $COMPLETER = new DC::MapWidget::Command::
2195 force_h => $::HEIGHT * 0.6, 2301 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2302 has_close_button => 1,
2197 ; 2303 ;
2198 2304
2199 $METASERVER = metaserver_dialog; 2305 $METASERVER = metaserver_dialog;
2306 # the name is changed to not conflict with the older name as users could have hidden it
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2307 $MESSAGE_WINDOW = new DC::UI::Dockbar
2308 name => "message_window2",
2309 title => 'Messages',
2310 force_w => $::WIDTH * 0.6,
2311 force_h => $::HEIGHT * 0.25,
2312 ;
2201 2313
2314 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2315
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2316 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2317 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2318
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2319 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2320 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2321 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2339 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2340
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2341 $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."); 2342 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2343
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2344# $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."); 2345# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2346
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 2347 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 2348
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2349 $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."); 2350 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2238 $BUTTONBAR->add (new DC::UI::Button 2352 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2353 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.", 2354 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 { 2355 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2356 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2357 DC::write_cfg;
2244 status "Configuration Saved"; 2358 status "Configuration Saved";
2245 0 2359 0
2246 }, 2360 },
2247 ); 2361 );
2248 2362
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2363 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2364 tooltip => "View Documentation");
2251
2252 2365
2253 $BUTTONBAR->add (new DC::UI::Button 2366 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2367 text => "Quit",
2255 tooltip => "Terminates the program", 2368 tooltip => "Terminates the program",
2256 on_activate => sub { 2369 on_activate => sub {
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2384 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2385}
2273 2386
2274sub video_shutdown { 2387sub video_shutdown {
2275 DC::OpenGL::shutdown; 2388 DC::OpenGL::shutdown;
2389 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2390
2277 undef $SDL_ACTIVE; 2391 undef $SDL_ACTIVE;
2278} 2392}
2279 2393
2280my %animate_object; 2394my %animate_object;
2294 $DC::UI::ROOT->draw; 2408 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2409 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2410 $LAST_REFRESH = $NOW;
2297} 2411}
2298 2412
2299my $want_refresh = EV::idle_ns \&force_refresh; 2413my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2414
2301my $input = EV::periodic 0, 1/60, undef, sub { 2415my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2416 $NOW = EV::now;
2303 2417
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2418 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2419 for DC::poll_events;
2306 2420
2307 if (%animate_object) { 2421 if (%animate_object) {
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2455# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2456 },
2343 DC::SDL_KEYDOWN => sub { 2457 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2458 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2459 # alt-enter
2460 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2461 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2462 video_init;
2349 } else { 2463 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2464 &DC::UI::feed_sdl_key_down_event;
2351 } 2465 }
2466 update_modbox;
2352 }, 2467 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2468 DC::SDL_KEYUP => sub {
2469 &DC::UI::feed_sdl_key_up_event;
2470 update_modbox;
2471 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2472 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2473 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2474 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2475 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2476 if ($_[0]{code} == 1) {
2369 EV::unloop; 2487 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2488 #d# TODO calling exit here hangs the process in some futex
2371}; 2489};
2372 2490
2373{ 2491{
2492 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2493
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2494 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2495 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2496 } else {
2377 #TODO: compatibility cruft 2497 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2498 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2499 print STDERR "INFO: used old configuration file\n";
2380 } 2500 }
2381 2501
2382 DC::DB::Server::run; 2502 DC::DB::Server::run;
2503
2504 if ($CFG->{db_schema} < 1) {
2505 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2506 DC::DB::nuke_db;
2507 $CFG->{db_schema} = 1;
2508 DC::write_cfg;
2509 }
2510
2511 DC::DB::open_db;
2383 2512
2384 DC::UI::set_layout ($::CFG->{layout}); 2513 DC::UI::set_layout ($::CFG->{layout});
2385 2514
2386 my %DEF_CFG = ( 2515 my %DEF_CFG = (
2387 sdl_mode => 0, 2516 sdl_mode => 0,
2388 fullscreen => 1, 2517 fullscreen => 1,
2389 fast => 0, 2518 fast => 0,
2390 force_opengl11 => undef, 2519 force_opengl11 => undef,
2520 disable_alpha => 0,
2391 texture_compression => 1, 2521 texture_compression => 1,
2392 map_scale => 1, 2522 map_scale => 1,
2393 fow_enable => 1, 2523 fow_enable => 1,
2394 fow_intensity => 0, 2524 fow_intensity => 0,
2395 map_smoothing => 1, 2525 map_smoothing => 1,
2412 pickup => 0, 2542 pickup => 0,
2413 inv_sort => "mtime", 2543 inv_sort => "mtime",
2414 default => "profile", # default profile 2544 default => "profile", # default profile
2415 show_tips => 1, 2545 show_tips => 1,
2416 logview_max_par => 1000, 2546 logview_max_par => 1000,
2547 shift_fire_stop => 0,
2417 ); 2548 );
2418 2549
2419 while (my ($k, $v) = each %DEF_CFG) { 2550 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2551 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2552 }
2434 } 2565 }
2435 } 2566 }
2436 } 2567 }
2437 2568
2438 sdl_init; 2569 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 2570
2448 { 2571 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2572 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2573 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2574 DejaVuSansMono.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2580 DejaVuSansMono-BoldOblique.ttf
2458 ); 2581 );
2459 2582
2460 DC::add_font $_ for @fonts; 2583 DC::add_font $_ for @fonts;
2461 2584
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2585 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2586 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2587
2467 $FONT_PROP->make_default; 2588 $FONT_PROP->make_default;
2589
2590 DC::pango_init;
2468 } 2591 }
2469 2592
2470# compare mono (ft) vs. rgba (cairo) 2593# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2594# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2595# for my $rgba (0..1) {
2489our $STARTUP_CANCEL = EV::idle sub { 2612our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2613 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2614 $startup_done->();
2492}; 2615};
2493 2616
2617delete $SIG{__DIE__};
2494EV::loop; 2618EV::loop;
2495 2619
2496#video_shutdown; 2620#video_shutdown;
2497#audio_shutdown; 2621#audio_shutdown;
2498DC::OpenGL::quit; 2622DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines