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.65 by root, Sat Aug 30 06:49:05 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 } 61 }
82 62
… …
97 77
98# need to do it again because that pile of garbage called PAR nukes it before main 78# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 80 if %PAR::LibCache;
101 81
102use Time::HiRes 'time';
103use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
104use List::Util qw(max min); 85use List::Util qw(max min);
105 86
106use Deliantra; 87use Deliantra;
107use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
108 89
90use AnyEvent::Util ();
109use AnyEvent::DNS; 91use AnyEvent::DNS;
110use AnyEvent::Socket (); 92use AnyEvent::Socket ();
111 93
112use Compress::LZF; 94use Compress::LZF;
95use JSON::XS;
113 96
114use DC; 97use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 98
99sub crash($;$) {
100 # nop during compiletime
101}
102
103BEGIN {
104 $SIG{__DIE__} = sub {
105 return if $^S;
106 crash "CRASH/DIE: $_[0]" => 1;
107 DC::fatal Carp::longmess "$_[0]";
108 }
109}
110
116use DC::OpenGL (); 111use DC::OpenGL ();
117use DC::Protocol; 112use DC::Protocol;
118use DC::DB; 113use DC::DB;
119use DC::UI; 114use DC::UI;
120use DC::UI::Canvas; 115use DC::UI::Canvas;
… …
130 125
131$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
132$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
133 128
134$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 0;
135 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
136}; 132};
137 133
138my $MAX_FPS = 60; 134my $MAX_FPS = 60;
139 135
… …
141 137
142our $LAST_REFRESH; 138our $LAST_REFRESH;
143our $NOW; 139our $NOW;
144 140
145our $CFG; 141our $CFG;
146our $CONN;
147our $PROFILE; # current profile 142our $PROFILE; # current profile
148our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
149 144
150our $WANT_REFRESH; 145our $WANT_REFRESH;
151 146
… …
159our $FULLSCREEN; 154our $FULLSCREEN;
160our $FONTSIZE; 155our $FONTSIZE;
161 156
162our $FONT_PROP; 157our $FONT_PROP;
163our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
164 161
165our $MAP; 162our $MAP;
166our $MAPMAP; 163our $MAPMAP;
167our $MAPWIDGET; 164our $MAPWIDGET;
168our $COMPLETER; 165our $COMPLETER;
… …
210our $DEBUG_STATUS; 207our $DEBUG_STATUS;
211 208
212our $INV; 209our $INV;
213our $INVR; 210our $INVR;
214our $INVR_HB; 211our $INVR_HB;
212
213#############################################################################
214
215# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) {
218 my ($msg, $backtrace) = @_;
219
220 warn $msg;
221
222 return unless $CONN;
223
224 my $fh = $CONN->{fh}
225 or return;
226
227 my $buf = delete $CONN->{wbuf};
228
229 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
230
231 AnyEvent::Util::fh_nonblocking $fh, 0;
232 syswrite $fh, $buf;
233 AnyEvent::Util::fh_nonblocking $fh, 1;
234
235 $msg =~ s/\s+$//;
236
237 # backtrace as second step, in case it crashes, too
238 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
239 if $backtrace;
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}
215 252
216############################################################################# 253#############################################################################
217 254
218sub status { 255sub status {
219 $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]);
… …
374 my $rwops = $meta->{path} 411 my $rwops = $meta->{path}
375 ? new_from_file DC::RW $meta->{path} 412 ? new_from_file DC::RW $meta->{path}
376 : new DC::RW $$MUSIC_PLAYING_DATA; 413 : new DC::RW $$MUSIC_PLAYING_DATA;
377 414
378 $MUSIC_PLAYER = new DC::MixMusic $rwops 415 $MUSIC_PLAYER = new DC::MixMusic $rwops
379 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 416 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
380 417
381 my $NOW = time; 418 my $NOW = time;
382 419
383 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 420 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
384 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 421 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
742} 779}
743 780
744sub dc_connect { 781sub dc_connect {
745 my ($host, $port) = @_; 782 my ($host, $port) = @_;
746 783
747 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;
748 786
749 $CONN = 787 $CONN =
750 new DC::Protocol 788 new DC::Protocol
751 host => $host, 789 host => $host,
752 port => $port, 790 port => $port,
753 user => $PROFILE->{user}, 791 user => $PROFILE->{user},
754 pass => $PROFILE->{password}, 792 pass => $PROFILE->{password},
755 mapw => $mapsize, 793 mapw => $mapw,
756 maph => $mapsize, 794 maph => $maph,
757 795
758 client => "$DC::VERSION $] $^O", 796 client => "$DC::VERSION $] $^O",
759 797
760 map_widget => $MAPWIDGET, 798 map_widget => $MAPWIDGET,
761 statusbox => $STATUSBOX, 799 statusbox => $STATUSBOX,
… …
806 dc_connect $host, $port; 844 dc_connect $host, $port;
807 } 845 }
808} 846}
809 847
810sub stop_game { 848sub stop_game {
849 crash "stop_game";
850
811 $LOGIN_BUTTON->set_text ("Login / Register"); 851 $LOGIN_BUTTON->set_text ("Login / Register");
812 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 852 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
813 $SETUP_DIALOG->show; 853 $SETUP_DIALOG->show;
814 $PL_WINDOW->hide; 854 $PL_WINDOW->hide;
815 $SPELL_LIST->clear_spells; 855 $SPELL_LIST->clear_spells;
… …
829} 869}
830 870
831sub graphics_setup { 871sub graphics_setup {
832 my $vbox = new DC::UI::VBox; 872 my $vbox = new DC::UI::VBox;
833 873
874 {
875 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
876
834 $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]);
835 878
836 my $row = 0; 879 my $row = 0;
837 880
838 $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");
839 $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,
840 can_events => 1, 883 can_events => 1,
841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 884 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
842 885
843 $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");
844 $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,
845 can_events => 1, 888 can_events => 1,
846 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 "
847 . "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 "
848 . "by selecting a different video mode, changing the settings below or " 891 . "by selecting a different video mode, changing the settings below or "
849 . "by installing the right driver for your graphics card."); 892 . "by installing the right driver for your graphics card.");
850 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
851 my $vidmode_tooltip = 907 my $vidmode_tooltip =
852 "<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). "
853 . "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>.";
854 910
855 $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");
856 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
857 913
858 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
859 force_w => $WIDTH * 0.1, expand => 1, 915 force_w => $WIDTH * 0.1, expand => 1,
860 range => [ ($CFG->{sdl_mode}) x 3 ], 916 range => [ ($CFG->{sdl_mode}) x 3 ],
861 tooltip => $vidmode_tooltip); 917 tooltip => $vidmode_tooltip);
862 $hbox->add (my $mode_label = new DC::UI::Label 918 $hbox->add (my $mode_label = new DC::UI::Label
863 height => 0.8, template => "9999x9999@9+9", 919 height => 0.8, template => "9999x9999@9+9",
864 can_events => 1, tooltip => $vidmode_tooltip); 920 can_events => 1, tooltip => $vidmode_tooltip);
865 921
866 $MODE_SLIDER->connect (changed => sub { 922 $MODE_SLIDER->connect (changed => sub {
867 my ($self, $value) = @_;
868
869 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
870 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
871 });
872 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
873
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
875 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
876 state => $CFG->{fullscreen},
877 tooltip => "Bring the client into fullscreen mode.",
878 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
879 );
880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
882 $table->add_at (1, $row++, new DC::UI::CheckBox
883 state => $CFG->{force_opengl11},
884 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
885 . "higher memory usage and slower performance. It will, however, help tremendously on "
886 . "cards that claim to support a feature but fall back to software rendering. "
887 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
888 . "but cards and drivers from other vendors (ATI) are often just as bad. "
889 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
891 );
892
893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
894 $table->add_at (1, $row++, new DC::UI::CheckBox
895 state => $CFG->{disable_alpha},
896 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
897 . "by disabling a number of textures and transparency effects. Normally, these "
898 . "effects do not cost a lot of resources, but some graphics cards might fall "
899 . "back to etxremely slow rendering if this is enabled. If disabling this option "
900 . "noticably improves the framerate of the client please report this! "
901 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
902 on_changed => sub {
903 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) = @_;
904 $CFG->{disable_alpha} = $value; 960 $CFG->{disable_alpha} = $value;
905 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 961 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
962 0
906 0 963 }
907 } 964 );
908 );
909 965
910 $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");
911 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
912 state => $CFG->{texture_compression}, 968 state => $CFG->{texture_compression},
913 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 "
914 . "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). "
915 . "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 "
916 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 972 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
918 ); 974 );
919 975
920 $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");
921 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
922 state => $CFG->{fast}, 978 state => $CFG->{fast},
923 tooltip => "Lower the visual quality considerably to speed up rendering.", 979 tooltip => "Lower the visual quality considerably to speed up rendering.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
925 ); 981 );
926 982
927 $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");
928 $table->add_at (1, $row++, new DC::UI::Slider 984 $table->add_at (1, $row++, new DC::UI::Slider
929 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 985 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
930 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.",
931 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 987 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
932 ); 988 );
933 989
934 $table->add_at (1, $row++, new DC::UI::Button 990 $table->add_at (1, $row++, new DC::UI::Button
935 expand => 1, text => "Apply", 991 expand => 1, text => "Apply",
936 tooltip => "Apply the video settings above.", 992 tooltip => "Apply the video settings above.",
937 on_activate => sub { 993 on_activate => sub {
938 video_shutdown (); 994 video_shutdown ();
939 video_init (); 995 video_init ();
996 0
940 0 997 }
941 } 998 );
942 ); 999 }
943 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;
944 $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");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1008 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{smooth_movement}, 1009 state => $CFG->{smooth_movement},
947 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. "
948 . "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, "
949 . "then disable this option. Changes take effect immdiately.", 1012 . "then disable this option. Changes take effect immdiately.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
951 ); 1014 );
952 1015
953 $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");
954 $table->add_at (1, $row++, new DC::UI::Slider 1017 $table->add_at (1, $row++, new DC::UI::Slider
955 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
956 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
957 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 }
958 ); 1021 );
959 1022
960 $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");
961 $table->add_at (1, $row++, new DC::UI::CheckBox 1024 $table->add_at (1, $row++, new DC::UI::CheckBox
962 state => $CFG->{map_smoothing}, 1025 state => $CFG->{map_smoothing},
963 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. "
964 . "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. "
965 . "Changes take effect at next login only.", 1028 . "Changes take effect at next login only.",
966 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
967 ); 1030 );
968 1031
969 $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");
970 $table->add_at (1, $row++, new DC::UI::CheckBox 1033 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{fow_enable}, 1034 state => $CFG->{fow_enable},
972 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.",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
974 ); 1037 );
975 1038
976 $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");
977 $table->add_at (1, $row++, new DC::UI::Slider 1040 $table->add_at (1, $row++, new DC::UI::Slider
978 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
979 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.",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
981 ); 1044 );
982 1045
983 $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");
984 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
985 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1048 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
986 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, "
987 . "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.",
988 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 },
989 ); 1052 );
990 1053
991 $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");
992 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
993 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1056 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
994 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.",
995 on_changed => sub { 1058 on_changed => sub {
996 $CFG->{gauge_fontsize} = $_[1]; 1059 $CFG->{gauge_fontsize} = $_[1];
997 &set_gauge_window_fontsize; 1060 &set_gauge_window_fontsize;
1061 0
998 0 1062 }
999 } 1063 );
1000 );
1001 1064
1002 $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");
1003 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1004 range => [$CFG->{gauge_size}, 0.2, 0.8], 1067 range => [$CFG->{gauge_size}, 0.2, 0.8],
1005 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.",
1006 on_changed => sub { 1069 on_changed => sub {
1007 $CFG->{gauge_size} = $_[1]; 1070 $CFG->{gauge_size} = $_[1];
1008 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1071 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1072 0
1009 0 1073 }
1010 } 1074 );
1011 ); 1075 }
1012 1076
1013 $vbox 1077 $vbox
1014} 1078}
1015 1079
1016our $AUDIO_HW_CHUNKSIZE; 1080our $AUDIO_HW_CHUNKSIZE;
… …
2132 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2196 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2133 ); 2197 );
2134 $hb->add (new DC::UI::Button 2198 $hb->add (new DC::UI::Button
2135 text => "Quit anyway", 2199 text => "Quit anyway",
2136 expand => 1, 2200 expand => 1,
2137 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2201 on_activate => sub {
2202 crash "Quit anyway";
2203 EV::unloop EV::UNLOOP_ALL;
2204 },
2138 ); 2205 );
2139 } 2206 }
2140 2207
2141 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2142 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
… …
2200 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2267 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2201 and die "SDL::Init failed!\n"; 2268 and die "SDL::Init failed!\n";
2202} 2269}
2203 2270
2204sub video_init { 2271sub video_init {
2272 DC::set_theme $CFG->{uitheme};
2273
2205 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2274 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2206 $SDL_REINIT = 0; 2275 $SDL_REINIT = 0;
2207 2276
2208 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2277 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2209 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2278 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2213 @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;
2214 2283
2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2284 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2216 $CFG->{sdl_mode} = 0; # lowest resolution by default 2285 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217 2286
2218 # now choose biggets mode <= 1024x768 2287 # now choose biggest mode <= 1024x768
2219 for (0 .. $#SDL_MODES) { 2288 for (0 .. $#SDL_MODES) {
2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2289 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_; 2290 $CFG->{sdl_mode} = $_;
2222 } 2291 }
2223 } 2292 }
… …
2306 x => 0, 2375 x => 0,
2307 y => $FONTSIZE + 8, 2376 y => $FONTSIZE + 8,
2308 border_bg => [1, 1, 1, 192/255], 2377 border_bg => [1, 1, 1, 192/255],
2309 bg => [1, 1, 1, 0], 2378 bg => [1, 1, 1, 0],
2310 child => ($MAPMAP = new DC::MapWidget::MapMap 2379 child => ($MAPMAP = new DC::MapWidget::MapMap
2311 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.",
2312 ), 2381 ),
2313 )->show; 2382 )->show;
2314 2383
2315 $MAPWIDGET = new DC::MapWidget; 2384 $MAPWIDGET = new DC::MapWidget;
2316 $MAPWIDGET->connect (activate_console => sub { 2385 $MAPWIDGET->connect (activate_console => sub {
… …
2415 $BUTTONBAR->show; 2484 $BUTTONBAR->show;
2416 $SETUP_DIALOG->show; 2485 $SETUP_DIALOG->show;
2417 $MESSAGE_WINDOW->show; 2486 $MESSAGE_WINDOW->show;
2418 } 2487 }
2419 2488
2420 $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]);
2421 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2490 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2422 2491
2423 $CAVEAT_LABEL->set_text ("None :)"); 2492 $CAVEAT_LABEL->set_text ("None :)");
2424 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2493 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2425 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2494 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2480 delete $animate_object{$widget}; 2549 delete $animate_object{$widget};
2481} 2550}
2482 2551
2483%SDL_CB = ( 2552%SDL_CB = (
2484 DC::SDL_QUIT => sub { 2553 DC::SDL_QUIT => sub {
2554 crash "SDL_QUIT";
2485 EV::unloop EV::UNLOOP_ALL; 2555 EV::unloop EV::UNLOOP_ALL;
2486 }, 2556 },
2487 DC::SDL_VIDEORESIZE => sub { 2557 DC::SDL_VIDEORESIZE => sub {
2488 }, 2558 },
2489 DC::SDL_VIDEOEXPOSE => sub { 2559 DC::SDL_VIDEOEXPOSE => sub {
… …
2589 inv_sort => "mtime", 2659 inv_sort => "mtime",
2590 default => "profile", # default profile 2660 default => "profile", # default profile
2591 show_tips => 1, 2661 show_tips => 1,
2592 logview_max_par => 1000, 2662 logview_max_par => 1000,
2593 shift_fire_stop => 0, 2663 shift_fire_stop => 0,
2664 uitheme => "wood",
2594 ); 2665 );
2595 2666
2596 while (my ($k, $v) = each %DEF_CFG) { 2667 while (my ($k, $v) = each %DEF_CFG) {
2597 $CFG->{$k} = $v unless exists $CFG->{$k}; 2668 $CFG->{$k} = $v unless exists $CFG->{$k};
2598 } 2669 }

Diff Legend

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