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.53 by root, Fri Jul 18 22:32:55 2008 UTC vs.
Revision 1.77 by root, Fri Sep 26 04:45:48 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 ();
102use AnyEvent::DNS; 111use AnyEvent::DNS;
103use AnyEvent::Socket (); 112use AnyEvent::Socket ();
104 113
105use Compress::LZF; 114use Compress::LZF;
115use JSON::XS;
106 116
107use DC; 117use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 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
109use DC::OpenGL (); 131use DC::OpenGL ();
110use DC::Protocol; 132use DC::Protocol;
111use DC::DB; 133use DC::DB;
112use DC::UI; 134use DC::UI;
113use DC::UI::Canvas; 135use DC::UI::Canvas;
114use DC::UI::Inventory; 136use DC::UI::Inventory;
115use DC::UI::SpellList; 137use DC::UI::SpellList;
116use DC::UI::Dockable; 138use DC::UI::Dockable;
117use DC::UI::Dockbar; 139use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 140use DC::UI::ChatView;
120use DC::MessageDistributor; 141use DC::MessageDistributor;
121use DC::Pod; 142use DC::Pod;
122use DC::MapWidget; 143use DC::MapWidget;
123use DC::Macro; 144use DC::Macro;
124 145
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 146$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 147$SIG{PIPE} = 'IGNORE';
127 148
128$EV::DIED = sub { 149$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1;
129 DC::fatal Carp::longmess $@; 151 DC::fatal Carp::longmess $@;
130}; 152};
131 153
132my $MAX_FPS = 60; 154my $MAX_FPS = 60;
133 155
… …
135 157
136our $LAST_REFRESH; 158our $LAST_REFRESH;
137our $NOW; 159our $NOW;
138 160
139our $CFG; 161our $CFG;
140our $CONN;
141our $PROFILE; # current profile 162our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 163our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 164
144our $WANT_REFRESH; 165our $WANT_REFRESH;
145 166
… …
153our $FULLSCREEN; 174our $FULLSCREEN;
154our $FONTSIZE; 175our $FONTSIZE;
155 176
156our $FONT_PROP; 177our $FONT_PROP;
157our $FONT_FIXED; 178our $FONT_FIXED;
179
180our $CONN;
158 181
159our $MAP; 182our $MAP;
160our $MAPMAP; 183our $MAPMAP;
161our $MAPWIDGET; 184our $MAPWIDGET;
162our $COMPLETER; 185our $COMPLETER;
… …
204our $DEBUG_STATUS; 227our $DEBUG_STATUS;
205 228
206our $INV; 229our $INV;
207our $INVR; 230our $INVR;
208our $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};
209 259
210############################################################################# 260#############################################################################
211 261
212sub status { 262sub status {
213 $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]);
… …
800 dc_connect $host, $port; 850 dc_connect $host, $port;
801 } 851 }
802} 852}
803 853
804sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
805 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
823} 875}
824 876
825sub graphics_setup { 877sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 878 my $vbox = new DC::UI::VBox;
827 879
880 {
881 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
882
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 883 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 884
830 my $row = 0; 885 my $row = 0;
831 886
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 887 $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, 888 $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, 889 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 890 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 891
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 892 $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, 893 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 894 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 895 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 " 896 . "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 " 897 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 898 . "by installing the right driver for your graphics card.");
844 899
900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
901 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
902 value => $CFG->{uitheme},
903 options => [
904 [wood => "Wood (the default)"],
905 [plain => "Plain (very)"],
906 [blue => "Blue (dark)"],
907 [metal => "Metal (light)"],
908 ],
909 tooltip => "Choose the User Interface theme that you like most :)",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
911 );
912
845 my $vidmode_tooltip = 913 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 914 "<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>."; 915 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 916
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 917 $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); 918 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 919
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 920 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
853 force_w => $WIDTH * 0.1, expand => 1, 921 force_w => $WIDTH * 0.1, expand => 1,
922 range => [ ($CFG->{sdl_mode}) x 3 ],
854 tooltip => $vidmode_tooltip); 923 tooltip => $vidmode_tooltip);
855 $hbox->add (my $mode_label = new DC::UI::Label 924 $hbox->add (my $mode_label = new DC::UI::Label
856 height => 0.8, template => "9999x9999@9+9", 925 height => 0.8, template => "9999x9999@9+9",
857 can_events => 1, tooltip => $vidmode_tooltip); 926 can_events => 1, tooltip => $vidmode_tooltip);
858 927
859 $MODE_SLIDER->connect (changed => sub { 928 $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) = @_; 929 my ($self, $value) = @_;
930
931 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
932 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
933 });
934 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
935
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
937 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
938 state => $CFG->{fullscreen},
939 tooltip => "Bring the client into fullscreen mode.",
940 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
941 );
942
943 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
944 $table->add_at (1, $row++, new DC::UI::CheckBox
945 state => $CFG->{force_opengl11},
946 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
947 . "higher memory usage and slower performance. It will, however, help tremendously on "
948 . "cards that claim to support a feature but fall back to software rendering. "
949 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
950 . "but cards and drivers from other vendors (ATI) are often just as bad. "
951 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
952 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
953 );
954
955 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
956 $table->add_at (1, $row++, new DC::UI::CheckBox
957 state => $CFG->{disable_alpha},
958 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
959 . "by disabling a number of textures and transparency effects. Normally, these "
960 . "effects do not cost a lot of resources, but some graphics cards might fall "
961 . "back to extremely slow rendering if this is enabled. If disabling this option "
962 . "noticably improves the framerate of the client please report this! "
963 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
964 on_changed => sub {
965 my ($self, $value) = @_;
897 $CFG->{disable_alpha} = $value; 966 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 967 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
968 0
899 0 969 }
900 } 970 );
901 );
902 971
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 972 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
904 $table->add_at (1, $row++, new DC::UI::CheckBox 973 $table->add_at (1, $row++, new DC::UI::CheckBox
905 state => $CFG->{texture_compression}, 974 state => $CFG->{texture_compression},
906 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 975 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 " 976 . "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 " 977 . "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.", 978 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 979 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911 ); 980 );
912 981
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 982 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
914 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
915 state => $CFG->{fast}, 984 state => $CFG->{fast},
916 tooltip => "Lower the visual quality considerably to speed up rendering.", 985 tooltip => "Lower the visual quality considerably to speed up rendering.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 986 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
918 ); 987 );
919 988
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
921 $table->add_at (1, $row++, new DC::UI::Slider 990 $table->add_at (1, $row++, new DC::UI::Slider
922 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 991 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.", 992 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 }, 993 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
925 ); 994 );
926 995
927 $table->add_at (1, $row++, new DC::UI::Button 996 $table->add_at (1, $row++, new DC::UI::Button
928 expand => 1, text => "Apply", 997 expand => 1, text => "Apply",
929 tooltip => "Apply the video settings above.", 998 tooltip => "Apply the video settings above.",
930 on_activate => sub { 999 on_activate => sub {
931 video_shutdown (); 1000 video_shutdown ();
932 video_init (); 1001 video_init ();
1002 0
933 0 1003 }
934 } 1004 );
1005 }
1006
1007 {
1008 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1009
1010 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1011
1012 my $row = 0;
1013 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1014 $table->add_at (1, $row++, new DC::UI::CheckBox
1015 state => $CFG->{smooth_movement},
1016 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1017 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1018 . "then disable this option. Changes take effect immdiately.",
1019 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
935 ); 1020 );
936 1021
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
938 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1024 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
940 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1025 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
941 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1026 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
942 ); 1027 );
943 1028
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1030 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{map_smoothing}, 1031 state => $CFG->{map_smoothing},
947 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1032 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. " 1033 . "This increases load on the graphics subsystem and works only with TRT servers. "
949 . "Changes take effect at next login only.", 1034 . "Changes take effect at next login only.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1035 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
951 ); 1036 );
952 1037
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1038 $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 1039 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{fow_enable}, 1040 state => $CFG->{fow_enable},
956 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1041 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 } 1042 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
958 ); 1043 );
959 1044
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1045 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
961 $table->add_at (1, $row++, new DC::UI::Slider 1046 $table->add_at (1, $row++, new DC::UI::Slider
962 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1047 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.", 1048 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 } 1049 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
965 ); 1050 );
966 1051
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1052 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
968 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
969 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1054 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, " 1055 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.", 1056 . "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 }, 1057 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
973 ); 1058 );
974 1059
975 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
976 $table->add_at (1, $row++, new DC::UI::Slider 1061 $table->add_at (1, $row++, new DC::UI::Slider
977 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1062 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.", 1063 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
979 on_changed => sub { 1064 on_changed => sub {
980 $CFG->{gauge_fontsize} = $_[1]; 1065 $CFG->{gauge_fontsize} = $_[1];
981 &set_gauge_window_fontsize; 1066 &set_gauge_window_fontsize;
1067 0
982 0 1068 }
983 } 1069 );
984 );
985 1070
986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
987 $table->add_at (1, $row++, new DC::UI::Slider 1072 $table->add_at (1, $row++, new DC::UI::Slider
988 range => [$CFG->{gauge_size}, 0.2, 0.8], 1073 range => [$CFG->{gauge_size}, 0.2, 0.8],
989 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1074 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
990 on_changed => sub { 1075 on_changed => sub {
991 $CFG->{gauge_size} = $_[1]; 1076 $CFG->{gauge_size} = $_[1];
992 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1077 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1078 0
993 0 1079 }
994 } 1080 );
995 ); 1081 }
996 1082
997 $vbox 1083 $vbox
998} 1084}
999 1085
1000our $AUDIO_HW_CHUNKSIZE; 1086our $AUDIO_HW_CHUNKSIZE;
… …
1579 1 1665 1
1580 }, 1666 },
1581 ); 1667 );
1582 1668
1583 $vbox->add (new DC::UI::FancyFrame 1669 $vbox->add (new DC::UI::FancyFrame
1584 label => "Registering", 1670 label => "How to Play",
1585 min_h => 200, 1671 min_h => 240,
1586 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1672 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587 markup => 1673 markup =>
1674 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1675 . "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 " 1676 . "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.", 1677 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1590 ), 1678 ),
1591 ); 1679 );
1592 1680
1593 $vbox 1681 $vbox
… …
1739 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1827 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740 ["Ignore cursed" => PICKUP_NOT_CURSED], 1828 ["Ignore cursed" => PICKUP_NOT_CURSED],
1741 ["Jewelery" => PICKUP_JEWELS], 1829 ["Jewelery" => PICKUP_JEWELS],
1742 ["Flesh" => PICKUP_FLESH], 1830 ["Flesh" => PICKUP_FLESH],
1743 ], 1831 ],
1744 ["Weight/Value ratio", 2, 17] 1832 ["Value/Weight ratio", 2, 17]
1745 ) 1833 )
1746 { 1834 {
1747 my ($title, $x, $y, @bits) = @$_; 1835 my ($title, $x, $y, @bits) = @$_;
1748 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1836 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1749 1837
… …
1774 } 1862 }
1775 1863
1776 $table->add_at (2, 18, new DC::UI::ValSlider 1864 $table->add_at (2, 18, new DC::UI::ValSlider
1777 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1865 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778 template => ">= 99", 1866 template => ">= 99",
1867 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] }, 1868 to_value => sub { ">= " . 5 * $_[0] },
1780 on_changed => sub { 1869 on_changed => sub {
1781 my ($slider, $value) = @_; 1870 my ($slider, $value) = @_;
1782 1871
1783 $::CFG->{pickup} &= ~0xF; 1872 $::CFG->{pickup} &= ~0xF;
… …
1839 $::CFG->{inv_sort} = $_[1]; 1928 $::CFG->{inv_sort} = $_[1];
1840 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1929 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1841 }, 1930 },
1842 ); 1931 );
1843 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1932 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1844 #TODO# update to weigh/maxweight 1933 #TODO# update to weight/maxweight
1845 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1934 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846 1935
1847 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1936 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1848 $sw1->add ($INV = new DC::UI::Inventory); 1937 $sw1->add ($INV = new DC::UI::Inventory);
1849 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1938 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2113 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2202 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114 ); 2203 );
2115 $hb->add (new DC::UI::Button 2204 $hb->add (new DC::UI::Button
2116 text => "Quit anyway", 2205 text => "Quit anyway",
2117 expand => 1, 2206 expand => 1,
2118 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2207 on_activate => sub {
2208 crash "Quit anyway";
2209 EV::unloop EV::UNLOOP_ALL;
2210 },
2119 ); 2211 );
2120 } 2212 }
2121 2213
2122 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2123 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
… …
2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2273 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2182 and die "SDL::Init failed!\n"; 2274 and die "SDL::Init failed!\n";
2183} 2275}
2184 2276
2185sub video_init { 2277sub video_init {
2278 DC::set_theme $CFG->{uitheme};
2279
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2280 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0; 2281 $SDL_REINIT = 0;
2188 2282
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2283 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2284 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2285 @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)"; 2286 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193 2287
2194 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2288 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195 2289
2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) { 2290 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197 $CFG->{sdl_mode} = 0; 2291 $CFG->{sdl_mode} = 0; # lowest resolution by default
2292
2293 # now choose biggest mode <= 1024x768
2198 for (reverse 0 .. $#SDL_MODES) { 2294 for (0 .. $#SDL_MODES) {
2199 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2295 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2296 $CFG->{sdl_mode} = $_;
2297 }
2200 } 2298 }
2201 } 2299 }
2202 2300
2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2301 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204 2302
2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2303 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206 $FULLSCREEN = $CFG->{fullscreen}; 2304 $FULLSCREEN = $CFG->{fullscreen};
2207 $FAST = $CFG->{fast}; 2305 $FAST = $CFG->{fast};
2208 2306
2307 # 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 2308 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2309 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2210 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2310 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211 2311
2212 $SDL_ACTIVE = 1; 2312 $SDL_ACTIVE = 1;
2213 $LAST_REFRESH = time - 0.01; 2313 $LAST_REFRESH = time - 0.01;
2214 2314
… …
2281 x => 0, 2381 x => 0,
2282 y => $FONTSIZE + 8, 2382 y => $FONTSIZE + 8,
2283 border_bg => [1, 1, 1, 192/255], 2383 border_bg => [1, 1, 1, 192/255],
2284 bg => [1, 1, 1, 0], 2384 bg => [1, 1, 1, 0],
2285 child => ($MAPMAP = new DC::MapWidget::MapMap 2385 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.", 2386 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2287 ), 2387 ),
2288 )->show; 2388 )->show;
2289 2389
2290 $MAPWIDGET = new DC::MapWidget; 2390 $MAPWIDGET = new DC::MapWidget;
2291 $MAPWIDGET->connect (activate_console => sub { 2391 $MAPWIDGET->connect (activate_console => sub {
… …
2390 $BUTTONBAR->show; 2490 $BUTTONBAR->show;
2391 $SETUP_DIALOG->show; 2491 $SETUP_DIALOG->show;
2392 $MESSAGE_WINDOW->show; 2492 $MESSAGE_WINDOW->show;
2393 } 2493 }
2394 2494
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2495 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2496 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397 2497
2398 $CAVEAT_LABEL->set_text ("None :)"); 2498 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Non-accelerated video mode") 2499 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2500 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401 2501
2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2502 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2403} 2503}
2404 2504
… …
2455 delete $animate_object{$widget}; 2555 delete $animate_object{$widget};
2456} 2556}
2457 2557
2458%SDL_CB = ( 2558%SDL_CB = (
2459 DC::SDL_QUIT => sub { 2559 DC::SDL_QUIT => sub {
2560 crash "SDL_QUIT";
2460 EV::unloop EV::UNLOOP_ALL; 2561 EV::unloop EV::UNLOOP_ALL;
2461 }, 2562 },
2462 DC::SDL_VIDEORESIZE => sub { 2563 DC::SDL_VIDEORESIZE => sub {
2463 }, 2564 },
2464 DC::SDL_VIDEOEXPOSE => sub { 2565 DC::SDL_VIDEOEXPOSE => sub {
… …
2504$SIG{INT} = $SIG{TERM} = sub { 2605$SIG{INT} = $SIG{TERM} = sub {
2505 EV::unloop; 2606 EV::unloop;
2506 #d# TODO calling exit here hangs the process in some futex 2607 #d# TODO calling exit here hangs the process in some futex
2507}; 2608};
2508 2609
2509{ 2610# due to mac os x + sdl combined briandamage, we need this contortion
2611sub main {
2612 {
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2613 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511 2614
2512 if (-e "$Deliantra::VARDIR/client.cf") { 2615 if (-e "$Deliantra::VARDIR/client.cf") {
2513 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2616 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514 } else { 2617 } else {
2515 #TODO: compatibility cruft 2618 #TODO: compatibility cruft
2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2619 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517 print STDERR "INFO: used old configuration file\n"; 2620 print STDERR "INFO: used old configuration file\n";
2518 } 2621 }
2519 2622
2520 DC::DB::Server::run; 2623 DC::DB::Server::run;
2521 2624
2522 if ($CFG->{db_schema} < 1) { 2625 if ($CFG->{db_schema} < 1) {
2523 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2626 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2524 DC::DB::nuke_db; 2627 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1; 2628 $CFG->{db_schema} = 1;
2526 DC::write_cfg; 2629 DC::write_cfg;
2527 } 2630 }
2528 2631
2529 DC::DB::open_db; 2632 DC::DB::open_db;
2530 2633
2531 DC::UI::set_layout ($::CFG->{layout}); 2634 DC::UI::set_layout ($::CFG->{layout});
2532 2635
2533 my %DEF_CFG = ( 2636 my %DEF_CFG = (
2534 sdl_mode => 0, 2637 sdl_mode => undef,
2535 fullscreen => 1, 2638 fullscreen => 1,
2536 fast => 0, 2639 fast => 0,
2537 force_opengl11 => undef, 2640 force_opengl11 => undef,
2538 disable_alpha => 0, 2641 disable_alpha => 0,
2642 smooth_movement => 1,
2539 texture_compression => 1, 2643 texture_compression => 1,
2540 map_scale => 1, 2644 map_scale => 1,
2541 fow_enable => 1, 2645 fow_enable => 1,
2542 fow_intensity => 0, 2646 fow_intensity => 0,
2543 map_smoothing => 1, 2647 map_smoothing => 1,
2544 gui_fontsize => 1, 2648 gui_fontsize => 1,
2545 log_fontsize => 0.7, 2649 log_fontsize => 0.7,
2546 gauge_fontsize => 1, 2650 gauge_fontsize => 1,
2547 gauge_size => 0.35, 2651 gauge_size => 0.35,
2548 stat_fontsize => 0.7, 2652 stat_fontsize => 0.7,
2549 mapsize => 100, 2653 mapsize => 100,
2550 audio_enable => 1, 2654 audio_enable => 1,
2551 audio_hw_channels => 0, 2655 audio_hw_channels => 0,
2552 audio_hw_frequency => 0, 2656 audio_hw_frequency => 0,
2553 audio_hw_chunksize => 0, 2657 audio_hw_chunksize => 0,
2554 audio_mix_channels => 8, 2658 audio_mix_channels => 8,
2555 effects_enable => 1, 2659 effects_enable => 1,
2556 effects_volume => 1, 2660 effects_volume => 1,
2557 bgm_enable => 1, 2661 bgm_enable => 1,
2558 bgm_volume => 0.5, 2662 bgm_volume => 0.5,
2559 output_rate => "", 2663 output_rate => "",
2560 pickup => 0, 2664 pickup => 0,
2561 inv_sort => "mtime", 2665 inv_sort => "mtime",
2562 default => "profile", # default profile 2666 default => "profile", # default profile
2563 show_tips => 1, 2667 show_tips => 1,
2564 logview_max_par => 1000, 2668 logview_max_par => 1000,
2565 shift_fire_stop => 0, 2669 shift_fire_stop => 0,
2670 uitheme => "wood",
2566 ); 2671 );
2567 2672
2568 while (my ($k, $v) = each %DEF_CFG) { 2673 while (my ($k, $v) = each %DEF_CFG) {
2569 $CFG->{$k} = $v unless exists $CFG->{$k}; 2674 $CFG->{$k} = $v unless exists $CFG->{$k};
2570 } 2675 }
2571 2676
2572 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2677 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2573 $PROFILE = $CFG->{profile}{default}; 2678 $PROFILE = $CFG->{profile}{default};
2574 2679
2575 # convert old bindings (only default profile matters) 2680 # convert old bindings (only default profile matters)
2576 if (my $bindings = delete $PROFILE->{bindings}) { 2681 if (my $bindings = delete $PROFILE->{bindings}) {
2577 while (my ($mod, $syms) = each %$bindings) { 2682 while (my ($mod, $syms) = each %$bindings) {
2578 while (my ($sym, $cmds) = each %$syms) { 2683 while (my ($sym, $cmds) = each %$syms) {
2579 push @{ $PROFILE->{macro} }, { 2684 push @{ $PROFILE->{macro} }, {
2580 accelkey => [$mod*1, $sym*1], 2685 accelkey => [$mod*1, $sym*1],
2581 action => $cmds, 2686 action => $cmds,
2687 };
2582 }; 2688 }
2583 } 2689 }
2584 } 2690 }
2585 }
2586 2691
2587 sdl_init; 2692 sdl_init;
2588 2693
2589 { 2694 {
2590 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2695 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591 DejaVuSans.ttf 2696 DejaVuSans.ttf
2592 DejaVuSansMono.ttf 2697 DejaVuSansMono.ttf
2593 DejaVuSans-Bold.ttf 2698 DejaVuSans-Bold.ttf
2594 DejaVuSansMono-Bold.ttf 2699 DejaVuSansMono-Bold.ttf
2595 DejaVuSans-Oblique.ttf 2700 DejaVuSans-Oblique.ttf
2596 DejaVuSansMono-Oblique.ttf 2701 DejaVuSansMono-Oblique.ttf
2597 DejaVuSans-BoldOblique.ttf 2702 DejaVuSans-BoldOblique.ttf
2598 DejaVuSansMono-BoldOblique.ttf 2703 DejaVuSansMono-BoldOblique.ttf
2599 ); 2704 );
2600 2705
2601 DC::add_font $_ for @fonts; 2706 DC::add_font $_ for @fonts;
2602 2707
2603 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2708 $FONT_PROP = new_from_file DC::Font $fonts[0];
2604 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2709 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2605 2710
2606 $FONT_PROP->make_default; 2711 $FONT_PROP->make_default;
2607 2712
2608 DC::pango_init; 2713 DC::pango_init;
2609 } 2714 }
2610 2715
2611# compare mono (ft) vs. rgba (cairo) 2716# compare mono (ft) vs. rgba (cairo)
2612# ft - 1.8s, cairo 3s, even in alpha-only mode 2717# ft - 1.8s, cairo 3s, even in alpha-only mode
2613# for my $rgba (0..1) { 2718# for my $rgba (0..1) {
2614# my $t1 = Time::HiRes::time; 2719# my $t1 = Time::HiRes::time;
… …
2619# } 2724# }
2620# my $t2 = Time::HiRes::time; 2725# my $t2 = Time::HiRes::time;
2621# warn $t2-$t1; 2726# warn $t2-$t1;
2622# } 2727# }
2623 2728
2624 video_init; 2729 video_init;
2625 audio_init; 2730 audio_init;
2626} 2731 }
2627 2732
2628show_tip_of_the_day if $CFG->{show_tips}; 2733 show_tip_of_the_day if $CFG->{show_tips};
2629 2734
2630our $STARTUP_CANCEL = EV::idle sub { 2735 our $STARTUP_CANCEL = EV::idle sub {
2631 undef $::STARTUP_CANCEL; 2736 undef $::STARTUP_CANCEL;
2632 $startup_done->(); 2737 $startup_done->();
2633}; 2738 };
2634 2739
2635delete $SIG{__DIE__}; 2740 delete $SIG{__DIE__};
2636EV::loop; 2741 EV::loop;
2637 2742
2638#video_shutdown; 2743#video_shutdown;
2639#audio_shutdown; 2744#audio_shutdown;
2640DC::OpenGL::quit; 2745 DC::OpenGL::quit;
2641DC::SDL_Quit; 2746 DC::SDL_Quit;
2642DC::DB::Server::stop; 2747 DC::DB::Server::stop;
2748}
2749
2750DC::SDL_braino; # see sub above
2643 2751
2644=head1 NAME 2752=head1 NAME
2645 2753
2646deliantra - A Deliantra MORPG game client 2754deliantra - A Deliantra MORPG game client
2647 2755
… …
2664 4 show fps 2772 4 show fps
2665 8 suppress tooltips 2773 8 suppress tooltips
2666 2774
2667=head1 AUTHOR 2775=head1 AUTHOR
2668 2776
2669Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2777Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670 2778
2671 2779
2672 2780

Diff Legend

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