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.19 by root, Thu Dec 27 18:35:56 2007 UTC vs.
Revision 1.65 by root, Sat Aug 30 06:49:05 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
74 } 81 }
75 82
76 unshift @INC, $root; 83 unshift @INC, $root;
77 } 84 }
78} 85}
79 86
80# prepend private library directory 87# prepend private library directory
81BEGIN { 88BEGIN {
82 for (grep !ref, @INC) { 89 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 90 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 91 if (-d $path) {
85 unshift @INC, $path; 92 unshift @INC, $path;
86 last; 93 last;
87 } 94 }
88 } 95 }
… …
97use List::Util qw(max min); 104use List::Util qw(max min);
98 105
99use Deliantra; 106use Deliantra;
100use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
101 108
109use AnyEvent::DNS;
110use AnyEvent::Socket ();
111
102use Compress::LZF; 112use Compress::LZF;
103 113
104use DC; 114use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 116use DC::OpenGL ();
106use DC::Protocol; 117use DC::Protocol;
107use DC::DB; 118use DC::DB;
108use DC::UI; 119use DC::UI;
109use DC::UI::Canvas; 120use DC::UI::Canvas;
110use DC::UI::Inventory; 121use DC::UI::Inventory;
111use DC::UI::SpellList; 122use DC::UI::SpellList;
112use DC::UI::Dockable; 123use DC::UI::Dockable;
113use DC::UI::MessageWindow; 124use DC::UI::Dockbar;
114use DC::UI::ChatView; 125use DC::UI::ChatView;
126use DC::MessageDistributor;
115use DC::Pod; 127use DC::Pod;
116use DC::MapWidget; 128use DC::MapWidget;
117use DC::Macro; 129use DC::Macro;
118 130
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
135our $PROFILE; # current profile 147our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 149
138our $WANT_REFRESH; 150our $WANT_REFRESH;
139 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
140our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
141our $WIDTH; 157our $WIDTH;
142our $HEIGHT; 158our $HEIGHT;
143our $FULLSCREEN; 159our $FULLSCREEN;
144our $FONTSIZE; 160our $FONTSIZE;
145 161
… …
178our $SPELL_PAGE; 194our $SPELL_PAGE;
179our $SPELL_LIST; 195our $SPELL_LIST;
180 196
181our $HELP_WINDOW; 197our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 198our $MESSAGE_WINDOW;
199our $MESSAGE_DIST;
183our $FLOORBOX; 200our $FLOORBOX;
184our $GAUGES; 201our $GAUGES;
185our $STATWIDS; 202our $STATWIDS;
186 203
187our $SDL_ACTIVE; 204our $SDL_ACTIVE;
188our %SDL_CB; 205our %SDL_CB;
189 206
190our $ALT_ENTER_MESSAGE; 207our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 208our $STATUSBOX;
209our $MODBOX;
192our $DEBUG_STATUS; 210our $DEBUG_STATUS;
193 211
194our $INV; 212our $INV;
195our $INVR; 213our $INVR;
196our $INVR_HB; 214our $INVR_HB;
… …
204sub debug { 222sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 223 $DEBUG_STATUS->set_text ($_[0]);
206} 224}
207 225
208sub message { 226sub message {
209 $MESSAGE_WINDOW->message (@_); 227 $MESSAGE_DIST->message (@_);
228}
229
230sub update_modbox {
231 my $mod = DC::SDL_GetModState;
232
233 my $markup;
234
235 $markup .= $mod & DC::KMOD_CTRL
236 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
237 : "[<span foreground='#888'> once </span>]";
238
239 $markup .= $mod & DC::KMOD_SHIFT
240 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
241 : "[<span foreground='#888'>move</span>]";
242
243 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
244 ? "[ALT]"
245 : "[<span foreground='#888'>alt</span>]";
246
247 $markup .= $mod & DC::KMOD_NUM
248 ? "[NUM]"
249 : "[<span foreground='#888'>num</span>]";
250
251 # <tt> around next statement works around some bug that keeps the
252 # "font =>" from being used on windows
253 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 254}
211 255
212############################################################################# 256#############################################################################
213#TODO: maybe move into own audio module... 257#TODO: maybe move into own audio module...
214 258
… …
634 # right: accept 678 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 679 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 680 text => "Accept",
637 on_activate => sub { 681 on_activate => sub {
638 $conn->send ("reply n"); 682 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 683 destroy_query_dialog $conn;
641 0 684 0
642 }, 685 },
643 ); 686 );
644 687
… …
653 [Cha => CS_STAT_CHA], 696 [Cha => CS_STAT_CHA],
654 ) { 697 ) {
655 my ($name, $id) = @$_; 698 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 699 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 700 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 701 expand => 1,
660 can_events => 1, 702 can_events => 1,
661 can_hover => 1, 703 can_hover => 1,
662 tooltip => "#stat_$name", 704 tooltip => "#stat_$name",
663 ); 705 );
… …
697 739
698 $vbox->add (@dialog); 740 $vbox->add (@dialog);
699 $dialog->show; 741 $dialog->show;
700} 742}
701 743
702sub start_game { 744sub dc_connect {
703 status "logging in..."; 745 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 746
708 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 747 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
709 748
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 749 $CONN =
715 new DC::Protocol 750 new DC::Protocol
716 host => $host, 751 host => $host,
717 port => $port || 13327, 752 port => $port,
718 user => $PROFILE->{user}, 753 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 754 pass => $PROFILE->{password},
720 mapw => $mapsize, 755 mapw => $mapsize,
721 maph => $mapsize, 756 maph => $mapsize,
722 757
723 client => "cfplus $DC::VERSION $] $^O", 758 client => "$DC::VERSION $] $^O",
724 759
725 map_widget => $MAPWIDGET, 760 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 761 statusbox => $STATUSBOX,
727 map => $MAP, 762 map => $MAP,
728 mapmap => $MAPMAP, 763 mapmap => $MAPMAP,
729 query => \&server_query, 764 query => \&server_query,
730 765
731 setup_req => { 766 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 767 smoothing => $CFG->{map_smoothing}*1,
733 }, 768 },
734 };
735 769
736 if ($CONN) { 770 on_connect => sub {
771 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 772 DC::lowdelay fileno $CONN->{fh};
738 773
739 status "login successful"; 774 status "login successful";
775 } else {
776 undef $CONN;
777 status "unable to connect: $!";
778 stop_game();
779 }
780 },
781 ;
782}
783
784sub start_game {
785 status "logging in...";
786
787 $LOGIN_BUTTON->set_text ("Logout");
788 $SETUP_DIALOG->hide;
789
790 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
791
792 $MAP = new DC::Map;
793
794 # hack to make SURE we find the IP address all right
795 # can be removed once AnyEvent::DNS is proven stable.
796 if ($host eq "gameserver.deliantra.net") {
797 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
798 if ($_[0] ne "80.101.114.108") { # Perl
799 status "dns failure, using hardcoded address";
800 $host = "129.13.162.95";
801 }
802
803 dc_connect $host, $port;
804 };
740 } else { 805 } else {
741 status "unable to connect"; 806 dc_connect $host, $port;
742 stop_game();
743 } 807 }
744} 808}
745 809
746sub stop_game { 810sub stop_game {
747 $LOGIN_BUTTON->set_text ("Login / Register"); 811 $LOGIN_BUTTON->set_text ("Login / Register");
… …
769 833
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 834 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 835
772 my $row = 0; 836 my $row = 0;
773 837
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 838 $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, 839 $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, 840 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
842
843 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
844 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
845 can_events => 1,
846 tooltip => "This field shows any known issues with your config or driver, such as "
847 . "a non-accelerated display format. You can try to work around these issues "
848 . "by selecting a different video mode, changing the settings below or "
849 . "by installing the right driver for your graphics card.");
778 850
779 my $vidmode_tooltip = 851 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 852 "<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>."; 853 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 854
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 855 $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); 856 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 857
786 $hbox->add (my $mode_slider = new DC::UI::Slider 858 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 859 force_w => $WIDTH * 0.1, expand => 1,
860 range => [ ($CFG->{sdl_mode}) x 3 ],
788 tooltip => $vidmode_tooltip); 861 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 862 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 863 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 864 can_events => 1, tooltip => $vidmode_tooltip);
792 865
793 $mode_slider->connect (changed => sub { 866 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 867 my ($self, $value) = @_;
795 868
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 869 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 870 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 871 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 872 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 873
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 874 $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 875 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 876 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 877 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 878 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 879 );
807 880
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 881 $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 882 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 883 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 884 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 " 885 . "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. " 886 . "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, " 887 . "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 " 888 . "but cards and drivers from other vendors (ATI) are often just as bad. "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 889 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 890 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 891 );
819 892
893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
894 $table->add_at (1, $row++, new DC::UI::CheckBox
895 state => $CFG->{disable_alpha},
896 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
897 . "by disabling a number of textures and transparency effects. Normally, these "
898 . "effects do not cost a lot of resources, but some graphics cards might fall "
899 . "back to etxremely slow rendering if this is enabled. If disabling this option "
900 . "noticably improves the framerate of the client please report this! "
901 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
902 on_changed => sub {
903 my ($self, $value) = @_;
904 $CFG->{disable_alpha} = $value;
905 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
906 0
907 }
908 );
909
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 910 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 911 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 912 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 913 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 " 914 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 915 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 916 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 918 );
829 919
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 921 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 922 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 923 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 924 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 925 );
836 926
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 928 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 929 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.", 930 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 }, 931 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 932 );
843 933
844 $table->add_at (1, $row++, new DC::UI::Button 934 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 935 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 936 tooltip => "Apply the video settings above.",
847 on_activate => sub { 937 on_activate => sub {
848 video_shutdown (); 938 video_shutdown ();
849 video_init (); 939 video_init ();
850 0 940 0
851 } 941 }
852 ); 942 );
853 943
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
945 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{smooth_movement},
947 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
948 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
949 . "then disable this option. Changes take effect immdiately.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
951 );
952
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 954 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 955 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 956 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 957 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 958 );
860 959
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 961 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 962 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 963 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. " 964 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 965 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 967 );
869 968
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 969 $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 970 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 971 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 972 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 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 974 );
876 975
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 977 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 978 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.", 979 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 } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 981 );
883 982
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 984 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 985 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, " 986 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.", 987 . "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 }, 988 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 989 );
891 990
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 992 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 993 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.", 994 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 995 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 996 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 997 &set_gauge_window_fontsize;
899 0 998 0
900 } 999 }
901 ); 1000 );
902 1001
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 1003 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 1004 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1005 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 1006 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 1007 $CFG->{gauge_size} = $_[1];
… …
942 1041
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1042 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1043
945 my $row = 0; 1044 my $row = 0;
946 1045
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1048 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.", 1049 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 } 1050 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1051 );
953 1052
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1054 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1055 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1056 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1057 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1058 $CFG->{effects_enable} = $_[1];
… …
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1065 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.", 1066 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1067 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1068 );
970 1069
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1071 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1072 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1073 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1074 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1075 $CFG->{bgm_enable} = $_[1];
… …
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1082 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1083 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1084 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1085 );
987 1086
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1088 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1089 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1090 value => $CFG->{audio_hw_frequency},
992 options => [ 1091 options => [
993 [ 0, "default" , "Use System Default"], 1092 [ 0, "default" , "Use System Default"],
… …
1002 audio_tab_update; 1101 audio_tab_update;
1003 1 1102 1
1004 } 1103 }
1005 ); 1104 );
1006 1105
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1106 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1107 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1108 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1109 value => $CFG->{audio_hw_channels},
1011 options => [ 1110 options => [
1012 [0, "default" , "Use System Default"], 1111 [0, "default" , "Use System Default"],
… …
1021 audio_tab_update; 1120 audio_tab_update;
1022 1 1121 1
1023 } 1122 }
1024 ); 1123 );
1025 1124
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1125 $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 1126 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1127 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1128 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 " 1129 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.", 1130 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1035 1 1134 1
1036 } 1135 }
1037 ); 1136 );
1038 1137
1039 # should really be a slider 1138 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1139 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1140 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1141 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.", 1142 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], 1143 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1144 template => ">= 99",
… …
1051 1; 1150 1;
1052 } 1151 }
1053 ); 1152 );
1054 1153
1055 $table->add_at (1, $row++, new DC::UI::Button 1154 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1155 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1156 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1157 on_activate => sub {
1059 audio_shutdown (); 1158 audio_shutdown ();
1060 audio_init (); 1159 audio_init ();
1061 0 1160 0
… …
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1210 $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"); 1211 $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"); 1212 $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"); 1213 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1214
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1215 $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); 1216 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1217 $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"); 1218 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1219
1121 $GAUGES = { 1220 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1221 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1222 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1223 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 }); 1239 $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"); 1240 $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 }); 1241 $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() } ); 1242 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1144 1243
1145 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1244 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1146 1245
1147 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1246 $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 a a", c_rowspan => 1, c_colspan => 2); 1247 $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); 1248 $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 c", c_rowspan => 1, c_colspan => 2); 1249 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1151 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1250 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1152 $t->add_at (1,1, new DC::UI::Label text => "e"); 1251 $t->add_at (1,1, new DC::UI::Label text => "e");
1153 1252
1154 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1253 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1155 1254
1156 $c->add_items ({ 1255 $c->add_items ({
… …
1190 $vb->add (new DC::UI::FancyFrame 1289 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1290 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1291 child => (my $pi = new DC::UI::VBox),
1193 ); 1292 );
1194 1293
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1294 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1295 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."); 1296 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, 1297 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1298 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1299 tooltip => "The map you are currently on (if supported by the server).");
1201 1300
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1301 $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, 1302 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1303 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1304 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, 1305 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1306 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1307 tooltip => "The weight limit: you cannot carry more than this.");
1209 1308
1210 $vb->add (new DC::UI::FancyFrame 1309 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1310 label => "Primary/Secondary Statistics",
… …
1232 [2, 5, st_wspd => "WSp", 10.54], 1331 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1332 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1333 my ($col, $row, $id, $label, $template) = @$_;
1235 1334
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1335 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1336 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1337 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1338 $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, 1339 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1340 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1341 }
1243 1342
1244 $vb->add (new DC::UI::FancyFrame 1343 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1344 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1345 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1346 );
1248 1347
1249 my $row = 0; 1348 my $row = 0;
1250 my $col = 0; 1349 my $col = 0;
1251 1350
… …
1290 1389
1291 for (qw/slow holyw conf fire depl magic 1390 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1391 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1392 blind fear tund elec cold ghit/)
1294 { 1393 {
1295 $tbl2->add_at ($col, $row, 1394 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1395 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1396 new DC::UI::Label
1298 font => $FONT_FIXED, 1397 font => $FONT_FIXED,
1299 template => "-100%", 1398 template => "-100%",
1300 align => +1, 1399 align => 1,
1301 valign => 0,
1302 can_events => 1, 1400 can_events => 1,
1303 can_hover => 1, 1401 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1402 tooltip => $resist_names{$_}->[1],
1305 ); 1403 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1404 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1308 can_hover => 1, 1406 can_hover => 1,
1309 can_events => 1, 1407 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1408 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1409 tooltip => $resist_names{$_}->[1],
1312 ); 1410 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1411 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1412 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1413 font => $FONT_FIXED,
1414 align => 1,
1316 can_hover => 1, 1415 can_hover => 1,
1317 can_events => 1, 1416 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1417 tooltip => $resist_names{$_}->[1],
1319 ); 1418 );
1320 1419
1321 $row++; 1420 $row++;
1322 if ($row % 6 == 0) { 1421 if ($row % 6 == 0) {
1323 $col += 3; 1422 $col += 4;
1324 $row = 0; 1423 $row = 0;
1325 } 1424 }
1326 } 1425 }
1327 1426
1328 #update_stats_window ({}); 1427 #update_stats_window ({});
… …
1374 "The time this server has been running without being restarted.", 1473 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1474 "Short information about this server provided by its admins.",
1376 ); 1475 );
1377 my @col = qw(#Users Host Uptime Version Description); 1476 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1477 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1478 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1479 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1480 for 0 .. $#col;
1383 1481
1384 my @align = qw(1 0 1 1 -1); 1482 my @align = qw(1 0.5 1 1 0);
1385 1483
1386 my $y = 0; 1484 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1485 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1486 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1487 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1470 $vbox->add (new DC::UI::FancyFrame 1568 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1569 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1570 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1571 );
1474 1572
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1573 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1574 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1575 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1576 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1577 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1578 );
1481 1579
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1580 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1581 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1582 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1583 hidden => 1,
1486 tooltip => "The password for your character.", 1584 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1585 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1586 );
1489 1587
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1588 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1589 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1590 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1591 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1592 on_activate => sub {
1496 $CONN ? stop_game 1593 $CONN ? stop_game
1497 : start_game; 1594 : start_game;
1498 1 1595 1
1499 }, 1596 },
1500 ); 1597 );
1501 1598
1502 $vbox->add (new DC::UI::FancyFrame 1599 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1600 label => "How to Play",
1504 min_h => 200, 1601 min_h => 240,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1602 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1603 markup =>
1604 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1605 . "Then register a new account (or use an existing one if you have one). "
1507 "To register a new account, choose a username that hasn't been taken yet and " 1606 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1607 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1608 ),
1510 ); 1609 );
1511 1610
1512 $vbox 1611 $vbox
… …
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1619 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1620 );
1522 1621
1523 my $row = 0; 1622 my $row = 0;
1524 1623
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1624 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1625 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1626 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1627
1529 $vbox->add ( 1628 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1629 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1630 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1631 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1632 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1633 on_changed => sub {
1535 my ($self, $value) = @_; 1634 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1635 $CFG->{profile}{default}{host} = $value;
1537 1 1636 1
1538 } 1637 }
… …
1541 if (0) { #d# disabled 1640 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1641 $vbox->add (new DC::UI::Button
1543 expand => 1, 1642 expand => 1,
1544 text => "Server List", 1643 text => "Server List",
1545 other => $METASERVER, 1644 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1645 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1646 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1647 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1648 );
1550 }#d# 1649 }#d#
1551 } 1650 }
1552 1651
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1652 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1653 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1654 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1655 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1656 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, " 1657 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1658 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1659 . "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 }, 1660 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1661 );
1563 1662
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1663 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1664 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1665 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1666 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1667 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1668 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1582sub client_setup { 1681sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1682 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1683
1585 my $row = 0; 1684 my $row = 0;
1586 1685
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1686 $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 1687 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1688 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1689 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1690 on_changed => sub {
1592 my ($self, $value) = @_; 1691 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1692 $CFG->{show_tips} = $value;
1594 0 1693 0
1595 } 1694 }
1596 ); 1695 );
1597 1696
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1697 $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 1698 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1699 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1700 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 " 1701 . "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.", 1702 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1703 on_changed => sub {
1605 my ($self, $value) = @_; 1704 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1705 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1706 0
1608 }, 1707 },
1609 ); 1708 );
1610 1709
1611 $table 1710 $table
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1757 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1758 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1759 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1760 ["Flesh" => PICKUP_FLESH],
1662 ], 1761 ],
1663 ["Weight/Value ratio", 2, 17] 1762 ["Value/Weight ratio", 2, 17]
1664 ) 1763 )
1665 { 1764 {
1666 my ($title, $x, $y, @bits) = @$_; 1765 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1766 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1767
… …
1693 } 1792 }
1694 1793
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1794 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1795 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1796 template => ">= 99",
1797 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1798 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1799 on_changed => sub {
1700 my ($slider, $value) = @_; 1800 my ($slider, $value) = @_;
1701 1801
1702 $::CFG->{pickup} &= ~0xF; 1802 $::CFG->{pickup} &= ~0xF;
… …
1715 1815
1716 $r 1816 $r
1717} 1817}
1718 1818
1719my %SORT_ORDER = ( 1819my %SORT_ORDER = (
1720 type => undef, 1820 type => sub {
1821 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1822 },
1721 mtime => sub { 1823 mtime => sub {
1722 my $NOW = time; 1824 my $NOW = time;
1723 sort { 1825 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1826 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; 1827 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1737 1839
1738sub inventory_widget { 1840sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1841 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1842
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1843 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1844 $vb1->add (new DC::UI::Label text => "Player");
1743 1845
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1846 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1847
1746 use sort 'stable'; 1848 use sort 'stable';
1747 1849
… …
1756 $::CFG->{inv_sort} = $_[1]; 1858 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1859 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1860 },
1759 ); 1861 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1862 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1863 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1864 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1865
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1866 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1867 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1868 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1869
… …
1947 my @path = DC::Pod::full_path_of $node; 2049 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2050 pop @path; # drop current node
1949 2051
1950 for my $node (@path) { 2052 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2053 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2054 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2055 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2056 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2057 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2058 $load_node->($node);
1957 }, 2059 },
1958 ); 2060 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2061 $buttons->add (new DC::UI::Label text => "/");
1960 } 2062 }
1961 2063
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2064 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2065
1964 $curnode = $node; 2066 $curnode = $node;
1965 2067
1966 $viewer->clear; 2068 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2069 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2093 $dialog->show; 2195 $dialog->show;
2094 }; 2196 };
2095} 2197}
2096 2198
2097sub sdl_init { 2199sub sdl_init {
2098 DC::SDL_Init 2200 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2201 and die "SDL::Init failed!\n";
2100} 2202}
2101 2203
2102sub video_init { 2204sub video_init {
2205 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2206 $SDL_REINIT = 0;
2207
2208 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2209 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2210 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2211 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2212
2213 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2214
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2216 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217
2218 # now choose biggets mode <= 1024x768
2219 for (0 .. $#SDL_MODES) {
2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_;
2222 }
2223 }
2224 }
2104 2225
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2226 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2227
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2228 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2229 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2230 $FAST = $CFG->{fast};
2110 2231
2232 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2233 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2234 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2235 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2236
2114 $SDL_ACTIVE = 1; 2237 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2238 $LAST_REFRESH = time - 0.01;
2116 2239
… …
2146 force_x => "max", 2269 force_x => "max",
2147 force_y => 0; 2270 force_y => 0;
2148 $DEBUG_STATUS->show; 2271 $DEBUG_STATUS->show;
2149 2272
2150 $STATUSBOX = new DC::UI::Statusbox; 2273 $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]); 2274
2275 $MODBOX = new DC::UI::Label
2276 can_events => 1,
2277 can_hover => 1,
2278 markup => "",
2279 align => 0,
2280 font => $FONT_FIXED,
2281 tooltip => "#modifier_box",
2282 tooltip_width => 0.67,
2283 ;
2284
2285 update_modbox;
2152 2286
2153 (new DC::UI::Frame 2287 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2288 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2289 force_x => 0,
2156 force_y => "max", 2290 force_y => "max",
2157 child => $STATUSBOX, 2291 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2292 )->show;
2293
2294 $LR->add ($STATUSBOX);
2295 $LR->add ($MODBOX);
2296 $LR->add (new DC::UI::Label
2297 align => 0,
2298 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2299 fontsize => 0.5,
2300 fg => [1, 1, 0, 0.7],
2301 );
2159 2302
2160 DC::UI::Toplevel->new ( 2303 DC::UI::Toplevel->new (
2161 title => "Minimap", 2304 title => "Minimap",
2162 name => "mapmap", 2305 name => "mapmap",
2163 x => 0, 2306 x => 0,
… …
2171 2314
2172 $MAPWIDGET = new DC::MapWidget; 2315 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2316 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2317 my ($mapwidget, $preset) = @_;
2175 2318
2176 $MESSAGE_WINDOW->activate_console ($preset) 2319 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2320 if $MESSAGE_DIST;
2178 }); 2321 });
2179 $MAPWIDGET->show; 2322 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2323 $MAPWIDGET->grab_focus;
2181 2324
2182 $COMPLETER = new DC::MapWidget::Command:: 2325 $COMPLETER = new DC::MapWidget::Command::
… …
2194 force_h => $::HEIGHT * 0.6, 2337 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2338 has_close_button => 1,
2196 ; 2339 ;
2197 2340
2198 $METASERVER = metaserver_dialog; 2341 $METASERVER = metaserver_dialog;
2342 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2343 $MESSAGE_WINDOW = new DC::UI::Dockbar
2344 name => "message_window2",
2345 title => 'Messages',
2346 force_w => $::WIDTH * 0.6,
2347 force_h => $::HEIGHT * 0.25,
2348 ;
2200 2349
2350 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2351
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2352 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2353 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2354
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2355 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2356 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2357 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2375 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2376
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2377 $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."); 2378 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2379
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2380# $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."); 2381# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2382
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 2383 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 2384
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2385 $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."); 2386 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2237 $BUTTONBAR->add (new DC::UI::Button 2388 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2389 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.", 2390 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 { 2391 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2392 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2393 DC::write_cfg;
2243 status "Configuration Saved"; 2394 status "Configuration Saved";
2244 0 2395 0
2245 }, 2396 },
2246 ); 2397 );
2247 2398
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2399 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2400 tooltip => "View Documentation");
2250
2251 2401
2252 $BUTTONBAR->add (new DC::UI::Button 2402 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2403 text => "Quit",
2254 tooltip => "Terminates the program", 2404 tooltip => "Terminates the program",
2255 on_activate => sub { 2405 on_activate => sub {
… …
2265 $BUTTONBAR->show; 2415 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2416 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2417 $MESSAGE_WINDOW->show;
2268 } 2418 }
2269 2419
2420 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2421 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2422
2423 $CAVEAT_LABEL->set_text ("None :)");
2424 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2425 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2426
2270 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2427 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2271} 2428}
2272 2429
2273sub video_shutdown { 2430sub video_shutdown {
2274 DC::OpenGL::shutdown; 2431 DC::OpenGL::shutdown;
2432 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2433
2276 undef $SDL_ACTIVE; 2434 undef $SDL_ACTIVE;
2277} 2435}
2278 2436
2279my %animate_object; 2437my %animate_object;
… …
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2498# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2499 },
2342 DC::SDL_KEYDOWN => sub { 2500 DC::SDL_KEYDOWN => sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2501 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2502 # alt-enter
2503 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2504 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2505 video_init;
2348 } else { 2506 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2507 &DC::UI::feed_sdl_key_down_event;
2350 } 2508 }
2509 update_modbox;
2351 }, 2510 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2511 DC::SDL_KEYUP => sub {
2512 &DC::UI::feed_sdl_key_up_event;
2513 update_modbox;
2514 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2515 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2516 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2517 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2518 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2519 if ($_[0]{code} == 1) {
… …
2367$SIG{INT} = $SIG{TERM} = sub { 2529$SIG{INT} = $SIG{TERM} = sub {
2368 EV::unloop; 2530 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2531 #d# TODO calling exit here hangs the process in some futex
2370}; 2532};
2371 2533
2372{ 2534# due to mac os x + sdl combined briandamage, we need this contortion
2535sub main {
2536 {
2537 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2538
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2539 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2540 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2541 } else {
2376 #TODO: compatibility cruft 2542 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2543 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2544 print STDERR "INFO: used old configuration file\n";
2379 } 2545 }
2380 2546
2381 DC::DB::Server::run; 2547 DC::DB::Server::run;
2382 2548
2549 if ($CFG->{db_schema} < 1) {
2550 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2551 DC::DB::nuke_db;
2552 $CFG->{db_schema} = 1;
2553 DC::write_cfg;
2554 }
2555
2556 DC::DB::open_db;
2557
2383 DC::UI::set_layout ($::CFG->{layout}); 2558 DC::UI::set_layout ($::CFG->{layout});
2384 2559
2385 my %DEF_CFG = ( 2560 my %DEF_CFG = (
2386 sdl_mode => 0, 2561 sdl_mode => undef,
2387 fullscreen => 1, 2562 fullscreen => 1,
2388 fast => 0, 2563 fast => 0,
2389 force_opengl11 => undef, 2564 force_opengl11 => undef,
2565 disable_alpha => 0,
2566 smooth_movement => 1,
2390 texture_compression => 1, 2567 texture_compression => 1,
2391 map_scale => 1, 2568 map_scale => 1,
2392 fow_enable => 1, 2569 fow_enable => 1,
2393 fow_intensity => 0, 2570 fow_intensity => 0,
2394 map_smoothing => 1, 2571 map_smoothing => 1,
2395 gui_fontsize => 1, 2572 gui_fontsize => 1,
2396 log_fontsize => 0.7, 2573 log_fontsize => 0.7,
2397 gauge_fontsize => 1, 2574 gauge_fontsize => 1,
2398 gauge_size => 0.35, 2575 gauge_size => 0.35,
2399 stat_fontsize => 0.7, 2576 stat_fontsize => 0.7,
2400 mapsize => 100, 2577 mapsize => 100,
2401 audio_enable => 1, 2578 audio_enable => 1,
2402 audio_hw_channels => 0, 2579 audio_hw_channels => 0,
2403 audio_hw_frequency => 0, 2580 audio_hw_frequency => 0,
2404 audio_hw_chunksize => 0, 2581 audio_hw_chunksize => 0,
2405 audio_mix_channels => 8, 2582 audio_mix_channels => 8,
2406 effects_enable => 1, 2583 effects_enable => 1,
2407 effects_volume => 1, 2584 effects_volume => 1,
2408 bgm_enable => 1, 2585 bgm_enable => 1,
2409 bgm_volume => 0.5, 2586 bgm_volume => 0.5,
2410 output_rate => "", 2587 output_rate => "",
2411 pickup => 0, 2588 pickup => 0,
2412 inv_sort => "mtime", 2589 inv_sort => "mtime",
2413 default => "profile", # default profile 2590 default => "profile", # default profile
2414 show_tips => 1, 2591 show_tips => 1,
2415 logview_max_par => 1000, 2592 logview_max_par => 1000,
2593 shift_fire_stop => 0,
2416 ); 2594 );
2417 2595
2418 while (my ($k, $v) = each %DEF_CFG) { 2596 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2597 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2598 }
2421 2599
2422 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2600 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2423 $PROFILE = $CFG->{profile}{default}; 2601 $PROFILE = $CFG->{profile}{default};
2424 2602
2425 # convert old bindings (only default profile matters) 2603 # convert old bindings (only default profile matters)
2426 if (my $bindings = delete $PROFILE->{bindings}) { 2604 if (my $bindings = delete $PROFILE->{bindings}) {
2427 while (my ($mod, $syms) = each %$bindings) { 2605 while (my ($mod, $syms) = each %$bindings) {
2428 while (my ($sym, $cmds) = each %$syms) { 2606 while (my ($sym, $cmds) = each %$syms) {
2429 push @{ $PROFILE->{macro} }, { 2607 push @{ $PROFILE->{macro} }, {
2430 accelkey => [$mod*1, $sym*1], 2608 accelkey => [$mod*1, $sym*1],
2431 action => $cmds, 2609 action => $cmds,
2610 };
2432 }; 2611 }
2433 } 2612 }
2434 } 2613 }
2435 }
2436 2614
2437 sdl_init; 2615 sdl_init;
2438 2616
2439 @SDL_MODES = DC::SDL_ListModes 8, 8; 2617 {
2440 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2441 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2442
2443 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2444
2445 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2446
2447 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2618 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2619 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2620 DejaVuSansMono.ttf
2451 DejaVuSans-Bold.ttf 2621 DejaVuSans-Bold.ttf
2452 DejaVuSansMono-Bold.ttf 2622 DejaVuSansMono-Bold.ttf
2453 DejaVuSans-Oblique.ttf 2623 DejaVuSans-Oblique.ttf
2454 DejaVuSansMono-Oblique.ttf 2624 DejaVuSansMono-Oblique.ttf
2455 DejaVuSans-BoldOblique.ttf 2625 DejaVuSans-BoldOblique.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2626 DejaVuSansMono-BoldOblique.ttf
2457 ); 2627 );
2458 2628
2459 DC::add_font $_ for @fonts; 2629 DC::add_font $_ for @fonts;
2460 2630
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2631 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2632 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2633
2466 $FONT_PROP->make_default; 2634 $FONT_PROP->make_default;
2467 } 2635
2636 DC::pango_init;
2637 }
2468 2638
2469# compare mono (ft) vs. rgba (cairo) 2639# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2640# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2641# for my $rgba (0..1) {
2472# my $t1 = Time::HiRes::time; 2642# my $t1 = Time::HiRes::time;
… …
2477# } 2647# }
2478# my $t2 = Time::HiRes::time; 2648# my $t2 = Time::HiRes::time;
2479# warn $t2-$t1; 2649# warn $t2-$t1;
2480# } 2650# }
2481 2651
2482 video_init; 2652 video_init;
2483 audio_init; 2653 audio_init;
2484} 2654 }
2485 2655
2486show_tip_of_the_day if $CFG->{show_tips}; 2656 show_tip_of_the_day if $CFG->{show_tips};
2487 2657
2488our $STARTUP_CANCEL = EV::idle sub { 2658 our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2659 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2660 $startup_done->();
2491}; 2661 };
2492 2662
2663 delete $SIG{__DIE__};
2493EV::loop; 2664 EV::loop;
2494 2665
2495#video_shutdown; 2666#video_shutdown;
2496#audio_shutdown; 2667#audio_shutdown;
2497DC::OpenGL::quit; 2668 DC::OpenGL::quit;
2498DC::SDL_Quit; 2669 DC::SDL_Quit;
2499DC::DB::Server::stop; 2670 DC::DB::Server::stop;
2671}
2672
2673DC::SDL_braino; # see sub above
2500 2674
2501=head1 NAME 2675=head1 NAME
2502 2676
2503deliantra - A Deliantra MORPG game client 2677deliantra - A Deliantra MORPG game client
2504 2678
… …
2521 4 show fps 2695 4 show fps
2522 8 suppress tooltips 2696 8 suppress tooltips
2523 2697
2524=head1 AUTHOR 2698=head1 AUTHOR
2525 2699
2526Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2700Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2527 2701
2528 2702
2529 2703

Diff Legend

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