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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines