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.43 by root, Wed May 21 23:35:55 2008 UTC vs.
Revision 1.74 by root, Wed Sep 3 06:23:04 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
74 } 81 }
75 82
76 unshift @INC, $root; 83 unshift @INC, $root;
77 } 84 }
78} 85}
… …
90 97
91# 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
92unshift @INC, $ENV{PAR_TEMP} 99unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 100 if %PAR::LibCache;
94 101
95use Time::HiRes 'time';
96use EV; 102use EV;
103BEGIN { *time = \&EV::time }
104
97use List::Util qw(max min); 105use List::Util qw(max min);
98 106
99use Deliantra; 107use Deliantra;
100use Deliantra::Protocol::Constants; 108use Deliantra::Protocol::Constants;
101 109
110use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket ();
113
102use Compress::LZF; 114use Compress::LZF;
115use JSON::XS;
103 116
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 117use DC;
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
105use DC::OpenGL (); 131use DC::OpenGL ();
106use DC::Protocol; 132use DC::Protocol;
107use DC::DB; 133use DC::DB;
108use DC::UI; 134use DC::UI;
109use DC::UI::Canvas; 135use DC::UI::Canvas;
110use DC::UI::Inventory; 136use DC::UI::Inventory;
111use DC::UI::SpellList; 137use DC::UI::SpellList;
112use DC::UI::Dockable; 138use DC::UI::Dockable;
113use DC::UI::Dockbar; 139use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 140use DC::UI::ChatView;
116use DC::MessageDistributor; 141use DC::MessageDistributor;
117use DC::Pod; 142use DC::Pod;
118use DC::MapWidget; 143use DC::MapWidget;
119use DC::Macro; 144use DC::Macro;
120 145
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 146$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 147$SIG{PIPE} = 'IGNORE';
123 148
124$EV::DIED = sub { 149$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1;
125 DC::fatal Carp::longmess $@; 151 DC::fatal Carp::longmess $@;
126}; 152};
127 153
128my $MAX_FPS = 60; 154my $MAX_FPS = 60;
129 155
… …
131 157
132our $LAST_REFRESH; 158our $LAST_REFRESH;
133our $NOW; 159our $NOW;
134 160
135our $CFG; 161our $CFG;
136our $CONN;
137our $PROFILE; # current profile 162our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 163our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 164
140our $WANT_REFRESH; 165our $WANT_REFRESH;
141 166
167our $MODE_SLIDER;
168our $CAVEAT_LABEL;
169
142our @SDL_MODES; 170our @SDL_MODES;
171our $SDL_REINIT = 1;
143our $WIDTH; 172our $WIDTH;
144our $HEIGHT; 173our $HEIGHT;
145our $FULLSCREEN; 174our $FULLSCREEN;
146our $FONTSIZE; 175our $FONTSIZE;
147 176
148our $FONT_PROP; 177our $FONT_PROP;
149our $FONT_FIXED; 178our $FONT_FIXED;
179
180our $CONN;
150 181
151our $MAP; 182our $MAP;
152our $MAPMAP; 183our $MAPMAP;
153our $MAPWIDGET; 184our $MAPWIDGET;
154our $COMPLETER; 185our $COMPLETER;
… …
196our $DEBUG_STATUS; 227our $DEBUG_STATUS;
197 228
198our $INV; 229our $INV;
199our $INVR; 230our $INVR;
200our $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};
201 259
202############################################################################# 260#############################################################################
203 261
204sub status { 262sub status {
205 $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]);
… …
725 783
726 $vbox->add (@dialog); 784 $vbox->add (@dialog);
727 $dialog->show; 785 $dialog->show;
728} 786}
729 787
730sub start_game { 788sub dc_connect {
731 status "logging in..."; 789 my ($host, $port) = @_;
732
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735 790
736 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;
737 792
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 793 $CONN =
743 local $SIG{__DIE__};
744
745 new DC::Protocol 794 new DC::Protocol
746 host => $host, 795 host => $host,
747 port => $port || 13327, 796 port => $port,
748 user => $PROFILE->{user}, 797 user => $PROFILE->{user},
749 pass => $PROFILE->{password}, 798 pass => $PROFILE->{password},
750 mapw => $mapsize, 799 mapw => $mapsize,
751 maph => $mapsize, 800 maph => $mapsize,
752 801
… …
759 query => \&server_query, 808 query => \&server_query,
760 809
761 setup_req => { 810 setup_req => {
762 smoothing => $CFG->{map_smoothing}*1, 811 smoothing => $CFG->{map_smoothing}*1,
763 }, 812 },
764 };
765 813
766 if ($CONN) { 814 on_connect => sub {
815 if ($_[0]) {
767 DC::lowdelay fileno $CONN->{fh}; 816 DC::lowdelay fileno $CONN->{fh};
768 817
769 status "login successful"; 818 status "login successful";
819 } else {
820 undef $CONN;
821 status "unable to connect: $!";
822 stop_game();
823 }
824 },
825 ;
826}
827
828sub start_game {
829 status "logging in...";
830
831 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835
836 $MAP = new DC::Map;
837
838 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl
843 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95";
845 }
846
847 dc_connect $host, $port;
848 };
770 } else { 849 } else {
771 warn $@; 850 dc_connect $host, $port;
772 status "unable to connect";
773 stop_game();
774 } 851 }
775} 852}
776 853
777sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
778 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
779 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
780 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
781 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
782 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
802 881
803 my $row = 0; 882 my $row = 0;
804 883
805 $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");
806 $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,
807 can_events => 1, 886 can_events => 1,
808 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"],
904 ],
905 tooltip => "Choose the User Interface theme that you like most :)",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
907 );
809 908
810 my $vidmode_tooltip = 909 my $vidmode_tooltip =
811 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 910 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
812 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 911 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
813 912
814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
815 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 914 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
816 915
817 $hbox->add (my $mode_slider = new DC::UI::Slider 916 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
818 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 917 force_w => $WIDTH * 0.1, expand => 1,
918 range => [ ($CFG->{sdl_mode}) x 3 ],
819 tooltip => $vidmode_tooltip); 919 tooltip => $vidmode_tooltip);
820 $hbox->add (my $mode_label = new DC::UI::Label 920 $hbox->add (my $mode_label = new DC::UI::Label
821 height => 0.8, template => "9999x9999@9+9", 921 height => 0.8, template => "9999x9999@9+9",
822 can_events => 1, tooltip => $vidmode_tooltip); 922 can_events => 1, tooltip => $vidmode_tooltip);
823 923
824 $mode_slider->connect (changed => sub { 924 $MODE_SLIDER->connect (changed => sub {
825 my ($self, $value) = @_; 925 my ($self, $value) = @_;
826 926
827 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 927 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
828 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 928 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
829 }); 929 });
830 $mode_slider->emit (changed => $mode_slider->{range}[0]); 930 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
831 931
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
833 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 933 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
834 state => $CFG->{fullscreen}, 934 state => $CFG->{fullscreen},
835 tooltip => "Bring the client into fullscreen mode.", 935 tooltip => "Bring the client into fullscreen mode.",
… …
841 state => $CFG->{force_opengl11}, 941 state => $CFG->{force_opengl11},
842 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 942 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
843 . "higher memory usage and slower performance. It will, however, help tremendously on " 943 . "higher memory usage and slower performance. It will, however, help tremendously on "
844 . "cards that claim to support a feature but fall back to software rendering. " 944 . "cards that claim to support a feature but fall back to software rendering. "
845 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 945 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
846 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 946 . "but cards and drivers from other vendors (ATI) are often just as bad. "
847 . "experience extremely low framerates and your card should do better, try this option.</b>", 947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
848 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 948 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
949 );
950
951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
952 $table->add_at (1, $row++, new DC::UI::CheckBox
953 state => $CFG->{disable_alpha},
954 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
955 . "by disabling a number of textures and transparency effects. Normally, these "
956 . "effects do not cost a lot of resources, but some graphics cards might fall "
957 . "back to etxremely slow rendering if this is enabled. If disabling this option "
958 . "noticably improves the framerate of the client please report this! "
959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
960 on_changed => sub {
961 my ($self, $value) = @_;
962 $CFG->{disable_alpha} = $value;
963 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
964 0
965 }
849 ); 966 );
850 967
851 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 968 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
852 $table->add_at (1, $row++, new DC::UI::CheckBox 969 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{texture_compression}, 970 state => $CFG->{texture_compression},
854 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 971 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
855 . "will save a lot of memory and increase performance. The compression algorithm " 972 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
856 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 973 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
857 . "forced OpenGL 1.1 mode.", 974 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 975 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
859 ); 976 );
860 977
861 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
878 on_activate => sub { 995 on_activate => sub {
879 video_shutdown (); 996 video_shutdown ();
880 video_init (); 997 video_init ();
881 0 998 0
882 } 999 }
1000 );
1001
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1003 $table->add_at (1, $row++, new DC::UI::CheckBox
1004 state => $CFG->{smooth_movement},
1005 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1006 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1007 . "then disable this option. Changes take effect immdiately.",
1008 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
883 ); 1009 );
884 1010
885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1011 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
886 $table->add_at (1, $row++, new DC::UI::Slider 1012 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1013 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1527 1 1653 1
1528 }, 1654 },
1529 ); 1655 );
1530 1656
1531 $vbox->add (new DC::UI::FancyFrame 1657 $vbox->add (new DC::UI::FancyFrame
1532 label => "Registering", 1658 label => "How to Play",
1533 min_h => 200, 1659 min_h => 240,
1534 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1660 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1535 markup => 1661 markup =>
1662 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1663 . "Then register a new account (or use an existing one if you have one). "
1536 "To register a new account, choose a username that hasn't been taken yet and " 1664 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1537 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1665 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1538 ), 1666 ),
1539 ); 1667 );
1540 1668
1541 $vbox 1669 $vbox
… …
1687 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1815 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1688 ["Ignore cursed" => PICKUP_NOT_CURSED], 1816 ["Ignore cursed" => PICKUP_NOT_CURSED],
1689 ["Jewelery" => PICKUP_JEWELS], 1817 ["Jewelery" => PICKUP_JEWELS],
1690 ["Flesh" => PICKUP_FLESH], 1818 ["Flesh" => PICKUP_FLESH],
1691 ], 1819 ],
1692 ["Weight/Value ratio", 2, 17] 1820 ["Value/Weight ratio", 2, 17]
1693 ) 1821 )
1694 { 1822 {
1695 my ($title, $x, $y, @bits) = @$_; 1823 my ($title, $x, $y, @bits) = @$_;
1696 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1824 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1697 1825
… …
1722 } 1850 }
1723 1851
1724 $table->add_at (2, 18, new DC::UI::ValSlider 1852 $table->add_at (2, 18, new DC::UI::ValSlider
1725 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1853 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1726 template => ">= 99", 1854 template => ">= 99",
1855 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1727 to_value => sub { ">= " . 5 * $_[0] }, 1856 to_value => sub { ">= " . 5 * $_[0] },
1728 on_changed => sub { 1857 on_changed => sub {
1729 my ($slider, $value) = @_; 1858 my ($slider, $value) = @_;
1730 1859
1731 $::CFG->{pickup} &= ~0xF; 1860 $::CFG->{pickup} &= ~0xF;
… …
1787 $::CFG->{inv_sort} = $_[1]; 1916 $::CFG->{inv_sort} = $_[1];
1788 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1917 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1789 }, 1918 },
1790 ); 1919 );
1791 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1920 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1792 #TODO# update to weigh/maxweight 1921 #TODO# update to weight/maxweight
1793 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1922 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1794 1923
1795 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1924 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1796 $sw1->add ($INV = new DC::UI::Inventory); 1925 $sw1->add ($INV = new DC::UI::Inventory);
1797 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1926 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2061 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2190 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2062 ); 2191 );
2063 $hb->add (new DC::UI::Button 2192 $hb->add (new DC::UI::Button
2064 text => "Quit anyway", 2193 text => "Quit anyway",
2065 expand => 1, 2194 expand => 1,
2066 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2195 on_activate => sub {
2196 crash "Quit anyway";
2197 EV::unloop EV::UNLOOP_ALL;
2198 },
2067 ); 2199 );
2068 } 2200 }
2069 2201
2070 $QUIT_DIALOG->show; 2202 $QUIT_DIALOG->show;
2071 $QUIT_DIALOG->grab_focus; 2203 $QUIT_DIALOG->grab_focus;
… …
2124 $dialog->show; 2256 $dialog->show;
2125 }; 2257 };
2126} 2258}
2127 2259
2128sub sdl_init { 2260sub sdl_init {
2129 DC::SDL_Init 2261 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2130 and die "SDL::Init failed!\n"; 2262 and die "SDL::Init failed!\n";
2131} 2263}
2132 2264
2133sub video_init { 2265sub video_init {
2266 DC::set_theme $CFG->{uitheme};
2267
2268 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2269 $SDL_REINIT = 0;
2270
2271 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2272 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2273 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2274 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2275
2276 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2277
2134 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2278 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2279 $CFG->{sdl_mode} = 0; # lowest resolution by default
2280
2281 # now choose biggest mode <= 1024x768
2282 for (0 .. $#SDL_MODES) {
2283 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2284 $CFG->{sdl_mode} = $_;
2285 }
2286 }
2287 }
2135 2288
2136 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2289 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2137 2290
2138 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2291 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2139 $FULLSCREEN = $CFG->{fullscreen}; 2292 $FULLSCREEN = $CFG->{fullscreen};
2140 $FAST = $CFG->{fast}; 2293 $FAST = $CFG->{fast};
2141 2294
2295 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2142 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2296 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2297 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2143 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2298 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2144 2299
2145 $SDL_ACTIVE = 1; 2300 $SDL_ACTIVE = 1;
2146 $LAST_REFRESH = time - 0.01; 2301 $LAST_REFRESH = time - 0.01;
2147 2302
… …
2323 $BUTTONBAR->show; 2478 $BUTTONBAR->show;
2324 $SETUP_DIALOG->show; 2479 $SETUP_DIALOG->show;
2325 $MESSAGE_WINDOW->show; 2480 $MESSAGE_WINDOW->show;
2326 } 2481 }
2327 2482
2483 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2484 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2485
2486 $CAVEAT_LABEL->set_text ("None :)");
2487 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2488 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2489
2328 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2490 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2329} 2491}
2330 2492
2331sub video_shutdown { 2493sub video_shutdown {
2332 DC::OpenGL::shutdown; 2494 DC::OpenGL::shutdown;
2495 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2333 2496
2334 undef $SDL_ACTIVE; 2497 undef $SDL_ACTIVE;
2335} 2498}
2336 2499
2337my %animate_object; 2500my %animate_object;
… …
2380 delete $animate_object{$widget}; 2543 delete $animate_object{$widget};
2381} 2544}
2382 2545
2383%SDL_CB = ( 2546%SDL_CB = (
2384 DC::SDL_QUIT => sub { 2547 DC::SDL_QUIT => sub {
2548 crash "SDL_QUIT";
2385 EV::unloop EV::UNLOOP_ALL; 2549 EV::unloop EV::UNLOOP_ALL;
2386 }, 2550 },
2387 DC::SDL_VIDEORESIZE => sub { 2551 DC::SDL_VIDEORESIZE => sub {
2388 }, 2552 },
2389 DC::SDL_VIDEOEXPOSE => sub { 2553 DC::SDL_VIDEOEXPOSE => sub {
… …
2398# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2562# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2399 }, 2563 },
2400 DC::SDL_KEYDOWN => sub { 2564 DC::SDL_KEYDOWN => sub {
2401 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2565 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2402 # alt-enter 2566 # alt-enter
2567 video_shutdown;
2403 $FULLSCREEN_ENABLE->toggle; 2568 $FULLSCREEN_ENABLE->toggle;
2404 video_shutdown;
2405 video_init; 2569 video_init;
2406 } else { 2570 } else {
2407 &DC::UI::feed_sdl_key_down_event; 2571 &DC::UI::feed_sdl_key_down_event;
2408 } 2572 }
2409 update_modbox; 2573 update_modbox;
… …
2429$SIG{INT} = $SIG{TERM} = sub { 2593$SIG{INT} = $SIG{TERM} = sub {
2430 EV::unloop; 2594 EV::unloop;
2431 #d# TODO calling exit here hangs the process in some futex 2595 #d# TODO calling exit here hangs the process in some futex
2432}; 2596};
2433 2597
2434{ 2598# due to mac os x + sdl combined briandamage, we need this contortion
2599sub main {
2600 {
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2601 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436 2602
2437 if (-e "$Deliantra::VARDIR/client.cf") { 2603 if (-e "$Deliantra::VARDIR/client.cf") {
2438 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2604 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2439 } else { 2605 } else {
2440 #TODO: compatibility cruft 2606 #TODO: compatibility cruft
2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2607 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2442 print STDERR "INFO: used old configuration file\n"; 2608 print STDERR "INFO: used old configuration file\n";
2443 } 2609 }
2444 2610
2445 DC::DB::Server::run; 2611 DC::DB::Server::run;
2446 2612
2447 if ($CFG->{db_schema} < 1) { 2613 if ($CFG->{db_schema} < 1) {
2448 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2614 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2449 DC::DB::nuke_db; 2615 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1; 2616 $CFG->{db_schema} = 1;
2451 DC::write_cfg; 2617 DC::write_cfg;
2452 } 2618 }
2453 2619
2454 DC::DB::open_db; 2620 DC::DB::open_db;
2455 2621
2456 DC::UI::set_layout ($::CFG->{layout}); 2622 DC::UI::set_layout ($::CFG->{layout});
2457 2623
2458 my %DEF_CFG = ( 2624 my %DEF_CFG = (
2459 sdl_mode => 0, 2625 sdl_mode => undef,
2460 fullscreen => 1, 2626 fullscreen => 1,
2461 fast => 0, 2627 fast => 0,
2462 force_opengl11 => undef, 2628 force_opengl11 => undef,
2629 disable_alpha => 0,
2630 smooth_movement => 1,
2463 texture_compression => 1, 2631 texture_compression => 1,
2464 map_scale => 1, 2632 map_scale => 1,
2465 fow_enable => 1, 2633 fow_enable => 1,
2466 fow_intensity => 0, 2634 fow_intensity => 0,
2467 map_smoothing => 1, 2635 map_smoothing => 1,
2468 gui_fontsize => 1, 2636 gui_fontsize => 1,
2469 log_fontsize => 0.7, 2637 log_fontsize => 0.7,
2470 gauge_fontsize => 1, 2638 gauge_fontsize => 1,
2471 gauge_size => 0.35, 2639 gauge_size => 0.35,
2472 stat_fontsize => 0.7, 2640 stat_fontsize => 0.7,
2473 mapsize => 100, 2641 mapsize => 100,
2474 audio_enable => 1, 2642 audio_enable => 1,
2475 audio_hw_channels => 0, 2643 audio_hw_channels => 0,
2476 audio_hw_frequency => 0, 2644 audio_hw_frequency => 0,
2477 audio_hw_chunksize => 0, 2645 audio_hw_chunksize => 0,
2478 audio_mix_channels => 8, 2646 audio_mix_channels => 8,
2479 effects_enable => 1, 2647 effects_enable => 1,
2480 effects_volume => 1, 2648 effects_volume => 1,
2481 bgm_enable => 1, 2649 bgm_enable => 1,
2482 bgm_volume => 0.5, 2650 bgm_volume => 0.5,
2483 output_rate => "", 2651 output_rate => "",
2484 pickup => 0, 2652 pickup => 0,
2485 inv_sort => "mtime", 2653 inv_sort => "mtime",
2486 default => "profile", # default profile 2654 default => "profile", # default profile
2487 show_tips => 1, 2655 show_tips => 1,
2488 logview_max_par => 1000, 2656 logview_max_par => 1000,
2489 shift_fire_stop => 0, 2657 shift_fire_stop => 0,
2658 uitheme => "wood",
2490 ); 2659 );
2491 2660
2492 while (my ($k, $v) = each %DEF_CFG) { 2661 while (my ($k, $v) = each %DEF_CFG) {
2493 $CFG->{$k} = $v unless exists $CFG->{$k}; 2662 $CFG->{$k} = $v unless exists $CFG->{$k};
2494 } 2663 }
2495 2664
2496 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2665 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2497 $PROFILE = $CFG->{profile}{default}; 2666 $PROFILE = $CFG->{profile}{default};
2498 2667
2499 # convert old bindings (only default profile matters) 2668 # convert old bindings (only default profile matters)
2500 if (my $bindings = delete $PROFILE->{bindings}) { 2669 if (my $bindings = delete $PROFILE->{bindings}) {
2501 while (my ($mod, $syms) = each %$bindings) { 2670 while (my ($mod, $syms) = each %$bindings) {
2502 while (my ($sym, $cmds) = each %$syms) { 2671 while (my ($sym, $cmds) = each %$syms) {
2503 push @{ $PROFILE->{macro} }, { 2672 push @{ $PROFILE->{macro} }, {
2504 accelkey => [$mod*1, $sym*1], 2673 accelkey => [$mod*1, $sym*1],
2505 action => $cmds, 2674 action => $cmds,
2675 };
2506 }; 2676 }
2507 } 2677 }
2508 } 2678 }
2509 }
2510 2679
2511 sdl_init; 2680 sdl_init;
2512 2681
2513 @SDL_MODES = DC::SDL_ListModes 8, 8; 2682 {
2514 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2515 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2516
2517 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2518
2519 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2520
2521 {
2522 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2683 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2523 DejaVuSans.ttf 2684 DejaVuSans.ttf
2524 DejaVuSansMono.ttf 2685 DejaVuSansMono.ttf
2525 DejaVuSans-Bold.ttf 2686 DejaVuSans-Bold.ttf
2526 DejaVuSansMono-Bold.ttf 2687 DejaVuSansMono-Bold.ttf
2527 DejaVuSans-Oblique.ttf 2688 DejaVuSans-Oblique.ttf
2528 DejaVuSansMono-Oblique.ttf 2689 DejaVuSansMono-Oblique.ttf
2529 DejaVuSans-BoldOblique.ttf 2690 DejaVuSans-BoldOblique.ttf
2530 DejaVuSansMono-BoldOblique.ttf 2691 DejaVuSansMono-BoldOblique.ttf
2531 ); 2692 );
2532 2693
2533 DC::add_font $_ for @fonts; 2694 DC::add_font $_ for @fonts;
2534 2695
2535 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2696 $FONT_PROP = new_from_file DC::Font $fonts[0];
2536 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2697 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2537 2698
2538 $FONT_PROP->make_default; 2699 $FONT_PROP->make_default;
2539 2700
2540 DC::pango_init; 2701 DC::pango_init;
2541 } 2702 }
2542 2703
2543# compare mono (ft) vs. rgba (cairo) 2704# compare mono (ft) vs. rgba (cairo)
2544# ft - 1.8s, cairo 3s, even in alpha-only mode 2705# ft - 1.8s, cairo 3s, even in alpha-only mode
2545# for my $rgba (0..1) { 2706# for my $rgba (0..1) {
2546# my $t1 = Time::HiRes::time; 2707# my $t1 = Time::HiRes::time;
… …
2551# } 2712# }
2552# my $t2 = Time::HiRes::time; 2713# my $t2 = Time::HiRes::time;
2553# warn $t2-$t1; 2714# warn $t2-$t1;
2554# } 2715# }
2555 2716
2556 video_init; 2717 video_init;
2557 audio_init; 2718 audio_init;
2558} 2719 }
2559 2720
2560show_tip_of_the_day if $CFG->{show_tips}; 2721 show_tip_of_the_day if $CFG->{show_tips};
2561 2722
2562our $STARTUP_CANCEL = EV::idle sub { 2723 our $STARTUP_CANCEL = EV::idle sub {
2563 undef $::STARTUP_CANCEL; 2724 undef $::STARTUP_CANCEL;
2564 $startup_done->(); 2725 $startup_done->();
2565}; 2726 };
2566 2727
2567delete $SIG{__DIE__}; 2728 delete $SIG{__DIE__};
2568EV::loop; 2729 EV::loop;
2569 2730
2570#video_shutdown; 2731#video_shutdown;
2571#audio_shutdown; 2732#audio_shutdown;
2572DC::OpenGL::quit; 2733 DC::OpenGL::quit;
2573DC::SDL_Quit; 2734 DC::SDL_Quit;
2574DC::DB::Server::stop; 2735 DC::DB::Server::stop;
2736}
2737
2738DC::SDL_braino; # see sub above
2575 2739
2576=head1 NAME 2740=head1 NAME
2577 2741
2578deliantra - A Deliantra MORPG game client 2742deliantra - A Deliantra MORPG game client
2579 2743
… …
2596 4 show fps 2760 4 show fps
2597 8 suppress tooltips 2761 8 suppress tooltips
2598 2762
2599=head1 AUTHOR 2763=head1 AUTHOR
2600 2764
2601Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2765Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2602 2766
2603 2767
2604 2768

Diff Legend

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