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.69 by root, Mon Sep 1 15:08:15 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
81 symlink "libjpeg.62.dylib", "libjpeg.dylib";
79 } 82 }
80 83
81 unshift @INC, $root; 84 unshift @INC, $root;
82 } 85 }
83} 86}
… …
95 98
96# need to do it again because that pile of garbage called PAR nukes it before main 99# need to do it again because that pile of garbage called PAR nukes it before main
97unshift @INC, $ENV{PAR_TEMP} 100unshift @INC, $ENV{PAR_TEMP}
98 if %PAR::LibCache; 101 if %PAR::LibCache;
99 102
100use Time::HiRes 'time';
101use EV; 103use EV;
104BEGIN { *time = \&EV::time }
105
102use List::Util qw(max min); 106use List::Util qw(max min);
103 107
104use Deliantra; 108use Deliantra;
105use Deliantra::Protocol::Constants; 109use Deliantra::Protocol::Constants;
106 110
111use AnyEvent::Util ();
107use AnyEvent::DNS; 112use AnyEvent::DNS;
113use AnyEvent::Socket ();
108 114
109use Compress::LZF; 115use Compress::LZF;
116use JSON::XS;
110 117
111use DC; 118use DC;
112BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 119
120sub crash($;$) {
121 # nop during compiletime
122}
123
124BEGIN {
125 $SIG{__DIE__} = sub {
126 return if $^S;
127 crash "CRASH/DIE: $_[0]" => 1;
128 DC::fatal Carp::longmess "$_[0]";
129 }
130}
131
113use DC::OpenGL (); 132use DC::OpenGL ();
114use DC::Protocol; 133use DC::Protocol;
115use DC::DB; 134use DC::DB;
116use DC::UI; 135use DC::UI;
117use DC::UI::Canvas; 136use DC::UI::Canvas;
118use DC::UI::Inventory; 137use DC::UI::Inventory;
119use DC::UI::SpellList; 138use DC::UI::SpellList;
120use DC::UI::Dockable; 139use DC::UI::Dockable;
121use DC::UI::Dockbar; 140use DC::UI::Dockbar;
122use DC::UI::MessageWindow;
123use DC::UI::ChatView; 141use DC::UI::ChatView;
124use DC::MessageDistributor; 142use DC::MessageDistributor;
125use DC::Pod; 143use DC::Pod;
126use DC::MapWidget; 144use DC::MapWidget;
127use DC::Macro; 145use DC::Macro;
128 146
129$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 147$SIG{QUIT} = sub { Carp::cluck "QUIT" };
130$SIG{PIPE} = 'IGNORE'; 148$SIG{PIPE} = 'IGNORE';
131 149
132$EV::DIED = sub { 150$EV::DIED = sub {
151 crash "CRASH/EV::DIED: $@" => 1;
133 DC::fatal Carp::longmess $@; 152 DC::fatal Carp::longmess $@;
134}; 153};
135 154
136my $MAX_FPS = 60; 155my $MAX_FPS = 60;
137 156
… …
139 158
140our $LAST_REFRESH; 159our $LAST_REFRESH;
141our $NOW; 160our $NOW;
142 161
143our $CFG; 162our $CFG;
144our $CONN;
145our $PROFILE; # current profile 163our $PROFILE; # current profile
146our $FAST; # fast, low-quality mode, possibly useful for software-rendering 164our $FAST; # fast, low-quality mode, possibly useful for software-rendering
147 165
148our $WANT_REFRESH; 166our $WANT_REFRESH;
149 167
168our $MODE_SLIDER;
169our $CAVEAT_LABEL;
170
150our @SDL_MODES; 171our @SDL_MODES;
172our $SDL_REINIT = 1;
151our $WIDTH; 173our $WIDTH;
152our $HEIGHT; 174our $HEIGHT;
153our $FULLSCREEN; 175our $FULLSCREEN;
154our $FONTSIZE; 176our $FONTSIZE;
155 177
156our $FONT_PROP; 178our $FONT_PROP;
157our $FONT_FIXED; 179our $FONT_FIXED;
180
181our $CONN;
158 182
159our $MAP; 183our $MAP;
160our $MAPMAP; 184our $MAPMAP;
161our $MAPWIDGET; 185our $MAPWIDGET;
162our $COMPLETER; 186our $COMPLETER;
… …
204our $DEBUG_STATUS; 228our $DEBUG_STATUS;
205 229
206our $INV; 230our $INV;
207our $INVR; 231our $INVR;
208our $INVR_HB; 232our $INVR_HB;
233
234#############################################################################
235
236# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) {
239 my ($msg, $backtrace) = @_;
240
241 return unless $CONN;
242
243 my $fh = $CONN->{fh}
244 or return;
245
246 my $buf = delete $CONN->{wbuf};
247
248 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
249
250 AnyEvent::Util::fh_nonblocking $fh, 0;
251 syswrite $fh, $buf;
252 AnyEvent::Util::fh_nonblocking $fh, 1;
253
254 $msg =~ s/\s+$//;
255
256 # backtrace as second step, in case it crashes, too
257 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace;
259};
209 260
210############################################################################# 261#############################################################################
211 262
212sub status { 263sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
742 793
743 $CONN = 794 $CONN =
744 new DC::Protocol 795 new DC::Protocol
745 host => $host, 796 host => $host,
746 port => $port || 13327, 797 port => $port,
747 user => $PROFILE->{user}, 798 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 799 pass => $PROFILE->{password},
749 mapw => $mapsize, 800 mapw => $mapsize,
750 maph => $mapsize, 801 maph => $mapsize,
751 802
… …
779 status "logging in..."; 830 status "logging in...";
780 831
781 $LOGIN_BUTTON->set_text ("Logout"); 832 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 833 $SETUP_DIALOG->hide;
783 834
784 my ($host, $port) = split /:/, $PROFILE->{host}; 835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 836
786 $MAP = new DC::Map; 837 $MAP = new DC::Map;
787 838
788 # hack to make SURE we find the IP address all right 839 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 840 # can be removed once AnyEvent::DNS is proven stable.
… …
800 dc_connect $host, $port; 851 dc_connect $host, $port;
801 } 852 }
802} 853}
803 854
804sub stop_game { 855sub stop_game {
856 crash "stop_game";
857
805 $LOGIN_BUTTON->set_text ("Login / Register"); 858 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 859 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 860 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 861 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 862 $SPELL_LIST->clear_spells;
… …
829 882
830 my $row = 0; 883 my $row = 0;
831 884
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 885 $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, 886 $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, 887 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
891 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as "
894 . "a non-accelerated display format. You can try to work around these issues "
895 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card.");
836 897
837 my $vidmode_tooltip = 898 my $vidmode_tooltip =
838 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 899 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
839 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 900 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
840 901
841 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 902 $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); 903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
843 904
844 $hbox->add (my $mode_slider = new DC::UI::Slider 905 $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], 906 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ],
846 tooltip => $vidmode_tooltip); 908 tooltip => $vidmode_tooltip);
847 $hbox->add (my $mode_label = new DC::UI::Label 909 $hbox->add (my $mode_label = new DC::UI::Label
848 height => 0.8, template => "9999x9999@9+9", 910 height => 0.8, template => "9999x9999@9+9",
849 can_events => 1, tooltip => $vidmode_tooltip); 911 can_events => 1, tooltip => $vidmode_tooltip);
850 912
851 $mode_slider->connect (changed => sub { 913 $MODE_SLIDER->connect (changed => sub {
852 my ($self, $value) = @_; 914 my ($self, $value) = @_;
853 915
854 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 916 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
855 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 917 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
856 }); 918 });
857 $mode_slider->emit (changed => $mode_slider->{range}[0]); 919 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
858 920
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 921 $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 922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
861 state => $CFG->{fullscreen}, 923 state => $CFG->{fullscreen},
862 tooltip => "Bring the client into fullscreen mode.", 924 tooltip => "Bring the client into fullscreen mode.",
… …
868 state => $CFG->{force_opengl11}, 930 state => $CFG->{force_opengl11},
869 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 931 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
870 . "higher memory usage and slower performance. It will, however, help tremendously on " 932 . "higher memory usage and slower performance. It will, however, help tremendously on "
871 . "cards that claim to support a feature but fall back to software rendering. " 933 . "cards that claim to support a feature but fall back to software rendering. "
872 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 934 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
873 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 935 . "but cards and drivers from other vendors (ATI) are often just as bad. "
874 . "experience extremely low framerates and your card should do better, try this option.</b>", 936 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 937 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
938 );
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{disable_alpha},
943 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
944 . "by disabling a number of textures and transparency effects. Normally, these "
945 . "effects do not cost a lot of resources, but some graphics cards might fall "
946 . "back to etxremely slow rendering if this is enabled. If disabling this option "
947 . "noticably improves the framerate of the client please report this! "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub {
950 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
953 0
954 }
876 ); 955 );
877 956
878 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
879 $table->add_at (1, $row++, new DC::UI::CheckBox 958 $table->add_at (1, $row++, new DC::UI::CheckBox
880 state => $CFG->{texture_compression}, 959 state => $CFG->{texture_compression},
881 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
882 . "will save a lot of memory and increase performance. The compression algorithm " 961 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
883 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 962 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
884 . "forced OpenGL 1.1 mode.", 963 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
885 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
886 ); 965 );
887 966
888 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
889 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
905 on_activate => sub { 984 on_activate => sub {
906 video_shutdown (); 985 video_shutdown ();
907 video_init (); 986 video_init ();
908 0 987 0
909 } 988 }
989 );
990
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
995 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
910 ); 998 );
911 999
912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
913 $table->add_at (1, $row++, new DC::UI::Slider 1001 $table->add_at (1, $row++, new DC::UI::Slider
914 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1554 1 1642 1
1555 }, 1643 },
1556 ); 1644 );
1557 1645
1558 $vbox->add (new DC::UI::FancyFrame 1646 $vbox->add (new DC::UI::FancyFrame
1559 label => "Registering", 1647 label => "How to Play",
1560 min_h => 200, 1648 min_h => 240,
1561 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1649 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1562 markup => 1650 markup =>
1651 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1652 . "Then register a new account (or use an existing one if you have one). "
1563 "To register a new account, choose a username that hasn't been taken yet and " 1653 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1564 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1654 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1565 ), 1655 ),
1566 ); 1656 );
1567 1657
1568 $vbox 1658 $vbox
… …
1714 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1804 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1715 ["Ignore cursed" => PICKUP_NOT_CURSED], 1805 ["Ignore cursed" => PICKUP_NOT_CURSED],
1716 ["Jewelery" => PICKUP_JEWELS], 1806 ["Jewelery" => PICKUP_JEWELS],
1717 ["Flesh" => PICKUP_FLESH], 1807 ["Flesh" => PICKUP_FLESH],
1718 ], 1808 ],
1719 ["Weight/Value ratio", 2, 17] 1809 ["Value/Weight ratio", 2, 17]
1720 ) 1810 )
1721 { 1811 {
1722 my ($title, $x, $y, @bits) = @$_; 1812 my ($title, $x, $y, @bits) = @$_;
1723 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1813 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1724 1814
… …
1749 } 1839 }
1750 1840
1751 $table->add_at (2, 18, new DC::UI::ValSlider 1841 $table->add_at (2, 18, new DC::UI::ValSlider
1752 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1842 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1753 template => ">= 99", 1843 template => ">= 99",
1844 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1754 to_value => sub { ">= " . 5 * $_[0] }, 1845 to_value => sub { ">= " . 5 * $_[0] },
1755 on_changed => sub { 1846 on_changed => sub {
1756 my ($slider, $value) = @_; 1847 my ($slider, $value) = @_;
1757 1848
1758 $::CFG->{pickup} &= ~0xF; 1849 $::CFG->{pickup} &= ~0xF;
… …
1814 $::CFG->{inv_sort} = $_[1]; 1905 $::CFG->{inv_sort} = $_[1];
1815 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1906 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1816 }, 1907 },
1817 ); 1908 );
1818 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1909 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1819 #TODO# update to weigh/maxweight 1910 #TODO# update to weight/maxweight
1820 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1911 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1821 1912
1822 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1913 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1823 $sw1->add ($INV = new DC::UI::Inventory); 1914 $sw1->add ($INV = new DC::UI::Inventory);
1824 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1915 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2088 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2179 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2089 ); 2180 );
2090 $hb->add (new DC::UI::Button 2181 $hb->add (new DC::UI::Button
2091 text => "Quit anyway", 2182 text => "Quit anyway",
2092 expand => 1, 2183 expand => 1,
2093 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2184 on_activate => sub {
2185 crash "Quit anyway";
2186 EV::unloop EV::UNLOOP_ALL;
2187 },
2094 ); 2188 );
2095 } 2189 }
2096 2190
2097 $QUIT_DIALOG->show; 2191 $QUIT_DIALOG->show;
2098 $QUIT_DIALOG->grab_focus; 2192 $QUIT_DIALOG->grab_focus;
… …
2151 $dialog->show; 2245 $dialog->show;
2152 }; 2246 };
2153} 2247}
2154 2248
2155sub sdl_init { 2249sub sdl_init {
2156 DC::SDL_Init 2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2157 and die "SDL::Init failed!\n"; 2251 and die "SDL::Init failed!\n";
2158} 2252}
2159 2253
2160sub video_init { 2254sub video_init {
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0;
2257
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2260 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2261 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2262
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264
2161 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267
2268 # now choose biggets mode <= 1024x768
2269 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_;
2272 }
2273 }
2274 }
2162 2275
2163 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2276 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2164 2277
2165 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2278 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2166 $FULLSCREEN = $CFG->{fullscreen}; 2279 $FULLSCREEN = $CFG->{fullscreen};
2167 $FAST = $CFG->{fast}; 2280 $FAST = $CFG->{fast};
2168 2281
2282 # 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 2283 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2284 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2170 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2285 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2171 2286
2172 $SDL_ACTIVE = 1; 2287 $SDL_ACTIVE = 1;
2173 $LAST_REFRESH = time - 0.01; 2288 $LAST_REFRESH = time - 0.01;
2174 2289
… …
2350 $BUTTONBAR->show; 2465 $BUTTONBAR->show;
2351 $SETUP_DIALOG->show; 2466 $SETUP_DIALOG->show;
2352 $MESSAGE_WINDOW->show; 2467 $MESSAGE_WINDOW->show;
2353 } 2468 }
2354 2469
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472
2473 $CAVEAT_LABEL->set_text ("None :)");
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476
2355 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2356} 2478}
2357 2479
2358sub video_shutdown { 2480sub video_shutdown {
2359 DC::OpenGL::shutdown; 2481 DC::OpenGL::shutdown;
2482 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2360 2483
2361 undef $SDL_ACTIVE; 2484 undef $SDL_ACTIVE;
2362} 2485}
2363 2486
2364my %animate_object; 2487my %animate_object;
… …
2407 delete $animate_object{$widget}; 2530 delete $animate_object{$widget};
2408} 2531}
2409 2532
2410%SDL_CB = ( 2533%SDL_CB = (
2411 DC::SDL_QUIT => sub { 2534 DC::SDL_QUIT => sub {
2535 crash "SDL_QUIT";
2412 EV::unloop EV::UNLOOP_ALL; 2536 EV::unloop EV::UNLOOP_ALL;
2413 }, 2537 },
2414 DC::SDL_VIDEORESIZE => sub { 2538 DC::SDL_VIDEORESIZE => sub {
2415 }, 2539 },
2416 DC::SDL_VIDEOEXPOSE => sub { 2540 DC::SDL_VIDEOEXPOSE => sub {
… …
2425# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2426 }, 2550 },
2427 DC::SDL_KEYDOWN => sub { 2551 DC::SDL_KEYDOWN => sub {
2428 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2429 # alt-enter 2553 # alt-enter
2554 video_shutdown;
2430 $FULLSCREEN_ENABLE->toggle; 2555 $FULLSCREEN_ENABLE->toggle;
2431 video_shutdown;
2432 video_init; 2556 video_init;
2433 } else { 2557 } else {
2434 &DC::UI::feed_sdl_key_down_event; 2558 &DC::UI::feed_sdl_key_down_event;
2435 } 2559 }
2436 update_modbox; 2560 update_modbox;
… …
2456$SIG{INT} = $SIG{TERM} = sub { 2580$SIG{INT} = $SIG{TERM} = sub {
2457 EV::unloop; 2581 EV::unloop;
2458 #d# TODO calling exit here hangs the process in some futex 2582 #d# TODO calling exit here hangs the process in some futex
2459}; 2583};
2460 2584
2461{ 2585# due to mac os x + sdl combined briandamage, we need this contortion
2586sub main {
2587 {
2462 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2463 2589
2464 if (-e "$Deliantra::VARDIR/client.cf") { 2590 if (-e "$Deliantra::VARDIR/client.cf") {
2465 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2591 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2466 } else { 2592 } else {
2467 #TODO: compatibility cruft 2593 #TODO: compatibility cruft
2468 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2594 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2469 print STDERR "INFO: used old configuration file\n"; 2595 print STDERR "INFO: used old configuration file\n";
2470 } 2596 }
2471 2597
2472 DC::DB::Server::run; 2598 DC::DB::Server::run;
2473 2599
2474 if ($CFG->{db_schema} < 1) { 2600 if ($CFG->{db_schema} < 1) {
2475 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2601 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2476 DC::DB::nuke_db; 2602 DC::DB::nuke_db;
2477 $CFG->{db_schema} = 1; 2603 $CFG->{db_schema} = 1;
2478 DC::write_cfg; 2604 DC::write_cfg;
2479 } 2605 }
2480 2606
2481 DC::DB::open_db; 2607 DC::DB::open_db;
2482 2608
2483 DC::UI::set_layout ($::CFG->{layout}); 2609 DC::UI::set_layout ($::CFG->{layout});
2484 2610
2485 my %DEF_CFG = ( 2611 my %DEF_CFG = (
2486 sdl_mode => 0, 2612 sdl_mode => undef,
2487 fullscreen => 1, 2613 fullscreen => 1,
2488 fast => 0, 2614 fast => 0,
2489 force_opengl11 => undef, 2615 force_opengl11 => undef,
2616 disable_alpha => 0,
2617 smooth_movement => 1,
2490 texture_compression => 1, 2618 texture_compression => 1,
2491 map_scale => 1, 2619 map_scale => 1,
2492 fow_enable => 1, 2620 fow_enable => 1,
2493 fow_intensity => 0, 2621 fow_intensity => 0,
2494 map_smoothing => 1, 2622 map_smoothing => 1,
2495 gui_fontsize => 1, 2623 gui_fontsize => 1,
2496 log_fontsize => 0.7, 2624 log_fontsize => 0.7,
2497 gauge_fontsize => 1, 2625 gauge_fontsize => 1,
2498 gauge_size => 0.35, 2626 gauge_size => 0.35,
2499 stat_fontsize => 0.7, 2627 stat_fontsize => 0.7,
2500 mapsize => 100, 2628 mapsize => 100,
2501 audio_enable => 1, 2629 audio_enable => 1,
2502 audio_hw_channels => 0, 2630 audio_hw_channels => 0,
2503 audio_hw_frequency => 0, 2631 audio_hw_frequency => 0,
2504 audio_hw_chunksize => 0, 2632 audio_hw_chunksize => 0,
2505 audio_mix_channels => 8, 2633 audio_mix_channels => 8,
2506 effects_enable => 1, 2634 effects_enable => 1,
2507 effects_volume => 1, 2635 effects_volume => 1,
2508 bgm_enable => 1, 2636 bgm_enable => 1,
2509 bgm_volume => 0.5, 2637 bgm_volume => 0.5,
2510 output_rate => "", 2638 output_rate => "",
2511 pickup => 0, 2639 pickup => 0,
2512 inv_sort => "mtime", 2640 inv_sort => "mtime",
2513 default => "profile", # default profile 2641 default => "profile", # default profile
2514 show_tips => 1, 2642 show_tips => 1,
2515 logview_max_par => 1000, 2643 logview_max_par => 1000,
2516 shift_fire_stop => 0, 2644 shift_fire_stop => 0,
2517 ); 2645 );
2518 2646
2519 while (my ($k, $v) = each %DEF_CFG) { 2647 while (my ($k, $v) = each %DEF_CFG) {
2520 $CFG->{$k} = $v unless exists $CFG->{$k}; 2648 $CFG->{$k} = $v unless exists $CFG->{$k};
2521 } 2649 }
2522 2650
2523 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2524 $PROFILE = $CFG->{profile}{default}; 2652 $PROFILE = $CFG->{profile}{default};
2525 2653
2526 # convert old bindings (only default profile matters) 2654 # convert old bindings (only default profile matters)
2527 if (my $bindings = delete $PROFILE->{bindings}) { 2655 if (my $bindings = delete $PROFILE->{bindings}) {
2528 while (my ($mod, $syms) = each %$bindings) { 2656 while (my ($mod, $syms) = each %$bindings) {
2529 while (my ($sym, $cmds) = each %$syms) { 2657 while (my ($sym, $cmds) = each %$syms) {
2530 push @{ $PROFILE->{macro} }, { 2658 push @{ $PROFILE->{macro} }, {
2531 accelkey => [$mod*1, $sym*1], 2659 accelkey => [$mod*1, $sym*1],
2532 action => $cmds, 2660 action => $cmds,
2661 };
2533 }; 2662 }
2534 } 2663 }
2535 } 2664 }
2536 }
2537 2665
2538 sdl_init; 2666 sdl_init;
2539 2667
2540 @SDL_MODES = DC::SDL_ListModes 8, 8; 2668 {
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( 2669 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2550 DejaVuSans.ttf 2670 DejaVuSans.ttf
2551 DejaVuSansMono.ttf 2671 DejaVuSansMono.ttf
2552 DejaVuSans-Bold.ttf 2672 DejaVuSans-Bold.ttf
2553 DejaVuSansMono-Bold.ttf 2673 DejaVuSansMono-Bold.ttf
2554 DejaVuSans-Oblique.ttf 2674 DejaVuSans-Oblique.ttf
2555 DejaVuSansMono-Oblique.ttf 2675 DejaVuSansMono-Oblique.ttf
2556 DejaVuSans-BoldOblique.ttf 2676 DejaVuSans-BoldOblique.ttf
2557 DejaVuSansMono-BoldOblique.ttf 2677 DejaVuSansMono-BoldOblique.ttf
2558 ); 2678 );
2559 2679
2560 DC::add_font $_ for @fonts; 2680 DC::add_font $_ for @fonts;
2561 2681
2562 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2682 $FONT_PROP = new_from_file DC::Font $fonts[0];
2563 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2683 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2564 2684
2565 $FONT_PROP->make_default; 2685 $FONT_PROP->make_default;
2566 2686
2567 DC::pango_init; 2687 DC::pango_init;
2568 } 2688 }
2569 2689
2570# compare mono (ft) vs. rgba (cairo) 2690# compare mono (ft) vs. rgba (cairo)
2571# ft - 1.8s, cairo 3s, even in alpha-only mode 2691# ft - 1.8s, cairo 3s, even in alpha-only mode
2572# for my $rgba (0..1) { 2692# for my $rgba (0..1) {
2573# my $t1 = Time::HiRes::time; 2693# my $t1 = Time::HiRes::time;
… …
2578# } 2698# }
2579# my $t2 = Time::HiRes::time; 2699# my $t2 = Time::HiRes::time;
2580# warn $t2-$t1; 2700# warn $t2-$t1;
2581# } 2701# }
2582 2702
2583 video_init; 2703 video_init;
2584 audio_init; 2704 audio_init;
2585} 2705 }
2586 2706
2587show_tip_of_the_day if $CFG->{show_tips}; 2707 show_tip_of_the_day if $CFG->{show_tips};
2588 2708
2589our $STARTUP_CANCEL = EV::idle sub { 2709 our $STARTUP_CANCEL = EV::idle sub {
2590 undef $::STARTUP_CANCEL; 2710 undef $::STARTUP_CANCEL;
2591 $startup_done->(); 2711 $startup_done->();
2592}; 2712 };
2593 2713
2594delete $SIG{__DIE__}; 2714 delete $SIG{__DIE__};
2595EV::loop; 2715 EV::loop;
2596 2716
2597#video_shutdown; 2717#video_shutdown;
2598#audio_shutdown; 2718#audio_shutdown;
2599DC::OpenGL::quit; 2719 DC::OpenGL::quit;
2600DC::SDL_Quit; 2720 DC::SDL_Quit;
2601DC::DB::Server::stop; 2721 DC::DB::Server::stop;
2722}
2723
2724DC::SDL_braino; # see sub above
2602 2725
2603=head1 NAME 2726=head1 NAME
2604 2727
2605deliantra - A Deliantra MORPG game client 2728deliantra - A Deliantra MORPG game client
2606 2729
… …
2623 4 show fps 2746 4 show fps
2624 8 suppress tooltips 2747 8 suppress tooltips
2625 2748
2626=head1 AUTHOR 2749=head1 AUTHOR
2627 2750
2628Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2751Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2629 2752
2630 2753
2631 2754

Diff Legend

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