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.32 by root, Tue Mar 25 19:28:56 2008 UTC vs.
Revision 1.106 by root, Sat Apr 3 03:02:28 2010 UTC

17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 59 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
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"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 63 }
75 64
76 unshift @INC, $root; 65 unshift @INC, $root;
77 } 66 }
78} 67}
79 68
80# prepend private library directory 69# prepend private library directory and prepare env
81BEGIN { 70BEGIN {
82 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 73 if (-d $path) {
85 unshift @INC, $path; 74 unshift @INC, $path;
90 79
91# need to do it again because that pile of garbage called PAR nukes it before main 80# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 82 if %PAR::LibCache;
94 83
95use Time::HiRes 'time';
96use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
97use List::Util qw(max min); 87use List::Util qw(max min);
98 88
99use Deliantra; 89use Deliantra;
100use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
101 91
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
95
102use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
103 98
104use DC; 99use DC;
100
101sub crash($;$) {
102 # nop during compiletime
103}
104
105BEGIN {
106 $SIG{__DIE__} = sub {
107 return if $^S;
108 crash "CRASH/DIE: $_[0]" => 1;
109 DC::fatal Carp::longmess "$_[0]";
110 }
111}
112
105use DC::OpenGL (); 113use DC::OpenGL ();
106use DC::Protocol; 114use DC::Protocol;
107use DC::DB; 115use DC::DB;
108use DC::UI; 116use DC::UI;
109use DC::UI::Canvas; 117use DC::UI::Canvas;
110use DC::UI::Inventory; 118use DC::UI::Inventory;
111use DC::UI::SpellList; 119use DC::UI::SpellList;
112use DC::UI::Dockable; 120use DC::UI::Dockable;
113use DC::UI::Dockbar; 121use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 122use DC::UI::ChatView;
116use DC::MessageDistributor; 123use DC::MessageDistributor;
117use DC::Pod; 124use DC::Pod;
118use DC::MapWidget; 125use DC::MapWidget;
119use DC::Macro; 126use DC::Macro;
120 127
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
123 130
124$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
126}; 134};
127 135
128my $MAX_FPS = 60; 136my $MAX_FPS = 60;
129 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
130our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
131 141
132our $LAST_REFRESH; 142our $LAST_REFRESH;
133our $NOW; 143our $NOW;
134 144
135our $CFG; 145our $CFG;
136our $CONN;
137our $PROFILE; # current profile 146our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 148
140our $WANT_REFRESH; 149our $WANT_REFRESH;
141 150
151our $MODE_SLIDER;
152our $CAVEAT_LABEL;
153
142our @SDL_MODES; 154our @SDL_MODES;
155our $SDL_REINIT = 1;
143our $WIDTH; 156our $WIDTH;
144our $HEIGHT; 157our $HEIGHT;
145our $FULLSCREEN; 158our $FULLSCREEN;
146our $FONTSIZE; 159our $FONTSIZE;
147 160
148our $FONT_PROP; 161our $FONT_PROP;
149our $FONT_FIXED; 162our $FONT_FIXED;
150 163
164our $CONN;
165
151our $MAP; 166our $MAP;
152our $MAPMAP; 167our $MAPMAP;
153our $MAPWIDGET; 168our $MAPWIDGET;
154our $COMPLETER; 169our $COMPLETER;
155our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
156our $METASERVER; 174our $METASERVER;
157our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 176our $QUIT_DIALOG;
159our $HOST_ENTRY; 177our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
186our $FLOORBOX; 204our $FLOORBOX;
187our $GAUGES; 205our $GAUGES;
188our $STATWIDS; 206our $STATWIDS;
189 207
190our $SDL_ACTIVE; 208our $SDL_ACTIVE;
191our %SDL_CB; 209our @SDL_CB;
192 210
193our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 212our $STATUSBOX;
195our $MODBOX; 213our $MODBOX;
196our $DEBUG_STATUS; 214our $DEBUG_STATUS;
197 215
198our $INV; 216our $INV;
199our $INVR; 217our $INVR;
200our $INVR_HB; 218our $INVR_HB;
219
220#############################################################################
221
222# write a crash message blockingly to the socket, if possible
223# this is a bit too complicated for my tastes, but it was easy.
224*crash = sub($;$) {
225 my ($msg, $backtrace) = @_;
226
227 warn $msg;
228
229 return unless $CONN;
230
231 my $fh = $CONN->{fh}
232 or return;
233
234 my $buf = delete $CONN->{wbuf};
235
236 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
237
238 AnyEvent::Util::fh_nonblocking $fh, 0;
239 syswrite $fh, $buf;
240 AnyEvent::Util::fh_nonblocking $fh, 1;
241
242 $msg =~ s/\s+$//;
243
244 # backtrace as second step, in case it crashes, too
245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
246 if $backtrace;
247};
248
249sub clienterror($;$) {
250 my ($msg, $backtrace) = @_;
251
252 warn $msg;
253
254 return unless $CONN;
255
256 $CONN->send_exti_msg (clientlog => $msg);
257 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
258}
201 259
202############################################################################# 260#############################################################################
203 261
204sub status { 262sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
287 or return; 345 or return;
288 346
289 $meta->{data} 347 $meta->{data}
290 or return; 348 or return;
291 349
292 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
294 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 352 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 354 &audio_music_push ($face);
297 } 355 }
298 } else { 356 } else {
299 # fetch from database 357 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
303 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 361 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
306 364
307 audio_sound_push ($face); 365 audio_sound_push ($face);
308 }; 366 };
355 413
356 audio_music_update_volume; 414 audio_music_update_volume;
357 415
358 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
359 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
360 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
361 ? new_from_file DC::RW $meta->{path} 422 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
362 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
363 424
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 427
367 my $NOW = time; 428 my $NOW = time;
368 429
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
479 sub audio_tab_update; 540 sub audio_tab_update;
480 audio_tab_update; 541 audio_tab_update;
481} 542}
482 543
483sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
484 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
485 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
486 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
487 553
488 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
664 # right: accept 730 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 731 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 732 text => "Accept",
667 on_activate => sub { 733 on_activate => sub {
668 $conn->send ("reply n"); 734 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 735 destroy_query_dialog $conn;
671 0 736 0
672 }, 737 },
673 ); 738 );
674 739
726 791
727 $vbox->add (@dialog); 792 $vbox->add (@dialog);
728 $dialog->show; 793 $dialog->show;
729} 794}
730 795
731sub start_game { 796sub dc_connect {
732 status "logging in..."; 797 my ($host, $port) = @_;
733 798
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 799 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
800 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
738 801
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 802 $CONN =
744 new DC::Protocol 803 new DC::Protocol
745 host => $host, 804 host => $host,
746 port => $port || 13327, 805 port => $port,
747 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
749 mapw => $mapsize, 808 mapw => $mapw,
750 maph => $mapsize, 809 maph => $maph,
751 810
752 client => "$DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
753 812
754 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
758 query => \&server_query, 817 query => \&server_query,
759 818
760 setup_req => { 819 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 820 smoothing => $CFG->{map_smoothing}*1,
762 }, 821 },
763 };
764 822
765 if ($CONN) { 823 on_connect => sub {
824 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
767 826
768 status "login successful"; 827 status "successfully connected to the server";
828 } else {
829 undef $CONN;
830 status "unable to connect: $!";
831 stop_game();
832 }
833 },
834 ;
835}
836
837sub start_game {
838 status "logging in...";
839
840 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
841 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
842 or return status "$server: unable to parse server address, try an empty field.";
843
844 $LOGIN_BUTTON->set_text ("Logout");
845 $SETUP_DIALOG->hide;
846
847 $MAP = new DC::Map;
848
849 # hack to make SURE we find the IP address all right
850 # can be removed once AnyEvent::DNS is proven stable.
851 if ($host eq "gameserver.deliantra.net") {
852 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
853 if ($_[0] ne "80.101.114.108") { # Perl
854 status "dns failure, trying differently";
855 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
856 unless (defined $host) {
857 status "dns failure, using hardcoded address";
858 $host = "129.13.162.95";
859 }
860 }
861
862 dc_connect $host, $port;
863 };
769 } else { 864 } else {
770 warn $@; 865 dc_connect $host, $port;
771 status "unable to connect";
772 stop_game();
773 } 866 }
774} 867}
775 868
776sub stop_game { 869sub stop_game {
870 crash "stop_game";
871
777 $LOGIN_BUTTON->set_text ("Login / Register"); 872 $LOGIN_BUTTON->set_text ("Login / Register");
778 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 873 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
779 $SETUP_DIALOG->show; 874 $SETUP_DIALOG->show;
780 $PL_WINDOW->hide; 875 $PL_WINDOW->hide;
781 $SPELL_LIST->clear_spells; 876 $SPELL_LIST->clear_spells;
795} 890}
796 891
797sub graphics_setup { 892sub graphics_setup {
798 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
799 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
800 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 898 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
801 899
802 my $row = 0; 900 my $row = 0;
803 901
804 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
805 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 903 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
806 can_events => 1, 904 can_events => 1,
807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
808 906
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
908 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
909 can_events => 1,
910 tooltip => "This field shows any known issues with your config or driver, such as "
911 . "a non-accelerated display format. You can try to work around these issues "
912 . "by selecting a different video mode, changing the settings below or "
913 . "by installing the right driver for your graphics card.");
914
915 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
916 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
917 value => $CFG->{uitheme},
918 options => [
919 [wood => "Wood (the default)"],
920 [plain => "Plain (very)"],
921 [blue => "Blue (dark)"],
922 [metal => "Metal (light)"],
923 ],
924 tooltip => "Choose the User Interface theme that you like most :)",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
926 );
927
809 my $vidmode_tooltip = 928 my $vidmode_tooltip =
810 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 929 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
811 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 930 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
812 931
813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
814 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
815 934
816 $hbox->add (my $mode_slider = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
817 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 936 c_rescale => 1,
937 force_w => $WIDTH * 0.1, expand => 1,
938 range => [ ($CFG->{sdl_mode}) x 3 ],
818 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
819 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
820 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
821 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
822 943
823 $mode_slider->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
824 my ($self, $value) = @_; 945 my ($self, $value) = @_;
825 946
826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
827 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 948 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
828 }); 949 });
829 $mode_slider->emit (changed => $mode_slider->{range}[0]); 950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
830 951
831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
832 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
833 state => $CFG->{fullscreen}, 954 state => $CFG->{fullscreen},
834 tooltip => "Bring the client into fullscreen mode.", 955 tooltip => "Bring the client into fullscreen mode.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
836 ); 957 );
837 958
838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
839 $table->add_at (1, $row++, new DC::UI::CheckBox 960 $table->add_at (1, $row++, new DC::UI::CheckBox
840 state => $CFG->{force_opengl11}, 961 state => $CFG->{force_opengl11},
841 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 962 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
842 . "higher memory usage and slower performance. It will, however, help tremendously on " 963 . "higher memory usage and slower performance. It will, however, help tremendously on "
843 . "cards that claim to support a feature but fall back to software rendering. " 964 . "cards that claim to support a feature but fall back to software rendering. "
844 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 965 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
845 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 966 . "but cards and drivers from other vendors (ATI) are often just as bad. "
846 . "experience extremely low framerates and your card should do better, try this option.</b>", 967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
847 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
848 ); 969 );
849 970
971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
972 $table->add_at (1, $row++, new DC::UI::CheckBox
973 state => $CFG->{disable_alpha},
974 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
975 . "by disabling a number of textures and transparency effects. Normally, these "
976 . "effects do not cost a lot of resources, but some graphics cards might fall "
977 . "back to extremely slow rendering if this is enabled. If disabling this option "
978 . "noticably improves the framerate of the client please report this! "
979 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
980 on_changed => sub {
981 my ($self, $value) = @_;
982 $CFG->{disable_alpha} = $value;
983 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
984 0
985 }
986 );
987
850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
851 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
852 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
853 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 991 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
854 . "will save a lot of memory and increase performance. The compression algorithm " 992 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
855 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 993 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
856 . "forced OpenGL 1.1 mode.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
857 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
858 ); 996 );
859 997
860 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 998 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
861 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
862 state => $CFG->{fast}, 1000 state => $CFG->{fast},
863 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
864 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
865 ); 1003 );
866 1004
867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
868 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
869 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
870 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1008 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
871 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
872 ); 1010 );
873 1011
874 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
875 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
876 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
877 on_activate => sub { 1015 on_activate => sub {
878 video_shutdown (); 1016 video_shutdown ();
879 video_init (); 1017 video_init ();
1018 0
880 0 1019 }
881 } 1020 );
1021 }
1022
1023 {
1024 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1025
1026 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1027
1028 my $row = 0;
1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1030 $table->add_at (1, $row++, new DC::UI::CheckBox
1031 state => $CFG->{smooth_movement},
1032 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1033 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1034 . "then disable this option. Changes take effect immdiately.",
1035 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
882 ); 1036 );
883 1037
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1039 $table->add_at (1, $row++, new DC::UI::CheckBox
1040 state => $CFG->{smooth_transitions},
1041 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1042 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1043 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1044 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1045 );
1046
1047
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
885 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
887 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
888 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
889 ); 1053 );
890 1054
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
892 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
893 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
894 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1058 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
895 . "This increases load on the graphics subsystem and works only with TRT servers. " 1059 . "This increases load on the graphics subsystem and works only with TRT servers. "
896 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
897 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
898 ); 1062 );
899 1063
900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
901 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
902 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
903 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1067 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
904 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
905 ); 1069 );
906 1070
1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1072 $table->add_at (1, $row++, new DC::UI::ImageButton
1073 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1074 bg => [0.3, 0.3, 0.2],
1075 force_w => 64,
1076 force_h => 64,
1077 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1078 on_activate => sub {
1079 my ($self) = @_;
1080 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1081 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1082 $MAPWIDGET->update;
1083 }
1084 );
1085
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1086 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
908 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
909 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
910 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1089 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
912 ); 1091 );
913 1092
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
915 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
916 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
917 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1096 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
918 . "but you still need to press apply to correctly re-layout the widget.", 1097 . "but you still need to press apply to correctly re-layout the widget.",
919 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1098 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
920 ); 1099 );
921 1100
922 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1101 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
923 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
924 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
925 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1104 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
926 on_changed => sub { 1105 on_changed => sub {
927 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
928 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
929 0 1109 }
930 } 1110 );
931 );
932 1111
933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1112 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
934 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
935 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
936 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1115 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
937 on_changed => sub { 1116 on_changed => sub {
938 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
939 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
940 0 1120 }
941 } 1121 );
942 ); 1122 }
943 1123
944 $vbox 1124 $vbox
945} 1125}
946 1126
947our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
960 1140
961 my $text = !$freq 1141 my $text = !$freq
962 ? "audio is off" 1142 ? "audio is off"
963 : "audio is enabled\n" 1143 : "audio is enabled\n"
964 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
965 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
966 1148
967 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
968} 1150}
969 1151
970sub audio_setup { 1152sub audio_setup {
1110} 1292}
1111 1293
1112sub make_gauge_window { 1294sub make_gauge_window {
1113 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1114 1296
1115 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1116 force_x => 0, 1298 force_x => 0,
1117 force_y => "max", 1299 force_y => "max",
1118 force_w => $WIDTH, 1300 force_w => $WIDTH,
1119 force_h => $gh, 1301 force_h => $gh,
1120 ); 1302 );
1136 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1137 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1138 ], 1320 ],
1139 ); 1321 );
1140 1322
1141 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1323 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1142 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1324 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1143 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1325 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1144 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1326 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1145
1146 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1147 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1148 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1149 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1150
1151 $GAUGES = {
1152 exp => $exp, prg => $prg, sklprg => $sklprg,
1153 win => $win, range => $rng,
1154 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1155 };
1156 1327
1157 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1158 1329
1159 $win 1330 $win
1160} 1331}
1501 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1672 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1502 ); 1673 );
1503 1674
1504 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1675 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1505 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1506 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1507 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1508 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1509 ); 1680 );
1510 1681
1511 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1682 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1512 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1513 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1514 hidden => 1, 1685 hidden => 1,
1515 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1516 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1517 ); 1688 );
1518 1689
1519 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1520 expand => 1, 1691 expand => 1,
1521 text => "Login / Register", 1692 text => "Login / Register",
1526 1 1697 1
1527 }, 1698 },
1528 ); 1699 );
1529 1700
1530 $vbox->add (new DC::UI::FancyFrame 1701 $vbox->add (new DC::UI::FancyFrame
1531 label => "Registering", 1702 label => "How to Play",
1532 min_h => 200, 1703 min_h => 240,
1533 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1704 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1534 markup => 1705 markup =>
1706 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1707 . "Then register a new account (or use an existing one if you have one). "
1535 "To register a new account, choose a username that hasn't been taken yet and " 1708 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1536 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1709 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1537 ), 1710 ),
1538 ); 1711 );
1539 1712
1540 $vbox 1713 $vbox
1555 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1556 1729
1557 $vbox->add ( 1730 $vbox->add (
1558 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1559 expand => 1, 1732 expand => 1,
1560 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1561 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1734 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1562 on_changed => sub { 1735 on_changed => sub {
1563 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1564 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1565 1 1738 1
1566 } 1739 }
1567 ); 1740 );
1568 1741
1569 if (0) { #d# disabled 1742 if (0) { #d# disabled
1612 1785
1613 my $row = 0; 1786 my $row = 0;
1614 1787
1615 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1788 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1616 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1617 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1618 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1792 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1619 on_changed => sub { 1793 on_changed => sub {
1620 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1621 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
1622 0 1796 0
1623 } 1797 }
1624 ); 1798 );
1625 1799
1626 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1800 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1627 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1801 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1802 c_colspan => 2,
1628 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1629 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1804 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1630 . "sends more messages than this number, older messages get removed to save memory and " 1805 . "sends more messages than this number, older messages get removed to save memory and "
1631 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1806 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1632 on_changed => sub { 1807 on_changed => sub {
1633 my ($self, $value) = @_; 1808 my ($self, $value) = @_;
1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1635 0 1810 0
1636 }, 1811 },
1637 ); 1812 );
1638 1813
1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1815 $table->add_at (1, $row, new DC::UI::CheckBox
1816 state => $CFG->{config_autosave},
1817 tooltip => "Normally, configuration settings and the user interface layout "
1818 . "are saved on client exit. You can disable this behaviour by "
1819 . "unchecking this checkbox.",
1820 on_changed => sub {
1821 my ($self, $value) = @_;
1822 $CFG->{config_autosave} = $value;
1823 0
1824 }
1825 );
1826 $table->add_at (2, $row++, new DC::UI::Button
1827 text => "Save Now",
1828 tooltip => "Use this to manually save configuration and UI layout when "
1829 . "autosave is disabled.",
1830 on_activate => sub {
1831 DC::write_cfg;
1832 0
1833 }
1834 );
1835
1639 $table 1836 $table
1640} 1837}
1641 1838
1642sub autopickup_setup { 1839sub autopickup_setup {
1643 my $r = new DC::UI::ScrolledWindow ( 1840 my $r = new DC::UI::ScrolledWindow (
1649 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1650 ); 1847 );
1651 1848
1652 for ( 1849 for (
1653 ["General", 0, 0, 1850 ["General", 0, 0,
1654 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1655 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1656 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1657 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1658 ], 1854 ],
1659 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1660 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
1686 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1882 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1687 ["Ignore cursed" => PICKUP_NOT_CURSED], 1883 ["Ignore cursed" => PICKUP_NOT_CURSED],
1688 ["Jewelery" => PICKUP_JEWELS], 1884 ["Jewelery" => PICKUP_JEWELS],
1689 ["Flesh" => PICKUP_FLESH], 1885 ["Flesh" => PICKUP_FLESH],
1690 ], 1886 ],
1691 ["Weight/Value ratio", 2, 17] 1887 ["Value/Weight ratio", 2, 17]
1692 ) 1888 )
1693 { 1889 {
1694 my ($title, $x, $y, @bits) = @$_; 1890 my ($title, $x, $y, @bits) = @$_;
1695 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1891 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1696 1892
1708 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1709 } else { 1905 } else {
1710 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1711 } 1907 }
1712 1908
1713 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1714 if defined $::CONN; 1910 if defined $::CONN;
1715 1911
1716 0 1912 0
1717 }); 1913 });
1718 1914
1721 } 1917 }
1722 1918
1723 $table->add_at (2, 18, new DC::UI::ValSlider 1919 $table->add_at (2, 18, new DC::UI::ValSlider
1724 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1920 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1725 template => ">= 99", 1921 template => ">= 99",
1922 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1726 to_value => sub { ">= " . 5 * $_[0] }, 1923 to_value => sub { ">= " . 5 * $_[0] },
1727 on_changed => sub { 1924 on_changed => sub {
1728 my ($slider, $value) = @_; 1925 my ($slider, $value) = @_;
1729 1926
1730 $::CFG->{pickup} &= ~0xF; 1927 $::CFG->{pickup} &= ~0xF;
1734 }); 1931 });
1735 1932
1736 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1737 text => "set", 1934 text => "set",
1738 on_activate => sub { 1935 on_activate => sub {
1739 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1740 if defined $::CONN; 1937 if defined $::CONN;
1741 0 1938 0
1742 }); 1939 });
1743 1940
1744 $r 1941 $r
1745} 1942}
1746 1943
1747my %SORT_ORDER = ( 1944my %SORT_ORDER = (
1748 type => undef, 1945 type => sub {
1946 use sort 'stable';
1947 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1948 },
1749 mtime => sub { 1949 mtime => sub {
1950 use sort 'stable';
1750 my $NOW = time; 1951 my $NOW = time;
1751 sort { 1952 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1953 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1753 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1954 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1754 1955
1755 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1956 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1756 or $btime <=> $atime 1957 or $btime <=> $atime
1757 or $a->{type} <=> $b->{type} 1958 or $a->{type} <=> $b->{type}
1758 } @_ 1959 } @_
1759 }, 1960 },
1760 weight => sub { sort { 1961 weight => sub {
1962 use sort 'stable';
1963 sort {
1761 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1964 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1762 or $a->{type} <=> $b->{type} 1965 or $a->{type} <=> $b->{type}
1763 } @_ }, 1966 } @_
1967 },
1764); 1968);
1765 1969
1766sub inventory_widget { 1970sub inventory_widget {
1767 my $hb = new DC::UI::HBox homogeneous => 1; 1971 my $hb = new DC::UI::HBox homogeneous => 1;
1768 1972
1784 $::CFG->{inv_sort} = $_[1]; 1988 $::CFG->{inv_sort} = $_[1];
1785 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1989 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1786 }, 1990 },
1787 ); 1991 );
1788 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1992 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1789 #TODO# update to weigh/maxweight 1993 #TODO# update to weight/maxweight
1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1994 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1791 1995
1792 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1996 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1793 $sw1->add ($INV = new DC::UI::Inventory); 1997 $sw1->add ($INV = new DC::UI::Inventory);
1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1998 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1855 $PL_NOTEBOOK->set_current_page ($widget); 2059 $PL_NOTEBOOK->set_current_page ($widget);
1856 $PL_WINDOW->show; 2060 $PL_WINDOW->show;
1857 } 2061 }
1858} 2062}
1859 2063
1860sub player_window { 2064sub make_playerbook {
1861 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2065 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1862 x => "center", 2066 x => "center",
1863 y => "center", 2067 y => "center",
1864 force_w => $WIDTH * 9/10, 2068 force_w => $WIDTH * 9/10,
1865 force_h => $HEIGHT * 9/10, 2069 force_h => $HEIGHT * 9/10,
1899 "License, Author and Source info for media sent by the server."); 2103 "License, Author and Source info for media sent by the server.");
1900 2104
1901 $ntb->set_current_page ($INVENTORY_PAGE); 2105 $ntb->set_current_page ($INVENTORY_PAGE);
1902 2106
1903 $plwin->add ($ntb); 2107 $plwin->add ($ntb);
1904 $plwin
1905} 2108}
1906 2109
1907sub keyboard_setup { 2110sub keyboard_setup {
1908 DC::Macro::keyboard_setup 2111 DC::Macro::keyboard_setup
1909} 2112}
1910 2113
1911sub help_window { 2114sub make_help_window {
1912 my $win = new DC::UI::Toplevel 2115 my $win = new DC::UI::Toplevel
1913 x => 'center', 2116 x => 'center',
1914 y => 'center', 2117 y => 'center',
1915 z => 4, 2118 z => 4,
1916 name => 'doc_browser', 2119 name => 'doc_browser',
2005 2208
2006 $load_node->((DC::Pod::find @path)[0]); 2209 $load_node->((DC::Pod::find @path)[0]);
2007 $win->show; 2210 $win->show;
2008 }; 2211 };
2009 2212
2010 $win 2213 $HELP_WINDOW = $win;
2011}
2012
2013sub open_string_query {
2014 my ($title, $cb, $txt, $tooltip) = @_;
2015 my $dialog = new DC::UI::Toplevel
2016 x => "center",
2017 y => "center",
2018 z => 50,
2019 force_w => $WIDTH * 4/5,
2020 title => $title;
2021
2022 $dialog->add (
2023 my $e = new DC::UI::Entry
2024 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2025 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2026 tooltip => $tooltip
2027 );
2028
2029 $e->grab_focus;
2030 $e->set_text ($txt) if $txt;
2031 $dialog->show;
2032} 2214}
2033 2215
2034sub open_quit_dialog { 2216sub open_quit_dialog {
2035 unless ($QUIT_DIALOG) { 2217 unless ($QUIT_DIALOG) {
2036 $QUIT_DIALOG = new DC::UI::Toplevel 2218 $QUIT_DIALOG = new DC::UI::Toplevel
2058 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2240 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2059 ); 2241 );
2060 $hb->add (new DC::UI::Button 2242 $hb->add (new DC::UI::Button
2061 text => "Quit anyway", 2243 text => "Quit anyway",
2062 expand => 1, 2244 expand => 1,
2063 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2245 on_activate => sub {
2246 crash "Quit anyway";
2247 EV::unloop EV::UNLOOP_ALL;
2248 },
2064 ); 2249 );
2065 } 2250 }
2066 2251
2067 $QUIT_DIALOG->show; 2252 $QUIT_DIALOG->show;
2068 $QUIT_DIALOG->grab_focus; 2253 $QUIT_DIALOG->grab_focus;
2254}
2255
2256sub make_menubar {
2257 $MENUFRAME = new DC::UI::Toplevel
2258 border => 0,
2259 force_x => 0,
2260 force_y => 0,
2261 force_w => $::WIDTH,
2262 child => ($MENUBAR = new DC::UI::HBox),
2263 ;
2264
2265 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2266
2267 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2268 make_gauge_window->show;
2269
2270# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2271# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2272
2273 make_playerbook;
2274
2275 $MENUPOPUP = DC::UI::Menu->new (items => [
2276 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2277 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2278 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2279 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2280 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2281 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2282 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2283 ["Quit…" , sub {
2284 if ($CONN) {
2285 open_quit_dialog;
2286 } else {
2287 EV::unloop EV::UNLOOP_ALL;
2288 }
2289 }],
2290 ]);
2291
2292 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2293 tooltip => "Shows the main menu",
2294 on_button_down => sub {
2295 my ($self, $ev) = @_;
2296 local $ev->{x} = 0;
2297 local $ev->{y} = 0;
2298 $MENUPOPUP->popup ($ev);
2299 },
2300 );
2301
2302 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2303 padding_x => 6,
2304 padding_y => 3,
2305 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2306 template => " Exp: 888,888,888,888 (lvl 188) ",
2307 );
2308
2309 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2310 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2311 . "will automatically pick up items as defined by your item pickup settings "
2312 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2313 . "disable autopickup by disabling this checkbox.",
2314 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2315 on_changed => sub {
2316 my ($self, $value) = @_;
2317 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2318 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2319 $CONN->send_pickup ($CFG->{pickup})
2320 if $CONN;
2321 },
2322 );
2323
2324 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2325 c_rescale => 1,
2326 padding_x => 6,
2327 padding_y => 3,
2328 force_w => $::WIDTH * 0.2,
2329 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2330 template => "two handed weapons 99%",
2331 );
2332
2333 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2334 expand => 1,
2335 align => 1, can_hover => 1, can_events => 1,
2336 text => "Range and Combat Slots",
2337 tooltip => "#stat_ranged",
2338 );
2339
2340 $MENUFRAME->show;
2341}
2342
2343sub open_string_query {
2344 my ($title, $cb, $txt, $tooltip) = @_;
2345 my $dialog = new DC::UI::Toplevel
2346 x => "center",
2347 y => "center",
2348 z => 50,
2349 force_w => $WIDTH * 4/5,
2350 title => $title;
2351
2352 $dialog->add (
2353 my $e = new DC::UI::Entry
2354 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2355 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2356 tooltip => $tooltip
2357 );
2358
2359 $e->grab_focus;
2360 $e->set_text ($txt) if $txt;
2361 $dialog->show;
2069} 2362}
2070 2363
2071sub show_tip_of_the_day { 2364sub show_tip_of_the_day {
2072 # find all tips 2365 # find all tips
2073 my @tod = DC::Pod::find tip_of_the_day => "*"; 2366 my @tod = DC::Pod::find tip_of_the_day => "*";
2121 $dialog->show; 2414 $dialog->show;
2122 }; 2415 };
2123} 2416}
2124 2417
2125sub sdl_init { 2418sub sdl_init {
2126 DC::SDL_Init 2419 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2127 and die "SDL::Init failed!\n"; 2420 and die "SDL::Init failed!\n";
2128} 2421}
2129 2422
2130sub video_init { 2423sub video_init {
2424 DC::set_theme $CFG->{uitheme};
2425
2426 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2427 $SDL_REINIT = 0;
2428
2429 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2430 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2431 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2432 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2433
2434 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2435
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2436 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2437 $CFG->{sdl_mode} = 0; # lowest resolution by default
2438
2439 # now choose biggest mode <= 1024x768
2440 for (0 .. $#SDL_MODES) {
2441 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2442 $CFG->{sdl_mode} = $_;
2443 }
2444 }
2445 }
2132 2446
2133 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2447 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2134 2448
2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2449 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2136 $FULLSCREEN = $CFG->{fullscreen}; 2450 $FULLSCREEN = $CFG->{fullscreen};
2137 $FAST = $CFG->{fast}; 2451 $FAST = $CFG->{fast};
2138 2452
2453 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2139 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2454 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2455 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2140 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2456 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2141 2457
2142 $SDL_ACTIVE = 1; 2458 $SDL_ACTIVE = 1;
2143 $LAST_REFRESH = time - 0.01; 2459 $LAST_REFRESH = time - 0.01;
2144 2460
2191 2507
2192 (new DC::UI::Frame 2508 (new DC::UI::Frame
2193 bg => [0, 0, 0, 0.4], 2509 bg => [0, 0, 0, 0.4],
2194 force_x => 0, 2510 force_x => 0,
2195 force_y => "max", 2511 force_y => "max",
2196 child => (my $LR = new DC::UI::VBox), 2512 child => (my $LL = new DC::UI::VBox),
2197 )->show; 2513 )->show;
2198 2514
2199 $LR->add ($STATUSBOX); 2515 $LL->add ($STATUSBOX);
2200 $LR->add ($MODBOX); 2516 $LL->add ($MODBOX);
2201 $LR->add (new DC::UI::Label 2517 $LL->add (new DC::UI::Label
2202 align => 0, 2518 align => 0,
2203 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2519 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2204 fontsize => 0.5, 2520 fontsize => 0.5,
2205 fg => [1, 1, 0, 0.7], 2521 fg => [1, 1, 0, 0.7],
2206 ); 2522 );
2207 2523
2208 DC::UI::Toplevel->new ( 2524 DC::UI::Toplevel->new (
2209 title => "Minimap", 2525 title => "Minimap",
2210 name => "mapmap", 2526 name => "mapmap",
2211 x => 0, 2527 x => 0,
2212 y => $FONTSIZE + 8, 2528 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2213 border_bg => [1, 1, 1, 192/255], 2529 border_bg => [1, 1, 1, 192/255],
2214 bg => [1, 1, 1, 0], 2530 bg => [1, 1, 1, 0],
2215 child => ($MAPMAP = new DC::MapWidget::MapMap 2531 child => ($MAPMAP = new DC::MapWidget::MapMap
2216 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2532 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2217 ), 2533 ),
2218 )->show; 2534 )->show;
2219 2535
2220 $MAPWIDGET = new DC::MapWidget; 2536 $MAPWIDGET = new DC::MapWidget;
2221 $MAPWIDGET->connect (activate_console => sub { 2537 $MAPWIDGET->connect (activate_console => sub {
2242 force_h => $::HEIGHT * 0.6, 2558 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2559 has_close_button => 1,
2244 ; 2560 ;
2245 2561
2246 $METASERVER = metaserver_dialog; 2562 $METASERVER = metaserver_dialog;
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2563 # the name is changed to not conflict with the older name as users could have hidden it
2564 $MESSAGE_WINDOW = new DC::UI::Dockbar
2565 name => "message_window2",
2566 title => 'Messages',
2567 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2568 force_w => $::WIDTH * 0.6,
2569 force_h => $::HEIGHT * 0.25,
2570 ;
2571
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2572 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2573
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2574 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2575 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2576
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2577 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2578 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2579 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2268 . "After pressing the combo the binding will be saved automatically and the " 2592 . "After pressing the combo the binding will be saved automatically and the "
2269 . "binding editor closes"); 2593 . "binding editor closes");
2270 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2594 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2271 "Some debuggin' options. Do not ask."); 2595 "Some debuggin' options. Do not ask.");
2272 2596
2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2597 make_help_window;
2598 make_menubar;
2274 2599
2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2276 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2277
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2279 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2280
2281 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
2282
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2284 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2285
2286 $BUTTONBAR->add (new DC::UI::Button
2287 text => "Save Config",
2288 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2289 on_activate => sub {
2290 $::CFG->{layout} = DC::UI::get_layout;
2291 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2292 status "Configuration Saved";
2293 0
2294 },
2295 );
2296
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation");
2299
2300
2301 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit",
2303 tooltip => "Terminates the program",
2304 on_activate => sub {
2305 if ($CONN) {
2306 open_quit_dialog;
2307 } else {
2308 EV::unloop EV::UNLOOP_ALL;
2309 }
2310 0
2311 },
2312 );
2313
2314 $BUTTONBAR->show;
2315 $SETUP_DIALOG->show; 2600 $SETUP_DIALOG->show;
2316 $MESSAGE_WINDOW->show; 2601 $MESSAGE_WINDOW->show;
2317 } 2602 }
2318 2603
2604 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2605 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2606
2607 $CAVEAT_LABEL->set_text ("None :)");
2608 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2609 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2610 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2611 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2612
2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2613 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2320} 2614}
2321 2615
2322sub video_shutdown { 2616sub video_shutdown {
2323 DC::OpenGL::shutdown; 2617 DC::OpenGL::shutdown;
2618 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2324 2619
2325 undef $SDL_ACTIVE; 2620 undef $SDL_ACTIVE;
2326} 2621}
2327 2622
2328my %animate_object; 2623my %animate_object;
2347my $want_refresh = EV::prepare_ns \&force_refresh; 2642my $want_refresh = EV::prepare_ns \&force_refresh;
2348 2643
2349my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2644my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2350 $NOW = EV::now; 2645 $NOW = EV::now;
2351 2646
2352 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2647 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2353 for DC::poll_events; 2648 for DC::poll_events;
2354 2649
2355 if (%animate_object) { 2650 if (%animate_object) {
2356 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2651 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2357 $WANT_REFRESH = 1; 2652 $WANT_REFRESH = 1;
2369sub animation_stop { 2664sub animation_stop {
2370 my ($widget) = @_; 2665 my ($widget) = @_;
2371 delete $animate_object{$widget}; 2666 delete $animate_object{$widget};
2372} 2667}
2373 2668
2374%SDL_CB = (
2375 DC::SDL_QUIT => sub { 2669$SDL_CB[DC::SDL_QUIT] = sub {
2670 crash "SDL_QUIT";
2376 EV::unloop EV::UNLOOP_ALL; 2671 EV::unloop EV::UNLOOP_ALL;
2377 }, 2672};
2378 DC::SDL_VIDEORESIZE => sub { 2673$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2379 },
2380 DC::SDL_VIDEOEXPOSE => sub { 2674$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2381 DC::UI::full_refresh; 2675 DC::UI::full_refresh;
2382 }, 2676};
2383 DC::SDL_ACTIVEEVENT => sub { 2677$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2384# not useful, as APPACTIVE includes only iconified state, not unmapped 2678# not useful, as APPACTIVE includes only iconified state, not unmapped
2385# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2679# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2386# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2680# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2387# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2681# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2388# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2682# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2683# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2390 }, 2684};
2391 DC::SDL_KEYDOWN => sub { 2685$SDL_CB[DC::SDL_KEYDOWN] = sub {
2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2686 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2393 # alt-enter 2687 # alt-enter
2688 video_shutdown;
2394 $FULLSCREEN_ENABLE->toggle; 2689 $FULLSCREEN_ENABLE->toggle;
2395 video_shutdown;
2396 video_init; 2690 video_init;
2397 } else { 2691 } else {
2398 &DC::UI::feed_sdl_key_down_event; 2692 &DC::UI::feed_sdl_key_down_event;
2399 } 2693 }
2400 update_modbox; 2694 update_modbox;
2401 }, 2695};
2402 DC::SDL_KEYUP => sub { 2696$SDL_CB[DC::SDL_KEYUP] = sub {
2403 &DC::UI::feed_sdl_key_up_event; 2697 &DC::UI::feed_sdl_key_up_event;
2404 update_modbox; 2698 update_modbox;
2405 }, 2699};
2406 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2700$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2407 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2701$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2408 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2702$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2409 DC::SDL_USEREVENT => sub { 2703$SDL_CB[DC::SDL_USEREVENT] = sub {
2410 if ($_[0]{code} == 1) { 2704 if ($_[0]{code} == 1) {
2411 audio_channel_finished $_[0]{data1}; 2705 audio_channel_finished $_[0]{data1};
2412 } elsif ($_[0]{code} == 0) { 2706 } elsif ($_[0]{code} == 0) {
2413 audio_music_finished; 2707 audio_music_finished;
2414 }
2415 }, 2708 }
2416); 2709};
2417 2710
2418############################################################################# 2711#############################################################################
2419 2712
2420$SIG{INT} = $SIG{TERM} = sub { 2713$SIG{INT} = $SIG{TERM} = sub {
2421 EV::unloop; 2714 EV::unloop;
2422 #d# TODO calling exit here hangs the process in some futex 2715 #d# TODO calling exit here hangs the process in some futex
2423}; 2716};
2424 2717
2425{ 2718# due to mac os x + sdl combined braindamage, we need this contortion
2719sub main {
2720 {
2721 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2722
2426 if (-e "$Deliantra::VARDIR/client.cf") { 2723 if (-e "$Deliantra::VARDIR/client.cf") {
2427 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2724 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2428 } else { 2725 } else {
2429 #TODO: compatibility cruft 2726 #TODO: compatibility cruft
2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2727 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2431 print STDERR "INFO: used old configuration file\n"; 2728 print STDERR "INFO: used old configuration file\n";
2432 } 2729 }
2433 2730
2434 DC::DB::Server::run; 2731 DC::DB::Server::run;
2435 2732
2733 if ($CFG->{db_schema} < 1) {
2734 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2735 DC::DB::nuke_db;
2736 $CFG->{db_schema} = 1;
2737 DC::write_cfg;
2738 }
2739
2740 DC::DB::open_db;
2741
2436 DC::UI::set_layout ($::CFG->{layout}); 2742 DC::UI::set_layout ($::CFG->{layout});
2437 2743
2438 my %DEF_CFG = ( 2744 my %DEF_CFG = (
2745 config_autosave => 1,
2439 sdl_mode => 0, 2746 sdl_mode => undef,
2440 fullscreen => 1, 2747 fullscreen => 1,
2441 fast => 0, 2748 fast => 0,
2442 force_opengl11 => undef, 2749 force_opengl11 => undef,
2750 disable_alpha => 0,
2751 smooth_movement => 1,
2752 smooth_transitions => 1,
2443 texture_compression => 1, 2753 texture_compression => 1,
2444 map_scale => 1, 2754 map_scale => 1,
2445 fow_enable => 1, 2755 fow_enable => 1,
2446 fow_intensity => 0, 2756 fow_intensity => 0,
2757 fow_texture => 0,
2447 map_smoothing => 1, 2758 map_smoothing => 1,
2448 gui_fontsize => 1, 2759 gui_fontsize => 1,
2449 log_fontsize => 0.7, 2760 log_fontsize => 0.7,
2450 gauge_fontsize => 1, 2761 gauge_fontsize => 1,
2451 gauge_size => 0.35, 2762 gauge_size => 0.35,
2452 stat_fontsize => 0.7, 2763 stat_fontsize => 0.7,
2453 mapsize => 100, 2764 mapsize => 100,
2454 audio_enable => 1, 2765 audio_enable => 1,
2455 audio_hw_channels => 0, 2766 audio_hw_channels => 0,
2456 audio_hw_frequency => 0, 2767 audio_hw_frequency => 0,
2457 audio_hw_chunksize => 0, 2768 audio_hw_chunksize => 0,
2458 audio_mix_channels => 8, 2769 audio_mix_channels => 8,
2459 effects_enable => 1, 2770 effects_enable => 1,
2460 effects_volume => 1, 2771 effects_volume => 1,
2461 bgm_enable => 1, 2772 bgm_enable => 1,
2462 bgm_volume => 0.5, 2773 bgm_volume => 0.5,
2463 output_rate => "", 2774 output_rate => "",
2464 pickup => 0, 2775 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2465 inv_sort => "mtime", 2776 inv_sort => "mtime",
2466 default => "profile", # default profile 2777 default => "profile", # default profile
2467 show_tips => 1, 2778 show_tips => 1,
2468 logview_max_par => 1000, 2779 logview_max_par => 1000,
2780 shift_fire_stop => 0,
2781 uitheme => "wood",
2782 map_shift_x => -24, # arbitrary
2783 map_shift_y => +24, # arbitrary
2469 ); 2784 );
2470 2785
2471 while (my ($k, $v) = each %DEF_CFG) { 2786 while (my ($k, $v) = each %DEF_CFG) {
2472 $CFG->{$k} = $v unless exists $CFG->{$k}; 2787 $CFG->{$k} = $v unless exists $CFG->{$k};
2473 } 2788 }
2474 2789
2475 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2790 my @args = @ARGV;
2476 $PROFILE = $CFG->{profile}{default};
2477 2791
2478 # convert old bindings (only default profile matters) 2792 my $profile = 'default';
2479 if (my $bindings = delete $PROFILE->{bindings}) { 2793
2480 while (my ($mod, $syms) = each %$bindings) { 2794 for (my $i = 0; $i < @args; $i++) {
2481 while (my ($sym, $cmds) = each %$syms) { 2795 if ($args[$i] =~ /^--?profile$/) {
2482 push @{ $PROFILE->{macro} }, { 2796 $profile = $args[$i + 1];
2483 accelkey => [$mod*1, $sym*1], 2797 splice @args, $i, 2, ();
2484 action => $cmds,
2485 }; 2798 $i = 0;
2799 } elsif ($args[$i] =~ /^--?h/) {
2800 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2801 exit 0;
2486 } 2802 }
2487 } 2803 }
2488 }
2489 2804
2805 $CFG->{profile}{$profile} ||= {};
2806 $PROFILE = $CFG->{profile}{$profile};
2807 $PROFILE->{host} ||= "gameserver.deliantra.net";
2808
2809 $PROFILE->{host} = $args[0] if @args > 0;
2810 $PROFILE->{user} = $args[1] if @args > 1;
2811 $PROFILE->{password} = $args[2] if @args > 2;
2812
2813 # convert old bindings (only default profile matters)
2814 if (my $bindings = delete $PROFILE->{bindings}) {
2815 while (my ($mod, $syms) = each %$bindings) {
2816 while (my ($sym, $cmds) = each %$syms) {
2817 push @{ $PROFILE->{macro} }, {
2818 accelkey => [$mod*1, $sym*1],
2819 action => $cmds,
2820 };
2821 }
2822 }
2823 }
2824
2490 sdl_init; 2825 sdl_init;
2491 2826
2492 @SDL_MODES = DC::SDL_ListModes 8, 8; 2827 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2493 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2828 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2494 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2495 2829
2496 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2830 {
2497
2498 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2499
2500 {
2501 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2831 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2502 DejaVuSans.ttf 2832 DejaVuSans.ttf
2503 DejaVuSansMono.ttf 2833 DejaVuSansMono.ttf
2504 DejaVuSans-Bold.ttf 2834 DejaVuSans-Bold.ttf
2505 DejaVuSansMono-Bold.ttf 2835 DejaVuSansMono-Bold.ttf
2506 DejaVuSans-Oblique.ttf 2836 DejaVuSans-Oblique.ttf
2507 DejaVuSansMono-Oblique.ttf 2837 DejaVuSansMono-Oblique.ttf
2508 DejaVuSans-BoldOblique.ttf 2838 DejaVuSans-BoldOblique.ttf
2509 DejaVuSansMono-BoldOblique.ttf 2839 DejaVuSansMono-BoldOblique.ttf
2840 mona.ttf
2510 ); 2841 );
2511 2842
2512 DC::add_font $_ for @fonts; 2843 DC::add_font $_ for @fonts;
2513 2844
2514 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2845 $FONT_PROP = new_from_file DC::Font $fonts[0];
2515 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2846 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2516 2847
2517 $FONT_PROP->make_default; 2848 $FONT_PROP->make_default;
2518 2849
2519 DC::pango_init; 2850 DC::pango_init;
2520 } 2851 }
2521 2852
2522# compare mono (ft) vs. rgba (cairo) 2853# compare mono (ft) vs. rgba (cairo)
2523# ft - 1.8s, cairo 3s, even in alpha-only mode 2854# ft - 1.8s, cairo 3s, even in alpha-only mode
2524# for my $rgba (0..1) { 2855# for my $rgba (0..1) {
2525# my $t1 = Time::HiRes::time; 2856# my $t1 = Time::HiRes::time;
2530# } 2861# }
2531# my $t2 = Time::HiRes::time; 2862# my $t2 = Time::HiRes::time;
2532# warn $t2-$t1; 2863# warn $t2-$t1;
2533# } 2864# }
2534 2865
2535 video_init; 2866 video_init;
2536 audio_init; 2867 audio_init;
2537} 2868 }
2538 2869
2539show_tip_of_the_day if $CFG->{show_tips}; 2870 show_tip_of_the_day if $CFG->{show_tips};
2540 2871
2541our $STARTUP_CANCEL = EV::idle sub { 2872 our $STARTUP_CANCEL = EV::idle sub {
2542 undef $::STARTUP_CANCEL; 2873 undef $::STARTUP_CANCEL;
2543 $startup_done->(); 2874 $startup_done->();
2544}; 2875 };
2545 2876
2877 delete $SIG{__DIE__};
2546EV::loop; 2878 EV::loop;
2547 2879
2880 DC::write_cfg if $CFG->{config_autosave};
2881
2548#video_shutdown; 2882 #video_shutdown;
2549#audio_shutdown; 2883 #audio_shutdown;
2884
2550DC::OpenGL::quit; 2885 DC::OpenGL::quit;
2551DC::SDL_Quit; 2886 DC::SDL_Quit;
2552DC::DB::Server::stop; 2887 DC::DB::Server::stop;
2888}
2889
2890DC::SDL_braino; # see sub above
2553 2891
2554=head1 NAME 2892=head1 NAME
2555 2893
2556deliantra - A Deliantra MORPG game client 2894deliantra - A Deliantra MORPG game client
2557 2895
2558=head1 SYNOPSIS 2896=head1 SYNOPSIS
2559 2897
2560Just run it - no commandline arguments are supported. 2898 deliantra [--profile name] [host [user [password]]]
2899 deliantra --help
2561 2900
2562=head1 USAGE 2901=head1 USAGE
2563 2902
2564deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2903The deliantra client utilises OpenGL for all UI elements and the game. It
2565be used in fullscreen mode and interactively. 2904is supposed to be used in fullscreen mode and interactively.
2566 2905
2567=head1 DEBUGGING 2906=head1 DEBUGGING
2568
2569 2907
2570CFPLUS_DEBUG - environment variable 2908CFPLUS_DEBUG - environment variable
2571 2909
2572 1 draw borders around widgets 2910 1 draw borders around widgets
2573 2 add low-level widget info to tooltips 2911 2 add low-level widget info to tooltips
2574 4 show fps 2912 4 show fps
2575 8 suppress tooltips 2913 8 suppress tooltips
2576 2914
2577=head1 AUTHOR 2915=head1 AUTHOR
2578 2916
2579Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2917Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2580 2918
2581 2919
2582 2920

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines