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.68 by root, Mon Sep 1 10:17:42 2008 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 use AnyEvent::DNS ();
29 AnyEvent::DNS::resolver;
30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
49 } 53 }
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # 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 { 58 } else {
75 # OS X 59 # 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"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
81 } 63 }
82 64
83 unshift @INC, $root; 65 unshift @INC, $root;
84 } 66 }
85} 67}
86 68
87# prepend private library directory 69# prepend private library directory and prepare env
88BEGIN { 70BEGIN {
89 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 73 if (-d $path) {
92 unshift @INC, $path; 74 unshift @INC, $path;
106 88
107use Deliantra; 89use Deliantra;
108use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
109 91
110use AnyEvent::Util (); 92use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
113 95
114use Compress::LZF; 96use Compress::LZF;
115use JSON::XS; 97use JSON::XS;
116 98
117use DC; 99use DC;
145 127
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
148 130
149$EV::DIED = sub { 131$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
152}; 134};
153 135
154my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
155 139
156our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
157 141
158our $LAST_REFRESH; 142our $LAST_REFRESH;
159our $NOW; 143our $NOW;
160 144
161our $CFG; 145our $CFG;
162our $PROFILE; # current profile 146our $PROFILE; # current profile
163our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
164 149
165our $WANT_REFRESH; 150our $WANT_REFRESH;
166 151
167our $MODE_SLIDER; 152our $MODE_SLIDER;
168our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
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};
537 sub audio_tab_update; 541 sub audio_tab_update;
538 audio_tab_update; 542 audio_tab_update;
539} 543}
540 544
541sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
542 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
543 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
544 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
545 554
546 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
786} 795}
787 796
788sub dc_connect { 797sub dc_connect {
789 my ($host, $port) = @_; 798 my ($host, $port) = @_;
790 799
791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 800 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
801 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
792 802
793 $CONN = 803 $CONN =
794 new DC::Protocol 804 new DC::Protocol
795 host => $host, 805 host => $host,
796 port => $port, 806 port => $port,
797 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
799 mapw => $mapsize, 809 mapw => $mapw,
800 maph => $mapsize, 810 maph => $maph,
801 811
812 c_version => {
813 client => "deliantra",
802 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
803 818
804 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
806 map => $MAP, 821 map => $MAP,
807 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
813 828
814 on_connect => sub { 829 on_connect => sub {
815 if ($_[0]) { 830 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
817 832
818 status "login successful"; 833 status "successfully connected to the server";
819 } else { 834 } else {
820 undef $CONN; 835 undef $CONN;
821 status "unable to connect: $!"; 836 status "unable to connect: $!";
822 stop_game(); 837 stop_game();
823 } 838 }
825 ; 840 ;
826} 841}
827 842
828sub start_game { 843sub start_game {
829 status "logging in..."; 844 status "logging in...";
845
846 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
847 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
848 or return status "$server: unable to parse server address, try an empty field.";
830 849
831 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835 852
836 $MAP = new DC::Map; 853 $MAP = new DC::Map;
837 854
838 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # P-e-r-l
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
843 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 864 $host = "194.126.175.154";
865 }
845 } 866 }
846 867
847 dc_connect $host, $port; 868 dc_connect $host, $port;
848 }; 869 };
849 } else { 870 } else {
875} 896}
876 897
877sub graphics_setup { 898sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 899 my $vbox = new DC::UI::VBox;
879 900
901 {
902 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
903
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 904 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 905
882 my $row = 0; 906 my $row = 0;
883 907
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 908 $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, 909 $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, 910 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 911 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 912
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 913 $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, 914 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 915 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 916 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 " 917 . "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 " 918 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 919 . "by installing the right driver for your graphics card.");
896 920
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
923 value => $CFG->{uitheme},
924 options => [
925 [wood => "Wood (the default)"],
926 [plain => "Plain (very)"],
927 [blue => "Blue (dark)"],
928 [metal => "Metal (light)"],
929 ],
930 tooltip => "Choose the User Interface theme that you like most :)",
931 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
932 );
933
897 my $vidmode_tooltip = 934 my $vidmode_tooltip =
898 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 935 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
899 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 936 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
900 937
901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
902 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
903 940
904 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
942 c_rescale => 1,
905 force_w => $WIDTH * 0.1, expand => 1, 943 force_w => $WIDTH * 0.1, expand => 1,
906 range => [ ($CFG->{sdl_mode}) x 3 ], 944 range => [ ($CFG->{sdl_mode}) x 3 ],
907 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
908 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
909 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
910 can_events => 1, tooltip => $vidmode_tooltip); 948 can_events => 1, tooltip => $vidmode_tooltip);
911 949
912 $MODE_SLIDER->connect (changed => sub { 950 $MODE_SLIDER->connect (changed => sub {
913 my ($self, $value) = @_;
914
915 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
916 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
917 });
918 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
922 state => $CFG->{fullscreen},
923 tooltip => "Bring the client into fullscreen mode.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
925 );
926
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
928 $table->add_at (1, $row++, new DC::UI::CheckBox
929 state => $CFG->{force_opengl11},
930 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
931 . "higher memory usage and slower performance. It will, however, help tremendously on "
932 . "cards that claim to support a feature but fall back to software rendering. "
933 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
934 . "but cards and drivers from other vendors (ATI) are often just as bad. "
935 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
936 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
937 );
938
939 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
940 $table->add_at (1, $row++, new DC::UI::CheckBox
941 state => $CFG->{disable_alpha},
942 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
943 . "by disabling a number of textures and transparency effects. Normally, these "
944 . "effects do not cost a lot of resources, but some graphics cards might fall "
945 . "back to etxremely slow rendering if this is enabled. If disabling this option "
946 . "noticably improves the framerate of the client please report this! "
947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
948 on_changed => sub {
949 my ($self, $value) = @_; 951 my ($self, $value) = @_;
952
953 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
954 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
955 });
956 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
957
958 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
959 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
960 state => $CFG->{fullscreen},
961 tooltip => "Bring the client into fullscreen mode.",
962 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
963 );
964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{force_opengl11},
968 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
969 . "higher memory usage and slower performance. It will, however, help tremendously on "
970 . "cards that claim to support a feature but fall back to software rendering. "
971 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
972 . "but cards and drivers from other vendors (ATI) are often just as bad. "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
975 );
976
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
978 $table->add_at (1, $row++, new DC::UI::CheckBox
979 state => $CFG->{disable_alpha},
980 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
981 . "by disabling a number of textures and transparency effects. Normally, these "
982 . "effects do not cost a lot of resources, but some graphics cards might fall "
983 . "back to extremely slow rendering if this is enabled. If disabling this option "
984 . "noticably improves the framerate of the client please report this! "
985 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
986 on_changed => sub {
987 my ($self, $value) = @_;
950 $CFG->{disable_alpha} = $value; 988 $CFG->{disable_alpha} = $value;
951 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 989 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
990 0
952 0 991 }
953 } 992 );
954 );
955 993
956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
957 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
958 state => $CFG->{texture_compression}, 996 state => $CFG->{texture_compression},
959 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 997 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
960 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 998 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
961 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 999 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
962 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 1000 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
963 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
964 ); 1002 );
965 1003
966 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1004 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
967 $table->add_at (1, $row++, new DC::UI::CheckBox 1005 $table->add_at (1, $row++, new DC::UI::CheckBox
968 state => $CFG->{fast}, 1006 state => $CFG->{fast},
969 tooltip => "Lower the visual quality considerably to speed up rendering.", 1007 tooltip => "Lower the visual quality considerably to speed up rendering.",
970 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
971 ); 1009 );
972 1010
973 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1011 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
974 $table->add_at (1, $row++, new DC::UI::Slider 1012 $table->add_at (1, $row++, new DC::UI::Slider
975 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1013 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
976 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1014 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
977 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1015 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
978 ); 1016 );
979 1017
980 $table->add_at (1, $row++, new DC::UI::Button 1018 $table->add_at (1, $row++, new DC::UI::Button
981 expand => 1, text => "Apply", 1019 expand => 1, text => "Apply",
982 tooltip => "Apply the video settings above.", 1020 tooltip => "Apply the video settings above.",
983 on_activate => sub { 1021 on_activate => sub {
984 video_shutdown (); 1022 video_shutdown ();
985 video_init (); 1023 video_init ();
1024 0
986 0 1025 }
987 } 1026 );
988 ); 1027 }
989 1028
1029 {
1030 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1031
1032 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1033
1034 my $row = 0;
990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
991 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
992 state => $CFG->{smooth_movement}, 1037 state => $CFG->{smooth_movement},
993 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1038 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
994 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1039 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
995 . "then disable this option. Changes take effect immdiately.", 1040 . "then disable this option. Changes take effect immdiately.",
996 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
997 ); 1042 );
998 1043
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{smooth_transitions},
1047 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1048 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1049 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1050 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1051 );
1052
1053
999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1000 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
1001 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1002 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1003 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1058 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1004 ); 1059 );
1005 1060
1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1061 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1007 $table->add_at (1, $row++, new DC::UI::CheckBox 1062 $table->add_at (1, $row++, new DC::UI::CheckBox
1008 state => $CFG->{map_smoothing}, 1063 state => $CFG->{map_smoothing},
1009 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1064 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1010 . "This increases load on the graphics subsystem and works only with TRT servers. " 1065 . "This increases load on the graphics subsystem and works only with TRT servers. "
1011 . "Changes take effect at next login only.", 1066 . "Changes take effect at next login only.",
1012 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1067 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1013 ); 1068 );
1014 1069
1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1016 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
1017 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
1018 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1073 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1020 ); 1075 );
1021 1076
1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1078 $table->add_at (1, $row++, new DC::UI::ImageButton
1079 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1080 bg => [0.3, 0.3, 0.2],
1081 force_w => 64,
1082 force_h => 64,
1083 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1084 on_activate => sub {
1085 my ($self) = @_;
1086 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1087 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1088 $MAPWIDGET->update;
1089 }
1090 );
1091
1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1023 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
1024 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1025 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1095 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1026 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1027 ); 1097 );
1028 1098
1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1099 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1030 $table->add_at (1, $row++, new DC::UI::Slider 1100 $table->add_at (1, $row++, new DC::UI::Slider
1031 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1101 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1032 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1102 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1033 . "but you still need to press apply to correctly re-layout the widget.", 1103 . "but you still need to press apply to correctly re-layout the widget.",
1034 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1104 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1035 ); 1105 );
1036 1106
1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1107 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1038 $table->add_at (1, $row++, new DC::UI::Slider 1108 $table->add_at (1, $row++, new DC::UI::Slider
1039 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1109 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1040 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1110 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1041 on_changed => sub { 1111 on_changed => sub {
1042 $CFG->{gauge_fontsize} = $_[1]; 1112 $CFG->{gauge_fontsize} = $_[1];
1043 &set_gauge_window_fontsize; 1113 &set_gauge_window_fontsize;
1114 0
1044 0 1115 }
1045 } 1116 );
1046 );
1047 1117
1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1049 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
1050 range => [$CFG->{gauge_size}, 0.2, 0.8], 1120 range => [$CFG->{gauge_size}, 0.2, 0.8],
1051 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1121 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1052 on_changed => sub { 1122 on_changed => sub {
1053 $CFG->{gauge_size} = $_[1]; 1123 $CFG->{gauge_size} = $_[1];
1054 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1124 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1125 0
1055 0 1126 }
1056 } 1127 );
1057 ); 1128 }
1058 1129
1059 $vbox 1130 $vbox
1060} 1131}
1061 1132
1062our $AUDIO_HW_CHUNKSIZE; 1133our $AUDIO_HW_CHUNKSIZE;
1074 ]); 1145 ]);
1075 1146
1076 my $text = !$freq 1147 my $text = !$freq
1077 ? "audio is off" 1148 ? "audio is off"
1078 : "audio is enabled\n" 1149 : "audio is enabled\n"
1150 . "driver: " . DC::SDL_AudioDriverName . "\n"
1079 . "frequency (Hz): $freq\n" 1151 . "frequency (Hz): $freq\n"
1080 . "channels: $chans"; 1152 . "channels: $chans\n"
1153 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1154 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1081 1155
1082 $AUDIO_INFO->set_text ($text); 1156 $AUDIO_INFO->set_text ($text);
1083} 1157}
1084 1158
1085sub audio_setup { 1159sub audio_setup {
1114 ); 1188 );
1115 1189
1116 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1190 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1117 $table->add_at (1, $row, new DC::UI::CheckBox 1191 $table->add_at (1, $row, new DC::UI::CheckBox
1118 expand => 1, state => $CFG->{bgm_enable}, 1192 expand => 1, state => $CFG->{bgm_enable},
1119 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1193 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1120 on_changed => sub { 1194 on_changed => sub {
1121 $CFG->{bgm_enable} = $_[1]; 1195 $CFG->{bgm_enable} = $_[1];
1122 $CONN->update_fx_want if $CONN; 1196 $CONN->update_fx_want if $CONN;
1123 audio_music_push; 1197 audio_music_push;
1124 1 1198 1
1225} 1299}
1226 1300
1227sub make_gauge_window { 1301sub make_gauge_window {
1228 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1302 my $gh = int $HEIGHT * $CFG->{gauge_size};
1229 1303
1230 my $win = new DC::UI::Frame ( 1304 $GAUGES->{win} = my $win = new DC::UI::Frame (
1231 force_x => 0, 1305 force_x => 0,
1232 force_y => "max", 1306 force_y => "max",
1233 force_w => $WIDTH, 1307 force_w => $WIDTH,
1234 force_h => $gh, 1308 force_h => $gh,
1235 ); 1309 );
1251 (new DC::UI::Empty expand => 1), 1325 (new DC::UI::Empty expand => 1),
1252 (my $hb = new DC::UI::HBox), 1326 (my $hb = new DC::UI::HBox),
1253 ], 1327 ],
1254 ); 1328 );
1255 1329
1256 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1330 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1257 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1331 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1258 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1332 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1259 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1333 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1260
1261 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1262 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1263 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1264 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1265
1266 $GAUGES = {
1267 exp => $exp, prg => $prg, sklprg => $sklprg,
1268 win => $win, range => $rng,
1269 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1270 };
1271 1334
1272 &set_gauge_window_fontsize; 1335 &set_gauge_window_fontsize;
1273 1336
1274 $win 1337 $win
1338}
1339
1340our $BW_WATCHER;
1341
1342sub debug_toggle($) {
1343 $DELIANTRA_DEBUG ^= $_[0];
1344
1345 if ($DELIANTRA_DEBUG & 16) {
1346 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1347 return unless $CONN;
1348 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1349 $CONN->{octets_in} = 0;
1350 };
1351 } else {
1352 undef $BW_WATCHER;
1353 }
1354
1275} 1355}
1276 1356
1277sub debug_setup { 1357sub debug_setup {
1278 my $table = new DC::UI::Table; 1358 my $table = new DC::UI::Table;
1279 1359
1280 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1360 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1281 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1361 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1282 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1362 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1283 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1363 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1284 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1364 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1285 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1365 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1286 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1366 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1287 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1367 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1368 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1369 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1370
1288 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1371 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1289
1290 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1372 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1291 1373
1292 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1374 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1293 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1375 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1294 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1376 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1295 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1377 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1616 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1698 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1617 ); 1699 );
1618 1700
1619 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1701 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1620 $table->add_at (1, 4, new DC::UI::Entry 1702 $table->add_at (1, 4, new DC::UI::Entry
1621 text => $CFG->{profile}{default}{user}, 1703 text => $PROFILE->{user},
1622 tooltip => "The name of your character on the server.", 1704 tooltip => "The name of your character on the server. The name is case-sensitive!",
1623 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1705 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1624 ); 1706 );
1625 1707
1626 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1708 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1627 $table->add_at (1, 5, new DC::UI::Entry 1709 $table->add_at (1, 5, new DC::UI::Entry
1628 text => $CFG->{profile}{default}{password}, 1710 text => $PROFILE->{password},
1629 hidden => 1, 1711 hidden => 1,
1630 tooltip => "The password for your character.", 1712 tooltip => "The password for your character.",
1631 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1713 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1632 ); 1714 );
1633 1715
1634 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1716 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1635 expand => 1, 1717 expand => 1,
1636 text => "Login / Register", 1718 text => "Login / Register",
1672 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1754 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1673 1755
1674 $vbox->add ( 1756 $vbox->add (
1675 $HOST_ENTRY = new DC::UI::Entry 1757 $HOST_ENTRY = new DC::UI::Entry
1676 expand => 1, 1758 expand => 1,
1677 text => $CFG->{profile}{default}{host}, 1759 text => $PROFILE->{host},
1678 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1760 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1679 on_changed => sub { 1761 on_changed => sub {
1680 my ($self, $value) = @_; 1762 my ($self, $value) = @_;
1681 $CFG->{profile}{default}{host} = $value; 1763 $PROFILE->{host} = $value;
1682 1 1764 1
1683 } 1765 }
1684 ); 1766 );
1685 1767
1686 if (0) { #d# disabled 1768 if (0) { #d# disabled
1729 1811
1730 my $row = 0; 1812 my $row = 0;
1731 1813
1732 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1733 $table->add_at (1, $row++, new DC::UI::CheckBox 1815 $table->add_at (1, $row++, new DC::UI::CheckBox
1816 c_colspan => 2,
1734 state => $CFG->{show_tips}, 1817 state => $CFG->{show_tips},
1735 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1818 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1736 on_changed => sub { 1819 on_changed => sub {
1737 my ($self, $value) = @_; 1820 my ($self, $value) = @_;
1738 $CFG->{show_tips} = $value; 1821 $CFG->{show_tips} = $value;
1740 } 1823 }
1741 ); 1824 );
1742 1825
1743 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1826 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1744 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1827 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1828 c_colspan => 2,
1745 text => $CFG->{logview_max_par}, 1829 text => $CFG->{logview_max_par},
1746 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1830 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1747 . "sends more messages than this number, older messages get removed to save memory and " 1831 . "sends more messages than this number, older messages get removed to save memory and "
1748 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1832 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1749 on_changed => sub { 1833 on_changed => sub {
1751 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1835 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1752 0 1836 0
1753 }, 1837 },
1754 ); 1838 );
1755 1839
1840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1841 $table->add_at (1, $row, new DC::UI::CheckBox
1842 state => $CFG->{config_autosave},
1843 tooltip => "Normally, configuration settings and the user interface layout "
1844 . "are saved on client exit. You can disable this behaviour by "
1845 . "unchecking this checkbox.",
1846 on_changed => sub {
1847 my ($self, $value) = @_;
1848 $CFG->{config_autosave} = $value;
1849 0
1850 }
1851 );
1852 $table->add_at (2, $row++, new DC::UI::Button
1853 text => "Save Now",
1854 tooltip => "Use this to manually save configuration and UI layout when "
1855 . "autosave is disabled.",
1856 on_activate => sub {
1857 DC::write_cfg;
1858 0
1859 }
1860 );
1861
1756 $table 1862 $table
1757} 1863}
1758 1864
1759sub autopickup_setup { 1865sub autopickup_setup {
1760 my $r = new DC::UI::ScrolledWindow ( 1866 my $r = new DC::UI::ScrolledWindow (
1766 col_expand => [0, 1, 0, 1], 1872 col_expand => [0, 1, 0, 1],
1767 ); 1873 );
1768 1874
1769 for ( 1875 for (
1770 ["General", 0, 0, 1876 ["General", 0, 0,
1771 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1772 ["Inhibit autopickup" => PICKUP_INHIBIT], 1877# ["Inhibit autopickup" => PICKUP_INHIBIT],
1773 ["Stop before pickup" => PICKUP_STOP], 1878 ["Stop before pickup" => PICKUP_STOP],
1774 ["Debug autopickup" => PICKUP_DEBUG], 1879 ["Debug autopickup" => PICKUP_DEBUG],
1775 ], 1880 ],
1776 ["Weapons", 0, 6, 1881 ["Weapons", 0, 6,
1777 ["All weapons" => PICKUP_ALLWEAPON], 1882 ["All weapons" => PICKUP_ALLWEAPON],
1825 $::CFG->{pickup} |= $mask; 1930 $::CFG->{pickup} |= $mask;
1826 } else { 1931 } else {
1827 $::CFG->{pickup} &= ~$mask; 1932 $::CFG->{pickup} &= ~$mask;
1828 } 1933 }
1829 1934
1830 $::CONN->send_command ("pickup $::CFG->{pickup}") 1935 $::CONN->send_pickup ($::CFG->{pickup})
1831 if defined $::CONN; 1936 if defined $::CONN;
1832 1937
1833 0 1938 0
1834 }); 1939 });
1835 1940
1852 }); 1957 });
1853 1958
1854 $table->add_at (3, 18, new DC::UI::Button 1959 $table->add_at (3, 18, new DC::UI::Button
1855 text => "set", 1960 text => "set",
1856 on_activate => sub { 1961 on_activate => sub {
1857 $::CONN->send_command ("pickup $::CFG->{pickup}") 1962 $::CONN->send_pickup ($::CFG->{pickup})
1858 if defined $::CONN; 1963 if defined $::CONN;
1859 0 1964 0
1860 }); 1965 });
1861 1966
1862 $r 1967 $r
1863} 1968}
1864 1969
1865my %SORT_ORDER = ( 1970my %SORT_ORDER = (
1866 type => sub { 1971 type => sub {
1972 use sort 'stable';
1867 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1973 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1868 }, 1974 },
1869 mtime => sub { 1975 mtime => sub {
1976 use sort 'stable';
1870 my $NOW = time; 1977 my $NOW = time;
1871 sort { 1978 sort {
1872 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1979 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1873 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1980 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1874 1981
1875 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1982 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1876 or $btime <=> $atime 1983 or $btime <=> $atime
1877 or $a->{type} <=> $b->{type} 1984 or $a->{type} <=> $b->{type}
1878 } @_ 1985 } @_
1879 }, 1986 },
1880 weight => sub { sort { 1987 weight => sub {
1988 use sort 'stable';
1989 sort {
1881 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1990 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1882 or $a->{type} <=> $b->{type} 1991 or $a->{type} <=> $b->{type}
1883 } @_ }, 1992 } @_
1993 },
1884); 1994);
1885 1995
1886sub inventory_widget { 1996sub inventory_widget {
1887 my $hb = new DC::UI::HBox homogeneous => 1; 1997 my $hb = new DC::UI::HBox homogeneous => 1;
1888 1998
1975 $PL_NOTEBOOK->set_current_page ($widget); 2085 $PL_NOTEBOOK->set_current_page ($widget);
1976 $PL_WINDOW->show; 2086 $PL_WINDOW->show;
1977 } 2087 }
1978} 2088}
1979 2089
1980sub player_window { 2090sub make_playerbook {
1981 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2091 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1982 x => "center", 2092 x => "center",
1983 y => "center", 2093 y => "center",
1984 force_w => $WIDTH * 9/10, 2094 force_w => $WIDTH * 9/10,
1985 force_h => $HEIGHT * 9/10, 2095 force_h => $HEIGHT * 9/10,
2019 "License, Author and Source info for media sent by the server."); 2129 "License, Author and Source info for media sent by the server.");
2020 2130
2021 $ntb->set_current_page ($INVENTORY_PAGE); 2131 $ntb->set_current_page ($INVENTORY_PAGE);
2022 2132
2023 $plwin->add ($ntb); 2133 $plwin->add ($ntb);
2024 $plwin
2025} 2134}
2026 2135
2027sub keyboard_setup { 2136sub keyboard_setup {
2028 DC::Macro::keyboard_setup 2137 DC::Macro::keyboard_setup
2029} 2138}
2030 2139
2031sub help_window { 2140sub make_help_window {
2032 my $win = new DC::UI::Toplevel 2141 my $win = new DC::UI::Toplevel
2033 x => 'center', 2142 x => 'center',
2034 y => 'center', 2143 y => 'center',
2035 z => 4, 2144 z => 4,
2036 name => 'doc_browser', 2145 name => 'doc_browser',
2125 2234
2126 $load_node->((DC::Pod::find @path)[0]); 2235 $load_node->((DC::Pod::find @path)[0]);
2127 $win->show; 2236 $win->show;
2128 }; 2237 };
2129 2238
2130 $win 2239 $HELP_WINDOW = $win;
2131}
2132
2133sub open_string_query {
2134 my ($title, $cb, $txt, $tooltip) = @_;
2135 my $dialog = new DC::UI::Toplevel
2136 x => "center",
2137 y => "center",
2138 z => 50,
2139 force_w => $WIDTH * 4/5,
2140 title => $title;
2141
2142 $dialog->add (
2143 my $e = new DC::UI::Entry
2144 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2145 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2146 tooltip => $tooltip
2147 );
2148
2149 $e->grab_focus;
2150 $e->set_text ($txt) if $txt;
2151 $dialog->show;
2152} 2240}
2153 2241
2154sub open_quit_dialog { 2242sub open_quit_dialog {
2155 unless ($QUIT_DIALOG) { 2243 unless ($QUIT_DIALOG) {
2156 $QUIT_DIALOG = new DC::UI::Toplevel 2244 $QUIT_DIALOG = new DC::UI::Toplevel
2189 2277
2190 $QUIT_DIALOG->show; 2278 $QUIT_DIALOG->show;
2191 $QUIT_DIALOG->grab_focus; 2279 $QUIT_DIALOG->grab_focus;
2192} 2280}
2193 2281
2282sub make_menubar {
2283 $MENUFRAME = new DC::UI::Toplevel
2284 border => 0,
2285 force_x => 0,
2286 force_y => 0,
2287 force_w => $::WIDTH,
2288 child => ($MENUBAR = new DC::UI::HBox),
2289 ;
2290
2291 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2292
2293 # 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
2294 make_gauge_window->show;
2295
2296# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2297# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2298
2299 make_playerbook;
2300
2301 $MENUPOPUP = DC::UI::Menu->new (items => [
2302 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2303 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2304 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2305 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2306 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2307 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2308 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2309 ["Quit…" , sub {
2310 if ($CONN) {
2311 open_quit_dialog;
2312 } else {
2313 EV::unloop EV::UNLOOP_ALL;
2314 }
2315 }],
2316 ]);
2317
2318 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2319 tooltip => "Shows the main menu",
2320 on_button_down => sub {
2321 my ($self, $ev) = @_;
2322 local $ev->{x} = 0;
2323 local $ev->{y} = 0;
2324 $MENUPOPUP->popup ($ev);
2325 },
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2329 padding_x => 6,
2330 padding_y => 3,
2331 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2332 template => " Exp: 888,888,888,888 (lvl 188) ",
2333 );
2334
2335 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2336 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2337 . "will automatically pick up items as defined by your item pickup settings "
2338 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2339 . "disable autopickup by disabling this checkbox.",
2340 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2341 on_changed => sub {
2342 my ($self, $value) = @_;
2343 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2344 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2345 $CONN->send_pickup ($CFG->{pickup})
2346 if $CONN;
2347 },
2348 );
2349
2350 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2351 c_rescale => 1,
2352 padding_x => 6,
2353 padding_y => 3,
2354 force_w => $::WIDTH * 0.2,
2355 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2356 template => "two handed weapons 99%",
2357 );
2358
2359 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2360 expand => 1,
2361 align => 1, can_hover => 1, can_events => 1,
2362 text => "Range and Combat Slots",
2363 tooltip => "#stat_ranged",
2364 );
2365
2366 $MENUFRAME->show;
2367}
2368
2369sub open_string_query {
2370 my ($title, $cb, $txt, $tooltip) = @_;
2371 my $dialog = new DC::UI::Toplevel
2372 x => "center",
2373 y => "center",
2374 z => 50,
2375 force_w => $WIDTH * 4/5,
2376 title => $title;
2377
2378 $dialog->add (
2379 my $e = new DC::UI::Entry
2380 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2381 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2382 tooltip => $tooltip
2383 );
2384
2385 $e->grab_focus;
2386 $e->set_text ($txt) if $txt;
2387 $dialog->show;
2388}
2389
2194sub show_tip_of_the_day { 2390sub show_tip_of_the_day {
2195 # find all tips 2391 # find all tips
2196 my @tod = DC::Pod::find tip_of_the_day => "*"; 2392 my @tod = DC::Pod::find tip_of_the_day => "*";
2197 2393
2198 DC::DB::get state => "tip_of_the_day", sub { 2394 DC::DB::get state => "tip_of_the_day", sub {
2249 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2445 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2250 and die "SDL::Init failed!\n"; 2446 and die "SDL::Init failed!\n";
2251} 2447}
2252 2448
2253sub video_init { 2449sub video_init {
2450 DC::set_theme $CFG->{uitheme};
2451
2254 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2452 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2255 $SDL_REINIT = 0; 2453 $SDL_REINIT = 0;
2256 2454
2257 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2455 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2258 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2456 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2262 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2460 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2263 2461
2264 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2462 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2265 $CFG->{sdl_mode} = 0; # lowest resolution by default 2463 $CFG->{sdl_mode} = 0; # lowest resolution by default
2266 2464
2267 # now choose biggets mode <= 1024x768 2465 # now choose biggest mode <= 1024x768
2268 for (0 .. $#SDL_MODES) { 2466 for (0 .. $#SDL_MODES) {
2269 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2467 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2270 $CFG->{sdl_mode} = $_; 2468 $CFG->{sdl_mode} = $_;
2271 } 2469 }
2272 } 2470 }
2314 2512
2315 $DEBUG_STATUS = new DC::UI::Label 2513 $DEBUG_STATUS = new DC::UI::Label
2316 padding => 0, 2514 padding => 0,
2317 z => 100, 2515 z => 100,
2318 force_x => "max", 2516 force_x => "max",
2319 force_y => 0; 2517 force_y => 20;
2320 $DEBUG_STATUS->show; 2518 $DEBUG_STATUS->show;
2321 2519
2322 $STATUSBOX = new DC::UI::Statusbox; 2520 $STATUSBOX = new DC::UI::Statusbox;
2323 2521
2324 $MODBOX = new DC::UI::Label 2522 $MODBOX = new DC::UI::Label
2335 2533
2336 (new DC::UI::Frame 2534 (new DC::UI::Frame
2337 bg => [0, 0, 0, 0.4], 2535 bg => [0, 0, 0, 0.4],
2338 force_x => 0, 2536 force_x => 0,
2339 force_y => "max", 2537 force_y => "max",
2340 child => (my $LR = new DC::UI::VBox), 2538 child => (my $LL = new DC::UI::VBox),
2341 )->show; 2539 )->show;
2342 2540
2343 $LR->add ($STATUSBOX); 2541 $LL->add ($STATUSBOX);
2344 $LR->add ($MODBOX); 2542 $LL->add ($MODBOX);
2345 $LR->add (new DC::UI::Label 2543 $LL->add (new DC::UI::Label
2346 align => 0, 2544 align => 0,
2347 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2545 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2348 fontsize => 0.5, 2546 fontsize => 0.5,
2349 fg => [1, 1, 0, 0.7], 2547 fg => [1, 1, 0, 0.7],
2350 ); 2548 );
2351 2549
2352 DC::UI::Toplevel->new ( 2550 DC::UI::Toplevel->new (
2353 title => "Minimap", 2551 title => "Minimap",
2354 name => "mapmap", 2552 name => "mapmap",
2355 x => 0, 2553 x => 0,
2356 y => $FONTSIZE + 8, 2554 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2357 border_bg => [1, 1, 1, 192/255], 2555 border_bg => [1, 1, 1, 192/255],
2358 bg => [1, 1, 1, 0], 2556 bg => [1, 1, 1, 0],
2359 child => ($MAPMAP = new DC::MapWidget::MapMap 2557 child => ($MAPMAP = new DC::MapWidget::MapMap
2360 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2558 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2361 ), 2559 ),
2362 )->show; 2560 )->show;
2363 2561
2364 $MAPWIDGET = new DC::MapWidget; 2562 $MAPWIDGET = new DC::MapWidget;
2365 $MAPWIDGET->connect (activate_console => sub { 2563 $MAPWIDGET->connect (activate_console => sub {
2390 $METASERVER = metaserver_dialog; 2588 $METASERVER = metaserver_dialog;
2391 # the name is changed to not conflict with the older name as users could have hidden it 2589 # the name is changed to not conflict with the older name as users could have hidden it
2392 $MESSAGE_WINDOW = new DC::UI::Dockbar 2590 $MESSAGE_WINDOW = new DC::UI::Dockbar
2393 name => "message_window2", 2591 name => "message_window2",
2394 title => 'Messages', 2592 title => 'Messages',
2593 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2395 force_w => $::WIDTH * 0.6, 2594 force_w => $::WIDTH * 0.6,
2396 force_h => $::HEIGHT * 0.25, 2595 force_h => $::HEIGHT * 0.25,
2397 ; 2596 ;
2398 2597
2399 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2598 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2419 . "After pressing the combo the binding will be saved automatically and the " 2618 . "After pressing the combo the binding will be saved automatically and the "
2420 . "binding editor closes"); 2619 . "binding editor closes");
2421 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2620 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2422 "Some debuggin' options. Do not ask."); 2621 "Some debuggin' options. Do not ask.");
2423 2622
2424 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2623 make_help_window;
2624 make_menubar;
2425 2625
2426 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2427 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2428
2429# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2430# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2431
2432 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
2433
2434 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2435 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2436
2437 $BUTTONBAR->add (new DC::UI::Button
2438 text => "Save Config",
2439 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2440 on_activate => sub {
2441 $::CFG->{layout} = DC::UI::get_layout;
2442 DC::write_cfg;
2443 status "Configuration Saved";
2444 0
2445 },
2446 );
2447
2448 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2449 tooltip => "View Documentation");
2450
2451 $BUTTONBAR->add (new DC::UI::Button
2452 text => "Quit",
2453 tooltip => "Terminates the program",
2454 on_activate => sub {
2455 if ($CONN) {
2456 open_quit_dialog;
2457 } else {
2458 EV::unloop EV::UNLOOP_ALL;
2459 }
2460 0
2461 },
2462 );
2463
2464 $BUTTONBAR->show;
2465 $SETUP_DIALOG->show; 2626 $SETUP_DIALOG->show;
2466 $MESSAGE_WINDOW->show; 2627 $MESSAGE_WINDOW->show;
2467 } 2628 }
2468 2629
2469 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2630 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2470 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2631 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2471 2632
2472 $CAVEAT_LABEL->set_text ("None :)"); 2633 $CAVEAT_LABEL->set_text ("None :)");
2634 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2635 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2473 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2636 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2474 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2637 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2475 2638
2476 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2639 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2477} 2640}
2487my $animate_timer; 2650my $animate_timer;
2488 2651
2489my $fps = 9; 2652my $fps = 9;
2490 2653
2491sub force_refresh { 2654sub force_refresh {
2492 if ($ENV{CFPLUS_DEBUG} & 4) { 2655 if ($DELIANTRA_DEBUG & 4) {
2493 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2656 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2494 debug sprintf "%3.2f", $fps; 2657 debug sprintf "%3.2f", $fps;
2495 } 2658 }
2496 2659
2497 undef $WANT_REFRESH; 2660 undef $WANT_REFRESH;
2505my $want_refresh = EV::prepare_ns \&force_refresh; 2668my $want_refresh = EV::prepare_ns \&force_refresh;
2506 2669
2507my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2670my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2508 $NOW = EV::now; 2671 $NOW = EV::now;
2509 2672
2510 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2673 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2511 for DC::poll_events; 2674 for DC::poll_events;
2512 2675
2513 if (%animate_object) { 2676 if (%animate_object) {
2514 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2677 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2515 $WANT_REFRESH = 1; 2678 $WANT_REFRESH = 1;
2527sub animation_stop { 2690sub animation_stop {
2528 my ($widget) = @_; 2691 my ($widget) = @_;
2529 delete $animate_object{$widget}; 2692 delete $animate_object{$widget};
2530} 2693}
2531 2694
2532%SDL_CB = (
2533 DC::SDL_QUIT => sub { 2695$SDL_CB[DC::SDL_QUIT] = sub {
2534 crash "SDL_QUIT"; 2696 crash "SDL_QUIT";
2535 EV::unloop EV::UNLOOP_ALL; 2697 EV::unloop EV::UNLOOP_ALL;
2536 }, 2698};
2537 DC::SDL_VIDEORESIZE => sub { 2699$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2538 },
2539 DC::SDL_VIDEOEXPOSE => sub { 2700$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2540 DC::UI::full_refresh; 2701 DC::UI::full_refresh;
2541 }, 2702};
2542 DC::SDL_ACTIVEEVENT => sub { 2703$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2543# not useful, as APPACTIVE includes only iconified state, not unmapped 2704# not useful, as APPACTIVE includes only iconified state, not unmapped
2544# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2705# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2545# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2706# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2546# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2707# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2547# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2708# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2548# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2709# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2549 }, 2710};
2550 DC::SDL_KEYDOWN => sub { 2711$SDL_CB[DC::SDL_KEYDOWN] = sub {
2551 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2712 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2552 # alt-enter 2713 # alt-enter
2553 video_shutdown; 2714 video_shutdown;
2554 $FULLSCREEN_ENABLE->toggle; 2715 $FULLSCREEN_ENABLE->toggle;
2555 video_init; 2716 video_init;
2556 } else { 2717 } else {
2557 &DC::UI::feed_sdl_key_down_event; 2718 &DC::UI::feed_sdl_key_down_event;
2558 } 2719 }
2559 update_modbox; 2720 update_modbox;
2560 }, 2721};
2561 DC::SDL_KEYUP => sub { 2722$SDL_CB[DC::SDL_KEYUP] = sub {
2562 &DC::UI::feed_sdl_key_up_event; 2723 &DC::UI::feed_sdl_key_up_event;
2563 update_modbox; 2724 update_modbox;
2564 }, 2725};
2565 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2726$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2566 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2567 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2728$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2568 DC::SDL_USEREVENT => sub { 2729$SDL_CB[DC::SDL_USEREVENT] = sub {
2569 if ($_[0]{code} == 1) { 2730 if ($_[0]{code} == 1) {
2570 audio_channel_finished $_[0]{data1}; 2731 audio_channel_finished $_[0]{data1};
2571 } elsif ($_[0]{code} == 0) { 2732 } elsif ($_[0]{code} == 0) {
2572 audio_music_finished; 2733 audio_music_finished;
2573 }
2574 }, 2734 }
2575); 2735};
2576 2736
2577############################################################################# 2737#############################################################################
2578 2738
2579$SIG{INT} = $SIG{TERM} = sub { 2739$SIG{INT} = $SIG{TERM} = sub {
2580 EV::unloop; 2740 EV::unloop;
2581 #d# TODO calling exit here hangs the process in some futex 2741 #d# TODO calling exit here hangs the process in some futex
2582}; 2742};
2583 2743
2584# due to mac os x + sdl combined briandamage, we need this contortion 2744# due to mac os x + sdl combined braindamage, we need this contortion
2585sub main { 2745sub main {
2586 { 2746 {
2587 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2747 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2588 2748
2589 if (-e "$Deliantra::VARDIR/client.cf") { 2749 if (-e "$Deliantra::VARDIR/client.cf") {
2606 DC::DB::open_db; 2766 DC::DB::open_db;
2607 2767
2608 DC::UI::set_layout ($::CFG->{layout}); 2768 DC::UI::set_layout ($::CFG->{layout});
2609 2769
2610 my %DEF_CFG = ( 2770 my %DEF_CFG = (
2771 config_autosave => 1,
2611 sdl_mode => undef, 2772 sdl_mode => undef,
2612 fullscreen => 1, 2773 fullscreen => 1,
2613 fast => 0, 2774 fast => 0,
2614 force_opengl11 => undef, 2775 force_opengl11 => undef,
2615 disable_alpha => 0, 2776 disable_alpha => 0,
2616 smooth_movement => 1, 2777 smooth_movement => 1,
2778 smooth_transitions => 1,
2617 texture_compression => 1, 2779 texture_compression => 1,
2618 map_scale => 1, 2780 map_scale => 1,
2619 fow_enable => 1, 2781 fow_enable => 1,
2620 fow_intensity => 0, 2782 fow_intensity => 0,
2783 fow_texture => 0,
2621 map_smoothing => 1, 2784 map_smoothing => 1,
2622 gui_fontsize => 1, 2785 gui_fontsize => 1,
2623 log_fontsize => 0.7, 2786 log_fontsize => 0.7,
2624 gauge_fontsize => 1, 2787 gauge_fontsize => 1,
2625 gauge_size => 0.35, 2788 gauge_size => 0.35,
2633 effects_enable => 1, 2796 effects_enable => 1,
2634 effects_volume => 1, 2797 effects_volume => 1,
2635 bgm_enable => 1, 2798 bgm_enable => 1,
2636 bgm_volume => 0.5, 2799 bgm_volume => 0.5,
2637 output_rate => "", 2800 output_rate => "",
2638 pickup => 0, 2801 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2639 inv_sort => "mtime", 2802 inv_sort => "mtime",
2640 default => "profile", # default profile 2803 default => "profile", # default profile
2641 show_tips => 1, 2804 show_tips => 1,
2642 logview_max_par => 1000, 2805 logview_max_par => 1000,
2643 shift_fire_stop => 0, 2806 shift_fire_stop => 0,
2644 ); 2807 uitheme => "wood",
2808 map_shift_x => -24, # arbitrary
2809 map_shift_y => +24, # arbitrary
2645 2810 );
2811
2646 while (my ($k, $v) = each %DEF_CFG) { 2812 while (my ($k, $v) = each %DEF_CFG) {
2647 $CFG->{$k} = $v unless exists $CFG->{$k}; 2813 $CFG->{$k} = $v unless exists $CFG->{$k};
2648 } 2814 }
2649 2815
2650 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2816 my @args = @ARGV;
2817
2818 my $profile = 'default';
2819
2820 for (my $i = 0; $i < @args; $i++) {
2821 if ($args[$i] =~ /^--?profile$/) {
2822 $profile = $args[$i + 1];
2823 splice @args, $i, 2, ();
2824 $i = 0;
2825 } elsif ($args[$i] =~ /^--?h/) {
2826 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2827 exit 0;
2828 }
2829 }
2830
2831 $CFG->{profile}{$profile} ||= {};
2651 $PROFILE = $CFG->{profile}{default}; 2832 $PROFILE = $CFG->{profile}{$profile};
2833 $PROFILE->{host} ||= "gameserver.deliantra.net";
2834
2835 $PROFILE->{host} = $args[0] if @args > 0;
2836 $PROFILE->{user} = $args[1] if @args > 1;
2837 $PROFILE->{password} = $args[2] if @args > 2;
2652 2838
2653 # convert old bindings (only default profile matters) 2839 # convert old bindings (only default profile matters)
2654 if (my $bindings = delete $PROFILE->{bindings}) { 2840 if (my $bindings = delete $PROFILE->{bindings}) {
2655 while (my ($mod, $syms) = each %$bindings) { 2841 while (my ($mod, $syms) = each %$bindings) {
2656 while (my ($sym, $cmds) = each %$syms) { 2842 while (my ($sym, $cmds) = each %$syms) {
2662 } 2848 }
2663 } 2849 }
2664 2850
2665 sdl_init; 2851 sdl_init;
2666 2852
2853 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2854 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2855
2667 { 2856 {
2668 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2857 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2669 DejaVuSans.ttf 2858 DejaVuSans.ttf
2670 DejaVuSansMono.ttf 2859 DejaVuSansMono.ttf
2671 DejaVuSans-Bold.ttf 2860 DejaVuSans-Bold.ttf
2672 DejaVuSansMono-Bold.ttf 2861 DejaVuSansMono-Bold.ttf
2673 DejaVuSans-Oblique.ttf 2862 DejaVuSans-Oblique.ttf
2674 DejaVuSansMono-Oblique.ttf 2863 DejaVuSansMono-Oblique.ttf
2675 DejaVuSans-BoldOblique.ttf 2864 DejaVuSans-BoldOblique.ttf
2676 DejaVuSansMono-BoldOblique.ttf 2865 DejaVuSansMono-BoldOblique.ttf
2866 mona.ttf
2677 ); 2867 );
2678 2868
2679 DC::add_font $_ for @fonts; 2869 DC::add_font $_ for @fonts;
2680 2870
2681 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2871 $FONT_PROP = new_from_file DC::Font $fonts[0];
2682 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2872 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2683 2873
2684 $FONT_PROP->make_default; 2874 $FONT_PROP->make_default;
2685 2875
2708 our $STARTUP_CANCEL = EV::idle sub { 2898 our $STARTUP_CANCEL = EV::idle sub {
2709 undef $::STARTUP_CANCEL; 2899 undef $::STARTUP_CANCEL;
2710 $startup_done->(); 2900 $startup_done->();
2711 }; 2901 };
2712 2902
2903 debug_toggle 0;
2904
2713 delete $SIG{__DIE__}; 2905 delete $SIG{__DIE__};
2714 EV::loop; 2906 EV::loop;
2715 2907
2908 DC::write_cfg if $CFG->{config_autosave};
2909
2716#video_shutdown; 2910 #video_shutdown;
2717#audio_shutdown; 2911 #audio_shutdown;
2912
2718 DC::OpenGL::quit; 2913 DC::OpenGL::quit;
2719 DC::SDL_Quit; 2914 DC::SDL_Quit;
2720 DC::DB::Server::stop; 2915 DC::DB::Server::stop;
2721} 2916}
2722 2917
2726 2921
2727deliantra - A Deliantra MORPG game client 2922deliantra - A Deliantra MORPG game client
2728 2923
2729=head1 SYNOPSIS 2924=head1 SYNOPSIS
2730 2925
2731Just run it - no commandline arguments are supported. 2926 deliantra [--profile name] [host [user [password]]]
2927 deliantra --help
2732 2928
2733=head1 USAGE 2929=head1 USAGE
2734 2930
2735deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2931The deliantra client utilises OpenGL for all UI elements and the game. It
2736be used in fullscreen mode and interactively. 2932is supposed to be used in fullscreen mode and interactively.
2737 2933
2738=head1 DEBUGGING 2934=head1 DEBUGGING
2739 2935
2740
2741CFPLUS_DEBUG - environment variable 2936DELIANTRA_DEBUG - environment variable
2742 2937
2743 1 draw borders around widgets 2938 1 draw borders around widgets
2744 2 add low-level widget info to tooltips 2939 2 add low-level widget info to tooltips
2745 4 show fps 2940 4 show fps
2746 8 suppress tooltips 2941 8 suppress tooltips
2942 16 show bandwidth downstream
2747 2943
2748=head1 AUTHOR 2944=head1 AUTHOR
2749 2945
2750Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2946Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2751 2947

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines