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.90 by root, Mon Jan 12 03:49:35 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;
… …
130 130
131$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
132$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
133 133
134$EV::DIED = sub { 134$EV::DIED = sub {
135 crash "CRASH/EV::DIED: $@" => 0;
135 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
136}; 137};
137 138
138my $MAX_FPS = 60; 139my $MAX_FPS = 60;
139 140
… …
141 142
142our $LAST_REFRESH; 143our $LAST_REFRESH;
143our $NOW; 144our $NOW;
144 145
145our $CFG; 146our $CFG;
146our $CONN;
147our $PROFILE; # current profile 147our $PROFILE; # current profile
148our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
149 149
150our $WANT_REFRESH; 150our $WANT_REFRESH;
151 151
… …
160our $FONTSIZE; 160our $FONTSIZE;
161 161
162our $FONT_PROP; 162our $FONT_PROP;
163our $FONT_FIXED; 163our $FONT_FIXED;
164 164
165our $CONN;
166
165our $MAP; 167our $MAP;
166our $MAPMAP; 168our $MAPMAP;
167our $MAPWIDGET; 169our $MAPWIDGET;
168our $COMPLETER; 170our $COMPLETER;
169our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
170our $METASERVER; 175our $METASERVER;
171our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
172our $QUIT_DIALOG; 177our $QUIT_DIALOG;
173our $HOST_ENTRY; 178our $HOST_ENTRY;
174our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
200our $FLOORBOX; 205our $FLOORBOX;
201our $GAUGES; 206our $GAUGES;
202our $STATWIDS; 207our $STATWIDS;
203 208
204our $SDL_ACTIVE; 209our $SDL_ACTIVE;
205our %SDL_CB; 210our @SDL_CB;
206 211
207our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
208our $STATUSBOX; 213our $STATUSBOX;
209our $MODBOX; 214our $MODBOX;
210our $DEBUG_STATUS; 215our $DEBUG_STATUS;
211 216
212our $INV; 217our $INV;
213our $INVR; 218our $INVR;
214our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
215 260
216############################################################################# 261#############################################################################
217 262
218sub status { 263sub status {
219 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
301 or return; 346 or return;
302 347
303 $meta->{data} 348 $meta->{data}
304 or return; 349 or return;
305 350
306 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
307 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
308 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
309 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
310 &audio_music_push ($face); 355 &audio_music_push ($face);
311 } 356 }
312 } else { 357 } else {
313 # fetch from database 358 # fetch from database
314 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
315 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
316 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
317 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
318 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
319 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
320 365
321 audio_sound_push ($face); 366 audio_sound_push ($face);
322 }; 367 };
… …
369 414
370 audio_music_update_volume; 415 audio_music_update_volume;
371 416
372 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
373 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
374 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
375 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
376 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
377 425
378 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
379 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
380 428
381 my $NOW = time; 429 my $NOW = time;
382 430
383 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
384 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
742} 790}
743 791
744sub dc_connect { 792sub dc_connect {
745 my ($host, $port) = @_; 793 my ($host, $port) = @_;
746 794
747 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
748 797
749 $CONN = 798 $CONN =
750 new DC::Protocol 799 new DC::Protocol
751 host => $host, 800 host => $host,
752 port => $port, 801 port => $port,
753 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
754 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
755 mapw => $mapsize, 804 mapw => $mapw,
756 maph => $mapsize, 805 maph => $maph,
757 806
758 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
759 808
760 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
761 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
806 dc_connect $host, $port; 855 dc_connect $host, $port;
807 } 856 }
808} 857}
809 858
810sub stop_game { 859sub stop_game {
860 crash "stop_game";
861
811 $LOGIN_BUTTON->set_text ("Login / Register"); 862 $LOGIN_BUTTON->set_text ("Login / Register");
812 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 863 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
813 $SETUP_DIALOG->show; 864 $SETUP_DIALOG->show;
814 $PL_WINDOW->hide; 865 $PL_WINDOW->hide;
815 $SPELL_LIST->clear_spells; 866 $SPELL_LIST->clear_spells;
… …
829} 880}
830 881
831sub graphics_setup { 882sub graphics_setup {
832 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
833 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
834 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 888 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
835 889
836 my $row = 0; 890 my $row = 0;
837 891
838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 892 $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, 893 $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, 894 can_events => 1,
841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
842 896
843 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 897 $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, 898 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
845 can_events => 1, 899 can_events => 1,
846 tooltip => "This field shows any known issues with your config or driver, such as " 900 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 " 901 . "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 " 902 . "by selecting a different video mode, changing the settings below or "
849 . "by installing the right driver for your graphics card."); 903 . "by installing the right driver for your graphics card.");
850 904
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
906 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
907 value => $CFG->{uitheme},
908 options => [
909 [wood => "Wood (the default)"],
910 [plain => "Plain (very)"],
911 [blue => "Blue (dark)"],
912 [metal => "Metal (light)"],
913 ],
914 tooltip => "Choose the User Interface theme that you like most :)",
915 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
916 );
917
851 my $vidmode_tooltip = 918 my $vidmode_tooltip =
852 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 919 "<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>."; 920 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
854 921
855 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 922 $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); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
857 924
858 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
926 c_rescale => 1,
859 force_w => $WIDTH * 0.1, expand => 1, 927 force_w => $WIDTH * 0.1, expand => 1,
860 range => [ ($CFG->{sdl_mode}) x 3 ], 928 range => [ ($CFG->{sdl_mode}) x 3 ],
861 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
862 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
863 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
864 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
865 933
866 $MODE_SLIDER->connect (changed => sub { 934 $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) = @_; 935 my ($self, $value) = @_;
936
937 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
938 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
939 });
940 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
941
942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
943 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
944 state => $CFG->{fullscreen},
945 tooltip => "Bring the client into fullscreen mode.",
946 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
947 );
948
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
950 $table->add_at (1, $row++, new DC::UI::CheckBox
951 state => $CFG->{force_opengl11},
952 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
953 . "higher memory usage and slower performance. It will, however, help tremendously on "
954 . "cards that claim to support a feature but fall back to software rendering. "
955 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
956 . "but cards and drivers from other vendors (ATI) are often just as bad. "
957 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
959 );
960
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
962 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{disable_alpha},
964 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
965 . "by disabling a number of textures and transparency effects. Normally, these "
966 . "effects do not cost a lot of resources, but some graphics cards might fall "
967 . "back to extremely slow rendering if this is enabled. If disabling this option "
968 . "noticably improves the framerate of the client please report this! "
969 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
970 on_changed => sub {
971 my ($self, $value) = @_;
904 $CFG->{disable_alpha} = $value; 972 $CFG->{disable_alpha} = $value;
905 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 973 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
974 0
906 0 975 }
907 } 976 );
908 );
909 977
910 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
911 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
912 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
913 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 981 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). " 982 . "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 " 983 . "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.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
918 ); 986 );
919 987
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
921 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
922 state => $CFG->{fast}, 990 state => $CFG->{fast},
923 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
925 ); 993 );
926 994
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 995 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
928 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
929 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 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.", 998 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 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
932 ); 1000 );
933 1001
934 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
935 expand => 1, text => "Apply", 1003 expand => 1, text => "Apply",
936 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
937 on_activate => sub { 1005 on_activate => sub {
938 video_shutdown (); 1006 video_shutdown ();
939 video_init (); 1007 video_init ();
1008 0
940 0 1009 }
941 } 1010 );
942 ); 1011 }
943 1012
1013 {
1014 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1015
1016 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1017
1018 my $row = 0;
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{smooth_movement}, 1021 state => $CFG->{smooth_movement},
947 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1022 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, " 1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
949 . "then disable this option. Changes take effect immdiately.", 1024 . "then disable this option. Changes take effect immdiately.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
951 ); 1026 );
952 1027
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
954 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
955 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
956 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
958 ); 1033 );
959 1034
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
961 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
962 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
963 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1038 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. " 1039 . "This increases load on the graphics subsystem and works only with TRT servers. "
965 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
966 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
967 ); 1042 );
968 1043
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1044 $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 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
972 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1047 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 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
974 ); 1049 );
975 1050
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
977 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
978 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 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.", 1054 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 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
981 ); 1056 );
982 1057
983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1058 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
984 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
985 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 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, " 1061 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.", 1062 . "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 }, 1063 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
989 ); 1064 );
990 1065
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
992 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
993 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 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.", 1069 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
995 on_changed => sub { 1070 on_changed => sub {
996 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
997 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
998 0 1074 }
999 } 1075 );
1000 );
1001 1076
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1003 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
1004 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
1005 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1080 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1006 on_changed => sub { 1081 on_changed => sub {
1007 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
1008 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
1009 0 1085 }
1010 } 1086 );
1011 ); 1087 }
1012 1088
1013 $vbox 1089 $vbox
1014} 1090}
1015 1091
1016our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
… …
1179} 1255}
1180 1256
1181sub make_gauge_window { 1257sub make_gauge_window {
1182 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1183 1259
1184 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1185 force_x => 0, 1261 force_x => 0,
1186 force_y => "max", 1262 force_y => "max",
1187 force_w => $WIDTH, 1263 force_w => $WIDTH,
1188 force_h => $gh, 1264 force_h => $gh,
1189 ); 1265 );
… …
1205 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1206 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1207 ], 1283 ],
1208 ); 1284 );
1209 1285
1210 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1286 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1211 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1287 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1212 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1288 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1213 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1289 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1214
1215 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1216 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1217 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1218 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1219
1220 $GAUGES = {
1221 exp => $exp, prg => $prg, sklprg => $sklprg,
1222 win => $win, range => $rng,
1223 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1224 };
1225 1290
1226 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1227 1292
1228 $win 1293 $win
1229} 1294}
… …
1571 ); 1636 );
1572 1637
1573 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1638 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1574 $table->add_at (1, 4, new DC::UI::Entry 1639 $table->add_at (1, 4, new DC::UI::Entry
1575 text => $CFG->{profile}{default}{user}, 1640 text => $CFG->{profile}{default}{user},
1576 tooltip => "The name of your character on the server.", 1641 tooltip => "The name of your character on the server. The name is case-sensitive!",
1577 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1642 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1578 ); 1643 );
1579 1644
1580 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1645 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1581 $table->add_at (1, 5, new DC::UI::Entry 1646 $table->add_at (1, 5, new DC::UI::Entry
… …
1683 1748
1684 my $row = 0; 1749 my $row = 0;
1685 1750
1686 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1751 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1687 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1688 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1689 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1755 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1690 on_changed => sub { 1756 on_changed => sub {
1691 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1692 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
… …
1694 } 1760 }
1695 ); 1761 );
1696 1762
1697 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1763 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1698 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1764 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1765 c_colspan => 2,
1699 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1700 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1767 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1701 . "sends more messages than this number, older messages get removed to save memory and " 1768 . "sends more messages than this number, older messages get removed to save memory and "
1702 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1769 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1703 on_changed => sub { 1770 on_changed => sub {
… …
1705 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1706 0 1773 0
1707 }, 1774 },
1708 ); 1775 );
1709 1776
1777 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1778 $table->add_at (1, $row, new DC::UI::CheckBox
1779 state => $CFG->{config_autosave},
1780 tooltip => "Normally, configuration settings and the user interface layout "
1781 . "are saved on client exit. You can disable this behaviour by "
1782 . "unchecking this checkbox.",
1783 on_changed => sub {
1784 my ($self, $value) = @_;
1785 $CFG->{config_autosave} = $value;
1786 0
1787 }
1788 );
1789 $table->add_at (2, $row++, new DC::UI::Button
1790 text => "Save Now",
1791 tooltip => "Use this to manually save configuration and UI layout when "
1792 . "autosave is disabled.",
1793 on_activate => sub {
1794 DC::write_cfg;
1795 0
1796 }
1797 );
1798
1710 $table 1799 $table
1711} 1800}
1712 1801
1713sub autopickup_setup { 1802sub autopickup_setup {
1714 my $r = new DC::UI::ScrolledWindow ( 1803 my $r = new DC::UI::ScrolledWindow (
… …
1720 col_expand => [0, 1, 0, 1], 1809 col_expand => [0, 1, 0, 1],
1721 ); 1810 );
1722 1811
1723 for ( 1812 for (
1724 ["General", 0, 0, 1813 ["General", 0, 0,
1725 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1726 ["Inhibit autopickup" => PICKUP_INHIBIT], 1814# ["Inhibit autopickup" => PICKUP_INHIBIT],
1727 ["Stop before pickup" => PICKUP_STOP], 1815 ["Stop before pickup" => PICKUP_STOP],
1728 ["Debug autopickup" => PICKUP_DEBUG], 1816 ["Debug autopickup" => PICKUP_DEBUG],
1729 ], 1817 ],
1730 ["Weapons", 0, 6, 1818 ["Weapons", 0, 6,
1731 ["All weapons" => PICKUP_ALLWEAPON], 1819 ["All weapons" => PICKUP_ALLWEAPON],
… …
1779 $::CFG->{pickup} |= $mask; 1867 $::CFG->{pickup} |= $mask;
1780 } else { 1868 } else {
1781 $::CFG->{pickup} &= ~$mask; 1869 $::CFG->{pickup} &= ~$mask;
1782 } 1870 }
1783 1871
1784 $::CONN->send_command ("pickup $::CFG->{pickup}") 1872 $::CONN->send_pickup ($::CFG->{pickup})
1785 if defined $::CONN; 1873 if defined $::CONN;
1786 1874
1787 0 1875 0
1788 }); 1876 });
1789 1877
… …
1806 }); 1894 });
1807 1895
1808 $table->add_at (3, 18, new DC::UI::Button 1896 $table->add_at (3, 18, new DC::UI::Button
1809 text => "set", 1897 text => "set",
1810 on_activate => sub { 1898 on_activate => sub {
1811 $::CONN->send_command ("pickup $::CFG->{pickup}") 1899 $::CONN->send_pickup ($::CFG->{pickup})
1812 if defined $::CONN; 1900 if defined $::CONN;
1813 0 1901 0
1814 }); 1902 });
1815 1903
1816 $r 1904 $r
… …
1929 $PL_NOTEBOOK->set_current_page ($widget); 2017 $PL_NOTEBOOK->set_current_page ($widget);
1930 $PL_WINDOW->show; 2018 $PL_WINDOW->show;
1931 } 2019 }
1932} 2020}
1933 2021
1934sub player_window { 2022sub make_playerbook {
1935 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2023 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1936 x => "center", 2024 x => "center",
1937 y => "center", 2025 y => "center",
1938 force_w => $WIDTH * 9/10, 2026 force_w => $WIDTH * 9/10,
1939 force_h => $HEIGHT * 9/10, 2027 force_h => $HEIGHT * 9/10,
… …
1973 "License, Author and Source info for media sent by the server."); 2061 "License, Author and Source info for media sent by the server.");
1974 2062
1975 $ntb->set_current_page ($INVENTORY_PAGE); 2063 $ntb->set_current_page ($INVENTORY_PAGE);
1976 2064
1977 $plwin->add ($ntb); 2065 $plwin->add ($ntb);
1978 $plwin
1979} 2066}
1980 2067
1981sub keyboard_setup { 2068sub keyboard_setup {
1982 DC::Macro::keyboard_setup 2069 DC::Macro::keyboard_setup
1983} 2070}
1984 2071
1985sub help_window { 2072sub make_help_window {
1986 my $win = new DC::UI::Toplevel 2073 my $win = new DC::UI::Toplevel
1987 x => 'center', 2074 x => 'center',
1988 y => 'center', 2075 y => 'center',
1989 z => 4, 2076 z => 4,
1990 name => 'doc_browser', 2077 name => 'doc_browser',
… …
2079 2166
2080 $load_node->((DC::Pod::find @path)[0]); 2167 $load_node->((DC::Pod::find @path)[0]);
2081 $win->show; 2168 $win->show;
2082 }; 2169 };
2083 2170
2084 $win 2171 $HELP_WINDOW = $win;
2085}
2086
2087sub open_string_query {
2088 my ($title, $cb, $txt, $tooltip) = @_;
2089 my $dialog = new DC::UI::Toplevel
2090 x => "center",
2091 y => "center",
2092 z => 50,
2093 force_w => $WIDTH * 4/5,
2094 title => $title;
2095
2096 $dialog->add (
2097 my $e = new DC::UI::Entry
2098 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2099 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2100 tooltip => $tooltip
2101 );
2102
2103 $e->grab_focus;
2104 $e->set_text ($txt) if $txt;
2105 $dialog->show;
2106} 2172}
2107 2173
2108sub open_quit_dialog { 2174sub open_quit_dialog {
2109 unless ($QUIT_DIALOG) { 2175 unless ($QUIT_DIALOG) {
2110 $QUIT_DIALOG = new DC::UI::Toplevel 2176 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2132 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2133 ); 2199 );
2134 $hb->add (new DC::UI::Button 2200 $hb->add (new DC::UI::Button
2135 text => "Quit anyway", 2201 text => "Quit anyway",
2136 expand => 1, 2202 expand => 1,
2137 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2203 on_activate => sub {
2204 crash "Quit anyway";
2205 EV::unloop EV::UNLOOP_ALL;
2206 },
2138 ); 2207 );
2139 } 2208 }
2140 2209
2141 $QUIT_DIALOG->show; 2210 $QUIT_DIALOG->show;
2142 $QUIT_DIALOG->grab_focus; 2211 $QUIT_DIALOG->grab_focus;
2212}
2213
2214sub make_menubar {
2215 $MENUFRAME = new DC::UI::Toplevel
2216 border => 0,
2217 force_x => 0,
2218 force_y => 0,
2219 force_w => $::WIDTH,
2220 child => ($MENUBAR = new DC::UI::HBox),
2221 ;
2222
2223 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2224
2225 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2226 make_gauge_window->show;
2227
2228# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2229# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2230
2231 make_playerbook;
2232
2233 $MENUPOPUP = DC::UI::Menu->new (items => [
2234 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2235 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2236 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2237 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2238 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2239 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2240 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2241 ["Quit…" , sub {
2242 if ($CONN) {
2243 open_quit_dialog;
2244 } else {
2245 EV::unloop EV::UNLOOP_ALL;
2246 }
2247 }],
2248 ]);
2249
2250 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2251 tooltip => "Shows the main menu",
2252 on_button_down => sub {
2253 my ($self, $ev) = @_;
2254 local $ev->{x} = 0;
2255 local $ev->{y} = 0;
2256 $MENUPOPUP->popup ($ev);
2257 },
2258 );
2259
2260 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2261 padding_x => 6,
2262 padding_y => 3,
2263 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2264 template => " Exp: 888,888,888,888 (lvl 188) ",
2265 );
2266
2267 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2268 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2269 . "will automatically pick up items as defined by your item pickup settings "
2270 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2271 . "disable autopickup by disabling this checkbox.",
2272 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2273 on_changed => sub {
2274 my ($self, $value) = @_;
2275 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2276 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2277 $CONN->send_pickup ($CFG->{pickup})
2278 if $CONN;
2279 },
2280 );
2281
2282 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2283 c_rescale => 1,
2284 padding_x => 6,
2285 padding_y => 3,
2286 force_w => $::WIDTH * 0.2,
2287 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2288 template => "two handed weapons 99%",
2289 );
2290
2291 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2292 expand => 1,
2293 align => 1, can_hover => 1, can_events => 1,
2294 text => "Range and Combat Slots",
2295 tooltip => "#stat_ranged",
2296 );
2297
2298 $MENUFRAME->show;
2299}
2300
2301sub open_string_query {
2302 my ($title, $cb, $txt, $tooltip) = @_;
2303 my $dialog = new DC::UI::Toplevel
2304 x => "center",
2305 y => "center",
2306 z => 50,
2307 force_w => $WIDTH * 4/5,
2308 title => $title;
2309
2310 $dialog->add (
2311 my $e = new DC::UI::Entry
2312 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2313 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2314 tooltip => $tooltip
2315 );
2316
2317 $e->grab_focus;
2318 $e->set_text ($txt) if $txt;
2319 $dialog->show;
2143} 2320}
2144 2321
2145sub show_tip_of_the_day { 2322sub show_tip_of_the_day {
2146 # find all tips 2323 # find all tips
2147 my @tod = DC::Pod::find tip_of_the_day => "*"; 2324 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2200 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2377 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2201 and die "SDL::Init failed!\n"; 2378 and die "SDL::Init failed!\n";
2202} 2379}
2203 2380
2204sub video_init { 2381sub video_init {
2382 DC::set_theme $CFG->{uitheme};
2383
2205 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2384 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2206 $SDL_REINIT = 0; 2385 $SDL_REINIT = 0;
2207 2386
2208 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2387 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2209 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2388 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2213 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2392 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2214 2393
2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2394 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2216 $CFG->{sdl_mode} = 0; # lowest resolution by default 2395 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217 2396
2218 # now choose biggets mode <= 1024x768 2397 # now choose biggest mode <= 1024x768
2219 for (0 .. $#SDL_MODES) { 2398 for (0 .. $#SDL_MODES) {
2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2399 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_; 2400 $CFG->{sdl_mode} = $_;
2222 } 2401 }
2223 } 2402 }
… …
2286 2465
2287 (new DC::UI::Frame 2466 (new DC::UI::Frame
2288 bg => [0, 0, 0, 0.4], 2467 bg => [0, 0, 0, 0.4],
2289 force_x => 0, 2468 force_x => 0,
2290 force_y => "max", 2469 force_y => "max",
2291 child => (my $LR = new DC::UI::VBox), 2470 child => (my $LL = new DC::UI::VBox),
2292 )->show; 2471 )->show;
2293 2472
2294 $LR->add ($STATUSBOX); 2473 $LL->add ($STATUSBOX);
2295 $LR->add ($MODBOX); 2474 $LL->add ($MODBOX);
2296 $LR->add (new DC::UI::Label 2475 $LL->add (new DC::UI::Label
2297 align => 0, 2476 align => 0,
2298 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2477 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2299 fontsize => 0.5, 2478 fontsize => 0.5,
2300 fg => [1, 1, 0, 0.7], 2479 fg => [1, 1, 0, 0.7],
2301 ); 2480 );
… …
2306 x => 0, 2485 x => 0,
2307 y => $FONTSIZE + 8, 2486 y => $FONTSIZE + 8,
2308 border_bg => [1, 1, 1, 192/255], 2487 border_bg => [1, 1, 1, 192/255],
2309 bg => [1, 1, 1, 0], 2488 bg => [1, 1, 1, 0],
2310 child => ($MAPMAP = new DC::MapWidget::MapMap 2489 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.", 2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2312 ), 2491 ),
2313 )->show; 2492 )->show;
2314 2493
2315 $MAPWIDGET = new DC::MapWidget; 2494 $MAPWIDGET = new DC::MapWidget;
2316 $MAPWIDGET->connect (activate_console => sub { 2495 $MAPWIDGET->connect (activate_console => sub {
… …
2370 . "After pressing the combo the binding will be saved automatically and the " 2549 . "After pressing the combo the binding will be saved automatically and the "
2371 . "binding editor closes"); 2550 . "binding editor closes");
2372 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2551 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2373 "Some debuggin' options. Do not ask."); 2552 "Some debuggin' options. Do not ask.");
2374 2553
2375 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2554 make_help_window;
2555 make_menubar;
2376 2556
2377 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2378 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2379
2380# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2381# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2382
2383 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2384
2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2386 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2387
2388 $BUTTONBAR->add (new DC::UI::Button
2389 text => "Save Config",
2390 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2391 on_activate => sub {
2392 $::CFG->{layout} = DC::UI::get_layout;
2393 DC::write_cfg;
2394 status "Configuration Saved";
2395 0
2396 },
2397 );
2398
2399 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2400 tooltip => "View Documentation");
2401
2402 $BUTTONBAR->add (new DC::UI::Button
2403 text => "Quit",
2404 tooltip => "Terminates the program",
2405 on_activate => sub {
2406 if ($CONN) {
2407 open_quit_dialog;
2408 } else {
2409 EV::unloop EV::UNLOOP_ALL;
2410 }
2411 0
2412 },
2413 );
2414
2415 $BUTTONBAR->show;
2416 $SETUP_DIALOG->show; 2557 $SETUP_DIALOG->show;
2417 $MESSAGE_WINDOW->show; 2558 $MESSAGE_WINDOW->show;
2418 } 2559 }
2419 2560
2420 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2561 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2421 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2562 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2422 2563
2423 $CAVEAT_LABEL->set_text ("None :)"); 2564 $CAVEAT_LABEL->set_text ("None :)");
2424 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2565 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2425 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2566 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2456my $want_refresh = EV::prepare_ns \&force_refresh; 2597my $want_refresh = EV::prepare_ns \&force_refresh;
2457 2598
2458my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2599my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2459 $NOW = EV::now; 2600 $NOW = EV::now;
2460 2601
2461 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2602 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2462 for DC::poll_events; 2603 for DC::poll_events;
2463 2604
2464 if (%animate_object) { 2605 if (%animate_object) {
2465 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2606 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2466 $WANT_REFRESH = 1; 2607 $WANT_REFRESH = 1;
… …
2478sub animation_stop { 2619sub animation_stop {
2479 my ($widget) = @_; 2620 my ($widget) = @_;
2480 delete $animate_object{$widget}; 2621 delete $animate_object{$widget};
2481} 2622}
2482 2623
2483%SDL_CB = (
2484 DC::SDL_QUIT => sub { 2624$SDL_CB[DC::SDL_QUIT] = sub {
2625 crash "SDL_QUIT";
2485 EV::unloop EV::UNLOOP_ALL; 2626 EV::unloop EV::UNLOOP_ALL;
2486 }, 2627};
2487 DC::SDL_VIDEORESIZE => sub { 2628$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2488 },
2489 DC::SDL_VIDEOEXPOSE => sub { 2629$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2490 DC::UI::full_refresh; 2630 DC::UI::full_refresh;
2491 }, 2631};
2492 DC::SDL_ACTIVEEVENT => sub { 2632$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2493# not useful, as APPACTIVE includes only iconified state, not unmapped 2633# not useful, as APPACTIVE includes only iconified state, not unmapped
2494# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2634# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2495# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2635# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2496# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2636# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2497# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2637# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2498# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2638# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2499 }, 2639};
2500 DC::SDL_KEYDOWN => sub { 2640$SDL_CB[DC::SDL_KEYDOWN] = sub {
2501 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2641 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2502 # alt-enter 2642 # alt-enter
2503 video_shutdown; 2643 video_shutdown;
2504 $FULLSCREEN_ENABLE->toggle; 2644 $FULLSCREEN_ENABLE->toggle;
2505 video_init; 2645 video_init;
2506 } else { 2646 } else {
2507 &DC::UI::feed_sdl_key_down_event; 2647 &DC::UI::feed_sdl_key_down_event;
2508 } 2648 }
2509 update_modbox; 2649 update_modbox;
2510 }, 2650};
2511 DC::SDL_KEYUP => sub { 2651$SDL_CB[DC::SDL_KEYUP] = sub {
2512 &DC::UI::feed_sdl_key_up_event; 2652 &DC::UI::feed_sdl_key_up_event;
2513 update_modbox; 2653 update_modbox;
2514 }, 2654};
2515 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2655$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2516 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2656$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2517 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2657$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2518 DC::SDL_USEREVENT => sub { 2658$SDL_CB[DC::SDL_USEREVENT] = sub {
2519 if ($_[0]{code} == 1) { 2659 if ($_[0]{code} == 1) {
2520 audio_channel_finished $_[0]{data1}; 2660 audio_channel_finished $_[0]{data1};
2521 } elsif ($_[0]{code} == 0) { 2661 } elsif ($_[0]{code} == 0) {
2522 audio_music_finished; 2662 audio_music_finished;
2523 }
2524 }, 2663 }
2525); 2664};
2526 2665
2527############################################################################# 2666#############################################################################
2528 2667
2529$SIG{INT} = $SIG{TERM} = sub { 2668$SIG{INT} = $SIG{TERM} = sub {
2530 EV::unloop; 2669 EV::unloop;
2531 #d# TODO calling exit here hangs the process in some futex 2670 #d# TODO calling exit here hangs the process in some futex
2532}; 2671};
2533 2672
2534# due to mac os x + sdl combined briandamage, we need this contortion 2673# due to mac os x + sdl combined braindamage, we need this contortion
2535sub main { 2674sub main {
2536 { 2675 {
2537 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2676 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2538 2677
2539 if (-e "$Deliantra::VARDIR/client.cf") { 2678 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2556 DC::DB::open_db; 2695 DC::DB::open_db;
2557 2696
2558 DC::UI::set_layout ($::CFG->{layout}); 2697 DC::UI::set_layout ($::CFG->{layout});
2559 2698
2560 my %DEF_CFG = ( 2699 my %DEF_CFG = (
2700 config_autosave => 1,
2561 sdl_mode => undef, 2701 sdl_mode => undef,
2562 fullscreen => 1, 2702 fullscreen => 1,
2563 fast => 0, 2703 fast => 0,
2564 force_opengl11 => undef, 2704 force_opengl11 => undef,
2565 disable_alpha => 0, 2705 disable_alpha => 0,
… …
2583 effects_enable => 1, 2723 effects_enable => 1,
2584 effects_volume => 1, 2724 effects_volume => 1,
2585 bgm_enable => 1, 2725 bgm_enable => 1,
2586 bgm_volume => 0.5, 2726 bgm_volume => 0.5,
2587 output_rate => "", 2727 output_rate => "",
2588 pickup => 0, 2728 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2589 inv_sort => "mtime", 2729 inv_sort => "mtime",
2590 default => "profile", # default profile 2730 default => "profile", # default profile
2591 show_tips => 1, 2731 show_tips => 1,
2592 logview_max_par => 1000, 2732 logview_max_par => 1000,
2593 shift_fire_stop => 0, 2733 shift_fire_stop => 0,
2734 uitheme => "wood",
2594 ); 2735 );
2595 2736
2596 while (my ($k, $v) = each %DEF_CFG) { 2737 while (my ($k, $v) = each %DEF_CFG) {
2597 $CFG->{$k} = $v unless exists $CFG->{$k}; 2738 $CFG->{$k} = $v unless exists $CFG->{$k};
2598 } 2739 }
… …
2661 }; 2802 };
2662 2803
2663 delete $SIG{__DIE__}; 2804 delete $SIG{__DIE__};
2664 EV::loop; 2805 EV::loop;
2665 2806
2807 DC::write_cfg if $CFG->{config_autosave};
2808
2666#video_shutdown; 2809 #video_shutdown;
2667#audio_shutdown; 2810 #audio_shutdown;
2811
2668 DC::OpenGL::quit; 2812 DC::OpenGL::quit;
2669 DC::SDL_Quit; 2813 DC::SDL_Quit;
2670 DC::DB::Server::stop; 2814 DC::DB::Server::stop;
2671} 2815}
2672 2816

Diff Legend

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