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.31 by root, Tue Mar 25 02:12:35 2008 UTC vs.
Revision 1.76 by root, Wed Sep 3 12:50:43 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;
… …
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]);
… …
664 # right: accept 722 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 723 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 724 text => "Accept",
667 on_activate => sub { 725 on_activate => sub {
668 $conn->send ("reply n"); 726 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 727 destroy_query_dialog $conn;
671 0 728 0
672 }, 729 },
673 ); 730 );
674 731
… …
726 783
727 $vbox->add (@dialog); 784 $vbox->add (@dialog);
728 $dialog->show; 785 $dialog->show;
729} 786}
730 787
731sub start_game { 788sub dc_connect {
732 status "logging in..."; 789 my ($host, $port) = @_;
733
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736 790
737 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;
738 792
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 793 $CONN =
744 new DC::Protocol 794 new DC::Protocol
745 host => $host, 795 host => $host,
746 port => $port || 13327, 796 port => $port,
747 user => $PROFILE->{user}, 797 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 798 pass => $PROFILE->{password},
749 mapw => $mapsize, 799 mapw => $mapsize,
750 maph => $mapsize, 800 maph => $mapsize,
751 801
… …
758 query => \&server_query, 808 query => \&server_query,
759 809
760 setup_req => { 810 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 811 smoothing => $CFG->{map_smoothing}*1,
762 }, 812 },
763 };
764 813
765 if ($CONN) { 814 on_connect => sub {
815 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 816 DC::lowdelay fileno $CONN->{fh};
767 817
768 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 };
769 } else { 849 } else {
770 status "unable to connect"; 850 dc_connect $host, $port;
771 stop_game();
772 } 851 }
773} 852}
774 853
775sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
776 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
800 881
801 my $row = 0; 882 my $row = 0;
802 883
803 $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");
804 $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,
805 can_events => 1, 886 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
890 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as "
893 . "a non-accelerated display format. You can try to work around these issues "
894 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card.");
896
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
898 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme},
900 options => [
901 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"],
903 [blue => "Blue (dark)"],
904 [metal => "Metal (light)"],
905 ],
906 tooltip => "Choose the User Interface theme that you like most :)",
907 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
908 );
807 909
808 my $vidmode_tooltip = 910 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 911 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 912 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 913
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 915 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 916
815 $hbox->add (my $mode_slider = new DC::UI::Slider 917 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 918 force_w => $WIDTH * 0.1, expand => 1,
919 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 920 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 921 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 922 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 923 can_events => 1, tooltip => $vidmode_tooltip);
821 924
822 $mode_slider->connect (changed => sub { 925 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 926 my ($self, $value) = @_;
824 927
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 928 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 929 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 930 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 931 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 932
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 934 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 935 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 936 tooltip => "Bring the client into fullscreen mode.",
… …
839 state => $CFG->{force_opengl11}, 942 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 943 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 944 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 945 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 946 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 947 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 949 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
950 );
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
953 $table->add_at (1, $row++, new DC::UI::CheckBox
954 state => $CFG->{disable_alpha},
955 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
956 . "by disabling a number of textures and transparency effects. Normally, these "
957 . "effects do not cost a lot of resources, but some graphics cards might fall "
958 . "back to etxremely slow rendering if this is enabled. If disabling this option "
959 . "noticably improves the framerate of the client please report this! "
960 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
961 on_changed => sub {
962 my ($self, $value) = @_;
963 $CFG->{disable_alpha} = $value;
964 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
965 0
966 }
847 ); 967 );
848 968
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 970 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 971 state => $CFG->{texture_compression},
852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 972 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
853 . "will save a lot of memory and increase performance. The compression algorithm " 973 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
854 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 974 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
855 . "forced OpenGL 1.1 mode.", 975 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 976 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 977 );
858 978
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 979 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 980 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
876 on_activate => sub { 996 on_activate => sub {
877 video_shutdown (); 997 video_shutdown ();
878 video_init (); 998 video_init ();
879 0 999 0
880 } 1000 }
1001 );
1002
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1004 $table->add_at (1, $row++, new DC::UI::CheckBox
1005 state => $CFG->{smooth_movement},
1006 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1007 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1008 . "then disable this option. Changes take effect immdiately.",
1009 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 1010 );
882 1011
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 1013 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1014 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1525 1 1654 1
1526 }, 1655 },
1527 ); 1656 );
1528 1657
1529 $vbox->add (new DC::UI::FancyFrame 1658 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1659 label => "How to Play",
1531 min_h => 200, 1660 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1661 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 markup => 1662 markup =>
1663 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1664 . "Then register a new account (or use an existing one if you have one). "
1534 "To register a new account, choose a username that hasn't been taken yet and " 1665 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1535 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1666 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1536 ), 1667 ),
1537 ); 1668 );
1538 1669
1539 $vbox 1670 $vbox
… …
1620 $CFG->{show_tips} = $value; 1751 $CFG->{show_tips} = $value;
1621 0 1752 0
1622 } 1753 }
1623 ); 1754 );
1624 1755
1625 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1756 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1757 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1627 text => $CFG->{logview_max_par}, 1758 text => $CFG->{logview_max_par},
1628 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1759 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1629 . "sends more messages than this number, older messages get removed to save memory and " 1760 . "sends more messages than this number, older messages get removed to save memory and "
1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1761 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1631 on_changed => sub { 1762 on_changed => sub {
1632 my ($self, $value) = @_; 1763 my ($self, $value) = @_;
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1764 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1816 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1817 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1818 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1819 ["Flesh" => PICKUP_FLESH],
1689 ], 1820 ],
1690 ["Weight/Value ratio", 2, 17] 1821 ["Value/Weight ratio", 2, 17]
1691 ) 1822 )
1692 { 1823 {
1693 my ($title, $x, $y, @bits) = @$_; 1824 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1825 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1826
… …
1720 } 1851 }
1721 1852
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1853 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1854 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1855 template => ">= 99",
1856 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1857 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1858 on_changed => sub {
1727 my ($slider, $value) = @_; 1859 my ($slider, $value) = @_;
1728 1860
1729 $::CFG->{pickup} &= ~0xF; 1861 $::CFG->{pickup} &= ~0xF;
… …
1742 1874
1743 $r 1875 $r
1744} 1876}
1745 1877
1746my %SORT_ORDER = ( 1878my %SORT_ORDER = (
1747 type => undef, 1879 type => sub {
1880 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1881 },
1748 mtime => sub { 1882 mtime => sub {
1749 my $NOW = time; 1883 my $NOW = time;
1750 sort { 1884 sort {
1751 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1885 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1752 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1886 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1783 $::CFG->{inv_sort} = $_[1]; 1917 $::CFG->{inv_sort} = $_[1];
1784 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1918 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1785 }, 1919 },
1786 ); 1920 );
1787 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1921 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1788 #TODO# update to weigh/maxweight 1922 #TODO# update to weight/maxweight
1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1923 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1790 1924
1791 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1925 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 $sw1->add ($INV = new DC::UI::Inventory); 1926 $sw1->add ($INV = new DC::UI::Inventory);
1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1927 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2057 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2191 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2058 ); 2192 );
2059 $hb->add (new DC::UI::Button 2193 $hb->add (new DC::UI::Button
2060 text => "Quit anyway", 2194 text => "Quit anyway",
2061 expand => 1, 2195 expand => 1,
2062 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2196 on_activate => sub {
2197 crash "Quit anyway";
2198 EV::unloop EV::UNLOOP_ALL;
2199 },
2063 ); 2200 );
2064 } 2201 }
2065 2202
2066 $QUIT_DIALOG->show; 2203 $QUIT_DIALOG->show;
2067 $QUIT_DIALOG->grab_focus; 2204 $QUIT_DIALOG->grab_focus;
… …
2120 $dialog->show; 2257 $dialog->show;
2121 }; 2258 };
2122} 2259}
2123 2260
2124sub sdl_init { 2261sub sdl_init {
2125 DC::SDL_Init 2262 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2126 and die "SDL::Init failed!\n"; 2263 and die "SDL::Init failed!\n";
2127} 2264}
2128 2265
2129sub video_init { 2266sub video_init {
2267 DC::set_theme $CFG->{uitheme};
2268
2269 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2270 $SDL_REINIT = 0;
2271
2272 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2273 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2274 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2275 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2276
2277 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2278
2130 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2279 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2280 $CFG->{sdl_mode} = 0; # lowest resolution by default
2281
2282 # now choose biggest mode <= 1024x768
2283 for (0 .. $#SDL_MODES) {
2284 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2285 $CFG->{sdl_mode} = $_;
2286 }
2287 }
2288 }
2131 2289
2132 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2290 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2133 2291
2134 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2292 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2135 $FULLSCREEN = $CFG->{fullscreen}; 2293 $FULLSCREEN = $CFG->{fullscreen};
2136 $FAST = $CFG->{fast}; 2294 $FAST = $CFG->{fast};
2137 2295
2296 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2138 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2297 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2298 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2139 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2299 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2140 2300
2141 $SDL_ACTIVE = 1; 2301 $SDL_ACTIVE = 1;
2142 $LAST_REFRESH = time - 0.01; 2302 $LAST_REFRESH = time - 0.01;
2143 2303
… …
2210 x => 0, 2370 x => 0,
2211 y => $FONTSIZE + 8, 2371 y => $FONTSIZE + 8,
2212 border_bg => [1, 1, 1, 192/255], 2372 border_bg => [1, 1, 1, 192/255],
2213 bg => [1, 1, 1, 0], 2373 bg => [1, 1, 1, 0],
2214 child => ($MAPMAP = new DC::MapWidget::MapMap 2374 child => ($MAPMAP = new DC::MapWidget::MapMap
2215 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2375 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2216 ), 2376 ),
2217 )->show; 2377 )->show;
2218 2378
2219 $MAPWIDGET = new DC::MapWidget; 2379 $MAPWIDGET = new DC::MapWidget;
2220 $MAPWIDGET->connect (activate_console => sub { 2380 $MAPWIDGET->connect (activate_console => sub {
… …
2241 force_h => $::HEIGHT * 0.6, 2401 force_h => $::HEIGHT * 0.6,
2242 has_close_button => 1, 2402 has_close_button => 1,
2243 ; 2403 ;
2244 2404
2245 $METASERVER = metaserver_dialog; 2405 $METASERVER = metaserver_dialog;
2246 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2406 # the name is changed to not conflict with the older name as users could have hidden it
2407 $MESSAGE_WINDOW = new DC::UI::Dockbar
2408 name => "message_window2",
2409 title => 'Messages',
2410 force_w => $::WIDTH * 0.6,
2411 force_h => $::HEIGHT * 0.25,
2412 ;
2413
2247 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2414 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2248 2415
2249 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2416 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2250 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2417 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2251 2418
2252 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2419 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2253 "Configure the server to play on, your username and password."); 2420 "Configure the server to play on, your username and password.");
2254 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2421 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2272 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2439 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2273 2440
2274 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2275 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2442 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2276 2443
2277 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2444# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2278 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2445# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2279 2446
2280 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 2447 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
2281 2448
2282 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2449 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2283 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2450 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2285 $BUTTONBAR->add (new DC::UI::Button 2452 $BUTTONBAR->add (new DC::UI::Button
2286 text => "Save Config", 2453 text => "Save Config",
2287 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2454 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2288 on_activate => sub { 2455 on_activate => sub {
2289 $::CFG->{layout} = DC::UI::get_layout; 2456 $::CFG->{layout} = DC::UI::get_layout;
2290 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2457 DC::write_cfg;
2291 status "Configuration Saved"; 2458 status "Configuration Saved";
2292 0 2459 0
2293 }, 2460 },
2294 ); 2461 );
2295 2462
2296 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2463 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2297 tooltip => "View Documentation"); 2464 tooltip => "View Documentation");
2298
2299 2465
2300 $BUTTONBAR->add (new DC::UI::Button 2466 $BUTTONBAR->add (new DC::UI::Button
2301 text => "Quit", 2467 text => "Quit",
2302 tooltip => "Terminates the program", 2468 tooltip => "Terminates the program",
2303 on_activate => sub { 2469 on_activate => sub {
… …
2313 $BUTTONBAR->show; 2479 $BUTTONBAR->show;
2314 $SETUP_DIALOG->show; 2480 $SETUP_DIALOG->show;
2315 $MESSAGE_WINDOW->show; 2481 $MESSAGE_WINDOW->show;
2316 } 2482 }
2317 2483
2484 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2485 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2486
2487 $CAVEAT_LABEL->set_text ("None :)");
2488 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2489 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2490
2318 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2491 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2319} 2492}
2320 2493
2321sub video_shutdown { 2494sub video_shutdown {
2322 DC::OpenGL::shutdown; 2495 DC::OpenGL::shutdown;
2496 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2323 2497
2324 undef $SDL_ACTIVE; 2498 undef $SDL_ACTIVE;
2325} 2499}
2326 2500
2327my %animate_object; 2501my %animate_object;
… …
2370 delete $animate_object{$widget}; 2544 delete $animate_object{$widget};
2371} 2545}
2372 2546
2373%SDL_CB = ( 2547%SDL_CB = (
2374 DC::SDL_QUIT => sub { 2548 DC::SDL_QUIT => sub {
2549 crash "SDL_QUIT";
2375 EV::unloop EV::UNLOOP_ALL; 2550 EV::unloop EV::UNLOOP_ALL;
2376 }, 2551 },
2377 DC::SDL_VIDEORESIZE => sub { 2552 DC::SDL_VIDEORESIZE => sub {
2378 }, 2553 },
2379 DC::SDL_VIDEOEXPOSE => sub { 2554 DC::SDL_VIDEOEXPOSE => sub {
… …
2388# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2563# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2389 }, 2564 },
2390 DC::SDL_KEYDOWN => sub { 2565 DC::SDL_KEYDOWN => sub {
2391 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2566 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2392 # alt-enter 2567 # alt-enter
2568 video_shutdown;
2393 $FULLSCREEN_ENABLE->toggle; 2569 $FULLSCREEN_ENABLE->toggle;
2394 video_shutdown;
2395 video_init; 2570 video_init;
2396 } else { 2571 } else {
2397 &DC::UI::feed_sdl_key_down_event; 2572 &DC::UI::feed_sdl_key_down_event;
2398 } 2573 }
2399 update_modbox; 2574 update_modbox;
… …
2419$SIG{INT} = $SIG{TERM} = sub { 2594$SIG{INT} = $SIG{TERM} = sub {
2420 EV::unloop; 2595 EV::unloop;
2421 #d# TODO calling exit here hangs the process in some futex 2596 #d# TODO calling exit here hangs the process in some futex
2422}; 2597};
2423 2598
2424{ 2599# due to mac os x + sdl combined briandamage, we need this contortion
2600sub main {
2601 {
2602 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2603
2425 if (-e "$Deliantra::VARDIR/client.cf") { 2604 if (-e "$Deliantra::VARDIR/client.cf") {
2426 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2605 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2427 } else { 2606 } else {
2428 #TODO: compatibility cruft 2607 #TODO: compatibility cruft
2429 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2608 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2430 print STDERR "INFO: used old configuration file\n"; 2609 print STDERR "INFO: used old configuration file\n";
2431 } 2610 }
2432 2611
2433 DC::DB::Server::run; 2612 DC::DB::Server::run;
2434 2613
2614 if ($CFG->{db_schema} < 1) {
2615 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2616 DC::DB::nuke_db;
2617 $CFG->{db_schema} = 1;
2618 DC::write_cfg;
2619 }
2620
2621 DC::DB::open_db;
2622
2435 DC::UI::set_layout ($::CFG->{layout}); 2623 DC::UI::set_layout ($::CFG->{layout});
2436 2624
2437 my %DEF_CFG = ( 2625 my %DEF_CFG = (
2438 sdl_mode => 0, 2626 sdl_mode => undef,
2439 fullscreen => 1, 2627 fullscreen => 1,
2440 fast => 0, 2628 fast => 0,
2441 force_opengl11 => undef, 2629 force_opengl11 => undef,
2630 disable_alpha => 0,
2631 smooth_movement => 1,
2442 texture_compression => 1, 2632 texture_compression => 1,
2443 map_scale => 1, 2633 map_scale => 1,
2444 fow_enable => 1, 2634 fow_enable => 1,
2445 fow_intensity => 0, 2635 fow_intensity => 0,
2446 map_smoothing => 1, 2636 map_smoothing => 1,
2447 gui_fontsize => 1, 2637 gui_fontsize => 1,
2448 log_fontsize => 0.7, 2638 log_fontsize => 0.7,
2449 gauge_fontsize => 1, 2639 gauge_fontsize => 1,
2450 gauge_size => 0.35, 2640 gauge_size => 0.35,
2451 stat_fontsize => 0.7, 2641 stat_fontsize => 0.7,
2452 mapsize => 100, 2642 mapsize => 100,
2453 audio_enable => 1, 2643 audio_enable => 1,
2454 audio_hw_channels => 0, 2644 audio_hw_channels => 0,
2455 audio_hw_frequency => 0, 2645 audio_hw_frequency => 0,
2456 audio_hw_chunksize => 0, 2646 audio_hw_chunksize => 0,
2457 audio_mix_channels => 8, 2647 audio_mix_channels => 8,
2458 effects_enable => 1, 2648 effects_enable => 1,
2459 effects_volume => 1, 2649 effects_volume => 1,
2460 bgm_enable => 1, 2650 bgm_enable => 1,
2461 bgm_volume => 0.5, 2651 bgm_volume => 0.5,
2462 output_rate => "", 2652 output_rate => "",
2463 pickup => 0, 2653 pickup => 0,
2464 inv_sort => "mtime", 2654 inv_sort => "mtime",
2465 default => "profile", # default profile 2655 default => "profile", # default profile
2466 show_tips => 1, 2656 show_tips => 1,
2467 logview_max_par => 1000, 2657 logview_max_par => 1000,
2658 shift_fire_stop => 0,
2659 uitheme => "wood",
2468 ); 2660 );
2469 2661
2470 while (my ($k, $v) = each %DEF_CFG) { 2662 while (my ($k, $v) = each %DEF_CFG) {
2471 $CFG->{$k} = $v unless exists $CFG->{$k}; 2663 $CFG->{$k} = $v unless exists $CFG->{$k};
2472 } 2664 }
2473 2665
2474 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2666 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2475 $PROFILE = $CFG->{profile}{default}; 2667 $PROFILE = $CFG->{profile}{default};
2476 2668
2477 # convert old bindings (only default profile matters) 2669 # convert old bindings (only default profile matters)
2478 if (my $bindings = delete $PROFILE->{bindings}) { 2670 if (my $bindings = delete $PROFILE->{bindings}) {
2479 while (my ($mod, $syms) = each %$bindings) { 2671 while (my ($mod, $syms) = each %$bindings) {
2480 while (my ($sym, $cmds) = each %$syms) { 2672 while (my ($sym, $cmds) = each %$syms) {
2481 push @{ $PROFILE->{macro} }, { 2673 push @{ $PROFILE->{macro} }, {
2482 accelkey => [$mod*1, $sym*1], 2674 accelkey => [$mod*1, $sym*1],
2483 action => $cmds, 2675 action => $cmds,
2676 };
2484 }; 2677 }
2485 } 2678 }
2486 } 2679 }
2487 }
2488 2680
2489 sdl_init; 2681 sdl_init;
2490 2682
2491 @SDL_MODES = DC::SDL_ListModes 8, 8; 2683 {
2492 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2493 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2494
2495 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2496
2497 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2498
2499 {
2500 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2684 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2501 DejaVuSans.ttf 2685 DejaVuSans.ttf
2502 DejaVuSansMono.ttf 2686 DejaVuSansMono.ttf
2503 DejaVuSans-Bold.ttf 2687 DejaVuSans-Bold.ttf
2504 DejaVuSansMono-Bold.ttf 2688 DejaVuSansMono-Bold.ttf
2505 DejaVuSans-Oblique.ttf 2689 DejaVuSans-Oblique.ttf
2506 DejaVuSansMono-Oblique.ttf 2690 DejaVuSansMono-Oblique.ttf
2507 DejaVuSans-BoldOblique.ttf 2691 DejaVuSans-BoldOblique.ttf
2508 DejaVuSansMono-BoldOblique.ttf 2692 DejaVuSansMono-BoldOblique.ttf
2509 ); 2693 );
2510 2694
2511 DC::add_font $_ for @fonts; 2695 DC::add_font $_ for @fonts;
2512 2696
2513 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2697 $FONT_PROP = new_from_file DC::Font $fonts[0];
2514 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2698 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2515 2699
2516 $FONT_PROP->make_default; 2700 $FONT_PROP->make_default;
2517 2701
2518 DC::pango_init; 2702 DC::pango_init;
2519 } 2703 }
2520 2704
2521# compare mono (ft) vs. rgba (cairo) 2705# compare mono (ft) vs. rgba (cairo)
2522# ft - 1.8s, cairo 3s, even in alpha-only mode 2706# ft - 1.8s, cairo 3s, even in alpha-only mode
2523# for my $rgba (0..1) { 2707# for my $rgba (0..1) {
2524# my $t1 = Time::HiRes::time; 2708# my $t1 = Time::HiRes::time;
… …
2529# } 2713# }
2530# my $t2 = Time::HiRes::time; 2714# my $t2 = Time::HiRes::time;
2531# warn $t2-$t1; 2715# warn $t2-$t1;
2532# } 2716# }
2533 2717
2534 video_init; 2718 video_init;
2535 audio_init; 2719 audio_init;
2536} 2720 }
2537 2721
2538show_tip_of_the_day if $CFG->{show_tips}; 2722 show_tip_of_the_day if $CFG->{show_tips};
2539 2723
2540our $STARTUP_CANCEL = EV::idle sub { 2724 our $STARTUP_CANCEL = EV::idle sub {
2541 undef $::STARTUP_CANCEL; 2725 undef $::STARTUP_CANCEL;
2542 $startup_done->(); 2726 $startup_done->();
2543}; 2727 };
2544 2728
2729 delete $SIG{__DIE__};
2545EV::loop; 2730 EV::loop;
2546 2731
2547#video_shutdown; 2732#video_shutdown;
2548#audio_shutdown; 2733#audio_shutdown;
2549DC::OpenGL::quit; 2734 DC::OpenGL::quit;
2550DC::SDL_Quit; 2735 DC::SDL_Quit;
2551DC::DB::Server::stop; 2736 DC::DB::Server::stop;
2737}
2738
2739DC::SDL_braino; # see sub above
2552 2740
2553=head1 NAME 2741=head1 NAME
2554 2742
2555deliantra - A Deliantra MORPG game client 2743deliantra - A Deliantra MORPG game client
2556 2744
… …
2573 4 show fps 2761 4 show fps
2574 8 suppress tooltips 2762 8 suppress tooltips
2575 2763
2576=head1 AUTHOR 2764=head1 AUTHOR
2577 2765
2578Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2766Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2579 2767
2580 2768
2581 2769

Diff Legend

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