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

Diff Legend

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