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.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.70 by root, Mon Sep 1 15:17:23 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; 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;
… …
199our $INVR; 230our $INVR;
200our $INVR_HB; 231our $INVR_HB;
201 232
202############################################################################# 233#############################################################################
203 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};
259
260#############################################################################
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]);
206} 264}
207 265
208sub debug { 266sub debug {
… …
232 290
233 $markup .= $mod & DC::KMOD_NUM 291 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]" 292 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]"; 293 : "[<span foreground='#888'>num</span>]";
236 294
295 # <tt> around next statement works around some bug that keeps the
296 # "font =>" from being used on windows
237 $MODBOX->set_markup ($markup); 297 $MODBOX->set_markup ("<tt>$markup</tt>");
238} 298}
239 299
240############################################################################# 300#############################################################################
241#TODO: maybe move into own audio module... 301#TODO: maybe move into own audio module...
242 302
… …
662 # right: accept 722 # right: accept
663 $table->add_at (4, 0, new DC::UI::Button 723 $table->add_at (4, 0, new DC::UI::Button
664 text => "Accept", 724 text => "Accept",
665 on_activate => sub { 725 on_activate => sub {
666 $conn->send ("reply n"); 726 $conn->send ("reply n");
667 $STATS_PAGE->hide;
668 destroy_query_dialog $conn; 727 destroy_query_dialog $conn;
669 0 728 0
670 }, 729 },
671 ); 730 );
672 731
… …
724 783
725 $vbox->add (@dialog); 784 $vbox->add (@dialog);
726 $dialog->show; 785 $dialog->show;
727} 786}
728 787
729sub start_game { 788sub dc_connect {
730 status "logging in..."; 789 my ($host, $port) = @_;
731
732 $LOGIN_BUTTON->set_text ("Logout");
733 $SETUP_DIALOG->hide;
734 790
735 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;
736 792
737 my ($host, $port) = split /:/, $PROFILE->{host};
738
739 $MAP = new DC::Map;
740
741 $CONN = eval { 793 $CONN =
742 new DC::Protocol 794 new DC::Protocol
743 host => $host, 795 host => $host,
744 port => $port || 13327, 796 port => $port,
745 user => $PROFILE->{user}, 797 user => $PROFILE->{user},
746 pass => $PROFILE->{password}, 798 pass => $PROFILE->{password},
747 mapw => $mapsize, 799 mapw => $mapsize,
748 maph => $mapsize, 800 maph => $mapsize,
749 801
… …
756 query => \&server_query, 808 query => \&server_query,
757 809
758 setup_req => { 810 setup_req => {
759 smoothing => $CFG->{map_smoothing}*1, 811 smoothing => $CFG->{map_smoothing}*1,
760 }, 812 },
761 };
762 813
763 if ($CONN) { 814 on_connect => sub {
815 if ($_[0]) {
764 DC::lowdelay fileno $CONN->{fh}; 816 DC::lowdelay fileno $CONN->{fh};
765 817
766 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 };
767 } else { 849 } else {
768 status "unable to connect"; 850 dc_connect $host, $port;
769 stop_game();
770 } 851 }
771} 852}
772 853
773sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
774 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
775 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
776 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
777 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
778 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
798 881
799 my $row = 0; 882 my $row = 0;
800 883
801 $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");
802 $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,
803 can_events => 1, 886 can_events => 1,
804 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.");
805 896
806 my $vidmode_tooltip = 897 my $vidmode_tooltip =
807 "<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). "
808 . "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>.";
809 900
810 $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");
811 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 902 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
812 903
813 $hbox->add (my $mode_slider = new DC::UI::Slider 904 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
814 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 ],
815 tooltip => $vidmode_tooltip); 907 tooltip => $vidmode_tooltip);
816 $hbox->add (my $mode_label = new DC::UI::Label 908 $hbox->add (my $mode_label = new DC::UI::Label
817 height => 0.8, template => "9999x9999@9+9", 909 height => 0.8, template => "9999x9999@9+9",
818 can_events => 1, tooltip => $vidmode_tooltip); 910 can_events => 1, tooltip => $vidmode_tooltip);
819 911
820 $mode_slider->connect (changed => sub { 912 $MODE_SLIDER->connect (changed => sub {
821 my ($self, $value) = @_; 913 my ($self, $value) = @_;
822 914
823 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 915 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
824 $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]});
825 }); 917 });
826 $mode_slider->emit (changed => $mode_slider->{range}[0]); 918 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
827 919
828 $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");
829 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
830 state => $CFG->{fullscreen}, 922 state => $CFG->{fullscreen},
831 tooltip => "Bring the client into fullscreen mode.", 923 tooltip => "Bring the client into fullscreen mode.",
… …
837 state => $CFG->{force_opengl11}, 929 state => $CFG->{force_opengl11},
838 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 "
839 . "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 "
840 . "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. "
841 . "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, "
842 . "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. "
843 . "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>",
844 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 }
845 ); 954 );
846 955
847 $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");
848 $table->add_at (1, $row++, new DC::UI::CheckBox 957 $table->add_at (1, $row++, new DC::UI::CheckBox
849 state => $CFG->{texture_compression}, 958 state => $CFG->{texture_compression},
850 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 "
851 . "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). "
852 . "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 "
853 . "forced OpenGL 1.1 mode.", 962 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
854 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 963 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
855 ); 964 );
856 965
857 $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");
858 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
874 on_activate => sub { 983 on_activate => sub {
875 video_shutdown (); 984 video_shutdown ();
876 video_init (); 985 video_init ();
877 0 986 0
878 } 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 }
879 ); 997 );
880 998
881 $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");
882 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
883 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1001 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1523 1 1641 1
1524 }, 1642 },
1525 ); 1643 );
1526 1644
1527 $vbox->add (new DC::UI::FancyFrame 1645 $vbox->add (new DC::UI::FancyFrame
1528 label => "Registering", 1646 label => "How to Play",
1529 min_h => 200, 1647 min_h => 240,
1530 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1648 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1531 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). "
1532 "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 "
1533 . "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.",
1534 ), 1654 ),
1535 ); 1655 );
1536 1656
1537 $vbox 1657 $vbox
… …
1618 $CFG->{show_tips} = $value; 1738 $CFG->{show_tips} = $value;
1619 0 1739 0
1620 } 1740 }
1621 ); 1741 );
1622 1742
1623 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1743 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1624 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1744 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1625 text => $CFG->{logview_max_par}, 1745 text => $CFG->{logview_max_par},
1626 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1746 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1627 . "sends more messages than this number, older messages get removed to save memory and " 1747 . "sends more messages than this number, older messages get removed to save memory and "
1628 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1748 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1629 on_changed => sub { 1749 on_changed => sub {
1630 my ($self, $value) = @_; 1750 my ($self, $value) = @_;
1631 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1751 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1683 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1803 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1684 ["Ignore cursed" => PICKUP_NOT_CURSED], 1804 ["Ignore cursed" => PICKUP_NOT_CURSED],
1685 ["Jewelery" => PICKUP_JEWELS], 1805 ["Jewelery" => PICKUP_JEWELS],
1686 ["Flesh" => PICKUP_FLESH], 1806 ["Flesh" => PICKUP_FLESH],
1687 ], 1807 ],
1688 ["Weight/Value ratio", 2, 17] 1808 ["Value/Weight ratio", 2, 17]
1689 ) 1809 )
1690 { 1810 {
1691 my ($title, $x, $y, @bits) = @$_; 1811 my ($title, $x, $y, @bits) = @$_;
1692 $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]);
1693 1813
… …
1718 } 1838 }
1719 1839
1720 $table->add_at (2, 18, new DC::UI::ValSlider 1840 $table->add_at (2, 18, new DC::UI::ValSlider
1721 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1841 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1722 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).",
1723 to_value => sub { ">= " . 5 * $_[0] }, 1844 to_value => sub { ">= " . 5 * $_[0] },
1724 on_changed => sub { 1845 on_changed => sub {
1725 my ($slider, $value) = @_; 1846 my ($slider, $value) = @_;
1726 1847
1727 $::CFG->{pickup} &= ~0xF; 1848 $::CFG->{pickup} &= ~0xF;
… …
1740 1861
1741 $r 1862 $r
1742} 1863}
1743 1864
1744my %SORT_ORDER = ( 1865my %SORT_ORDER = (
1745 type => undef, 1866 type => sub {
1867 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1868 },
1746 mtime => sub { 1869 mtime => sub {
1747 my $NOW = time; 1870 my $NOW = time;
1748 sort { 1871 sort {
1749 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1872 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1750 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1873 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1781 $::CFG->{inv_sort} = $_[1]; 1904 $::CFG->{inv_sort} = $_[1];
1782 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1905 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1783 }, 1906 },
1784 ); 1907 );
1785 $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);
1786 #TODO# update to weigh/maxweight 1909 #TODO# update to weight/maxweight
1787 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1910 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1788 1911
1789 $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);
1790 $sw1->add ($INV = new DC::UI::Inventory); 1913 $sw1->add ($INV = new DC::UI::Inventory);
1791 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1914 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1972 my @path = DC::Pod::full_path_of $node; 2095 my @path = DC::Pod::full_path_of $node;
1973 pop @path; # drop current node 2096 pop @path; # drop current node
1974 2097
1975 for my $node (@path) { 2098 for my $node (@path) {
1976 $buttons->add (new DC::UI::Button 2099 $buttons->add (new DC::UI::Button
1977 text => $node->{kw}[0], 2100 text => $node->[DC::Pod::N_KW][0],
1978 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2101 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1979 on_activate => sub { 2102 on_activate => sub {
1980 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2103 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1981 $load_node->($node); 2104 $load_node->($node);
1982 }, 2105 },
1983 ); 2106 );
1984 $buttons->add (new DC::UI::Label text => "/"); 2107 $buttons->add (new DC::UI::Label text => "/");
1985 } 2108 }
1986 2109
1987 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2110 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1988 2111
1989 $curnode = $node; 2112 $curnode = $node;
1990 2113
1991 $viewer->clear; 2114 $viewer->clear;
1992 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2115 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2055 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2178 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2056 ); 2179 );
2057 $hb->add (new DC::UI::Button 2180 $hb->add (new DC::UI::Button
2058 text => "Quit anyway", 2181 text => "Quit anyway",
2059 expand => 1, 2182 expand => 1,
2060 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2183 on_activate => sub {
2184 crash "Quit anyway";
2185 EV::unloop EV::UNLOOP_ALL;
2186 },
2061 ); 2187 );
2062 } 2188 }
2063 2189
2064 $QUIT_DIALOG->show; 2190 $QUIT_DIALOG->show;
2065 $QUIT_DIALOG->grab_focus; 2191 $QUIT_DIALOG->grab_focus;
… …
2118 $dialog->show; 2244 $dialog->show;
2119 }; 2245 };
2120} 2246}
2121 2247
2122sub sdl_init { 2248sub sdl_init {
2123 DC::SDL_Init 2249 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2124 and die "SDL::Init failed!\n"; 2250 and die "SDL::Init failed!\n";
2125} 2251}
2126 2252
2127sub video_init { 2253sub video_init {
2254 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2255 $SDL_REINIT = 0;
2256
2257 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2258 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2259 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2260 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2261
2262 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2263
2128 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2264 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2265 $CFG->{sdl_mode} = 0; # lowest resolution by default
2266
2267 # now choose biggets mode <= 1024x768
2268 for (0 .. $#SDL_MODES) {
2269 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2270 $CFG->{sdl_mode} = $_;
2271 }
2272 }
2273 }
2129 2274
2130 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2275 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2131 2276
2132 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2277 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2133 $FULLSCREEN = $CFG->{fullscreen}; 2278 $FULLSCREEN = $CFG->{fullscreen};
2134 $FAST = $CFG->{fast}; 2279 $FAST = $CFG->{fast};
2135 2280
2281 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2136 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2282 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2283 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2137 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2284 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2138 2285
2139 $SDL_ACTIVE = 1; 2286 $SDL_ACTIVE = 1;
2140 $LAST_REFRESH = time - 0.01; 2287 $LAST_REFRESH = time - 0.01;
2141 2288
… …
2178 can_events => 1, 2325 can_events => 1,
2179 can_hover => 1, 2326 can_hover => 1,
2180 markup => "", 2327 markup => "",
2181 align => 0, 2328 align => 0,
2182 font => $FONT_FIXED, 2329 font => $FONT_FIXED,
2183 tooltip => "#modifier_box"; 2330 tooltip => "#modifier_box",
2331 tooltip_width => 0.67,
2332 ;
2184 2333
2185 update_modbox; 2334 update_modbox;
2186 2335
2187 (new DC::UI::Frame 2336 (new DC::UI::Frame
2188 bg => [0, 0, 0, 0.4], 2337 bg => [0, 0, 0, 0.4],
… …
2237 force_h => $::HEIGHT * 0.6, 2386 force_h => $::HEIGHT * 0.6,
2238 has_close_button => 1, 2387 has_close_button => 1,
2239 ; 2388 ;
2240 2389
2241 $METASERVER = metaserver_dialog; 2390 $METASERVER = metaserver_dialog;
2242 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2391 # the name is changed to not conflict with the older name as users could have hidden it
2392 $MESSAGE_WINDOW = new DC::UI::Dockbar
2393 name => "message_window2",
2394 title => 'Messages',
2395 force_w => $::WIDTH * 0.6,
2396 force_h => $::HEIGHT * 0.25,
2397 ;
2398
2243 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2399 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2244 2400
2245 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2401 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2246 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2402 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2247 2403
2248 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2404 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2249 "Configure the server to play on, your username and password."); 2405 "Configure the server to play on, your username and password.");
2250 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2406 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2268 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2424 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2269 2425
2270 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2426 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2271 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2427 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2272 2428
2273 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2429# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2274 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2430# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2275 2431
2276 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2432 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2277 2433
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2434 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2279 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2435 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2281 $BUTTONBAR->add (new DC::UI::Button 2437 $BUTTONBAR->add (new DC::UI::Button
2282 text => "Save Config", 2438 text => "Save Config",
2283 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2439 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2284 on_activate => sub { 2440 on_activate => sub {
2285 $::CFG->{layout} = DC::UI::get_layout; 2441 $::CFG->{layout} = DC::UI::get_layout;
2286 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2442 DC::write_cfg;
2287 status "Configuration Saved"; 2443 status "Configuration Saved";
2288 0 2444 0
2289 }, 2445 },
2290 ); 2446 );
2291 2447
2292 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2448 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2293 tooltip => "View Documentation"); 2449 tooltip => "View Documentation");
2294
2295 2450
2296 $BUTTONBAR->add (new DC::UI::Button 2451 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Quit", 2452 text => "Quit",
2298 tooltip => "Terminates the program", 2453 tooltip => "Terminates the program",
2299 on_activate => sub { 2454 on_activate => sub {
… …
2309 $BUTTONBAR->show; 2464 $BUTTONBAR->show;
2310 $SETUP_DIALOG->show; 2465 $SETUP_DIALOG->show;
2311 $MESSAGE_WINDOW->show; 2466 $MESSAGE_WINDOW->show;
2312 } 2467 }
2313 2468
2469 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2470 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2471
2472 $CAVEAT_LABEL->set_text ("None :)");
2473 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2474 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2475
2314 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2476 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2315} 2477}
2316 2478
2317sub video_shutdown { 2479sub video_shutdown {
2318 DC::OpenGL::shutdown; 2480 DC::OpenGL::shutdown;
2481 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2319 2482
2320 undef $SDL_ACTIVE; 2483 undef $SDL_ACTIVE;
2321} 2484}
2322 2485
2323my %animate_object; 2486my %animate_object;
… …
2366 delete $animate_object{$widget}; 2529 delete $animate_object{$widget};
2367} 2530}
2368 2531
2369%SDL_CB = ( 2532%SDL_CB = (
2370 DC::SDL_QUIT => sub { 2533 DC::SDL_QUIT => sub {
2534 crash "SDL_QUIT";
2371 EV::unloop EV::UNLOOP_ALL; 2535 EV::unloop EV::UNLOOP_ALL;
2372 }, 2536 },
2373 DC::SDL_VIDEORESIZE => sub { 2537 DC::SDL_VIDEORESIZE => sub {
2374 }, 2538 },
2375 DC::SDL_VIDEOEXPOSE => sub { 2539 DC::SDL_VIDEOEXPOSE => sub {
… …
2384# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2548# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2385 }, 2549 },
2386 DC::SDL_KEYDOWN => sub { 2550 DC::SDL_KEYDOWN => sub {
2387 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2551 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2388 # alt-enter 2552 # alt-enter
2553 video_shutdown;
2389 $FULLSCREEN_ENABLE->toggle; 2554 $FULLSCREEN_ENABLE->toggle;
2390 video_shutdown;
2391 video_init; 2555 video_init;
2392 } else { 2556 } else {
2393 &DC::UI::feed_sdl_key_down_event; 2557 &DC::UI::feed_sdl_key_down_event;
2394 } 2558 }
2395 update_modbox; 2559 update_modbox;
… …
2415$SIG{INT} = $SIG{TERM} = sub { 2579$SIG{INT} = $SIG{TERM} = sub {
2416 EV::unloop; 2580 EV::unloop;
2417 #d# TODO calling exit here hangs the process in some futex 2581 #d# TODO calling exit here hangs the process in some futex
2418}; 2582};
2419 2583
2420{ 2584# due to mac os x + sdl combined briandamage, we need this contortion
2585sub main {
2586 {
2587 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2588
2421 if (-e "$Deliantra::VARDIR/client.cf") { 2589 if (-e "$Deliantra::VARDIR/client.cf") {
2422 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2590 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2423 } else { 2591 } else {
2424 #TODO: compatibility cruft 2592 #TODO: compatibility cruft
2425 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2593 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2426 print STDERR "INFO: used old configuration file\n"; 2594 print STDERR "INFO: used old configuration file\n";
2427 } 2595 }
2428 2596
2429 DC::DB::Server::run; 2597 DC::DB::Server::run;
2430 2598
2599 if ($CFG->{db_schema} < 1) {
2600 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2601 DC::DB::nuke_db;
2602 $CFG->{db_schema} = 1;
2603 DC::write_cfg;
2604 }
2605
2606 DC::DB::open_db;
2607
2431 DC::UI::set_layout ($::CFG->{layout}); 2608 DC::UI::set_layout ($::CFG->{layout});
2432 2609
2433 my %DEF_CFG = ( 2610 my %DEF_CFG = (
2434 sdl_mode => 0, 2611 sdl_mode => undef,
2435 fullscreen => 1, 2612 fullscreen => 1,
2436 fast => 0, 2613 fast => 0,
2437 force_opengl11 => undef, 2614 force_opengl11 => undef,
2615 disable_alpha => 0,
2616 smooth_movement => 1,
2438 texture_compression => 1, 2617 texture_compression => 1,
2439 map_scale => 1, 2618 map_scale => 1,
2440 fow_enable => 1, 2619 fow_enable => 1,
2441 fow_intensity => 0, 2620 fow_intensity => 0,
2442 map_smoothing => 1, 2621 map_smoothing => 1,
2443 gui_fontsize => 1, 2622 gui_fontsize => 1,
2444 log_fontsize => 0.7, 2623 log_fontsize => 0.7,
2445 gauge_fontsize => 1, 2624 gauge_fontsize => 1,
2446 gauge_size => 0.35, 2625 gauge_size => 0.35,
2447 stat_fontsize => 0.7, 2626 stat_fontsize => 0.7,
2448 mapsize => 100, 2627 mapsize => 100,
2449 audio_enable => 1, 2628 audio_enable => 1,
2450 audio_hw_channels => 0, 2629 audio_hw_channels => 0,
2451 audio_hw_frequency => 0, 2630 audio_hw_frequency => 0,
2452 audio_hw_chunksize => 0, 2631 audio_hw_chunksize => 0,
2453 audio_mix_channels => 8, 2632 audio_mix_channels => 8,
2454 effects_enable => 1, 2633 effects_enable => 1,
2455 effects_volume => 1, 2634 effects_volume => 1,
2456 bgm_enable => 1, 2635 bgm_enable => 1,
2457 bgm_volume => 0.5, 2636 bgm_volume => 0.5,
2458 output_rate => "", 2637 output_rate => "",
2459 pickup => 0, 2638 pickup => 0,
2460 inv_sort => "mtime", 2639 inv_sort => "mtime",
2461 default => "profile", # default profile 2640 default => "profile", # default profile
2462 show_tips => 1, 2641 show_tips => 1,
2463 logview_max_par => 1000, 2642 logview_max_par => 1000,
2643 shift_fire_stop => 0,
2464 ); 2644 );
2465 2645
2466 while (my ($k, $v) = each %DEF_CFG) { 2646 while (my ($k, $v) = each %DEF_CFG) {
2467 $CFG->{$k} = $v unless exists $CFG->{$k}; 2647 $CFG->{$k} = $v unless exists $CFG->{$k};
2468 } 2648 }
2469 2649
2470 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2650 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2471 $PROFILE = $CFG->{profile}{default}; 2651 $PROFILE = $CFG->{profile}{default};
2472 2652
2473 # convert old bindings (only default profile matters) 2653 # convert old bindings (only default profile matters)
2474 if (my $bindings = delete $PROFILE->{bindings}) { 2654 if (my $bindings = delete $PROFILE->{bindings}) {
2475 while (my ($mod, $syms) = each %$bindings) { 2655 while (my ($mod, $syms) = each %$bindings) {
2476 while (my ($sym, $cmds) = each %$syms) { 2656 while (my ($sym, $cmds) = each %$syms) {
2477 push @{ $PROFILE->{macro} }, { 2657 push @{ $PROFILE->{macro} }, {
2478 accelkey => [$mod*1, $sym*1], 2658 accelkey => [$mod*1, $sym*1],
2479 action => $cmds, 2659 action => $cmds,
2660 };
2480 }; 2661 }
2481 } 2662 }
2482 } 2663 }
2483 }
2484 2664
2485 sdl_init; 2665 sdl_init;
2486 2666
2487 @SDL_MODES = DC::SDL_ListModes 8, 8; 2667 {
2488 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2489 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2490
2491 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2492
2493 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2494
2495 {
2496 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2668 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2497 DejaVuSans.ttf 2669 DejaVuSans.ttf
2498 DejaVuSansMono.ttf 2670 DejaVuSansMono.ttf
2499 DejaVuSans-Bold.ttf 2671 DejaVuSans-Bold.ttf
2500 DejaVuSansMono-Bold.ttf 2672 DejaVuSansMono-Bold.ttf
2501 DejaVuSans-Oblique.ttf 2673 DejaVuSans-Oblique.ttf
2502 DejaVuSansMono-Oblique.ttf 2674 DejaVuSansMono-Oblique.ttf
2503 DejaVuSans-BoldOblique.ttf 2675 DejaVuSans-BoldOblique.ttf
2504 DejaVuSansMono-BoldOblique.ttf 2676 DejaVuSansMono-BoldOblique.ttf
2505 ); 2677 );
2506 2678
2507 DC::add_font $_ for @fonts; 2679 DC::add_font $_ for @fonts;
2508 2680
2509 DC::pango_init;
2510
2511 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2681 $FONT_PROP = new_from_file DC::Font $fonts[0];
2512 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2682 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2513 2683
2514 $FONT_PROP->make_default; 2684 $FONT_PROP->make_default;
2515 } 2685
2686 DC::pango_init;
2687 }
2516 2688
2517# compare mono (ft) vs. rgba (cairo) 2689# compare mono (ft) vs. rgba (cairo)
2518# ft - 1.8s, cairo 3s, even in alpha-only mode 2690# ft - 1.8s, cairo 3s, even in alpha-only mode
2519# for my $rgba (0..1) { 2691# for my $rgba (0..1) {
2520# my $t1 = Time::HiRes::time; 2692# my $t1 = Time::HiRes::time;
… …
2525# } 2697# }
2526# my $t2 = Time::HiRes::time; 2698# my $t2 = Time::HiRes::time;
2527# warn $t2-$t1; 2699# warn $t2-$t1;
2528# } 2700# }
2529 2701
2530 video_init; 2702 video_init;
2531 audio_init; 2703 audio_init;
2532} 2704 }
2533 2705
2534show_tip_of_the_day if $CFG->{show_tips}; 2706 show_tip_of_the_day if $CFG->{show_tips};
2535 2707
2536our $STARTUP_CANCEL = EV::idle sub { 2708 our $STARTUP_CANCEL = EV::idle sub {
2537 undef $::STARTUP_CANCEL; 2709 undef $::STARTUP_CANCEL;
2538 $startup_done->(); 2710 $startup_done->();
2539}; 2711 };
2540 2712
2713 delete $SIG{__DIE__};
2541EV::loop; 2714 EV::loop;
2542 2715
2543#video_shutdown; 2716#video_shutdown;
2544#audio_shutdown; 2717#audio_shutdown;
2545DC::OpenGL::quit; 2718 DC::OpenGL::quit;
2546DC::SDL_Quit; 2719 DC::SDL_Quit;
2547DC::DB::Server::stop; 2720 DC::DB::Server::stop;
2721}
2722
2723DC::SDL_braino; # see sub above
2548 2724
2549=head1 NAME 2725=head1 NAME
2550 2726
2551deliantra - A Deliantra MORPG game client 2727deliantra - A Deliantra MORPG game client
2552 2728
… …
2569 4 show fps 2745 4 show fps
2570 8 suppress tooltips 2746 8 suppress tooltips
2571 2747
2572=head1 AUTHOR 2748=head1 AUTHOR
2573 2749
2574Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2750Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2575 2751
2576 2752
2577 2753

Diff Legend

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