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.83 by root, Sun Jan 4 10:22:19 2009 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 ();
93use AnyEvent::DNS ();
111 94
112use Compress::LZF; 95use Compress::LZF;
96use JSON::XS;
113 97
114use DC; 98use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 99
100sub crash($;$) {
101 # nop during compiletime
102}
103
104BEGIN {
105 $SIG{__DIE__} = sub {
106 return if $^S;
107 crash "CRASH/DIE: $_[0]" => 1;
108 DC::fatal Carp::longmess "$_[0]";
109 }
110}
111
116use DC::OpenGL (); 112use DC::OpenGL ();
117use DC::Protocol; 113use DC::Protocol;
118use DC::DB; 114use DC::DB;
119use DC::UI; 115use DC::UI;
120use DC::UI::Canvas; 116use DC::UI::Canvas;
121use DC::UI::Inventory; 117use DC::UI::Inventory;
122use DC::UI::SpellList; 118use DC::UI::SpellList;
123use DC::UI::Dockable; 119use DC::UI::Dockable;
124use DC::UI::Dockbar; 120use DC::UI::Dockbar;
125use DC::UI::MessageWindow;
126use DC::UI::ChatView; 121use DC::UI::ChatView;
127use DC::MessageDistributor; 122use DC::MessageDistributor;
128use DC::Pod; 123use DC::Pod;
129use DC::MapWidget; 124use DC::MapWidget;
130use DC::Macro; 125use DC::Macro;
131 126
132$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 127$SIG{QUIT} = sub { Carp::cluck "QUIT" };
133$SIG{PIPE} = 'IGNORE'; 128$SIG{PIPE} = 'IGNORE';
134 129
135$EV::DIED = sub { 130$EV::DIED = sub {
131 crash "CRASH/EV::DIED: $@" => 0;
136 DC::fatal Carp::longmess $@; 132 DC::fatal Carp::longmess $@;
137}; 133};
138 134
139my $MAX_FPS = 60; 135my $MAX_FPS = 60;
140 136
… …
142 138
143our $LAST_REFRESH; 139our $LAST_REFRESH;
144our $NOW; 140our $NOW;
145 141
146our $CFG; 142our $CFG;
147our $CONN;
148our $PROFILE; # current profile 143our $PROFILE; # current profile
149our $FAST; # fast, low-quality mode, possibly useful for software-rendering 144our $FAST; # fast, low-quality mode, possibly useful for software-rendering
150 145
151our $WANT_REFRESH; 146our $WANT_REFRESH;
152 147
… …
160our $FULLSCREEN; 155our $FULLSCREEN;
161our $FONTSIZE; 156our $FONTSIZE;
162 157
163our $FONT_PROP; 158our $FONT_PROP;
164our $FONT_FIXED; 159our $FONT_FIXED;
160
161our $CONN;
165 162
166our $MAP; 163our $MAP;
167our $MAPMAP; 164our $MAPMAP;
168our $MAPWIDGET; 165our $MAPWIDGET;
169our $COMPLETER; 166our $COMPLETER;
… …
211our $DEBUG_STATUS; 208our $DEBUG_STATUS;
212 209
213our $INV; 210our $INV;
214our $INVR; 211our $INVR;
215our $INVR_HB; 212our $INVR_HB;
213
214#############################################################################
215
216# write a crash message blockingly to the socket, if possible
217# this is a bit too complicated for my tastes, but it was easy.
218*crash = sub($;$) {
219 my ($msg, $backtrace) = @_;
220
221 warn $msg;
222
223 return unless $CONN;
224
225 my $fh = $CONN->{fh}
226 or return;
227
228 my $buf = delete $CONN->{wbuf};
229
230 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
231
232 AnyEvent::Util::fh_nonblocking $fh, 0;
233 syswrite $fh, $buf;
234 AnyEvent::Util::fh_nonblocking $fh, 1;
235
236 $msg =~ s/\s+$//;
237
238 # backtrace as second step, in case it crashes, too
239 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
240 if $backtrace;
241};
242
243sub clienterror($;$) {
244 my ($msg, $backtrace) = @_;
245
246 warn $msg;
247
248 return unless $CONN;
249
250 $CONN->send_exti_msg (clientlog => $msg);
251 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
252}
216 253
217############################################################################# 254#############################################################################
218 255
219sub status { 256sub status {
220 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 257 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
375 my $rwops = $meta->{path} 412 my $rwops = $meta->{path}
376 ? new_from_file DC::RW $meta->{path} 413 ? new_from_file DC::RW $meta->{path}
377 : new DC::RW $$MUSIC_PLAYING_DATA; 414 : new DC::RW $$MUSIC_PLAYING_DATA;
378 415
379 $MUSIC_PLAYER = new DC::MixMusic $rwops 416 $MUSIC_PLAYER = new DC::MixMusic $rwops
380 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
381 418
382 my $NOW = time; 419 my $NOW = time;
383 420
384 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 421 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
385 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 422 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
743} 780}
744 781
745sub dc_connect { 782sub dc_connect {
746 my ($host, $port) = @_; 783 my ($host, $port) = @_;
747 784
748 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 785 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
786 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
749 787
750 $CONN = 788 $CONN =
751 new DC::Protocol 789 new DC::Protocol
752 host => $host, 790 host => $host,
753 port => $port, 791 port => $port,
754 user => $PROFILE->{user}, 792 user => $PROFILE->{user},
755 pass => $PROFILE->{password}, 793 pass => $PROFILE->{password},
756 mapw => $mapsize, 794 mapw => $mapw,
757 maph => $mapsize, 795 maph => $maph,
758 796
759 client => "$DC::VERSION $] $^O", 797 client => "$DC::VERSION $] $^O",
760 798
761 map_widget => $MAPWIDGET, 799 map_widget => $MAPWIDGET,
762 statusbox => $STATUSBOX, 800 statusbox => $STATUSBOX,
… …
807 dc_connect $host, $port; 845 dc_connect $host, $port;
808 } 846 }
809} 847}
810 848
811sub stop_game { 849sub stop_game {
850 crash "stop_game";
851
812 $LOGIN_BUTTON->set_text ("Login / Register"); 852 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 853 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 854 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 855 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 856 $SPELL_LIST->clear_spells;
… …
830} 870}
831 871
832sub graphics_setup { 872sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 873 my $vbox = new DC::UI::VBox;
834 874
875 {
876 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
877
835 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 878 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
836 879
837 my $row = 0; 880 my $row = 0;
838 881
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 882 $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, 883 $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, 884 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 886
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 887 $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, 888 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 889 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 890 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 " 891 . "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 " 892 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 893 . "by installing the right driver for your graphics card.");
851 894
895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
896 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
897 value => $CFG->{uitheme},
898 options => [
899 [wood => "Wood (the default)"],
900 [plain => "Plain (very)"],
901 [blue => "Blue (dark)"],
902 [metal => "Metal (light)"],
903 ],
904 tooltip => "Choose the User Interface theme that you like most :)",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
906 );
907
852 my $vidmode_tooltip = 908 my $vidmode_tooltip =
853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 909 "<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>."; 910 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
855 911
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 912 $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); 913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 914
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
860 force_w => $WIDTH * 0.1, expand => 1, 916 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 917 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 918 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 919 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 920 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 921 can_events => 1, tooltip => $vidmode_tooltip);
866 922
867 $MODE_SLIDER->connect (changed => sub { 923 $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) = @_; 924 my ($self, $value) = @_;
925
926 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
927 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
928 });
929 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
930
931 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
932 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
933 state => $CFG->{fullscreen},
934 tooltip => "Bring the client into fullscreen mode.",
935 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
936 );
937
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
939 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{force_opengl11},
941 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
942 . "higher memory usage and slower performance. It will, however, help tremendously on "
943 . "cards that claim to support a feature but fall back to software rendering. "
944 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
945 . "but cards and drivers from other vendors (ATI) are often just as bad. "
946 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
947 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
948 );
949
950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
951 $table->add_at (1, $row++, new DC::UI::CheckBox
952 state => $CFG->{disable_alpha},
953 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
954 . "by disabling a number of textures and transparency effects. Normally, these "
955 . "effects do not cost a lot of resources, but some graphics cards might fall "
956 . "back to extremely slow rendering if this is enabled. If disabling this option "
957 . "noticably improves the framerate of the client please report this! "
958 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
959 on_changed => sub {
960 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value; 961 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 962 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
963 0
907 0 964 }
908 } 965 );
909 );
910 966
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 969 state => $CFG->{texture_compression},
914 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 970 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). " 971 . "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 " 972 . "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.", 973 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 975 );
920 976
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 979 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 980 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 981 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 982 );
927 983
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
929 $table->add_at (1, $row++, new DC::UI::Slider 985 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 986 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.", 987 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 }, 988 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 989 );
934 990
935 $table->add_at (1, $row++, new DC::UI::Button 991 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 992 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 993 tooltip => "Apply the video settings above.",
938 on_activate => sub { 994 on_activate => sub {
939 video_shutdown (); 995 video_shutdown ();
940 video_init (); 996 video_init ();
997 0
941 0 998 }
942 } 999 );
943 ); 1000 }
944 1001
1002 {
1003 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1004
1005 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1006
1007 my $row = 0;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1008 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 1009 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 1010 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1011 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, " 1012 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 1013 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1014 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1015 );
953 1016
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
955 $table->add_at (1, $row++, new DC::UI::Slider 1018 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1019 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1020 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1021 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
959 ); 1022 );
960 1023
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1025 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1026 state => $CFG->{map_smoothing},
964 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1027 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. " 1028 . "This increases load on the graphics subsystem and works only with TRT servers. "
966 . "Changes take effect at next login only.", 1029 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1031 );
969 1032
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1033 $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 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1035 state => $CFG->{fow_enable},
973 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1036 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 } 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1038 );
976 1039
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
978 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1042 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.", 1043 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 } 1044 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1045 );
983 1046
984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1047 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
985 $table->add_at (1, $row++, new DC::UI::Slider 1048 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1049 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, " 1050 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.", 1051 . "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 }, 1052 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
990 ); 1053 );
991 1054
992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
993 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1057 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.", 1058 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
996 on_changed => sub { 1059 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1060 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1061 &set_gauge_window_fontsize;
1062 0
999 0 1063 }
1000 } 1064 );
1001 );
1002 1065
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1068 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1069 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1007 on_changed => sub { 1070 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1071 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1072 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1073 0
1010 0 1074 }
1011 } 1075 );
1012 ); 1076 }
1013 1077
1014 $vbox 1078 $vbox
1015} 1079}
1016 1080
1017our $AUDIO_HW_CHUNKSIZE; 1081our $AUDIO_HW_CHUNKSIZE;
… …
1597 }, 1661 },
1598 ); 1662 );
1599 1663
1600 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1601 label => "How to Play", 1665 label => "How to Play",
1602 min_h => 200, 1666 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 markup => 1668 markup =>
1605 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n" 1669 "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). " 1670 . "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 " 1671 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
… …
2133 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2134 ); 2198 );
2135 $hb->add (new DC::UI::Button 2199 $hb->add (new DC::UI::Button
2136 text => "Quit anyway", 2200 text => "Quit anyway",
2137 expand => 1, 2201 expand => 1,
2138 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2202 on_activate => sub {
2203 crash "Quit anyway";
2204 EV::unloop EV::UNLOOP_ALL;
2205 },
2139 ); 2206 );
2140 } 2207 }
2141 2208
2142 $QUIT_DIALOG->show; 2209 $QUIT_DIALOG->show;
2143 $QUIT_DIALOG->grab_focus; 2210 $QUIT_DIALOG->grab_focus;
… …
2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2268 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2202 and die "SDL::Init failed!\n"; 2269 and die "SDL::Init failed!\n";
2203} 2270}
2204 2271
2205sub video_init { 2272sub video_init {
2273 DC::set_theme $CFG->{uitheme};
2274
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2275 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0; 2276 $SDL_REINIT = 0;
2208 2277
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2278 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2279 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2283 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215 2284
2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2285 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default 2286 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218 2287
2219 # now choose biggets mode <= 1024x768 2288 # now choose biggest mode <= 1024x768
2220 for (0 .. $#SDL_MODES) { 2289 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2290 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_; 2291 $CFG->{sdl_mode} = $_;
2223 } 2292 }
2224 } 2293 }
… …
2307 x => 0, 2376 x => 0,
2308 y => $FONTSIZE + 8, 2377 y => $FONTSIZE + 8,
2309 border_bg => [1, 1, 1, 192/255], 2378 border_bg => [1, 1, 1, 192/255],
2310 bg => [1, 1, 1, 0], 2379 bg => [1, 1, 1, 0],
2311 child => ($MAPMAP = new DC::MapWidget::MapMap 2380 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.", 2381 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2313 ), 2382 ),
2314 )->show; 2383 )->show;
2315 2384
2316 $MAPWIDGET = new DC::MapWidget; 2385 $MAPWIDGET = new DC::MapWidget;
2317 $MAPWIDGET->connect (activate_console => sub { 2386 $MAPWIDGET->connect (activate_console => sub {
… …
2416 $BUTTONBAR->show; 2485 $BUTTONBAR->show;
2417 $SETUP_DIALOG->show; 2486 $SETUP_DIALOG->show;
2418 $MESSAGE_WINDOW->show; 2487 $MESSAGE_WINDOW->show;
2419 } 2488 }
2420 2489
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2490 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2491 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423 2492
2424 $CAVEAT_LABEL->set_text ("None :)"); 2493 $CAVEAT_LABEL->set_text ("None :)");
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2494 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2495 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2481 delete $animate_object{$widget}; 2550 delete $animate_object{$widget};
2482} 2551}
2483 2552
2484%SDL_CB = ( 2553%SDL_CB = (
2485 DC::SDL_QUIT => sub { 2554 DC::SDL_QUIT => sub {
2555 crash "SDL_QUIT";
2486 EV::unloop EV::UNLOOP_ALL; 2556 EV::unloop EV::UNLOOP_ALL;
2487 }, 2557 },
2488 DC::SDL_VIDEORESIZE => sub { 2558 DC::SDL_VIDEORESIZE => sub {
2489 }, 2559 },
2490 DC::SDL_VIDEOEXPOSE => sub { 2560 DC::SDL_VIDEOEXPOSE => sub {
… …
2530$SIG{INT} = $SIG{TERM} = sub { 2600$SIG{INT} = $SIG{TERM} = sub {
2531 EV::unloop; 2601 EV::unloop;
2532 #d# TODO calling exit here hangs the process in some futex 2602 #d# TODO calling exit here hangs the process in some futex
2533}; 2603};
2534 2604
2605# initialise the resolver now, as vista forces us back to the desktop
2606# when doing this.
2607AnyEvent::DNS::resolver;
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