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.48 by root, Mon Jul 7 08:02:17 2008 UTC vs.
Revision 1.66 by root, Mon Sep 1 09:12:08 2008 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3{
4package Deliantra::Client; # work around CPAN breakage
5package App::Deliantra; # try to reserve namespace
6}
7 2
8if ($ENV{DELIANTRA_CORO_DEBUG}) { 3if ($ENV{DELIANTRA_CORO_DEBUG}) {
9 eval ' 4 eval '
10 use Coro; 5 use Coro;
11 use Coro::EV; 6 use Coro::EV;
54 } 49 }
55 } 50 }
56 51
57 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
58 # pango is relocatable on win32 53 # pango is relocatable on win32
59 } else { 54 } elsif (-e "$root/pangoversion") {
60 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
61 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
62 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
63 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
64 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"
74 69
75 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
76 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
77 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
78 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
79 } 81 }
80 82
81 unshift @INC, $root; 83 unshift @INC, $root;
82 } 84 }
83} 85}
102use List::Util qw(max min); 104use List::Util qw(max min);
103 105
104use Deliantra; 106use Deliantra;
105use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
106 108
109use AnyEvent::Util ();
107use AnyEvent::DNS; 110use AnyEvent::DNS;
111use AnyEvent::Socket ();
108 112
109use Compress::LZF; 113use Compress::LZF;
114use JSON::XS;
110 115
111use DC; 116use DC;
112BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 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
113use DC::OpenGL (); 158use DC::OpenGL ();
114use DC::Protocol; 159use DC::Protocol;
115use DC::DB; 160use DC::DB;
116use DC::UI; 161use DC::UI;
117use DC::UI::Canvas; 162use DC::UI::Canvas;
118use DC::UI::Inventory; 163use DC::UI::Inventory;
119use DC::UI::SpellList; 164use DC::UI::SpellList;
120use DC::UI::Dockable; 165use DC::UI::Dockable;
121use DC::UI::Dockbar; 166use DC::UI::Dockbar;
122use DC::UI::MessageWindow;
123use DC::UI::ChatView; 167use DC::UI::ChatView;
124use DC::MessageDistributor; 168use DC::MessageDistributor;
125use DC::Pod; 169use DC::Pod;
126use DC::MapWidget; 170use DC::MapWidget;
127use DC::Macro; 171use DC::Macro;
128 172
129$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 173$SIG{QUIT} = sub { Carp::cluck "QUIT" };
130$SIG{PIPE} = 'IGNORE'; 174$SIG{PIPE} = 'IGNORE';
131 175
132$EV::DIED = sub { 176$EV::DIED = sub {
177 crash ("CRASH/EV::DIED: $@" => 1);
133 DC::fatal Carp::longmess $@; 178 DC::fatal Carp::longmess $@;
134}; 179};
135 180
136my $MAX_FPS = 60; 181my $MAX_FPS = 60;
137 182
139 184
140our $LAST_REFRESH; 185our $LAST_REFRESH;
141our $NOW; 186our $NOW;
142 187
143our $CFG; 188our $CFG;
144our $CONN;
145our $PROFILE; # current profile 189our $PROFILE; # current profile
146our $FAST; # fast, low-quality mode, possibly useful for software-rendering 190our $FAST; # fast, low-quality mode, possibly useful for software-rendering
147 191
148our $WANT_REFRESH; 192our $WANT_REFRESH;
149 193
194our $MODE_SLIDER;
195our $CAVEAT_LABEL;
196
150our @SDL_MODES; 197our @SDL_MODES;
198our $SDL_REINIT = 1;
151our $WIDTH; 199our $WIDTH;
152our $HEIGHT; 200our $HEIGHT;
153our $FULLSCREEN; 201our $FULLSCREEN;
154our $FONTSIZE; 202our $FONTSIZE;
155 203
741 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;
742 790
743 $CONN = 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
779 status "logging in..."; 827 status "logging in...";
780 828
781 $LOGIN_BUTTON->set_text ("Logout"); 829 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 830 $SETUP_DIALOG->hide;
783 831
784 my ($host, $port) = split /:/, $PROFILE->{host}; 832 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 833
786 $MAP = new DC::Map; 834 $MAP = new DC::Map;
787 835
788 # hack to make SURE we find the IP address all right 836 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 837 # can be removed once AnyEvent::DNS is proven stable.
800 dc_connect $host, $port; 848 dc_connect $host, $port;
801 } 849 }
802} 850}
803 851
804sub stop_game { 852sub stop_game {
853 crash "stop_game";
854
805 $LOGIN_BUTTON->set_text ("Login / Register"); 855 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 856 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 857 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 858 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 859 $SPELL_LIST->clear_spells;
829 879
830 my $row = 0; 880 my $row = 0;
831 881
832 $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");
833 $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,
834 can_events => 1, 884 can_events => 1,
835 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.");
836 894
837 my $vidmode_tooltip = 895 my $vidmode_tooltip =
838 "<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). "
839 . "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>.";
840 898
841 $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");
842 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 900 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
843 901
844 $hbox->add (my $mode_slider = new DC::UI::Slider 902 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
845 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 ],
846 tooltip => $vidmode_tooltip); 905 tooltip => $vidmode_tooltip);
847 $hbox->add (my $mode_label = new DC::UI::Label 906 $hbox->add (my $mode_label = new DC::UI::Label
848 height => 0.8, template => "9999x9999@9+9", 907 height => 0.8, template => "9999x9999@9+9",
849 can_events => 1, tooltip => $vidmode_tooltip); 908 can_events => 1, tooltip => $vidmode_tooltip);
850 909
851 $mode_slider->connect (changed => sub { 910 $MODE_SLIDER->connect (changed => sub {
852 my ($self, $value) = @_; 911 my ($self, $value) = @_;
853 912
854 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 913 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
855 $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]});
856 }); 915 });
857 $mode_slider->emit (changed => $mode_slider->{range}[0]); 916 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
858 917
859 $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");
860 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 919 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
861 state => $CFG->{fullscreen}, 920 state => $CFG->{fullscreen},
862 tooltip => "Bring the client into fullscreen mode.", 921 tooltip => "Bring the client into fullscreen mode.",
868 state => $CFG->{force_opengl11}, 927 state => $CFG->{force_opengl11},
869 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 "
870 . "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 "
871 . "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. "
872 . "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, "
873 . "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. "
874 . "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>",
875 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 }
876 ); 952 );
877 953
878 $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");
879 $table->add_at (1, $row++, new DC::UI::CheckBox 955 $table->add_at (1, $row++, new DC::UI::CheckBox
880 state => $CFG->{texture_compression}, 956 state => $CFG->{texture_compression},
881 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 "
882 . "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). "
883 . "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 "
884 . "forced OpenGL 1.1 mode.", 960 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
885 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 961 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
886 ); 962 );
887 963
888 $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");
889 $table->add_at (1, $row++, new DC::UI::CheckBox 965 $table->add_at (1, $row++, new DC::UI::CheckBox
905 on_activate => sub { 981 on_activate => sub {
906 video_shutdown (); 982 video_shutdown ();
907 video_init (); 983 video_init ();
908 0 984 0
909 } 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 }
910 ); 995 );
911 996
912 $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");
913 $table->add_at (1, $row++, new DC::UI::Slider 998 $table->add_at (1, $row++, new DC::UI::Slider
914 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 999 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1554 1 1639 1
1555 }, 1640 },
1556 ); 1641 );
1557 1642
1558 $vbox->add (new DC::UI::FancyFrame 1643 $vbox->add (new DC::UI::FancyFrame
1559 label => "Registering", 1644 label => "How to Play",
1560 min_h => 200, 1645 min_h => 240,
1561 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1646 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1562 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). "
1563 "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 "
1564 . "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.",
1565 ), 1652 ),
1566 ); 1653 );
1567 1654
1568 $vbox 1655 $vbox
1714 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1801 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1715 ["Ignore cursed" => PICKUP_NOT_CURSED], 1802 ["Ignore cursed" => PICKUP_NOT_CURSED],
1716 ["Jewelery" => PICKUP_JEWELS], 1803 ["Jewelery" => PICKUP_JEWELS],
1717 ["Flesh" => PICKUP_FLESH], 1804 ["Flesh" => PICKUP_FLESH],
1718 ], 1805 ],
1719 ["Weight/Value ratio", 2, 17] 1806 ["Value/Weight ratio", 2, 17]
1720 ) 1807 )
1721 { 1808 {
1722 my ($title, $x, $y, @bits) = @$_; 1809 my ($title, $x, $y, @bits) = @$_;
1723 $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]);
1724 1811
1749 } 1836 }
1750 1837
1751 $table->add_at (2, 18, new DC::UI::ValSlider 1838 $table->add_at (2, 18, new DC::UI::ValSlider
1752 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1839 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1753 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).",
1754 to_value => sub { ">= " . 5 * $_[0] }, 1842 to_value => sub { ">= " . 5 * $_[0] },
1755 on_changed => sub { 1843 on_changed => sub {
1756 my ($slider, $value) = @_; 1844 my ($slider, $value) = @_;
1757 1845
1758 $::CFG->{pickup} &= ~0xF; 1846 $::CFG->{pickup} &= ~0xF;
1814 $::CFG->{inv_sort} = $_[1]; 1902 $::CFG->{inv_sort} = $_[1];
1815 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1903 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1816 }, 1904 },
1817 ); 1905 );
1818 $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);
1819 #TODO# update to weigh/maxweight 1907 #TODO# update to weight/maxweight
1820 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1908 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1821 1909
1822 $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);
1823 $sw1->add ($INV = new DC::UI::Inventory); 1911 $sw1->add ($INV = new DC::UI::Inventory);
1824 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1912 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
2088 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2176 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2089 ); 2177 );
2090 $hb->add (new DC::UI::Button 2178 $hb->add (new DC::UI::Button
2091 text => "Quit anyway", 2179 text => "Quit anyway",
2092 expand => 1, 2180 expand => 1,
2093 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2181 on_activate => sub {
2182 crash "Quit anyway";
2183 EV::unloop EV::UNLOOP_ALL;
2184 },
2094 ); 2185 );
2095 } 2186 }
2096 2187
2097 $QUIT_DIALOG->show; 2188 $QUIT_DIALOG->show;
2098 $QUIT_DIALOG->grab_focus; 2189 $QUIT_DIALOG->grab_focus;
2151 $dialog->show; 2242 $dialog->show;
2152 }; 2243 };
2153} 2244}
2154 2245
2155sub sdl_init { 2246sub sdl_init {
2156 DC::SDL_Init 2247 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2157 and die "SDL::Init failed!\n"; 2248 and die "SDL::Init failed!\n";
2158} 2249}
2159 2250
2160sub 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
2161 $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 }
2162 2272
2163 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2273 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2164 2274
2165 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2275 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2166 $FULLSCREEN = $CFG->{fullscreen}; 2276 $FULLSCREEN = $CFG->{fullscreen};
2167 $FAST = $CFG->{fast}; 2277 $FAST = $CFG->{fast};
2168 2278
2279 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2169 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
2170 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2282 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2171 2283
2172 $SDL_ACTIVE = 1; 2284 $SDL_ACTIVE = 1;
2173 $LAST_REFRESH = time - 0.01; 2285 $LAST_REFRESH = time - 0.01;
2174 2286
2350 $BUTTONBAR->show; 2462 $BUTTONBAR->show;
2351 $SETUP_DIALOG->show; 2463 $SETUP_DIALOG->show;
2352 $MESSAGE_WINDOW->show; 2464 $MESSAGE_WINDOW->show;
2353 } 2465 }
2354 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
2355 $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]);
2356} 2475}
2357 2476
2358sub video_shutdown { 2477sub video_shutdown {
2359 DC::OpenGL::shutdown; 2478 DC::OpenGL::shutdown;
2479 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2360 2480
2361 undef $SDL_ACTIVE; 2481 undef $SDL_ACTIVE;
2362} 2482}
2363 2483
2364my %animate_object; 2484my %animate_object;
2407 delete $animate_object{$widget}; 2527 delete $animate_object{$widget};
2408} 2528}
2409 2529
2410%SDL_CB = ( 2530%SDL_CB = (
2411 DC::SDL_QUIT => sub { 2531 DC::SDL_QUIT => sub {
2532 crash "SDL_QUIT";
2412 EV::unloop EV::UNLOOP_ALL; 2533 EV::unloop EV::UNLOOP_ALL;
2413 }, 2534 },
2414 DC::SDL_VIDEORESIZE => sub { 2535 DC::SDL_VIDEORESIZE => sub {
2415 }, 2536 },
2416 DC::SDL_VIDEOEXPOSE => sub { 2537 DC::SDL_VIDEOEXPOSE => sub {
2425# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2546# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2426 }, 2547 },
2427 DC::SDL_KEYDOWN => sub { 2548 DC::SDL_KEYDOWN => sub {
2428 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2549 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2429 # alt-enter 2550 # alt-enter
2551 video_shutdown;
2430 $FULLSCREEN_ENABLE->toggle; 2552 $FULLSCREEN_ENABLE->toggle;
2431 video_shutdown;
2432 video_init; 2553 video_init;
2433 } else { 2554 } else {
2434 &DC::UI::feed_sdl_key_down_event; 2555 &DC::UI::feed_sdl_key_down_event;
2435 } 2556 }
2436 update_modbox; 2557 update_modbox;
2456$SIG{INT} = $SIG{TERM} = sub { 2577$SIG{INT} = $SIG{TERM} = sub {
2457 EV::unloop; 2578 EV::unloop;
2458 #d# TODO calling exit here hangs the process in some futex 2579 #d# TODO calling exit here hangs the process in some futex
2459}; 2580};
2460 2581
2461{ 2582# due to mac os x + sdl combined briandamage, we need this contortion
2583sub main {
2584 {
2462 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2585 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2463 2586
2464 if (-e "$Deliantra::VARDIR/client.cf") { 2587 if (-e "$Deliantra::VARDIR/client.cf") {
2465 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2588 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2466 } else { 2589 } else {
2467 #TODO: compatibility cruft 2590 #TODO: compatibility cruft
2468 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2591 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2469 print STDERR "INFO: used old configuration file\n"; 2592 print STDERR "INFO: used old configuration file\n";
2470 } 2593 }
2471 2594
2472 DC::DB::Server::run; 2595 DC::DB::Server::run;
2473 2596
2474 if ($CFG->{db_schema} < 1) { 2597 if ($CFG->{db_schema} < 1) {
2475 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";
2476 DC::DB::nuke_db; 2599 DC::DB::nuke_db;
2477 $CFG->{db_schema} = 1; 2600 $CFG->{db_schema} = 1;
2478 DC::write_cfg; 2601 DC::write_cfg;
2479 } 2602 }
2480 2603
2481 DC::DB::open_db; 2604 DC::DB::open_db;
2482 2605
2483 DC::UI::set_layout ($::CFG->{layout}); 2606 DC::UI::set_layout ($::CFG->{layout});
2484 2607
2485 my %DEF_CFG = ( 2608 my %DEF_CFG = (
2486 sdl_mode => 0, 2609 sdl_mode => undef,
2487 fullscreen => 1, 2610 fullscreen => 1,
2488 fast => 0, 2611 fast => 0,
2489 force_opengl11 => undef, 2612 force_opengl11 => undef,
2613 disable_alpha => 0,
2614 smooth_movement => 1,
2490 texture_compression => 1, 2615 texture_compression => 1,
2491 map_scale => 1, 2616 map_scale => 1,
2492 fow_enable => 1, 2617 fow_enable => 1,
2493 fow_intensity => 0, 2618 fow_intensity => 0,
2494 map_smoothing => 1, 2619 map_smoothing => 1,
2495 gui_fontsize => 1, 2620 gui_fontsize => 1,
2496 log_fontsize => 0.7, 2621 log_fontsize => 0.7,
2497 gauge_fontsize => 1, 2622 gauge_fontsize => 1,
2498 gauge_size => 0.35, 2623 gauge_size => 0.35,
2499 stat_fontsize => 0.7, 2624 stat_fontsize => 0.7,
2500 mapsize => 100, 2625 mapsize => 100,
2501 audio_enable => 1, 2626 audio_enable => 1,
2502 audio_hw_channels => 0, 2627 audio_hw_channels => 0,
2503 audio_hw_frequency => 0, 2628 audio_hw_frequency => 0,
2504 audio_hw_chunksize => 0, 2629 audio_hw_chunksize => 0,
2505 audio_mix_channels => 8, 2630 audio_mix_channels => 8,
2506 effects_enable => 1, 2631 effects_enable => 1,
2507 effects_volume => 1, 2632 effects_volume => 1,
2508 bgm_enable => 1, 2633 bgm_enable => 1,
2509 bgm_volume => 0.5, 2634 bgm_volume => 0.5,
2510 output_rate => "", 2635 output_rate => "",
2511 pickup => 0, 2636 pickup => 0,
2512 inv_sort => "mtime", 2637 inv_sort => "mtime",
2513 default => "profile", # default profile 2638 default => "profile", # default profile
2514 show_tips => 1, 2639 show_tips => 1,
2515 logview_max_par => 1000, 2640 logview_max_par => 1000,
2516 shift_fire_stop => 0, 2641 shift_fire_stop => 0,
2517 ); 2642 );
2518 2643
2519 while (my ($k, $v) = each %DEF_CFG) { 2644 while (my ($k, $v) = each %DEF_CFG) {
2520 $CFG->{$k} = $v unless exists $CFG->{$k}; 2645 $CFG->{$k} = $v unless exists $CFG->{$k};
2521 } 2646 }
2522 2647
2523 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2648 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2524 $PROFILE = $CFG->{profile}{default}; 2649 $PROFILE = $CFG->{profile}{default};
2525 2650
2526 # convert old bindings (only default profile matters) 2651 # convert old bindings (only default profile matters)
2527 if (my $bindings = delete $PROFILE->{bindings}) { 2652 if (my $bindings = delete $PROFILE->{bindings}) {
2528 while (my ($mod, $syms) = each %$bindings) { 2653 while (my ($mod, $syms) = each %$bindings) {
2529 while (my ($sym, $cmds) = each %$syms) { 2654 while (my ($sym, $cmds) = each %$syms) {
2530 push @{ $PROFILE->{macro} }, { 2655 push @{ $PROFILE->{macro} }, {
2531 accelkey => [$mod*1, $sym*1], 2656 accelkey => [$mod*1, $sym*1],
2532 action => $cmds, 2657 action => $cmds,
2658 };
2533 }; 2659 }
2534 } 2660 }
2535 } 2661 }
2536 }
2537 2662
2538 sdl_init; 2663 sdl_init;
2539 2664
2540 @SDL_MODES = DC::SDL_ListModes 8, 8; 2665 {
2541 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2542 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2543
2544 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2545
2546 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2547
2548 {
2549 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2666 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2550 DejaVuSans.ttf 2667 DejaVuSans.ttf
2551 DejaVuSansMono.ttf 2668 DejaVuSansMono.ttf
2552 DejaVuSans-Bold.ttf 2669 DejaVuSans-Bold.ttf
2553 DejaVuSansMono-Bold.ttf 2670 DejaVuSansMono-Bold.ttf
2554 DejaVuSans-Oblique.ttf 2671 DejaVuSans-Oblique.ttf
2555 DejaVuSansMono-Oblique.ttf 2672 DejaVuSansMono-Oblique.ttf
2556 DejaVuSans-BoldOblique.ttf 2673 DejaVuSans-BoldOblique.ttf
2557 DejaVuSansMono-BoldOblique.ttf 2674 DejaVuSansMono-BoldOblique.ttf
2558 ); 2675 );
2559 2676
2560 DC::add_font $_ for @fonts; 2677 DC::add_font $_ for @fonts;
2561 2678
2562 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2679 $FONT_PROP = new_from_file DC::Font $fonts[0];
2563 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2680 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2564 2681
2565 $FONT_PROP->make_default; 2682 $FONT_PROP->make_default;
2566 2683
2567 DC::pango_init; 2684 DC::pango_init;
2568 } 2685 }
2569 2686
2570# compare mono (ft) vs. rgba (cairo) 2687# compare mono (ft) vs. rgba (cairo)
2571# ft - 1.8s, cairo 3s, even in alpha-only mode 2688# ft - 1.8s, cairo 3s, even in alpha-only mode
2572# for my $rgba (0..1) { 2689# for my $rgba (0..1) {
2573# my $t1 = Time::HiRes::time; 2690# my $t1 = Time::HiRes::time;
2578# } 2695# }
2579# my $t2 = Time::HiRes::time; 2696# my $t2 = Time::HiRes::time;
2580# warn $t2-$t1; 2697# warn $t2-$t1;
2581# } 2698# }
2582 2699
2583 video_init; 2700 video_init;
2584 audio_init; 2701 audio_init;
2585} 2702 }
2586 2703
2587show_tip_of_the_day if $CFG->{show_tips}; 2704 show_tip_of_the_day if $CFG->{show_tips};
2588 2705
2589our $STARTUP_CANCEL = EV::idle sub { 2706 our $STARTUP_CANCEL = EV::idle sub {
2590 undef $::STARTUP_CANCEL; 2707 undef $::STARTUP_CANCEL;
2591 $startup_done->(); 2708 $startup_done->();
2592}; 2709 };
2593 2710
2594delete $SIG{__DIE__}; 2711 delete $SIG{__DIE__};
2595EV::loop; 2712 EV::loop;
2596 2713
2597#video_shutdown; 2714#video_shutdown;
2598#audio_shutdown; 2715#audio_shutdown;
2599DC::OpenGL::quit; 2716 DC::OpenGL::quit;
2600DC::SDL_Quit; 2717 DC::SDL_Quit;
2601DC::DB::Server::stop; 2718 DC::DB::Server::stop;
2719}
2720
2721DC::SDL_braino; # see sub above
2602 2722
2603=head1 NAME 2723=head1 NAME
2604 2724
2605deliantra - A Deliantra MORPG game client 2725deliantra - A Deliantra MORPG game client
2606 2726
2623 4 show fps 2743 4 show fps
2624 8 suppress tooltips 2744 8 suppress tooltips
2625 2745
2626=head1 AUTHOR 2746=head1 AUTHOR
2627 2747
2628Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2748Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2629 2749
2630 2750
2631 2751

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines