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.106 by root, Sat Apr 3 03:02:28 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;
… …
182 165
183our $MAP; 166our $MAP;
184our $MAPMAP; 167our $MAPMAP;
185our $MAPWIDGET; 168our $MAPWIDGET;
186our $COMPLETER; 169our $COMPLETER;
187our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
188our $METASERVER; 174our $METASERVER;
189our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
190our $QUIT_DIALOG; 176our $QUIT_DIALOG;
191our $HOST_ENTRY; 177our $HOST_ENTRY;
192our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
218our $FLOORBOX; 204our $FLOORBOX;
219our $GAUGES; 205our $GAUGES;
220our $STATWIDS; 206our $STATWIDS;
221 207
222our $SDL_ACTIVE; 208our $SDL_ACTIVE;
223our %SDL_CB; 209our @SDL_CB;
224 210
225our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
226our $STATUSBOX; 212our $STATUSBOX;
227our $MODBOX; 213our $MODBOX;
228our $DEBUG_STATUS; 214our $DEBUG_STATUS;
… …
236# write a crash message blockingly to the socket, if possible 222# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy. 223# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) { 224*crash = sub($;$) {
239 my ($msg, $backtrace) = @_; 225 my ($msg, $backtrace) = @_;
240 226
227 warn $msg;
228
241 return unless $CONN; 229 return unless $CONN;
242 230
243 my $fh = $CONN->{fh} 231 my $fh = $CONN->{fh}
244 or return; 232 or return;
245 233
… …
255 243
256 # backtrace as second step, in case it crashes, too 244 # backtrace as second step, in case it crashes, too
257 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace; 246 if $backtrace;
259}; 247};
248
249sub clienterror($;$) {
250 my ($msg, $backtrace) = @_;
251
252 warn $msg;
253
254 return unless $CONN;
255
256 $CONN->send_exti_msg (clientlog => $msg);
257 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
258}
260 259
261############################################################################# 260#############################################################################
262 261
263sub status { 262sub status {
264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
346 or return; 345 or return;
347 346
348 $meta->{data} 347 $meta->{data}
349 or return; 348 or return;
350 349
351 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
352 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 352 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 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
355 &audio_music_push ($face); 354 &audio_music_push ($face);
356 } 355 }
357 } else { 356 } else {
358 # fetch from database 357 # fetch from database
359 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
360 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
361 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 361 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); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
364 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
365 364
366 audio_sound_push ($face); 365 audio_sound_push ($face);
367 }; 366 };
… …
414 413
415 audio_music_update_volume; 414 audio_music_update_volume;
416 415
417 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
418 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
419 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
420 ? new_from_file DC::RW $meta->{path} 422 ? (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; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
422 424
423 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
424 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
425 427
426 my $NOW = time; 428 my $NOW = time;
427 429
428 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
429 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
538 sub audio_tab_update; 540 sub audio_tab_update;
539 audio_tab_update; 541 audio_tab_update;
540} 542}
541 543
542sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
543 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
544 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
545 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
546 553
547 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
787} 794}
788 795
789sub dc_connect { 796sub dc_connect {
790 my ($host, $port) = @_; 797 my ($host, $port) = @_;
791 798
792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 799 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
800 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
793 801
794 $CONN = 802 $CONN =
795 new DC::Protocol 803 new DC::Protocol
796 host => $host, 804 host => $host,
797 port => $port, 805 port => $port,
798 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
799 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
800 mapw => $mapsize, 808 mapw => $mapw,
801 maph => $mapsize, 809 maph => $maph,
802 810
803 client => "$DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
804 812
805 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
… …
814 822
815 on_connect => sub { 823 on_connect => sub {
816 if ($_[0]) { 824 if ($_[0]) {
817 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
818 826
819 status "login successful"; 827 status "successfully connected to the server";
820 } else { 828 } else {
821 undef $CONN; 829 undef $CONN;
822 status "unable to connect: $!"; 830 status "unable to connect: $!";
823 stop_game(); 831 stop_game();
824 } 832 }
… …
826 ; 834 ;
827} 835}
828 836
829sub start_game { 837sub start_game {
830 status "logging in..."; 838 status "logging in...";
839
840 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
841 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
842 or return status "$server: unable to parse server address, try an empty field.";
831 843
832 $LOGIN_BUTTON->set_text ("Logout"); 844 $LOGIN_BUTTON->set_text ("Logout");
833 $SETUP_DIALOG->hide; 845 $SETUP_DIALOG->hide;
834
835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
836 846
837 $MAP = new DC::Map; 847 $MAP = new DC::Map;
838 848
839 # hack to make SURE we find the IP address all right 849 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable. 850 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") { 851 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 852 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 if ($_[0] ne "80.101.114.108") { # Perl 853 if ($_[0] ne "80.101.114.108") { # Perl
854 status "dns failure, trying differently";
855 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
856 unless (defined $host) {
844 status "dns failure, using hardcoded address"; 857 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95"; 858 $host = "129.13.162.95";
859 }
846 } 860 }
847 861
848 dc_connect $host, $port; 862 dc_connect $host, $port;
849 }; 863 };
850 } else { 864 } else {
… …
876} 890}
877 891
878sub graphics_setup { 892sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
880 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
881 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 898 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
882 899
883 my $row = 0; 900 my $row = 0;
884 901
885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 902 $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, 903 $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, 904 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 906
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 907 $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, 908 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1, 909 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as " 910 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 " 911 . "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 " 912 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 913 . "by installing the right driver for your graphics card.");
897 914
915 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
916 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
917 value => $CFG->{uitheme},
918 options => [
919 [wood => "Wood (the default)"],
920 [plain => "Plain (very)"],
921 [blue => "Blue (dark)"],
922 [metal => "Metal (light)"],
923 ],
924 tooltip => "Choose the User Interface theme that you like most :)",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
926 );
927
898 my $vidmode_tooltip = 928 my $vidmode_tooltip =
899 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 929 "<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>."; 930 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
901 931
902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 932 $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); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 934
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
936 c_rescale => 1,
906 force_w => $WIDTH * 0.1, expand => 1, 937 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 938 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
912 943
913 $MODE_SLIDER->connect (changed => sub { 944 $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) = @_; 945 my ($self, $value) = @_;
946
947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
948 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
949 });
950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
954 state => $CFG->{fullscreen},
955 tooltip => "Bring the client into fullscreen mode.",
956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
957 );
958
959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
960 $table->add_at (1, $row++, new DC::UI::CheckBox
961 state => $CFG->{force_opengl11},
962 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
963 . "higher memory usage and slower performance. It will, however, help tremendously on "
964 . "cards that claim to support a feature but fall back to software rendering. "
965 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
966 . "but cards and drivers from other vendors (ATI) are often just as bad. "
967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
969 );
970
971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
972 $table->add_at (1, $row++, new DC::UI::CheckBox
973 state => $CFG->{disable_alpha},
974 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
975 . "by disabling a number of textures and transparency effects. Normally, these "
976 . "effects do not cost a lot of resources, but some graphics cards might fall "
977 . "back to extremely slow rendering if this is enabled. If disabling this option "
978 . "noticably improves the framerate of the client please report this! "
979 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
980 on_changed => sub {
981 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value; 982 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 983 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
984 0
953 0 985 }
954 } 986 );
955 );
956 987
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 991 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). " 992 . "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 " 993 . "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.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 996 );
966 997
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 998 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 1000 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 1003 );
973 1004
974 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
975 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 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.", 1008 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 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 1010 );
980 1011
981 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
984 on_activate => sub { 1015 on_activate => sub {
985 video_shutdown (); 1016 video_shutdown ();
986 video_init (); 1017 video_init ();
1018 0
987 0 1019 }
988 } 1020 );
989 ); 1021 }
990 1022
1023 {
1024 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1025
1026 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1027
1028 my $row = 0;
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1030 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1031 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1032 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, " 1033 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.", 1034 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1035 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1036 );
999 1037
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1039 $table->add_at (1, $row++, new DC::UI::CheckBox
1040 state => $CFG->{smooth_transitions},
1041 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1042 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1043 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1044 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1045 );
1046
1047
1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1005 ); 1053 );
1006 1054
1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
1010 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1058 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. " 1059 . "This increases load on the graphics subsystem and works only with TRT servers. "
1012 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1062 );
1015 1063
1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1064 $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 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
1019 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1067 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 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1069 );
1022 1070
1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1072 $table->add_at (1, $row++, new DC::UI::ImageButton
1073 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1074 bg => [0.3, 0.3, 0.2],
1075 force_w => 64,
1076 force_h => 64,
1077 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.",
1078 on_activate => sub {
1079 my ($self) = @_;
1080 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1081 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1082 $MAPWIDGET->update;
1083 }
1084 );
1085
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1086 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 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.", 1089 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 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1091 );
1029 1092
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 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, " 1096 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.", 1097 . "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 }, 1098 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1036 ); 1099 );
1037 1100
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1101 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 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.", 1104 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1042 on_changed => sub { 1105 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
1045 0 1109 }
1046 } 1110 );
1047 );
1048 1111
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1112 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1115 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1116 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
1056 0 1120 }
1057 } 1121 );
1058 ); 1122 }
1059 1123
1060 $vbox 1124 $vbox
1061} 1125}
1062 1126
1063our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
… …
1076 1140
1077 my $text = !$freq 1141 my $text = !$freq
1078 ? "audio is off" 1142 ? "audio is off"
1079 : "audio is enabled\n" 1143 : "audio is enabled\n"
1080 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
1081 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1082 1148
1083 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
1084} 1150}
1085 1151
1086sub audio_setup { 1152sub audio_setup {
… …
1226} 1292}
1227 1293
1228sub make_gauge_window { 1294sub make_gauge_window {
1229 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1230 1296
1231 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1232 force_x => 0, 1298 force_x => 0,
1233 force_y => "max", 1299 force_y => "max",
1234 force_w => $WIDTH, 1300 force_w => $WIDTH,
1235 force_h => $gh, 1301 force_h => $gh,
1236 ); 1302 );
… …
1252 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1253 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1254 ], 1320 ],
1255 ); 1321 );
1256 1322
1257 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1323 $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"); 1324 $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"); 1325 $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"); 1326 $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 1327
1273 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1274 1329
1275 $win 1330 $win
1276} 1331}
… …
1617 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1672 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1618 ); 1673 );
1619 1674
1620 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1675 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1621 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1622 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1623 tooltip => "The name of your character on the server.", 1678 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 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1625 ); 1680 );
1626 1681
1627 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1682 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1628 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1629 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1630 hidden => 1, 1685 hidden => 1,
1631 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1632 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1633 ); 1688 );
1634 1689
1635 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1636 expand => 1, 1691 expand => 1,
1637 text => "Login / Register", 1692 text => "Login / Register",
… …
1673 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1674 1729
1675 $vbox->add ( 1730 $vbox->add (
1676 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1677 expand => 1, 1732 expand => 1,
1678 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1679 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1734 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1680 on_changed => sub { 1735 on_changed => sub {
1681 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1682 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1683 1 1738 1
1684 } 1739 }
1685 ); 1740 );
1686 1741
1687 if (0) { #d# disabled 1742 if (0) { #d# disabled
… …
1730 1785
1731 my $row = 0; 1786 my $row = 0;
1732 1787
1733 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1788 $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 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1735 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1736 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1792 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1737 on_changed => sub { 1793 on_changed => sub {
1738 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1739 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
… …
1741 } 1797 }
1742 ); 1798 );
1743 1799
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1800 $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 1801 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1802 c_colspan => 2,
1746 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1747 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1804 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 " 1805 . "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.", 1806 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1750 on_changed => sub { 1807 on_changed => sub {
… …
1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1753 0 1810 0
1754 }, 1811 },
1755 ); 1812 );
1756 1813
1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1815 $table->add_at (1, $row, new DC::UI::CheckBox
1816 state => $CFG->{config_autosave},
1817 tooltip => "Normally, configuration settings and the user interface layout "
1818 . "are saved on client exit. You can disable this behaviour by "
1819 . "unchecking this checkbox.",
1820 on_changed => sub {
1821 my ($self, $value) = @_;
1822 $CFG->{config_autosave} = $value;
1823 0
1824 }
1825 );
1826 $table->add_at (2, $row++, new DC::UI::Button
1827 text => "Save Now",
1828 tooltip => "Use this to manually save configuration and UI layout when "
1829 . "autosave is disabled.",
1830 on_activate => sub {
1831 DC::write_cfg;
1832 0
1833 }
1834 );
1835
1757 $table 1836 $table
1758} 1837}
1759 1838
1760sub autopickup_setup { 1839sub autopickup_setup {
1761 my $r = new DC::UI::ScrolledWindow ( 1840 my $r = new DC::UI::ScrolledWindow (
… …
1767 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1768 ); 1847 );
1769 1848
1770 for ( 1849 for (
1771 ["General", 0, 0, 1850 ["General", 0, 0,
1772 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1773 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1774 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1775 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1776 ], 1854 ],
1777 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1778 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
… …
1826 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1827 } else { 1905 } else {
1828 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1829 } 1907 }
1830 1908
1831 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1832 if defined $::CONN; 1910 if defined $::CONN;
1833 1911
1834 0 1912 0
1835 }); 1913 });
1836 1914
… …
1853 }); 1931 });
1854 1932
1855 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1856 text => "set", 1934 text => "set",
1857 on_activate => sub { 1935 on_activate => sub {
1858 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1859 if defined $::CONN; 1937 if defined $::CONN;
1860 0 1938 0
1861 }); 1939 });
1862 1940
1863 $r 1941 $r
1864} 1942}
1865 1943
1866my %SORT_ORDER = ( 1944my %SORT_ORDER = (
1867 type => sub { 1945 type => sub {
1946 use sort 'stable';
1868 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1947 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1869 }, 1948 },
1870 mtime => sub { 1949 mtime => sub {
1950 use sort 'stable';
1871 my $NOW = time; 1951 my $NOW = time;
1872 sort { 1952 sort {
1873 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1953 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; 1954 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1875 1955
1876 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1956 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1877 or $btime <=> $atime 1957 or $btime <=> $atime
1878 or $a->{type} <=> $b->{type} 1958 or $a->{type} <=> $b->{type}
1879 } @_ 1959 } @_
1880 }, 1960 },
1881 weight => sub { sort { 1961 weight => sub {
1962 use sort 'stable';
1963 sort {
1882 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1964 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1883 or $a->{type} <=> $b->{type} 1965 or $a->{type} <=> $b->{type}
1884 } @_ }, 1966 } @_
1967 },
1885); 1968);
1886 1969
1887sub inventory_widget { 1970sub inventory_widget {
1888 my $hb = new DC::UI::HBox homogeneous => 1; 1971 my $hb = new DC::UI::HBox homogeneous => 1;
1889 1972
… …
1976 $PL_NOTEBOOK->set_current_page ($widget); 2059 $PL_NOTEBOOK->set_current_page ($widget);
1977 $PL_WINDOW->show; 2060 $PL_WINDOW->show;
1978 } 2061 }
1979} 2062}
1980 2063
1981sub player_window { 2064sub make_playerbook {
1982 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2065 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1983 x => "center", 2066 x => "center",
1984 y => "center", 2067 y => "center",
1985 force_w => $WIDTH * 9/10, 2068 force_w => $WIDTH * 9/10,
1986 force_h => $HEIGHT * 9/10, 2069 force_h => $HEIGHT * 9/10,
… …
2020 "License, Author and Source info for media sent by the server."); 2103 "License, Author and Source info for media sent by the server.");
2021 2104
2022 $ntb->set_current_page ($INVENTORY_PAGE); 2105 $ntb->set_current_page ($INVENTORY_PAGE);
2023 2106
2024 $plwin->add ($ntb); 2107 $plwin->add ($ntb);
2025 $plwin
2026} 2108}
2027 2109
2028sub keyboard_setup { 2110sub keyboard_setup {
2029 DC::Macro::keyboard_setup 2111 DC::Macro::keyboard_setup
2030} 2112}
2031 2113
2032sub help_window { 2114sub make_help_window {
2033 my $win = new DC::UI::Toplevel 2115 my $win = new DC::UI::Toplevel
2034 x => 'center', 2116 x => 'center',
2035 y => 'center', 2117 y => 'center',
2036 z => 4, 2118 z => 4,
2037 name => 'doc_browser', 2119 name => 'doc_browser',
… …
2126 2208
2127 $load_node->((DC::Pod::find @path)[0]); 2209 $load_node->((DC::Pod::find @path)[0]);
2128 $win->show; 2210 $win->show;
2129 }; 2211 };
2130 2212
2131 $win 2213 $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} 2214}
2154 2215
2155sub open_quit_dialog { 2216sub open_quit_dialog {
2156 unless ($QUIT_DIALOG) { 2217 unless ($QUIT_DIALOG) {
2157 $QUIT_DIALOG = new DC::UI::Toplevel 2218 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2190 2251
2191 $QUIT_DIALOG->show; 2252 $QUIT_DIALOG->show;
2192 $QUIT_DIALOG->grab_focus; 2253 $QUIT_DIALOG->grab_focus;
2193} 2254}
2194 2255
2256sub make_menubar {
2257 $MENUFRAME = new DC::UI::Toplevel
2258 border => 0,
2259 force_x => 0,
2260 force_y => 0,
2261 force_w => $::WIDTH,
2262 child => ($MENUBAR = new DC::UI::HBox),
2263 ;
2264
2265 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2266
2267 # 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
2268 make_gauge_window->show;
2269
2270# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2271# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2272
2273 make_playerbook;
2274
2275 $MENUPOPUP = DC::UI::Menu->new (items => [
2276 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2277 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2278 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2279 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2280 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2281 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2282 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2283 ["Quit…" , sub {
2284 if ($CONN) {
2285 open_quit_dialog;
2286 } else {
2287 EV::unloop EV::UNLOOP_ALL;
2288 }
2289 }],
2290 ]);
2291
2292 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2293 tooltip => "Shows the main menu",
2294 on_button_down => sub {
2295 my ($self, $ev) = @_;
2296 local $ev->{x} = 0;
2297 local $ev->{y} = 0;
2298 $MENUPOPUP->popup ($ev);
2299 },
2300 );
2301
2302 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2303 padding_x => 6,
2304 padding_y => 3,
2305 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2306 template => " Exp: 888,888,888,888 (lvl 188) ",
2307 );
2308
2309 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2310 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2311 . "will automatically pick up items as defined by your item pickup settings "
2312 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2313 . "disable autopickup by disabling this checkbox.",
2314 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2315 on_changed => sub {
2316 my ($self, $value) = @_;
2317 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2318 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2319 $CONN->send_pickup ($CFG->{pickup})
2320 if $CONN;
2321 },
2322 );
2323
2324 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2325 c_rescale => 1,
2326 padding_x => 6,
2327 padding_y => 3,
2328 force_w => $::WIDTH * 0.2,
2329 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2330 template => "two handed weapons 99%",
2331 );
2332
2333 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2334 expand => 1,
2335 align => 1, can_hover => 1, can_events => 1,
2336 text => "Range and Combat Slots",
2337 tooltip => "#stat_ranged",
2338 );
2339
2340 $MENUFRAME->show;
2341}
2342
2343sub open_string_query {
2344 my ($title, $cb, $txt, $tooltip) = @_;
2345 my $dialog = new DC::UI::Toplevel
2346 x => "center",
2347 y => "center",
2348 z => 50,
2349 force_w => $WIDTH * 4/5,
2350 title => $title;
2351
2352 $dialog->add (
2353 my $e = new DC::UI::Entry
2354 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2355 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2356 tooltip => $tooltip
2357 );
2358
2359 $e->grab_focus;
2360 $e->set_text ($txt) if $txt;
2361 $dialog->show;
2362}
2363
2195sub show_tip_of_the_day { 2364sub show_tip_of_the_day {
2196 # find all tips 2365 # find all tips
2197 my @tod = DC::Pod::find tip_of_the_day => "*"; 2366 my @tod = DC::Pod::find tip_of_the_day => "*";
2198 2367
2199 DC::DB::get state => "tip_of_the_day", sub { 2368 DC::DB::get state => "tip_of_the_day", sub {
… …
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2419 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n"; 2420 and die "SDL::Init failed!\n";
2252} 2421}
2253 2422
2254sub video_init { 2423sub video_init {
2424 DC::set_theme $CFG->{uitheme};
2425
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2426 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2427 $SDL_REINIT = 0;
2257 2428
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2429 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2430 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2434 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264 2435
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2436 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2437 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2438
2268 # now choose biggets mode <= 1024x768 2439 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2440 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2441 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2442 $CFG->{sdl_mode} = $_;
2272 } 2443 }
2273 } 2444 }
… …
2336 2507
2337 (new DC::UI::Frame 2508 (new DC::UI::Frame
2338 bg => [0, 0, 0, 0.4], 2509 bg => [0, 0, 0, 0.4],
2339 force_x => 0, 2510 force_x => 0,
2340 force_y => "max", 2511 force_y => "max",
2341 child => (my $LR = new DC::UI::VBox), 2512 child => (my $LL = new DC::UI::VBox),
2342 )->show; 2513 )->show;
2343 2514
2344 $LR->add ($STATUSBOX); 2515 $LL->add ($STATUSBOX);
2345 $LR->add ($MODBOX); 2516 $LL->add ($MODBOX);
2346 $LR->add (new DC::UI::Label 2517 $LL->add (new DC::UI::Label
2347 align => 0, 2518 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2519 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5, 2520 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7], 2521 fg => [1, 1, 0, 0.7],
2351 ); 2522 );
2352 2523
2353 DC::UI::Toplevel->new ( 2524 DC::UI::Toplevel->new (
2354 title => "Minimap", 2525 title => "Minimap",
2355 name => "mapmap", 2526 name => "mapmap",
2356 x => 0, 2527 x => 0,
2357 y => $FONTSIZE + 8, 2528 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2358 border_bg => [1, 1, 1, 192/255], 2529 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2530 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2531 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.", 2532 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2362 ), 2533 ),
2363 )->show; 2534 )->show;
2364 2535
2365 $MAPWIDGET = new DC::MapWidget; 2536 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2537 $MAPWIDGET->connect (activate_console => sub {
… …
2391 $METASERVER = metaserver_dialog; 2562 $METASERVER = metaserver_dialog;
2392 # the name is changed to not conflict with the older name as users could have hidden it 2563 # the name is changed to not conflict with the older name as users could have hidden it
2393 $MESSAGE_WINDOW = new DC::UI::Dockbar 2564 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2", 2565 name => "message_window2",
2395 title => 'Messages', 2566 title => 'Messages',
2567 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2396 force_w => $::WIDTH * 0.6, 2568 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25, 2569 force_h => $::HEIGHT * 0.25,
2398 ; 2570 ;
2399 2571
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2572 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2420 . "After pressing the combo the binding will be saved automatically and the " 2592 . "After pressing the combo the binding will be saved automatically and the "
2421 . "binding editor closes"); 2593 . "binding editor closes");
2422 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2594 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2423 "Some debuggin' options. Do not ask."); 2595 "Some debuggin' options. Do not ask.");
2424 2596
2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2597 make_help_window;
2598 make_menubar;
2426 2599
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; 2600 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2601 $MESSAGE_WINDOW->show;
2468 } 2602 }
2469 2603
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2604 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2605 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2606
2473 $CAVEAT_LABEL->set_text ("None :)"); 2607 $CAVEAT_LABEL->set_text ("None :)");
2608 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2609 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2610 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2611 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476 2612
2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2613 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2478} 2614}
… …
2506my $want_refresh = EV::prepare_ns \&force_refresh; 2642my $want_refresh = EV::prepare_ns \&force_refresh;
2507 2643
2508my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2644my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2509 $NOW = EV::now; 2645 $NOW = EV::now;
2510 2646
2511 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2647 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2512 for DC::poll_events; 2648 for DC::poll_events;
2513 2649
2514 if (%animate_object) { 2650 if (%animate_object) {
2515 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2651 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2516 $WANT_REFRESH = 1; 2652 $WANT_REFRESH = 1;
… …
2528sub animation_stop { 2664sub animation_stop {
2529 my ($widget) = @_; 2665 my ($widget) = @_;
2530 delete $animate_object{$widget}; 2666 delete $animate_object{$widget};
2531} 2667}
2532 2668
2533%SDL_CB = (
2534 DC::SDL_QUIT => sub { 2669$SDL_CB[DC::SDL_QUIT] = sub {
2535 crash "SDL_QUIT"; 2670 crash "SDL_QUIT";
2536 EV::unloop EV::UNLOOP_ALL; 2671 EV::unloop EV::UNLOOP_ALL;
2537 }, 2672};
2538 DC::SDL_VIDEORESIZE => sub { 2673$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2539 },
2540 DC::SDL_VIDEOEXPOSE => sub { 2674$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2541 DC::UI::full_refresh; 2675 DC::UI::full_refresh;
2542 }, 2676};
2543 DC::SDL_ACTIVEEVENT => sub { 2677$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2544# not useful, as APPACTIVE includes only iconified state, not unmapped 2678# 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# 2679# 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# 2680# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2547# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2681# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2548# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2682# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2683# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2550 }, 2684};
2551 DC::SDL_KEYDOWN => sub { 2685$SDL_CB[DC::SDL_KEYDOWN] = sub {
2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2686 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2553 # alt-enter 2687 # alt-enter
2554 video_shutdown; 2688 video_shutdown;
2555 $FULLSCREEN_ENABLE->toggle; 2689 $FULLSCREEN_ENABLE->toggle;
2556 video_init; 2690 video_init;
2557 } else { 2691 } else {
2558 &DC::UI::feed_sdl_key_down_event; 2692 &DC::UI::feed_sdl_key_down_event;
2559 } 2693 }
2560 update_modbox; 2694 update_modbox;
2561 }, 2695};
2562 DC::SDL_KEYUP => sub { 2696$SDL_CB[DC::SDL_KEYUP] = sub {
2563 &DC::UI::feed_sdl_key_up_event; 2697 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox; 2698 update_modbox;
2565 }, 2699};
2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2700$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2701$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2702$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2569 DC::SDL_USEREVENT => sub { 2703$SDL_CB[DC::SDL_USEREVENT] = sub {
2570 if ($_[0]{code} == 1) { 2704 if ($_[0]{code} == 1) {
2571 audio_channel_finished $_[0]{data1}; 2705 audio_channel_finished $_[0]{data1};
2572 } elsif ($_[0]{code} == 0) { 2706 } elsif ($_[0]{code} == 0) {
2573 audio_music_finished; 2707 audio_music_finished;
2574 }
2575 }, 2708 }
2576); 2709};
2577 2710
2578############################################################################# 2711#############################################################################
2579 2712
2580$SIG{INT} = $SIG{TERM} = sub { 2713$SIG{INT} = $SIG{TERM} = sub {
2581 EV::unloop; 2714 EV::unloop;
2582 #d# TODO calling exit here hangs the process in some futex 2715 #d# TODO calling exit here hangs the process in some futex
2583}; 2716};
2584 2717
2585# due to mac os x + sdl combined briandamage, we need this contortion 2718# due to mac os x + sdl combined braindamage, we need this contortion
2586sub main { 2719sub main {
2587 { 2720 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2721 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589 2722
2590 if (-e "$Deliantra::VARDIR/client.cf") { 2723 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2607 DC::DB::open_db; 2740 DC::DB::open_db;
2608 2741
2609 DC::UI::set_layout ($::CFG->{layout}); 2742 DC::UI::set_layout ($::CFG->{layout});
2610 2743
2611 my %DEF_CFG = ( 2744 my %DEF_CFG = (
2745 config_autosave => 1,
2612 sdl_mode => undef, 2746 sdl_mode => undef,
2613 fullscreen => 1, 2747 fullscreen => 1,
2614 fast => 0, 2748 fast => 0,
2615 force_opengl11 => undef, 2749 force_opengl11 => undef,
2616 disable_alpha => 0, 2750 disable_alpha => 0,
2617 smooth_movement => 1, 2751 smooth_movement => 1,
2752 smooth_transitions => 1,
2618 texture_compression => 1, 2753 texture_compression => 1,
2619 map_scale => 1, 2754 map_scale => 1,
2620 fow_enable => 1, 2755 fow_enable => 1,
2621 fow_intensity => 0, 2756 fow_intensity => 0,
2757 fow_texture => 0,
2622 map_smoothing => 1, 2758 map_smoothing => 1,
2623 gui_fontsize => 1, 2759 gui_fontsize => 1,
2624 log_fontsize => 0.7, 2760 log_fontsize => 0.7,
2625 gauge_fontsize => 1, 2761 gauge_fontsize => 1,
2626 gauge_size => 0.35, 2762 gauge_size => 0.35,
… …
2634 effects_enable => 1, 2770 effects_enable => 1,
2635 effects_volume => 1, 2771 effects_volume => 1,
2636 bgm_enable => 1, 2772 bgm_enable => 1,
2637 bgm_volume => 0.5, 2773 bgm_volume => 0.5,
2638 output_rate => "", 2774 output_rate => "",
2639 pickup => 0, 2775 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2640 inv_sort => "mtime", 2776 inv_sort => "mtime",
2641 default => "profile", # default profile 2777 default => "profile", # default profile
2642 show_tips => 1, 2778 show_tips => 1,
2643 logview_max_par => 1000, 2779 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2780 shift_fire_stop => 0,
2645 ); 2781 uitheme => "wood",
2782 map_shift_x => -24, # arbitrary
2783 map_shift_y => +24, # arbitrary
2646 2784 );
2785
2647 while (my ($k, $v) = each %DEF_CFG) { 2786 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2787 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2788 }
2650 2789
2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2790 my @args = @ARGV;
2791
2792 my $profile = 'default';
2793
2794 for (my $i = 0; $i < @args; $i++) {
2795 if ($args[$i] =~ /^--?profile$/) {
2796 $profile = $args[$i + 1];
2797 splice @args, $i, 2, ();
2798 $i = 0;
2799 } elsif ($args[$i] =~ /^--?h/) {
2800 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2801 exit 0;
2802 }
2803 }
2804
2805 $CFG->{profile}{$profile} ||= {};
2652 $PROFILE = $CFG->{profile}{default}; 2806 $PROFILE = $CFG->{profile}{$profile};
2807 $PROFILE->{host} ||= "gameserver.deliantra.net";
2808
2809 $PROFILE->{host} = $args[0] if @args > 0;
2810 $PROFILE->{user} = $args[1] if @args > 1;
2811 $PROFILE->{password} = $args[2] if @args > 2;
2653 2812
2654 # convert old bindings (only default profile matters) 2813 # convert old bindings (only default profile matters)
2655 if (my $bindings = delete $PROFILE->{bindings}) { 2814 if (my $bindings = delete $PROFILE->{bindings}) {
2656 while (my ($mod, $syms) = each %$bindings) { 2815 while (my ($mod, $syms) = each %$bindings) {
2657 while (my ($sym, $cmds) = each %$syms) { 2816 while (my ($sym, $cmds) = each %$syms) {
… …
2663 } 2822 }
2664 } 2823 }
2665 2824
2666 sdl_init; 2825 sdl_init;
2667 2826
2827 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2828 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2829
2668 { 2830 {
2669 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2831 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2670 DejaVuSans.ttf 2832 DejaVuSans.ttf
2671 DejaVuSansMono.ttf 2833 DejaVuSansMono.ttf
2672 DejaVuSans-Bold.ttf 2834 DejaVuSans-Bold.ttf
2673 DejaVuSansMono-Bold.ttf 2835 DejaVuSansMono-Bold.ttf
2674 DejaVuSans-Oblique.ttf 2836 DejaVuSans-Oblique.ttf
2675 DejaVuSansMono-Oblique.ttf 2837 DejaVuSansMono-Oblique.ttf
2676 DejaVuSans-BoldOblique.ttf 2838 DejaVuSans-BoldOblique.ttf
2677 DejaVuSansMono-BoldOblique.ttf 2839 DejaVuSansMono-BoldOblique.ttf
2840 mona.ttf
2678 ); 2841 );
2679 2842
2680 DC::add_font $_ for @fonts; 2843 DC::add_font $_ for @fonts;
2681 2844
2682 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2845 $FONT_PROP = new_from_file DC::Font $fonts[0];
2683 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2846 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2684 2847
2685 $FONT_PROP->make_default; 2848 $FONT_PROP->make_default;
2686 2849
… …
2712 }; 2875 };
2713 2876
2714 delete $SIG{__DIE__}; 2877 delete $SIG{__DIE__};
2715 EV::loop; 2878 EV::loop;
2716 2879
2880 DC::write_cfg if $CFG->{config_autosave};
2881
2717#video_shutdown; 2882 #video_shutdown;
2718#audio_shutdown; 2883 #audio_shutdown;
2884
2719 DC::OpenGL::quit; 2885 DC::OpenGL::quit;
2720 DC::SDL_Quit; 2886 DC::SDL_Quit;
2721 DC::DB::Server::stop; 2887 DC::DB::Server::stop;
2722} 2888}
2723 2889
… …
2727 2893
2728deliantra - A Deliantra MORPG game client 2894deliantra - A Deliantra MORPG game client
2729 2895
2730=head1 SYNOPSIS 2896=head1 SYNOPSIS
2731 2897
2732Just run it - no commandline arguments are supported. 2898 deliantra [--profile name] [host [user [password]]]
2899 deliantra --help
2733 2900
2734=head1 USAGE 2901=head1 USAGE
2735 2902
2736deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2903The deliantra client utilises OpenGL for all UI elements and the game. It
2737be used in fullscreen mode and interactively. 2904is supposed to be used in fullscreen mode and interactively.
2738 2905
2739=head1 DEBUGGING 2906=head1 DEBUGGING
2740
2741 2907
2742CFPLUS_DEBUG - environment variable 2908CFPLUS_DEBUG - environment variable
2743 2909
2744 1 draw borders around widgets 2910 1 draw borders around widgets
2745 2 add low-level widget info to tooltips 2911 2 add low-level widget info to tooltips

Diff Legend

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