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.75 by root, Wed Sep 3 10:08:18 2008 UTC vs.
Revision 1.93 by root, Fri Jan 23 06:39:41 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
… …
106 91
107use Deliantra; 92use Deliantra;
108use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
109 94
110use AnyEvent::Util (); 95use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
113 98
114use Compress::LZF; 99use Compress::LZF;
115use JSON::XS; 100use JSON::XS;
116 101
117use DC; 102use DC;
… …
145 130
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
148 133
149$EV::DIED = sub { 134$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 135 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
152}; 137};
153 138
154my $MAX_FPS = 60; 139my $MAX_FPS = 60;
155 140
… …
181 166
182our $MAP; 167our $MAP;
183our $MAPMAP; 168our $MAPMAP;
184our $MAPWIDGET; 169our $MAPWIDGET;
185our $COMPLETER; 170our $COMPLETER;
186our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
187our $METASERVER; 175our $METASERVER;
188our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 177our $QUIT_DIALOG;
190our $HOST_ENTRY; 178our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 205our $FLOORBOX;
218our $GAUGES; 206our $GAUGES;
219our $STATWIDS; 207our $STATWIDS;
220 208
221our $SDL_ACTIVE; 209our $SDL_ACTIVE;
222our %SDL_CB; 210our @SDL_CB;
223 211
224our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 213our $STATUSBOX;
226our $MODBOX; 214our $MODBOX;
227our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 225*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
239 227
228 warn $msg;
229
240 return unless $CONN; 230 return unless $CONN;
241 231
242 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
243 or return; 233 or return;
244 234
… …
254 244
255 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 247 if $backtrace;
258}; 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}
259 260
260############################################################################# 261#############################################################################
261 262
262sub status { 263sub status {
263 $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]);
… …
345 or return; 346 or return;
346 347
347 $meta->{data} 348 $meta->{data}
348 or return; 349 or return;
349 350
350 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
352 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
353 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 355 &audio_music_push ($face);
355 } 356 }
356 } else { 357 } else {
357 # fetch from database 358 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
361 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;
362 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
364 365
365 audio_sound_push ($face); 366 audio_sound_push ($face);
366 }; 367 };
… …
413 414
414 audio_music_update_volume; 415 audio_music_update_volume;
415 416
416 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
417 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
418 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
419 ? 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
420 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
421 425
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 428
425 my $NOW = time; 429 my $NOW = time;
426 430
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
786} 790}
787 791
788sub dc_connect { 792sub dc_connect {
789 my ($host, $port) = @_; 793 my ($host, $port) = @_;
790 794
791 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;
792 797
793 $CONN = 798 $CONN =
794 new DC::Protocol 799 new DC::Protocol
795 host => $host, 800 host => $host,
796 port => $port, 801 port => $port,
797 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
799 mapw => $mapsize, 804 mapw => $mapw,
800 maph => $mapsize, 805 maph => $maph,
801 806
802 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
803 808
804 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
813 818
814 on_connect => sub { 819 on_connect => sub {
815 if ($_[0]) { 820 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
817 822
818 status "login successful"; 823 status "successfully connected to the server";
819 } else { 824 } else {
820 undef $CONN; 825 undef $CONN;
821 status "unable to connect: $!"; 826 status "unable to connect: $!";
822 stop_game(); 827 stop_game();
823 } 828 }
… …
875} 880}
876 881
877sub graphics_setup { 882sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
879 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
880 $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]);
881 889
882 my $row = 0; 890 my $row = 0;
883 891
884 $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");
885 $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,
886 can_events => 1, 894 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 896
889 $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");
890 $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,
891 can_events => 1, 899 can_events => 1,
892 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 "
893 . "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 "
894 . "by selecting a different video mode, changing the settings below or " 902 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 903 . "by installing the right driver for your graphics card.");
896 904
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme"); 905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
898 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector 906 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme}, 907 value => $CFG->{uitheme},
900 options => [ 908 options => [
901 [wood => "Wood (the default)"], 909 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"], 910 [plain => "Plain (very)"],
903 [blue => "Blue"], 911 [blue => "Blue (dark)"],
912 [metal => "Metal (light)"],
904 ], 913 ],
905 tooltip => "Choose the User Interface theme that you like most :)", 914 tooltip => "Choose the User Interface theme that you like most :)",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 } 915 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
907 ); 916 );
908 917
909 my $vidmode_tooltip = 918 my $vidmode_tooltip =
910 "<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). "
911 . "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>.";
912 921
913 $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");
914 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
915 924
916 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
926 c_rescale => 1,
917 force_w => $WIDTH * 0.1, expand => 1, 927 force_w => $WIDTH * 0.1, expand => 1,
918 range => [ ($CFG->{sdl_mode}) x 3 ], 928 range => [ ($CFG->{sdl_mode}) x 3 ],
919 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
920 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
921 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
922 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
923 933
924 $MODE_SLIDER->connect (changed => sub { 934 $MODE_SLIDER->connect (changed => sub {
925 my ($self, $value) = @_;
926
927 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
928 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
929 });
930 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
931
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
933 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
934 state => $CFG->{fullscreen},
935 tooltip => "Bring the client into fullscreen mode.",
936 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
937 );
938
939 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
940 $table->add_at (1, $row++, new DC::UI::CheckBox
941 state => $CFG->{force_opengl11},
942 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
943 . "higher memory usage and slower performance. It will, however, help tremendously on "
944 . "cards that claim to support a feature but fall back to software rendering. "
945 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
946 . "but cards and drivers from other vendors (ATI) are often just as bad. "
947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
948 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
949 );
950
951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
952 $table->add_at (1, $row++, new DC::UI::CheckBox
953 state => $CFG->{disable_alpha},
954 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
955 . "by disabling a number of textures and transparency effects. Normally, these "
956 . "effects do not cost a lot of resources, but some graphics cards might fall "
957 . "back to etxremely slow rendering if this is enabled. If disabling this option "
958 . "noticably improves the framerate of the client please report this! "
959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
960 on_changed => sub {
961 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) = @_;
962 $CFG->{disable_alpha} = $value; 972 $CFG->{disable_alpha} = $value;
963 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 973 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
974 0
964 0 975 }
965 } 976 );
966 );
967 977
968 $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");
969 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
970 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
971 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 "
972 . "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). "
973 . "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 "
974 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
975 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
976 ); 986 );
977 987
978 $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");
979 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
980 state => $CFG->{fast}, 990 state => $CFG->{fast},
981 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
982 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
983 ); 993 );
984 994
985 $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");
986 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
988 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.",
989 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
990 ); 1000 );
991 1001
992 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
993 expand => 1, text => "Apply", 1003 expand => 1, text => "Apply",
994 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
995 on_activate => sub { 1005 on_activate => sub {
996 video_shutdown (); 1006 video_shutdown ();
997 video_init (); 1007 video_init ();
1008 0
998 0 1009 }
999 } 1010 );
1000 ); 1011 }
1001 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;
1002 $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");
1003 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
1004 state => $CFG->{smooth_movement}, 1021 state => $CFG->{smooth_movement},
1005 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. "
1006 . "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, "
1007 . "then disable this option. Changes take effect immdiately.", 1024 . "then disable this option. Changes take effect immdiately.",
1008 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1009 ); 1026 );
1010 1027
1011 $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");
1012 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
1013 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1014 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1015 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 }
1016 ); 1033 );
1017 1034
1018 $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");
1019 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
1020 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
1021 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. "
1022 . "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. "
1023 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1025 ); 1042 );
1026 1043
1027 $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");
1028 $table->add_at (1, $row++, new DC::UI::CheckBox 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1029 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
1030 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.",
1031 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1032 ); 1049 );
1033 1050
1034 $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");
1035 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
1036 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1037 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.",
1038 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1039 ); 1056 );
1040 1057
1041 $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");
1042 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
1043 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1044 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, "
1045 . "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.",
1046 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 },
1047 ); 1064 );
1048 1065
1049 $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");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1052 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.",
1053 on_changed => sub { 1070 on_changed => sub {
1054 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
1055 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
1056 0 1074 }
1057 } 1075 );
1058 );
1059 1076
1060 $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");
1061 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
1062 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
1063 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.",
1064 on_changed => sub { 1081 on_changed => sub {
1065 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
1066 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
1067 0 1085 }
1068 } 1086 );
1069 ); 1087 }
1070 1088
1071 $vbox 1089 $vbox
1072} 1090}
1073 1091
1074our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
… …
1237} 1255}
1238 1256
1239sub make_gauge_window { 1257sub make_gauge_window {
1240 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1241 1259
1242 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1243 force_x => 0, 1261 force_x => 0,
1244 force_y => "max", 1262 force_y => "max",
1245 force_w => $WIDTH, 1263 force_w => $WIDTH,
1246 force_h => $gh, 1264 force_h => $gh,
1247 ); 1265 );
… …
1263 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1264 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1265 ], 1283 ],
1266 ); 1284 );
1267 1285
1268 $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");
1269 $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");
1270 $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");
1271 $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");
1272
1273 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1274 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1275 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1276 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1277
1278 $GAUGES = {
1279 exp => $exp, prg => $prg, sklprg => $sklprg,
1280 win => $win, range => $rng,
1281 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1282 };
1283 1290
1284 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1285 1292
1286 $win 1293 $win
1287} 1294}
… …
1629 ); 1636 );
1630 1637
1631 $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");
1632 $table->add_at (1, 4, new DC::UI::Entry 1639 $table->add_at (1, 4, new DC::UI::Entry
1633 text => $CFG->{profile}{default}{user}, 1640 text => $CFG->{profile}{default}{user},
1634 tooltip => "The name of your character on the server.", 1641 tooltip => "The name of your character on the server. The name is case-sensitive!",
1635 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 }
1636 ); 1643 );
1637 1644
1638 $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");
1639 $table->add_at (1, 5, new DC::UI::Entry 1646 $table->add_at (1, 5, new DC::UI::Entry
… …
1741 1748
1742 my $row = 0; 1749 my $row = 0;
1743 1750
1744 $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");
1745 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1746 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1747 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?",
1748 on_changed => sub { 1756 on_changed => sub {
1749 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1750 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
… …
1752 } 1760 }
1753 ); 1761 );
1754 1762
1755 $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");
1756 $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,
1757 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1758 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 "
1759 . "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 "
1760 . "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.",
1761 on_changed => sub { 1770 on_changed => sub {
… …
1763 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1764 0 1773 0
1765 }, 1774 },
1766 ); 1775 );
1767 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
1768 $table 1799 $table
1769} 1800}
1770 1801
1771sub autopickup_setup { 1802sub autopickup_setup {
1772 my $r = new DC::UI::ScrolledWindow ( 1803 my $r = new DC::UI::ScrolledWindow (
… …
1778 col_expand => [0, 1, 0, 1], 1809 col_expand => [0, 1, 0, 1],
1779 ); 1810 );
1780 1811
1781 for ( 1812 for (
1782 ["General", 0, 0, 1813 ["General", 0, 0,
1783 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1784 ["Inhibit autopickup" => PICKUP_INHIBIT], 1814# ["Inhibit autopickup" => PICKUP_INHIBIT],
1785 ["Stop before pickup" => PICKUP_STOP], 1815 ["Stop before pickup" => PICKUP_STOP],
1786 ["Debug autopickup" => PICKUP_DEBUG], 1816 ["Debug autopickup" => PICKUP_DEBUG],
1787 ], 1817 ],
1788 ["Weapons", 0, 6, 1818 ["Weapons", 0, 6,
1789 ["All weapons" => PICKUP_ALLWEAPON], 1819 ["All weapons" => PICKUP_ALLWEAPON],
… …
1837 $::CFG->{pickup} |= $mask; 1867 $::CFG->{pickup} |= $mask;
1838 } else { 1868 } else {
1839 $::CFG->{pickup} &= ~$mask; 1869 $::CFG->{pickup} &= ~$mask;
1840 } 1870 }
1841 1871
1842 $::CONN->send_command ("pickup $::CFG->{pickup}") 1872 $::CONN->send_pickup ($::CFG->{pickup})
1843 if defined $::CONN; 1873 if defined $::CONN;
1844 1874
1845 0 1875 0
1846 }); 1876 });
1847 1877
… …
1864 }); 1894 });
1865 1895
1866 $table->add_at (3, 18, new DC::UI::Button 1896 $table->add_at (3, 18, new DC::UI::Button
1867 text => "set", 1897 text => "set",
1868 on_activate => sub { 1898 on_activate => sub {
1869 $::CONN->send_command ("pickup $::CFG->{pickup}") 1899 $::CONN->send_pickup ($::CFG->{pickup})
1870 if defined $::CONN; 1900 if defined $::CONN;
1871 0 1901 0
1872 }); 1902 });
1873 1903
1874 $r 1904 $r
… …
1987 $PL_NOTEBOOK->set_current_page ($widget); 2017 $PL_NOTEBOOK->set_current_page ($widget);
1988 $PL_WINDOW->show; 2018 $PL_WINDOW->show;
1989 } 2019 }
1990} 2020}
1991 2021
1992sub player_window { 2022sub make_playerbook {
1993 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2023 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1994 x => "center", 2024 x => "center",
1995 y => "center", 2025 y => "center",
1996 force_w => $WIDTH * 9/10, 2026 force_w => $WIDTH * 9/10,
1997 force_h => $HEIGHT * 9/10, 2027 force_h => $HEIGHT * 9/10,
… …
2031 "License, Author and Source info for media sent by the server."); 2061 "License, Author and Source info for media sent by the server.");
2032 2062
2033 $ntb->set_current_page ($INVENTORY_PAGE); 2063 $ntb->set_current_page ($INVENTORY_PAGE);
2034 2064
2035 $plwin->add ($ntb); 2065 $plwin->add ($ntb);
2036 $plwin
2037} 2066}
2038 2067
2039sub keyboard_setup { 2068sub keyboard_setup {
2040 DC::Macro::keyboard_setup 2069 DC::Macro::keyboard_setup
2041} 2070}
2042 2071
2043sub help_window { 2072sub make_help_window {
2044 my $win = new DC::UI::Toplevel 2073 my $win = new DC::UI::Toplevel
2045 x => 'center', 2074 x => 'center',
2046 y => 'center', 2075 y => 'center',
2047 z => 4, 2076 z => 4,
2048 name => 'doc_browser', 2077 name => 'doc_browser',
… …
2137 2166
2138 $load_node->((DC::Pod::find @path)[0]); 2167 $load_node->((DC::Pod::find @path)[0]);
2139 $win->show; 2168 $win->show;
2140 }; 2169 };
2141 2170
2142 $win 2171 $HELP_WINDOW = $win;
2143}
2144
2145sub open_string_query {
2146 my ($title, $cb, $txt, $tooltip) = @_;
2147 my $dialog = new DC::UI::Toplevel
2148 x => "center",
2149 y => "center",
2150 z => 50,
2151 force_w => $WIDTH * 4/5,
2152 title => $title;
2153
2154 $dialog->add (
2155 my $e = new DC::UI::Entry
2156 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2157 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2158 tooltip => $tooltip
2159 );
2160
2161 $e->grab_focus;
2162 $e->set_text ($txt) if $txt;
2163 $dialog->show;
2164} 2172}
2165 2173
2166sub open_quit_dialog { 2174sub open_quit_dialog {
2167 unless ($QUIT_DIALOG) { 2175 unless ($QUIT_DIALOG) {
2168 $QUIT_DIALOG = new DC::UI::Toplevel 2176 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2201 2209
2202 $QUIT_DIALOG->show; 2210 $QUIT_DIALOG->show;
2203 $QUIT_DIALOG->grab_focus; 2211 $QUIT_DIALOG->grab_focus;
2204} 2212}
2205 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;
2320}
2321
2206sub show_tip_of_the_day { 2322sub show_tip_of_the_day {
2207 # find all tips 2323 # find all tips
2208 my @tod = DC::Pod::find tip_of_the_day => "*"; 2324 my @tod = DC::Pod::find tip_of_the_day => "*";
2209 2325
2210 DC::DB::get state => "tip_of_the_day", sub { 2326 DC::DB::get state => "tip_of_the_day", sub {
… …
2349 2465
2350 (new DC::UI::Frame 2466 (new DC::UI::Frame
2351 bg => [0, 0, 0, 0.4], 2467 bg => [0, 0, 0, 0.4],
2352 force_x => 0, 2468 force_x => 0,
2353 force_y => "max", 2469 force_y => "max",
2354 child => (my $LR = new DC::UI::VBox), 2470 child => (my $LL = new DC::UI::VBox),
2355 )->show; 2471 )->show;
2356 2472
2357 $LR->add ($STATUSBOX); 2473 $LL->add ($STATUSBOX);
2358 $LR->add ($MODBOX); 2474 $LL->add ($MODBOX);
2359 $LR->add (new DC::UI::Label 2475 $LL->add (new DC::UI::Label
2360 align => 0, 2476 align => 0,
2361 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2477 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2362 fontsize => 0.5, 2478 fontsize => 0.5,
2363 fg => [1, 1, 0, 0.7], 2479 fg => [1, 1, 0, 0.7],
2364 ); 2480 );
2365 2481
2366 DC::UI::Toplevel->new ( 2482 DC::UI::Toplevel->new (
2367 title => "Minimap", 2483 title => "Minimap",
2368 name => "mapmap", 2484 name => "mapmap",
2369 x => 0, 2485 x => 0,
2370 y => $FONTSIZE + 8, 2486 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2371 border_bg => [1, 1, 1, 192/255], 2487 border_bg => [1, 1, 1, 192/255],
2372 bg => [1, 1, 1, 0], 2488 bg => [1, 1, 1, 0],
2373 child => ($MAPMAP = new DC::MapWidget::MapMap 2489 child => ($MAPMAP = new DC::MapWidget::MapMap
2374 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2375 ), 2491 ),
… …
2404 $METASERVER = metaserver_dialog; 2520 $METASERVER = metaserver_dialog;
2405 # the name is changed to not conflict with the older name as users could have hidden it 2521 # the name is changed to not conflict with the older name as users could have hidden it
2406 $MESSAGE_WINDOW = new DC::UI::Dockbar 2522 $MESSAGE_WINDOW = new DC::UI::Dockbar
2407 name => "message_window2", 2523 name => "message_window2",
2408 title => 'Messages', 2524 title => 'Messages',
2525 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2409 force_w => $::WIDTH * 0.6, 2526 force_w => $::WIDTH * 0.6,
2410 force_h => $::HEIGHT * 0.25, 2527 force_h => $::HEIGHT * 0.25,
2411 ; 2528 ;
2412 2529
2413 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2530 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2433 . "After pressing the combo the binding will be saved automatically and the " 2550 . "After pressing the combo the binding will be saved automatically and the "
2434 . "binding editor closes"); 2551 . "binding editor closes");
2435 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2552 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2436 "Some debuggin' options. Do not ask."); 2553 "Some debuggin' options. Do not ask.");
2437 2554
2438 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2555 make_help_window;
2556 make_menubar;
2439 2557
2440 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2441 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2442
2443# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2444# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2445
2446 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
2447
2448 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2449 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2450
2451 $BUTTONBAR->add (new DC::UI::Button
2452 text => "Save Config",
2453 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2454 on_activate => sub {
2455 $::CFG->{layout} = DC::UI::get_layout;
2456 DC::write_cfg;
2457 status "Configuration Saved";
2458 0
2459 },
2460 );
2461
2462 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2463 tooltip => "View Documentation");
2464
2465 $BUTTONBAR->add (new DC::UI::Button
2466 text => "Quit",
2467 tooltip => "Terminates the program",
2468 on_activate => sub {
2469 if ($CONN) {
2470 open_quit_dialog;
2471 } else {
2472 EV::unloop EV::UNLOOP_ALL;
2473 }
2474 0
2475 },
2476 );
2477
2478 $BUTTONBAR->show;
2479 $SETUP_DIALOG->show; 2558 $SETUP_DIALOG->show;
2480 $MESSAGE_WINDOW->show; 2559 $MESSAGE_WINDOW->show;
2481 } 2560 }
2482 2561
2483 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2562 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
… …
2519my $want_refresh = EV::prepare_ns \&force_refresh; 2598my $want_refresh = EV::prepare_ns \&force_refresh;
2520 2599
2521my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2600my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2522 $NOW = EV::now; 2601 $NOW = EV::now;
2523 2602
2524 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2603 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2525 for DC::poll_events; 2604 for DC::poll_events;
2526 2605
2527 if (%animate_object) { 2606 if (%animate_object) {
2528 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2607 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2529 $WANT_REFRESH = 1; 2608 $WANT_REFRESH = 1;
… …
2541sub animation_stop { 2620sub animation_stop {
2542 my ($widget) = @_; 2621 my ($widget) = @_;
2543 delete $animate_object{$widget}; 2622 delete $animate_object{$widget};
2544} 2623}
2545 2624
2546%SDL_CB = (
2547 DC::SDL_QUIT => sub { 2625$SDL_CB[DC::SDL_QUIT] = sub {
2548 crash "SDL_QUIT"; 2626 crash "SDL_QUIT";
2549 EV::unloop EV::UNLOOP_ALL; 2627 EV::unloop EV::UNLOOP_ALL;
2550 }, 2628};
2551 DC::SDL_VIDEORESIZE => sub { 2629$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2552 },
2553 DC::SDL_VIDEOEXPOSE => sub { 2630$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2554 DC::UI::full_refresh; 2631 DC::UI::full_refresh;
2555 }, 2632};
2556 DC::SDL_ACTIVEEVENT => sub { 2633$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2557# not useful, as APPACTIVE includes only iconified state, not unmapped 2634# not useful, as APPACTIVE includes only iconified state, not unmapped
2558# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2635# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2559# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2636# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2560# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2637# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2561# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2638# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2562# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2639# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2563 }, 2640};
2564 DC::SDL_KEYDOWN => sub { 2641$SDL_CB[DC::SDL_KEYDOWN] = sub {
2565 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2642 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2566 # alt-enter 2643 # alt-enter
2567 video_shutdown; 2644 video_shutdown;
2568 $FULLSCREEN_ENABLE->toggle; 2645 $FULLSCREEN_ENABLE->toggle;
2569 video_init; 2646 video_init;
2570 } else { 2647 } else {
2571 &DC::UI::feed_sdl_key_down_event; 2648 &DC::UI::feed_sdl_key_down_event;
2572 } 2649 }
2573 update_modbox; 2650 update_modbox;
2574 }, 2651};
2575 DC::SDL_KEYUP => sub { 2652$SDL_CB[DC::SDL_KEYUP] = sub {
2576 &DC::UI::feed_sdl_key_up_event; 2653 &DC::UI::feed_sdl_key_up_event;
2577 update_modbox; 2654 update_modbox;
2578 }, 2655};
2579 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2656$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2580 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2657$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2581 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2658$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2582 DC::SDL_USEREVENT => sub { 2659$SDL_CB[DC::SDL_USEREVENT] = sub {
2583 if ($_[0]{code} == 1) { 2660 if ($_[0]{code} == 1) {
2584 audio_channel_finished $_[0]{data1}; 2661 audio_channel_finished $_[0]{data1};
2585 } elsif ($_[0]{code} == 0) { 2662 } elsif ($_[0]{code} == 0) {
2586 audio_music_finished; 2663 audio_music_finished;
2587 }
2588 }, 2664 }
2589); 2665};
2590 2666
2591############################################################################# 2667#############################################################################
2592 2668
2593$SIG{INT} = $SIG{TERM} = sub { 2669$SIG{INT} = $SIG{TERM} = sub {
2594 EV::unloop; 2670 EV::unloop;
2595 #d# TODO calling exit here hangs the process in some futex 2671 #d# TODO calling exit here hangs the process in some futex
2596}; 2672};
2597 2673
2598# due to mac os x + sdl combined briandamage, we need this contortion 2674# due to mac os x + sdl combined braindamage, we need this contortion
2599sub main { 2675sub main {
2600 { 2676 {
2601 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2677 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2602 2678
2603 if (-e "$Deliantra::VARDIR/client.cf") { 2679 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2620 DC::DB::open_db; 2696 DC::DB::open_db;
2621 2697
2622 DC::UI::set_layout ($::CFG->{layout}); 2698 DC::UI::set_layout ($::CFG->{layout});
2623 2699
2624 my %DEF_CFG = ( 2700 my %DEF_CFG = (
2701 config_autosave => 1,
2625 sdl_mode => undef, 2702 sdl_mode => undef,
2626 fullscreen => 1, 2703 fullscreen => 1,
2627 fast => 0, 2704 fast => 0,
2628 force_opengl11 => undef, 2705 force_opengl11 => undef,
2629 disable_alpha => 0, 2706 disable_alpha => 0,
… …
2647 effects_enable => 1, 2724 effects_enable => 1,
2648 effects_volume => 1, 2725 effects_volume => 1,
2649 bgm_enable => 1, 2726 bgm_enable => 1,
2650 bgm_volume => 0.5, 2727 bgm_volume => 0.5,
2651 output_rate => "", 2728 output_rate => "",
2652 pickup => 0, 2729 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2653 inv_sort => "mtime", 2730 inv_sort => "mtime",
2654 default => "profile", # default profile 2731 default => "profile", # default profile
2655 show_tips => 1, 2732 show_tips => 1,
2656 logview_max_par => 1000, 2733 logview_max_par => 1000,
2657 shift_fire_stop => 0, 2734 shift_fire_stop => 0,
2658 uitheme => "wood", 2735 uitheme => "wood",
2736 map_shift_x => -24, # arbitrary
2737 map_shift_y => +24, # arbitrary
2659 ); 2738 );
2660 2739
2661 while (my ($k, $v) = each %DEF_CFG) { 2740 while (my ($k, $v) = each %DEF_CFG) {
2662 $CFG->{$k} = $v unless exists $CFG->{$k}; 2741 $CFG->{$k} = $v unless exists $CFG->{$k};
2663 } 2742 }
… …
2726 }; 2805 };
2727 2806
2728 delete $SIG{__DIE__}; 2807 delete $SIG{__DIE__};
2729 EV::loop; 2808 EV::loop;
2730 2809
2810 DC::write_cfg if $CFG->{config_autosave};
2811
2731#video_shutdown; 2812 #video_shutdown;
2732#audio_shutdown; 2813 #audio_shutdown;
2814
2733 DC::OpenGL::quit; 2815 DC::OpenGL::quit;
2734 DC::SDL_Quit; 2816 DC::SDL_Quit;
2735 DC::DB::Server::stop; 2817 DC::DB::Server::stop;
2736} 2818}
2737 2819

Diff Legend

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