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.56 by root, Sat Jul 19 20:33:47 2008 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 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: $@" => 0;
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 warn $msg;
221
222 return unless $CONN;
223
224 my $fh = $CONN->{fh}
225 or return;
226
227 my $buf = delete $CONN->{wbuf};
228
229 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
230
231 AnyEvent::Util::fh_nonblocking $fh, 0;
232 syswrite $fh, $buf;
233 AnyEvent::Util::fh_nonblocking $fh, 1;
234
235 $msg =~ s/\s+$//;
236
237 # backtrace as second step, in case it crashes, too
238 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
239 if $backtrace;
240};
241
242sub clienterror($;$) {
243 my ($msg, $backtrace) = @_;
244
245 warn $msg;
246
247 return unless $CONN;
248
249 $CONN->send_exti_msg (clientlog => $msg);
250 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
251}
209 252
210############################################################################# 253#############################################################################
211 254
212sub status { 255sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 256 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
368 my $rwops = $meta->{path} 411 my $rwops = $meta->{path}
369 ? new_from_file DC::RW $meta->{path} 412 ? new_from_file DC::RW $meta->{path}
370 : new DC::RW $$MUSIC_PLAYING_DATA; 413 : new DC::RW $$MUSIC_PLAYING_DATA;
371 414
372 $MUSIC_PLAYER = new DC::MixMusic $rwops 415 $MUSIC_PLAYER = new DC::MixMusic $rwops
373 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 416 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
374 417
375 my $NOW = time; 418 my $NOW = time;
376 419
377 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 420 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
378 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 421 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
736} 779}
737 780
738sub dc_connect { 781sub dc_connect {
739 my ($host, $port) = @_; 782 my ($host, $port) = @_;
740 783
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 784 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
785 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742 786
743 $CONN = 787 $CONN =
744 new DC::Protocol 788 new DC::Protocol
745 host => $host, 789 host => $host,
746 port => $port, 790 port => $port,
747 user => $PROFILE->{user}, 791 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 792 pass => $PROFILE->{password},
749 mapw => $mapsize, 793 mapw => $mapw,
750 maph => $mapsize, 794 maph => $maph,
751 795
752 client => "$DC::VERSION $] $^O", 796 client => "$DC::VERSION $] $^O",
753 797
754 map_widget => $MAPWIDGET, 798 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 799 statusbox => $STATUSBOX,
… …
800 dc_connect $host, $port; 844 dc_connect $host, $port;
801 } 845 }
802} 846}
803 847
804sub stop_game { 848sub stop_game {
849 crash "stop_game";
850
805 $LOGIN_BUTTON->set_text ("Login / Register"); 851 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 852 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 853 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 854 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 855 $SPELL_LIST->clear_spells;
… …
823} 869}
824 870
825sub graphics_setup { 871sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 872 my $vbox = new DC::UI::VBox;
827 873
874 {
875 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
876
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 877 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 878
830 my $row = 0; 879 my $row = 0;
831 880
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 881 $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, 882 $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, 883 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 884 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 885
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 886 $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, 887 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 888 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 889 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 " 890 . "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 " 891 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 892 . "by installing the right driver for your graphics card.");
844 893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
895 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
896 value => $CFG->{uitheme},
897 options => [
898 [wood => "Wood (the default)"],
899 [plain => "Plain (very)"],
900 [blue => "Blue (dark)"],
901 [metal => "Metal (light)"],
902 ],
903 tooltip => "Choose the User Interface theme that you like most :)",
904 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
905 );
906
845 my $vidmode_tooltip = 907 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 908 "<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>."; 909 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 910
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 911 $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); 912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 913
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
853 force_w => $WIDTH * 0.1, expand => 1, 915 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 916 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 917 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 918 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 919 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 920 can_events => 1, tooltip => $vidmode_tooltip);
859 921
860 $MODE_SLIDER->connect (changed => sub { 922 $MODE_SLIDER->connect (changed => sub {
861 my ($self, $value) = @_;
862
863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
865 });
866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
867
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
870 state => $CFG->{fullscreen},
871 tooltip => "Bring the client into fullscreen mode.",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{force_opengl11},
878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
879 . "higher memory usage and slower performance. It will, however, help tremendously on "
880 . "cards that claim to support a feature but fall back to software rendering. "
881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_; 923 my ($self, $value) = @_;
924
925 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
926 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
927 });
928 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
929
930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
931 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
932 state => $CFG->{fullscreen},
933 tooltip => "Bring the client into fullscreen mode.",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
935 );
936
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
938 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{force_opengl11},
940 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
941 . "higher memory usage and slower performance. It will, however, help tremendously on "
942 . "cards that claim to support a feature but fall back to software rendering. "
943 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
944 . "but cards and drivers from other vendors (ATI) are often just as bad. "
945 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
946 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
947 );
948
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
950 $table->add_at (1, $row++, new DC::UI::CheckBox
951 state => $CFG->{disable_alpha},
952 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
953 . "by disabling a number of textures and transparency effects. Normally, these "
954 . "effects do not cost a lot of resources, but some graphics cards might fall "
955 . "back to extremely slow rendering if this is enabled. If disabling this option "
956 . "noticably improves the framerate of the client please report this! "
957 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
958 on_changed => sub {
959 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value; 960 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 961 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
962 0
900 0 963 }
901 } 964 );
902 );
903 965
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 966 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 968 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 969 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 970 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 971 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 972 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 974 );
913 975
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 978 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 979 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 981 );
920 982
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 984 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 985 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 986 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 987 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 988 );
927 989
928 $table->add_at (1, $row++, new DC::UI::Button 990 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 991 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 992 tooltip => "Apply the video settings above.",
931 on_activate => sub { 993 on_activate => sub {
932 video_shutdown (); 994 video_shutdown ();
933 video_init (); 995 video_init ();
996 0
934 0 997 }
935 } 998 );
936 ); 999 }
937 1000
1001 {
1002 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1003
1004 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1005
1006 my $row = 0;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1008 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1009 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1010 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1011 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 1012 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1014 );
946 1015
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
948 $table->add_at (1, $row++, new DC::UI::Slider 1017 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1020 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
952 ); 1021 );
953 1022
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1024 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1025 state => $CFG->{map_smoothing},
957 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1026 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
958 . "This increases load on the graphics subsystem and works only with TRT servers. " 1027 . "This increases load on the graphics subsystem and works only with TRT servers. "
959 . "Changes take effect at next login only.", 1028 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1030 );
962 1031
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1033 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1034 state => $CFG->{fow_enable},
966 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1035 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1037 );
969 1038
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
971 $table->add_at (1, $row++, new DC::UI::Slider 1040 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
973 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1042 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1044 );
976 1045
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
978 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1048 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1049 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
981 . "but you still need to press apply to correctly re-layout the widget.", 1050 . "but you still need to press apply to correctly re-layout the widget.",
982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1051 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1052 );
984 1053
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1056 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1057 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1058 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1059 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1060 &set_gauge_window_fontsize;
1061 0
992 0 1062 }
993 } 1063 );
994 );
995 1064
996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
997 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1067 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1068 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1000 on_changed => sub { 1069 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1070 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1071 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1072 0
1003 0 1073 }
1004 } 1074 );
1005 ); 1075 }
1006 1076
1007 $vbox 1077 $vbox
1008} 1078}
1009 1079
1010our $AUDIO_HW_CHUNKSIZE; 1080our $AUDIO_HW_CHUNKSIZE;
… …
1589 1 1659 1
1590 }, 1660 },
1591 ); 1661 );
1592 1662
1593 $vbox->add (new DC::UI::FancyFrame 1663 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1664 label => "How to Play",
1595 min_h => 200, 1665 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1666 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1667 markup =>
1668 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1669 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1670 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1671 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1672 ),
1601 ); 1673 );
1602 1674
1603 $vbox 1675 $vbox
… …
1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1821 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1750 ["Ignore cursed" => PICKUP_NOT_CURSED], 1822 ["Ignore cursed" => PICKUP_NOT_CURSED],
1751 ["Jewelery" => PICKUP_JEWELS], 1823 ["Jewelery" => PICKUP_JEWELS],
1752 ["Flesh" => PICKUP_FLESH], 1824 ["Flesh" => PICKUP_FLESH],
1753 ], 1825 ],
1754 ["Weight/Value ratio", 2, 17] 1826 ["Value/Weight ratio", 2, 17]
1755 ) 1827 )
1756 { 1828 {
1757 my ($title, $x, $y, @bits) = @$_; 1829 my ($title, $x, $y, @bits) = @$_;
1758 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1830 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1759 1831
… …
1784 } 1856 }
1785 1857
1786 $table->add_at (2, 18, new DC::UI::ValSlider 1858 $table->add_at (2, 18, new DC::UI::ValSlider
1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1859 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1788 template => ">= 99", 1860 template => ">= 99",
1861 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1789 to_value => sub { ">= " . 5 * $_[0] }, 1862 to_value => sub { ">= " . 5 * $_[0] },
1790 on_changed => sub { 1863 on_changed => sub {
1791 my ($slider, $value) = @_; 1864 my ($slider, $value) = @_;
1792 1865
1793 $::CFG->{pickup} &= ~0xF; 1866 $::CFG->{pickup} &= ~0xF;
… …
1849 $::CFG->{inv_sort} = $_[1]; 1922 $::CFG->{inv_sort} = $_[1];
1850 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1923 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1851 }, 1924 },
1852 ); 1925 );
1853 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1926 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1854 #TODO# update to weigh/maxweight 1927 #TODO# update to weight/maxweight
1855 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1928 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1856 1929
1857 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1930 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1858 $sw1->add ($INV = new DC::UI::Inventory); 1931 $sw1->add ($INV = new DC::UI::Inventory);
1859 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1932 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2123 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2196 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2124 ); 2197 );
2125 $hb->add (new DC::UI::Button 2198 $hb->add (new DC::UI::Button
2126 text => "Quit anyway", 2199 text => "Quit anyway",
2127 expand => 1, 2200 expand => 1,
2128 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2201 on_activate => sub {
2202 crash "Quit anyway";
2203 EV::unloop EV::UNLOOP_ALL;
2204 },
2129 ); 2205 );
2130 } 2206 }
2131 2207
2132 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2133 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
… …
2191 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2267 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2192 and die "SDL::Init failed!\n"; 2268 and die "SDL::Init failed!\n";
2193} 2269}
2194 2270
2195sub video_init { 2271sub video_init {
2272 DC::set_theme $CFG->{uitheme};
2273
2196 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2274 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2197 $SDL_REINIT = 0; 2275 $SDL_REINIT = 0;
2198 2276
2199 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2277 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2200 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2278 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2279 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2280 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2203 2281
2204 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2282 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2205 2283
2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2284 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0; 2285 $CFG->{sdl_mode} = 0; # lowest resolution by default
2286
2287 # now choose biggest mode <= 1024x768
2208 for (reverse 0 .. $#SDL_MODES) { 2288 for (0 .. $#SDL_MODES) {
2209 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2289 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2290 $CFG->{sdl_mode} = $_;
2291 }
2210 } 2292 }
2211 } 2293 }
2212 2294
2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2295 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2214 2296
2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2297 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2216 $FULLSCREEN = $CFG->{fullscreen}; 2298 $FULLSCREEN = $CFG->{fullscreen};
2217 $FAST = $CFG->{fast}; 2299 $FAST = $CFG->{fast};
2218 2300
2301 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2219 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2302 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2303 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2220 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2304 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2221 2305
2222 $SDL_ACTIVE = 1; 2306 $SDL_ACTIVE = 1;
2223 $LAST_REFRESH = time - 0.01; 2307 $LAST_REFRESH = time - 0.01;
2224 2308
… …
2291 x => 0, 2375 x => 0,
2292 y => $FONTSIZE + 8, 2376 y => $FONTSIZE + 8,
2293 border_bg => [1, 1, 1, 192/255], 2377 border_bg => [1, 1, 1, 192/255],
2294 bg => [1, 1, 1, 0], 2378 bg => [1, 1, 1, 0],
2295 child => ($MAPMAP = new DC::MapWidget::MapMap 2379 child => ($MAPMAP = new DC::MapWidget::MapMap
2296 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2380 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2297 ), 2381 ),
2298 )->show; 2382 )->show;
2299 2383
2300 $MAPWIDGET = new DC::MapWidget; 2384 $MAPWIDGET = new DC::MapWidget;
2301 $MAPWIDGET->connect (activate_console => sub { 2385 $MAPWIDGET->connect (activate_console => sub {
… …
2400 $BUTTONBAR->show; 2484 $BUTTONBAR->show;
2401 $SETUP_DIALOG->show; 2485 $SETUP_DIALOG->show;
2402 $MESSAGE_WINDOW->show; 2486 $MESSAGE_WINDOW->show;
2403 } 2487 }
2404 2488
2405 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2489 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2406 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2490 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2407 2491
2408 $CAVEAT_LABEL->set_text ("None :)"); 2492 $CAVEAT_LABEL->set_text ("None :)");
2409 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2493 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2410 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2494 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2465 delete $animate_object{$widget}; 2549 delete $animate_object{$widget};
2466} 2550}
2467 2551
2468%SDL_CB = ( 2552%SDL_CB = (
2469 DC::SDL_QUIT => sub { 2553 DC::SDL_QUIT => sub {
2554 crash "SDL_QUIT";
2470 EV::unloop EV::UNLOOP_ALL; 2555 EV::unloop EV::UNLOOP_ALL;
2471 }, 2556 },
2472 DC::SDL_VIDEORESIZE => sub { 2557 DC::SDL_VIDEORESIZE => sub {
2473 }, 2558 },
2474 DC::SDL_VIDEOEXPOSE => sub { 2559 DC::SDL_VIDEOEXPOSE => sub {
… …
2514$SIG{INT} = $SIG{TERM} = sub { 2599$SIG{INT} = $SIG{TERM} = sub {
2515 EV::unloop; 2600 EV::unloop;
2516 #d# TODO calling exit here hangs the process in some futex 2601 #d# TODO calling exit here hangs the process in some futex
2517}; 2602};
2518 2603
2519{ 2604# due to mac os x + sdl combined briandamage, we need this contortion
2605sub main {
2606 {
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2607 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521 2608
2522 if (-e "$Deliantra::VARDIR/client.cf") { 2609 if (-e "$Deliantra::VARDIR/client.cf") {
2523 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2610 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2524 } else { 2611 } else {
2525 #TODO: compatibility cruft 2612 #TODO: compatibility cruft
2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2613 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2527 print STDERR "INFO: used old configuration file\n"; 2614 print STDERR "INFO: used old configuration file\n";
2528 } 2615 }
2529 2616
2530 DC::DB::Server::run; 2617 DC::DB::Server::run;
2531 2618
2532 if ($CFG->{db_schema} < 1) { 2619 if ($CFG->{db_schema} < 1) {
2533 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2620 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2534 DC::DB::nuke_db; 2621 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1; 2622 $CFG->{db_schema} = 1;
2536 DC::write_cfg; 2623 DC::write_cfg;
2537 } 2624 }
2538 2625
2539 DC::DB::open_db; 2626 DC::DB::open_db;
2540 2627
2541 DC::UI::set_layout ($::CFG->{layout}); 2628 DC::UI::set_layout ($::CFG->{layout});
2542 2629
2543 my %DEF_CFG = ( 2630 my %DEF_CFG = (
2544 sdl_mode => 0, 2631 sdl_mode => undef,
2545 fullscreen => 1, 2632 fullscreen => 1,
2546 fast => 0, 2633 fast => 0,
2547 force_opengl11 => undef, 2634 force_opengl11 => undef,
2548 disable_alpha => 0, 2635 disable_alpha => 0,
2549 smooth_movement => 1, 2636 smooth_movement => 1,
2550 texture_compression => 1, 2637 texture_compression => 1,
2551 map_scale => 1, 2638 map_scale => 1,
2552 fow_enable => 1, 2639 fow_enable => 1,
2553 fow_intensity => 0, 2640 fow_intensity => 0,
2554 map_smoothing => 1, 2641 map_smoothing => 1,
2555 gui_fontsize => 1, 2642 gui_fontsize => 1,
2556 log_fontsize => 0.7, 2643 log_fontsize => 0.7,
2557 gauge_fontsize => 1, 2644 gauge_fontsize => 1,
2558 gauge_size => 0.35, 2645 gauge_size => 0.35,
2559 stat_fontsize => 0.7, 2646 stat_fontsize => 0.7,
2560 mapsize => 100, 2647 mapsize => 100,
2561 audio_enable => 1, 2648 audio_enable => 1,
2562 audio_hw_channels => 0, 2649 audio_hw_channels => 0,
2563 audio_hw_frequency => 0, 2650 audio_hw_frequency => 0,
2564 audio_hw_chunksize => 0, 2651 audio_hw_chunksize => 0,
2565 audio_mix_channels => 8, 2652 audio_mix_channels => 8,
2566 effects_enable => 1, 2653 effects_enable => 1,
2567 effects_volume => 1, 2654 effects_volume => 1,
2568 bgm_enable => 1, 2655 bgm_enable => 1,
2569 bgm_volume => 0.5, 2656 bgm_volume => 0.5,
2570 output_rate => "", 2657 output_rate => "",
2571 pickup => 0, 2658 pickup => 0,
2572 inv_sort => "mtime", 2659 inv_sort => "mtime",
2573 default => "profile", # default profile 2660 default => "profile", # default profile
2574 show_tips => 1, 2661 show_tips => 1,
2575 logview_max_par => 1000, 2662 logview_max_par => 1000,
2576 shift_fire_stop => 0, 2663 shift_fire_stop => 0,
2664 uitheme => "wood",
2577 ); 2665 );
2578 2666
2579 while (my ($k, $v) = each %DEF_CFG) { 2667 while (my ($k, $v) = each %DEF_CFG) {
2580 $CFG->{$k} = $v unless exists $CFG->{$k}; 2668 $CFG->{$k} = $v unless exists $CFG->{$k};
2581 } 2669 }
2582 2670
2583 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2671 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2584 $PROFILE = $CFG->{profile}{default}; 2672 $PROFILE = $CFG->{profile}{default};
2585 2673
2586 # convert old bindings (only default profile matters) 2674 # convert old bindings (only default profile matters)
2587 if (my $bindings = delete $PROFILE->{bindings}) { 2675 if (my $bindings = delete $PROFILE->{bindings}) {
2588 while (my ($mod, $syms) = each %$bindings) { 2676 while (my ($mod, $syms) = each %$bindings) {
2589 while (my ($sym, $cmds) = each %$syms) { 2677 while (my ($sym, $cmds) = each %$syms) {
2590 push @{ $PROFILE->{macro} }, { 2678 push @{ $PROFILE->{macro} }, {
2591 accelkey => [$mod*1, $sym*1], 2679 accelkey => [$mod*1, $sym*1],
2592 action => $cmds, 2680 action => $cmds,
2681 };
2593 }; 2682 }
2594 } 2683 }
2595 } 2684 }
2596 }
2597 2685
2598 sdl_init; 2686 sdl_init;
2599 2687
2600 { 2688 {
2601 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2689 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2602 DejaVuSans.ttf 2690 DejaVuSans.ttf
2603 DejaVuSansMono.ttf 2691 DejaVuSansMono.ttf
2604 DejaVuSans-Bold.ttf 2692 DejaVuSans-Bold.ttf
2605 DejaVuSansMono-Bold.ttf 2693 DejaVuSansMono-Bold.ttf
2606 DejaVuSans-Oblique.ttf 2694 DejaVuSans-Oblique.ttf
2607 DejaVuSansMono-Oblique.ttf 2695 DejaVuSansMono-Oblique.ttf
2608 DejaVuSans-BoldOblique.ttf 2696 DejaVuSans-BoldOblique.ttf
2609 DejaVuSansMono-BoldOblique.ttf 2697 DejaVuSansMono-BoldOblique.ttf
2610 ); 2698 );
2611 2699
2612 DC::add_font $_ for @fonts; 2700 DC::add_font $_ for @fonts;
2613 2701
2614 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2702 $FONT_PROP = new_from_file DC::Font $fonts[0];
2615 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2703 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2616 2704
2617 $FONT_PROP->make_default; 2705 $FONT_PROP->make_default;
2618 2706
2619 DC::pango_init; 2707 DC::pango_init;
2620 } 2708 }
2621 2709
2622# compare mono (ft) vs. rgba (cairo) 2710# compare mono (ft) vs. rgba (cairo)
2623# ft - 1.8s, cairo 3s, even in alpha-only mode 2711# ft - 1.8s, cairo 3s, even in alpha-only mode
2624# for my $rgba (0..1) { 2712# for my $rgba (0..1) {
2625# my $t1 = Time::HiRes::time; 2713# my $t1 = Time::HiRes::time;
… …
2630# } 2718# }
2631# my $t2 = Time::HiRes::time; 2719# my $t2 = Time::HiRes::time;
2632# warn $t2-$t1; 2720# warn $t2-$t1;
2633# } 2721# }
2634 2722
2635 video_init; 2723 video_init;
2636 audio_init; 2724 audio_init;
2637} 2725 }
2638 2726
2639show_tip_of_the_day if $CFG->{show_tips}; 2727 show_tip_of_the_day if $CFG->{show_tips};
2640 2728
2641our $STARTUP_CANCEL = EV::idle sub { 2729 our $STARTUP_CANCEL = EV::idle sub {
2642 undef $::STARTUP_CANCEL; 2730 undef $::STARTUP_CANCEL;
2643 $startup_done->(); 2731 $startup_done->();
2644}; 2732 };
2645 2733
2646delete $SIG{__DIE__}; 2734 delete $SIG{__DIE__};
2647EV::loop; 2735 EV::loop;
2648 2736
2649#video_shutdown; 2737#video_shutdown;
2650#audio_shutdown; 2738#audio_shutdown;
2651DC::OpenGL::quit; 2739 DC::OpenGL::quit;
2652DC::SDL_Quit; 2740 DC::SDL_Quit;
2653DC::DB::Server::stop; 2741 DC::DB::Server::stop;
2742}
2743
2744DC::SDL_braino; # see sub above
2654 2745
2655=head1 NAME 2746=head1 NAME
2656 2747
2657deliantra - A Deliantra MORPG game client 2748deliantra - A Deliantra MORPG game client
2658 2749
… …
2675 4 show fps 2766 4 show fps
2676 8 suppress tooltips 2767 8 suppress tooltips
2677 2768
2678=head1 AUTHOR 2769=head1 AUTHOR
2679 2770
2680Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2771Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2681 2772
2682 2773
2683 2774

Diff Legend

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