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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines