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.63 by root, Tue Aug 26 00:12:37 2008 UTC vs.
Revision 1.84 by root, Fri Jan 9 22:38:17 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?! 61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?! 62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 63 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 64 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 65 chdir $root; # for pango modules, maybe other things
81 } 66 }
82 67
… …
97 82
98# need to do it again because that pile of garbage called PAR nukes it before main 83# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 84unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 85 if %PAR::LibCache;
101 86
102use Time::HiRes 'time';
103use EV; 87use EV;
88BEGIN { *time = \&EV::time }
89
104use List::Util qw(max min); 90use List::Util qw(max min);
105 91
106use Deliantra; 92use Deliantra;
107use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
108 94
109use AnyEvent::DNS; 95use AnyEvent::Util ();
110use AnyEvent::Socket (); 96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
111 98
112use Compress::LZF; 99use Compress::LZF;
100use JSON::XS;
113 101
114use DC; 102use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 103
104sub crash($;$) {
105 # nop during compiletime
106}
107
108BEGIN {
109 $SIG{__DIE__} = sub {
110 return if $^S;
111 crash "CRASH/DIE: $_[0]" => 1;
112 DC::fatal Carp::longmess "$_[0]";
113 }
114}
115
116use DC::OpenGL (); 116use DC::OpenGL ();
117use DC::Protocol; 117use DC::Protocol;
118use DC::DB; 118use DC::DB;
119use DC::UI; 119use DC::UI;
120use DC::UI::Canvas; 120use DC::UI::Canvas;
121use DC::UI::Inventory; 121use DC::UI::Inventory;
122use DC::UI::SpellList; 122use DC::UI::SpellList;
123use DC::UI::Dockable; 123use DC::UI::Dockable;
124use DC::UI::Dockbar; 124use DC::UI::Dockbar;
125use DC::UI::MessageWindow;
126use DC::UI::ChatView; 125use DC::UI::ChatView;
127use DC::MessageDistributor; 126use DC::MessageDistributor;
128use DC::Pod; 127use DC::Pod;
129use DC::MapWidget; 128use DC::MapWidget;
130use DC::Macro; 129use DC::Macro;
131 130
132$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
133$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
134 133
135$EV::DIED = sub { 134$EV::DIED = sub {
135 crash "CRASH/EV::DIED: $@" => 0;
136 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
137}; 137};
138 138
139my $MAX_FPS = 60; 139my $MAX_FPS = 60;
140 140
… …
142 142
143our $LAST_REFRESH; 143our $LAST_REFRESH;
144our $NOW; 144our $NOW;
145 145
146our $CFG; 146our $CFG;
147our $CONN;
148our $PROFILE; # current profile 147our $PROFILE; # current profile
149our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
150 149
151our $WANT_REFRESH; 150our $WANT_REFRESH;
152 151
… …
160our $FULLSCREEN; 159our $FULLSCREEN;
161our $FONTSIZE; 160our $FONTSIZE;
162 161
163our $FONT_PROP; 162our $FONT_PROP;
164our $FONT_FIXED; 163our $FONT_FIXED;
164
165our $CONN;
165 166
166our $MAP; 167our $MAP;
167our $MAPMAP; 168our $MAPMAP;
168our $MAPWIDGET; 169our $MAPWIDGET;
169our $COMPLETER; 170our $COMPLETER;
… …
211our $DEBUG_STATUS; 212our $DEBUG_STATUS;
212 213
213our $INV; 214our $INV;
214our $INVR; 215our $INVR;
215our $INVR_HB; 216our $INVR_HB;
217
218#############################################################################
219
220# write a crash message blockingly to the socket, if possible
221# this is a bit too complicated for my tastes, but it was easy.
222*crash = sub($;$) {
223 my ($msg, $backtrace) = @_;
224
225 warn $msg;
226
227 return unless $CONN;
228
229 my $fh = $CONN->{fh}
230 or return;
231
232 my $buf = delete $CONN->{wbuf};
233
234 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
235
236 AnyEvent::Util::fh_nonblocking $fh, 0;
237 syswrite $fh, $buf;
238 AnyEvent::Util::fh_nonblocking $fh, 1;
239
240 $msg =~ s/\s+$//;
241
242 # backtrace as second step, in case it crashes, too
243 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
244 if $backtrace;
245};
246
247sub clienterror($;$) {
248 my ($msg, $backtrace) = @_;
249
250 warn $msg;
251
252 return unless $CONN;
253
254 $CONN->send_exti_msg (clientlog => $msg);
255 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
256}
216 257
217############################################################################# 258#############################################################################
218 259
219sub status { 260sub status {
220 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 261 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
375 my $rwops = $meta->{path} 416 my $rwops = $meta->{path}
376 ? new_from_file DC::RW $meta->{path} 417 ? new_from_file DC::RW $meta->{path}
377 : new DC::RW $$MUSIC_PLAYING_DATA; 418 : new DC::RW $$MUSIC_PLAYING_DATA;
378 419
379 $MUSIC_PLAYER = new DC::MixMusic $rwops 420 $MUSIC_PLAYER = new DC::MixMusic $rwops
380 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 421 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
381 422
382 my $NOW = time; 423 my $NOW = time;
383 424
384 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
385 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 426 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
743} 784}
744 785
745sub dc_connect { 786sub dc_connect {
746 my ($host, $port) = @_; 787 my ($host, $port) = @_;
747 788
748 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 789 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
790 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
749 791
750 $CONN = 792 $CONN =
751 new DC::Protocol 793 new DC::Protocol
752 host => $host, 794 host => $host,
753 port => $port, 795 port => $port,
754 user => $PROFILE->{user}, 796 user => $PROFILE->{user},
755 pass => $PROFILE->{password}, 797 pass => $PROFILE->{password},
756 mapw => $mapsize, 798 mapw => $mapw,
757 maph => $mapsize, 799 maph => $maph,
758 800
759 client => "$DC::VERSION $] $^O", 801 client => "$DC::VERSION $] $^O",
760 802
761 map_widget => $MAPWIDGET, 803 map_widget => $MAPWIDGET,
762 statusbox => $STATUSBOX, 804 statusbox => $STATUSBOX,
… …
807 dc_connect $host, $port; 849 dc_connect $host, $port;
808 } 850 }
809} 851}
810 852
811sub stop_game { 853sub stop_game {
854 crash "stop_game";
855
812 $LOGIN_BUTTON->set_text ("Login / Register"); 856 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 857 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 858 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 859 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 860 $SPELL_LIST->clear_spells;
… …
830} 874}
831 875
832sub graphics_setup { 876sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 877 my $vbox = new DC::UI::VBox;
834 878
879 {
880 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
881
835 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 882 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
836 883
837 my $row = 0; 884 my $row = 0;
838 885
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
840 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 887 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
841 can_events => 1, 888 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 889 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 890
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 892 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 893 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 894 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues " 895 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or " 896 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 897 . "by installing the right driver for your graphics card.");
851 898
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
900 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
901 value => $CFG->{uitheme},
902 options => [
903 [wood => "Wood (the default)"],
904 [plain => "Plain (very)"],
905 [blue => "Blue (dark)"],
906 [metal => "Metal (light)"],
907 ],
908 tooltip => "Choose the User Interface theme that you like most :)",
909 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
910 );
911
852 my $vidmode_tooltip = 912 my $vidmode_tooltip =
853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 913 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
854 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 914 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
855 915
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 917 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 918
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 919 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
860 force_w => $WIDTH * 0.1, expand => 1, 920 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 921 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 922 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 923 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 924 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 925 can_events => 1, tooltip => $vidmode_tooltip);
866 926
867 $MODE_SLIDER->connect (changed => sub { 927 $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) = @_; 928 my ($self, $value) = @_;
929
930 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
931 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
932 });
933 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
934
935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
936 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
937 state => $CFG->{fullscreen},
938 tooltip => "Bring the client into fullscreen mode.",
939 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
940 );
941
942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
943 $table->add_at (1, $row++, new DC::UI::CheckBox
944 state => $CFG->{force_opengl11},
945 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
946 . "higher memory usage and slower performance. It will, however, help tremendously on "
947 . "cards that claim to support a feature but fall back to software rendering. "
948 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
949 . "but cards and drivers from other vendors (ATI) are often just as bad. "
950 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
952 );
953
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
955 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{disable_alpha},
957 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
958 . "by disabling a number of textures and transparency effects. Normally, these "
959 . "effects do not cost a lot of resources, but some graphics cards might fall "
960 . "back to extremely slow rendering if this is enabled. If disabling this option "
961 . "noticably improves the framerate of the client please report this! "
962 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
963 on_changed => sub {
964 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value; 965 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 966 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
967 0
907 0 968 }
908 } 969 );
909 );
910 970
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 972 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 973 state => $CFG->{texture_compression},
914 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 974 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
915 . "will save a lot of memory and increase performance. The compression algorithm " 975 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
916 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 976 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
917 . "forced OpenGL 1.1 mode.", 977 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 978 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 979 );
920 980
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 981 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 982 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 983 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 984 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 986 );
927 987
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
929 $table->add_at (1, $row++, new DC::UI::Slider 989 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 990 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.", 991 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 }, 992 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 993 );
934 994
935 $table->add_at (1, $row++, new DC::UI::Button 995 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 996 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 997 tooltip => "Apply the video settings above.",
938 on_activate => sub { 998 on_activate => sub {
939 video_shutdown (); 999 video_shutdown ();
940 video_init (); 1000 video_init ();
1001 0
941 0 1002 }
942 } 1003 );
943 ); 1004 }
944 1005
1006 {
1007 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1008
1009 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1010
1011 my $row = 0;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 1013 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 1014 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1015 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1016 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 1017 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1018 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1019 );
953 1020
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
955 $table->add_at (1, $row++, new DC::UI::Slider 1022 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1023 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1024 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
959 ); 1026 );
960 1027
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1029 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1030 state => $CFG->{map_smoothing},
964 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1031 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
965 . "This increases load on the graphics subsystem and works only with TRT servers. " 1032 . "This increases load on the graphics subsystem and works only with TRT servers. "
966 . "Changes take effect at next login only.", 1033 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1035 );
969 1036
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
971 $table->add_at (1, $row++, new DC::UI::CheckBox 1038 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1039 state => $CFG->{fow_enable},
973 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1040 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1042 );
976 1043
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
978 $table->add_at (1, $row++, new DC::UI::Slider 1045 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1046 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.", 1047 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 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1049 );
983 1050
984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
985 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1053 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, " 1054 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.", 1055 . "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 }, 1056 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
990 ); 1057 );
991 1058
992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1059 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
993 $table->add_at (1, $row++, new DC::UI::Slider 1060 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1061 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.", 1062 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
996 on_changed => sub { 1063 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1064 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1065 &set_gauge_window_fontsize;
1066 0
999 0 1067 }
1000 } 1068 );
1001 );
1002 1069
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1072 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1007 on_changed => sub { 1074 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1075 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1076 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1077 0
1010 0 1078 }
1011 } 1079 );
1012 ); 1080 }
1013 1081
1014 $vbox 1082 $vbox
1015} 1083}
1016 1084
1017our $AUDIO_HW_CHUNKSIZE; 1085our $AUDIO_HW_CHUNKSIZE;
… …
1597 }, 1665 },
1598 ); 1666 );
1599 1667
1600 $vbox->add (new DC::UI::FancyFrame 1668 $vbox->add (new DC::UI::FancyFrame
1601 label => "How to Play", 1669 label => "How to Play",
1602 min_h => 200, 1670 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1671 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 markup => 1672 markup =>
1605 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n" 1673 "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). " 1674 . "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 " 1675 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
… …
2133 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2201 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2134 ); 2202 );
2135 $hb->add (new DC::UI::Button 2203 $hb->add (new DC::UI::Button
2136 text => "Quit anyway", 2204 text => "Quit anyway",
2137 expand => 1, 2205 expand => 1,
2138 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2206 on_activate => sub {
2207 crash "Quit anyway";
2208 EV::unloop EV::UNLOOP_ALL;
2209 },
2139 ); 2210 );
2140 } 2211 }
2141 2212
2142 $QUIT_DIALOG->show; 2213 $QUIT_DIALOG->show;
2143 $QUIT_DIALOG->grab_focus; 2214 $QUIT_DIALOG->grab_focus;
… …
2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2272 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2202 and die "SDL::Init failed!\n"; 2273 and die "SDL::Init failed!\n";
2203} 2274}
2204 2275
2205sub video_init { 2276sub video_init {
2277 DC::set_theme $CFG->{uitheme};
2278
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2279 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0; 2280 $SDL_REINIT = 0;
2208 2281
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2282 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2283 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2287 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215 2288
2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2289 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default 2290 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218 2291
2219 # now choose biggets mode <= 1024x768 2292 # now choose biggest mode <= 1024x768
2220 for (0 .. $#SDL_MODES) { 2293 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2294 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_; 2295 $CFG->{sdl_mode} = $_;
2223 } 2296 }
2224 } 2297 }
… …
2307 x => 0, 2380 x => 0,
2308 y => $FONTSIZE + 8, 2381 y => $FONTSIZE + 8,
2309 border_bg => [1, 1, 1, 192/255], 2382 border_bg => [1, 1, 1, 192/255],
2310 bg => [1, 1, 1, 0], 2383 bg => [1, 1, 1, 0],
2311 child => ($MAPMAP = new DC::MapWidget::MapMap 2384 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.", 2385 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2313 ), 2386 ),
2314 )->show; 2387 )->show;
2315 2388
2316 $MAPWIDGET = new DC::MapWidget; 2389 $MAPWIDGET = new DC::MapWidget;
2317 $MAPWIDGET->connect (activate_console => sub { 2390 $MAPWIDGET->connect (activate_console => sub {
… …
2416 $BUTTONBAR->show; 2489 $BUTTONBAR->show;
2417 $SETUP_DIALOG->show; 2490 $SETUP_DIALOG->show;
2418 $MESSAGE_WINDOW->show; 2491 $MESSAGE_WINDOW->show;
2419 } 2492 }
2420 2493
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2494 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2495 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423 2496
2424 $CAVEAT_LABEL->set_text ("None :)"); 2497 $CAVEAT_LABEL->set_text ("None :)");
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2498 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2499 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2481 delete $animate_object{$widget}; 2554 delete $animate_object{$widget};
2482} 2555}
2483 2556
2484%SDL_CB = ( 2557%SDL_CB = (
2485 DC::SDL_QUIT => sub { 2558 DC::SDL_QUIT => sub {
2559 crash "SDL_QUIT";
2486 EV::unloop EV::UNLOOP_ALL; 2560 EV::unloop EV::UNLOOP_ALL;
2487 }, 2561 },
2488 DC::SDL_VIDEORESIZE => sub { 2562 DC::SDL_VIDEORESIZE => sub {
2489 }, 2563 },
2490 DC::SDL_VIDEOEXPOSE => sub { 2564 DC::SDL_VIDEOEXPOSE => sub {
… …
2530$SIG{INT} = $SIG{TERM} = sub { 2604$SIG{INT} = $SIG{TERM} = sub {
2531 EV::unloop; 2605 EV::unloop;
2532 #d# TODO calling exit here hangs the process in some futex 2606 #d# TODO calling exit here hangs the process in some futex
2533}; 2607};
2534 2608
2535# due to mac os x + sdl combined briandamage, we need this contortion 2609# due to mac os x + sdl combined braindamage, we need this contortion
2536sub main { 2610sub main {
2537 { 2611 {
2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2539 2613
2540 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2590 inv_sort => "mtime", 2664 inv_sort => "mtime",
2591 default => "profile", # default profile 2665 default => "profile", # default profile
2592 show_tips => 1, 2666 show_tips => 1,
2593 logview_max_par => 1000, 2667 logview_max_par => 1000,
2594 shift_fire_stop => 0, 2668 shift_fire_stop => 0,
2669 uitheme => "wood",
2595 ); 2670 );
2596 2671
2597 while (my ($k, $v) = each %DEF_CFG) { 2672 while (my ($k, $v) = each %DEF_CFG) {
2598 $CFG->{$k} = $v unless exists $CFG->{$k}; 2673 $CFG->{$k} = $v unless exists $CFG->{$k};
2599 } 2674 }

Diff Legend

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