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.20 by root, Fri Dec 28 11:44:02 2007 UTC vs.
Revision 1.49 by root, Mon Jul 7 12:56:07 2008 UTC

… …
78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
… …
97use List::Util qw(max min); 97use List::Util qw(max min);
98 98
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use AnyEvent::DNS;
103
102use Compress::LZF; 104use Compress::LZF;
103 105
104use DC; 106use DC;
107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 108use DC::OpenGL ();
106use DC::Protocol; 109use DC::Protocol;
107use DC::DB; 110use DC::DB;
108use DC::UI; 111use DC::UI;
109use DC::UI::Canvas; 112use DC::UI::Canvas;
110use DC::UI::Inventory; 113use DC::UI::Inventory;
111use DC::UI::SpellList; 114use DC::UI::SpellList;
112use DC::UI::Dockable; 115use DC::UI::Dockable;
116use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 117use DC::UI::MessageWindow;
114use DC::UI::ChatView; 118use DC::UI::ChatView;
119use DC::MessageDistributor;
115use DC::Pod; 120use DC::Pod;
116use DC::MapWidget; 121use DC::MapWidget;
117use DC::Macro; 122use DC::Macro;
118 123
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 124$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
178our $SPELL_PAGE; 183our $SPELL_PAGE;
179our $SPELL_LIST; 184our $SPELL_LIST;
180 185
181our $HELP_WINDOW; 186our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 187our $MESSAGE_WINDOW;
188our $MESSAGE_DIST;
183our $FLOORBOX; 189our $FLOORBOX;
184our $GAUGES; 190our $GAUGES;
185our $STATWIDS; 191our $STATWIDS;
186 192
187our $SDL_ACTIVE; 193our $SDL_ACTIVE;
188our %SDL_CB; 194our %SDL_CB;
189 195
190our $ALT_ENTER_MESSAGE; 196our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 197our $STATUSBOX;
198our $MODBOX;
192our $DEBUG_STATUS; 199our $DEBUG_STATUS;
193 200
194our $INV; 201our $INV;
195our $INVR; 202our $INVR;
196our $INVR_HB; 203our $INVR_HB;
… …
204sub debug { 211sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 212 $DEBUG_STATUS->set_text ($_[0]);
206} 213}
207 214
208sub message { 215sub message {
209 $MESSAGE_WINDOW->message (@_); 216 $MESSAGE_DIST->message (@_);
217}
218
219sub update_modbox {
220 my $mod = DC::SDL_GetModState;
221
222 my $markup;
223
224 $markup .= $mod & DC::KMOD_CTRL
225 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
226 : "[<span foreground='#888'> once </span>]";
227
228 $markup .= $mod & DC::KMOD_SHIFT
229 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
230 : "[<span foreground='#888'>move</span>]";
231
232 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
233 ? "[ALT]"
234 : "[<span foreground='#888'>alt</span>]";
235
236 $markup .= $mod & DC::KMOD_NUM
237 ? "[NUM]"
238 : "[<span foreground='#888'>num</span>]";
239
240 # <tt> around next statement works around some bug that keeps the
241 # "font =>" from being used on windows
242 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 243}
211 244
212############################################################################# 245#############################################################################
213#TODO: maybe move into own audio module... 246#TODO: maybe move into own audio module...
214 247
… …
634 # right: accept 667 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 668 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 669 text => "Accept",
637 on_activate => sub { 670 on_activate => sub {
638 $conn->send ("reply n"); 671 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 672 destroy_query_dialog $conn;
641 0 673 0
642 }, 674 },
643 ); 675 );
644 676
… …
653 [Cha => CS_STAT_CHA], 685 [Cha => CS_STAT_CHA],
654 ) { 686 ) {
655 my ($name, $id) = @$_; 687 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 688 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 689 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 690 expand => 1,
660 can_events => 1, 691 can_events => 1,
661 can_hover => 1, 692 can_hover => 1,
662 tooltip => "#stat_$name", 693 tooltip => "#stat_$name",
663 ); 694 );
… …
697 728
698 $vbox->add (@dialog); 729 $vbox->add (@dialog);
699 $dialog->show; 730 $dialog->show;
700} 731}
701 732
702sub start_game { 733sub dc_connect {
703 status "logging in..."; 734 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 735
708 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
709 737
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 738 $CONN =
715 new DC::Protocol 739 new DC::Protocol
716 host => $host, 740 host => $host,
717 port => $port || 13327, 741 port => $port || 13327,
718 user => $PROFILE->{user}, 742 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 743 pass => $PROFILE->{password},
720 mapw => $mapsize, 744 mapw => $mapsize,
721 maph => $mapsize, 745 maph => $mapsize,
722 746
723 client => "cfplus $DC::VERSION $] $^O", 747 client => "$DC::VERSION $] $^O",
724 748
725 map_widget => $MAPWIDGET, 749 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 750 statusbox => $STATUSBOX,
727 map => $MAP, 751 map => $MAP,
728 mapmap => $MAPMAP, 752 mapmap => $MAPMAP,
729 query => \&server_query, 753 query => \&server_query,
730 754
731 setup_req => { 755 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 756 smoothing => $CFG->{map_smoothing}*1,
733 }, 757 },
734 };
735 758
736 if ($CONN) { 759 on_connect => sub {
760 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 761 DC::lowdelay fileno $CONN->{fh};
738 762
739 status "login successful"; 763 status "login successful";
764 } else {
765 undef $CONN;
766 status "unable to connect: $!";
767 stop_game();
768 }
769 },
770 ;
771}
772
773sub start_game {
774 status "logging in...";
775
776 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide;
778
779 my ($host, $port) = split /:/, $PROFILE->{host};
780
781 $MAP = new DC::Map;
782
783 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable.
785 if ($host eq "gameserver.deliantra.net") {
786 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
787 if ($_[0] ne "80.101.114.108") { # Perl
788 status "dns failure, using hardcoded address";
789 $host = "129.13.162.95";
790 }
791
792 dc_connect $host, $port;
793 };
740 } else { 794 } else {
741 status "unable to connect"; 795 dc_connect $host, $port;
742 stop_game();
743 } 796 }
744} 797}
745 798
746sub stop_game { 799sub stop_game {
747 $LOGIN_BUTTON->set_text ("Login / Register"); 800 $LOGIN_BUTTON->set_text ("Login / Register");
… …
769 822
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 823 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 824
772 my $row = 0; 825 my $row = 0;
773 826
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 827 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 828 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
776 can_events => 1, 829 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 830 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 831
779 my $vidmode_tooltip = 832 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 833 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
781 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 834 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 835
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 836 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 837 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 838
786 $hbox->add (my $mode_slider = new DC::UI::Slider 839 $hbox->add (my $mode_slider = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 840 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
788 tooltip => $vidmode_tooltip); 841 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 842 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 843 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 844 can_events => 1, tooltip => $vidmode_tooltip);
792 845
793 $mode_slider->connect (changed => sub { 846 $mode_slider->connect (changed => sub {
794 my ($self, $value) = @_; 847 my ($self, $value) = @_;
795 848
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 849 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 850 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 851 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 852 $mode_slider->emit (changed => $mode_slider->{range}[0]);
800 853
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 854 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 855 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 856 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 857 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 859 );
807 860
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 861 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 862 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 863 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 864 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
812 . "higher memory usage and slower performance. It will, however, help tremendously on " 865 . "higher memory usage and slower performance. It will, however, help tremendously on "
813 . "cards that claim to support a feature but fall back to software rendering. " 866 . "cards that claim to support a feature but fall back to software rendering. "
814 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 867 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
815 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 868 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 869 . "experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 870 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 871 );
819 872
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 874 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 875 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 876 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
824 . "will save a lot of memory and increase performance. The compression algorithm " 877 . "will save a lot of memory and increase performance. The compression algorithm "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 878 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 879 . "forced OpenGL 1.1 mode.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 880 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 881 );
829 882
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 884 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 885 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 886 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 887 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 888 );
836 889
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 891 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 892 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 893 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 894 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 895 );
843 896
844 $table->add_at (1, $row++, new DC::UI::Button 897 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 898 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 899 tooltip => "Apply the video settings above.",
847 on_activate => sub { 900 on_activate => sub {
848 video_shutdown (); 901 video_shutdown ();
849 video_init (); 902 video_init ();
850 0 903 0
851 } 904 }
852 ); 905 );
853 906
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 908 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 909 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 910 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 911 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 912 );
860 913
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 915 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 916 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 917 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
865 . "This increases load on the graphics subsystem and works only with TRT servers. " 918 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 919 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 920 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 921 );
869 922
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 923 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 924 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 925 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 926 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 927 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 928 );
876 929
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 931 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 932 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 933 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 934 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 935 );
883 936
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 938 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 939 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 940 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
888 . "but you still need to press apply to correctly re-layout the widget.", 941 . "but you still need to press apply to correctly re-layout the widget.",
889 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 942 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 943 );
891 944
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 946 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 947 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 948 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 949 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 950 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 951 &set_gauge_window_fontsize;
899 0 952 0
900 } 953 }
901 ); 954 );
902 955
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 957 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 958 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 959 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 960 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 961 $CFG->{gauge_size} = $_[1];
… …
942 995
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 996 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 997
945 my $row = 0; 998 my $row = 0;
946 999
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1001 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1002 state => $CFG->{audio_enable},
950 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1003 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1004 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1005 );
953 1006
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1008 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1009 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1010 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1011 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1012 $CFG->{effects_enable} = $_[1];
… …
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1019 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1020 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1021 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1022 );
970 1023
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1025 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1026 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1027 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1028 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1029 $CFG->{bgm_enable} = $_[1];
… …
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1036 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1037 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1038 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1039 );
987 1040
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1042 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1043 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1044 value => $CFG->{audio_hw_frequency},
992 options => [ 1045 options => [
993 [ 0, "default" , "Use System Default"], 1046 [ 0, "default" , "Use System Default"],
… …
1002 audio_tab_update; 1055 audio_tab_update;
1003 1 1056 1
1004 } 1057 }
1005 ); 1058 );
1006 1059
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1061 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1062 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1063 value => $CFG->{audio_hw_channels},
1011 options => [ 1064 options => [
1012 [0, "default" , "Use System Default"], 1065 [0, "default" , "Use System Default"],
… …
1021 audio_tab_update; 1074 audio_tab_update;
1022 1 1075 1
1023 } 1076 }
1024 ); 1077 );
1025 1078
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1080 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1081 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1082 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1083 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1084 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1035 1 1088 1
1036 } 1089 }
1037 ); 1090 );
1038 1091
1039 # should really be a slider 1092 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1094 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1095 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1096 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1097 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1098 template => ">= 99",
… …
1051 1; 1104 1;
1052 } 1105 }
1053 ); 1106 );
1054 1107
1055 $table->add_at (1, $row++, new DC::UI::Button 1108 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1109 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1110 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1111 on_activate => sub {
1059 audio_shutdown (); 1112 audio_shutdown ();
1060 audio_init (); 1113 audio_init ();
1061 0 1114 0
… …
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1164 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1112 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1165 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1113 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1166 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1114 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1167 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1168
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1169 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1170 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1171 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1172 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1173
1121 $GAUGES = { 1174 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1175 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1176 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1177 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1140 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1193 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1141 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1194 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1142 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1195 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1143 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1196 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1144 1197
1145 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1198 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1146 1199
1147 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1200 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1148 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1201 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1149 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1202 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1150 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1203 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1190 $vb->add (new DC::UI::FancyFrame 1243 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1244 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1245 child => (my $pi = new DC::UI::VBox),
1193 ); 1246 );
1194 1247
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1248 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1249 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1250 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1251 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1252 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1253 tooltip => "The map you are currently on (if supported by the server).");
1201 1254
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1255 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1256 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1257 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1258 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1259 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1260 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1261 tooltip => "The weight limit: you cannot carry more than this.");
1209 1262
1210 $vb->add (new DC::UI::FancyFrame 1263 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1264 label => "Primary/Secondary Statistics",
… …
1232 [2, 5, st_wspd => "WSp", 10.54], 1285 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1286 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1287 my ($col, $row, $id, $label, $template) = @$_;
1235 1288
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1289 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1290 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1291 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1292 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1293 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1294 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1295 }
1243 1296
1244 $vb->add (new DC::UI::FancyFrame 1297 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1298 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1299 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1300 );
1248 1301
1249 my $row = 0; 1302 my $row = 0;
1250 my $col = 0; 1303 my $col = 0;
1251 1304
… …
1290 1343
1291 for (qw/slow holyw conf fire depl magic 1344 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1345 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1346 blind fear tund elec cold ghit/)
1294 { 1347 {
1295 $tbl2->add_at ($col, $row, 1348 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1349 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1350 new DC::UI::Label
1298 font => $FONT_FIXED, 1351 font => $FONT_FIXED,
1299 template => "-100%", 1352 template => "-100%",
1300 align => +1, 1353 align => 1,
1301 valign => 0,
1302 can_events => 1, 1354 can_events => 1,
1303 can_hover => 1, 1355 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1356 tooltip => $resist_names{$_}->[1],
1305 ); 1357 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1358 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1308 can_hover => 1, 1360 can_hover => 1,
1309 can_events => 1, 1361 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1362 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1363 tooltip => $resist_names{$_}->[1],
1312 ); 1364 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1365 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1366 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1367 font => $FONT_FIXED,
1368 align => 1,
1316 can_hover => 1, 1369 can_hover => 1,
1317 can_events => 1, 1370 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1371 tooltip => $resist_names{$_}->[1],
1319 ); 1372 );
1320 1373
1321 $row++; 1374 $row++;
1322 if ($row % 6 == 0) { 1375 if ($row % 6 == 0) {
1323 $col += 3; 1376 $col += 4;
1324 $row = 0; 1377 $row = 0;
1325 } 1378 }
1326 } 1379 }
1327 1380
1328 #update_stats_window ({}); 1381 #update_stats_window ({});
… …
1374 "The time this server has been running without being restarted.", 1427 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1428 "Short information about this server provided by its admins.",
1376 ); 1429 );
1377 my @col = qw(#Users Host Uptime Version Description); 1430 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1431 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1432 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1433 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1434 for 0 .. $#col;
1383 1435
1384 my @align = qw(1 0 1 1 -1); 1436 my @align = qw(1 0.5 1 1 0);
1385 1437
1386 my $y = 0; 1438 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1439 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1440 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1441 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1470 $vbox->add (new DC::UI::FancyFrame 1522 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1523 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1524 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1525 );
1474 1526
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1527 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1528 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1529 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1530 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1531 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1532 );
1481 1533
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1534 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1535 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1536 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1537 hidden => 1,
1486 tooltip => "The password for your character.", 1538 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1539 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1540 );
1489 1541
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1542 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1543 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1544 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1545 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1546 on_activate => sub {
1496 $CONN ? stop_game 1547 $CONN ? stop_game
1497 : start_game; 1548 : start_game;
… …
1500 ); 1551 );
1501 1552
1502 $vbox->add (new DC::UI::FancyFrame 1553 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1554 label => "Registering",
1504 min_h => 200, 1555 min_h => 200,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1556 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1557 markup =>
1507 "To register a new account, choose a username that hasn't been taken yet and " 1558 "To register a new account, choose a username that hasn't been taken yet and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1559 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1560 ),
1510 ); 1561 );
… …
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1571 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1572 );
1522 1573
1523 my $row = 0; 1574 my $row = 0;
1524 1575
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1576 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1577 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1578 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1579
1529 $vbox->add ( 1580 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1581 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1582 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1583 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1584 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1585 on_changed => sub {
1535 my ($self, $value) = @_; 1586 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1587 $CFG->{profile}{default}{host} = $value;
1537 1 1588 1
1538 } 1589 }
… …
1541 if (0) { #d# disabled 1592 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1593 $vbox->add (new DC::UI::Button
1543 expand => 1, 1594 expand => 1,
1544 text => "Server List", 1595 text => "Server List",
1545 other => $METASERVER, 1596 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1597 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1598 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1599 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1600 );
1550 }#d# 1601 }#d#
1551 } 1602 }
1552 1603
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1604 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1605 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1606 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1607 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1608 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1609 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1610 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1611 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1612 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1613 );
1563 1614
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1615 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1616 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1617 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1618 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1619 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1620 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1582sub client_setup { 1633sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1634 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1635
1585 my $row = 0; 1636 my $row = 0;
1586 1637
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1638 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1639 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1640 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1641 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1642 on_changed => sub {
1592 my ($self, $value) = @_; 1643 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1644 $CFG->{show_tips} = $value;
1594 0 1645 0
1595 } 1646 }
1596 ); 1647 );
1597 1648
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1649 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1650 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1651 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1652 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1653 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1654 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1655 on_changed => sub {
1605 my ($self, $value) = @_; 1656 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1657 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1658 0
1608 }, 1659 },
1609 ); 1660 );
1610 1661
1611 $table 1662 $table
… …
1715 1766
1716 $r 1767 $r
1717} 1768}
1718 1769
1719my %SORT_ORDER = ( 1770my %SORT_ORDER = (
1720 type => undef, 1771 type => sub {
1772 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1773 },
1721 mtime => sub { 1774 mtime => sub {
1722 my $NOW = time; 1775 my $NOW = time;
1723 sort { 1776 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1777 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1778 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1737 1790
1738sub inventory_widget { 1791sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1792 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1793
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1794 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1795 $vb1->add (new DC::UI::Label text => "Player");
1743 1796
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1797 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1798
1746 use sort 'stable'; 1799 use sort 'stable';
1747 1800
… …
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1810 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1811 },
1759 ); 1812 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1813 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1814 #TODO# update to weigh/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1815 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1816
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1817 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1818 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1819 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1820
… …
1947 my @path = DC::Pod::full_path_of $node; 2000 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2001 pop @path; # drop current node
1949 2002
1950 for my $node (@path) { 2003 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2004 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2005 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2006 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2007 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2008 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2009 $load_node->($node);
1957 }, 2010 },
1958 ); 2011 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2012 $buttons->add (new DC::UI::Label text => "/");
1960 } 2013 }
1961 2014
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2015 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2016
1964 $curnode = $node; 2017 $curnode = $node;
1965 2018
1966 $viewer->clear; 2019 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2020 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2146 force_x => "max", 2199 force_x => "max",
2147 force_y => 0; 2200 force_y => 0;
2148 $DEBUG_STATUS->show; 2201 $DEBUG_STATUS->show;
2149 2202
2150 $STATUSBOX = new DC::UI::Statusbox; 2203 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2204
2205 $MODBOX = new DC::UI::Label
2206 can_events => 1,
2207 can_hover => 1,
2208 markup => "",
2209 align => 0,
2210 font => $FONT_FIXED,
2211 tooltip => "#modifier_box",
2212 tooltip_width => 0.67,
2213 ;
2214
2215 update_modbox;
2152 2216
2153 (new DC::UI::Frame 2217 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2218 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2219 force_x => 0,
2156 force_y => "max", 2220 force_y => "max",
2157 child => $STATUSBOX, 2221 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2222 )->show;
2223
2224 $LR->add ($STATUSBOX);
2225 $LR->add ($MODBOX);
2226 $LR->add (new DC::UI::Label
2227 align => 0,
2228 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2229 fontsize => 0.5,
2230 fg => [1, 1, 0, 0.7],
2231 );
2159 2232
2160 DC::UI::Toplevel->new ( 2233 DC::UI::Toplevel->new (
2161 title => "Minimap", 2234 title => "Minimap",
2162 name => "mapmap", 2235 name => "mapmap",
2163 x => 0, 2236 x => 0,
… …
2171 2244
2172 $MAPWIDGET = new DC::MapWidget; 2245 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2246 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2247 my ($mapwidget, $preset) = @_;
2175 2248
2176 $MESSAGE_WINDOW->activate_console ($preset) 2249 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2250 if $MESSAGE_DIST;
2178 }); 2251 });
2179 $MAPWIDGET->show; 2252 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2253 $MAPWIDGET->grab_focus;
2181 2254
2182 $COMPLETER = new DC::MapWidget::Command:: 2255 $COMPLETER = new DC::MapWidget::Command::
… …
2194 force_h => $::HEIGHT * 0.6, 2267 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2268 has_close_button => 1,
2196 ; 2269 ;
2197 2270
2198 $METASERVER = metaserver_dialog; 2271 $METASERVER = metaserver_dialog;
2272 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2273 $MESSAGE_WINDOW = new DC::UI::Dockbar
2274 name => "message_window2",
2275 title => 'Messages',
2276 force_w => $::WIDTH * 0.6,
2277 force_h => $::HEIGHT * 0.25,
2278 ;
2200 2279
2280 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2281
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2282 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2283 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2284
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2285 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2286 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2287 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2305 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2306
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2308 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2309
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2310# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2311# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2312
2232 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2313 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2233 2314
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2315 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2316 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2237 $BUTTONBAR->add (new DC::UI::Button 2318 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2319 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2320 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub { 2321 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2322 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2323 DC::write_cfg;
2243 status "Configuration Saved"; 2324 status "Configuration Saved";
2244 0 2325 0
2245 }, 2326 },
2246 ); 2327 );
2247 2328
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2329 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2330 tooltip => "View Documentation");
2250
2251 2331
2252 $BUTTONBAR->add (new DC::UI::Button 2332 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2333 text => "Quit",
2254 tooltip => "Terminates the program", 2334 tooltip => "Terminates the program",
2255 on_activate => sub { 2335 on_activate => sub {
… …
2344 # alt-enter 2424 # alt-enter
2345 $FULLSCREEN_ENABLE->toggle; 2425 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown; 2426 video_shutdown;
2347 video_init; 2427 video_init;
2348 } else { 2428 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2429 &DC::UI::feed_sdl_key_down_event;
2350 } 2430 }
2431 update_modbox;
2351 }, 2432 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2433 DC::SDL_KEYUP => sub {
2434 &DC::UI::feed_sdl_key_up_event;
2435 update_modbox;
2436 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2437 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2438 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2439 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2440 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2441 if ($_[0]{code} == 1) {
… …
2368 EV::unloop; 2452 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2453 #d# TODO calling exit here hangs the process in some futex
2370}; 2454};
2371 2455
2372{ 2456{
2457 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2459 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2460 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2461 } else {
2376 #TODO: compatibility cruft 2462 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2463 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2464 print STDERR "INFO: used old configuration file\n";
2379 } 2465 }
2380 2466
2381 DC::DB::Server::run; 2467 DC::DB::Server::run;
2468
2469 if ($CFG->{db_schema} < 1) {
2470 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471 DC::DB::nuke_db;
2472 $CFG->{db_schema} = 1;
2473 DC::write_cfg;
2474 }
2475
2476 DC::DB::open_db;
2382 2477
2383 DC::UI::set_layout ($::CFG->{layout}); 2478 DC::UI::set_layout ($::CFG->{layout});
2384 2479
2385 my %DEF_CFG = ( 2480 my %DEF_CFG = (
2386 sdl_mode => 0, 2481 sdl_mode => 0,
… …
2411 pickup => 0, 2506 pickup => 0,
2412 inv_sort => "mtime", 2507 inv_sort => "mtime",
2413 default => "profile", # default profile 2508 default => "profile", # default profile
2414 show_tips => 1, 2509 show_tips => 1,
2415 logview_max_par => 1000, 2510 logview_max_par => 1000,
2511 shift_fire_stop => 0,
2416 ); 2512 );
2417 2513
2418 while (my ($k, $v) = each %DEF_CFG) { 2514 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2515 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2516 }
… …
2456 DejaVuSansMono-BoldOblique.ttf 2552 DejaVuSansMono-BoldOblique.ttf
2457 ); 2553 );
2458 2554
2459 DC::add_font $_ for @fonts; 2555 DC::add_font $_ for @fonts;
2460 2556
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2557 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2558 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2559
2466 $FONT_PROP->make_default; 2560 $FONT_PROP->make_default;
2561
2562 DC::pango_init;
2467 } 2563 }
2468 2564
2469# compare mono (ft) vs. rgba (cairo) 2565# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2566# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2567# for my $rgba (0..1) {
… …
2488our $STARTUP_CANCEL = EV::idle sub { 2584our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2585 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2586 $startup_done->();
2491}; 2587};
2492 2588
2589delete $SIG{__DIE__};
2493EV::loop; 2590EV::loop;
2494 2591
2495#video_shutdown; 2592#video_shutdown;
2496#audio_shutdown; 2593#audio_shutdown;
2497DC::OpenGL::quit; 2594DC::OpenGL::quit;

Diff Legend

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