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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines