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.70 by root, Mon Sep 1 15:17:23 2008 UTC vs.
Revision 1.81 by root, Mon Dec 22 02:33:30 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 } 61 }
82 62
83 unshift @INC, $root; 63 unshift @INC, $root;
84 } 64 }
786} 766}
787 767
788sub dc_connect { 768sub dc_connect {
789 my ($host, $port) = @_; 769 my ($host, $port) = @_;
790 770
791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
772 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
792 773
793 $CONN = 774 $CONN =
794 new DC::Protocol 775 new DC::Protocol
795 host => $host, 776 host => $host,
796 port => $port, 777 port => $port,
797 user => $PROFILE->{user}, 778 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 779 pass => $PROFILE->{password},
799 mapw => $mapsize, 780 mapw => $mapw,
800 maph => $mapsize, 781 maph => $maph,
801 782
802 client => "$DC::VERSION $] $^O", 783 client => "$DC::VERSION $] $^O",
803 784
804 map_widget => $MAPWIDGET, 785 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 786 statusbox => $STATUSBOX,
875} 856}
876 857
877sub graphics_setup { 858sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 859 my $vbox = new DC::UI::VBox;
879 860
861 {
862 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
863
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 864 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 865
882 my $row = 0; 866 my $row = 0;
883 867
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 868 $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, 869 $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, 870 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 871 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 872
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 873 $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, 874 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 875 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 876 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 " 877 . "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 " 878 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 879 . "by installing the right driver for your graphics card.");
896 880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
882 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
883 value => $CFG->{uitheme},
884 options => [
885 [wood => "Wood (the default)"],
886 [plain => "Plain (very)"],
887 [blue => "Blue (dark)"],
888 [metal => "Metal (light)"],
889 ],
890 tooltip => "Choose the User Interface theme that you like most :)",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
892 );
893
897 my $vidmode_tooltip = 894 my $vidmode_tooltip =
898 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 895 "<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>."; 896 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
900 897
901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 898 $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); 899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
903 900
904 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
905 force_w => $WIDTH * 0.1, expand => 1, 902 force_w => $WIDTH * 0.1, expand => 1,
906 range => [ ($CFG->{sdl_mode}) x 3 ], 903 range => [ ($CFG->{sdl_mode}) x 3 ],
907 tooltip => $vidmode_tooltip); 904 tooltip => $vidmode_tooltip);
908 $hbox->add (my $mode_label = new DC::UI::Label 905 $hbox->add (my $mode_label = new DC::UI::Label
909 height => 0.8, template => "9999x9999@9+9", 906 height => 0.8, template => "9999x9999@9+9",
910 can_events => 1, tooltip => $vidmode_tooltip); 907 can_events => 1, tooltip => $vidmode_tooltip);
911 908
912 $MODE_SLIDER->connect (changed => sub { 909 $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) = @_; 910 my ($self, $value) = @_;
911
912 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
913 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
914 });
915 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
916
917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
918 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
919 state => $CFG->{fullscreen},
920 tooltip => "Bring the client into fullscreen mode.",
921 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
922 );
923
924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
925 $table->add_at (1, $row++, new DC::UI::CheckBox
926 state => $CFG->{force_opengl11},
927 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
928 . "higher memory usage and slower performance. It will, however, help tremendously on "
929 . "cards that claim to support a feature but fall back to software rendering. "
930 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
931 . "but cards and drivers from other vendors (ATI) are often just as bad. "
932 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
933 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
934 );
935
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
937 $table->add_at (1, $row++, new DC::UI::CheckBox
938 state => $CFG->{disable_alpha},
939 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
940 . "by disabling a number of textures and transparency effects. Normally, these "
941 . "effects do not cost a lot of resources, but some graphics cards might fall "
942 . "back to extremely slow rendering if this is enabled. If disabling this option "
943 . "noticably improves the framerate of the client please report this! "
944 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
945 on_changed => sub {
946 my ($self, $value) = @_;
950 $CFG->{disable_alpha} = $value; 947 $CFG->{disable_alpha} = $value;
951 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 948 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
949 0
952 0 950 }
953 } 951 );
954 );
955 952
956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
957 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
958 state => $CFG->{texture_compression}, 955 state => $CFG->{texture_compression},
959 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 956 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). " 957 . "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 " 958 . "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.", 959 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
963 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
964 ); 961 );
965 962
966 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
967 $table->add_at (1, $row++, new DC::UI::CheckBox 964 $table->add_at (1, $row++, new DC::UI::CheckBox
968 state => $CFG->{fast}, 965 state => $CFG->{fast},
969 tooltip => "Lower the visual quality considerably to speed up rendering.", 966 tooltip => "Lower the visual quality considerably to speed up rendering.",
970 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 967 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
971 ); 968 );
972 969
973 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
974 $table->add_at (1, $row++, new DC::UI::Slider 971 $table->add_at (1, $row++, new DC::UI::Slider
975 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 972 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.", 973 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 }, 974 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
978 ); 975 );
979 976
980 $table->add_at (1, $row++, new DC::UI::Button 977 $table->add_at (1, $row++, new DC::UI::Button
981 expand => 1, text => "Apply", 978 expand => 1, text => "Apply",
982 tooltip => "Apply the video settings above.", 979 tooltip => "Apply the video settings above.",
983 on_activate => sub { 980 on_activate => sub {
984 video_shutdown (); 981 video_shutdown ();
985 video_init (); 982 video_init ();
983 0
986 0 984 }
987 } 985 );
988 ); 986 }
989 987
988 {
989 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
990
991 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
992
993 my $row = 0;
990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
991 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
992 state => $CFG->{smooth_movement}, 996 state => $CFG->{smooth_movement},
993 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 997 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, " 998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
995 . "then disable this option. Changes take effect immdiately.", 999 . "then disable this option. Changes take effect immdiately.",
996 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
997 ); 1001 );
998 1002
999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1000 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
1001 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1002 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1003 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1004 ); 1008 );
1005 1009
1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1007 $table->add_at (1, $row++, new DC::UI::CheckBox 1011 $table->add_at (1, $row++, new DC::UI::CheckBox
1008 state => $CFG->{map_smoothing}, 1012 state => $CFG->{map_smoothing},
1009 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1013 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. " 1014 . "This increases load on the graphics subsystem and works only with TRT servers. "
1011 . "Changes take effect at next login only.", 1015 . "Changes take effect at next login only.",
1012 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1013 ); 1017 );
1014 1018
1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1019 $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 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
1017 state => $CFG->{fow_enable}, 1021 state => $CFG->{fow_enable},
1018 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1022 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 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1020 ); 1024 );
1021 1025
1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1023 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
1024 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1028 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.", 1029 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 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1027 ); 1031 );
1028 1032
1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1030 $table->add_at (1, $row++, new DC::UI::Slider 1034 $table->add_at (1, $row++, new DC::UI::Slider
1031 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1035 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, " 1036 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.", 1037 . "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 }, 1038 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1035 ); 1039 );
1036 1040
1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1038 $table->add_at (1, $row++, new DC::UI::Slider 1042 $table->add_at (1, $row++, new DC::UI::Slider
1039 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1043 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.", 1044 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1041 on_changed => sub { 1045 on_changed => sub {
1042 $CFG->{gauge_fontsize} = $_[1]; 1046 $CFG->{gauge_fontsize} = $_[1];
1043 &set_gauge_window_fontsize; 1047 &set_gauge_window_fontsize;
1048 0
1044 0 1049 }
1045 } 1050 );
1046 );
1047 1051
1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1052 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1049 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
1050 range => [$CFG->{gauge_size}, 0.2, 0.8], 1054 range => [$CFG->{gauge_size}, 0.2, 0.8],
1051 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1055 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1052 on_changed => sub { 1056 on_changed => sub {
1053 $CFG->{gauge_size} = $_[1]; 1057 $CFG->{gauge_size} = $_[1];
1054 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1058 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1059 0
1055 0 1060 }
1056 } 1061 );
1057 ); 1062 }
1058 1063
1059 $vbox 1064 $vbox
1060} 1065}
1061 1066
1062our $AUDIO_HW_CHUNKSIZE; 1067our $AUDIO_HW_CHUNKSIZE;
2249 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2254 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2250 and die "SDL::Init failed!\n"; 2255 and die "SDL::Init failed!\n";
2251} 2256}
2252 2257
2253sub video_init { 2258sub video_init {
2259 DC::set_theme $CFG->{uitheme};
2260
2254 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2261 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2255 $SDL_REINIT = 0; 2262 $SDL_REINIT = 0;
2256 2263
2257 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2264 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2258 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2265 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2262 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2269 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2263 2270
2264 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2271 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2265 $CFG->{sdl_mode} = 0; # lowest resolution by default 2272 $CFG->{sdl_mode} = 0; # lowest resolution by default
2266 2273
2267 # now choose biggets mode <= 1024x768 2274 # now choose biggest mode <= 1024x768
2268 for (0 .. $#SDL_MODES) { 2275 for (0 .. $#SDL_MODES) {
2269 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2276 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2270 $CFG->{sdl_mode} = $_; 2277 $CFG->{sdl_mode} = $_;
2271 } 2278 }
2272 } 2279 }
2355 x => 0, 2362 x => 0,
2356 y => $FONTSIZE + 8, 2363 y => $FONTSIZE + 8,
2357 border_bg => [1, 1, 1, 192/255], 2364 border_bg => [1, 1, 1, 192/255],
2358 bg => [1, 1, 1, 0], 2365 bg => [1, 1, 1, 0],
2359 child => ($MAPMAP = new DC::MapWidget::MapMap 2366 child => ($MAPMAP = new DC::MapWidget::MapMap
2360 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2361 ), 2368 ),
2362 )->show; 2369 )->show;
2363 2370
2364 $MAPWIDGET = new DC::MapWidget; 2371 $MAPWIDGET = new DC::MapWidget;
2365 $MAPWIDGET->connect (activate_console => sub { 2372 $MAPWIDGET->connect (activate_console => sub {
2464 $BUTTONBAR->show; 2471 $BUTTONBAR->show;
2465 $SETUP_DIALOG->show; 2472 $SETUP_DIALOG->show;
2466 $MESSAGE_WINDOW->show; 2473 $MESSAGE_WINDOW->show;
2467 } 2474 }
2468 2475
2469 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2470 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2471 2478
2472 $CAVEAT_LABEL->set_text ("None :)"); 2479 $CAVEAT_LABEL->set_text ("None :)");
2473 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2474 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2639 inv_sort => "mtime", 2646 inv_sort => "mtime",
2640 default => "profile", # default profile 2647 default => "profile", # default profile
2641 show_tips => 1, 2648 show_tips => 1,
2642 logview_max_par => 1000, 2649 logview_max_par => 1000,
2643 shift_fire_stop => 0, 2650 shift_fire_stop => 0,
2651 uitheme => "wood",
2644 ); 2652 );
2645 2653
2646 while (my ($k, $v) = each %DEF_CFG) { 2654 while (my ($k, $v) = each %DEF_CFG) {
2647 $CFG->{$k} = $v unless exists $CFG->{$k}; 2655 $CFG->{$k} = $v unless exists $CFG->{$k};
2648 } 2656 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines