ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.54 by root, Fri Jul 18 22:56:11 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" };
135our $PROFILE; # current profile 141our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 142our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 143
138our $WANT_REFRESH; 144our $WANT_REFRESH;
139 145
146our $MODE_SLIDER;
147our $CAVEAT_LABEL;
148
140our @SDL_MODES; 149our @SDL_MODES;
150our $SDL_REINIT = 1;
141our $WIDTH; 151our $WIDTH;
142our $HEIGHT; 152our $HEIGHT;
143our $FULLSCREEN; 153our $FULLSCREEN;
144our $FONTSIZE; 154our $FONTSIZE;
145 155
178our $SPELL_PAGE; 188our $SPELL_PAGE;
179our $SPELL_LIST; 189our $SPELL_LIST;
180 190
181our $HELP_WINDOW; 191our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 192our $MESSAGE_WINDOW;
193our $MESSAGE_DIST;
183our $FLOORBOX; 194our $FLOORBOX;
184our $GAUGES; 195our $GAUGES;
185our $STATWIDS; 196our $STATWIDS;
186 197
187our $SDL_ACTIVE; 198our $SDL_ACTIVE;
188our %SDL_CB; 199our %SDL_CB;
189 200
190our $ALT_ENTER_MESSAGE; 201our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 202our $STATUSBOX;
203our $MODBOX;
192our $DEBUG_STATUS; 204our $DEBUG_STATUS;
193 205
194our $INV; 206our $INV;
195our $INVR; 207our $INVR;
196our $INVR_HB; 208our $INVR_HB;
204sub debug { 216sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 217 $DEBUG_STATUS->set_text ($_[0]);
206} 218}
207 219
208sub message { 220sub message {
209 $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>");
210} 248}
211 249
212############################################################################# 250#############################################################################
213#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
214 252
634 # right: accept 672 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 674 text => "Accept",
637 on_activate => sub { 675 on_activate => sub {
638 $conn->send ("reply n"); 676 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
641 0 678 0
642 }, 679 },
643 ); 680 );
644 681
653 [Cha => CS_STAT_CHA], 690 [Cha => CS_STAT_CHA],
654 ) { 691 ) {
655 my ($name, $id) = @$_; 692 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 693 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 694 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 695 expand => 1,
660 can_events => 1, 696 can_events => 1,
661 can_hover => 1, 697 can_hover => 1,
662 tooltip => "#stat_$name", 698 tooltip => "#stat_$name",
663 ); 699 );
697 733
698 $vbox->add (@dialog); 734 $vbox->add (@dialog);
699 $dialog->show; 735 $dialog->show;
700} 736}
701 737
702sub start_game { 738sub dc_connect {
703 status "logging in..."; 739 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 740
708 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;
709 742
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 743 $CONN =
715 new DC::Protocol 744 new DC::Protocol
716 host => $host, 745 host => $host,
717 port => $port || 13327, 746 port => $port,
718 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
720 mapw => $mapsize, 749 mapw => $mapsize,
721 maph => $mapsize, 750 maph => $mapsize,
722 751
723 client => "cfplus $DC::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
724 753
725 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
727 map => $MAP, 756 map => $MAP,
728 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
729 query => \&server_query, 758 query => \&server_query,
730 759
731 setup_req => { 760 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
733 }, 762 },
734 };
735 763
736 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
738 767
739 status "login successful"; 768 status "login successful";
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 };
740 } else { 799 } else {
741 status "unable to connect"; 800 dc_connect $host, $port;
742 stop_game();
743 } 801 }
744} 802}
745 803
746sub stop_game { 804sub stop_game {
747 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
769 827
770 $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]);
771 829
772 my $row = 0; 830 my $row = 0;
773 831
774 $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");
775 $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,
776 can_events => 1, 834 can_events => 1,
777 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.");
778 844
779 my $vidmode_tooltip = 845 my $vidmode_tooltip =
780 "<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). "
781 . "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>.";
782 848
783 $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");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 851
786 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 853 force_w => $WIDTH * 0.1, expand => 1,
788 tooltip => $vidmode_tooltip); 854 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 855 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 856 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 857 can_events => 1, tooltip => $vidmode_tooltip);
792 858
793 $mode_slider->connect (changed => sub { 859 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 860 my ($self, $value) = @_;
795 861
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 863 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 864 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 866
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 869 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 870 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 871 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 872 );
807 873
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 875 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 876 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 877 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
812 . "higher memory usage and slower performance. It will, however, help tremendously on " 878 . "higher memory usage and slower performance. It will, however, help tremendously on "
813 . "cards that claim to support a feature but fall back to software rendering. " 879 . "cards that claim to support a feature but fall back to software rendering. "
814 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 880 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
815 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 881 . "but cards and drivers from other vendors (ATI) are often just as bad. "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 882 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 883 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 884 );
819 885
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887 $table->add_at (1, $row++, new DC::UI::CheckBox
888 state => $CFG->{disable_alpha},
889 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890 . "by disabling a number of textures and transparency effects. Normally, these "
891 . "effects do not cost a lot of resources, but some graphics cards might fall "
892 . "back to etxremely slow rendering if this is enabled. If disabling this option "
893 . "noticably improves the framerate of the client please report this! "
894 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895 on_changed => sub {
896 my ($self, $value) = @_;
897 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
899 0
900 }
901 );
902
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 904 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 905 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 906 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
824 . "will save a lot of memory and increase performance. The compression algorithm " 907 . "will save a lot of memory and increase performance. The compression algorithm "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 908 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 909 . "forced OpenGL 1.1 mode.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 910 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 911 );
829 912
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 914 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 915 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 916 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 917 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 918 );
836 919
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 921 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 922 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 923 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 924 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 925 );
843 926
844 $table->add_at (1, $row++, new DC::UI::Button 927 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 928 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 929 tooltip => "Apply the video settings above.",
847 on_activate => sub { 930 on_activate => sub {
848 video_shutdown (); 931 video_shutdown ();
849 video_init (); 932 video_init ();
850 0 933 0
851 } 934 }
852 ); 935 );
853 936
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 938 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 939 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 940 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 941 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 942 );
860 943
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 945 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 946 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 947 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
865 . "This increases load on the graphics subsystem and works only with TRT servers. " 948 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 949 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 950 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 951 );
869 952
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 955 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 956 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 957 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 958 );
876 959
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 961 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 962 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 963 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 964 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 965 );
883 966
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 968 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 969 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 970 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
888 . "but you still need to press apply to correctly re-layout the widget.", 971 . "but you still need to press apply to correctly re-layout the widget.",
889 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 972 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 973 );
891 974
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 975 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 976 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 977 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 978 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 979 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 980 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 981 &set_gauge_window_fontsize;
899 0 982 0
900 } 983 }
901 ); 984 );
902 985
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 987 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 988 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 989 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 990 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 991 $CFG->{gauge_size} = $_[1];
942 1025
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1026 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1027
945 my $row = 0; 1028 my $row = 0;
946 1029
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1031 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1032 state => $CFG->{audio_enable},
950 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1033 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1034 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1035 );
953 1036
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1038 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1039 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1040 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1041 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1042 $CFG->{effects_enable} = $_[1];
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1049 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1050 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1051 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1052 );
970 1053
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1055 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1056 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1057 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1058 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1059 $CFG->{bgm_enable} = $_[1];
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1066 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1067 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1068 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1069 );
987 1070
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1072 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1073 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1074 value => $CFG->{audio_hw_frequency},
992 options => [ 1075 options => [
993 [ 0, "default" , "Use System Default"], 1076 [ 0, "default" , "Use System Default"],
1002 audio_tab_update; 1085 audio_tab_update;
1003 1 1086 1
1004 } 1087 }
1005 ); 1088 );
1006 1089
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1090 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1091 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1092 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1093 value => $CFG->{audio_hw_channels},
1011 options => [ 1094 options => [
1012 [0, "default" , "Use System Default"], 1095 [0, "default" , "Use System Default"],
1021 audio_tab_update; 1104 audio_tab_update;
1022 1 1105 1
1023 } 1106 }
1024 ); 1107 );
1025 1108
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1109 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1110 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1111 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1112 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1113 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1114 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1035 1 1118 1
1036 } 1119 }
1037 ); 1120 );
1038 1121
1039 # should really be a slider 1122 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1123 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1124 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1125 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1126 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1127 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1128 template => ">= 99",
1051 1; 1134 1;
1052 } 1135 }
1053 ); 1136 );
1054 1137
1055 $table->add_at (1, $row++, new DC::UI::Button 1138 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1139 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1140 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1141 on_activate => sub {
1059 audio_shutdown (); 1142 audio_shutdown ();
1060 audio_init (); 1143 audio_init ();
1061 0 1144 0
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1194 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1112 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1195 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1113 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1196 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1114 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1197 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1198
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1199 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1200 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1201 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1202 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1203
1121 $GAUGES = { 1204 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1205 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1206 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1207 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1190 $vb->add (new DC::UI::FancyFrame 1273 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1274 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1275 child => (my $pi = new DC::UI::VBox),
1193 ); 1276 );
1194 1277
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1278 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1279 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1280 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1281 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1282 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1283 tooltip => "The map you are currently on (if supported by the server).");
1201 1284
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1285 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1286 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1287 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1288 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1289 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1290 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1291 tooltip => "The weight limit: you cannot carry more than this.");
1209 1292
1210 $vb->add (new DC::UI::FancyFrame 1293 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1294 label => "Primary/Secondary Statistics",
1232 [2, 5, st_wspd => "WSp", 10.54], 1315 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1316 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1317 my ($col, $row, $id, $label, $template) = @$_;
1235 1318
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1319 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1320 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1321 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1322 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1323 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1324 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1325 }
1243 1326
1244 $vb->add (new DC::UI::FancyFrame 1327 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1328 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1329 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1330 );
1248 1331
1249 my $row = 0; 1332 my $row = 0;
1250 my $col = 0; 1333 my $col = 0;
1251 1334
1290 1373
1291 for (qw/slow holyw conf fire depl magic 1374 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1375 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1376 blind fear tund elec cold ghit/)
1294 { 1377 {
1295 $tbl2->add_at ($col, $row, 1378 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1379 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1380 new DC::UI::Label
1298 font => $FONT_FIXED, 1381 font => $FONT_FIXED,
1299 template => "-100%", 1382 template => "-100%",
1300 align => +1, 1383 align => 1,
1301 valign => 0,
1302 can_events => 1, 1384 can_events => 1,
1303 can_hover => 1, 1385 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1386 tooltip => $resist_names{$_}->[1],
1305 ); 1387 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1388 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 can_hover => 1, 1390 can_hover => 1,
1309 can_events => 1, 1391 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1392 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1393 tooltip => $resist_names{$_}->[1],
1312 ); 1394 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1395 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1396 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1397 font => $FONT_FIXED,
1398 align => 1,
1316 can_hover => 1, 1399 can_hover => 1,
1317 can_events => 1, 1400 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1401 tooltip => $resist_names{$_}->[1],
1319 ); 1402 );
1320 1403
1321 $row++; 1404 $row++;
1322 if ($row % 6 == 0) { 1405 if ($row % 6 == 0) {
1323 $col += 3; 1406 $col += 4;
1324 $row = 0; 1407 $row = 0;
1325 } 1408 }
1326 } 1409 }
1327 1410
1328 #update_stats_window ({}); 1411 #update_stats_window ({});
1374 "The time this server has been running without being restarted.", 1457 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1458 "Short information about this server provided by its admins.",
1376 ); 1459 );
1377 my @col = qw(#Users Host Uptime Version Description); 1460 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1461 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1462 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1463 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1464 for 0 .. $#col;
1383 1465
1384 my @align = qw(1 0 1 1 -1); 1466 my @align = qw(1 0.5 1 1 0);
1385 1467
1386 my $y = 0; 1468 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1469 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1470 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1471 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1470 $vbox->add (new DC::UI::FancyFrame 1552 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1553 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1554 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1555 );
1474 1556
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1557 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1558 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1559 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1560 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1561 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1562 );
1481 1563
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1564 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1565 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1566 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1567 hidden => 1,
1486 tooltip => "The password for your character.", 1568 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1569 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1570 );
1489 1571
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1572 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1573 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1574 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1575 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1576 on_activate => sub {
1496 $CONN ? stop_game 1577 $CONN ? stop_game
1497 : start_game; 1578 : start_game;
1500 ); 1581 );
1501 1582
1502 $vbox->add (new DC::UI::FancyFrame 1583 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1584 label => "Registering",
1504 min_h => 200, 1585 min_h => 200,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1586 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1587 markup =>
1507 "To register a new account, choose a username that hasn't been taken yet and " 1588 "To register a new account, choose a username that hasn't been taken yet and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1589 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1590 ),
1510 ); 1591 );
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1601 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1602 );
1522 1603
1523 my $row = 0; 1604 my $row = 0;
1524 1605
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1606 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1607 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1608 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1609
1529 $vbox->add ( 1610 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1611 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1612 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1613 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1614 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1615 on_changed => sub {
1535 my ($self, $value) = @_; 1616 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1617 $CFG->{profile}{default}{host} = $value;
1537 1 1618 1
1538 } 1619 }
1541 if (0) { #d# disabled 1622 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1623 $vbox->add (new DC::UI::Button
1543 expand => 1, 1624 expand => 1,
1544 text => "Server List", 1625 text => "Server List",
1545 other => $METASERVER, 1626 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1627 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1628 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1629 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1630 );
1550 }#d# 1631 }#d#
1551 } 1632 }
1552 1633
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1634 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1635 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1636 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1637 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1638 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1639 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1640 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1641 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1642 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1643 );
1563 1644
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1645 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1646 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1647 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1648 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1649 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1650 . "default will be used, which is usually around 100kb/s. Most servers will "
1582sub client_setup { 1663sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1664 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1665
1585 my $row = 0; 1666 my $row = 0;
1586 1667
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1668 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1669 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1670 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1671 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1672 on_changed => sub {
1592 my ($self, $value) = @_; 1673 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1674 $CFG->{show_tips} = $value;
1594 0 1675 0
1595 } 1676 }
1596 ); 1677 );
1597 1678
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1679 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1680 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1681 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1682 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1683 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1684 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1685 on_changed => sub {
1605 my ($self, $value) = @_; 1686 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1687 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1688 0
1608 }, 1689 },
1609 ); 1690 );
1610 1691
1611 $table 1692 $table
1715 1796
1716 $r 1797 $r
1717} 1798}
1718 1799
1719my %SORT_ORDER = ( 1800my %SORT_ORDER = (
1720 type => undef, 1801 type => sub {
1802 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1803 },
1721 mtime => sub { 1804 mtime => sub {
1722 my $NOW = time; 1805 my $NOW = time;
1723 sort { 1806 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1807 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1808 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1737 1820
1738sub inventory_widget { 1821sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1822 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1823
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1824 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1825 $vb1->add (new DC::UI::Label text => "Player");
1743 1826
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1827 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1828
1746 use sort 'stable'; 1829 use sort 'stable';
1747 1830
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1840 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1841 },
1759 ); 1842 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1843 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1844 #TODO# update to weigh/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1845 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1846
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1847 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1848 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1849 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1850
1947 my @path = DC::Pod::full_path_of $node; 2030 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2031 pop @path; # drop current node
1949 2032
1950 for my $node (@path) { 2033 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2034 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2035 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2036 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2037 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2038 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2039 $load_node->($node);
1957 }, 2040 },
1958 ); 2041 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2042 $buttons->add (new DC::UI::Label text => "/");
1960 } 2043 }
1961 2044
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2045 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2046
1964 $curnode = $node; 2047 $curnode = $node;
1965 2048
1966 $viewer->clear; 2049 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2050 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2093 $dialog->show; 2176 $dialog->show;
2094 }; 2177 };
2095} 2178}
2096 2179
2097sub sdl_init { 2180sub sdl_init {
2098 DC::SDL_Init 2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2182 and die "SDL::Init failed!\n";
2100} 2183}
2101 2184
2102sub video_init { 2185sub video_init {
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0;
2188
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193
2194 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {
2197 $CFG->{sdl_mode} = 0;
2198 for (reverse 0 .. $#SDL_MODES) {
2199 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2200 }
2201 }
2104 2202
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2204
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2206 $FULLSCREEN = $CFG->{fullscreen};
2146 force_x => "max", 2244 force_x => "max",
2147 force_y => 0; 2245 force_y => 0;
2148 $DEBUG_STATUS->show; 2246 $DEBUG_STATUS->show;
2149 2247
2150 $STATUSBOX = new DC::UI::Statusbox; 2248 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2249
2250 $MODBOX = new DC::UI::Label
2251 can_events => 1,
2252 can_hover => 1,
2253 markup => "",
2254 align => 0,
2255 font => $FONT_FIXED,
2256 tooltip => "#modifier_box",
2257 tooltip_width => 0.67,
2258 ;
2259
2260 update_modbox;
2152 2261
2153 (new DC::UI::Frame 2262 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2263 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2264 force_x => 0,
2156 force_y => "max", 2265 force_y => "max",
2157 child => $STATUSBOX, 2266 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2267 )->show;
2268
2269 $LR->add ($STATUSBOX);
2270 $LR->add ($MODBOX);
2271 $LR->add (new DC::UI::Label
2272 align => 0,
2273 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2274 fontsize => 0.5,
2275 fg => [1, 1, 0, 0.7],
2276 );
2159 2277
2160 DC::UI::Toplevel->new ( 2278 DC::UI::Toplevel->new (
2161 title => "Minimap", 2279 title => "Minimap",
2162 name => "mapmap", 2280 name => "mapmap",
2163 x => 0, 2281 x => 0,
2171 2289
2172 $MAPWIDGET = new DC::MapWidget; 2290 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2291 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2292 my ($mapwidget, $preset) = @_;
2175 2293
2176 $MESSAGE_WINDOW->activate_console ($preset) 2294 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2295 if $MESSAGE_DIST;
2178 }); 2296 });
2179 $MAPWIDGET->show; 2297 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2298 $MAPWIDGET->grab_focus;
2181 2299
2182 $COMPLETER = new DC::MapWidget::Command:: 2300 $COMPLETER = new DC::MapWidget::Command::
2194 force_h => $::HEIGHT * 0.6, 2312 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2313 has_close_button => 1,
2196 ; 2314 ;
2197 2315
2198 $METASERVER = metaserver_dialog; 2316 $METASERVER = metaserver_dialog;
2317 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2318 $MESSAGE_WINDOW = new DC::UI::Dockbar
2319 name => "message_window2",
2320 title => 'Messages',
2321 force_w => $::WIDTH * 0.6,
2322 force_h => $::HEIGHT * 0.25,
2323 ;
2200 2324
2325 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2326
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2327 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2328 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2329
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2330 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2331 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2332 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2350 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2351
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2352 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2353 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2354
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2355# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2356# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2357
2232 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2358 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2233 2359
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2360 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2361 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237 $BUTTONBAR->add (new DC::UI::Button 2363 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2364 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2365 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub { 2366 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2367 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2368 DC::write_cfg;
2243 status "Configuration Saved"; 2369 status "Configuration Saved";
2244 0 2370 0
2245 }, 2371 },
2246 ); 2372 );
2247 2373
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2374 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2375 tooltip => "View Documentation");
2250
2251 2376
2252 $BUTTONBAR->add (new DC::UI::Button 2377 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2378 text => "Quit",
2254 tooltip => "Terminates the program", 2379 tooltip => "Terminates the program",
2255 on_activate => sub { 2380 on_activate => sub {
2265 $BUTTONBAR->show; 2390 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2391 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2392 $MESSAGE_WINDOW->show;
2268 } 2393 }
2269 2394
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397
2398 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Sofwtare Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401
2270 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2271} 2403}
2272 2404
2273sub video_shutdown { 2405sub video_shutdown {
2274 DC::OpenGL::shutdown; 2406 DC::OpenGL::shutdown;
2407 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2408
2276 undef $SDL_ACTIVE; 2409 undef $SDL_ACTIVE;
2277} 2410}
2278 2411
2279my %animate_object; 2412my %animate_object;
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2473# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2474 },
2342 DC::SDL_KEYDOWN => sub { 2475 DC::SDL_KEYDOWN => sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2476 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2477 # alt-enter
2478 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2479 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2480 video_init;
2348 } else { 2481 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2482 &DC::UI::feed_sdl_key_down_event;
2350 } 2483 }
2484 update_modbox;
2351 }, 2485 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2486 DC::SDL_KEYUP => sub {
2487 &DC::UI::feed_sdl_key_up_event;
2488 update_modbox;
2489 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2490 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2491 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2492 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2493 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2494 if ($_[0]{code} == 1) {
2368 EV::unloop; 2505 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2506 #d# TODO calling exit here hangs the process in some futex
2370}; 2507};
2371 2508
2372{ 2509{
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2512 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2513 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2514 } else {
2376 #TODO: compatibility cruft 2515 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2517 print STDERR "INFO: used old configuration file\n";
2379 } 2518 }
2380 2519
2381 DC::DB::Server::run; 2520 DC::DB::Server::run;
2521
2522 if ($CFG->{db_schema} < 1) {
2523 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2524 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1;
2526 DC::write_cfg;
2527 }
2528
2529 DC::DB::open_db;
2382 2530
2383 DC::UI::set_layout ($::CFG->{layout}); 2531 DC::UI::set_layout ($::CFG->{layout});
2384 2532
2385 my %DEF_CFG = ( 2533 my %DEF_CFG = (
2386 sdl_mode => 0, 2534 sdl_mode => 0,
2387 fullscreen => 1, 2535 fullscreen => 1,
2388 fast => 0, 2536 fast => 0,
2389 force_opengl11 => undef, 2537 force_opengl11 => undef,
2538 disable_alpha => 0,
2390 texture_compression => 1, 2539 texture_compression => 1,
2391 map_scale => 1, 2540 map_scale => 1,
2392 fow_enable => 1, 2541 fow_enable => 1,
2393 fow_intensity => 0, 2542 fow_intensity => 0,
2394 map_smoothing => 1, 2543 map_smoothing => 1,
2411 pickup => 0, 2560 pickup => 0,
2412 inv_sort => "mtime", 2561 inv_sort => "mtime",
2413 default => "profile", # default profile 2562 default => "profile", # default profile
2414 show_tips => 1, 2563 show_tips => 1,
2415 logview_max_par => 1000, 2564 logview_max_par => 1000,
2565 shift_fire_stop => 0,
2416 ); 2566 );
2417 2567
2418 while (my ($k, $v) = each %DEF_CFG) { 2568 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2569 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2570 }
2433 } 2583 }
2434 } 2584 }
2435 } 2585 }
2436 2586
2437 sdl_init; 2587 sdl_init;
2438
2439 @SDL_MODES = DC::SDL_ListModes 8, 8;
2440 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2441 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2442
2443 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2444
2445 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2446 2588
2447 { 2589 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2590 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2591 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2592 DejaVuSansMono.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2598 DejaVuSansMono-BoldOblique.ttf
2457 ); 2599 );
2458 2600
2459 DC::add_font $_ for @fonts; 2601 DC::add_font $_ for @fonts;
2460 2602
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2603 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2604 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2605
2466 $FONT_PROP->make_default; 2606 $FONT_PROP->make_default;
2607
2608 DC::pango_init;
2467 } 2609 }
2468 2610
2469# compare mono (ft) vs. rgba (cairo) 2611# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2612# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2613# for my $rgba (0..1) {
2488our $STARTUP_CANCEL = EV::idle sub { 2630our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2631 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2632 $startup_done->();
2491}; 2633};
2492 2634
2635delete $SIG{__DIE__};
2493EV::loop; 2636EV::loop;
2494 2637
2495#video_shutdown; 2638#video_shutdown;
2496#audio_shutdown; 2639#audio_shutdown;
2497DC::OpenGL::quit; 2640DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines