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.64 by root, Sat Aug 30 04:43:02 2008 UTC vs.
Revision 1.77 by root, Fri Sep 26 04:45:48 2008 UTC

… …
97 97
98# need to do it again because that pile of garbage called PAR nukes it before main 98# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 99unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 100 if %PAR::LibCache;
101 101
102use Time::HiRes 'time';
103use EV; 102use EV;
103BEGIN { *time = \&EV::time }
104
104use List::Util qw(max min); 105use List::Util qw(max min);
105 106
106use Deliantra; 107use Deliantra;
107use Deliantra::Protocol::Constants; 108use Deliantra::Protocol::Constants;
108 109
110use AnyEvent::Util ();
109use AnyEvent::DNS; 111use AnyEvent::DNS;
110use AnyEvent::Socket (); 112use AnyEvent::Socket ();
111 113
112use Compress::LZF; 114use Compress::LZF;
115use JSON::XS;
113 116
114use DC; 117use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 118
119sub crash($;$) {
120 # nop during compiletime
121}
122
123BEGIN {
124 $SIG{__DIE__} = sub {
125 return if $^S;
126 crash "CRASH/DIE: $_[0]" => 1;
127 DC::fatal Carp::longmess "$_[0]";
128 }
129}
130
116use DC::OpenGL (); 131use DC::OpenGL ();
117use DC::Protocol; 132use DC::Protocol;
118use DC::DB; 133use DC::DB;
119use DC::UI; 134use DC::UI;
120use DC::UI::Canvas; 135use DC::UI::Canvas;
121use DC::UI::Inventory; 136use DC::UI::Inventory;
122use DC::UI::SpellList; 137use DC::UI::SpellList;
123use DC::UI::Dockable; 138use DC::UI::Dockable;
124use DC::UI::Dockbar; 139use DC::UI::Dockbar;
125use DC::UI::MessageWindow;
126use DC::UI::ChatView; 140use DC::UI::ChatView;
127use DC::MessageDistributor; 141use DC::MessageDistributor;
128use DC::Pod; 142use DC::Pod;
129use DC::MapWidget; 143use DC::MapWidget;
130use DC::Macro; 144use DC::Macro;
131 145
132$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 146$SIG{QUIT} = sub { Carp::cluck "QUIT" };
133$SIG{PIPE} = 'IGNORE'; 147$SIG{PIPE} = 'IGNORE';
134 148
135$EV::DIED = sub { 149$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1;
136 DC::fatal Carp::longmess $@; 151 DC::fatal Carp::longmess $@;
137}; 152};
138 153
139my $MAX_FPS = 60; 154my $MAX_FPS = 60;
140 155
… …
142 157
143our $LAST_REFRESH; 158our $LAST_REFRESH;
144our $NOW; 159our $NOW;
145 160
146our $CFG; 161our $CFG;
147our $CONN;
148our $PROFILE; # current profile 162our $PROFILE; # current profile
149our $FAST; # fast, low-quality mode, possibly useful for software-rendering 163our $FAST; # fast, low-quality mode, possibly useful for software-rendering
150 164
151our $WANT_REFRESH; 165our $WANT_REFRESH;
152 166
… …
160our $FULLSCREEN; 174our $FULLSCREEN;
161our $FONTSIZE; 175our $FONTSIZE;
162 176
163our $FONT_PROP; 177our $FONT_PROP;
164our $FONT_FIXED; 178our $FONT_FIXED;
179
180our $CONN;
165 181
166our $MAP; 182our $MAP;
167our $MAPMAP; 183our $MAPMAP;
168our $MAPWIDGET; 184our $MAPWIDGET;
169our $COMPLETER; 185our $COMPLETER;
… …
211our $DEBUG_STATUS; 227our $DEBUG_STATUS;
212 228
213our $INV; 229our $INV;
214our $INVR; 230our $INVR;
215our $INVR_HB; 231our $INVR_HB;
232
233#############################################################################
234
235# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) {
238 my ($msg, $backtrace) = @_;
239
240 return unless $CONN;
241
242 my $fh = $CONN->{fh}
243 or return;
244
245 my $buf = delete $CONN->{wbuf};
246
247 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
248
249 AnyEvent::Util::fh_nonblocking $fh, 0;
250 syswrite $fh, $buf;
251 AnyEvent::Util::fh_nonblocking $fh, 1;
252
253 $msg =~ s/\s+$//;
254
255 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace;
258};
216 259
217############################################################################# 260#############################################################################
218 261
219sub status { 262sub status {
220 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
807 dc_connect $host, $port; 850 dc_connect $host, $port;
808 } 851 }
809} 852}
810 853
811sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
812 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
830} 875}
831 876
832sub graphics_setup { 877sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 878 my $vbox = new DC::UI::VBox;
834 879
880 {
881 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
882
835 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 883 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
836 884
837 my $row = 0; 885 my $row = 0;
838 886
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
840 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 888 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
841 can_events => 1, 889 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 890 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 891
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 892 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 893 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 894 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 895 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues " 896 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or " 897 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 898 . "by installing the right driver for your graphics card.");
851 899
900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
901 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
902 value => $CFG->{uitheme},
903 options => [
904 [wood => "Wood (the default)"],
905 [plain => "Plain (very)"],
906 [blue => "Blue (dark)"],
907 [metal => "Metal (light)"],
908 ],
909 tooltip => "Choose the User Interface theme that you like most :)",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
911 );
912
852 my $vidmode_tooltip = 913 my $vidmode_tooltip =
853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 914 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
854 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 915 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
855 916
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 918 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 919
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 920 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
860 force_w => $WIDTH * 0.1, expand => 1, 921 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 922 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 923 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 924 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 925 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 926 can_events => 1, tooltip => $vidmode_tooltip);
866 927
867 $MODE_SLIDER->connect (changed => sub { 928 $MODE_SLIDER->connect (changed => sub {
868 my ($self, $value) = @_;
869
870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
871 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
872 });
873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
877 state => $CFG->{fullscreen},
878 tooltip => "Bring the client into fullscreen mode.",
879 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
880 );
881
882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
883 $table->add_at (1, $row++, new DC::UI::CheckBox
884 state => $CFG->{force_opengl11},
885 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
886 . "higher memory usage and slower performance. It will, however, help tremendously on "
887 . "cards that claim to support a feature but fall back to software rendering. "
888 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
889 . "but cards and drivers from other vendors (ATI) are often just as bad. "
890 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
892 );
893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
895 $table->add_at (1, $row++, new DC::UI::CheckBox
896 state => $CFG->{disable_alpha},
897 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
898 . "by disabling a number of textures and transparency effects. Normally, these "
899 . "effects do not cost a lot of resources, but some graphics cards might fall "
900 . "back to etxremely slow rendering if this is enabled. If disabling this option "
901 . "noticably improves the framerate of the client please report this! "
902 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
903 on_changed => sub {
904 my ($self, $value) = @_; 929 my ($self, $value) = @_;
930
931 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
932 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
933 });
934 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
935
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
937 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
938 state => $CFG->{fullscreen},
939 tooltip => "Bring the client into fullscreen mode.",
940 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
941 );
942
943 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
944 $table->add_at (1, $row++, new DC::UI::CheckBox
945 state => $CFG->{force_opengl11},
946 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
947 . "higher memory usage and slower performance. It will, however, help tremendously on "
948 . "cards that claim to support a feature but fall back to software rendering. "
949 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
950 . "but cards and drivers from other vendors (ATI) are often just as bad. "
951 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
952 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
953 );
954
955 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
956 $table->add_at (1, $row++, new DC::UI::CheckBox
957 state => $CFG->{disable_alpha},
958 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
959 . "by disabling a number of textures and transparency effects. Normally, these "
960 . "effects do not cost a lot of resources, but some graphics cards might fall "
961 . "back to extremely slow rendering if this is enabled. If disabling this option "
962 . "noticably improves the framerate of the client please report this! "
963 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
964 on_changed => sub {
965 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value; 966 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 967 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
968 0
907 0 969 }
908 } 970 );
909 );
910 971
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 972 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 973 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 974 state => $CFG->{texture_compression},
914 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 975 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
915 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 976 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
916 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 977 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
917 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 978 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 979 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 980 );
920 981
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 982 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 984 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 985 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 986 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 987 );
927 988
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
929 $table->add_at (1, $row++, new DC::UI::Slider 990 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 991 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
931 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 992 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
932 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 993 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 994 );
934 995
935 $table->add_at (1, $row++, new DC::UI::Button 996 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 997 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 998 tooltip => "Apply the video settings above.",
938 on_activate => sub { 999 on_activate => sub {
939 video_shutdown (); 1000 video_shutdown ();
940 video_init (); 1001 video_init ();
1002 0
941 0 1003 }
942 } 1004 );
943 ); 1005 }
944 1006
1007 {
1008 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1009
1010 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1011
1012 my $row = 0;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1013 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 1014 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 1015 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1016 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1017 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 1018 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1020 );
953 1021
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
955 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1024 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1025 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1026 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
959 ); 1027 );
960 1028
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1030 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1031 state => $CFG->{map_smoothing},
964 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1032 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
965 . "This increases load on the graphics subsystem and works only with TRT servers. " 1033 . "This increases load on the graphics subsystem and works only with TRT servers. "
966 . "Changes take effect at next login only.", 1034 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1035 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1036 );
969 1037
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
971 $table->add_at (1, $row++, new DC::UI::CheckBox 1039 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1040 state => $CFG->{fow_enable},
973 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1041 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1042 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1043 );
976 1044
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1045 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
978 $table->add_at (1, $row++, new DC::UI::Slider 1046 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1047 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
980 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1048 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
981 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1049 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1050 );
983 1051
984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1052 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
985 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1054 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
987 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1055 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
988 . "but you still need to press apply to correctly re-layout the widget.", 1056 . "but you still need to press apply to correctly re-layout the widget.",
989 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1057 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
990 ); 1058 );
991 1059
992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
993 $table->add_at (1, $row++, new DC::UI::Slider 1061 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1062 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
995 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1063 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
996 on_changed => sub { 1064 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1065 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1066 &set_gauge_window_fontsize;
1067 0
999 0 1068 }
1000 } 1069 );
1001 );
1002 1070
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1072 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1073 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1074 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1007 on_changed => sub { 1075 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1076 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1077 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1078 0
1010 0 1079 }
1011 } 1080 );
1012 ); 1081 }
1013 1082
1014 $vbox 1083 $vbox
1015} 1084}
1016 1085
1017our $AUDIO_HW_CHUNKSIZE; 1086our $AUDIO_HW_CHUNKSIZE;
… …
1597 }, 1666 },
1598 ); 1667 );
1599 1668
1600 $vbox->add (new DC::UI::FancyFrame 1669 $vbox->add (new DC::UI::FancyFrame
1601 label => "How to Play", 1670 label => "How to Play",
1602 min_h => 200, 1671 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1672 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 markup => 1673 markup =>
1605 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n" 1674 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1606 . "Then register a new account (or use an existing one if you have one). " 1675 . "Then register a new account (or use an existing one if you have one). "
1607 . "To register an account, choose a username that hasn't been taken yet (just guess) and " 1676 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
… …
2133 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2202 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2134 ); 2203 );
2135 $hb->add (new DC::UI::Button 2204 $hb->add (new DC::UI::Button
2136 text => "Quit anyway", 2205 text => "Quit anyway",
2137 expand => 1, 2206 expand => 1,
2138 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2207 on_activate => sub {
2208 crash "Quit anyway";
2209 EV::unloop EV::UNLOOP_ALL;
2210 },
2139 ); 2211 );
2140 } 2212 }
2141 2213
2142 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2143 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
… …
2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2273 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2202 and die "SDL::Init failed!\n"; 2274 and die "SDL::Init failed!\n";
2203} 2275}
2204 2276
2205sub video_init { 2277sub video_init {
2278 DC::set_theme $CFG->{uitheme};
2279
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2280 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0; 2281 $SDL_REINIT = 0;
2208 2282
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2283 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2284 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2288 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215 2289
2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2290 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default 2291 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218 2292
2219 # now choose biggets mode <= 1024x768 2293 # now choose biggest mode <= 1024x768
2220 for (0 .. $#SDL_MODES) { 2294 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2295 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_; 2296 $CFG->{sdl_mode} = $_;
2223 } 2297 }
2224 } 2298 }
… …
2307 x => 0, 2381 x => 0,
2308 y => $FONTSIZE + 8, 2382 y => $FONTSIZE + 8,
2309 border_bg => [1, 1, 1, 192/255], 2383 border_bg => [1, 1, 1, 192/255],
2310 bg => [1, 1, 1, 0], 2384 bg => [1, 1, 1, 0],
2311 child => ($MAPMAP = new DC::MapWidget::MapMap 2385 child => ($MAPMAP = new DC::MapWidget::MapMap
2312 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2386 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2313 ), 2387 ),
2314 )->show; 2388 )->show;
2315 2389
2316 $MAPWIDGET = new DC::MapWidget; 2390 $MAPWIDGET = new DC::MapWidget;
2317 $MAPWIDGET->connect (activate_console => sub { 2391 $MAPWIDGET->connect (activate_console => sub {
… …
2416 $BUTTONBAR->show; 2490 $BUTTONBAR->show;
2417 $SETUP_DIALOG->show; 2491 $SETUP_DIALOG->show;
2418 $MESSAGE_WINDOW->show; 2492 $MESSAGE_WINDOW->show;
2419 } 2493 }
2420 2494
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2495 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2496 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423 2497
2424 $CAVEAT_LABEL->set_text ("None :)"); 2498 $CAVEAT_LABEL->set_text ("None :)");
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2499 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2500 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2481 delete $animate_object{$widget}; 2555 delete $animate_object{$widget};
2482} 2556}
2483 2557
2484%SDL_CB = ( 2558%SDL_CB = (
2485 DC::SDL_QUIT => sub { 2559 DC::SDL_QUIT => sub {
2560 crash "SDL_QUIT";
2486 EV::unloop EV::UNLOOP_ALL; 2561 EV::unloop EV::UNLOOP_ALL;
2487 }, 2562 },
2488 DC::SDL_VIDEORESIZE => sub { 2563 DC::SDL_VIDEORESIZE => sub {
2489 }, 2564 },
2490 DC::SDL_VIDEOEXPOSE => sub { 2565 DC::SDL_VIDEOEXPOSE => sub {
… …
2590 inv_sort => "mtime", 2665 inv_sort => "mtime",
2591 default => "profile", # default profile 2666 default => "profile", # default profile
2592 show_tips => 1, 2667 show_tips => 1,
2593 logview_max_par => 1000, 2668 logview_max_par => 1000,
2594 shift_fire_stop => 0, 2669 shift_fire_stop => 0,
2670 uitheme => "wood",
2595 ); 2671 );
2596 2672
2597 while (my ($k, $v) = each %DEF_CFG) { 2673 while (my ($k, $v) = each %DEF_CFG) {
2598 $CFG->{$k} = $v unless exists $CFG->{$k}; 2674 $CFG->{$k} = $v unless exists $CFG->{$k};
2599 } 2675 }

Diff Legend

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