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.47 by root, Mon Jul 7 05:02:03 2008 UTC vs.
Revision 1.73 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines