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.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.69 by root, Mon Sep 1 15:08:15 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
81 symlink "libjpeg.62.dylib", "libjpeg.dylib";
74 } 82 }
75 83
76 unshift @INC, $root; 84 unshift @INC, $root;
77 } 85 }
78} 86}
79 87
80# prepend private library directory 88# prepend private library directory
81BEGIN { 89BEGIN {
82 for (grep !ref, @INC) { 90 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 91 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 92 if (-d $path) {
85 unshift @INC, $path; 93 unshift @INC, $path;
86 last; 94 last;
87 } 95 }
88 } 96 }
… …
90 98
91# need to do it again because that pile of garbage called PAR nukes it before main 99# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 100unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 101 if %PAR::LibCache;
94 102
95use Time::HiRes 'time';
96use EV; 103use EV;
104BEGIN { *time = \&EV::time }
105
97use List::Util qw(max min); 106use List::Util qw(max min);
98 107
99use Deliantra; 108use Deliantra;
100use Deliantra::Protocol::Constants; 109use Deliantra::Protocol::Constants;
101 110
111use AnyEvent::Util ();
112use AnyEvent::DNS;
113use AnyEvent::Socket ();
114
102use Compress::LZF; 115use Compress::LZF;
116use JSON::XS;
103 117
104use DC; 118use DC;
119
120sub crash($;$) {
121 # nop during compiletime
122}
123
124BEGIN {
125 $SIG{__DIE__} = sub {
126 return if $^S;
127 crash "CRASH/DIE: $_[0]" => 1;
128 DC::fatal Carp::longmess "$_[0]";
129 }
130}
131
105use DC::OpenGL (); 132use DC::OpenGL ();
106use DC::Protocol; 133use DC::Protocol;
107use DC::DB; 134use DC::DB;
108use DC::UI; 135use DC::UI;
109use DC::UI::Canvas; 136use DC::UI::Canvas;
110use DC::UI::Inventory; 137use DC::UI::Inventory;
111use DC::UI::SpellList; 138use DC::UI::SpellList;
112use DC::UI::Dockable; 139use DC::UI::Dockable;
113use DC::UI::MessageWindow; 140use DC::UI::Dockbar;
114use DC::UI::ChatView; 141use DC::UI::ChatView;
142use DC::MessageDistributor;
115use DC::Pod; 143use DC::Pod;
116use DC::MapWidget; 144use DC::MapWidget;
117use DC::Macro; 145use DC::Macro;
118 146
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 147$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 148$SIG{PIPE} = 'IGNORE';
121 149
122$EV::DIED = sub { 150$EV::DIED = sub {
151 crash "CRASH/EV::DIED: $@" => 1;
123 DC::fatal Carp::longmess $@; 152 DC::fatal Carp::longmess $@;
124}; 153};
125 154
126my $MAX_FPS = 60; 155my $MAX_FPS = 60;
127 156
… …
129 158
130our $LAST_REFRESH; 159our $LAST_REFRESH;
131our $NOW; 160our $NOW;
132 161
133our $CFG; 162our $CFG;
134our $CONN;
135our $PROFILE; # current profile 163our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 164our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 165
138our $WANT_REFRESH; 166our $WANT_REFRESH;
139 167
168our $MODE_SLIDER;
169our $CAVEAT_LABEL;
170
140our @SDL_MODES; 171our @SDL_MODES;
172our $SDL_REINIT = 1;
141our $WIDTH; 173our $WIDTH;
142our $HEIGHT; 174our $HEIGHT;
143our $FULLSCREEN; 175our $FULLSCREEN;
144our $FONTSIZE; 176our $FONTSIZE;
145 177
146our $FONT_PROP; 178our $FONT_PROP;
147our $FONT_FIXED; 179our $FONT_FIXED;
180
181our $CONN;
148 182
149our $MAP; 183our $MAP;
150our $MAPMAP; 184our $MAPMAP;
151our $MAPWIDGET; 185our $MAPWIDGET;
152our $COMPLETER; 186our $COMPLETER;
… …
178our $SPELL_PAGE; 212our $SPELL_PAGE;
179our $SPELL_LIST; 213our $SPELL_LIST;
180 214
181our $HELP_WINDOW; 215our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 216our $MESSAGE_WINDOW;
217our $MESSAGE_DIST;
183our $FLOORBOX; 218our $FLOORBOX;
184our $GAUGES; 219our $GAUGES;
185our $STATWIDS; 220our $STATWIDS;
186 221
187our $SDL_ACTIVE; 222our $SDL_ACTIVE;
188our %SDL_CB; 223our %SDL_CB;
189 224
190our $ALT_ENTER_MESSAGE; 225our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 226our $STATUSBOX;
227our $MODBOX;
192our $DEBUG_STATUS; 228our $DEBUG_STATUS;
193 229
194our $INV; 230our $INV;
195our $INVR; 231our $INVR;
196our $INVR_HB; 232our $INVR_HB;
197 233
198############################################################################# 234#############################################################################
199 235
236# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) {
239 my ($msg, $backtrace) = @_;
240
241 return unless $CONN;
242
243 my $fh = $CONN->{fh}
244 or return;
245
246 my $buf = delete $CONN->{wbuf};
247
248 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
249
250 AnyEvent::Util::fh_nonblocking $fh, 0;
251 syswrite $fh, $buf;
252 AnyEvent::Util::fh_nonblocking $fh, 1;
253
254 $msg =~ s/\s+$//;
255
256 # backtrace as second step, in case it crashes, too
257 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace;
259};
260
261#############################################################################
262
200sub status { 263sub status {
201 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
202} 265}
203 266
204sub debug { 267sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 268 $DEBUG_STATUS->set_text ($_[0]);
206} 269}
207 270
208sub message { 271sub message {
209 $MESSAGE_WINDOW->message (@_); 272 $MESSAGE_DIST->message (@_);
273}
274
275sub update_modbox {
276 my $mod = DC::SDL_GetModState;
277
278 my $markup;
279
280 $markup .= $mod & DC::KMOD_CTRL
281 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
282 : "[<span foreground='#888'> once </span>]";
283
284 $markup .= $mod & DC::KMOD_SHIFT
285 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
286 : "[<span foreground='#888'>move</span>]";
287
288 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
289 ? "[ALT]"
290 : "[<span foreground='#888'>alt</span>]";
291
292 $markup .= $mod & DC::KMOD_NUM
293 ? "[NUM]"
294 : "[<span foreground='#888'>num</span>]";
295
296 # <tt> around next statement works around some bug that keeps the
297 # "font =>" from being used on windows
298 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 299}
211 300
212############################################################################# 301#############################################################################
213#TODO: maybe move into own audio module... 302#TODO: maybe move into own audio module...
214 303
… …
634 # right: accept 723 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 724 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 725 text => "Accept",
637 on_activate => sub { 726 on_activate => sub {
638 $conn->send ("reply n"); 727 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 728 destroy_query_dialog $conn;
641 0 729 0
642 }, 730 },
643 ); 731 );
644 732
… …
653 [Cha => CS_STAT_CHA], 741 [Cha => CS_STAT_CHA],
654 ) { 742 ) {
655 my ($name, $id) = @$_; 743 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 744 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 745 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 746 expand => 1,
660 can_events => 1, 747 can_events => 1,
661 can_hover => 1, 748 can_hover => 1,
662 tooltip => "#stat_$name", 749 tooltip => "#stat_$name",
663 ); 750 );
… …
697 784
698 $vbox->add (@dialog); 785 $vbox->add (@dialog);
699 $dialog->show; 786 $dialog->show;
700} 787}
701 788
702sub start_game { 789sub dc_connect {
703 status "logging in..."; 790 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 791
708 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
709 793
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 794 $CONN =
715 new DC::Protocol 795 new DC::Protocol
716 host => $host, 796 host => $host,
717 port => $port || 13327, 797 port => $port,
718 user => $PROFILE->{user}, 798 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 799 pass => $PROFILE->{password},
720 mapw => $mapsize, 800 mapw => $mapsize,
721 maph => $mapsize, 801 maph => $mapsize,
722 802
723 client => "cfplus $DC::VERSION $] $^O", 803 client => "$DC::VERSION $] $^O",
724 804
725 map_widget => $MAPWIDGET, 805 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 806 statusbox => $STATUSBOX,
727 map => $MAP, 807 map => $MAP,
728 mapmap => $MAPMAP, 808 mapmap => $MAPMAP,
729 query => \&server_query, 809 query => \&server_query,
730 810
731 setup_req => { 811 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 812 smoothing => $CFG->{map_smoothing}*1,
733 }, 813 },
734 };
735 814
736 if ($CONN) { 815 on_connect => sub {
816 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 817 DC::lowdelay fileno $CONN->{fh};
738 818
739 status "login successful"; 819 status "login successful";
820 } else {
821 undef $CONN;
822 status "unable to connect: $!";
823 stop_game();
824 }
825 },
826 ;
827}
828
829sub start_game {
830 status "logging in...";
831
832 $LOGIN_BUTTON->set_text ("Logout");
833 $SETUP_DIALOG->hide;
834
835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
836
837 $MAP = new DC::Map;
838
839 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 if ($_[0] ne "80.101.114.108") { # Perl
844 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95";
846 }
847
848 dc_connect $host, $port;
849 };
740 } else { 850 } else {
741 status "unable to connect"; 851 dc_connect $host, $port;
742 stop_game();
743 } 852 }
744} 853}
745 854
746sub stop_game { 855sub stop_game {
856 crash "stop_game";
857
747 $LOGIN_BUTTON->set_text ("Login / Register"); 858 $LOGIN_BUTTON->set_text ("Login / Register");
748 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 859 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
749 $SETUP_DIALOG->show; 860 $SETUP_DIALOG->show;
750 $PL_WINDOW->hide; 861 $PL_WINDOW->hide;
751 $SPELL_LIST->clear_spells; 862 $SPELL_LIST->clear_spells;
… …
769 880
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 881 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 882
772 my $row = 0; 883 my $row = 0;
773 884
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 885 $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, 886 $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, 887 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
891 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as "
894 . "a non-accelerated display format. You can try to work around these issues "
895 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card.");
778 897
779 my $vidmode_tooltip = 898 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 899 "<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>."; 900 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 901
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 902 $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); 903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 904
786 $hbox->add (my $mode_slider = new DC::UI::Slider 905 $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], 906 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ],
788 tooltip => $vidmode_tooltip); 908 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 909 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 910 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 911 can_events => 1, tooltip => $vidmode_tooltip);
792 912
793 $mode_slider->connect (changed => sub { 913 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 914 my ($self, $value) = @_;
795 915
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 916 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 917 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 918 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 919 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 920
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 921 $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 922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 923 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 924 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 925 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 926 );
807 927
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 928 $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 929 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 930 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 931 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 " 932 . "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. " 933 . "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, " 934 . "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 " 935 . "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>", 936 . "<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 } 937 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 938 );
819 939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{disable_alpha},
943 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
944 . "by disabling a number of textures and transparency effects. Normally, these "
945 . "effects do not cost a lot of resources, but some graphics cards might fall "
946 . "back to etxremely slow rendering if this is enabled. If disabling this option "
947 . "noticably improves the framerate of the client please report this! "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub {
950 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
953 0
954 }
955 );
956
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 958 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 959 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 960 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 " 961 . "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 " 962 . "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.", 963 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 965 );
829 966
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 969 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 970 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 972 );
836 973
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 974 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 975 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 976 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.", 977 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 }, 978 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 979 );
843 980
844 $table->add_at (1, $row++, new DC::UI::Button 981 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 982 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 983 tooltip => "Apply the video settings above.",
847 on_activate => sub { 984 on_activate => sub {
848 video_shutdown (); 985 video_shutdown ();
849 video_init (); 986 video_init ();
850 0 987 0
851 } 988 }
852 ); 989 );
853 990
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
995 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 );
999
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 1001 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1004 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 1005 );
860 1006
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1008 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 1009 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1010 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. " 1011 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 1012 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 1014 );
869 1015
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1016 $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 1017 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 1018 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1019 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 } 1020 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 1021 );
876 1022
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 1024 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1025 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.", 1026 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 } 1027 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 1028 );
883 1029
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 1031 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1032 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, " 1033 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.", 1034 . "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 }, 1035 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 1036 );
891 1037
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 1039 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1040 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.", 1041 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 1042 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 1043 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 1044 &set_gauge_window_fontsize;
899 0 1045 0
900 } 1046 }
901 ); 1047 );
902 1048
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 1051 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1052 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 1053 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 1054 $CFG->{gauge_size} = $_[1];
… …
942 1088
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1089 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1090
945 my $row = 0; 1091 my $row = 0;
946 1092
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1094 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1095 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.", 1096 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 } 1097 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1098 );
953 1099
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1100 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1101 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1102 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1103 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1104 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1105 $CFG->{effects_enable} = $_[1];
… …
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1112 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.", 1113 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1114 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1115 );
970 1116
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1118 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1119 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1120 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1121 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1122 $CFG->{bgm_enable} = $_[1];
… …
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1129 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1130 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1131 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1132 );
987 1133
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1134 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1135 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1136 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1137 value => $CFG->{audio_hw_frequency},
992 options => [ 1138 options => [
993 [ 0, "default" , "Use System Default"], 1139 [ 0, "default" , "Use System Default"],
… …
1002 audio_tab_update; 1148 audio_tab_update;
1003 1 1149 1
1004 } 1150 }
1005 ); 1151 );
1006 1152
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1153 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1154 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1155 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1156 value => $CFG->{audio_hw_channels},
1011 options => [ 1157 options => [
1012 [0, "default" , "Use System Default"], 1158 [0, "default" , "Use System Default"],
… …
1021 audio_tab_update; 1167 audio_tab_update;
1022 1 1168 1
1023 } 1169 }
1024 ); 1170 );
1025 1171
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1172 $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 1173 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1174 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1175 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 " 1176 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.", 1177 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1035 1 1181 1
1036 } 1182 }
1037 ); 1183 );
1038 1184
1039 # should really be a slider 1185 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1186 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1187 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1188 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.", 1189 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], 1190 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1191 template => ">= 99",
… …
1051 1; 1197 1;
1052 } 1198 }
1053 ); 1199 );
1054 1200
1055 $table->add_at (1, $row++, new DC::UI::Button 1201 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1202 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1203 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1204 on_activate => sub {
1059 audio_shutdown (); 1205 audio_shutdown ();
1060 audio_init (); 1206 audio_init ();
1061 0 1207 0
… …
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1257 $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"); 1258 $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"); 1259 $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"); 1260 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1261
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1262 $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); 1263 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1264 $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"); 1265 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1266
1121 $GAUGES = { 1267 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1268 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1269 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1270 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1190 $vb->add (new DC::UI::FancyFrame 1336 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1337 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1338 child => (my $pi = new DC::UI::VBox),
1193 ); 1339 );
1194 1340
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1341 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1342 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."); 1343 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, 1344 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1345 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1346 tooltip => "The map you are currently on (if supported by the server).");
1201 1347
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1348 $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, 1349 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1350 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1351 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, 1352 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1353 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1354 tooltip => "The weight limit: you cannot carry more than this.");
1209 1355
1210 $vb->add (new DC::UI::FancyFrame 1356 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1357 label => "Primary/Secondary Statistics",
… …
1232 [2, 5, st_wspd => "WSp", 10.54], 1378 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1379 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1380 my ($col, $row, $id, $label, $template) = @$_;
1235 1381
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1382 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1383 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1384 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1385 $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, 1386 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1387 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1388 }
1243 1389
1244 $vb->add (new DC::UI::FancyFrame 1390 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1391 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1392 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1393 );
1248 1394
1249 my $row = 0; 1395 my $row = 0;
1250 my $col = 0; 1396 my $col = 0;
1251 1397
… …
1290 1436
1291 for (qw/slow holyw conf fire depl magic 1437 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1438 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1439 blind fear tund elec cold ghit/)
1294 { 1440 {
1295 $tbl2->add_at ($col, $row, 1441 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1442 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1443 new DC::UI::Label
1298 font => $FONT_FIXED, 1444 font => $FONT_FIXED,
1299 template => "-100%", 1445 template => "-100%",
1300 align => +1, 1446 align => 1,
1301 valign => 0,
1302 can_events => 1, 1447 can_events => 1,
1303 can_hover => 1, 1448 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1449 tooltip => $resist_names{$_}->[1],
1305 ); 1450 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1451 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1308 can_hover => 1, 1453 can_hover => 1,
1309 can_events => 1, 1454 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1455 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1456 tooltip => $resist_names{$_}->[1],
1312 ); 1457 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1458 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1459 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1460 font => $FONT_FIXED,
1461 align => 1,
1316 can_hover => 1, 1462 can_hover => 1,
1317 can_events => 1, 1463 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1464 tooltip => $resist_names{$_}->[1],
1319 ); 1465 );
1320 1466
1321 $row++; 1467 $row++;
1322 if ($row % 6 == 0) { 1468 if ($row % 6 == 0) {
1323 $col += 3; 1469 $col += 4;
1324 $row = 0; 1470 $row = 0;
1325 } 1471 }
1326 } 1472 }
1327 1473
1328 #update_stats_window ({}); 1474 #update_stats_window ({});
… …
1374 "The time this server has been running without being restarted.", 1520 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1521 "Short information about this server provided by its admins.",
1376 ); 1522 );
1377 my @col = qw(#Users Host Uptime Version Description); 1523 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1524 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1525 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1526 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1527 for 0 .. $#col;
1383 1528
1384 my @align = qw(1 0 1 1 -1); 1529 my @align = qw(1 0.5 1 1 0);
1385 1530
1386 my $y = 0; 1531 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1532 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1533 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1534 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1470 $vbox->add (new DC::UI::FancyFrame 1615 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1616 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1617 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1618 );
1474 1619
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1620 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1621 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1622 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1623 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1624 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1625 );
1481 1626
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1627 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1628 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1629 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1630 hidden => 1,
1486 tooltip => "The password for your character.", 1631 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1632 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1633 );
1489 1634
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1635 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1636 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1637 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1638 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1639 on_activate => sub {
1496 $CONN ? stop_game 1640 $CONN ? stop_game
1497 : start_game; 1641 : start_game;
1498 1 1642 1
1499 }, 1643 },
1500 ); 1644 );
1501 1645
1502 $vbox->add (new DC::UI::FancyFrame 1646 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1647 label => "How to Play",
1504 min_h => 200, 1648 min_h => 240,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1649 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1650 markup =>
1651 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1652 . "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 " 1653 . "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.", 1654 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1655 ),
1510 ); 1656 );
1511 1657
1512 $vbox 1658 $vbox
… …
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1666 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1667 );
1522 1668
1523 my $row = 0; 1669 my $row = 0;
1524 1670
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1671 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1672 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1673 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1674
1529 $vbox->add ( 1675 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1676 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1677 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1678 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1679 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1680 on_changed => sub {
1535 my ($self, $value) = @_; 1681 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1682 $CFG->{profile}{default}{host} = $value;
1537 1 1683 1
1538 } 1684 }
… …
1541 if (0) { #d# disabled 1687 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1688 $vbox->add (new DC::UI::Button
1543 expand => 1, 1689 expand => 1,
1544 text => "Server List", 1690 text => "Server List",
1545 other => $METASERVER, 1691 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1692 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1693 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1694 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1695 );
1550 }#d# 1696 }#d#
1551 } 1697 }
1552 1698
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1699 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1700 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1701 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1702 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1703 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, " 1704 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1705 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1706 . "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 }, 1707 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1708 );
1563 1709
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1710 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1711 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1712 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1713 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1714 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1715 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1582sub client_setup { 1728sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1729 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1730
1585 my $row = 0; 1731 my $row = 0;
1586 1732
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1733 $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 1734 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1735 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1736 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1737 on_changed => sub {
1592 my ($self, $value) = @_; 1738 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1739 $CFG->{show_tips} = $value;
1594 0 1740 0
1595 } 1741 }
1596 ); 1742 );
1597 1743
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1744 $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 1745 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1746 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1747 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 " 1748 . "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.", 1749 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1750 on_changed => sub {
1605 my ($self, $value) = @_; 1751 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1753 0
1608 }, 1754 },
1609 ); 1755 );
1610 1756
1611 $table 1757 $table
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1804 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1805 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1806 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1807 ["Flesh" => PICKUP_FLESH],
1662 ], 1808 ],
1663 ["Weight/Value ratio", 2, 17] 1809 ["Value/Weight ratio", 2, 17]
1664 ) 1810 )
1665 { 1811 {
1666 my ($title, $x, $y, @bits) = @$_; 1812 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1813 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1814
… …
1693 } 1839 }
1694 1840
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1841 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1842 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1843 template => ">= 99",
1844 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] }, 1845 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1846 on_changed => sub {
1700 my ($slider, $value) = @_; 1847 my ($slider, $value) = @_;
1701 1848
1702 $::CFG->{pickup} &= ~0xF; 1849 $::CFG->{pickup} &= ~0xF;
… …
1715 1862
1716 $r 1863 $r
1717} 1864}
1718 1865
1719my %SORT_ORDER = ( 1866my %SORT_ORDER = (
1720 type => undef, 1867 type => sub {
1868 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1869 },
1721 mtime => sub { 1870 mtime => sub {
1722 my $NOW = time; 1871 my $NOW = time;
1723 sort { 1872 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1873 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; 1874 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1737 1886
1738sub inventory_widget { 1887sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1888 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1889
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1890 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1891 $vb1->add (new DC::UI::Label text => "Player");
1743 1892
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1893 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1894
1746 use sort 'stable'; 1895 use sort 'stable';
1747 1896
… …
1756 $::CFG->{inv_sort} = $_[1]; 1905 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1906 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1907 },
1759 ); 1908 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1909 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1910 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1911 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1912
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1913 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1914 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1915 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1916
… …
1947 my @path = DC::Pod::full_path_of $node; 2096 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2097 pop @path; # drop current node
1949 2098
1950 for my $node (@path) { 2099 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2100 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2101 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2102 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2103 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2104 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2105 $load_node->($node);
1957 }, 2106 },
1958 ); 2107 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2108 $buttons->add (new DC::UI::Label text => "/");
1960 } 2109 }
1961 2110
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2111 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2112
1964 $curnode = $node; 2113 $curnode = $node;
1965 2114
1966 $viewer->clear; 2115 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2116 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2179 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2180 );
2032 $hb->add (new DC::UI::Button 2181 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2182 text => "Quit anyway",
2034 expand => 1, 2183 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2184 on_activate => sub {
2185 crash "Quit anyway";
2186 EV::unloop EV::UNLOOP_ALL;
2187 },
2036 ); 2188 );
2037 } 2189 }
2038 2190
2039 $QUIT_DIALOG->show; 2191 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2192 $QUIT_DIALOG->grab_focus;
… …
2093 $dialog->show; 2245 $dialog->show;
2094 }; 2246 };
2095} 2247}
2096 2248
2097sub sdl_init { 2249sub sdl_init {
2098 DC::SDL_Init 2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2251 and die "SDL::Init failed!\n";
2100} 2252}
2101 2253
2102sub video_init { 2254sub video_init {
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0;
2257
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2260 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2261 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2262
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267
2268 # now choose biggets mode <= 1024x768
2269 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_;
2272 }
2273 }
2274 }
2104 2275
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2276 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2277
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2278 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2279 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2280 $FAST = $CFG->{fast};
2110 2281
2282 # 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 2283 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2284 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2285 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2286
2114 $SDL_ACTIVE = 1; 2287 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2288 $LAST_REFRESH = time - 0.01;
2116 2289
… …
2146 force_x => "max", 2319 force_x => "max",
2147 force_y => 0; 2320 force_y => 0;
2148 $DEBUG_STATUS->show; 2321 $DEBUG_STATUS->show;
2149 2322
2150 $STATUSBOX = new DC::UI::Statusbox; 2323 $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]); 2324
2325 $MODBOX = new DC::UI::Label
2326 can_events => 1,
2327 can_hover => 1,
2328 markup => "",
2329 align => 0,
2330 font => $FONT_FIXED,
2331 tooltip => "#modifier_box",
2332 tooltip_width => 0.67,
2333 ;
2334
2335 update_modbox;
2152 2336
2153 (new DC::UI::Frame 2337 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2338 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2339 force_x => 0,
2156 force_y => "max", 2340 force_y => "max",
2157 child => $STATUSBOX, 2341 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2342 )->show;
2343
2344 $LR->add ($STATUSBOX);
2345 $LR->add ($MODBOX);
2346 $LR->add (new DC::UI::Label
2347 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7],
2351 );
2159 2352
2160 DC::UI::Toplevel->new ( 2353 DC::UI::Toplevel->new (
2161 title => "Minimap", 2354 title => "Minimap",
2162 name => "mapmap", 2355 name => "mapmap",
2163 x => 0, 2356 x => 0,
… …
2171 2364
2172 $MAPWIDGET = new DC::MapWidget; 2365 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2366 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2367 my ($mapwidget, $preset) = @_;
2175 2368
2176 $MESSAGE_WINDOW->activate_console ($preset) 2369 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2370 if $MESSAGE_DIST;
2178 }); 2371 });
2179 $MAPWIDGET->show; 2372 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2373 $MAPWIDGET->grab_focus;
2181 2374
2182 $COMPLETER = new DC::MapWidget::Command:: 2375 $COMPLETER = new DC::MapWidget::Command::
… …
2194 force_h => $::HEIGHT * 0.6, 2387 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2388 has_close_button => 1,
2196 ; 2389 ;
2197 2390
2198 $METASERVER = metaserver_dialog; 2391 $METASERVER = metaserver_dialog;
2392 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2393 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2",
2395 title => 'Messages',
2396 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25,
2398 ;
2200 2399
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2401
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2402 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2403 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2404
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2405 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2406 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2407 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2426
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2427 $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."); 2428 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2429
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2430# $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."); 2431# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2432
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 2433 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 2434
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2435 $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."); 2436 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2237 $BUTTONBAR->add (new DC::UI::Button 2438 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2439 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.", 2440 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 { 2441 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2442 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2443 DC::write_cfg;
2243 status "Configuration Saved"; 2444 status "Configuration Saved";
2244 0 2445 0
2245 }, 2446 },
2246 ); 2447 );
2247 2448
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2449 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2450 tooltip => "View Documentation");
2250
2251 2451
2252 $BUTTONBAR->add (new DC::UI::Button 2452 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2453 text => "Quit",
2254 tooltip => "Terminates the program", 2454 tooltip => "Terminates the program",
2255 on_activate => sub { 2455 on_activate => sub {
… …
2265 $BUTTONBAR->show; 2465 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2466 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2467 $MESSAGE_WINDOW->show;
2268 } 2468 }
2269 2469
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472
2473 $CAVEAT_LABEL->set_text ("None :)");
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476
2270 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2271} 2478}
2272 2479
2273sub video_shutdown { 2480sub video_shutdown {
2274 DC::OpenGL::shutdown; 2481 DC::OpenGL::shutdown;
2482 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2483
2276 undef $SDL_ACTIVE; 2484 undef $SDL_ACTIVE;
2277} 2485}
2278 2486
2279my %animate_object; 2487my %animate_object;
… …
2322 delete $animate_object{$widget}; 2530 delete $animate_object{$widget};
2323} 2531}
2324 2532
2325%SDL_CB = ( 2533%SDL_CB = (
2326 DC::SDL_QUIT => sub { 2534 DC::SDL_QUIT => sub {
2535 crash "SDL_QUIT";
2327 EV::unloop EV::UNLOOP_ALL; 2536 EV::unloop EV::UNLOOP_ALL;
2328 }, 2537 },
2329 DC::SDL_VIDEORESIZE => sub { 2538 DC::SDL_VIDEORESIZE => sub {
2330 }, 2539 },
2331 DC::SDL_VIDEOEXPOSE => sub { 2540 DC::SDL_VIDEOEXPOSE => sub {
… …
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2550 },
2342 DC::SDL_KEYDOWN => sub { 2551 DC::SDL_KEYDOWN => sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2553 # alt-enter
2554 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2555 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2556 video_init;
2348 } else { 2557 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2558 &DC::UI::feed_sdl_key_down_event;
2350 } 2559 }
2560 update_modbox;
2351 }, 2561 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2562 DC::SDL_KEYUP => sub {
2563 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox;
2565 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2569 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2570 if ($_[0]{code} == 1) {
… …
2367$SIG{INT} = $SIG{TERM} = sub { 2580$SIG{INT} = $SIG{TERM} = sub {
2368 EV::unloop; 2581 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2582 #d# TODO calling exit here hangs the process in some futex
2370}; 2583};
2371 2584
2372{ 2585# due to mac os x + sdl combined briandamage, we need this contortion
2586sub main {
2587 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2590 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2591 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2592 } else {
2376 #TODO: compatibility cruft 2593 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2594 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2595 print STDERR "INFO: used old configuration file\n";
2379 } 2596 }
2380 2597
2381 DC::DB::Server::run; 2598 DC::DB::Server::run;
2382 2599
2600 if ($CFG->{db_schema} < 1) {
2601 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2602 DC::DB::nuke_db;
2603 $CFG->{db_schema} = 1;
2604 DC::write_cfg;
2605 }
2606
2607 DC::DB::open_db;
2608
2383 DC::UI::set_layout ($::CFG->{layout}); 2609 DC::UI::set_layout ($::CFG->{layout});
2384 2610
2385 my %DEF_CFG = ( 2611 my %DEF_CFG = (
2386 sdl_mode => 0, 2612 sdl_mode => undef,
2387 fullscreen => 1, 2613 fullscreen => 1,
2388 fast => 0, 2614 fast => 0,
2389 force_opengl11 => undef, 2615 force_opengl11 => undef,
2616 disable_alpha => 0,
2617 smooth_movement => 1,
2390 texture_compression => 1, 2618 texture_compression => 1,
2391 map_scale => 1, 2619 map_scale => 1,
2392 fow_enable => 1, 2620 fow_enable => 1,
2393 fow_intensity => 0, 2621 fow_intensity => 0,
2394 map_smoothing => 1, 2622 map_smoothing => 1,
2395 gui_fontsize => 1, 2623 gui_fontsize => 1,
2396 log_fontsize => 0.7, 2624 log_fontsize => 0.7,
2397 gauge_fontsize => 1, 2625 gauge_fontsize => 1,
2398 gauge_size => 0.35, 2626 gauge_size => 0.35,
2399 stat_fontsize => 0.7, 2627 stat_fontsize => 0.7,
2400 mapsize => 100, 2628 mapsize => 100,
2401 audio_enable => 1, 2629 audio_enable => 1,
2402 audio_hw_channels => 0, 2630 audio_hw_channels => 0,
2403 audio_hw_frequency => 0, 2631 audio_hw_frequency => 0,
2404 audio_hw_chunksize => 0, 2632 audio_hw_chunksize => 0,
2405 audio_mix_channels => 8, 2633 audio_mix_channels => 8,
2406 effects_enable => 1, 2634 effects_enable => 1,
2407 effects_volume => 1, 2635 effects_volume => 1,
2408 bgm_enable => 1, 2636 bgm_enable => 1,
2409 bgm_volume => 0.5, 2637 bgm_volume => 0.5,
2410 output_rate => "", 2638 output_rate => "",
2411 pickup => 0, 2639 pickup => 0,
2412 inv_sort => "mtime", 2640 inv_sort => "mtime",
2413 default => "profile", # default profile 2641 default => "profile", # default profile
2414 show_tips => 1, 2642 show_tips => 1,
2415 logview_max_par => 1000, 2643 logview_max_par => 1000,
2644 shift_fire_stop => 0,
2416 ); 2645 );
2417 2646
2418 while (my ($k, $v) = each %DEF_CFG) { 2647 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2648 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2649 }
2421 2650
2422 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2423 $PROFILE = $CFG->{profile}{default}; 2652 $PROFILE = $CFG->{profile}{default};
2424 2653
2425 # convert old bindings (only default profile matters) 2654 # convert old bindings (only default profile matters)
2426 if (my $bindings = delete $PROFILE->{bindings}) { 2655 if (my $bindings = delete $PROFILE->{bindings}) {
2427 while (my ($mod, $syms) = each %$bindings) { 2656 while (my ($mod, $syms) = each %$bindings) {
2428 while (my ($sym, $cmds) = each %$syms) { 2657 while (my ($sym, $cmds) = each %$syms) {
2429 push @{ $PROFILE->{macro} }, { 2658 push @{ $PROFILE->{macro} }, {
2430 accelkey => [$mod*1, $sym*1], 2659 accelkey => [$mod*1, $sym*1],
2431 action => $cmds, 2660 action => $cmds,
2661 };
2432 }; 2662 }
2433 } 2663 }
2434 } 2664 }
2435 }
2436 2665
2437 sdl_init; 2666 sdl_init;
2438 2667
2439 @SDL_MODES = DC::SDL_ListModes 8, 8; 2668 {
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( 2669 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2670 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2671 DejaVuSansMono.ttf
2451 DejaVuSans-Bold.ttf 2672 DejaVuSans-Bold.ttf
2452 DejaVuSansMono-Bold.ttf 2673 DejaVuSansMono-Bold.ttf
2453 DejaVuSans-Oblique.ttf 2674 DejaVuSans-Oblique.ttf
2454 DejaVuSansMono-Oblique.ttf 2675 DejaVuSansMono-Oblique.ttf
2455 DejaVuSans-BoldOblique.ttf 2676 DejaVuSans-BoldOblique.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2677 DejaVuSansMono-BoldOblique.ttf
2457 ); 2678 );
2458 2679
2459 DC::add_font $_ for @fonts; 2680 DC::add_font $_ for @fonts;
2460 2681
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2682 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2683 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2684
2466 $FONT_PROP->make_default; 2685 $FONT_PROP->make_default;
2467 } 2686
2687 DC::pango_init;
2688 }
2468 2689
2469# compare mono (ft) vs. rgba (cairo) 2690# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2691# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2692# for my $rgba (0..1) {
2472# my $t1 = Time::HiRes::time; 2693# my $t1 = Time::HiRes::time;
… …
2477# } 2698# }
2478# my $t2 = Time::HiRes::time; 2699# my $t2 = Time::HiRes::time;
2479# warn $t2-$t1; 2700# warn $t2-$t1;
2480# } 2701# }
2481 2702
2482 video_init; 2703 video_init;
2483 audio_init; 2704 audio_init;
2484} 2705 }
2485 2706
2486show_tip_of_the_day if $CFG->{show_tips}; 2707 show_tip_of_the_day if $CFG->{show_tips};
2487 2708
2488our $STARTUP_CANCEL = EV::idle sub { 2709 our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2710 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2711 $startup_done->();
2491}; 2712 };
2492 2713
2714 delete $SIG{__DIE__};
2493EV::loop; 2715 EV::loop;
2494 2716
2495#video_shutdown; 2717#video_shutdown;
2496#audio_shutdown; 2718#audio_shutdown;
2497DC::OpenGL::quit; 2719 DC::OpenGL::quit;
2498DC::SDL_Quit; 2720 DC::SDL_Quit;
2499DC::DB::Server::stop; 2721 DC::DB::Server::stop;
2722}
2723
2724DC::SDL_braino; # see sub above
2500 2725
2501=head1 NAME 2726=head1 NAME
2502 2727
2503deliantra - A Deliantra MORPG game client 2728deliantra - A Deliantra MORPG game client
2504 2729
… …
2521 4 show fps 2746 4 show fps
2522 8 suppress tooltips 2747 8 suppress tooltips
2523 2748
2524=head1 AUTHOR 2749=head1 AUTHOR
2525 2750
2526Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2751Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2527 2752
2528 2753
2529 2754

Diff Legend

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