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.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" };
… …
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
140our @SDL_MODES; 146our @SDL_MODES;
147our $SDL_REINIT = 1;
141our $WIDTH; 148our $WIDTH;
142our $HEIGHT; 149our $HEIGHT;
143our $FULLSCREEN; 150our $FULLSCREEN;
144our $FONTSIZE; 151our $FONTSIZE;
145 152
… …
178our $SPELL_PAGE; 185our $SPELL_PAGE;
179our $SPELL_LIST; 186our $SPELL_LIST;
180 187
181our $HELP_WINDOW; 188our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 189our $MESSAGE_WINDOW;
190our $MESSAGE_DIST;
183our $FLOORBOX; 191our $FLOORBOX;
184our $GAUGES; 192our $GAUGES;
185our $STATWIDS; 193our $STATWIDS;
186 194
187our $SDL_ACTIVE; 195our $SDL_ACTIVE;
188our %SDL_CB; 196our %SDL_CB;
189 197
190our $ALT_ENTER_MESSAGE; 198our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 199our $STATUSBOX;
200our $MODBOX;
192our $DEBUG_STATUS; 201our $DEBUG_STATUS;
193 202
194our $INV; 203our $INV;
195our $INVR; 204our $INVR;
196our $INVR_HB; 205our $INVR_HB;
… …
204sub debug { 213sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 214 $DEBUG_STATUS->set_text ($_[0]);
206} 215}
207 216
208sub message { 217sub message {
209 $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>");
210} 245}
211 246
212############################################################################# 247#############################################################################
213#TODO: maybe move into own audio module... 248#TODO: maybe move into own audio module...
214 249
… …
634 # right: accept 669 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 670 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 671 text => "Accept",
637 on_activate => sub { 672 on_activate => sub {
638 $conn->send ("reply n"); 673 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 674 destroy_query_dialog $conn;
641 0 675 0
642 }, 676 },
643 ); 677 );
644 678
… …
653 [Cha => CS_STAT_CHA], 687 [Cha => CS_STAT_CHA],
654 ) { 688 ) {
655 my ($name, $id) = @$_; 689 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 690 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 691 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 692 expand => 1,
660 can_events => 1, 693 can_events => 1,
661 can_hover => 1, 694 can_hover => 1,
662 tooltip => "#stat_$name", 695 tooltip => "#stat_$name",
663 ); 696 );
… …
697 730
698 $vbox->add (@dialog); 731 $vbox->add (@dialog);
699 $dialog->show; 732 $dialog->show;
700} 733}
701 734
702sub start_game { 735sub dc_connect {
703 status "logging in..."; 736 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 737
708 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;
709 739
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 740 $CONN =
715 new DC::Protocol 741 new DC::Protocol
716 host => $host, 742 host => $host,
717 port => $port || 13327, 743 port => $port,
718 user => $PROFILE->{user}, 744 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 745 pass => $PROFILE->{password},
720 mapw => $mapsize, 746 mapw => $mapsize,
721 maph => $mapsize, 747 maph => $mapsize,
722 748
723 client => "cfplus $DC::VERSION $] $^O", 749 client => "$DC::VERSION $] $^O",
724 750
725 map_widget => $MAPWIDGET, 751 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 752 statusbox => $STATUSBOX,
727 map => $MAP, 753 map => $MAP,
728 mapmap => $MAPMAP, 754 mapmap => $MAPMAP,
729 query => \&server_query, 755 query => \&server_query,
730 756
731 setup_req => { 757 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 758 smoothing => $CFG->{map_smoothing}*1,
733 }, 759 },
734 };
735 760
736 if ($CONN) { 761 on_connect => sub {
762 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 763 DC::lowdelay fileno $CONN->{fh};
738 764
739 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 };
740 } else { 796 } else {
741 status "unable to connect"; 797 dc_connect $host, $port;
742 stop_game();
743 } 798 }
744} 799}
745 800
746sub stop_game { 801sub stop_game {
747 $LOGIN_BUTTON->set_text ("Login / Register"); 802 $LOGIN_BUTTON->set_text ("Login / Register");
… …
769 824
770 $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]);
771 826
772 my $row = 0; 827 my $row = 0;
773 828
774 $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");
775 $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,
776 can_events => 1, 831 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 832 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 833
779 my $vidmode_tooltip = 834 my $vidmode_tooltip =
780 "<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). "
781 . "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>.";
782 837
783 $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");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 839 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 840
786 $hbox->add (my $mode_slider = new DC::UI::Slider 841 $hbox->add (my $mode_slider = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 842 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
788 tooltip => $vidmode_tooltip); 843 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 844 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 845 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 846 can_events => 1, tooltip => $vidmode_tooltip);
792 847
793 $mode_slider->connect (changed => sub { 848 $mode_slider->connect (changed => sub {
794 my ($self, $value) = @_; 849 my ($self, $value) = @_;
795 850
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 851 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $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]});
798 }); 853 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 854 $mode_slider->emit (changed => $mode_slider->{range}[0]);
800 855
801 $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");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 857 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 858 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 859 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 860 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 861 );
807 862
808 $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");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 864 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 865 state => $CFG->{force_opengl11},
811 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 "
812 . "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 "
813 . "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. "
814 . "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, "
815 . "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. "
816 . "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>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 872 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 873 );
819 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
820 $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");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 893 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 894 state => $CFG->{texture_compression},
823 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 "
824 . "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 "
825 . "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 "
826 . "forced OpenGL 1.1 mode.", 898 . "forced OpenGL 1.1 mode.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 899 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 900 );
829 901
830 $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");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 903 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 904 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 905 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 906 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 907 );
836 908
837 $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");
838 $table->add_at (1, $row++, new DC::UI::Slider 910 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 911 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.", 912 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 }, 913 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 914 );
843 915
844 $table->add_at (1, $row++, new DC::UI::Button 916 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 917 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 918 tooltip => "Apply the video settings above.",
847 on_activate => sub { 919 on_activate => sub {
848 video_shutdown (); 920 video_shutdown ();
849 video_init (); 921 video_init ();
850 0 922 0
851 } 923 }
852 ); 924 );
853 925
854 $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");
855 $table->add_at (1, $row++, new DC::UI::Slider 927 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 928 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 929 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 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 }
859 ); 931 );
860 932
861 $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");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 934 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 935 state => $CFG->{map_smoothing},
864 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. "
865 . "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. "
866 . "Changes take effect at next login only.", 938 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 939 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 940 );
869 941
870 $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");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 943 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 944 state => $CFG->{fow_enable},
873 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.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 946 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 947 );
876 948
877 $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");
878 $table->add_at (1, $row++, new DC::UI::Slider 950 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 951 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.", 952 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 } 953 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 954 );
883 955
884 $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");
885 $table->add_at (1, $row++, new DC::UI::Slider 957 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 958 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, " 959 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.", 960 . "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 }, 961 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 962 );
891 963
892 $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");
893 $table->add_at (1, $row++, new DC::UI::Slider 965 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 966 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.", 967 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 968 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 969 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 970 &set_gauge_window_fontsize;
899 0 971 0
900 } 972 }
901 ); 973 );
902 974
903 $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");
904 $table->add_at (1, $row++, new DC::UI::Slider 976 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 977 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 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.",
907 on_changed => sub { 979 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 980 $CFG->{gauge_size} = $_[1];
… …
942 1014
943 $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]);
944 1016
945 my $row = 0; 1017 my $row = 0;
946 1018
947 $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");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1021 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.", 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.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1023 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1024 );
953 1025
954 $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");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1027 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1028 expand => 1, state => $CFG->{effects_enable},
957 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.",
958 on_changed => sub { 1030 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1031 $CFG->{effects_enable} = $_[1];
… …
966 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 "
967 . "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.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1040 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1041 );
970 1042
971 $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");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1044 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1045 expand => 1, state => $CFG->{bgm_enable},
974 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.",
975 on_changed => sub { 1047 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1048 $CFG->{bgm_enable} = $_[1];
… …
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1055 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1056 tooltip => "The volume of the background music. Changes are instant.",
985 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 }
986 ); 1058 );
987 1059
988 $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");
989 $table->add_at (1, $row++, new DC::UI::Selector 1061 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1062 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1063 value => $CFG->{audio_hw_frequency},
992 options => [ 1064 options => [
993 [ 0, "default" , "Use System Default"], 1065 [ 0, "default" , "Use System Default"],
… …
1002 audio_tab_update; 1074 audio_tab_update;
1003 1 1075 1
1004 } 1076 }
1005 ); 1077 );
1006 1078
1007 $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");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1080 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1081 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1082 value => $CFG->{audio_hw_channels},
1011 options => [ 1083 options => [
1012 [0, "default" , "Use System Default"], 1084 [0, "default" , "Use System Default"],
… …
1021 audio_tab_update; 1093 audio_tab_update;
1022 1 1094 1
1023 } 1095 }
1024 ); 1096 );
1025 1097
1026 $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");
1027 $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
1028 c_colspan => 2, expand => 1, 1100 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1101 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 " 1102 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.", 1103 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1035 1 1107 1
1036 } 1108 }
1037 ); 1109 );
1038 1110
1039 # should really be a slider 1111 # should really be a slider
1040 $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");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1113 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1114 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.", 1115 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], 1116 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1117 template => ">= 99",
… …
1051 1; 1123 1;
1052 } 1124 }
1053 ); 1125 );
1054 1126
1055 $table->add_at (1, $row++, new DC::UI::Button 1127 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1128 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1129 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1130 on_activate => sub {
1059 audio_shutdown (); 1131 audio_shutdown ();
1060 audio_init (); 1132 audio_init ();
1061 0 1133 0
… …
1111 $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");
1112 $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");
1113 $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");
1114 $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");
1115 1187
1116 $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");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1189 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1190 $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"); 1191 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1192
1121 $GAUGES = { 1193 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1194 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1195 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1196 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1190 $vb->add (new DC::UI::FancyFrame 1262 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1263 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1264 child => (my $pi = new DC::UI::VBox),
1193 ); 1265 );
1194 1266
1195 $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,
1196 can_hover => 1, can_events => 1, 1268 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."); 1269 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, 1270 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1271 can_hover => 1, can_events => 1,
1200 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).");
1201 1273
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1274 $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, 1275 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1276 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1277 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, 1278 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1279 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1280 tooltip => "The weight limit: you cannot carry more than this.");
1209 1281
1210 $vb->add (new DC::UI::FancyFrame 1282 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1283 label => "Primary/Secondary Statistics",
… …
1232 [2, 5, st_wspd => "WSp", 10.54], 1304 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1305 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1306 my ($col, $row, $id, $label, $template) = @$_;
1235 1307
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1308 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1309 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1310 align => 1, template => $template, tooltip => "#stat_$label");
1239 $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
1240 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,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1313 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1314 }
1243 1315
1244 $vb->add (new DC::UI::FancyFrame 1316 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1317 label => "Resistancies",
1246 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]),
1247 ); 1319 );
1248 1320
1249 my $row = 0; 1321 my $row = 0;
1250 my $col = 0; 1322 my $col = 0;
1251 1323
… …
1290 1362
1291 for (qw/slow holyw conf fire depl magic 1363 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1364 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1365 blind fear tund elec cold ghit/)
1294 { 1366 {
1295 $tbl2->add_at ($col, $row, 1367 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1368 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1369 new DC::UI::Label
1298 font => $FONT_FIXED, 1370 font => $FONT_FIXED,
1299 template => "-100%", 1371 template => "-100%",
1300 align => +1, 1372 align => 1,
1301 valign => 0,
1302 can_events => 1, 1373 can_events => 1,
1303 can_hover => 1, 1374 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1375 tooltip => $resist_names{$_}->[1],
1305 ); 1376 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1377 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1308 can_hover => 1, 1379 can_hover => 1,
1309 can_events => 1, 1380 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1381 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1382 tooltip => $resist_names{$_}->[1],
1312 ); 1383 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1384 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1385 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1386 font => $FONT_FIXED,
1387 align => 1,
1316 can_hover => 1, 1388 can_hover => 1,
1317 can_events => 1, 1389 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1390 tooltip => $resist_names{$_}->[1],
1319 ); 1391 );
1320 1392
1321 $row++; 1393 $row++;
1322 if ($row % 6 == 0) { 1394 if ($row % 6 == 0) {
1323 $col += 3; 1395 $col += 4;
1324 $row = 0; 1396 $row = 0;
1325 } 1397 }
1326 } 1398 }
1327 1399
1328 #update_stats_window ({}); 1400 #update_stats_window ({});
… …
1374 "The time this server has been running without being restarted.", 1446 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1447 "Short information about this server provided by its admins.",
1376 ); 1448 );
1377 my @col = qw(#Users Host Uptime Version Description); 1449 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1450 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1451 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1452 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1453 for 0 .. $#col;
1383 1454
1384 my @align = qw(1 0 1 1 -1); 1455 my @align = qw(1 0.5 1 1 0);
1385 1456
1386 my $y = 0; 1457 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1458 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1459 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$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)};
… …
1470 $vbox->add (new DC::UI::FancyFrame 1541 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1542 label => "Login Settings",
1472 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]),
1473 ); 1544 );
1474 1545
1475 $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");
1476 $table->add_at (1, 4, new DC::UI::Entry 1547 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1548 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1549 tooltip => "The name of your character on the server.",
1479 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 }
1480 ); 1551 );
1481 1552
1482 $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");
1483 $table->add_at (1, 5, new DC::UI::Entry 1554 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1555 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1556 hidden => 1,
1486 tooltip => "The password for your character.", 1557 tooltip => "The password for your character.",
1487 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 }
1488 ); 1559 );
1489 1560
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1561 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1562 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1563 text => "Login / Register",
1494 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.",
1495 on_activate => sub { 1565 on_activate => sub {
1496 $CONN ? stop_game 1566 $CONN ? stop_game
1497 : start_game; 1567 : start_game;
… …
1500 ); 1570 );
1501 1571
1502 $vbox->add (new DC::UI::FancyFrame 1572 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1573 label => "Registering",
1504 min_h => 200, 1574 min_h => 200,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1575 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1576 markup =>
1507 "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 "
1508 . "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.",
1509 ), 1579 ),
1510 ); 1580 );
… …
1520 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]),
1521 ); 1591 );
1522 1592
1523 my $row = 0; 1593 my $row = 0;
1524 1594
1525 $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");
1526 { 1596 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1597 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1598
1529 $vbox->add ( 1599 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1600 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1601 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1602 text => $CFG->{profile}{default}{host},
1533 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>)",
1534 on_changed => sub { 1604 on_changed => sub {
1535 my ($self, $value) = @_; 1605 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1606 $CFG->{profile}{default}{host} = $value;
1537 1 1607 1
1538 } 1608 }
… …
1541 if (0) { #d# disabled 1611 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1612 $vbox->add (new DC::UI::Button
1543 expand => 1, 1613 expand => 1,
1544 text => "Server List", 1614 text => "Server List",
1545 other => $METASERVER, 1615 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1616 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1617 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1618 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1619 );
1550 }#d# 1620 }#d#
1551 } 1621 }
1552 1622
1553 $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");
1554 $table->add_at (1, $row, new DC::UI::Slider 1624 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1625 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1626 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 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. "
1558 . "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, "
1559 . "but you also increase bandwidth requirements and latency. " 1629 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1630 . "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 }, 1631 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1632 );
1563 1633
1564 $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");
1565 $table->add_at (1, $row, new DC::UI::Entry 1635 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1636 text => $CFG->{output_rate},
1567 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 "
1568 . "when sending data. When 0 or unset, the server " 1638 . "when sending data. When 0 or unset, the server "
1569 . "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 "
… …
1582sub client_setup { 1652sub client_setup {
1583 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];
1584 1654
1585 my $row = 0; 1655 my $row = 0;
1586 1656
1587 $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");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1658 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1659 state => $CFG->{show_tips},
1590 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?",
1591 on_changed => sub { 1661 on_changed => sub {
1592 my ($self, $value) = @_; 1662 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1663 $CFG->{show_tips} = $value;
1594 0 1664 0
1595 } 1665 }
1596 ); 1666 );
1597 1667
1598 $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");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1669 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1670 text => $CFG->{logview_max_par},
1601 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 "
1602 . "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 "
1603 . "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.",
1604 on_changed => sub { 1674 on_changed => sub {
1605 my ($self, $value) = @_; 1675 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1676 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1677 0
1608 }, 1678 },
1609 ); 1679 );
1610 1680
1611 $table 1681 $table
… …
1715 1785
1716 $r 1786 $r
1717} 1787}
1718 1788
1719my %SORT_ORDER = ( 1789my %SORT_ORDER = (
1720 type => undef, 1790 type => sub {
1791 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1792 },
1721 mtime => sub { 1793 mtime => sub {
1722 my $NOW = time; 1794 my $NOW = time;
1723 sort { 1795 sort {
1724 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;
1725 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;
… …
1737 1809
1738sub inventory_widget { 1810sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1811 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1812
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1813 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1814 $vb1->add (new DC::UI::Label text => "Player");
1743 1815
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1816 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1817
1746 use sort 'stable'; 1818 use sort 'stable';
1747 1819
… …
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1829 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1830 },
1759 ); 1831 );
1760 $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);
1761 #TODO# update to weigh/maxweight 1833 #TODO# update to weigh/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1834 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1835
1764 $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);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1837 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1838 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1839
… …
1947 my @path = DC::Pod::full_path_of $node; 2019 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2020 pop @path; # drop current node
1949 2021
1950 for my $node (@path) { 2022 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2023 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2024 text => $node->[DC::Pod::N_KW][0],
1953 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>",
1954 on_activate => sub { 2026 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2027 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2028 $load_node->($node);
1957 }, 2029 },
1958 ); 2030 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2031 $buttons->add (new DC::UI::Label text => "/");
1960 } 2032 }
1961 2033
1962 $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);
1963 2035
1964 $curnode = $node; 2036 $curnode = $node;
1965 2037
1966 $viewer->clear; 2038 $viewer->clear;
1967 $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);
… …
2093 $dialog->show; 2165 $dialog->show;
2094 }; 2166 };
2095} 2167}
2096 2168
2097sub sdl_init { 2169sub sdl_init {
2098 DC::SDL_Init 2170 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2171 and die "SDL::Init failed!\n";
2100} 2172}
2101 2173
2102sub 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
2103 $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 }
2104 2191
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2192 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2193
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2194 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2195 $FULLSCREEN = $CFG->{fullscreen};
… …
2146 force_x => "max", 2233 force_x => "max",
2147 force_y => 0; 2234 force_y => 0;
2148 $DEBUG_STATUS->show; 2235 $DEBUG_STATUS->show;
2149 2236
2150 $STATUSBOX = new DC::UI::Statusbox; 2237 $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]); 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;
2152 2250
2153 (new DC::UI::Frame 2251 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2252 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2253 force_x => 0,
2156 force_y => "max", 2254 force_y => "max",
2157 child => $STATUSBOX, 2255 child => (my $LR = new DC::UI::VBox),
2158 )->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 );
2159 2266
2160 DC::UI::Toplevel->new ( 2267 DC::UI::Toplevel->new (
2161 title => "Minimap", 2268 title => "Minimap",
2162 name => "mapmap", 2269 name => "mapmap",
2163 x => 0, 2270 x => 0,
… …
2171 2278
2172 $MAPWIDGET = new DC::MapWidget; 2279 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2280 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2281 my ($mapwidget, $preset) = @_;
2175 2282
2176 $MESSAGE_WINDOW->activate_console ($preset) 2283 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2284 if $MESSAGE_DIST;
2178 }); 2285 });
2179 $MAPWIDGET->show; 2286 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2287 $MAPWIDGET->grab_focus;
2181 2288
2182 $COMPLETER = new DC::MapWidget::Command:: 2289 $COMPLETER = new DC::MapWidget::Command::
… …
2194 force_h => $::HEIGHT * 0.6, 2301 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2302 has_close_button => 1,
2196 ; 2303 ;
2197 2304
2198 $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
2199 $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 ;
2200 2313
2314 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2315
2201 $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,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2317 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2318
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2319 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2320 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2321 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2224 $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
2225 2340
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2341 $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."); 2342 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2343
2229 $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,
2230 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.");
2231 2346
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 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
2233 2348
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2349 $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."); 2350 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2237 $BUTTONBAR->add (new DC::UI::Button 2352 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2353 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.", 2354 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 { 2355 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2356 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2357 DC::write_cfg;
2243 status "Configuration Saved"; 2358 status "Configuration Saved";
2244 0 2359 0
2245 }, 2360 },
2246 ); 2361 );
2247 2362
2248 $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,
2249 tooltip => "View Documentation"); 2364 tooltip => "View Documentation");
2250
2251 2365
2252 $BUTTONBAR->add (new DC::UI::Button 2366 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2367 text => "Quit",
2254 tooltip => "Terminates the program", 2368 tooltip => "Terminates the program",
2255 on_activate => sub { 2369 on_activate => sub {
… …
2270 $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]);
2271} 2385}
2272 2386
2273sub video_shutdown { 2387sub video_shutdown {
2274 DC::OpenGL::shutdown; 2388 DC::OpenGL::shutdown;
2389 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2390
2276 undef $SDL_ACTIVE; 2391 undef $SDL_ACTIVE;
2277} 2392}
2278 2393
2279my %animate_object; 2394my %animate_object;
… …
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2455# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2456 },
2342 DC::SDL_KEYDOWN => sub { 2457 DC::SDL_KEYDOWN => sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2458 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2459 # alt-enter
2460 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2461 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2462 video_init;
2348 } else { 2463 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2464 &DC::UI::feed_sdl_key_down_event;
2350 } 2465 }
2466 update_modbox;
2351 }, 2467 },
2352 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 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2472 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2473 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2474 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2475 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2476 if ($_[0]{code} == 1) {
… …
2368 EV::unloop; 2487 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2488 #d# TODO calling exit here hangs the process in some futex
2370}; 2489};
2371 2490
2372{ 2491{
2492 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2493
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2494 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2495 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2496 } else {
2376 #TODO: compatibility cruft 2497 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2498 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2499 print STDERR "INFO: used old configuration file\n";
2379 } 2500 }
2380 2501
2381 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;
2382 2512
2383 DC::UI::set_layout ($::CFG->{layout}); 2513 DC::UI::set_layout ($::CFG->{layout});
2384 2514
2385 my %DEF_CFG = ( 2515 my %DEF_CFG = (
2386 sdl_mode => 0, 2516 sdl_mode => 0,
2387 fullscreen => 1, 2517 fullscreen => 1,
2388 fast => 0, 2518 fast => 0,
2389 force_opengl11 => undef, 2519 force_opengl11 => undef,
2520 disable_alpha => 0,
2390 texture_compression => 1, 2521 texture_compression => 1,
2391 map_scale => 1, 2522 map_scale => 1,
2392 fow_enable => 1, 2523 fow_enable => 1,
2393 fow_intensity => 0, 2524 fow_intensity => 0,
2394 map_smoothing => 1, 2525 map_smoothing => 1,
… …
2411 pickup => 0, 2542 pickup => 0,
2412 inv_sort => "mtime", 2543 inv_sort => "mtime",
2413 default => "profile", # default profile 2544 default => "profile", # default profile
2414 show_tips => 1, 2545 show_tips => 1,
2415 logview_max_par => 1000, 2546 logview_max_par => 1000,
2547 shift_fire_stop => 0,
2416 ); 2548 );
2417 2549
2418 while (my ($k, $v) = each %DEF_CFG) { 2550 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2551 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2552 }
… …
2433 } 2565 }
2434 } 2566 }
2435 } 2567 }
2436 2568
2437 sdl_init; 2569 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 2570
2447 { 2571 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2572 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2573 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2574 DejaVuSansMono.ttf
… …
2456 DejaVuSansMono-BoldOblique.ttf 2580 DejaVuSansMono-BoldOblique.ttf
2457 ); 2581 );
2458 2582
2459 DC::add_font $_ for @fonts; 2583 DC::add_font $_ for @fonts;
2460 2584
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2585 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2586 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2587
2466 $FONT_PROP->make_default; 2588 $FONT_PROP->make_default;
2589
2590 DC::pango_init;
2467 } 2591 }
2468 2592
2469# compare mono (ft) vs. rgba (cairo) 2593# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2594# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2595# for my $rgba (0..1) {
… …
2488our $STARTUP_CANCEL = EV::idle sub { 2612our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2613 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2614 $startup_done->();
2491}; 2615};
2492 2616
2617delete $SIG{__DIE__};
2493EV::loop; 2618EV::loop;
2494 2619
2495#video_shutdown; 2620#video_shutdown;
2496#audio_shutdown; 2621#audio_shutdown;
2497DC::OpenGL::quit; 2622DC::OpenGL::quit;

Diff Legend

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