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.54 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.78 by root, Tue Sep 30 03:05:07 2008 UTC

… …
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 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 # OS X
56 or die "pangoversion: $!"; 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
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"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 59 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 60 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 61 }
75 62
76 unshift @INC, $root; 63 unshift @INC, $root;
77 } 64 }
78} 65}
… …
90 77
91# need to do it again because that pile of garbage called PAR nukes it before main 78# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 80 if %PAR::LibCache;
94 81
95use Time::HiRes 'time';
96use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
97use List::Util qw(max min); 85use List::Util qw(max min);
98 86
99use Deliantra; 87use Deliantra;
100use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
101 89
90use AnyEvent::Util ();
102use AnyEvent::DNS; 91use AnyEvent::DNS;
103use AnyEvent::Socket (); 92use AnyEvent::Socket ();
104 93
105use Compress::LZF; 94use Compress::LZF;
95use JSON::XS;
106 96
107use DC; 97use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 98
99sub crash($;$) {
100 # nop during compiletime
101}
102
103BEGIN {
104 $SIG{__DIE__} = sub {
105 return if $^S;
106 crash "CRASH/DIE: $_[0]" => 1;
107 DC::fatal Carp::longmess "$_[0]";
108 }
109}
110
109use DC::OpenGL (); 111use DC::OpenGL ();
110use DC::Protocol; 112use DC::Protocol;
111use DC::DB; 113use DC::DB;
112use DC::UI; 114use DC::UI;
113use DC::UI::Canvas; 115use DC::UI::Canvas;
114use DC::UI::Inventory; 116use DC::UI::Inventory;
115use DC::UI::SpellList; 117use DC::UI::SpellList;
116use DC::UI::Dockable; 118use DC::UI::Dockable;
117use DC::UI::Dockbar; 119use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 120use DC::UI::ChatView;
120use DC::MessageDistributor; 121use DC::MessageDistributor;
121use DC::Pod; 122use DC::Pod;
122use DC::MapWidget; 123use DC::MapWidget;
123use DC::Macro; 124use DC::Macro;
124 125
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
127 128
128$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1;
129 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
130}; 132};
131 133
132my $MAX_FPS = 60; 134my $MAX_FPS = 60;
133 135
… …
135 137
136our $LAST_REFRESH; 138our $LAST_REFRESH;
137our $NOW; 139our $NOW;
138 140
139our $CFG; 141our $CFG;
140our $CONN;
141our $PROFILE; # current profile 142our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 144
144our $WANT_REFRESH; 145our $WANT_REFRESH;
145 146
… …
153our $FULLSCREEN; 154our $FULLSCREEN;
154our $FONTSIZE; 155our $FONTSIZE;
155 156
156our $FONT_PROP; 157our $FONT_PROP;
157our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
158 161
159our $MAP; 162our $MAP;
160our $MAPMAP; 163our $MAPMAP;
161our $MAPWIDGET; 164our $MAPWIDGET;
162our $COMPLETER; 165our $COMPLETER;
… …
204our $DEBUG_STATUS; 207our $DEBUG_STATUS;
205 208
206our $INV; 209our $INV;
207our $INVR; 210our $INVR;
208our $INVR_HB; 211our $INVR_HB;
212
213#############################################################################
214
215# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) {
218 my ($msg, $backtrace) = @_;
219
220 return unless $CONN;
221
222 my $fh = $CONN->{fh}
223 or return;
224
225 my $buf = delete $CONN->{wbuf};
226
227 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
228
229 AnyEvent::Util::fh_nonblocking $fh, 0;
230 syswrite $fh, $buf;
231 AnyEvent::Util::fh_nonblocking $fh, 1;
232
233 $msg =~ s/\s+$//;
234
235 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace;
238};
209 239
210############################################################################# 240#############################################################################
211 241
212sub status { 242sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
800 dc_connect $host, $port; 830 dc_connect $host, $port;
801 } 831 }
802} 832}
803 833
804sub stop_game { 834sub stop_game {
835 crash "stop_game";
836
805 $LOGIN_BUTTON->set_text ("Login / Register"); 837 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 838 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 839 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 840 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 841 $SPELL_LIST->clear_spells;
… …
823} 855}
824 856
825sub graphics_setup { 857sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 858 my $vbox = new DC::UI::VBox;
827 859
860 {
861 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
862
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 863 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 864
830 my $row = 0; 865 my $row = 0;
831 866
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 868 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 869 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 870 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 871
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 873 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 874 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 875 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues " 876 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or " 877 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 878 . "by installing the right driver for your graphics card.");
844 879
880 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
881 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
882 value => $CFG->{uitheme},
883 options => [
884 [wood => "Wood (the default)"],
885 [plain => "Plain (very)"],
886 [blue => "Blue (dark)"],
887 [metal => "Metal (light)"],
888 ],
889 tooltip => "Choose the User Interface theme that you like most :)",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
891 );
892
845 my $vidmode_tooltip = 893 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 894 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 895 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 896
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 898 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 899
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 900 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
853 force_w => $WIDTH * 0.1, expand => 1, 901 force_w => $WIDTH * 0.1, expand => 1,
902 range => [ ($CFG->{sdl_mode}) x 3 ],
854 tooltip => $vidmode_tooltip); 903 tooltip => $vidmode_tooltip);
855 $hbox->add (my $mode_label = new DC::UI::Label 904 $hbox->add (my $mode_label = new DC::UI::Label
856 height => 0.8, template => "9999x9999@9+9", 905 height => 0.8, template => "9999x9999@9+9",
857 can_events => 1, tooltip => $vidmode_tooltip); 906 can_events => 1, tooltip => $vidmode_tooltip);
858 907
859 $MODE_SLIDER->connect (changed => sub { 908 $MODE_SLIDER->connect (changed => sub {
860 my ($self, $value) = @_;
861
862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
863 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
864 });
865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
866
867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
869 state => $CFG->{fullscreen},
870 tooltip => "Bring the client into fullscreen mode.",
871 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
872 );
873
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
875 $table->add_at (1, $row++, new DC::UI::CheckBox
876 state => $CFG->{force_opengl11},
877 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
878 . "higher memory usage and slower performance. It will, however, help tremendously on "
879 . "cards that claim to support a feature but fall back to software rendering. "
880 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
881 . "but cards and drivers from other vendors (ATI) are often just as bad. "
882 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
883 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
884 );
885
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887 $table->add_at (1, $row++, new DC::UI::CheckBox
888 state => $CFG->{disable_alpha},
889 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890 . "by disabling a number of textures and transparency effects. Normally, these "
891 . "effects do not cost a lot of resources, but some graphics cards might fall "
892 . "back to etxremely slow rendering if this is enabled. If disabling this option "
893 . "noticably improves the framerate of the client please report this! "
894 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895 on_changed => sub {
896 my ($self, $value) = @_; 909 my ($self, $value) = @_;
910
911 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
912 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
913 });
914 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
915
916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
918 state => $CFG->{fullscreen},
919 tooltip => "Bring the client into fullscreen mode.",
920 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
921 );
922
923 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
924 $table->add_at (1, $row++, new DC::UI::CheckBox
925 state => $CFG->{force_opengl11},
926 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
927 . "higher memory usage and slower performance. It will, however, help tremendously on "
928 . "cards that claim to support a feature but fall back to software rendering. "
929 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
930 . "but cards and drivers from other vendors (ATI) are often just as bad. "
931 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
932 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
933 );
934
935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
936 $table->add_at (1, $row++, new DC::UI::CheckBox
937 state => $CFG->{disable_alpha},
938 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
939 . "by disabling a number of textures and transparency effects. Normally, these "
940 . "effects do not cost a lot of resources, but some graphics cards might fall "
941 . "back to extremely slow rendering if this is enabled. If disabling this option "
942 . "noticably improves the framerate of the client please report this! "
943 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
944 on_changed => sub {
945 my ($self, $value) = @_;
897 $CFG->{disable_alpha} = $value; 946 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 947 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
948 0
899 0 949 }
900 } 950 );
901 );
902 951
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
904 $table->add_at (1, $row++, new DC::UI::CheckBox 953 $table->add_at (1, $row++, new DC::UI::CheckBox
905 state => $CFG->{texture_compression}, 954 state => $CFG->{texture_compression},
906 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 955 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
907 . "will save a lot of memory and increase performance. The compression algorithm " 956 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
908 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 957 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
909 . "forced OpenGL 1.1 mode.", 958 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 959 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911 ); 960 );
912 961
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 962 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
914 $table->add_at (1, $row++, new DC::UI::CheckBox 963 $table->add_at (1, $row++, new DC::UI::CheckBox
915 state => $CFG->{fast}, 964 state => $CFG->{fast},
916 tooltip => "Lower the visual quality considerably to speed up rendering.", 965 tooltip => "Lower the visual quality considerably to speed up rendering.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
918 ); 967 );
919 968
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
921 $table->add_at (1, $row++, new DC::UI::Slider 970 $table->add_at (1, $row++, new DC::UI::Slider
922 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 971 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
923 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 972 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
924 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 973 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
925 ); 974 );
926 975
927 $table->add_at (1, $row++, new DC::UI::Button 976 $table->add_at (1, $row++, new DC::UI::Button
928 expand => 1, text => "Apply", 977 expand => 1, text => "Apply",
929 tooltip => "Apply the video settings above.", 978 tooltip => "Apply the video settings above.",
930 on_activate => sub { 979 on_activate => sub {
931 video_shutdown (); 980 video_shutdown ();
932 video_init (); 981 video_init ();
982 0
933 0 983 }
934 } 984 );
985 }
986
987 {
988 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
989
990 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
991
992 my $row = 0;
993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
994 $table->add_at (1, $row++, new DC::UI::CheckBox
995 state => $CFG->{smooth_movement},
996 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
997 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
998 . "then disable this option. Changes take effect immdiately.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
935 ); 1000 );
936 1001
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
938 $table->add_at (1, $row++, new DC::UI::Slider 1003 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1004 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
940 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1005 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
941 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1006 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
942 ); 1007 );
943 1008
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1009 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1010 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{map_smoothing}, 1011 state => $CFG->{map_smoothing},
947 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1012 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
948 . "This increases load on the graphics subsystem and works only with TRT servers. " 1013 . "This increases load on the graphics subsystem and works only with TRT servers. "
949 . "Changes take effect at next login only.", 1014 . "Changes take effect at next login only.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1015 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
951 ); 1016 );
952 1017
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
954 $table->add_at (1, $row++, new DC::UI::CheckBox 1019 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{fow_enable}, 1020 state => $CFG->{fow_enable},
956 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1021 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1022 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
958 ); 1023 );
959 1024
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1025 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
961 $table->add_at (1, $row++, new DC::UI::Slider 1026 $table->add_at (1, $row++, new DC::UI::Slider
962 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1027 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
963 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1028 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
965 ); 1030 );
966 1031
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
968 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
969 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1034 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
970 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1035 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
971 . "but you still need to press apply to correctly re-layout the widget.", 1036 . "but you still need to press apply to correctly re-layout the widget.",
972 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1037 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
973 ); 1038 );
974 1039
975 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
976 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
977 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1042 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
978 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1043 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
979 on_changed => sub { 1044 on_changed => sub {
980 $CFG->{gauge_fontsize} = $_[1]; 1045 $CFG->{gauge_fontsize} = $_[1];
981 &set_gauge_window_fontsize; 1046 &set_gauge_window_fontsize;
1047 0
982 0 1048 }
983 } 1049 );
984 );
985 1050
986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
987 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
988 range => [$CFG->{gauge_size}, 0.2, 0.8], 1053 range => [$CFG->{gauge_size}, 0.2, 0.8],
989 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1054 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
990 on_changed => sub { 1055 on_changed => sub {
991 $CFG->{gauge_size} = $_[1]; 1056 $CFG->{gauge_size} = $_[1];
992 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1057 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1058 0
993 0 1059 }
994 } 1060 );
995 ); 1061 }
996 1062
997 $vbox 1063 $vbox
998} 1064}
999 1065
1000our $AUDIO_HW_CHUNKSIZE; 1066our $AUDIO_HW_CHUNKSIZE;
… …
1579 1 1645 1
1580 }, 1646 },
1581 ); 1647 );
1582 1648
1583 $vbox->add (new DC::UI::FancyFrame 1649 $vbox->add (new DC::UI::FancyFrame
1584 label => "Registering", 1650 label => "How to Play",
1585 min_h => 200, 1651 min_h => 240,
1586 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1652 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587 markup => 1653 markup =>
1654 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1655 . "Then register a new account (or use an existing one if you have one). "
1588 "To register a new account, choose a username that hasn't been taken yet and " 1656 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1589 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1657 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1590 ), 1658 ),
1591 ); 1659 );
1592 1660
1593 $vbox 1661 $vbox
… …
1739 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1807 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740 ["Ignore cursed" => PICKUP_NOT_CURSED], 1808 ["Ignore cursed" => PICKUP_NOT_CURSED],
1741 ["Jewelery" => PICKUP_JEWELS], 1809 ["Jewelery" => PICKUP_JEWELS],
1742 ["Flesh" => PICKUP_FLESH], 1810 ["Flesh" => PICKUP_FLESH],
1743 ], 1811 ],
1744 ["Weight/Value ratio", 2, 17] 1812 ["Value/Weight ratio", 2, 17]
1745 ) 1813 )
1746 { 1814 {
1747 my ($title, $x, $y, @bits) = @$_; 1815 my ($title, $x, $y, @bits) = @$_;
1748 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1816 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1749 1817
… …
1774 } 1842 }
1775 1843
1776 $table->add_at (2, 18, new DC::UI::ValSlider 1844 $table->add_at (2, 18, new DC::UI::ValSlider
1777 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1845 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778 template => ">= 99", 1846 template => ">= 99",
1847 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1779 to_value => sub { ">= " . 5 * $_[0] }, 1848 to_value => sub { ">= " . 5 * $_[0] },
1780 on_changed => sub { 1849 on_changed => sub {
1781 my ($slider, $value) = @_; 1850 my ($slider, $value) = @_;
1782 1851
1783 $::CFG->{pickup} &= ~0xF; 1852 $::CFG->{pickup} &= ~0xF;
… …
1839 $::CFG->{inv_sort} = $_[1]; 1908 $::CFG->{inv_sort} = $_[1];
1840 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1909 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1841 }, 1910 },
1842 ); 1911 );
1843 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1912 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1844 #TODO# update to weigh/maxweight 1913 #TODO# update to weight/maxweight
1845 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1914 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846 1915
1847 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1916 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1848 $sw1->add ($INV = new DC::UI::Inventory); 1917 $sw1->add ($INV = new DC::UI::Inventory);
1849 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1918 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2113 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2182 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114 ); 2183 );
2115 $hb->add (new DC::UI::Button 2184 $hb->add (new DC::UI::Button
2116 text => "Quit anyway", 2185 text => "Quit anyway",
2117 expand => 1, 2186 expand => 1,
2118 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2187 on_activate => sub {
2188 crash "Quit anyway";
2189 EV::unloop EV::UNLOOP_ALL;
2190 },
2119 ); 2191 );
2120 } 2192 }
2121 2193
2122 $QUIT_DIALOG->show; 2194 $QUIT_DIALOG->show;
2123 $QUIT_DIALOG->grab_focus; 2195 $QUIT_DIALOG->grab_focus;
… …
2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2253 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2182 and die "SDL::Init failed!\n"; 2254 and die "SDL::Init failed!\n";
2183} 2255}
2184 2256
2185sub video_init { 2257sub video_init {
2258 DC::set_theme $CFG->{uitheme};
2259
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2260 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0; 2261 $SDL_REINIT = 0;
2188 2262
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2263 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2264 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2265 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2266 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193 2267
2194 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2268 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195 2269
2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) { 2270 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197 $CFG->{sdl_mode} = 0; 2271 $CFG->{sdl_mode} = 0; # lowest resolution by default
2272
2273 # now choose biggest mode <= 1024x768
2198 for (reverse 0 .. $#SDL_MODES) { 2274 for (0 .. $#SDL_MODES) {
2199 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2275 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2276 $CFG->{sdl_mode} = $_;
2277 }
2200 } 2278 }
2201 } 2279 }
2202 2280
2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2281 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204 2282
2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2283 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206 $FULLSCREEN = $CFG->{fullscreen}; 2284 $FULLSCREEN = $CFG->{fullscreen};
2207 $FAST = $CFG->{fast}; 2285 $FAST = $CFG->{fast};
2208 2286
2287 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2209 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2288 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2289 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2210 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2290 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211 2291
2212 $SDL_ACTIVE = 1; 2292 $SDL_ACTIVE = 1;
2213 $LAST_REFRESH = time - 0.01; 2293 $LAST_REFRESH = time - 0.01;
2214 2294
… …
2281 x => 0, 2361 x => 0,
2282 y => $FONTSIZE + 8, 2362 y => $FONTSIZE + 8,
2283 border_bg => [1, 1, 1, 192/255], 2363 border_bg => [1, 1, 1, 192/255],
2284 bg => [1, 1, 1, 0], 2364 bg => [1, 1, 1, 0],
2285 child => ($MAPMAP = new DC::MapWidget::MapMap 2365 child => ($MAPMAP = new DC::MapWidget::MapMap
2286 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2366 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2287 ), 2367 ),
2288 )->show; 2368 )->show;
2289 2369
2290 $MAPWIDGET = new DC::MapWidget; 2370 $MAPWIDGET = new DC::MapWidget;
2291 $MAPWIDGET->connect (activate_console => sub { 2371 $MAPWIDGET->connect (activate_console => sub {
… …
2390 $BUTTONBAR->show; 2470 $BUTTONBAR->show;
2391 $SETUP_DIALOG->show; 2471 $SETUP_DIALOG->show;
2392 $MESSAGE_WINDOW->show; 2472 $MESSAGE_WINDOW->show;
2393 } 2473 }
2394 2474
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2475 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2476 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397 2477
2398 $CAVEAT_LABEL->set_text ("None :)"); 2478 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Sofwtare Rendering (very slow)") 2479 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2480 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401 2481
2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2482 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2403} 2483}
2404 2484
… …
2455 delete $animate_object{$widget}; 2535 delete $animate_object{$widget};
2456} 2536}
2457 2537
2458%SDL_CB = ( 2538%SDL_CB = (
2459 DC::SDL_QUIT => sub { 2539 DC::SDL_QUIT => sub {
2540 crash "SDL_QUIT";
2460 EV::unloop EV::UNLOOP_ALL; 2541 EV::unloop EV::UNLOOP_ALL;
2461 }, 2542 },
2462 DC::SDL_VIDEORESIZE => sub { 2543 DC::SDL_VIDEORESIZE => sub {
2463 }, 2544 },
2464 DC::SDL_VIDEOEXPOSE => sub { 2545 DC::SDL_VIDEOEXPOSE => sub {
… …
2504$SIG{INT} = $SIG{TERM} = sub { 2585$SIG{INT} = $SIG{TERM} = sub {
2505 EV::unloop; 2586 EV::unloop;
2506 #d# TODO calling exit here hangs the process in some futex 2587 #d# TODO calling exit here hangs the process in some futex
2507}; 2588};
2508 2589
2509{ 2590# due to mac os x + sdl combined briandamage, we need this contortion
2591sub main {
2592 {
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2593 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511 2594
2512 if (-e "$Deliantra::VARDIR/client.cf") { 2595 if (-e "$Deliantra::VARDIR/client.cf") {
2513 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2596 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514 } else { 2597 } else {
2515 #TODO: compatibility cruft 2598 #TODO: compatibility cruft
2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2599 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517 print STDERR "INFO: used old configuration file\n"; 2600 print STDERR "INFO: used old configuration file\n";
2518 } 2601 }
2519 2602
2520 DC::DB::Server::run; 2603 DC::DB::Server::run;
2521 2604
2522 if ($CFG->{db_schema} < 1) { 2605 if ($CFG->{db_schema} < 1) {
2523 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2606 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2524 DC::DB::nuke_db; 2607 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1; 2608 $CFG->{db_schema} = 1;
2526 DC::write_cfg; 2609 DC::write_cfg;
2527 } 2610 }
2528 2611
2529 DC::DB::open_db; 2612 DC::DB::open_db;
2530 2613
2531 DC::UI::set_layout ($::CFG->{layout}); 2614 DC::UI::set_layout ($::CFG->{layout});
2532 2615
2533 my %DEF_CFG = ( 2616 my %DEF_CFG = (
2534 sdl_mode => 0, 2617 sdl_mode => undef,
2535 fullscreen => 1, 2618 fullscreen => 1,
2536 fast => 0, 2619 fast => 0,
2537 force_opengl11 => undef, 2620 force_opengl11 => undef,
2538 disable_alpha => 0, 2621 disable_alpha => 0,
2622 smooth_movement => 1,
2539 texture_compression => 1, 2623 texture_compression => 1,
2540 map_scale => 1, 2624 map_scale => 1,
2541 fow_enable => 1, 2625 fow_enable => 1,
2542 fow_intensity => 0, 2626 fow_intensity => 0,
2543 map_smoothing => 1, 2627 map_smoothing => 1,
2544 gui_fontsize => 1, 2628 gui_fontsize => 1,
2545 log_fontsize => 0.7, 2629 log_fontsize => 0.7,
2546 gauge_fontsize => 1, 2630 gauge_fontsize => 1,
2547 gauge_size => 0.35, 2631 gauge_size => 0.35,
2548 stat_fontsize => 0.7, 2632 stat_fontsize => 0.7,
2549 mapsize => 100, 2633 mapsize => 100,
2550 audio_enable => 1, 2634 audio_enable => 1,
2551 audio_hw_channels => 0, 2635 audio_hw_channels => 0,
2552 audio_hw_frequency => 0, 2636 audio_hw_frequency => 0,
2553 audio_hw_chunksize => 0, 2637 audio_hw_chunksize => 0,
2554 audio_mix_channels => 8, 2638 audio_mix_channels => 8,
2555 effects_enable => 1, 2639 effects_enable => 1,
2556 effects_volume => 1, 2640 effects_volume => 1,
2557 bgm_enable => 1, 2641 bgm_enable => 1,
2558 bgm_volume => 0.5, 2642 bgm_volume => 0.5,
2559 output_rate => "", 2643 output_rate => "",
2560 pickup => 0, 2644 pickup => 0,
2561 inv_sort => "mtime", 2645 inv_sort => "mtime",
2562 default => "profile", # default profile 2646 default => "profile", # default profile
2563 show_tips => 1, 2647 show_tips => 1,
2564 logview_max_par => 1000, 2648 logview_max_par => 1000,
2565 shift_fire_stop => 0, 2649 shift_fire_stop => 0,
2650 uitheme => "wood",
2566 ); 2651 );
2567 2652
2568 while (my ($k, $v) = each %DEF_CFG) { 2653 while (my ($k, $v) = each %DEF_CFG) {
2569 $CFG->{$k} = $v unless exists $CFG->{$k}; 2654 $CFG->{$k} = $v unless exists $CFG->{$k};
2570 } 2655 }
2571 2656
2572 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2657 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2573 $PROFILE = $CFG->{profile}{default}; 2658 $PROFILE = $CFG->{profile}{default};
2574 2659
2575 # convert old bindings (only default profile matters) 2660 # convert old bindings (only default profile matters)
2576 if (my $bindings = delete $PROFILE->{bindings}) { 2661 if (my $bindings = delete $PROFILE->{bindings}) {
2577 while (my ($mod, $syms) = each %$bindings) { 2662 while (my ($mod, $syms) = each %$bindings) {
2578 while (my ($sym, $cmds) = each %$syms) { 2663 while (my ($sym, $cmds) = each %$syms) {
2579 push @{ $PROFILE->{macro} }, { 2664 push @{ $PROFILE->{macro} }, {
2580 accelkey => [$mod*1, $sym*1], 2665 accelkey => [$mod*1, $sym*1],
2581 action => $cmds, 2666 action => $cmds,
2667 };
2582 }; 2668 }
2583 } 2669 }
2584 } 2670 }
2585 }
2586 2671
2587 sdl_init; 2672 sdl_init;
2588 2673
2589 { 2674 {
2590 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2675 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591 DejaVuSans.ttf 2676 DejaVuSans.ttf
2592 DejaVuSansMono.ttf 2677 DejaVuSansMono.ttf
2593 DejaVuSans-Bold.ttf 2678 DejaVuSans-Bold.ttf
2594 DejaVuSansMono-Bold.ttf 2679 DejaVuSansMono-Bold.ttf
2595 DejaVuSans-Oblique.ttf 2680 DejaVuSans-Oblique.ttf
2596 DejaVuSansMono-Oblique.ttf 2681 DejaVuSansMono-Oblique.ttf
2597 DejaVuSans-BoldOblique.ttf 2682 DejaVuSans-BoldOblique.ttf
2598 DejaVuSansMono-BoldOblique.ttf 2683 DejaVuSansMono-BoldOblique.ttf
2599 ); 2684 );
2600 2685
2601 DC::add_font $_ for @fonts; 2686 DC::add_font $_ for @fonts;
2602 2687
2603 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2688 $FONT_PROP = new_from_file DC::Font $fonts[0];
2604 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2689 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2605 2690
2606 $FONT_PROP->make_default; 2691 $FONT_PROP->make_default;
2607 2692
2608 DC::pango_init; 2693 DC::pango_init;
2609 } 2694 }
2610 2695
2611# compare mono (ft) vs. rgba (cairo) 2696# compare mono (ft) vs. rgba (cairo)
2612# ft - 1.8s, cairo 3s, even in alpha-only mode 2697# ft - 1.8s, cairo 3s, even in alpha-only mode
2613# for my $rgba (0..1) { 2698# for my $rgba (0..1) {
2614# my $t1 = Time::HiRes::time; 2699# my $t1 = Time::HiRes::time;
… …
2619# } 2704# }
2620# my $t2 = Time::HiRes::time; 2705# my $t2 = Time::HiRes::time;
2621# warn $t2-$t1; 2706# warn $t2-$t1;
2622# } 2707# }
2623 2708
2624 video_init; 2709 video_init;
2625 audio_init; 2710 audio_init;
2626} 2711 }
2627 2712
2628show_tip_of_the_day if $CFG->{show_tips}; 2713 show_tip_of_the_day if $CFG->{show_tips};
2629 2714
2630our $STARTUP_CANCEL = EV::idle sub { 2715 our $STARTUP_CANCEL = EV::idle sub {
2631 undef $::STARTUP_CANCEL; 2716 undef $::STARTUP_CANCEL;
2632 $startup_done->(); 2717 $startup_done->();
2633}; 2718 };
2634 2719
2635delete $SIG{__DIE__}; 2720 delete $SIG{__DIE__};
2636EV::loop; 2721 EV::loop;
2637 2722
2638#video_shutdown; 2723#video_shutdown;
2639#audio_shutdown; 2724#audio_shutdown;
2640DC::OpenGL::quit; 2725 DC::OpenGL::quit;
2641DC::SDL_Quit; 2726 DC::SDL_Quit;
2642DC::DB::Server::stop; 2727 DC::DB::Server::stop;
2728}
2729
2730DC::SDL_braino; # see sub above
2643 2731
2644=head1 NAME 2732=head1 NAME
2645 2733
2646deliantra - A Deliantra MORPG game client 2734deliantra - A Deliantra MORPG game client
2647 2735
… …
2664 4 show fps 2752 4 show fps
2665 8 suppress tooltips 2753 8 suppress tooltips
2666 2754
2667=head1 AUTHOR 2755=head1 AUTHOR
2668 2756
2669Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2757Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670 2758
2671 2759
2672 2760

Diff Legend

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