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.66 by root, Mon Sep 1 09:12:08 2008 UTC vs.
Revision 1.83 by root, Sun Jan 4 10:22:19 2009 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 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
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";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 54 } else {
75 # OS X 55 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?! 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?! 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 59 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 60 chdir $root; # for pango modules, maybe other things
81 } 61 }
82 62
… …
97 77
98# 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
99unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 80 if %PAR::LibCache;
101 81
102use Time::HiRes 'time';
103use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
104use List::Util qw(max min); 85use List::Util qw(max min);
105 86
106use Deliantra; 87use Deliantra;
107use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
108 89
109use AnyEvent::Util (); 90use AnyEvent::Util ();
110use AnyEvent::DNS; 91use AnyEvent::DNS;
111use AnyEvent::Socket (); 92use AnyEvent::Socket ();
93use AnyEvent::DNS ();
112 94
113use Compress::LZF; 95use Compress::LZF;
114use JSON::XS; 96use JSON::XS;
115 97
116use DC; 98use DC;
117 99
118#############################################################################
119
120our $CONN;
121
122# write a crash message blockingly to the socket, if possible
123# this is a bit too complicated for my tastes, but it was easy.
124sub crash($;$) { 100sub crash($;$) {
125 my ($msg, $backtrace) = @_; 101 # nop during compiletime
126
127 return unless $CONN;
128
129 my $fh = $CONN->{fh}
130 or return;
131
132 my $buf = delete $CONN->{wbuf};
133
134 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
135
136 AnyEvent::Util::fh_nonblocking $fh, 0;
137
138 syswrite $fh, $buf;
139 AnyEvent::Util::fh_nonblocking $fh, 1;
140
141 $msg =~ s/\s+$//;
142
143 # backtrace as second step, in case it crashes, too
144 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
145 if $backtrace;
146} 102}
147
148#############################################################################
149 103
150BEGIN { 104BEGIN {
151 $SIG{__DIE__} = sub { 105 $SIG{__DIE__} = sub {
152 return if $^S; 106 return if $^S;
153 crash ("CRASH/DIE: $_[0]" => 1); 107 crash "CRASH/DIE: $_[0]" => 1;
154 DC::fatal Carp::longmess "$_[0]"; 108 DC::fatal Carp::longmess "$_[0]";
155 } 109 }
156} 110}
157 111
158use DC::OpenGL (); 112use DC::OpenGL ();
… …
172 126
173$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 127$SIG{QUIT} = sub { Carp::cluck "QUIT" };
174$SIG{PIPE} = 'IGNORE'; 128$SIG{PIPE} = 'IGNORE';
175 129
176$EV::DIED = sub { 130$EV::DIED = sub {
177 crash ("CRASH/EV::DIED: $@" => 1); 131 crash "CRASH/EV::DIED: $@" => 0;
178 DC::fatal Carp::longmess $@; 132 DC::fatal Carp::longmess $@;
179}; 133};
180 134
181my $MAX_FPS = 60; 135my $MAX_FPS = 60;
182 136
… …
201our $FULLSCREEN; 155our $FULLSCREEN;
202our $FONTSIZE; 156our $FONTSIZE;
203 157
204our $FONT_PROP; 158our $FONT_PROP;
205our $FONT_FIXED; 159our $FONT_FIXED;
160
161our $CONN;
206 162
207our $MAP; 163our $MAP;
208our $MAPMAP; 164our $MAPMAP;
209our $MAPWIDGET; 165our $MAPWIDGET;
210our $COMPLETER; 166our $COMPLETER;
… …
252our $DEBUG_STATUS; 208our $DEBUG_STATUS;
253 209
254our $INV; 210our $INV;
255our $INVR; 211our $INVR;
256our $INVR_HB; 212our $INVR_HB;
213
214#############################################################################
215
216# write a crash message blockingly to the socket, if possible
217# this is a bit too complicated for my tastes, but it was easy.
218*crash = sub($;$) {
219 my ($msg, $backtrace) = @_;
220
221 warn $msg;
222
223 return unless $CONN;
224
225 my $fh = $CONN->{fh}
226 or return;
227
228 my $buf = delete $CONN->{wbuf};
229
230 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
231
232 AnyEvent::Util::fh_nonblocking $fh, 0;
233 syswrite $fh, $buf;
234 AnyEvent::Util::fh_nonblocking $fh, 1;
235
236 $msg =~ s/\s+$//;
237
238 # backtrace as second step, in case it crashes, too
239 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
240 if $backtrace;
241};
242
243sub clienterror($;$) {
244 my ($msg, $backtrace) = @_;
245
246 warn $msg;
247
248 return unless $CONN;
249
250 $CONN->send_exti_msg (clientlog => $msg);
251 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
252}
257 253
258############################################################################# 254#############################################################################
259 255
260sub status { 256sub status {
261 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 257 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
416 my $rwops = $meta->{path} 412 my $rwops = $meta->{path}
417 ? new_from_file DC::RW $meta->{path} 413 ? new_from_file DC::RW $meta->{path}
418 : new DC::RW $$MUSIC_PLAYING_DATA; 414 : new DC::RW $$MUSIC_PLAYING_DATA;
419 415
420 $MUSIC_PLAYER = new DC::MixMusic $rwops 416 $MUSIC_PLAYER = new DC::MixMusic $rwops
421 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
422 418
423 my $NOW = time; 419 my $NOW = time;
424 420
425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 421 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
426 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 422 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
784} 780}
785 781
786sub dc_connect { 782sub dc_connect {
787 my ($host, $port) = @_; 783 my ($host, $port) = @_;
788 784
789 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 785 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
786 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
790 787
791 $CONN = 788 $CONN =
792 new DC::Protocol 789 new DC::Protocol
793 host => $host, 790 host => $host,
794 port => $port, 791 port => $port,
795 user => $PROFILE->{user}, 792 user => $PROFILE->{user},
796 pass => $PROFILE->{password}, 793 pass => $PROFILE->{password},
797 mapw => $mapsize, 794 mapw => $mapw,
798 maph => $mapsize, 795 maph => $maph,
799 796
800 client => "$DC::VERSION $] $^O", 797 client => "$DC::VERSION $] $^O",
801 798
802 map_widget => $MAPWIDGET, 799 map_widget => $MAPWIDGET,
803 statusbox => $STATUSBOX, 800 statusbox => $STATUSBOX,
… …
873} 870}
874 871
875sub graphics_setup { 872sub graphics_setup {
876 my $vbox = new DC::UI::VBox; 873 my $vbox = new DC::UI::VBox;
877 874
875 {
876 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
877
878 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 878 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
879 879
880 my $row = 0; 880 my $row = 0;
881 881
882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
883 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 883 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
884 can_events => 1, 884 can_events => 1,
885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
886 886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
888 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 888 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
889 can_events => 1, 889 can_events => 1,
890 tooltip => "This field shows any known issues with your config or driver, such as " 890 tooltip => "This field shows any known issues with your config or driver, such as "
891 . "a non-accelerated display format. You can try to work around these issues " 891 . "a non-accelerated display format. You can try to work around these issues "
892 . "by selecting a different video mode, changing the settings below or " 892 . "by selecting a different video mode, changing the settings below or "
893 . "by installing the right driver for your graphics card."); 893 . "by installing the right driver for your graphics card.");
894 894
895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
896 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
897 value => $CFG->{uitheme},
898 options => [
899 [wood => "Wood (the default)"],
900 [plain => "Plain (very)"],
901 [blue => "Blue (dark)"],
902 [metal => "Metal (light)"],
903 ],
904 tooltip => "Choose the User Interface theme that you like most :)",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
906 );
907
895 my $vidmode_tooltip = 908 my $vidmode_tooltip =
896 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 909 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
897 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 910 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
898 911
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
900 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
901 914
902 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
903 force_w => $WIDTH * 0.1, expand => 1, 916 force_w => $WIDTH * 0.1, expand => 1,
904 range => [ ($CFG->{sdl_mode}) x 3 ], 917 range => [ ($CFG->{sdl_mode}) x 3 ],
905 tooltip => $vidmode_tooltip); 918 tooltip => $vidmode_tooltip);
906 $hbox->add (my $mode_label = new DC::UI::Label 919 $hbox->add (my $mode_label = new DC::UI::Label
907 height => 0.8, template => "9999x9999@9+9", 920 height => 0.8, template => "9999x9999@9+9",
908 can_events => 1, tooltip => $vidmode_tooltip); 921 can_events => 1, tooltip => $vidmode_tooltip);
909 922
910 $MODE_SLIDER->connect (changed => sub { 923 $MODE_SLIDER->connect (changed => sub {
911 my ($self, $value) = @_;
912
913 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
914 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
915 });
916 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
917
918 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
919 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
920 state => $CFG->{fullscreen},
921 tooltip => "Bring the client into fullscreen mode.",
922 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
923 );
924
925 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
926 $table->add_at (1, $row++, new DC::UI::CheckBox
927 state => $CFG->{force_opengl11},
928 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
929 . "higher memory usage and slower performance. It will, however, help tremendously on "
930 . "cards that claim to support a feature but fall back to software rendering. "
931 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
932 . "but cards and drivers from other vendors (ATI) are often just as bad. "
933 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
935 );
936
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
938 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{disable_alpha},
940 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
941 . "by disabling a number of textures and transparency effects. Normally, these "
942 . "effects do not cost a lot of resources, but some graphics cards might fall "
943 . "back to etxremely slow rendering if this is enabled. If disabling this option "
944 . "noticably improves the framerate of the client please report this! "
945 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
946 on_changed => sub {
947 my ($self, $value) = @_; 924 my ($self, $value) = @_;
925
926 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
927 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
928 });
929 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
930
931 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
932 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
933 state => $CFG->{fullscreen},
934 tooltip => "Bring the client into fullscreen mode.",
935 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
936 );
937
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
939 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{force_opengl11},
941 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
942 . "higher memory usage and slower performance. It will, however, help tremendously on "
943 . "cards that claim to support a feature but fall back to software rendering. "
944 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
945 . "but cards and drivers from other vendors (ATI) are often just as bad. "
946 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
947 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
948 );
949
950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
951 $table->add_at (1, $row++, new DC::UI::CheckBox
952 state => $CFG->{disable_alpha},
953 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
954 . "by disabling a number of textures and transparency effects. Normally, these "
955 . "effects do not cost a lot of resources, but some graphics cards might fall "
956 . "back to extremely slow rendering if this is enabled. If disabling this option "
957 . "noticably improves the framerate of the client please report this! "
958 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
959 on_changed => sub {
960 my ($self, $value) = @_;
948 $CFG->{disable_alpha} = $value; 961 $CFG->{disable_alpha} = $value;
949 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 962 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
963 0
950 0 964 }
951 } 965 );
952 );
953 966
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{texture_compression}, 969 state => $CFG->{texture_compression},
957 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 970 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
958 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 971 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
959 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 972 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
960 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 973 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
961 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
962 ); 975 );
963 976
964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
965 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
966 state => $CFG->{fast}, 979 state => $CFG->{fast},
967 tooltip => "Lower the visual quality considerably to speed up rendering.", 980 tooltip => "Lower the visual quality considerably to speed up rendering.",
968 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 981 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
969 ); 982 );
970 983
971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
972 $table->add_at (1, $row++, new DC::UI::Slider 985 $table->add_at (1, $row++, new DC::UI::Slider
973 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 986 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
974 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 987 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
975 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 988 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
976 ); 989 );
977 990
978 $table->add_at (1, $row++, new DC::UI::Button 991 $table->add_at (1, $row++, new DC::UI::Button
979 expand => 1, text => "Apply", 992 expand => 1, text => "Apply",
980 tooltip => "Apply the video settings above.", 993 tooltip => "Apply the video settings above.",
981 on_activate => sub { 994 on_activate => sub {
982 video_shutdown (); 995 video_shutdown ();
983 video_init (); 996 video_init ();
997 0
984 0 998 }
985 } 999 );
986 ); 1000 }
987 1001
1002 {
1003 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1004
1005 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1006
1007 my $row = 0;
988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1008 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
989 $table->add_at (1, $row++, new DC::UI::CheckBox 1009 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{smooth_movement}, 1010 state => $CFG->{smooth_movement},
991 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1011 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
992 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1012 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
993 . "then disable this option. Changes take effect immdiately.", 1013 . "then disable this option. Changes take effect immdiately.",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1014 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
995 ); 1015 );
996 1016
997 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
998 $table->add_at (1, $row++, new DC::UI::Slider 1018 $table->add_at (1, $row++, new DC::UI::Slider
999 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1019 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1000 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1020 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1001 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1021 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1002 ); 1022 );
1003 1023
1004 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1005 $table->add_at (1, $row++, new DC::UI::CheckBox 1025 $table->add_at (1, $row++, new DC::UI::CheckBox
1006 state => $CFG->{map_smoothing}, 1026 state => $CFG->{map_smoothing},
1007 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1027 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1008 . "This increases load on the graphics subsystem and works only with TRT servers. " 1028 . "This increases load on the graphics subsystem and works only with TRT servers. "
1009 . "Changes take effect at next login only.", 1029 . "Changes take effect at next login only.",
1010 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1011 ); 1031 );
1012 1032
1013 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1014 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
1015 state => $CFG->{fow_enable}, 1035 state => $CFG->{fow_enable},
1016 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1036 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1017 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1018 ); 1038 );
1019 1039
1020 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1021 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
1022 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1042 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1023 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1043 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1044 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1025 ); 1045 );
1026 1046
1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1047 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1028 $table->add_at (1, $row++, new DC::UI::Slider 1048 $table->add_at (1, $row++, new DC::UI::Slider
1029 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1049 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1030 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1050 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1031 . "but you still need to press apply to correctly re-layout the widget.", 1051 . "but you still need to press apply to correctly re-layout the widget.",
1032 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1052 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1033 ); 1053 );
1034 1054
1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1036 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
1037 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1057 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1038 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1058 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1039 on_changed => sub { 1059 on_changed => sub {
1040 $CFG->{gauge_fontsize} = $_[1]; 1060 $CFG->{gauge_fontsize} = $_[1];
1041 &set_gauge_window_fontsize; 1061 &set_gauge_window_fontsize;
1062 0
1042 0 1063 }
1043 } 1064 );
1044 );
1045 1065
1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1047 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
1048 range => [$CFG->{gauge_size}, 0.2, 0.8], 1068 range => [$CFG->{gauge_size}, 0.2, 0.8],
1049 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1069 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1050 on_changed => sub { 1070 on_changed => sub {
1051 $CFG->{gauge_size} = $_[1]; 1071 $CFG->{gauge_size} = $_[1];
1052 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1072 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1073 0
1053 0 1074 }
1054 } 1075 );
1055 ); 1076 }
1056 1077
1057 $vbox 1078 $vbox
1058} 1079}
1059 1080
1060our $AUDIO_HW_CHUNKSIZE; 1081our $AUDIO_HW_CHUNKSIZE;
… …
2247 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2268 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2248 and die "SDL::Init failed!\n"; 2269 and die "SDL::Init failed!\n";
2249} 2270}
2250 2271
2251sub video_init { 2272sub video_init {
2273 DC::set_theme $CFG->{uitheme};
2274
2252 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2275 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2253 $SDL_REINIT = 0; 2276 $SDL_REINIT = 0;
2254 2277
2255 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2278 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2256 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2279 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2260 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2283 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2261 2284
2262 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2285 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2263 $CFG->{sdl_mode} = 0; # lowest resolution by default 2286 $CFG->{sdl_mode} = 0; # lowest resolution by default
2264 2287
2265 # now choose biggets mode <= 1024x768 2288 # now choose biggest mode <= 1024x768
2266 for (0 .. $#SDL_MODES) { 2289 for (0 .. $#SDL_MODES) {
2267 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2290 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2268 $CFG->{sdl_mode} = $_; 2291 $CFG->{sdl_mode} = $_;
2269 } 2292 }
2270 } 2293 }
… …
2353 x => 0, 2376 x => 0,
2354 y => $FONTSIZE + 8, 2377 y => $FONTSIZE + 8,
2355 border_bg => [1, 1, 1, 192/255], 2378 border_bg => [1, 1, 1, 192/255],
2356 bg => [1, 1, 1, 0], 2379 bg => [1, 1, 1, 0],
2357 child => ($MAPMAP = new DC::MapWidget::MapMap 2380 child => ($MAPMAP = new DC::MapWidget::MapMap
2358 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2381 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2359 ), 2382 ),
2360 )->show; 2383 )->show;
2361 2384
2362 $MAPWIDGET = new DC::MapWidget; 2385 $MAPWIDGET = new DC::MapWidget;
2363 $MAPWIDGET->connect (activate_console => sub { 2386 $MAPWIDGET->connect (activate_console => sub {
… …
2462 $BUTTONBAR->show; 2485 $BUTTONBAR->show;
2463 $SETUP_DIALOG->show; 2486 $SETUP_DIALOG->show;
2464 $MESSAGE_WINDOW->show; 2487 $MESSAGE_WINDOW->show;
2465 } 2488 }
2466 2489
2467 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2490 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2468 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2491 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2469 2492
2470 $CAVEAT_LABEL->set_text ("None :)"); 2493 $CAVEAT_LABEL->set_text ("None :)");
2471 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2494 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2472 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2495 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2577$SIG{INT} = $SIG{TERM} = sub { 2600$SIG{INT} = $SIG{TERM} = sub {
2578 EV::unloop; 2601 EV::unloop;
2579 #d# TODO calling exit here hangs the process in some futex 2602 #d# TODO calling exit here hangs the process in some futex
2580}; 2603};
2581 2604
2605# initialise the resolver now, as vista forces us back to the desktop
2606# when doing this.
2607AnyEvent::DNS::resolver;
2608
2582# due to mac os x + sdl combined briandamage, we need this contortion 2609# due to mac os x + sdl combined braindamage, we need this contortion
2583sub main { 2610sub main {
2584 { 2611 {
2585 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2586 2613
2587 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2637 inv_sort => "mtime", 2664 inv_sort => "mtime",
2638 default => "profile", # default profile 2665 default => "profile", # default profile
2639 show_tips => 1, 2666 show_tips => 1,
2640 logview_max_par => 1000, 2667 logview_max_par => 1000,
2641 shift_fire_stop => 0, 2668 shift_fire_stop => 0,
2669 uitheme => "wood",
2642 ); 2670 );
2643 2671
2644 while (my ($k, $v) = each %DEF_CFG) { 2672 while (my ($k, $v) = each %DEF_CFG) {
2645 $CFG->{$k} = $v unless exists $CFG->{$k}; 2673 $CFG->{$k} = $v unless exists $CFG->{$k};
2646 } 2674 }

Diff Legend

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