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.74 by root, Wed Sep 3 06:23:04 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
108use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
109 89
110use AnyEvent::Util (); 90use AnyEvent::Util ();
111use AnyEvent::DNS; 91use AnyEvent::DNS;
112use AnyEvent::Socket (); 92use AnyEvent::Socket ();
93use AnyEvent::DNS ();
113 94
114use Compress::LZF; 95use Compress::LZF;
115use JSON::XS; 96use JSON::XS;
116 97
117use DC; 98use DC;
145 126
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 127$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 128$SIG{PIPE} = 'IGNORE';
148 129
149$EV::DIED = sub { 130$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 131 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 132 DC::fatal Carp::longmess $@;
152}; 133};
153 134
154my $MAX_FPS = 60; 135my $MAX_FPS = 60;
155 136
235# write a crash message blockingly to the socket, if possible 216# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 217# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 218*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 219 my ($msg, $backtrace) = @_;
239 220
221 warn $msg;
222
240 return unless $CONN; 223 return unless $CONN;
241 224
242 my $fh = $CONN->{fh} 225 my $fh = $CONN->{fh}
243 or return; 226 or return;
244 227
254 237
255 # backtrace as second step, in case it crashes, too 238 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 239 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 240 if $backtrace;
258}; 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}
259 253
260############################################################################# 254#############################################################################
261 255
262sub status { 256sub status {
263 $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]);
418 my $rwops = $meta->{path} 412 my $rwops = $meta->{path}
419 ? new_from_file DC::RW $meta->{path} 413 ? new_from_file DC::RW $meta->{path}
420 : new DC::RW $$MUSIC_PLAYING_DATA; 414 : new DC::RW $$MUSIC_PLAYING_DATA;
421 415
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 416 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 418
425 my $NOW = time; 419 my $NOW = time;
426 420
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 421 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 422 my $pos = $MUSIC_PLAYING_META->{stop_pos};
786} 780}
787 781
788sub dc_connect { 782sub dc_connect {
789 my ($host, $port) = @_; 783 my ($host, $port) = @_;
790 784
791 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;
792 787
793 $CONN = 788 $CONN =
794 new DC::Protocol 789 new DC::Protocol
795 host => $host, 790 host => $host,
796 port => $port, 791 port => $port,
797 user => $PROFILE->{user}, 792 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 793 pass => $PROFILE->{password},
799 mapw => $mapsize, 794 mapw => $mapw,
800 maph => $mapsize, 795 maph => $maph,
801 796
802 client => "$DC::VERSION $] $^O", 797 client => "$DC::VERSION $] $^O",
803 798
804 map_widget => $MAPWIDGET, 799 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 800 statusbox => $STATUSBOX,
875} 870}
876 871
877sub graphics_setup { 872sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 873 my $vbox = new DC::UI::VBox;
879 874
875 {
876 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
877
880 $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]);
881 879
882 my $row = 0; 880 my $row = 0;
883 881
884 $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");
885 $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,
886 can_events => 1, 884 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 886
889 $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");
890 $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,
891 can_events => 1, 889 can_events => 1,
892 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 "
893 . "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 "
894 . "by selecting a different video mode, changing the settings below or " 892 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 893 . "by installing the right driver for your graphics card.");
896 894
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme"); 895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
898 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector 896 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme}, 897 value => $CFG->{uitheme},
900 options => [ 898 options => [
901 [wood => "Wood (the default)"], 899 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"], 900 [plain => "Plain (very)"],
903 [blue => "Blue"], 901 [blue => "Blue (dark)"],
902 [metal => "Metal (light)"],
904 ], 903 ],
905 tooltip => "Choose the User Interface theme that you like most :)", 904 tooltip => "Choose the User Interface theme that you like most :)",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 } 905 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
907 ); 906 );
908 907
909 my $vidmode_tooltip = 908 my $vidmode_tooltip =
910 "<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). "
911 . "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>.";
912 911
913 $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");
914 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
915 914
916 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
917 force_w => $WIDTH * 0.1, expand => 1, 916 force_w => $WIDTH * 0.1, expand => 1,
918 range => [ ($CFG->{sdl_mode}) x 3 ], 917 range => [ ($CFG->{sdl_mode}) x 3 ],
919 tooltip => $vidmode_tooltip); 918 tooltip => $vidmode_tooltip);
920 $hbox->add (my $mode_label = new DC::UI::Label 919 $hbox->add (my $mode_label = new DC::UI::Label
921 height => 0.8, template => "9999x9999@9+9", 920 height => 0.8, template => "9999x9999@9+9",
922 can_events => 1, tooltip => $vidmode_tooltip); 921 can_events => 1, tooltip => $vidmode_tooltip);
923 922
924 $MODE_SLIDER->connect (changed => sub { 923 $MODE_SLIDER->connect (changed => sub {
925 my ($self, $value) = @_;
926
927 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
928 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
929 });
930 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
931
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
933 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
934 state => $CFG->{fullscreen},
935 tooltip => "Bring the client into fullscreen mode.",
936 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
937 );
938
939 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
940 $table->add_at (1, $row++, new DC::UI::CheckBox
941 state => $CFG->{force_opengl11},
942 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
943 . "higher memory usage and slower performance. It will, however, help tremendously on "
944 . "cards that claim to support a feature but fall back to software rendering. "
945 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
946 . "but cards and drivers from other vendors (ATI) are often just as bad. "
947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
948 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
949 );
950
951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
952 $table->add_at (1, $row++, new DC::UI::CheckBox
953 state => $CFG->{disable_alpha},
954 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
955 . "by disabling a number of textures and transparency effects. Normally, these "
956 . "effects do not cost a lot of resources, but some graphics cards might fall "
957 . "back to etxremely slow rendering if this is enabled. If disabling this option "
958 . "noticably improves the framerate of the client please report this! "
959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
960 on_changed => sub {
961 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) = @_;
962 $CFG->{disable_alpha} = $value; 961 $CFG->{disable_alpha} = $value;
963 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 962 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
963 0
964 0 964 }
965 } 965 );
966 );
967 966
968 $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");
969 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
970 state => $CFG->{texture_compression}, 969 state => $CFG->{texture_compression},
971 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 "
972 . "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). "
973 . "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 "
974 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 973 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
975 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
976 ); 975 );
977 976
978 $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");
979 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
980 state => $CFG->{fast}, 979 state => $CFG->{fast},
981 tooltip => "Lower the visual quality considerably to speed up rendering.", 980 tooltip => "Lower the visual quality considerably to speed up rendering.",
982 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 981 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
983 ); 982 );
984 983
985 $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");
986 $table->add_at (1, $row++, new DC::UI::Slider 985 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 986 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
988 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.",
989 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 988 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
990 ); 989 );
991 990
992 $table->add_at (1, $row++, new DC::UI::Button 991 $table->add_at (1, $row++, new DC::UI::Button
993 expand => 1, text => "Apply", 992 expand => 1, text => "Apply",
994 tooltip => "Apply the video settings above.", 993 tooltip => "Apply the video settings above.",
995 on_activate => sub { 994 on_activate => sub {
996 video_shutdown (); 995 video_shutdown ();
997 video_init (); 996 video_init ();
997 0
998 0 998 }
999 } 999 );
1000 ); 1000 }
1001 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;
1002 $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");
1003 $table->add_at (1, $row++, new DC::UI::CheckBox 1009 $table->add_at (1, $row++, new DC::UI::CheckBox
1004 state => $CFG->{smooth_movement}, 1010 state => $CFG->{smooth_movement},
1005 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. "
1006 . "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, "
1007 . "then disable this option. Changes take effect immdiately.", 1013 . "then disable this option. Changes take effect immdiately.",
1008 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1014 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1009 ); 1015 );
1010 1016
1011 $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");
1012 $table->add_at (1, $row++, new DC::UI::Slider 1018 $table->add_at (1, $row++, new DC::UI::Slider
1013 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1019 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1014 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1020 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1015 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 }
1016 ); 1022 );
1017 1023
1018 $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");
1019 $table->add_at (1, $row++, new DC::UI::CheckBox 1025 $table->add_at (1, $row++, new DC::UI::CheckBox
1020 state => $CFG->{map_smoothing}, 1026 state => $CFG->{map_smoothing},
1021 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. "
1022 . "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. "
1023 . "Changes take effect at next login only.", 1029 . "Changes take effect at next login only.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1025 ); 1031 );
1026 1032
1027 $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");
1028 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
1029 state => $CFG->{fow_enable}, 1035 state => $CFG->{fow_enable},
1030 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.",
1031 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1032 ); 1038 );
1033 1039
1034 $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");
1035 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
1036 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1042 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1037 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.",
1038 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1044 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1039 ); 1045 );
1040 1046
1041 $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");
1042 $table->add_at (1, $row++, new DC::UI::Slider 1048 $table->add_at (1, $row++, new DC::UI::Slider
1043 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1049 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1044 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, "
1045 . "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.",
1046 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 },
1047 ); 1053 );
1048 1054
1049 $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");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1057 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1052 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.",
1053 on_changed => sub { 1059 on_changed => sub {
1054 $CFG->{gauge_fontsize} = $_[1]; 1060 $CFG->{gauge_fontsize} = $_[1];
1055 &set_gauge_window_fontsize; 1061 &set_gauge_window_fontsize;
1062 0
1056 0 1063 }
1057 } 1064 );
1058 );
1059 1065
1060 $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");
1061 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
1062 range => [$CFG->{gauge_size}, 0.2, 0.8], 1068 range => [$CFG->{gauge_size}, 0.2, 0.8],
1063 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.",
1064 on_changed => sub { 1070 on_changed => sub {
1065 $CFG->{gauge_size} = $_[1]; 1071 $CFG->{gauge_size} = $_[1];
1066 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1072 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1073 0
1067 0 1074 }
1068 } 1075 );
1069 ); 1076 }
1070 1077
1071 $vbox 1078 $vbox
1072} 1079}
1073 1080
1074our $AUDIO_HW_CHUNKSIZE; 1081our $AUDIO_HW_CHUNKSIZE;
2369 x => 0, 2376 x => 0,
2370 y => $FONTSIZE + 8, 2377 y => $FONTSIZE + 8,
2371 border_bg => [1, 1, 1, 192/255], 2378 border_bg => [1, 1, 1, 192/255],
2372 bg => [1, 1, 1, 0], 2379 bg => [1, 1, 1, 0],
2373 child => ($MAPMAP = new DC::MapWidget::MapMap 2380 child => ($MAPMAP = new DC::MapWidget::MapMap
2374 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.",
2375 ), 2382 ),
2376 )->show; 2383 )->show;
2377 2384
2378 $MAPWIDGET = new DC::MapWidget; 2385 $MAPWIDGET = new DC::MapWidget;
2379 $MAPWIDGET->connect (activate_console => sub { 2386 $MAPWIDGET->connect (activate_console => sub {
2593$SIG{INT} = $SIG{TERM} = sub { 2600$SIG{INT} = $SIG{TERM} = sub {
2594 EV::unloop; 2601 EV::unloop;
2595 #d# TODO calling exit here hangs the process in some futex 2602 #d# TODO calling exit here hangs the process in some futex
2596}; 2603};
2597 2604
2605# initialise the resolver now, as vista forces us back to the desktop
2606# when doing this.
2607AnyEvent::DNS::resolver;
2608
2598# 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
2599sub main { 2610sub main {
2600 { 2611 {
2601 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2602 2613
2603 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines