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.35 by root, Sun Mar 30 06:05:53 2008 UTC vs.
Revision 1.66 by root, Mon Sep 1 09:12:08 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
74 } 81 }
75 82
76 unshift @INC, $root; 83 unshift @INC, $root;
77 } 84 }
78} 85}
… …
97use List::Util qw(max min); 104use List::Util qw(max min);
98 105
99use Deliantra; 106use Deliantra;
100use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
101 108
109use AnyEvent::Util ();
110use AnyEvent::DNS;
111use AnyEvent::Socket ();
112
102use Compress::LZF; 113use Compress::LZF;
114use JSON::XS;
103 115
104use DC; 116use DC;
117
118#############################################################################
119
120our $CONN;
121
122# write a crash message blockingly to the socket, if possible
123# this is a bit too complicated for my tastes, but it was easy.
124sub crash($;$) {
125 my ($msg, $backtrace) = @_;
126
127 return unless $CONN;
128
129 my $fh = $CONN->{fh}
130 or return;
131
132 my $buf = delete $CONN->{wbuf};
133
134 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
135
136 AnyEvent::Util::fh_nonblocking $fh, 0;
137
138 syswrite $fh, $buf;
139 AnyEvent::Util::fh_nonblocking $fh, 1;
140
141 $msg =~ s/\s+$//;
142
143 # backtrace as second step, in case it crashes, too
144 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
145 if $backtrace;
146}
147
148#############################################################################
149
150BEGIN {
151 $SIG{__DIE__} = sub {
152 return if $^S;
153 crash ("CRASH/DIE: $_[0]" => 1);
154 DC::fatal Carp::longmess "$_[0]";
155 }
156}
157
105use DC::OpenGL (); 158use DC::OpenGL ();
106use DC::Protocol; 159use DC::Protocol;
107use DC::DB; 160use DC::DB;
108use DC::UI; 161use DC::UI;
109use DC::UI::Canvas; 162use DC::UI::Canvas;
110use DC::UI::Inventory; 163use DC::UI::Inventory;
111use DC::UI::SpellList; 164use DC::UI::SpellList;
112use DC::UI::Dockable; 165use DC::UI::Dockable;
113use DC::UI::Dockbar; 166use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 167use DC::UI::ChatView;
116use DC::MessageDistributor; 168use DC::MessageDistributor;
117use DC::Pod; 169use DC::Pod;
118use DC::MapWidget; 170use DC::MapWidget;
119use DC::Macro; 171use DC::Macro;
120 172
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 173$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 174$SIG{PIPE} = 'IGNORE';
123 175
124$EV::DIED = sub { 176$EV::DIED = sub {
177 crash ("CRASH/EV::DIED: $@" => 1);
125 DC::fatal Carp::longmess $@; 178 DC::fatal Carp::longmess $@;
126}; 179};
127 180
128my $MAX_FPS = 60; 181my $MAX_FPS = 60;
129 182
… …
131 184
132our $LAST_REFRESH; 185our $LAST_REFRESH;
133our $NOW; 186our $NOW;
134 187
135our $CFG; 188our $CFG;
136our $CONN;
137our $PROFILE; # current profile 189our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 190our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 191
140our $WANT_REFRESH; 192our $WANT_REFRESH;
141 193
194our $MODE_SLIDER;
195our $CAVEAT_LABEL;
196
142our @SDL_MODES; 197our @SDL_MODES;
198our $SDL_REINIT = 1;
143our $WIDTH; 199our $WIDTH;
144our $HEIGHT; 200our $HEIGHT;
145our $FULLSCREEN; 201our $FULLSCREEN;
146our $FONTSIZE; 202our $FONTSIZE;
147 203
… …
664 # right: accept 720 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 721 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 722 text => "Accept",
667 on_activate => sub { 723 on_activate => sub {
668 $conn->send ("reply n"); 724 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 725 destroy_query_dialog $conn;
671 0 726 0
672 }, 727 },
673 ); 728 );
674 729
… …
726 781
727 $vbox->add (@dialog); 782 $vbox->add (@dialog);
728 $dialog->show; 783 $dialog->show;
729} 784}
730 785
731sub start_game { 786sub dc_connect {
732 status "logging in..."; 787 my ($host, $port) = @_;
733
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736 788
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 789 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
738 790
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 791 $CONN =
744 new DC::Protocol 792 new DC::Protocol
745 host => $host, 793 host => $host,
746 port => $port || 13327, 794 port => $port,
747 user => $PROFILE->{user}, 795 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 796 pass => $PROFILE->{password},
749 mapw => $mapsize, 797 mapw => $mapsize,
750 maph => $mapsize, 798 maph => $mapsize,
751 799
… …
758 query => \&server_query, 806 query => \&server_query,
759 807
760 setup_req => { 808 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 809 smoothing => $CFG->{map_smoothing}*1,
762 }, 810 },
763 };
764 811
765 if ($CONN) { 812 on_connect => sub {
813 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 814 DC::lowdelay fileno $CONN->{fh};
767 815
768 status "login successful"; 816 status "login successful";
817 } else {
818 undef $CONN;
819 status "unable to connect: $!";
820 stop_game();
821 }
822 },
823 ;
824}
825
826sub start_game {
827 status "logging in...";
828
829 $LOGIN_BUTTON->set_text ("Logout");
830 $SETUP_DIALOG->hide;
831
832 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
833
834 $MAP = new DC::Map;
835
836 # hack to make SURE we find the IP address all right
837 # can be removed once AnyEvent::DNS is proven stable.
838 if ($host eq "gameserver.deliantra.net") {
839 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
840 if ($_[0] ne "80.101.114.108") { # Perl
841 status "dns failure, using hardcoded address";
842 $host = "129.13.162.95";
843 }
844
845 dc_connect $host, $port;
846 };
769 } else { 847 } else {
770 warn $@; 848 dc_connect $host, $port;
771 status "unable to connect";
772 stop_game();
773 } 849 }
774} 850}
775 851
776sub stop_game { 852sub stop_game {
853 crash "stop_game";
854
777 $LOGIN_BUTTON->set_text ("Login / Register"); 855 $LOGIN_BUTTON->set_text ("Login / Register");
778 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 856 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
779 $SETUP_DIALOG->show; 857 $SETUP_DIALOG->show;
780 $PL_WINDOW->hide; 858 $PL_WINDOW->hide;
781 $SPELL_LIST->clear_spells; 859 $SPELL_LIST->clear_spells;
… …
801 879
802 my $row = 0; 880 my $row = 0;
803 881
804 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 882 $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, 883 $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, 884 can_events => 1,
807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
888 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
889 can_events => 1,
890 tooltip => "This field shows any known issues with your config or driver, such as "
891 . "a non-accelerated display format. You can try to work around these issues "
892 . "by selecting a different video mode, changing the settings below or "
893 . "by installing the right driver for your graphics card.");
808 894
809 my $vidmode_tooltip = 895 my $vidmode_tooltip =
810 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 896 "<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>."; 897 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
812 898
813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 899 $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); 900 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
815 901
816 $hbox->add (my $mode_slider = new DC::UI::Slider 902 $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], 903 force_w => $WIDTH * 0.1, expand => 1,
904 range => [ ($CFG->{sdl_mode}) x 3 ],
818 tooltip => $vidmode_tooltip); 905 tooltip => $vidmode_tooltip);
819 $hbox->add (my $mode_label = new DC::UI::Label 906 $hbox->add (my $mode_label = new DC::UI::Label
820 height => 0.8, template => "9999x9999@9+9", 907 height => 0.8, template => "9999x9999@9+9",
821 can_events => 1, tooltip => $vidmode_tooltip); 908 can_events => 1, tooltip => $vidmode_tooltip);
822 909
823 $mode_slider->connect (changed => sub { 910 $MODE_SLIDER->connect (changed => sub {
824 my ($self, $value) = @_; 911 my ($self, $value) = @_;
825 912
826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 913 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
827 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 914 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
828 }); 915 });
829 $mode_slider->emit (changed => $mode_slider->{range}[0]); 916 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
830 917
831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 918 $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 919 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
833 state => $CFG->{fullscreen}, 920 state => $CFG->{fullscreen},
834 tooltip => "Bring the client into fullscreen mode.", 921 tooltip => "Bring the client into fullscreen mode.",
… …
840 state => $CFG->{force_opengl11}, 927 state => $CFG->{force_opengl11},
841 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 928 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 " 929 . "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. " 930 . "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, " 931 . "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 " 932 . "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>", 933 . "<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 } 934 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
935 );
936
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
938 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{disable_alpha},
940 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
941 . "by disabling a number of textures and transparency effects. Normally, these "
942 . "effects do not cost a lot of resources, but some graphics cards might fall "
943 . "back to etxremely slow rendering if this is enabled. If disabling this option "
944 . "noticably improves the framerate of the client please report this! "
945 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
946 on_changed => sub {
947 my ($self, $value) = @_;
948 $CFG->{disable_alpha} = $value;
949 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
950 0
951 }
848 ); 952 );
849 953
850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
851 $table->add_at (1, $row++, new DC::UI::CheckBox 955 $table->add_at (1, $row++, new DC::UI::CheckBox
852 state => $CFG->{texture_compression}, 956 state => $CFG->{texture_compression},
853 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 957 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 " 958 . "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 " 959 . "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.", 960 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
857 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 961 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
858 ); 962 );
859 963
860 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
861 $table->add_at (1, $row++, new DC::UI::CheckBox 965 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
877 on_activate => sub { 981 on_activate => sub {
878 video_shutdown (); 982 video_shutdown ();
879 video_init (); 983 video_init ();
880 0 984 0
881 } 985 }
986 );
987
988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
989 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{smooth_movement},
991 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
992 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
993 . "then disable this option. Changes take effect immdiately.",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
882 ); 995 );
883 996
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 997 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
885 $table->add_at (1, $row++, new DC::UI::Slider 998 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 999 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1526 1 1639 1
1527 }, 1640 },
1528 ); 1641 );
1529 1642
1530 $vbox->add (new DC::UI::FancyFrame 1643 $vbox->add (new DC::UI::FancyFrame
1531 label => "Registering", 1644 label => "How to Play",
1532 min_h => 200, 1645 min_h => 240,
1533 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1646 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1534 markup => 1647 markup =>
1648 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1649 . "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 " 1650 . "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.", 1651 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1537 ), 1652 ),
1538 ); 1653 );
1539 1654
1540 $vbox 1655 $vbox
… …
1621 $CFG->{show_tips} = $value; 1736 $CFG->{show_tips} = $value;
1622 0 1737 0
1623 } 1738 }
1624 ); 1739 );
1625 1740
1626 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1741 $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 1742 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1628 text => $CFG->{logview_max_par}, 1743 text => $CFG->{logview_max_par},
1629 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1744 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 " 1745 . "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.", 1746 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1632 on_changed => sub { 1747 on_changed => sub {
1633 my ($self, $value) = @_; 1748 my ($self, $value) = @_;
1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1749 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1686 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1801 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1687 ["Ignore cursed" => PICKUP_NOT_CURSED], 1802 ["Ignore cursed" => PICKUP_NOT_CURSED],
1688 ["Jewelery" => PICKUP_JEWELS], 1803 ["Jewelery" => PICKUP_JEWELS],
1689 ["Flesh" => PICKUP_FLESH], 1804 ["Flesh" => PICKUP_FLESH],
1690 ], 1805 ],
1691 ["Weight/Value ratio", 2, 17] 1806 ["Value/Weight ratio", 2, 17]
1692 ) 1807 )
1693 { 1808 {
1694 my ($title, $x, $y, @bits) = @$_; 1809 my ($title, $x, $y, @bits) = @$_;
1695 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1810 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1696 1811
… …
1721 } 1836 }
1722 1837
1723 $table->add_at (2, 18, new DC::UI::ValSlider 1838 $table->add_at (2, 18, new DC::UI::ValSlider
1724 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1839 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1725 template => ">= 99", 1840 template => ">= 99",
1841 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] }, 1842 to_value => sub { ">= " . 5 * $_[0] },
1727 on_changed => sub { 1843 on_changed => sub {
1728 my ($slider, $value) = @_; 1844 my ($slider, $value) = @_;
1729 1845
1730 $::CFG->{pickup} &= ~0xF; 1846 $::CFG->{pickup} &= ~0xF;
… …
1743 1859
1744 $r 1860 $r
1745} 1861}
1746 1862
1747my %SORT_ORDER = ( 1863my %SORT_ORDER = (
1748 type => undef, 1864 type => sub {
1865 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1866 },
1749 mtime => sub { 1867 mtime => sub {
1750 my $NOW = time; 1868 my $NOW = time;
1751 sort { 1869 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1870 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; 1871 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1784 $::CFG->{inv_sort} = $_[1]; 1902 $::CFG->{inv_sort} = $_[1];
1785 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1903 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1786 }, 1904 },
1787 ); 1905 );
1788 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1906 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1789 #TODO# update to weigh/maxweight 1907 #TODO# update to weight/maxweight
1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1908 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1791 1909
1792 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1910 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1793 $sw1->add ($INV = new DC::UI::Inventory); 1911 $sw1->add ($INV = new DC::UI::Inventory);
1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1912 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2058 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2176 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2059 ); 2177 );
2060 $hb->add (new DC::UI::Button 2178 $hb->add (new DC::UI::Button
2061 text => "Quit anyway", 2179 text => "Quit anyway",
2062 expand => 1, 2180 expand => 1,
2063 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2181 on_activate => sub {
2182 crash "Quit anyway";
2183 EV::unloop EV::UNLOOP_ALL;
2184 },
2064 ); 2185 );
2065 } 2186 }
2066 2187
2067 $QUIT_DIALOG->show; 2188 $QUIT_DIALOG->show;
2068 $QUIT_DIALOG->grab_focus; 2189 $QUIT_DIALOG->grab_focus;
… …
2121 $dialog->show; 2242 $dialog->show;
2122 }; 2243 };
2123} 2244}
2124 2245
2125sub sdl_init { 2246sub sdl_init {
2126 DC::SDL_Init 2247 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2127 and die "SDL::Init failed!\n"; 2248 and die "SDL::Init failed!\n";
2128} 2249}
2129 2250
2130sub video_init { 2251sub video_init {
2252 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2253 $SDL_REINIT = 0;
2254
2255 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2256 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2257 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2258 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2259
2260 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2261
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2262 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2263 $CFG->{sdl_mode} = 0; # lowest resolution by default
2264
2265 # now choose biggets mode <= 1024x768
2266 for (0 .. $#SDL_MODES) {
2267 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2268 $CFG->{sdl_mode} = $_;
2269 }
2270 }
2271 }
2132 2272
2133 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2273 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2134 2274
2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2275 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2136 $FULLSCREEN = $CFG->{fullscreen}; 2276 $FULLSCREEN = $CFG->{fullscreen};
2137 $FAST = $CFG->{fast}; 2277 $FAST = $CFG->{fast};
2138 2278
2279 # 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 2280 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2281 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2140 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2282 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2141 2283
2142 $SDL_ACTIVE = 1; 2284 $SDL_ACTIVE = 1;
2143 $LAST_REFRESH = time - 0.01; 2285 $LAST_REFRESH = time - 0.01;
2144 2286
… …
2242 force_h => $::HEIGHT * 0.6, 2384 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2385 has_close_button => 1,
2244 ; 2386 ;
2245 2387
2246 $METASERVER = metaserver_dialog; 2388 $METASERVER = metaserver_dialog;
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2389 # the name is changed to not conflict with the older name as users could have hidden it
2390 $MESSAGE_WINDOW = new DC::UI::Dockbar
2391 name => "message_window2",
2392 title => 'Messages',
2393 force_w => $::WIDTH * 0.6,
2394 force_h => $::HEIGHT * 0.25,
2395 ;
2396
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2397 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2398
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2399 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2400 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2401
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2402 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2403 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2404 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2422 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2274 2423
2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2424 $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."); 2425 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2277 2426
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2427# $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."); 2428# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2280 2429
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 2430 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 2431
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2432 $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."); 2433 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2294 }, 2443 },
2295 ); 2444 );
2296 2445
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2447 tooltip => "View Documentation");
2299
2300 2448
2301 $BUTTONBAR->add (new DC::UI::Button 2449 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2450 text => "Quit",
2303 tooltip => "Terminates the program", 2451 tooltip => "Terminates the program",
2304 on_activate => sub { 2452 on_activate => sub {
… …
2314 $BUTTONBAR->show; 2462 $BUTTONBAR->show;
2315 $SETUP_DIALOG->show; 2463 $SETUP_DIALOG->show;
2316 $MESSAGE_WINDOW->show; 2464 $MESSAGE_WINDOW->show;
2317 } 2465 }
2318 2466
2467 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2468 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2469
2470 $CAVEAT_LABEL->set_text ("None :)");
2471 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2472 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2473
2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2474 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2320} 2475}
2321 2476
2322sub video_shutdown { 2477sub video_shutdown {
2323 DC::OpenGL::shutdown; 2478 DC::OpenGL::shutdown;
2479 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2324 2480
2325 undef $SDL_ACTIVE; 2481 undef $SDL_ACTIVE;
2326} 2482}
2327 2483
2328my %animate_object; 2484my %animate_object;
… …
2371 delete $animate_object{$widget}; 2527 delete $animate_object{$widget};
2372} 2528}
2373 2529
2374%SDL_CB = ( 2530%SDL_CB = (
2375 DC::SDL_QUIT => sub { 2531 DC::SDL_QUIT => sub {
2532 crash "SDL_QUIT";
2376 EV::unloop EV::UNLOOP_ALL; 2533 EV::unloop EV::UNLOOP_ALL;
2377 }, 2534 },
2378 DC::SDL_VIDEORESIZE => sub { 2535 DC::SDL_VIDEORESIZE => sub {
2379 }, 2536 },
2380 DC::SDL_VIDEOEXPOSE => sub { 2537 DC::SDL_VIDEOEXPOSE => sub {
… …
2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2546# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2390 }, 2547 },
2391 DC::SDL_KEYDOWN => sub { 2548 DC::SDL_KEYDOWN => sub {
2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2549 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2393 # alt-enter 2550 # alt-enter
2551 video_shutdown;
2394 $FULLSCREEN_ENABLE->toggle; 2552 $FULLSCREEN_ENABLE->toggle;
2395 video_shutdown;
2396 video_init; 2553 video_init;
2397 } else { 2554 } else {
2398 &DC::UI::feed_sdl_key_down_event; 2555 &DC::UI::feed_sdl_key_down_event;
2399 } 2556 }
2400 update_modbox; 2557 update_modbox;
… …
2420$SIG{INT} = $SIG{TERM} = sub { 2577$SIG{INT} = $SIG{TERM} = sub {
2421 EV::unloop; 2578 EV::unloop;
2422 #d# TODO calling exit here hangs the process in some futex 2579 #d# TODO calling exit here hangs the process in some futex
2423}; 2580};
2424 2581
2425{ 2582# due to mac os x + sdl combined briandamage, we need this contortion
2583sub main {
2584 {
2426 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2585 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2427 2586
2428 if (-e "$Deliantra::VARDIR/client.cf") { 2587 if (-e "$Deliantra::VARDIR/client.cf") {
2429 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2588 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2430 } else { 2589 } else {
2431 #TODO: compatibility cruft 2590 #TODO: compatibility cruft
2432 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2591 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2433 print STDERR "INFO: used old configuration file\n"; 2592 print STDERR "INFO: used old configuration file\n";
2434 } 2593 }
2435 2594
2436 DC::DB::Server::run; 2595 DC::DB::Server::run;
2437 2596
2438 if ($CFG->{db_schema} < 1) { 2597 if ($CFG->{db_schema} < 1) {
2439 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2598 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2440 DC::DB::nuke_db; 2599 DC::DB::nuke_db;
2441 $CFG->{db_schema} = 1; 2600 $CFG->{db_schema} = 1;
2442 DC::write_cfg; 2601 DC::write_cfg;
2443 } 2602 }
2444 2603
2445 DC::DB::open_db; 2604 DC::DB::open_db;
2446 2605
2447 DC::UI::set_layout ($::CFG->{layout}); 2606 DC::UI::set_layout ($::CFG->{layout});
2448 2607
2449 my %DEF_CFG = ( 2608 my %DEF_CFG = (
2450 sdl_mode => 0, 2609 sdl_mode => undef,
2451 fullscreen => 1, 2610 fullscreen => 1,
2452 fast => 0, 2611 fast => 0,
2453 force_opengl11 => undef, 2612 force_opengl11 => undef,
2613 disable_alpha => 0,
2614 smooth_movement => 1,
2454 texture_compression => 1, 2615 texture_compression => 1,
2455 map_scale => 1, 2616 map_scale => 1,
2456 fow_enable => 1, 2617 fow_enable => 1,
2457 fow_intensity => 0, 2618 fow_intensity => 0,
2458 map_smoothing => 1, 2619 map_smoothing => 1,
2459 gui_fontsize => 1, 2620 gui_fontsize => 1,
2460 log_fontsize => 0.7, 2621 log_fontsize => 0.7,
2461 gauge_fontsize => 1, 2622 gauge_fontsize => 1,
2462 gauge_size => 0.35, 2623 gauge_size => 0.35,
2463 stat_fontsize => 0.7, 2624 stat_fontsize => 0.7,
2464 mapsize => 100, 2625 mapsize => 100,
2465 audio_enable => 1, 2626 audio_enable => 1,
2466 audio_hw_channels => 0, 2627 audio_hw_channels => 0,
2467 audio_hw_frequency => 0, 2628 audio_hw_frequency => 0,
2468 audio_hw_chunksize => 0, 2629 audio_hw_chunksize => 0,
2469 audio_mix_channels => 8, 2630 audio_mix_channels => 8,
2470 effects_enable => 1, 2631 effects_enable => 1,
2471 effects_volume => 1, 2632 effects_volume => 1,
2472 bgm_enable => 1, 2633 bgm_enable => 1,
2473 bgm_volume => 0.5, 2634 bgm_volume => 0.5,
2474 output_rate => "", 2635 output_rate => "",
2475 pickup => 0, 2636 pickup => 0,
2476 inv_sort => "mtime", 2637 inv_sort => "mtime",
2477 default => "profile", # default profile 2638 default => "profile", # default profile
2478 show_tips => 1, 2639 show_tips => 1,
2479 logview_max_par => 1000, 2640 logview_max_par => 1000,
2641 shift_fire_stop => 0,
2480 ); 2642 );
2481 2643
2482 while (my ($k, $v) = each %DEF_CFG) { 2644 while (my ($k, $v) = each %DEF_CFG) {
2483 $CFG->{$k} = $v unless exists $CFG->{$k}; 2645 $CFG->{$k} = $v unless exists $CFG->{$k};
2484 } 2646 }
2485 2647
2486 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2648 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2487 $PROFILE = $CFG->{profile}{default}; 2649 $PROFILE = $CFG->{profile}{default};
2488 2650
2489 # convert old bindings (only default profile matters) 2651 # convert old bindings (only default profile matters)
2490 if (my $bindings = delete $PROFILE->{bindings}) { 2652 if (my $bindings = delete $PROFILE->{bindings}) {
2491 while (my ($mod, $syms) = each %$bindings) { 2653 while (my ($mod, $syms) = each %$bindings) {
2492 while (my ($sym, $cmds) = each %$syms) { 2654 while (my ($sym, $cmds) = each %$syms) {
2493 push @{ $PROFILE->{macro} }, { 2655 push @{ $PROFILE->{macro} }, {
2494 accelkey => [$mod*1, $sym*1], 2656 accelkey => [$mod*1, $sym*1],
2495 action => $cmds, 2657 action => $cmds,
2658 };
2496 }; 2659 }
2497 } 2660 }
2498 } 2661 }
2499 }
2500 2662
2501 sdl_init; 2663 sdl_init;
2502 2664
2503 @SDL_MODES = DC::SDL_ListModes 8, 8; 2665 {
2504 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2505 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2506
2507 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2508
2509 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2510
2511 {
2512 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2666 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2513 DejaVuSans.ttf 2667 DejaVuSans.ttf
2514 DejaVuSansMono.ttf 2668 DejaVuSansMono.ttf
2515 DejaVuSans-Bold.ttf 2669 DejaVuSans-Bold.ttf
2516 DejaVuSansMono-Bold.ttf 2670 DejaVuSansMono-Bold.ttf
2517 DejaVuSans-Oblique.ttf 2671 DejaVuSans-Oblique.ttf
2518 DejaVuSansMono-Oblique.ttf 2672 DejaVuSansMono-Oblique.ttf
2519 DejaVuSans-BoldOblique.ttf 2673 DejaVuSans-BoldOblique.ttf
2520 DejaVuSansMono-BoldOblique.ttf 2674 DejaVuSansMono-BoldOblique.ttf
2521 ); 2675 );
2522 2676
2523 DC::add_font $_ for @fonts; 2677 DC::add_font $_ for @fonts;
2524 2678
2525 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2679 $FONT_PROP = new_from_file DC::Font $fonts[0];
2526 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2680 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2527 2681
2528 $FONT_PROP->make_default; 2682 $FONT_PROP->make_default;
2529 2683
2530 DC::pango_init; 2684 DC::pango_init;
2531 } 2685 }
2532 2686
2533# compare mono (ft) vs. rgba (cairo) 2687# compare mono (ft) vs. rgba (cairo)
2534# ft - 1.8s, cairo 3s, even in alpha-only mode 2688# ft - 1.8s, cairo 3s, even in alpha-only mode
2535# for my $rgba (0..1) { 2689# for my $rgba (0..1) {
2536# my $t1 = Time::HiRes::time; 2690# my $t1 = Time::HiRes::time;
… …
2541# } 2695# }
2542# my $t2 = Time::HiRes::time; 2696# my $t2 = Time::HiRes::time;
2543# warn $t2-$t1; 2697# warn $t2-$t1;
2544# } 2698# }
2545 2699
2546 video_init; 2700 video_init;
2547 audio_init; 2701 audio_init;
2548} 2702 }
2549 2703
2550show_tip_of_the_day if $CFG->{show_tips}; 2704 show_tip_of_the_day if $CFG->{show_tips};
2551 2705
2552our $STARTUP_CANCEL = EV::idle sub { 2706 our $STARTUP_CANCEL = EV::idle sub {
2553 undef $::STARTUP_CANCEL; 2707 undef $::STARTUP_CANCEL;
2554 $startup_done->(); 2708 $startup_done->();
2555}; 2709 };
2556 2710
2711 delete $SIG{__DIE__};
2557EV::loop; 2712 EV::loop;
2558 2713
2559#video_shutdown; 2714#video_shutdown;
2560#audio_shutdown; 2715#audio_shutdown;
2561DC::OpenGL::quit; 2716 DC::OpenGL::quit;
2562DC::SDL_Quit; 2717 DC::SDL_Quit;
2563DC::DB::Server::stop; 2718 DC::DB::Server::stop;
2719}
2720
2721DC::SDL_braino; # see sub above
2564 2722
2565=head1 NAME 2723=head1 NAME
2566 2724
2567deliantra - A Deliantra MORPG game client 2725deliantra - A Deliantra MORPG game client
2568 2726
… …
2585 4 show fps 2743 4 show fps
2586 8 suppress tooltips 2744 8 suppress tooltips
2587 2745
2588=head1 AUTHOR 2746=head1 AUTHOR
2589 2747
2590Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2748Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2591 2749
2592 2750
2593 2751

Diff Legend

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