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

Diff Legend

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