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.73 by root, Wed Sep 3 06:07:39 2008 UTC vs.
Revision 1.84 by root, Fri Jan 9 22:38:17 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # 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 { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?! 61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?! 62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 63 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 64 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 65 chdir $root; # for pango modules, maybe other things
81 } 66 }
82 67
… …
106 91
107use Deliantra; 92use Deliantra;
108use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
109 94
110use AnyEvent::Util (); 95use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
113 98
114use Compress::LZF; 99use Compress::LZF;
115use JSON::XS; 100use JSON::XS;
116 101
117use DC; 102use DC;
… …
145 130
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
148 133
149$EV::DIED = sub { 134$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 135 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
152}; 137};
153 138
154my $MAX_FPS = 60; 139my $MAX_FPS = 60;
155 140
… …
235# write a crash message blockingly to the socket, if possible 220# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 221# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 222*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 223 my ($msg, $backtrace) = @_;
239 224
225 warn $msg;
226
240 return unless $CONN; 227 return unless $CONN;
241 228
242 my $fh = $CONN->{fh} 229 my $fh = $CONN->{fh}
243 or return; 230 or return;
244 231
… …
254 241
255 # backtrace as second step, in case it crashes, too 242 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 243 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 244 if $backtrace;
258}; 245};
246
247sub clienterror($;$) {
248 my ($msg, $backtrace) = @_;
249
250 warn $msg;
251
252 return unless $CONN;
253
254 $CONN->send_exti_msg (clientlog => $msg);
255 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
256}
259 257
260############################################################################# 258#############################################################################
261 259
262sub status { 260sub status {
263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 261 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
418 my $rwops = $meta->{path} 416 my $rwops = $meta->{path}
419 ? new_from_file DC::RW $meta->{path} 417 ? new_from_file DC::RW $meta->{path}
420 : new DC::RW $$MUSIC_PLAYING_DATA; 418 : new DC::RW $$MUSIC_PLAYING_DATA;
421 419
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 420 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 421 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 422
425 my $NOW = time; 423 my $NOW = time;
426 424
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 426 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
786} 784}
787 785
788sub dc_connect { 786sub dc_connect {
789 my ($host, $port) = @_; 787 my ($host, $port) = @_;
790 788
791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 789 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
790 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
792 791
793 $CONN = 792 $CONN =
794 new DC::Protocol 793 new DC::Protocol
795 host => $host, 794 host => $host,
796 port => $port, 795 port => $port,
797 user => $PROFILE->{user}, 796 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 797 pass => $PROFILE->{password},
799 mapw => $mapsize, 798 mapw => $mapw,
800 maph => $mapsize, 799 maph => $maph,
801 800
802 client => "$DC::VERSION $] $^O", 801 client => "$DC::VERSION $] $^O",
803 802
804 map_widget => $MAPWIDGET, 803 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 804 statusbox => $STATUSBOX,
… …
875} 874}
876 875
877sub graphics_setup { 876sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 877 my $vbox = new DC::UI::VBox;
879 878
879 {
880 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
881
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 882 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 883
882 my $row = 0; 884 my $row = 0;
883 885
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 886 $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, 887 $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, 888 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 889 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 890
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 891 $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, 892 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 893 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 894 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 " 895 . "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 " 896 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 897 . "by installing the right driver for your graphics card.");
896 898
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
900 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
901 value => $CFG->{uitheme},
902 options => [
903 [wood => "Wood (the default)"],
904 [plain => "Plain (very)"],
905 [blue => "Blue (dark)"],
906 [metal => "Metal (light)"],
907 ],
908 tooltip => "Choose the User Interface theme that you like most :)",
909 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
910 );
911
897 my $vidmode_tooltip = 912 my $vidmode_tooltip =
898 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 913 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
899 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 914 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
900 915
901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
902 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 917 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
903 918
904 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 919 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
905 force_w => $WIDTH * 0.1, expand => 1, 920 force_w => $WIDTH * 0.1, expand => 1,
906 range => [ ($CFG->{sdl_mode}) x 3 ], 921 range => [ ($CFG->{sdl_mode}) x 3 ],
907 tooltip => $vidmode_tooltip); 922 tooltip => $vidmode_tooltip);
908 $hbox->add (my $mode_label = new DC::UI::Label 923 $hbox->add (my $mode_label = new DC::UI::Label
909 height => 0.8, template => "9999x9999@9+9", 924 height => 0.8, template => "9999x9999@9+9",
910 can_events => 1, tooltip => $vidmode_tooltip); 925 can_events => 1, tooltip => $vidmode_tooltip);
911 926
912 $MODE_SLIDER->connect (changed => sub { 927 $MODE_SLIDER->connect (changed => sub {
913 my ($self, $value) = @_;
914
915 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
916 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
917 });
918 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
922 state => $CFG->{fullscreen},
923 tooltip => "Bring the client into fullscreen mode.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
925 );
926
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
928 $table->add_at (1, $row++, new DC::UI::CheckBox
929 state => $CFG->{force_opengl11},
930 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
931 . "higher memory usage and slower performance. It will, however, help tremendously on "
932 . "cards that claim to support a feature but fall back to software rendering. "
933 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
934 . "but cards and drivers from other vendors (ATI) are often just as bad. "
935 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
936 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
937 );
938
939 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
940 $table->add_at (1, $row++, new DC::UI::CheckBox
941 state => $CFG->{disable_alpha},
942 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
943 . "by disabling a number of textures and transparency effects. Normally, these "
944 . "effects do not cost a lot of resources, but some graphics cards might fall "
945 . "back to etxremely slow rendering if this is enabled. If disabling this option "
946 . "noticably improves the framerate of the client please report this! "
947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
948 on_changed => sub {
949 my ($self, $value) = @_; 928 my ($self, $value) = @_;
929
930 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
931 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
932 });
933 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
934
935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
936 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
937 state => $CFG->{fullscreen},
938 tooltip => "Bring the client into fullscreen mode.",
939 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
940 );
941
942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
943 $table->add_at (1, $row++, new DC::UI::CheckBox
944 state => $CFG->{force_opengl11},
945 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
946 . "higher memory usage and slower performance. It will, however, help tremendously on "
947 . "cards that claim to support a feature but fall back to software rendering. "
948 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
949 . "but cards and drivers from other vendors (ATI) are often just as bad. "
950 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
952 );
953
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
955 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{disable_alpha},
957 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
958 . "by disabling a number of textures and transparency effects. Normally, these "
959 . "effects do not cost a lot of resources, but some graphics cards might fall "
960 . "back to extremely slow rendering if this is enabled. If disabling this option "
961 . "noticably improves the framerate of the client please report this! "
962 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
963 on_changed => sub {
964 my ($self, $value) = @_;
950 $CFG->{disable_alpha} = $value; 965 $CFG->{disable_alpha} = $value;
951 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 966 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
967 0
952 0 968 }
953 } 969 );
954 );
955 970
956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
957 $table->add_at (1, $row++, new DC::UI::CheckBox 972 $table->add_at (1, $row++, new DC::UI::CheckBox
958 state => $CFG->{texture_compression}, 973 state => $CFG->{texture_compression},
959 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 974 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
960 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 975 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
961 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 976 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
962 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 977 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
963 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 978 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
964 ); 979 );
965 980
966 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 981 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
967 $table->add_at (1, $row++, new DC::UI::CheckBox 982 $table->add_at (1, $row++, new DC::UI::CheckBox
968 state => $CFG->{fast}, 983 state => $CFG->{fast},
969 tooltip => "Lower the visual quality considerably to speed up rendering.", 984 tooltip => "Lower the visual quality considerably to speed up rendering.",
970 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
971 ); 986 );
972 987
973 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
974 $table->add_at (1, $row++, new DC::UI::Slider 989 $table->add_at (1, $row++, new DC::UI::Slider
975 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 990 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
976 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 991 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
977 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 992 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
978 ); 993 );
979 994
980 $table->add_at (1, $row++, new DC::UI::Button 995 $table->add_at (1, $row++, new DC::UI::Button
981 expand => 1, text => "Apply", 996 expand => 1, text => "Apply",
982 tooltip => "Apply the video settings above.", 997 tooltip => "Apply the video settings above.",
983 on_activate => sub { 998 on_activate => sub {
984 video_shutdown (); 999 video_shutdown ();
985 video_init (); 1000 video_init ();
1001 0
986 0 1002 }
987 } 1003 );
988 ); 1004 }
989 1005
1006 {
1007 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1008
1009 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1010
1011 my $row = 0;
990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
991 $table->add_at (1, $row++, new DC::UI::CheckBox 1013 $table->add_at (1, $row++, new DC::UI::CheckBox
992 state => $CFG->{smooth_movement}, 1014 state => $CFG->{smooth_movement},
993 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1015 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
994 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1016 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
995 . "then disable this option. Changes take effect immdiately.", 1017 . "then disable this option. Changes take effect immdiately.",
996 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1018 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
997 ); 1019 );
998 1020
999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1000 $table->add_at (1, $row++, new DC::UI::Slider 1022 $table->add_at (1, $row++, new DC::UI::Slider
1001 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1023 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1002 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1024 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1003 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1004 ); 1026 );
1005 1027
1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1007 $table->add_at (1, $row++, new DC::UI::CheckBox 1029 $table->add_at (1, $row++, new DC::UI::CheckBox
1008 state => $CFG->{map_smoothing}, 1030 state => $CFG->{map_smoothing},
1009 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1031 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1010 . "This increases load on the graphics subsystem and works only with TRT servers. " 1032 . "This increases load on the graphics subsystem and works only with TRT servers. "
1011 . "Changes take effect at next login only.", 1033 . "Changes take effect at next login only.",
1012 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1013 ); 1035 );
1014 1036
1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1016 $table->add_at (1, $row++, new DC::UI::CheckBox 1038 $table->add_at (1, $row++, new DC::UI::CheckBox
1017 state => $CFG->{fow_enable}, 1039 state => $CFG->{fow_enable},
1018 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1040 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1020 ); 1042 );
1021 1043
1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1023 $table->add_at (1, $row++, new DC::UI::Slider 1045 $table->add_at (1, $row++, new DC::UI::Slider
1024 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1046 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1025 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1047 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1026 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1027 ); 1049 );
1028 1050
1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1030 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
1031 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1053 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1032 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1054 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1033 . "but you still need to press apply to correctly re-layout the widget.", 1055 . "but you still need to press apply to correctly re-layout the widget.",
1034 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1056 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1035 ); 1057 );
1036 1058
1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1059 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1038 $table->add_at (1, $row++, new DC::UI::Slider 1060 $table->add_at (1, $row++, new DC::UI::Slider
1039 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1061 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1040 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1062 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1041 on_changed => sub { 1063 on_changed => sub {
1042 $CFG->{gauge_fontsize} = $_[1]; 1064 $CFG->{gauge_fontsize} = $_[1];
1043 &set_gauge_window_fontsize; 1065 &set_gauge_window_fontsize;
1066 0
1044 0 1067 }
1045 } 1068 );
1046 );
1047 1069
1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1049 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
1050 range => [$CFG->{gauge_size}, 0.2, 0.8], 1072 range => [$CFG->{gauge_size}, 0.2, 0.8],
1051 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1052 on_changed => sub { 1074 on_changed => sub {
1053 $CFG->{gauge_size} = $_[1]; 1075 $CFG->{gauge_size} = $_[1];
1054 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1076 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1077 0
1055 0 1078 }
1056 } 1079 );
1057 ); 1080 }
1058 1081
1059 $vbox 1082 $vbox
1060} 1083}
1061 1084
1062our $AUDIO_HW_CHUNKSIZE; 1085our $AUDIO_HW_CHUNKSIZE;
… …
2249 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2272 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2250 and die "SDL::Init failed!\n"; 2273 and die "SDL::Init failed!\n";
2251} 2274}
2252 2275
2253sub video_init { 2276sub video_init {
2254 DC::set_theme $CFG->{theme}; 2277 DC::set_theme $CFG->{uitheme};
2255 2278
2256 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2279 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2257 $SDL_REINIT = 0; 2280 $SDL_REINIT = 0;
2258 2281
2259 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2282 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
… …
2357 x => 0, 2380 x => 0,
2358 y => $FONTSIZE + 8, 2381 y => $FONTSIZE + 8,
2359 border_bg => [1, 1, 1, 192/255], 2382 border_bg => [1, 1, 1, 192/255],
2360 bg => [1, 1, 1, 0], 2383 bg => [1, 1, 1, 0],
2361 child => ($MAPMAP = new DC::MapWidget::MapMap 2384 child => ($MAPMAP = new DC::MapWidget::MapMap
2362 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2385 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2363 ), 2386 ),
2364 )->show; 2387 )->show;
2365 2388
2366 $MAPWIDGET = new DC::MapWidget; 2389 $MAPWIDGET = new DC::MapWidget;
2367 $MAPWIDGET->connect (activate_console => sub { 2390 $MAPWIDGET->connect (activate_console => sub {
… …
2581$SIG{INT} = $SIG{TERM} = sub { 2604$SIG{INT} = $SIG{TERM} = sub {
2582 EV::unloop; 2605 EV::unloop;
2583 #d# TODO calling exit here hangs the process in some futex 2606 #d# TODO calling exit here hangs the process in some futex
2584}; 2607};
2585 2608
2586# 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
2587sub main { 2610sub main {
2588 { 2611 {
2589 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2590 2613
2591 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2641 inv_sort => "mtime", 2664 inv_sort => "mtime",
2642 default => "profile", # default profile 2665 default => "profile", # default profile
2643 show_tips => 1, 2666 show_tips => 1,
2644 logview_max_par => 1000, 2667 logview_max_par => 1000,
2645 shift_fire_stop => 0, 2668 shift_fire_stop => 0,
2646 theme => "wood", 2669 uitheme => "wood",
2647 ); 2670 );
2648 2671
2649 while (my ($k, $v) = each %DEF_CFG) { 2672 while (my ($k, $v) = each %DEF_CFG) {
2650 $CFG->{$k} = $v unless exists $CFG->{$k}; 2673 $CFG->{$k} = $v unless exists $CFG->{$k};
2651 } 2674 }

Diff Legend

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