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.97 by root, Thu Nov 26 07:19:12 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??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
81 } 64 }
82 65
83 unshift @INC, $root; 66 unshift @INC, $root;
84 } 67 }
85} 68}
86 69
87# prepend private library directory 70# prepend private library directory and prepare env
88BEGIN { 71BEGIN {
89 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 74 if (-d $path) {
92 unshift @INC, $path; 75 unshift @INC, $path;
… …
106 89
107use Deliantra; 90use Deliantra;
108use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
109 92
110use AnyEvent::Util (); 93use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
113 96
114use Compress::LZF; 97use Compress::LZF;
115use JSON::XS; 98use JSON::XS;
116 99
117use DC; 100use DC;
… …
145 128
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
148 131
149$EV::DIED = sub { 132$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 133 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
152}; 135};
153 136
154my $MAX_FPS = 60; 137my $MAX_FPS = 60;
155 138
… …
181 164
182our $MAP; 165our $MAP;
183our $MAPMAP; 166our $MAPMAP;
184our $MAPWIDGET; 167our $MAPWIDGET;
185our $COMPLETER; 168our $COMPLETER;
186our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
187our $METASERVER; 173our $METASERVER;
188our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 175our $QUIT_DIALOG;
190our $HOST_ENTRY; 176our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 203our $FLOORBOX;
218our $GAUGES; 204our $GAUGES;
219our $STATWIDS; 205our $STATWIDS;
220 206
221our $SDL_ACTIVE; 207our $SDL_ACTIVE;
222our %SDL_CB; 208our @SDL_CB;
223 209
224our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 211our $STATUSBOX;
226our $MODBOX; 212our $MODBOX;
227our $DEBUG_STATUS; 213our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 221# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 222# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 223*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 224 my ($msg, $backtrace) = @_;
239 225
226 warn $msg;
227
240 return unless $CONN; 228 return unless $CONN;
241 229
242 my $fh = $CONN->{fh} 230 my $fh = $CONN->{fh}
243 or return; 231 or return;
244 232
… …
254 242
255 # backtrace as second step, in case it crashes, too 243 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 245 if $backtrace;
258}; 246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
259 258
260############################################################################# 259#############################################################################
261 260
262sub status { 261sub status {
263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
345 or return; 344 or return;
346 345
347 $meta->{data} 346 $meta->{data}
348 or return; 347 or return;
349 348
350 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
352 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 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 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 353 &audio_music_push ($face);
355 } 354 }
356 } else { 355 } else {
357 # fetch from database 356 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
361 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 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); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
364 363
365 audio_sound_push ($face); 364 audio_sound_push ($face);
366 }; 365 };
… …
413 412
414 audio_music_update_volume; 413 audio_music_update_volume;
415 414
416 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
417 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
418 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
419 ? new_from_file DC::RW $meta->{path} 421 ? (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; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
421 423
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 426
425 my $NOW = time; 427 my $NOW = time;
426 428
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
546 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
547 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
548 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
549 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
550 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
551 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
552 undef $SDL_MIXER; 556 undef $SDL_MIXER;
553} 557}
554 558
555############################################################################# 559#############################################################################
… …
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 }
… …
838 # hack to make SURE we find the IP address all right 843 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 844 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 845 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl 847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, trying differently";
849 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
850 unless (defined $host) {
843 status "dns failure, using hardcoded address"; 851 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 852 $host = "129.13.162.95";
853 }
845 } 854 }
846 855
847 dc_connect $host, $port; 856 dc_connect $host, $port;
848 }; 857 };
849 } else { 858 } else {
… …
875} 884}
876 885
877sub graphics_setup { 886sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 887 my $vbox = new DC::UI::VBox;
879 888
889 {
890 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
891
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 892 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 893
882 my $row = 0; 894 my $row = 0;
883 895
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 896 $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, 897 $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, 898 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 899 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 900
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 901 $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, 902 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 903 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 904 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 " 905 . "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 " 906 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 907 . "by installing the right driver for your graphics card.");
896 908
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme"); 909 $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 910 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme}, 911 value => $CFG->{uitheme},
900 options => [ 912 options => [
901 [wood => "Wood (the default)"], 913 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"], 914 [plain => "Plain (very)"],
903 [blue => "Blue"], 915 [blue => "Blue (dark)"],
916 [metal => "Metal (light)"],
904 ], 917 ],
905 tooltip => "Choose the User Interface theme that you like most :)", 918 tooltip => "Choose the User Interface theme that you like most :)",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 } 919 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
907 ); 920 );
908 921
909 my $vidmode_tooltip = 922 my $vidmode_tooltip =
910 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 923 "<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>."; 924 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
912 925
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 926 $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); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
915 928
916 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
930 c_rescale => 1,
917 force_w => $WIDTH * 0.1, expand => 1, 931 force_w => $WIDTH * 0.1, expand => 1,
918 range => [ ($CFG->{sdl_mode}) x 3 ], 932 range => [ ($CFG->{sdl_mode}) x 3 ],
919 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
920 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
921 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
922 can_events => 1, tooltip => $vidmode_tooltip); 936 can_events => 1, tooltip => $vidmode_tooltip);
923 937
924 $MODE_SLIDER->connect (changed => sub { 938 $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) = @_; 939 my ($self, $value) = @_;
940
941 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
942 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
943 });
944 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
945
946 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
947 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
948 state => $CFG->{fullscreen},
949 tooltip => "Bring the client into fullscreen mode.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
951 );
952
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
954 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{force_opengl11},
956 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
957 . "higher memory usage and slower performance. It will, however, help tremendously on "
958 . "cards that claim to support a feature but fall back to software rendering. "
959 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
960 . "but cards and drivers from other vendors (ATI) are often just as bad. "
961 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
962 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
963 );
964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{disable_alpha},
968 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
969 . "by disabling a number of textures and transparency effects. Normally, these "
970 . "effects do not cost a lot of resources, but some graphics cards might fall "
971 . "back to extremely slow rendering if this is enabled. If disabling this option "
972 . "noticably improves the framerate of the client please report this! "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub {
975 my ($self, $value) = @_;
962 $CFG->{disable_alpha} = $value; 976 $CFG->{disable_alpha} = $value;
963 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 977 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
978 0
964 0 979 }
965 } 980 );
966 );
967 981
968 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 982 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
969 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
970 state => $CFG->{texture_compression}, 984 state => $CFG->{texture_compression},
971 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 985 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). " 986 . "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 " 987 . "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.", 988 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
975 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
976 ); 990 );
977 991
978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
979 $table->add_at (1, $row++, new DC::UI::CheckBox 993 $table->add_at (1, $row++, new DC::UI::CheckBox
980 state => $CFG->{fast}, 994 state => $CFG->{fast},
981 tooltip => "Lower the visual quality considerably to speed up rendering.", 995 tooltip => "Lower the visual quality considerably to speed up rendering.",
982 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
983 ); 997 );
984 998
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1001 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.", 1002 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 }, 1003 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
990 ); 1004 );
991 1005
992 $table->add_at (1, $row++, new DC::UI::Button 1006 $table->add_at (1, $row++, new DC::UI::Button
993 expand => 1, text => "Apply", 1007 expand => 1, text => "Apply",
994 tooltip => "Apply the video settings above.", 1008 tooltip => "Apply the video settings above.",
995 on_activate => sub { 1009 on_activate => sub {
996 video_shutdown (); 1010 video_shutdown ();
997 video_init (); 1011 video_init ();
1012 0
998 0 1013 }
999 } 1014 );
1000 ); 1015 }
1001 1016
1017 {
1018 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1019
1020 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1021
1022 my $row = 0;
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1003 $table->add_at (1, $row++, new DC::UI::CheckBox 1024 $table->add_at (1, $row++, new DC::UI::CheckBox
1004 state => $CFG->{smooth_movement}, 1025 state => $CFG->{smooth_movement},
1005 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1026 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, " 1027 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1007 . "then disable this option. Changes take effect immdiately.", 1028 . "then disable this option. Changes take effect immdiately.",
1008 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1009 ); 1030 );
1010 1031
1011 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1012 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
1013 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1034 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1014 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1035 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1015 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1016 ); 1037 );
1017 1038
1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1019 $table->add_at (1, $row++, new DC::UI::CheckBox 1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1020 state => $CFG->{map_smoothing}, 1041 state => $CFG->{map_smoothing},
1021 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1042 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. " 1043 . "This increases load on the graphics subsystem and works only with TRT servers. "
1023 . "Changes take effect at next login only.", 1044 . "Changes take effect at next login only.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1045 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1025 ); 1046 );
1026 1047
1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1048 $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 1049 $table->add_at (1, $row++, new DC::UI::CheckBox
1029 state => $CFG->{fow_enable}, 1050 state => $CFG->{fow_enable},
1030 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1051 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 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1032 ); 1053 );
1033 1054
1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1035 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
1036 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1057 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.", 1058 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 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1039 ); 1060 );
1040 1061
1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1042 $table->add_at (1, $row++, new DC::UI::Slider 1063 $table->add_at (1, $row++, new DC::UI::Slider
1043 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1064 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, " 1065 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.", 1066 . "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 }, 1067 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1047 ); 1068 );
1048 1069
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1072 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.", 1073 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1074 on_changed => sub {
1054 $CFG->{gauge_fontsize} = $_[1]; 1075 $CFG->{gauge_fontsize} = $_[1];
1055 &set_gauge_window_fontsize; 1076 &set_gauge_window_fontsize;
1077 0
1056 0 1078 }
1057 } 1079 );
1058 );
1059 1080
1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1061 $table->add_at (1, $row++, new DC::UI::Slider 1082 $table->add_at (1, $row++, new DC::UI::Slider
1062 range => [$CFG->{gauge_size}, 0.2, 0.8], 1083 range => [$CFG->{gauge_size}, 0.2, 0.8],
1063 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1084 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1064 on_changed => sub { 1085 on_changed => sub {
1065 $CFG->{gauge_size} = $_[1]; 1086 $CFG->{gauge_size} = $_[1];
1066 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1087 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1088 0
1067 0 1089 }
1068 } 1090 );
1069 ); 1091 }
1070 1092
1071 $vbox 1093 $vbox
1072} 1094}
1073 1095
1074our $AUDIO_HW_CHUNKSIZE; 1096our $AUDIO_HW_CHUNKSIZE;
… …
1237} 1259}
1238 1260
1239sub make_gauge_window { 1261sub make_gauge_window {
1240 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1241 1263
1242 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1243 force_x => 0, 1265 force_x => 0,
1244 force_y => "max", 1266 force_y => "max",
1245 force_w => $WIDTH, 1267 force_w => $WIDTH,
1246 force_h => $gh, 1268 force_h => $gh,
1247 ); 1269 );
… …
1263 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1264 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1265 ], 1287 ],
1266 ); 1288 );
1267 1289
1268 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1290 $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"); 1291 $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"); 1292 $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"); 1293 $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 1294
1284 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1285 1296
1286 $win 1297 $win
1287} 1298}
… …
1629 ); 1640 );
1630 1641
1631 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1632 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1633 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1634 tooltip => "The name of your character on the server.", 1645 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 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1636 ); 1647 );
1637 1648
1638 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1639 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1741 1752
1742 my $row = 0; 1753 my $row = 0;
1743 1754
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1755 $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 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1746 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1747 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1759 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1748 on_changed => sub { 1760 on_changed => sub {
1749 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1750 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1752 } 1764 }
1753 ); 1765 );
1754 1766
1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1767 $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 1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1769 c_colspan => 2,
1757 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1758 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1771 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 " 1772 . "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.", 1773 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1761 on_changed => sub { 1774 on_changed => sub {
… …
1763 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1764 0 1777 0
1765 }, 1778 },
1766 ); 1779 );
1767 1780
1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1782 $table->add_at (1, $row, new DC::UI::CheckBox
1783 state => $CFG->{config_autosave},
1784 tooltip => "Normally, configuration settings and the user interface layout "
1785 . "are saved on client exit. You can disable this behaviour by "
1786 . "unchecking this checkbox.",
1787 on_changed => sub {
1788 my ($self, $value) = @_;
1789 $CFG->{config_autosave} = $value;
1790 0
1791 }
1792 );
1793 $table->add_at (2, $row++, new DC::UI::Button
1794 text => "Save Now",
1795 tooltip => "Use this to manually save configuration and UI layout when "
1796 . "autosave is disabled.",
1797 on_activate => sub {
1798 DC::write_cfg;
1799 0
1800 }
1801 );
1802
1768 $table 1803 $table
1769} 1804}
1770 1805
1771sub autopickup_setup { 1806sub autopickup_setup {
1772 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1778 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1779 ); 1814 );
1780 1815
1781 for ( 1816 for (
1782 ["General", 0, 0, 1817 ["General", 0, 0,
1783 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1784 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1785 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1786 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1787 ], 1821 ],
1788 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1789 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1837 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1838 } else { 1872 } else {
1839 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1840 } 1874 }
1841 1875
1842 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1843 if defined $::CONN; 1877 if defined $::CONN;
1844 1878
1845 0 1879 0
1846 }); 1880 });
1847 1881
… …
1864 }); 1898 });
1865 1899
1866 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1867 text => "set", 1901 text => "set",
1868 on_activate => sub { 1902 on_activate => sub {
1869 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1870 if defined $::CONN; 1904 if defined $::CONN;
1871 0 1905 0
1872 }); 1906 });
1873 1907
1874 $r 1908 $r
… …
1987 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1988 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1989 } 2023 }
1990} 2024}
1991 2025
1992sub player_window { 2026sub make_playerbook {
1993 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1994 x => "center", 2028 x => "center",
1995 y => "center", 2029 y => "center",
1996 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
1997 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
2031 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
2032 2066
2033 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
2034 2068
2035 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
2036 $plwin
2037} 2070}
2038 2071
2039sub keyboard_setup { 2072sub keyboard_setup {
2040 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
2041} 2074}
2042 2075
2043sub help_window { 2076sub make_help_window {
2044 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
2045 x => 'center', 2078 x => 'center',
2046 y => 'center', 2079 y => 'center',
2047 z => 4, 2080 z => 4,
2048 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2137 2170
2138 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2139 $win->show; 2172 $win->show;
2140 }; 2173 };
2141 2174
2142 $win 2175 $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} 2176}
2165 2177
2166sub open_quit_dialog { 2178sub open_quit_dialog {
2167 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2168 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2201 2213
2202 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2203 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
2204} 2216}
2205 2217
2218sub make_menubar {
2219 $MENUFRAME = new DC::UI::Toplevel
2220 border => 0,
2221 force_x => 0,
2222 force_y => 0,
2223 force_w => $::WIDTH,
2224 child => ($MENUBAR = new DC::UI::HBox),
2225 ;
2226
2227 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2228
2229 # 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
2230 make_gauge_window->show;
2231
2232# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2233# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2234
2235 make_playerbook;
2236
2237 $MENUPOPUP = DC::UI::Menu->new (items => [
2238 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2239 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2240 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2241 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2242 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2243 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2244 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2245 ["Quit…" , sub {
2246 if ($CONN) {
2247 open_quit_dialog;
2248 } else {
2249 EV::unloop EV::UNLOOP_ALL;
2250 }
2251 }],
2252 ]);
2253
2254 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2255 tooltip => "Shows the main menu",
2256 on_button_down => sub {
2257 my ($self, $ev) = @_;
2258 local $ev->{x} = 0;
2259 local $ev->{y} = 0;
2260 $MENUPOPUP->popup ($ev);
2261 },
2262 );
2263
2264 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2265 padding_x => 6,
2266 padding_y => 3,
2267 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2268 template => " Exp: 888,888,888,888 (lvl 188) ",
2269 );
2270
2271 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2272 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2273 . "will automatically pick up items as defined by your item pickup settings "
2274 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2275 . "disable autopickup by disabling this checkbox.",
2276 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2277 on_changed => sub {
2278 my ($self, $value) = @_;
2279 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2280 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2281 $CONN->send_pickup ($CFG->{pickup})
2282 if $CONN;
2283 },
2284 );
2285
2286 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2287 c_rescale => 1,
2288 padding_x => 6,
2289 padding_y => 3,
2290 force_w => $::WIDTH * 0.2,
2291 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2292 template => "two handed weapons 99%",
2293 );
2294
2295 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2296 expand => 1,
2297 align => 1, can_hover => 1, can_events => 1,
2298 text => "Range and Combat Slots",
2299 tooltip => "#stat_ranged",
2300 );
2301
2302 $MENUFRAME->show;
2303}
2304
2305sub open_string_query {
2306 my ($title, $cb, $txt, $tooltip) = @_;
2307 my $dialog = new DC::UI::Toplevel
2308 x => "center",
2309 y => "center",
2310 z => 50,
2311 force_w => $WIDTH * 4/5,
2312 title => $title;
2313
2314 $dialog->add (
2315 my $e = new DC::UI::Entry
2316 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2317 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2318 tooltip => $tooltip
2319 );
2320
2321 $e->grab_focus;
2322 $e->set_text ($txt) if $txt;
2323 $dialog->show;
2324}
2325
2206sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2207 # find all tips 2327 # find all tips
2208 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
2209 2329
2210 DC::DB::get state => "tip_of_the_day", sub { 2330 DC::DB::get state => "tip_of_the_day", sub {
… …
2349 2469
2350 (new DC::UI::Frame 2470 (new DC::UI::Frame
2351 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2352 force_x => 0, 2472 force_x => 0,
2353 force_y => "max", 2473 force_y => "max",
2354 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2355 )->show; 2475 )->show;
2356 2476
2357 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2358 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2359 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2360 align => 0, 2480 align => 0,
2361 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2362 fontsize => 0.5, 2482 fontsize => 0.5,
2363 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2364 ); 2484 );
2365 2485
2366 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2367 title => "Minimap", 2487 title => "Minimap",
2368 name => "mapmap", 2488 name => "mapmap",
2369 x => 0, 2489 x => 0,
2370 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2371 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2372 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2373 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2374 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2494 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2375 ), 2495 ),
… …
2404 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2405 # the name is changed to not conflict with the older name as users could have hidden it 2525 # the name is changed to not conflict with the older name as users could have hidden it
2406 $MESSAGE_WINDOW = new DC::UI::Dockbar 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2407 name => "message_window2", 2527 name => "message_window2",
2408 title => 'Messages', 2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2409 force_w => $::WIDTH * 0.6, 2530 force_w => $::WIDTH * 0.6,
2410 force_h => $::HEIGHT * 0.25, 2531 force_h => $::HEIGHT * 0.25,
2411 ; 2532 ;
2412 2533
2413 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2433 . "After pressing the combo the binding will be saved automatically and the " 2554 . "After pressing the combo the binding will be saved automatically and the "
2434 . "binding editor closes"); 2555 . "binding editor closes");
2435 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2436 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2437 2558
2438 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2439 2561
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; 2562 $SETUP_DIALOG->show;
2480 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2481 } 2564 }
2482 2565
2483 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2566 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2484 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2567 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2485 2568
2486 $CAVEAT_LABEL->set_text ("None :)"); 2569 $CAVEAT_LABEL->set_text ("None :)");
2570 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2571 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2487 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2572 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2488 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2573 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2489 2574
2490 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2575 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2491} 2576}
… …
2519my $want_refresh = EV::prepare_ns \&force_refresh; 2604my $want_refresh = EV::prepare_ns \&force_refresh;
2520 2605
2521my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2606my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2522 $NOW = EV::now; 2607 $NOW = EV::now;
2523 2608
2524 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2609 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2525 for DC::poll_events; 2610 for DC::poll_events;
2526 2611
2527 if (%animate_object) { 2612 if (%animate_object) {
2528 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2613 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2529 $WANT_REFRESH = 1; 2614 $WANT_REFRESH = 1;
… …
2541sub animation_stop { 2626sub animation_stop {
2542 my ($widget) = @_; 2627 my ($widget) = @_;
2543 delete $animate_object{$widget}; 2628 delete $animate_object{$widget};
2544} 2629}
2545 2630
2546%SDL_CB = (
2547 DC::SDL_QUIT => sub { 2631$SDL_CB[DC::SDL_QUIT] = sub {
2548 crash "SDL_QUIT"; 2632 crash "SDL_QUIT";
2549 EV::unloop EV::UNLOOP_ALL; 2633 EV::unloop EV::UNLOOP_ALL;
2550 }, 2634};
2551 DC::SDL_VIDEORESIZE => sub { 2635$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2552 },
2553 DC::SDL_VIDEOEXPOSE => sub { 2636$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2554 DC::UI::full_refresh; 2637 DC::UI::full_refresh;
2555 }, 2638};
2556 DC::SDL_ACTIVEEVENT => sub { 2639$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2557# not useful, as APPACTIVE includes only iconified state, not unmapped 2640# 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# 2641# 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# 2642# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2560# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2643# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2561# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2644# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2562# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2645# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2563 }, 2646};
2564 DC::SDL_KEYDOWN => sub { 2647$SDL_CB[DC::SDL_KEYDOWN] = sub {
2565 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2648 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2566 # alt-enter 2649 # alt-enter
2567 video_shutdown; 2650 video_shutdown;
2568 $FULLSCREEN_ENABLE->toggle; 2651 $FULLSCREEN_ENABLE->toggle;
2569 video_init; 2652 video_init;
2570 } else { 2653 } else {
2571 &DC::UI::feed_sdl_key_down_event; 2654 &DC::UI::feed_sdl_key_down_event;
2572 } 2655 }
2573 update_modbox; 2656 update_modbox;
2574 }, 2657};
2575 DC::SDL_KEYUP => sub { 2658$SDL_CB[DC::SDL_KEYUP] = sub {
2576 &DC::UI::feed_sdl_key_up_event; 2659 &DC::UI::feed_sdl_key_up_event;
2577 update_modbox; 2660 update_modbox;
2578 }, 2661};
2579 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2662$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2580 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2663$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2581 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2664$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2582 DC::SDL_USEREVENT => sub { 2665$SDL_CB[DC::SDL_USEREVENT] = sub {
2583 if ($_[0]{code} == 1) { 2666 if ($_[0]{code} == 1) {
2584 audio_channel_finished $_[0]{data1}; 2667 audio_channel_finished $_[0]{data1};
2585 } elsif ($_[0]{code} == 0) { 2668 } elsif ($_[0]{code} == 0) {
2586 audio_music_finished; 2669 audio_music_finished;
2587 }
2588 }, 2670 }
2589); 2671};
2590 2672
2591############################################################################# 2673#############################################################################
2592 2674
2593$SIG{INT} = $SIG{TERM} = sub { 2675$SIG{INT} = $SIG{TERM} = sub {
2594 EV::unloop; 2676 EV::unloop;
2595 #d# TODO calling exit here hangs the process in some futex 2677 #d# TODO calling exit here hangs the process in some futex
2596}; 2678};
2597 2679
2598# due to mac os x + sdl combined briandamage, we need this contortion 2680# due to mac os x + sdl combined braindamage, we need this contortion
2599sub main { 2681sub main {
2600 { 2682 {
2601 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2683 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2602 2684
2603 if (-e "$Deliantra::VARDIR/client.cf") { 2685 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2620 DC::DB::open_db; 2702 DC::DB::open_db;
2621 2703
2622 DC::UI::set_layout ($::CFG->{layout}); 2704 DC::UI::set_layout ($::CFG->{layout});
2623 2705
2624 my %DEF_CFG = ( 2706 my %DEF_CFG = (
2707 config_autosave => 1,
2625 sdl_mode => undef, 2708 sdl_mode => undef,
2626 fullscreen => 1, 2709 fullscreen => 1,
2627 fast => 0, 2710 fast => 0,
2628 force_opengl11 => undef, 2711 force_opengl11 => undef,
2629 disable_alpha => 0, 2712 disable_alpha => 0,
… …
2647 effects_enable => 1, 2730 effects_enable => 1,
2648 effects_volume => 1, 2731 effects_volume => 1,
2649 bgm_enable => 1, 2732 bgm_enable => 1,
2650 bgm_volume => 0.5, 2733 bgm_volume => 0.5,
2651 output_rate => "", 2734 output_rate => "",
2652 pickup => 0, 2735 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2653 inv_sort => "mtime", 2736 inv_sort => "mtime",
2654 default => "profile", # default profile 2737 default => "profile", # default profile
2655 show_tips => 1, 2738 show_tips => 1,
2656 logview_max_par => 1000, 2739 logview_max_par => 1000,
2657 shift_fire_stop => 0, 2740 shift_fire_stop => 0,
2658 uitheme => "wood", 2741 uitheme => "wood",
2742 map_shift_x => -24, # arbitrary
2743 map_shift_y => +24, # arbitrary
2659 ); 2744 );
2660 2745
2661 while (my ($k, $v) = each %DEF_CFG) { 2746 while (my ($k, $v) = each %DEF_CFG) {
2662 $CFG->{$k} = $v unless exists $CFG->{$k}; 2747 $CFG->{$k} = $v unless exists $CFG->{$k};
2663 } 2748 }
… …
2677 } 2762 }
2678 } 2763 }
2679 2764
2680 sdl_init; 2765 sdl_init;
2681 2766
2767 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2768 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2769
2682 { 2770 {
2683 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2771 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2684 DejaVuSans.ttf 2772 DejaVuSans.ttf
2685 DejaVuSansMono.ttf 2773 DejaVuSansMono.ttf
2686 DejaVuSans-Bold.ttf 2774 DejaVuSans-Bold.ttf
2687 DejaVuSansMono-Bold.ttf 2775 DejaVuSansMono-Bold.ttf
2688 DejaVuSans-Oblique.ttf 2776 DejaVuSans-Oblique.ttf
2689 DejaVuSansMono-Oblique.ttf 2777 DejaVuSansMono-Oblique.ttf
2690 DejaVuSans-BoldOblique.ttf 2778 DejaVuSans-BoldOblique.ttf
2691 DejaVuSansMono-BoldOblique.ttf 2779 DejaVuSansMono-BoldOblique.ttf
2780 mona.ttf
2692 ); 2781 );
2693 2782
2694 DC::add_font $_ for @fonts; 2783 DC::add_font $_ for @fonts;
2695 2784
2696 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2785 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2726 }; 2815 };
2727 2816
2728 delete $SIG{__DIE__}; 2817 delete $SIG{__DIE__};
2729 EV::loop; 2818 EV::loop;
2730 2819
2820 DC::write_cfg if $CFG->{config_autosave};
2821
2731#video_shutdown; 2822 #video_shutdown;
2732#audio_shutdown; 2823 #audio_shutdown;
2824
2733 DC::OpenGL::quit; 2825 DC::OpenGL::quit;
2734 DC::SDL_Quit; 2826 DC::SDL_Quit;
2735 DC::DB::Server::stop; 2827 DC::DB::Server::stop;
2736} 2828}
2737 2829

Diff Legend

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