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

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

Diff Legend

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