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.69 by root, Mon Sep 1 15:08:15 2008 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } 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 symlink "libjpeg.62.dylib", "libjpeg.dylib";
82 } 61 }
83 62
84 unshift @INC, $root; 63 unshift @INC, $root;
85 } 64 }
86} 65}
… …
146 125
147$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
148$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
149 128
150$EV::DIED = sub { 129$EV::DIED = sub {
151 crash "CRASH/EV::DIED: $@" => 1; 130 crash "CRASH/EV::DIED: $@" => 0;
152 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
153}; 132};
154 133
155my $MAX_FPS = 60; 134my $MAX_FPS = 60;
156 135
… …
236# write a crash message blockingly to the socket, if possible 215# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy. 216# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) { 217*crash = sub($;$) {
239 my ($msg, $backtrace) = @_; 218 my ($msg, $backtrace) = @_;
240 219
220 warn $msg;
221
241 return unless $CONN; 222 return unless $CONN;
242 223
243 my $fh = $CONN->{fh} 224 my $fh = $CONN->{fh}
244 or return; 225 or return;
245 226
… …
255 236
256 # backtrace as second step, in case it crashes, too 237 # backtrace as second step, in case it crashes, too
257 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 238 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace; 239 if $backtrace;
259}; 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}
260 252
261############################################################################# 253#############################################################################
262 254
263sub status { 255sub status {
264 $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]);
… …
419 my $rwops = $meta->{path} 411 my $rwops = $meta->{path}
420 ? new_from_file DC::RW $meta->{path} 412 ? new_from_file DC::RW $meta->{path}
421 : new DC::RW $$MUSIC_PLAYING_DATA; 413 : new DC::RW $$MUSIC_PLAYING_DATA;
422 414
423 $MUSIC_PLAYER = new DC::MixMusic $rwops 415 $MUSIC_PLAYER = new DC::MixMusic $rwops
424 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 416 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
425 417
426 my $NOW = time; 418 my $NOW = time;
427 419
428 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 420 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
429 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 421 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
787} 779}
788 780
789sub dc_connect { 781sub dc_connect {
790 my ($host, $port) = @_; 782 my ($host, $port) = @_;
791 783
792 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;
793 786
794 $CONN = 787 $CONN =
795 new DC::Protocol 788 new DC::Protocol
796 host => $host, 789 host => $host,
797 port => $port, 790 port => $port,
798 user => $PROFILE->{user}, 791 user => $PROFILE->{user},
799 pass => $PROFILE->{password}, 792 pass => $PROFILE->{password},
800 mapw => $mapsize, 793 mapw => $mapw,
801 maph => $mapsize, 794 maph => $maph,
802 795
803 client => "$DC::VERSION $] $^O", 796 client => "$DC::VERSION $] $^O",
804 797
805 map_widget => $MAPWIDGET, 798 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 799 statusbox => $STATUSBOX,
… …
876} 869}
877 870
878sub graphics_setup { 871sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 872 my $vbox = new DC::UI::VBox;
880 873
874 {
875 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
876
881 $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]);
882 878
883 my $row = 0; 879 my $row = 0;
884 880
885 $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");
886 $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,
887 can_events => 1, 883 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 884 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 885
890 $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");
891 $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,
892 can_events => 1, 888 can_events => 1,
893 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 "
894 . "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 "
895 . "by selecting a different video mode, changing the settings below or " 891 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 892 . "by installing the right driver for your graphics card.");
897 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
898 my $vidmode_tooltip = 907 my $vidmode_tooltip =
899 "<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). "
900 . "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>.";
901 910
902 $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");
903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 913
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
906 force_w => $WIDTH * 0.1, expand => 1, 915 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 916 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 917 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 918 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 919 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 920 can_events => 1, tooltip => $vidmode_tooltip);
912 921
913 $MODE_SLIDER->connect (changed => sub { 922 $MODE_SLIDER->connect (changed => sub {
914 my ($self, $value) = @_;
915
916 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
917 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
918 });
919 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
920
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
923 state => $CFG->{fullscreen},
924 tooltip => "Bring the client into fullscreen mode.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
926 );
927
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
929 $table->add_at (1, $row++, new DC::UI::CheckBox
930 state => $CFG->{force_opengl11},
931 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
932 . "higher memory usage and slower performance. It will, however, help tremendously on "
933 . "cards that claim to support a feature but fall back to software rendering. "
934 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
935 . "but cards and drivers from other vendors (ATI) are often just as bad. "
936 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
937 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
938 );
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{disable_alpha},
943 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
944 . "by disabling a number of textures and transparency effects. Normally, these "
945 . "effects do not cost a lot of resources, but some graphics cards might fall "
946 . "back to etxremely slow rendering if this is enabled. If disabling this option "
947 . "noticably improves the framerate of the client please report this! "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub {
950 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) = @_;
951 $CFG->{disable_alpha} = $value; 960 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 961 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
962 0
953 0 963 }
954 } 964 );
955 );
956 965
957 $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");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 968 state => $CFG->{texture_compression},
960 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 "
961 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 970 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
962 . "The compression algorithm 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 "
963 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 972 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 974 );
966 975
967 $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");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 978 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 979 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 981 );
973 982
974 $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");
975 $table->add_at (1, $row++, new DC::UI::Slider 984 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 985 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
977 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.",
978 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 987 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 988 );
980 989
981 $table->add_at (1, $row++, new DC::UI::Button 990 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 991 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 992 tooltip => "Apply the video settings above.",
984 on_activate => sub { 993 on_activate => sub {
985 video_shutdown (); 994 video_shutdown ();
986 video_init (); 995 video_init ();
996 0
987 0 997 }
988 } 998 );
989 ); 999 }
990 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;
991 $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");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1008 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1009 state => $CFG->{smooth_movement},
994 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. "
995 . "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, "
996 . "then disable this option. Changes take effect immdiately.", 1012 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1014 );
999 1015
1000 $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");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1017 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 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 }
1005 ); 1021 );
1006 1022
1007 $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");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1024 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1025 state => $CFG->{map_smoothing},
1010 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. "
1011 . "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. "
1012 . "Changes take effect at next login only.", 1028 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1030 );
1015 1031
1016 $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");
1017 $table->add_at (1, $row++, new DC::UI::CheckBox 1033 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1034 state => $CFG->{fow_enable},
1019 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.",
1020 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1037 );
1022 1038
1023 $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");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1040 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1026 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.",
1027 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1044 );
1029 1045
1030 $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");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1048 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1033 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, "
1034 . "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.",
1035 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 },
1036 ); 1052 );
1037 1053
1038 $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");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1056 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1041 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.",
1042 on_changed => sub { 1058 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1059 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1060 &set_gauge_window_fontsize;
1061 0
1045 0 1062 }
1046 } 1063 );
1047 );
1048 1064
1049 $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");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1067 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 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.",
1053 on_changed => sub { 1069 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1070 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1071 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1072 0
1056 0 1073 }
1057 } 1074 );
1058 ); 1075 }
1059 1076
1060 $vbox 1077 $vbox
1061} 1078}
1062 1079
1063our $AUDIO_HW_CHUNKSIZE; 1080our $AUDIO_HW_CHUNKSIZE;
… …
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2267 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n"; 2268 and die "SDL::Init failed!\n";
2252} 2269}
2253 2270
2254sub video_init { 2271sub video_init {
2272 DC::set_theme $CFG->{uitheme};
2273
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2274 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2275 $SDL_REINIT = 0;
2257 2276
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2277 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2278 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @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;
2264 2283
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2284 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2285 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2286
2268 # now choose biggets mode <= 1024x768 2287 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2288 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2289 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2290 $CFG->{sdl_mode} = $_;
2272 } 2291 }
2273 } 2292 }
… …
2356 x => 0, 2375 x => 0,
2357 y => $FONTSIZE + 8, 2376 y => $FONTSIZE + 8,
2358 border_bg => [1, 1, 1, 192/255], 2377 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2378 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2379 child => ($MAPMAP = new DC::MapWidget::MapMap
2361 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.",
2362 ), 2381 ),
2363 )->show; 2382 )->show;
2364 2383
2365 $MAPWIDGET = new DC::MapWidget; 2384 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2385 $MAPWIDGET->connect (activate_console => sub {
… …
2465 $BUTTONBAR->show; 2484 $BUTTONBAR->show;
2466 $SETUP_DIALOG->show; 2485 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2486 $MESSAGE_WINDOW->show;
2468 } 2487 }
2469 2488
2470 $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]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2490 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2491
2473 $CAVEAT_LABEL->set_text ("None :)"); 2492 $CAVEAT_LABEL->set_text ("None :)");
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2493 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2494 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2640 inv_sort => "mtime", 2659 inv_sort => "mtime",
2641 default => "profile", # default profile 2660 default => "profile", # default profile
2642 show_tips => 1, 2661 show_tips => 1,
2643 logview_max_par => 1000, 2662 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2663 shift_fire_stop => 0,
2664 uitheme => "wood",
2645 ); 2665 );
2646 2666
2647 while (my ($k, $v) = each %DEF_CFG) { 2667 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2668 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2669 }

Diff Legend

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