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.74 by root, Wed Sep 3 06:23:04 2008 UTC vs.
Revision 1.104 by root, Sat Mar 20 01:38:59 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 {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
81 } 64 }
82 65
83 unshift @INC, $root; 66 unshift @INC, $root;
84 } 67 }
85} 68}
86 69
87# prepend private library directory 70# prepend private library directory and prepare env
88BEGIN { 71BEGIN {
89 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 74 if (-d $path) {
92 unshift @INC, $path; 75 unshift @INC, $path;
… …
106 89
107use Deliantra; 90use Deliantra;
108use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
109 92
110use AnyEvent::Util (); 93use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
113 96
114use Compress::LZF; 97use Compress::LZF;
115use JSON::XS; 98use JSON::XS;
116 99
117use DC; 100use DC;
… …
145 128
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
148 131
149$EV::DIED = sub { 132$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 133 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
152}; 135};
153 136
154my $MAX_FPS = 60; 137my $MAX_FPS = 60;
138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
155 140
156our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
157 142
158our $LAST_REFRESH; 143our $LAST_REFRESH;
159our $NOW; 144our $NOW;
… …
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
802 client => "$DC::VERSION $] $^O", 812 client => "$DC::VERSION $] $^O",
803 813
804 map_widget => $MAPWIDGET, 814 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 815 statusbox => $STATUSBOX,
… …
813 823
814 on_connect => sub { 824 on_connect => sub {
815 if ($_[0]) { 825 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
817 827
818 status "login successful"; 828 status "successfully connected to the server";
819 } else { 829 } else {
820 undef $CONN; 830 undef $CONN;
821 status "unable to connect: $!"; 831 status "unable to connect: $!";
822 stop_game(); 832 stop_game();
823 } 833 }
… …
825 ; 835 ;
826} 836}
827 837
828sub start_game { 838sub start_game {
829 status "logging in..."; 839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
830 844
831 $LOGIN_BUTTON->set_text ("Logout"); 845 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide; 846 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835 847
836 $MAP = new DC::Map; 848 $MAP = new DC::Map;
837 849
838 # hack to make SURE we find the IP address all right 850 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 851 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 852 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl 854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
843 status "dns failure, using hardcoded address"; 858 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 859 $host = "129.13.162.95";
860 }
845 } 861 }
846 862
847 dc_connect $host, $port; 863 dc_connect $host, $port;
848 }; 864 };
849 } else { 865 } else {
… …
875} 891}
876 892
877sub graphics_setup { 893sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 894 my $vbox = new DC::UI::VBox;
879 895
896 {
897 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
898
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 899 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 900
882 my $row = 0; 901 my $row = 0;
883 902
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 903 $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, 904 $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, 905 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 906 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 907
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 908 $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, 909 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 910 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 911 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 " 912 . "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 " 913 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 914 . "by installing the right driver for your graphics card.");
896 915
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme"); 916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
898 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector 917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme}, 918 value => $CFG->{uitheme},
900 options => [ 919 options => [
901 [wood => "Wood (the default)"], 920 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"], 921 [plain => "Plain (very)"],
903 [blue => "Blue"], 922 [blue => "Blue (dark)"],
923 [metal => "Metal (light)"],
904 ], 924 ],
905 tooltip => "Choose the User Interface theme that you like most :)", 925 tooltip => "Choose the User Interface theme that you like most :)",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 } 926 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
907 ); 927 );
908 928
909 my $vidmode_tooltip = 929 my $vidmode_tooltip =
910 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 930 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
911 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 931 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
912 932
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
914 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 934 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
915 935
916 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 936 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
937 c_rescale => 1,
917 force_w => $WIDTH * 0.1, expand => 1, 938 force_w => $WIDTH * 0.1, expand => 1,
918 range => [ ($CFG->{sdl_mode}) x 3 ], 939 range => [ ($CFG->{sdl_mode}) x 3 ],
919 tooltip => $vidmode_tooltip); 940 tooltip => $vidmode_tooltip);
920 $hbox->add (my $mode_label = new DC::UI::Label 941 $hbox->add (my $mode_label = new DC::UI::Label
921 height => 0.8, template => "9999x9999@9+9", 942 height => 0.8, template => "9999x9999@9+9",
922 can_events => 1, tooltip => $vidmode_tooltip); 943 can_events => 1, tooltip => $vidmode_tooltip);
923 944
924 $MODE_SLIDER->connect (changed => sub { 945 $MODE_SLIDER->connect (changed => sub {
925 my ($self, $value) = @_;
926
927 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
928 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
929 });
930 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
931
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
933 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
934 state => $CFG->{fullscreen},
935 tooltip => "Bring the client into fullscreen mode.",
936 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
937 );
938
939 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
940 $table->add_at (1, $row++, new DC::UI::CheckBox
941 state => $CFG->{force_opengl11},
942 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
943 . "higher memory usage and slower performance. It will, however, help tremendously on "
944 . "cards that claim to support a feature but fall back to software rendering. "
945 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
946 . "but cards and drivers from other vendors (ATI) are often just as bad. "
947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
948 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
949 );
950
951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
952 $table->add_at (1, $row++, new DC::UI::CheckBox
953 state => $CFG->{disable_alpha},
954 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
955 . "by disabling a number of textures and transparency effects. Normally, these "
956 . "effects do not cost a lot of resources, but some graphics cards might fall "
957 . "back to etxremely slow rendering if this is enabled. If disabling this option "
958 . "noticably improves the framerate of the client please report this! "
959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
960 on_changed => sub {
961 my ($self, $value) = @_; 946 my ($self, $value) = @_;
947
948 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
949 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
950 });
951 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
952
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
954 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
955 state => $CFG->{fullscreen},
956 tooltip => "Bring the client into fullscreen mode.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
958 );
959
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
961 $table->add_at (1, $row++, new DC::UI::CheckBox
962 state => $CFG->{force_opengl11},
963 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
964 . "higher memory usage and slower performance. It will, however, help tremendously on "
965 . "cards that claim to support a feature but fall back to software rendering. "
966 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
967 . "but cards and drivers from other vendors (ATI) are often just as bad. "
968 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
969 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
970 );
971
972 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
973 $table->add_at (1, $row++, new DC::UI::CheckBox
974 state => $CFG->{disable_alpha},
975 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
976 . "by disabling a number of textures and transparency effects. Normally, these "
977 . "effects do not cost a lot of resources, but some graphics cards might fall "
978 . "back to extremely slow rendering if this is enabled. If disabling this option "
979 . "noticably improves the framerate of the client please report this! "
980 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
981 on_changed => sub {
982 my ($self, $value) = @_;
962 $CFG->{disable_alpha} = $value; 983 $CFG->{disable_alpha} = $value;
963 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 984 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
985 0
964 0 986 }
965 } 987 );
966 );
967 988
968 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
969 $table->add_at (1, $row++, new DC::UI::CheckBox 990 $table->add_at (1, $row++, new DC::UI::CheckBox
970 state => $CFG->{texture_compression}, 991 state => $CFG->{texture_compression},
971 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 992 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
972 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 993 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
973 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 994 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
974 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 995 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
975 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
976 ); 997 );
977 998
978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
979 $table->add_at (1, $row++, new DC::UI::CheckBox 1000 $table->add_at (1, $row++, new DC::UI::CheckBox
980 state => $CFG->{fast}, 1001 state => $CFG->{fast},
981 tooltip => "Lower the visual quality considerably to speed up rendering.", 1002 tooltip => "Lower the visual quality considerably to speed up rendering.",
982 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
983 ); 1004 );
984 1005
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1007 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1008 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1009 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
989 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1010 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
990 ); 1011 );
991 1012
992 $table->add_at (1, $row++, new DC::UI::Button 1013 $table->add_at (1, $row++, new DC::UI::Button
993 expand => 1, text => "Apply", 1014 expand => 1, text => "Apply",
994 tooltip => "Apply the video settings above.", 1015 tooltip => "Apply the video settings above.",
995 on_activate => sub { 1016 on_activate => sub {
996 video_shutdown (); 1017 video_shutdown ();
997 video_init (); 1018 video_init ();
1019 0
998 0 1020 }
999 } 1021 );
1000 ); 1022 }
1001 1023
1024 {
1025 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1026
1027 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1028
1029 my $row = 0;
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1003 $table->add_at (1, $row++, new DC::UI::CheckBox 1031 $table->add_at (1, $row++, new DC::UI::CheckBox
1004 state => $CFG->{smooth_movement}, 1032 state => $CFG->{smooth_movement},
1005 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1033 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1006 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1007 . "then disable this option. Changes take effect immdiately.", 1035 . "then disable this option. Changes take effect immdiately.",
1008 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1009 ); 1037 );
1010 1038
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1041 state => $CFG->{smooth_transitions},
1042 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1043 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1044 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1045 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1046 );
1047
1048
1011 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1012 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
1013 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1014 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1015 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1016 ); 1054 );
1017 1055
1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1019 $table->add_at (1, $row++, new DC::UI::CheckBox 1057 $table->add_at (1, $row++, new DC::UI::CheckBox
1020 state => $CFG->{map_smoothing}, 1058 state => $CFG->{map_smoothing},
1021 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1059 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1022 . "This increases load on the graphics subsystem and works only with TRT servers. " 1060 . "This increases load on the graphics subsystem and works only with TRT servers. "
1023 . "Changes take effect at next login only.", 1061 . "Changes take effect at next login only.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1062 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1025 ); 1063 );
1026 1064
1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1028 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
1029 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
1030 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1068 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1031 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1032 ); 1070 );
1033 1071
1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1073 $table->add_at (1, $row++, new DC::UI::ImageButton
1074 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1075 bg => [0.3, 0.3, 0.2],
1076 force_w => 64,
1077 force_h => 64,
1078 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.",
1079 on_activate => sub {
1080 my ($self) = @_;
1081 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1082 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1083 $MAPWIDGET->update;
1084 }
1085 );
1086
1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1035 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
1036 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1037 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1090 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1038 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1091 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1039 ); 1092 );
1040 1093
1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1094 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1042 $table->add_at (1, $row++, new DC::UI::Slider 1095 $table->add_at (1, $row++, new DC::UI::Slider
1043 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1096 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1044 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1097 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1045 . "but you still need to press apply to correctly re-layout the widget.", 1098 . "but you still need to press apply to correctly re-layout the widget.",
1046 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1099 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1047 ); 1100 );
1048 1101
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1102 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1103 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1104 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1052 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1105 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1106 on_changed => sub {
1054 $CFG->{gauge_fontsize} = $_[1]; 1107 $CFG->{gauge_fontsize} = $_[1];
1055 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
1109 0
1056 0 1110 }
1057 } 1111 );
1058 );
1059 1112
1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1113 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1061 $table->add_at (1, $row++, new DC::UI::Slider 1114 $table->add_at (1, $row++, new DC::UI::Slider
1062 range => [$CFG->{gauge_size}, 0.2, 0.8], 1115 range => [$CFG->{gauge_size}, 0.2, 0.8],
1063 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1116 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1064 on_changed => sub { 1117 on_changed => sub {
1065 $CFG->{gauge_size} = $_[1]; 1118 $CFG->{gauge_size} = $_[1];
1066 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1119 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1120 0
1067 0 1121 }
1068 } 1122 );
1069 ); 1123 }
1070 1124
1071 $vbox 1125 $vbox
1072} 1126}
1073 1127
1074our $AUDIO_HW_CHUNKSIZE; 1128our $AUDIO_HW_CHUNKSIZE;
… …
1087 1141
1088 my $text = !$freq 1142 my $text = !$freq
1089 ? "audio is off" 1143 ? "audio is off"
1090 : "audio is enabled\n" 1144 : "audio is enabled\n"
1091 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1092 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1093 1149
1094 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1095} 1151}
1096 1152
1097sub audio_setup { 1153sub audio_setup {
… …
1237} 1293}
1238 1294
1239sub make_gauge_window { 1295sub make_gauge_window {
1240 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1296 my $gh = int $HEIGHT * $CFG->{gauge_size};
1241 1297
1242 my $win = new DC::UI::Frame ( 1298 $GAUGES->{win} = my $win = new DC::UI::Frame (
1243 force_x => 0, 1299 force_x => 0,
1244 force_y => "max", 1300 force_y => "max",
1245 force_w => $WIDTH, 1301 force_w => $WIDTH,
1246 force_h => $gh, 1302 force_h => $gh,
1247 ); 1303 );
… …
1263 (new DC::UI::Empty expand => 1), 1319 (new DC::UI::Empty expand => 1),
1264 (my $hb = new DC::UI::HBox), 1320 (my $hb = new DC::UI::HBox),
1265 ], 1321 ],
1266 ); 1322 );
1267 1323
1268 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1324 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1269 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1325 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1270 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1326 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1271 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1327 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1272
1273 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1274 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1275 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1276 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1277
1278 $GAUGES = {
1279 exp => $exp, prg => $prg, sklprg => $sklprg,
1280 win => $win, range => $rng,
1281 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1282 };
1283 1328
1284 &set_gauge_window_fontsize; 1329 &set_gauge_window_fontsize;
1285 1330
1286 $win 1331 $win
1287} 1332}
… …
1628 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1673 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1629 ); 1674 );
1630 1675
1631 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1676 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1632 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1633 text => $CFG->{profile}{default}{user}, 1678 text => $PROFILE->{user},
1634 tooltip => "The name of your character on the server.", 1679 tooltip => "The name of your character on the server. The name is case-sensitive!",
1635 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1680 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1636 ); 1681 );
1637 1682
1638 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1683 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1639 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
1640 text => $CFG->{profile}{default}{password}, 1685 text => $PROFILE->{password},
1641 hidden => 1, 1686 hidden => 1,
1642 tooltip => "The password for your character.", 1687 tooltip => "The password for your character.",
1643 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1688 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1644 ); 1689 );
1645 1690
1646 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1691 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1647 expand => 1, 1692 expand => 1,
1648 text => "Login / Register", 1693 text => "Login / Register",
… …
1684 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1729 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1685 1730
1686 $vbox->add ( 1731 $vbox->add (
1687 $HOST_ENTRY = new DC::UI::Entry 1732 $HOST_ENTRY = new DC::UI::Entry
1688 expand => 1, 1733 expand => 1,
1689 text => $CFG->{profile}{default}{host}, 1734 text => $PROFILE->{host},
1690 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1735 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1691 on_changed => sub { 1736 on_changed => sub {
1692 my ($self, $value) = @_; 1737 my ($self, $value) = @_;
1693 $CFG->{profile}{default}{host} = $value; 1738 $PROFILE->{host} = $value;
1694 1 1739 1
1695 } 1740 }
1696 ); 1741 );
1697 1742
1698 if (0) { #d# disabled 1743 if (0) { #d# disabled
… …
1741 1786
1742 my $row = 0; 1787 my $row = 0;
1743 1788
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1789 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1745 $table->add_at (1, $row++, new DC::UI::CheckBox 1790 $table->add_at (1, $row++, new DC::UI::CheckBox
1791 c_colspan => 2,
1746 state => $CFG->{show_tips}, 1792 state => $CFG->{show_tips},
1747 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1793 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1748 on_changed => sub { 1794 on_changed => sub {
1749 my ($self, $value) = @_; 1795 my ($self, $value) = @_;
1750 $CFG->{show_tips} = $value; 1796 $CFG->{show_tips} = $value;
… …
1752 } 1798 }
1753 ); 1799 );
1754 1800
1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1801 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1756 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1802 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1803 c_colspan => 2,
1757 text => $CFG->{logview_max_par}, 1804 text => $CFG->{logview_max_par},
1758 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1805 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1759 . "sends more messages than this number, older messages get removed to save memory and " 1806 . "sends more messages than this number, older messages get removed to save memory and "
1760 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1807 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1761 on_changed => sub { 1808 on_changed => sub {
… …
1763 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1810 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1764 0 1811 0
1765 }, 1812 },
1766 ); 1813 );
1767 1814
1815 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1816 $table->add_at (1, $row, new DC::UI::CheckBox
1817 state => $CFG->{config_autosave},
1818 tooltip => "Normally, configuration settings and the user interface layout "
1819 . "are saved on client exit. You can disable this behaviour by "
1820 . "unchecking this checkbox.",
1821 on_changed => sub {
1822 my ($self, $value) = @_;
1823 $CFG->{config_autosave} = $value;
1824 0
1825 }
1826 );
1827 $table->add_at (2, $row++, new DC::UI::Button
1828 text => "Save Now",
1829 tooltip => "Use this to manually save configuration and UI layout when "
1830 . "autosave is disabled.",
1831 on_activate => sub {
1832 DC::write_cfg;
1833 0
1834 }
1835 );
1836
1768 $table 1837 $table
1769} 1838}
1770 1839
1771sub autopickup_setup { 1840sub autopickup_setup {
1772 my $r = new DC::UI::ScrolledWindow ( 1841 my $r = new DC::UI::ScrolledWindow (
… …
1778 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1779 ); 1848 );
1780 1849
1781 for ( 1850 for (
1782 ["General", 0, 0, 1851 ["General", 0, 0,
1783 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1784 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1785 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1786 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1787 ], 1855 ],
1788 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1789 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
… …
1837 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1838 } else { 1906 } else {
1839 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1840 } 1908 }
1841 1909
1842 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1843 if defined $::CONN; 1911 if defined $::CONN;
1844 1912
1845 0 1913 0
1846 }); 1914 });
1847 1915
… …
1864 }); 1932 });
1865 1933
1866 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1867 text => "set", 1935 text => "set",
1868 on_activate => sub { 1936 on_activate => sub {
1869 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1870 if defined $::CONN; 1938 if defined $::CONN;
1871 0 1939 0
1872 }); 1940 });
1873 1941
1874 $r 1942 $r
… …
1987 $PL_NOTEBOOK->set_current_page ($widget); 2055 $PL_NOTEBOOK->set_current_page ($widget);
1988 $PL_WINDOW->show; 2056 $PL_WINDOW->show;
1989 } 2057 }
1990} 2058}
1991 2059
1992sub player_window { 2060sub make_playerbook {
1993 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2061 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1994 x => "center", 2062 x => "center",
1995 y => "center", 2063 y => "center",
1996 force_w => $WIDTH * 9/10, 2064 force_w => $WIDTH * 9/10,
1997 force_h => $HEIGHT * 9/10, 2065 force_h => $HEIGHT * 9/10,
… …
2031 "License, Author and Source info for media sent by the server."); 2099 "License, Author and Source info for media sent by the server.");
2032 2100
2033 $ntb->set_current_page ($INVENTORY_PAGE); 2101 $ntb->set_current_page ($INVENTORY_PAGE);
2034 2102
2035 $plwin->add ($ntb); 2103 $plwin->add ($ntb);
2036 $plwin
2037} 2104}
2038 2105
2039sub keyboard_setup { 2106sub keyboard_setup {
2040 DC::Macro::keyboard_setup 2107 DC::Macro::keyboard_setup
2041} 2108}
2042 2109
2043sub help_window { 2110sub make_help_window {
2044 my $win = new DC::UI::Toplevel 2111 my $win = new DC::UI::Toplevel
2045 x => 'center', 2112 x => 'center',
2046 y => 'center', 2113 y => 'center',
2047 z => 4, 2114 z => 4,
2048 name => 'doc_browser', 2115 name => 'doc_browser',
… …
2137 2204
2138 $load_node->((DC::Pod::find @path)[0]); 2205 $load_node->((DC::Pod::find @path)[0]);
2139 $win->show; 2206 $win->show;
2140 }; 2207 };
2141 2208
2142 $win 2209 $HELP_WINDOW = $win;
2143}
2144
2145sub open_string_query {
2146 my ($title, $cb, $txt, $tooltip) = @_;
2147 my $dialog = new DC::UI::Toplevel
2148 x => "center",
2149 y => "center",
2150 z => 50,
2151 force_w => $WIDTH * 4/5,
2152 title => $title;
2153
2154 $dialog->add (
2155 my $e = new DC::UI::Entry
2156 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2157 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2158 tooltip => $tooltip
2159 );
2160
2161 $e->grab_focus;
2162 $e->set_text ($txt) if $txt;
2163 $dialog->show;
2164} 2210}
2165 2211
2166sub open_quit_dialog { 2212sub open_quit_dialog {
2167 unless ($QUIT_DIALOG) { 2213 unless ($QUIT_DIALOG) {
2168 $QUIT_DIALOG = new DC::UI::Toplevel 2214 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2201 2247
2202 $QUIT_DIALOG->show; 2248 $QUIT_DIALOG->show;
2203 $QUIT_DIALOG->grab_focus; 2249 $QUIT_DIALOG->grab_focus;
2204} 2250}
2205 2251
2252sub make_menubar {
2253 $MENUFRAME = new DC::UI::Toplevel
2254 border => 0,
2255 force_x => 0,
2256 force_y => 0,
2257 force_w => $::WIDTH,
2258 child => ($MENUBAR = new DC::UI::HBox),
2259 ;
2260
2261 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2262
2263 # 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
2264 make_gauge_window->show;
2265
2266# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2267# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2268
2269 make_playerbook;
2270
2271 $MENUPOPUP = DC::UI::Menu->new (items => [
2272 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2273 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2274 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2275 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2276 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2277 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2278 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2279 ["Quit…" , sub {
2280 if ($CONN) {
2281 open_quit_dialog;
2282 } else {
2283 EV::unloop EV::UNLOOP_ALL;
2284 }
2285 }],
2286 ]);
2287
2288 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2289 tooltip => "Shows the main menu",
2290 on_button_down => sub {
2291 my ($self, $ev) = @_;
2292 local $ev->{x} = 0;
2293 local $ev->{y} = 0;
2294 $MENUPOPUP->popup ($ev);
2295 },
2296 );
2297
2298 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2299 padding_x => 6,
2300 padding_y => 3,
2301 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2302 template => " Exp: 888,888,888,888 (lvl 188) ",
2303 );
2304
2305 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2306 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2307 . "will automatically pick up items as defined by your item pickup settings "
2308 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2309 . "disable autopickup by disabling this checkbox.",
2310 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2311 on_changed => sub {
2312 my ($self, $value) = @_;
2313 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2314 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2315 $CONN->send_pickup ($CFG->{pickup})
2316 if $CONN;
2317 },
2318 );
2319
2320 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2321 c_rescale => 1,
2322 padding_x => 6,
2323 padding_y => 3,
2324 force_w => $::WIDTH * 0.2,
2325 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2326 template => "two handed weapons 99%",
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2330 expand => 1,
2331 align => 1, can_hover => 1, can_events => 1,
2332 text => "Range and Combat Slots",
2333 tooltip => "#stat_ranged",
2334 );
2335
2336 $MENUFRAME->show;
2337}
2338
2339sub open_string_query {
2340 my ($title, $cb, $txt, $tooltip) = @_;
2341 my $dialog = new DC::UI::Toplevel
2342 x => "center",
2343 y => "center",
2344 z => 50,
2345 force_w => $WIDTH * 4/5,
2346 title => $title;
2347
2348 $dialog->add (
2349 my $e = new DC::UI::Entry
2350 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2351 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2352 tooltip => $tooltip
2353 );
2354
2355 $e->grab_focus;
2356 $e->set_text ($txt) if $txt;
2357 $dialog->show;
2358}
2359
2206sub show_tip_of_the_day { 2360sub show_tip_of_the_day {
2207 # find all tips 2361 # find all tips
2208 my @tod = DC::Pod::find tip_of_the_day => "*"; 2362 my @tod = DC::Pod::find tip_of_the_day => "*";
2209 2363
2210 DC::DB::get state => "tip_of_the_day", sub { 2364 DC::DB::get state => "tip_of_the_day", sub {
… …
2349 2503
2350 (new DC::UI::Frame 2504 (new DC::UI::Frame
2351 bg => [0, 0, 0, 0.4], 2505 bg => [0, 0, 0, 0.4],
2352 force_x => 0, 2506 force_x => 0,
2353 force_y => "max", 2507 force_y => "max",
2354 child => (my $LR = new DC::UI::VBox), 2508 child => (my $LL = new DC::UI::VBox),
2355 )->show; 2509 )->show;
2356 2510
2357 $LR->add ($STATUSBOX); 2511 $LL->add ($STATUSBOX);
2358 $LR->add ($MODBOX); 2512 $LL->add ($MODBOX);
2359 $LR->add (new DC::UI::Label 2513 $LL->add (new DC::UI::Label
2360 align => 0, 2514 align => 0,
2361 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2515 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2362 fontsize => 0.5, 2516 fontsize => 0.5,
2363 fg => [1, 1, 0, 0.7], 2517 fg => [1, 1, 0, 0.7],
2364 ); 2518 );
2365 2519
2366 DC::UI::Toplevel->new ( 2520 DC::UI::Toplevel->new (
2367 title => "Minimap", 2521 title => "Minimap",
2368 name => "mapmap", 2522 name => "mapmap",
2369 x => 0, 2523 x => 0,
2370 y => $FONTSIZE + 8, 2524 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2371 border_bg => [1, 1, 1, 192/255], 2525 border_bg => [1, 1, 1, 192/255],
2372 bg => [1, 1, 1, 0], 2526 bg => [1, 1, 1, 0],
2373 child => ($MAPMAP = new DC::MapWidget::MapMap 2527 child => ($MAPMAP = new DC::MapWidget::MapMap
2374 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2528 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2375 ), 2529 ),
2376 )->show; 2530 )->show;
2377 2531
2378 $MAPWIDGET = new DC::MapWidget; 2532 $MAPWIDGET = new DC::MapWidget;
2379 $MAPWIDGET->connect (activate_console => sub { 2533 $MAPWIDGET->connect (activate_console => sub {
… …
2404 $METASERVER = metaserver_dialog; 2558 $METASERVER = metaserver_dialog;
2405 # the name is changed to not conflict with the older name as users could have hidden it 2559 # the name is changed to not conflict with the older name as users could have hidden it
2406 $MESSAGE_WINDOW = new DC::UI::Dockbar 2560 $MESSAGE_WINDOW = new DC::UI::Dockbar
2407 name => "message_window2", 2561 name => "message_window2",
2408 title => 'Messages', 2562 title => 'Messages',
2563 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2409 force_w => $::WIDTH * 0.6, 2564 force_w => $::WIDTH * 0.6,
2410 force_h => $::HEIGHT * 0.25, 2565 force_h => $::HEIGHT * 0.25,
2411 ; 2566 ;
2412 2567
2413 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2568 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2433 . "After pressing the combo the binding will be saved automatically and the " 2588 . "After pressing the combo the binding will be saved automatically and the "
2434 . "binding editor closes"); 2589 . "binding editor closes");
2435 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2590 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2436 "Some debuggin' options. Do not ask."); 2591 "Some debuggin' options. Do not ask.");
2437 2592
2438 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2593 make_help_window;
2594 make_menubar;
2439 2595
2440 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2441 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2442
2443# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2444# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2445
2446 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2447
2448 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2449 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2450
2451 $BUTTONBAR->add (new DC::UI::Button
2452 text => "Save Config",
2453 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2454 on_activate => sub {
2455 $::CFG->{layout} = DC::UI::get_layout;
2456 DC::write_cfg;
2457 status "Configuration Saved";
2458 0
2459 },
2460 );
2461
2462 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2463 tooltip => "View Documentation");
2464
2465 $BUTTONBAR->add (new DC::UI::Button
2466 text => "Quit",
2467 tooltip => "Terminates the program",
2468 on_activate => sub {
2469 if ($CONN) {
2470 open_quit_dialog;
2471 } else {
2472 EV::unloop EV::UNLOOP_ALL;
2473 }
2474 0
2475 },
2476 );
2477
2478 $BUTTONBAR->show;
2479 $SETUP_DIALOG->show; 2596 $SETUP_DIALOG->show;
2480 $MESSAGE_WINDOW->show; 2597 $MESSAGE_WINDOW->show;
2481 } 2598 }
2482 2599
2483 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2600 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2484 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2601 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2485 2602
2486 $CAVEAT_LABEL->set_text ("None :)"); 2603 $CAVEAT_LABEL->set_text ("None :)");
2604 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2605 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2487 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2606 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2488 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2607 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2489 2608
2490 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2609 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2491} 2610}
… …
2519my $want_refresh = EV::prepare_ns \&force_refresh; 2638my $want_refresh = EV::prepare_ns \&force_refresh;
2520 2639
2521my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2640my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2522 $NOW = EV::now; 2641 $NOW = EV::now;
2523 2642
2524 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2643 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2525 for DC::poll_events; 2644 for DC::poll_events;
2526 2645
2527 if (%animate_object) { 2646 if (%animate_object) {
2528 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2647 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2529 $WANT_REFRESH = 1; 2648 $WANT_REFRESH = 1;
… …
2541sub animation_stop { 2660sub animation_stop {
2542 my ($widget) = @_; 2661 my ($widget) = @_;
2543 delete $animate_object{$widget}; 2662 delete $animate_object{$widget};
2544} 2663}
2545 2664
2546%SDL_CB = (
2547 DC::SDL_QUIT => sub { 2665$SDL_CB[DC::SDL_QUIT] = sub {
2548 crash "SDL_QUIT"; 2666 crash "SDL_QUIT";
2549 EV::unloop EV::UNLOOP_ALL; 2667 EV::unloop EV::UNLOOP_ALL;
2550 }, 2668};
2551 DC::SDL_VIDEORESIZE => sub { 2669$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2552 },
2553 DC::SDL_VIDEOEXPOSE => sub { 2670$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2554 DC::UI::full_refresh; 2671 DC::UI::full_refresh;
2555 }, 2672};
2556 DC::SDL_ACTIVEEVENT => sub { 2673$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2557# not useful, as APPACTIVE includes only iconified state, not unmapped 2674# not useful, as APPACTIVE includes only iconified state, not unmapped
2558# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2675# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2559# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2676# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2560# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2677# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2561# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2678# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2562# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2679# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2563 }, 2680};
2564 DC::SDL_KEYDOWN => sub { 2681$SDL_CB[DC::SDL_KEYDOWN] = sub {
2565 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2682 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2566 # alt-enter 2683 # alt-enter
2567 video_shutdown; 2684 video_shutdown;
2568 $FULLSCREEN_ENABLE->toggle; 2685 $FULLSCREEN_ENABLE->toggle;
2569 video_init; 2686 video_init;
2570 } else { 2687 } else {
2571 &DC::UI::feed_sdl_key_down_event; 2688 &DC::UI::feed_sdl_key_down_event;
2572 } 2689 }
2573 update_modbox; 2690 update_modbox;
2574 }, 2691};
2575 DC::SDL_KEYUP => sub { 2692$SDL_CB[DC::SDL_KEYUP] = sub {
2576 &DC::UI::feed_sdl_key_up_event; 2693 &DC::UI::feed_sdl_key_up_event;
2577 update_modbox; 2694 update_modbox;
2578 }, 2695};
2579 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2696$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2580 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2581 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2698$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2582 DC::SDL_USEREVENT => sub { 2699$SDL_CB[DC::SDL_USEREVENT] = sub {
2583 if ($_[0]{code} == 1) { 2700 if ($_[0]{code} == 1) {
2584 audio_channel_finished $_[0]{data1}; 2701 audio_channel_finished $_[0]{data1};
2585 } elsif ($_[0]{code} == 0) { 2702 } elsif ($_[0]{code} == 0) {
2586 audio_music_finished; 2703 audio_music_finished;
2587 }
2588 }, 2704 }
2589); 2705};
2590 2706
2591############################################################################# 2707#############################################################################
2592 2708
2593$SIG{INT} = $SIG{TERM} = sub { 2709$SIG{INT} = $SIG{TERM} = sub {
2594 EV::unloop; 2710 EV::unloop;
2595 #d# TODO calling exit here hangs the process in some futex 2711 #d# TODO calling exit here hangs the process in some futex
2596}; 2712};
2597 2713
2598# due to mac os x + sdl combined briandamage, we need this contortion 2714# due to mac os x + sdl combined braindamage, we need this contortion
2599sub main { 2715sub main {
2600 { 2716 {
2601 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2717 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2602 2718
2603 if (-e "$Deliantra::VARDIR/client.cf") { 2719 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2620 DC::DB::open_db; 2736 DC::DB::open_db;
2621 2737
2622 DC::UI::set_layout ($::CFG->{layout}); 2738 DC::UI::set_layout ($::CFG->{layout});
2623 2739
2624 my %DEF_CFG = ( 2740 my %DEF_CFG = (
2741 config_autosave => 1,
2625 sdl_mode => undef, 2742 sdl_mode => undef,
2626 fullscreen => 1, 2743 fullscreen => 1,
2627 fast => 0, 2744 fast => 0,
2628 force_opengl11 => undef, 2745 force_opengl11 => undef,
2629 disable_alpha => 0, 2746 disable_alpha => 0,
2630 smooth_movement => 1, 2747 smooth_movement => 1,
2748 smooth_transitions => 1,
2631 texture_compression => 1, 2749 texture_compression => 1,
2632 map_scale => 1, 2750 map_scale => 1,
2633 fow_enable => 1, 2751 fow_enable => 1,
2634 fow_intensity => 0, 2752 fow_intensity => 0,
2753 fow_texture => 0,
2635 map_smoothing => 1, 2754 map_smoothing => 1,
2636 gui_fontsize => 1, 2755 gui_fontsize => 1,
2637 log_fontsize => 0.7, 2756 log_fontsize => 0.7,
2638 gauge_fontsize => 1, 2757 gauge_fontsize => 1,
2639 gauge_size => 0.35, 2758 gauge_size => 0.35,
… …
2647 effects_enable => 1, 2766 effects_enable => 1,
2648 effects_volume => 1, 2767 effects_volume => 1,
2649 bgm_enable => 1, 2768 bgm_enable => 1,
2650 bgm_volume => 0.5, 2769 bgm_volume => 0.5,
2651 output_rate => "", 2770 output_rate => "",
2652 pickup => 0, 2771 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2653 inv_sort => "mtime", 2772 inv_sort => "mtime",
2654 default => "profile", # default profile 2773 default => "profile", # default profile
2655 show_tips => 1, 2774 show_tips => 1,
2656 logview_max_par => 1000, 2775 logview_max_par => 1000,
2657 shift_fire_stop => 0, 2776 shift_fire_stop => 0,
2658 uitheme => "wood", 2777 uitheme => "wood",
2659 ); 2778 map_shift_x => -24, # arbitrary
2779 map_shift_y => +24, # arbitrary
2660 2780 );
2781
2661 while (my ($k, $v) = each %DEF_CFG) { 2782 while (my ($k, $v) = each %DEF_CFG) {
2662 $CFG->{$k} = $v unless exists $CFG->{$k}; 2783 $CFG->{$k} = $v unless exists $CFG->{$k};
2663 } 2784 }
2664 2785
2665 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2786 my @args = @ARGV;
2787
2788 my $profile = 'default';
2789
2790 for (my $i = 0; $i < @args; $i++) {
2791 if ($args[$i] =~ /^--?profile$/) {
2792 $profile = $args[$i + 1];
2793 splice @args, $i, 2, ();
2794 $i = 0;
2795 } elsif ($args[$i] =~ /^--?h/) {
2796 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2797 exit 0;
2798 }
2799 }
2800
2801 $CFG->{profile}{$profile} ||= {};
2666 $PROFILE = $CFG->{profile}{default}; 2802 $PROFILE = $CFG->{profile}{$profile};
2803 $PROFILE->{host} ||= "gameserver.deliantra.net";
2804
2805 $PROFILE->{host} = $args[0] if @args > 0;
2806 $PROFILE->{user} = $args[1] if @args > 1;
2807 $PROFILE->{password} = $args[2] if @args > 2;
2667 2808
2668 # convert old bindings (only default profile matters) 2809 # convert old bindings (only default profile matters)
2669 if (my $bindings = delete $PROFILE->{bindings}) { 2810 if (my $bindings = delete $PROFILE->{bindings}) {
2670 while (my ($mod, $syms) = each %$bindings) { 2811 while (my ($mod, $syms) = each %$bindings) {
2671 while (my ($sym, $cmds) = each %$syms) { 2812 while (my ($sym, $cmds) = each %$syms) {
… …
2677 } 2818 }
2678 } 2819 }
2679 2820
2680 sdl_init; 2821 sdl_init;
2681 2822
2823 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2824 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2825
2682 { 2826 {
2683 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2827 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2684 DejaVuSans.ttf 2828 DejaVuSans.ttf
2685 DejaVuSansMono.ttf 2829 DejaVuSansMono.ttf
2686 DejaVuSans-Bold.ttf 2830 DejaVuSans-Bold.ttf
2687 DejaVuSansMono-Bold.ttf 2831 DejaVuSansMono-Bold.ttf
2688 DejaVuSans-Oblique.ttf 2832 DejaVuSans-Oblique.ttf
2689 DejaVuSansMono-Oblique.ttf 2833 DejaVuSansMono-Oblique.ttf
2690 DejaVuSans-BoldOblique.ttf 2834 DejaVuSans-BoldOblique.ttf
2691 DejaVuSansMono-BoldOblique.ttf 2835 DejaVuSansMono-BoldOblique.ttf
2836 mona.ttf
2692 ); 2837 );
2693 2838
2694 DC::add_font $_ for @fonts; 2839 DC::add_font $_ for @fonts;
2695 2840
2696 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2841 $FONT_PROP = new_from_file DC::Font $fonts[0];
2697 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2842 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2698 2843
2699 $FONT_PROP->make_default; 2844 $FONT_PROP->make_default;
2700 2845
… …
2726 }; 2871 };
2727 2872
2728 delete $SIG{__DIE__}; 2873 delete $SIG{__DIE__};
2729 EV::loop; 2874 EV::loop;
2730 2875
2876 DC::write_cfg if $CFG->{config_autosave};
2877
2731#video_shutdown; 2878 #video_shutdown;
2732#audio_shutdown; 2879 #audio_shutdown;
2880
2733 DC::OpenGL::quit; 2881 DC::OpenGL::quit;
2734 DC::SDL_Quit; 2882 DC::SDL_Quit;
2735 DC::DB::Server::stop; 2883 DC::DB::Server::stop;
2736} 2884}
2737 2885
… …
2741 2889
2742deliantra - A Deliantra MORPG game client 2890deliantra - A Deliantra MORPG game client
2743 2891
2744=head1 SYNOPSIS 2892=head1 SYNOPSIS
2745 2893
2746Just run it - no commandline arguments are supported. 2894 deliantra [--profile name] [host [user [password]]]
2895 deliantra --help
2747 2896
2748=head1 USAGE 2897=head1 USAGE
2749 2898
2750deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2899The deliantra client utilises OpenGL for all UI elements and the game. It
2751be used in fullscreen mode and interactively. 2900is supposed to be used in fullscreen mode and interactively.
2752 2901
2753=head1 DEBUGGING 2902=head1 DEBUGGING
2754
2755 2903
2756CFPLUS_DEBUG - environment variable 2904CFPLUS_DEBUG - environment variable
2757 2905
2758 1 draw borders around widgets 2906 1 draw borders around widgets
2759 2 add low-level widget info to tooltips 2907 2 add low-level widget info to tooltips

Diff Legend

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