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.76 by root, Wed Sep 3 12:50:43 2008 UTC vs.
Revision 1.109 by root, Thu Apr 8 19:11:21 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 } 63 }
82 64
83 unshift @INC, $root; 65 unshift @INC, $root;
84 } 66 }
85} 67}
86 68
87# prepend private library directory 69# prepend private library directory and prepare env
88BEGIN { 70BEGIN {
89 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 73 if (-d $path) {
92 unshift @INC, $path; 74 unshift @INC, $path;
… …
106 88
107use Deliantra; 89use Deliantra;
108use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
109 91
110use AnyEvent::Util (); 92use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
113 95
114use Compress::LZF; 96use Compress::LZF;
115use JSON::XS; 97use JSON::XS;
116 98
117use DC; 99use DC;
… …
145 127
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
148 130
149$EV::DIED = sub { 131$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
152}; 134};
153 135
154my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
155 139
156our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
157 141
158our $LAST_REFRESH; 142our $LAST_REFRESH;
159our $NOW; 143our $NOW;
… …
181 165
182our $MAP; 166our $MAP;
183our $MAPMAP; 167our $MAPMAP;
184our $MAPWIDGET; 168our $MAPWIDGET;
185our $COMPLETER; 169our $COMPLETER;
186our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
187our $METASERVER; 174our $METASERVER;
188our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 176our $QUIT_DIALOG;
190our $HOST_ENTRY; 177our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 204our $FLOORBOX;
218our $GAUGES; 205our $GAUGES;
219our $STATWIDS; 206our $STATWIDS;
220 207
221our $SDL_ACTIVE; 208our $SDL_ACTIVE;
222our %SDL_CB; 209our @SDL_CB;
223 210
224our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 212our $STATUSBOX;
226our $MODBOX; 213our $MODBOX;
227our $DEBUG_STATUS; 214our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 222# write a crash message blockingly to the socket, if possible
236# 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.
237*crash = sub($;$) { 224*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 225 my ($msg, $backtrace) = @_;
239 226
227 warn $msg;
228
240 return unless $CONN; 229 return unless $CONN;
241 230
242 my $fh = $CONN->{fh} 231 my $fh = $CONN->{fh}
243 or return; 232 or return;
244 233
… …
254 243
255 # backtrace as second step, in case it crashes, too 244 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 246 if $backtrace;
258}; 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}
259 259
260############################################################################# 260#############################################################################
261 261
262sub status { 262sub status {
263 $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]);
… …
345 or return; 345 or return;
346 346
347 $meta->{data} 347 $meta->{data}
348 or return; 348 or return;
349 349
350 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
352 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
353 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 354 &audio_music_push ($face);
355 } 355 }
356 } else { 356 } else {
357 # fetch from database 357 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
361 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;
362 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
364 364
365 audio_sound_push ($face); 365 audio_sound_push ($face);
366 }; 366 };
… …
413 413
414 audio_music_update_volume; 414 audio_music_update_volume;
415 415
416 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
417 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
418 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
419 ? 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
420 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
421 424
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 427
425 my $NOW = time; 428 my $NOW = time;
426 429
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
537 sub audio_tab_update; 540 sub audio_tab_update;
538 audio_tab_update; 541 audio_tab_update;
539} 542}
540 543
541sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
542 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
543 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
544 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
545 553
546 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
786} 794}
787 795
788sub dc_connect { 796sub dc_connect {
789 my ($host, $port) = @_; 797 my ($host, $port) = @_;
790 798
791 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;
792 801
793 $CONN = 802 $CONN =
794 new DC::Protocol 803 new DC::Protocol
795 host => $host, 804 host => $host,
796 port => $port, 805 port => $port,
797 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
799 mapw => $mapsize, 808 mapw => $mapw,
800 maph => $mapsize, 809 maph => $maph,
801 810
811 c_version => {
812 client => "deliantra",
802 client => "$DC::VERSION $] $^O", 813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
803 817
804 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
806 map => $MAP, 820 map => $MAP,
807 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
… …
813 827
814 on_connect => sub { 828 on_connect => sub {
815 if ($_[0]) { 829 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
817 831
818 status "login successful"; 832 status "successfully connected to the server";
819 } else { 833 } else {
820 undef $CONN; 834 undef $CONN;
821 status "unable to connect: $!"; 835 status "unable to connect: $!";
822 stop_game(); 836 stop_game();
823 } 837 }
… …
825 ; 839 ;
826} 840}
827 841
828sub start_game { 842sub start_game {
829 status "logging in..."; 843 status "logging in...";
844
845 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
846 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
847 or return status "$server: unable to parse server address, try an empty field.";
830 848
831 $LOGIN_BUTTON->set_text ("Logout"); 849 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide; 850 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835 851
836 $MAP = new DC::Map; 852 $MAP = new DC::Map;
837 853
838 # hack to make SURE we find the IP address all right 854 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 855 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 856 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl 858 if ($_[0] ne "80.101.114.108") { # Perl
859 status "dns failure, trying differently";
860 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
861 unless (defined $host) {
843 status "dns failure, using hardcoded address"; 862 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 863 $host = "129.13.162.95";
864 }
845 } 865 }
846 866
847 dc_connect $host, $port; 867 dc_connect $host, $port;
848 }; 868 };
849 } else { 869 } else {
… …
875} 895}
876 896
877sub graphics_setup { 897sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 898 my $vbox = new DC::UI::VBox;
879 899
900 {
901 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
902
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 903 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 904
882 my $row = 0; 905 my $row = 0;
883 906
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 907 $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, 908 $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, 909 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 910 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 911
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 912 $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, 913 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 914 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 915 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 " 916 . "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 " 917 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 918 . "by installing the right driver for your graphics card.");
896 919
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme"); 920 $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 921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme}, 922 value => $CFG->{uitheme},
900 options => [ 923 options => [
901 [wood => "Wood (the default)"], 924 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"], 925 [plain => "Plain (very)"],
903 [blue => "Blue (dark)"], 926 [blue => "Blue (dark)"],
904 [metal => "Metal (light)"], 927 [metal => "Metal (light)"],
905 ], 928 ],
906 tooltip => "Choose the User Interface theme that you like most :)", 929 tooltip => "Choose the User Interface theme that you like most :)",
907 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 } 930 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
908 ); 931 );
909 932
910 my $vidmode_tooltip = 933 my $vidmode_tooltip =
911 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 934 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
912 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 935 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
913 936
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
915 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
916 939
917 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
941 c_rescale => 1,
918 force_w => $WIDTH * 0.1, expand => 1, 942 force_w => $WIDTH * 0.1, expand => 1,
919 range => [ ($CFG->{sdl_mode}) x 3 ], 943 range => [ ($CFG->{sdl_mode}) x 3 ],
920 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
921 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
922 height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
923 can_events => 1, tooltip => $vidmode_tooltip); 947 can_events => 1, tooltip => $vidmode_tooltip);
924 948
925 $MODE_SLIDER->connect (changed => sub { 949 $MODE_SLIDER->connect (changed => sub {
926 my ($self, $value) = @_;
927
928 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
929 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
930 });
931 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
932
933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
934 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
935 state => $CFG->{fullscreen},
936 tooltip => "Bring the client into fullscreen mode.",
937 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
938 );
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{force_opengl11},
943 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
944 . "higher memory usage and slower performance. It will, however, help tremendously on "
945 . "cards that claim to support a feature but fall back to software rendering. "
946 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
947 . "but cards and drivers from other vendors (ATI) are often just as bad. "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
950 );
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
953 $table->add_at (1, $row++, new DC::UI::CheckBox
954 state => $CFG->{disable_alpha},
955 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
956 . "by disabling a number of textures and transparency effects. Normally, these "
957 . "effects do not cost a lot of resources, but some graphics cards might fall "
958 . "back to etxremely slow rendering if this is enabled. If disabling this option "
959 . "noticably improves the framerate of the client please report this! "
960 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
961 on_changed => sub {
962 my ($self, $value) = @_; 950 my ($self, $value) = @_;
951
952 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
953 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
954 });
955 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
956
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
958 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
959 state => $CFG->{fullscreen},
960 tooltip => "Bring the client into fullscreen mode.",
961 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
962 );
963
964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
965 $table->add_at (1, $row++, new DC::UI::CheckBox
966 state => $CFG->{force_opengl11},
967 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
968 . "higher memory usage and slower performance. It will, however, help tremendously on "
969 . "cards that claim to support a feature but fall back to software rendering. "
970 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
971 . "but cards and drivers from other vendors (ATI) are often just as bad. "
972 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
974 );
975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{disable_alpha},
979 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
980 . "by disabling a number of textures and transparency effects. Normally, these "
981 . "effects do not cost a lot of resources, but some graphics cards might fall "
982 . "back to extremely slow rendering if this is enabled. If disabling this option "
983 . "noticably improves the framerate of the client please report this! "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub {
986 my ($self, $value) = @_;
963 $CFG->{disable_alpha} = $value; 987 $CFG->{disable_alpha} = $value;
964 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 988 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
989 0
965 0 990 }
966 } 991 );
967 );
968 992
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
970 $table->add_at (1, $row++, new DC::UI::CheckBox 994 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{texture_compression}, 995 state => $CFG->{texture_compression},
972 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 996 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
973 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 997 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
974 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 998 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
975 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 999 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
976 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
977 ); 1001 );
978 1002
979 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
980 $table->add_at (1, $row++, new DC::UI::CheckBox 1004 $table->add_at (1, $row++, new DC::UI::CheckBox
981 state => $CFG->{fast}, 1005 state => $CFG->{fast},
982 tooltip => "Lower the visual quality considerably to speed up rendering.", 1006 tooltip => "Lower the visual quality considerably to speed up rendering.",
983 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
984 ); 1008 );
985 1009
986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
987 $table->add_at (1, $row++, new DC::UI::Slider 1011 $table->add_at (1, $row++, new DC::UI::Slider
988 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1012 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
989 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1013 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
990 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1014 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
991 ); 1015 );
992 1016
993 $table->add_at (1, $row++, new DC::UI::Button 1017 $table->add_at (1, $row++, new DC::UI::Button
994 expand => 1, text => "Apply", 1018 expand => 1, text => "Apply",
995 tooltip => "Apply the video settings above.", 1019 tooltip => "Apply the video settings above.",
996 on_activate => sub { 1020 on_activate => sub {
997 video_shutdown (); 1021 video_shutdown ();
998 video_init (); 1022 video_init ();
1023 0
999 0 1024 }
1000 } 1025 );
1001 ); 1026 }
1002 1027
1028 {
1029 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1030
1031 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1032
1033 my $row = 0;
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1004 $table->add_at (1, $row++, new DC::UI::CheckBox 1035 $table->add_at (1, $row++, new DC::UI::CheckBox
1005 state => $CFG->{smooth_movement}, 1036 state => $CFG->{smooth_movement},
1006 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1037 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1007 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1038 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1008 . "then disable this option. Changes take effect immdiately.", 1039 . "then disable this option. Changes take effect immdiately.",
1009 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1010 ); 1041 );
1011 1042
1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1044 $table->add_at (1, $row++, new DC::UI::CheckBox
1045 state => $CFG->{smooth_transitions},
1046 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1047 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1048 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1049 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1050 );
1051
1052
1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1013 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
1014 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1015 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1017 ); 1058 );
1018 1059
1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1020 $table->add_at (1, $row++, new DC::UI::CheckBox 1061 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{map_smoothing}, 1062 state => $CFG->{map_smoothing},
1022 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1063 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1023 . "This increases load on the graphics subsystem and works only with TRT servers. " 1064 . "This increases load on the graphics subsystem and works only with TRT servers. "
1024 . "Changes take effect at next login only.", 1065 . "Changes take effect at next login only.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1026 ); 1067 );
1027 1068
1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1029 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
1030 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
1031 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1072 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1032 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1033 ); 1074 );
1034 1075
1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1077 $table->add_at (1, $row++, new DC::UI::ImageButton
1078 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1079 bg => [0.3, 0.3, 0.2],
1080 force_w => 64,
1081 force_h => 64,
1082 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.",
1083 on_activate => sub {
1084 my ($self) = @_;
1085 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1086 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1087 $MAPWIDGET->update;
1088 }
1089 );
1090
1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1091 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1036 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
1037 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1038 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1094 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1039 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1040 ); 1096 );
1041 1097
1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1043 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
1044 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1045 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1101 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1046 . "but you still need to press apply to correctly re-layout the widget.", 1102 . "but you still need to press apply to correctly re-layout the widget.",
1047 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1103 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1048 ); 1104 );
1049 1105
1050 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1106 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1051 $table->add_at (1, $row++, new DC::UI::Slider 1107 $table->add_at (1, $row++, new DC::UI::Slider
1052 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1108 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1053 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1109 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1054 on_changed => sub { 1110 on_changed => sub {
1055 $CFG->{gauge_fontsize} = $_[1]; 1111 $CFG->{gauge_fontsize} = $_[1];
1056 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
1113 0
1057 0 1114 }
1058 } 1115 );
1059 );
1060 1116
1061 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1062 $table->add_at (1, $row++, new DC::UI::Slider 1118 $table->add_at (1, $row++, new DC::UI::Slider
1063 range => [$CFG->{gauge_size}, 0.2, 0.8], 1119 range => [$CFG->{gauge_size}, 0.2, 0.8],
1064 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1120 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1065 on_changed => sub { 1121 on_changed => sub {
1066 $CFG->{gauge_size} = $_[1]; 1122 $CFG->{gauge_size} = $_[1];
1067 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1123 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1124 0
1068 0 1125 }
1069 } 1126 );
1070 ); 1127 }
1071 1128
1072 $vbox 1129 $vbox
1073} 1130}
1074 1131
1075our $AUDIO_HW_CHUNKSIZE; 1132our $AUDIO_HW_CHUNKSIZE;
… …
1088 1145
1089 my $text = !$freq 1146 my $text = !$freq
1090 ? "audio is off" 1147 ? "audio is off"
1091 : "audio is enabled\n" 1148 : "audio is enabled\n"
1092 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
1093 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1094 1153
1095 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
1096} 1155}
1097 1156
1098sub audio_setup { 1157sub audio_setup {
… …
1238} 1297}
1239 1298
1240sub make_gauge_window { 1299sub make_gauge_window {
1241 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1242 1301
1243 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1244 force_x => 0, 1303 force_x => 0,
1245 force_y => "max", 1304 force_y => "max",
1246 force_w => $WIDTH, 1305 force_w => $WIDTH,
1247 force_h => $gh, 1306 force_h => $gh,
1248 ); 1307 );
… …
1264 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1265 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1266 ], 1325 ],
1267 ); 1326 );
1268 1327
1269 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1328 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1270 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1329 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1271 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1330 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1272 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1331 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1273
1274 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1275 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1276 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1277 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1278
1279 $GAUGES = {
1280 exp => $exp, prg => $prg, sklprg => $sklprg,
1281 win => $win, range => $rng,
1282 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1283 };
1284 1332
1285 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1286 1334
1287 $win 1335 $win
1288} 1336}
… …
1629 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1677 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1630 ); 1678 );
1631 1679
1632 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1680 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1633 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1634 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1635 tooltip => "The name of your character on the server.", 1683 tooltip => "The name of your character on the server. The name is case-sensitive!",
1636 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1637 ); 1685 );
1638 1686
1639 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1687 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1640 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1641 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1642 hidden => 1, 1690 hidden => 1,
1643 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1644 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1645 ); 1693 );
1646 1694
1647 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1648 expand => 1, 1696 expand => 1,
1649 text => "Login / Register", 1697 text => "Login / Register",
… …
1685 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1686 1734
1687 $vbox->add ( 1735 $vbox->add (
1688 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1689 expand => 1, 1737 expand => 1,
1690 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1691 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1739 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1692 on_changed => sub { 1740 on_changed => sub {
1693 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1694 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1695 1 1743 1
1696 } 1744 }
1697 ); 1745 );
1698 1746
1699 if (0) { #d# disabled 1747 if (0) { #d# disabled
… …
1742 1790
1743 my $row = 0; 1791 my $row = 0;
1744 1792
1745 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1793 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1746 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1747 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1748 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1797 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1749 on_changed => sub { 1798 on_changed => sub {
1750 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1751 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
… …
1753 } 1802 }
1754 ); 1803 );
1755 1804
1756 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1805 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1757 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1806 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1807 c_colspan => 2,
1758 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1759 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1809 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1760 . "sends more messages than this number, older messages get removed to save memory and " 1810 . "sends more messages than this number, older messages get removed to save memory and "
1761 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1811 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1762 on_changed => sub { 1812 on_changed => sub {
… …
1764 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1765 0 1815 0
1766 }, 1816 },
1767 ); 1817 );
1768 1818
1819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1820 $table->add_at (1, $row, new DC::UI::CheckBox
1821 state => $CFG->{config_autosave},
1822 tooltip => "Normally, configuration settings and the user interface layout "
1823 . "are saved on client exit. You can disable this behaviour by "
1824 . "unchecking this checkbox.",
1825 on_changed => sub {
1826 my ($self, $value) = @_;
1827 $CFG->{config_autosave} = $value;
1828 0
1829 }
1830 );
1831 $table->add_at (2, $row++, new DC::UI::Button
1832 text => "Save Now",
1833 tooltip => "Use this to manually save configuration and UI layout when "
1834 . "autosave is disabled.",
1835 on_activate => sub {
1836 DC::write_cfg;
1837 0
1838 }
1839 );
1840
1769 $table 1841 $table
1770} 1842}
1771 1843
1772sub autopickup_setup { 1844sub autopickup_setup {
1773 my $r = new DC::UI::ScrolledWindow ( 1845 my $r = new DC::UI::ScrolledWindow (
… …
1779 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1780 ); 1852 );
1781 1853
1782 for ( 1854 for (
1783 ["General", 0, 0, 1855 ["General", 0, 0,
1784 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1785 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1786 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1787 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1788 ], 1859 ],
1789 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1790 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
… …
1838 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1839 } else { 1910 } else {
1840 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1841 } 1912 }
1842 1913
1843 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1844 if defined $::CONN; 1915 if defined $::CONN;
1845 1916
1846 0 1917 0
1847 }); 1918 });
1848 1919
… …
1865 }); 1936 });
1866 1937
1867 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1868 text => "set", 1939 text => "set",
1869 on_activate => sub { 1940 on_activate => sub {
1870 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1871 if defined $::CONN; 1942 if defined $::CONN;
1872 0 1943 0
1873 }); 1944 });
1874 1945
1875 $r 1946 $r
1876} 1947}
1877 1948
1878my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1879 type => sub { 1950 type => sub {
1951 use sort 'stable';
1880 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1881 }, 1953 },
1882 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1883 my $NOW = time; 1956 my $NOW = time;
1884 sort { 1957 sort {
1885 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1958 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1886 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1959 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1887 1960
1888 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1889 or $btime <=> $atime 1962 or $btime <=> $atime
1890 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1891 } @_ 1964 } @_
1892 }, 1965 },
1893 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1894 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1895 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1896 } @_ }, 1971 } @_
1972 },
1897); 1973);
1898 1974
1899sub inventory_widget { 1975sub inventory_widget {
1900 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1901 1977
… …
1988 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1989 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1990 } 2066 }
1991} 2067}
1992 2068
1993sub player_window { 2069sub make_playerbook {
1994 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1995 x => "center", 2071 x => "center",
1996 y => "center", 2072 y => "center",
1997 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1998 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
… …
2032 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
2033 2109
2034 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
2035 2111
2036 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
2037 $plwin
2038} 2113}
2039 2114
2040sub keyboard_setup { 2115sub keyboard_setup {
2041 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
2042} 2117}
2043 2118
2044sub help_window { 2119sub make_help_window {
2045 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
2046 x => 'center', 2121 x => 'center',
2047 y => 'center', 2122 y => 'center',
2048 z => 4, 2123 z => 4,
2049 name => 'doc_browser', 2124 name => 'doc_browser',
… …
2138 2213
2139 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
2140 $win->show; 2215 $win->show;
2141 }; 2216 };
2142 2217
2143 $win 2218 $HELP_WINDOW = $win;
2144}
2145
2146sub open_string_query {
2147 my ($title, $cb, $txt, $tooltip) = @_;
2148 my $dialog = new DC::UI::Toplevel
2149 x => "center",
2150 y => "center",
2151 z => 50,
2152 force_w => $WIDTH * 4/5,
2153 title => $title;
2154
2155 $dialog->add (
2156 my $e = new DC::UI::Entry
2157 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2158 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2159 tooltip => $tooltip
2160 );
2161
2162 $e->grab_focus;
2163 $e->set_text ($txt) if $txt;
2164 $dialog->show;
2165} 2219}
2166 2220
2167sub open_quit_dialog { 2221sub open_quit_dialog {
2168 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2169 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2202 2256
2203 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2204 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2205} 2259}
2206 2260
2261sub make_menubar {
2262 $MENUFRAME = new DC::UI::Toplevel
2263 border => 0,
2264 force_x => 0,
2265 force_y => 0,
2266 force_w => $::WIDTH,
2267 child => ($MENUBAR = new DC::UI::HBox),
2268 ;
2269
2270 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2271
2272 # 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
2273 make_gauge_window->show;
2274
2275# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2276# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2277
2278 make_playerbook;
2279
2280 $MENUPOPUP = DC::UI::Menu->new (items => [
2281 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2282 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2283 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2284 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2285 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2286 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2287 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2288 ["Quit…" , sub {
2289 if ($CONN) {
2290 open_quit_dialog;
2291 } else {
2292 EV::unloop EV::UNLOOP_ALL;
2293 }
2294 }],
2295 ]);
2296
2297 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2298 tooltip => "Shows the main menu",
2299 on_button_down => sub {
2300 my ($self, $ev) = @_;
2301 local $ev->{x} = 0;
2302 local $ev->{y} = 0;
2303 $MENUPOPUP->popup ($ev);
2304 },
2305 );
2306
2307 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2308 padding_x => 6,
2309 padding_y => 3,
2310 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2311 template => " Exp: 888,888,888,888 (lvl 188) ",
2312 );
2313
2314 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2315 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2316 . "will automatically pick up items as defined by your item pickup settings "
2317 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2318 . "disable autopickup by disabling this checkbox.",
2319 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2320 on_changed => sub {
2321 my ($self, $value) = @_;
2322 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2323 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2324 $CONN->send_pickup ($CFG->{pickup})
2325 if $CONN;
2326 },
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2330 c_rescale => 1,
2331 padding_x => 6,
2332 padding_y => 3,
2333 force_w => $::WIDTH * 0.2,
2334 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2335 template => "two handed weapons 99%",
2336 );
2337
2338 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2339 expand => 1,
2340 align => 1, can_hover => 1, can_events => 1,
2341 text => "Range and Combat Slots",
2342 tooltip => "#stat_ranged",
2343 );
2344
2345 $MENUFRAME->show;
2346}
2347
2348sub open_string_query {
2349 my ($title, $cb, $txt, $tooltip) = @_;
2350 my $dialog = new DC::UI::Toplevel
2351 x => "center",
2352 y => "center",
2353 z => 50,
2354 force_w => $WIDTH * 4/5,
2355 title => $title;
2356
2357 $dialog->add (
2358 my $e = new DC::UI::Entry
2359 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2360 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2361 tooltip => $tooltip
2362 );
2363
2364 $e->grab_focus;
2365 $e->set_text ($txt) if $txt;
2366 $dialog->show;
2367}
2368
2207sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2208 # find all tips 2370 # find all tips
2209 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2210 2372
2211 DC::DB::get state => "tip_of_the_day", sub { 2373 DC::DB::get state => "tip_of_the_day", sub {
… …
2350 2512
2351 (new DC::UI::Frame 2513 (new DC::UI::Frame
2352 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2353 force_x => 0, 2515 force_x => 0,
2354 force_y => "max", 2516 force_y => "max",
2355 child => (my $LR = new DC::UI::VBox), 2517 child => (my $LL = new DC::UI::VBox),
2356 )->show; 2518 )->show;
2357 2519
2358 $LR->add ($STATUSBOX); 2520 $LL->add ($STATUSBOX);
2359 $LR->add ($MODBOX); 2521 $LL->add ($MODBOX);
2360 $LR->add (new DC::UI::Label 2522 $LL->add (new DC::UI::Label
2361 align => 0, 2523 align => 0,
2362 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2363 fontsize => 0.5, 2525 fontsize => 0.5,
2364 fg => [1, 1, 0, 0.7], 2526 fg => [1, 1, 0, 0.7],
2365 ); 2527 );
2366 2528
2367 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2368 title => "Minimap", 2530 title => "Minimap",
2369 name => "mapmap", 2531 name => "mapmap",
2370 x => 0, 2532 x => 0,
2371 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2372 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2373 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2374 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 child => ($MAPMAP = new DC::MapWidget::MapMap
2375 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2376 ), 2538 ),
… …
2405 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2406 # the name is changed to not conflict with the older name as users could have hidden it 2568 # the name is changed to not conflict with the older name as users could have hidden it
2407 $MESSAGE_WINDOW = new DC::UI::Dockbar 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2408 name => "message_window2", 2570 name => "message_window2",
2409 title => 'Messages', 2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2410 force_w => $::WIDTH * 0.6, 2573 force_w => $::WIDTH * 0.6,
2411 force_h => $::HEIGHT * 0.25, 2574 force_h => $::HEIGHT * 0.25,
2412 ; 2575 ;
2413 2576
2414 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2434 . "After pressing the combo the binding will be saved automatically and the " 2597 . "After pressing the combo the binding will be saved automatically and the "
2435 . "binding editor closes"); 2598 . "binding editor closes");
2436 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2437 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2438 2601
2439 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2440 2604
2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2442 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2443
2444# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2445# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2446
2447 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
2448
2449 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2450 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2451
2452 $BUTTONBAR->add (new DC::UI::Button
2453 text => "Save Config",
2454 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2455 on_activate => sub {
2456 $::CFG->{layout} = DC::UI::get_layout;
2457 DC::write_cfg;
2458 status "Configuration Saved";
2459 0
2460 },
2461 );
2462
2463 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2464 tooltip => "View Documentation");
2465
2466 $BUTTONBAR->add (new DC::UI::Button
2467 text => "Quit",
2468 tooltip => "Terminates the program",
2469 on_activate => sub {
2470 if ($CONN) {
2471 open_quit_dialog;
2472 } else {
2473 EV::unloop EV::UNLOOP_ALL;
2474 }
2475 0
2476 },
2477 );
2478
2479 $BUTTONBAR->show;
2480 $SETUP_DIALOG->show; 2605 $SETUP_DIALOG->show;
2481 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2482 } 2607 }
2483 2608
2484 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2485 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2486 2611
2487 $CAVEAT_LABEL->set_text ("None :)"); 2612 $CAVEAT_LABEL->set_text ("None :)");
2613 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2614 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2488 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2489 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2490 2617
2491 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2492} 2619}
… …
2520my $want_refresh = EV::prepare_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2521 2648
2522my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2523 $NOW = EV::now; 2650 $NOW = EV::now;
2524 2651
2525 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2526 for DC::poll_events; 2653 for DC::poll_events;
2527 2654
2528 if (%animate_object) { 2655 if (%animate_object) {
2529 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2530 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
… …
2542sub animation_stop { 2669sub animation_stop {
2543 my ($widget) = @_; 2670 my ($widget) = @_;
2544 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2545} 2672}
2546 2673
2547%SDL_CB = (
2548 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2549 crash "SDL_QUIT"; 2675 crash "SDL_QUIT";
2550 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2551 }, 2677};
2552 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2553 },
2554 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2555 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2556 }, 2681};
2557 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2558# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# not useful, as APPACTIVE includes only iconified state, not unmapped
2559# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2684# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2560# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2561# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2562# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2563# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2564 }, 2689};
2565 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2566 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2567 # alt-enter 2692 # alt-enter
2568 video_shutdown; 2693 video_shutdown;
2569 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2570 video_init; 2695 video_init;
2571 } else { 2696 } else {
2572 &DC::UI::feed_sdl_key_down_event; 2697 &DC::UI::feed_sdl_key_down_event;
2573 } 2698 }
2574 update_modbox; 2699 update_modbox;
2575 }, 2700};
2576 DC::SDL_KEYUP => sub { 2701$SDL_CB[DC::SDL_KEYUP] = sub {
2577 &DC::UI::feed_sdl_key_up_event; 2702 &DC::UI::feed_sdl_key_up_event;
2578 update_modbox; 2703 update_modbox;
2579 }, 2704};
2580 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2581 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2582 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2583 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2584 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2585 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2586 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2587 audio_music_finished; 2712 audio_music_finished;
2588 }
2589 }, 2713 }
2590); 2714};
2591 2715
2592############################################################################# 2716#############################################################################
2593 2717
2594$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2595 EV::unloop; 2719 EV::unloop;
2596 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2597}; 2721};
2598 2722
2599# due to mac os x + sdl combined briandamage, we need this contortion 2723# due to mac os x + sdl combined braindamage, we need this contortion
2600sub main { 2724sub main {
2601 { 2725 {
2602 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2603 2727
2604 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2621 DC::DB::open_db; 2745 DC::DB::open_db;
2622 2746
2623 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2624 2748
2625 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2626 sdl_mode => undef, 2751 sdl_mode => undef,
2627 fullscreen => 1, 2752 fullscreen => 1,
2628 fast => 0, 2753 fast => 0,
2629 force_opengl11 => undef, 2754 force_opengl11 => undef,
2630 disable_alpha => 0, 2755 disable_alpha => 0,
2631 smooth_movement => 1, 2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2632 texture_compression => 1, 2758 texture_compression => 1,
2633 map_scale => 1, 2759 map_scale => 1,
2634 fow_enable => 1, 2760 fow_enable => 1,
2635 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2636 map_smoothing => 1, 2763 map_smoothing => 1,
2637 gui_fontsize => 1, 2764 gui_fontsize => 1,
2638 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2639 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2640 gauge_size => 0.35, 2767 gauge_size => 0.35,
… …
2648 effects_enable => 1, 2775 effects_enable => 1,
2649 effects_volume => 1, 2776 effects_volume => 1,
2650 bgm_enable => 1, 2777 bgm_enable => 1,
2651 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2652 output_rate => "", 2779 output_rate => "",
2653 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2654 inv_sort => "mtime", 2781 inv_sort => "mtime",
2655 default => "profile", # default profile 2782 default => "profile", # default profile
2656 show_tips => 1, 2783 show_tips => 1,
2657 logview_max_par => 1000, 2784 logview_max_par => 1000,
2658 shift_fire_stop => 0, 2785 shift_fire_stop => 0,
2659 uitheme => "wood", 2786 uitheme => "wood",
2660 ); 2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2661 2789 );
2790
2662 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2663 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2664 } 2793 }
2665 2794
2666 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2795 my @args = @ARGV;
2796
2797 my $profile = 'default';
2798
2799 for (my $i = 0; $i < @args; $i++) {
2800 if ($args[$i] =~ /^--?profile$/) {
2801 $profile = $args[$i + 1];
2802 splice @args, $i, 2, ();
2803 $i = 0;
2804 } elsif ($args[$i] =~ /^--?h/) {
2805 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2806 exit 0;
2807 }
2808 }
2809
2810 $CFG->{profile}{$profile} ||= {};
2667 $PROFILE = $CFG->{profile}{default}; 2811 $PROFILE = $CFG->{profile}{$profile};
2812 $PROFILE->{host} ||= "gameserver.deliantra.net";
2813
2814 $PROFILE->{host} = $args[0] if @args > 0;
2815 $PROFILE->{user} = $args[1] if @args > 1;
2816 $PROFILE->{password} = $args[2] if @args > 2;
2668 2817
2669 # convert old bindings (only default profile matters) 2818 # convert old bindings (only default profile matters)
2670 if (my $bindings = delete $PROFILE->{bindings}) { 2819 if (my $bindings = delete $PROFILE->{bindings}) {
2671 while (my ($mod, $syms) = each %$bindings) { 2820 while (my ($mod, $syms) = each %$bindings) {
2672 while (my ($sym, $cmds) = each %$syms) { 2821 while (my ($sym, $cmds) = each %$syms) {
… …
2678 } 2827 }
2679 } 2828 }
2680 2829
2681 sdl_init; 2830 sdl_init;
2682 2831
2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2834
2683 { 2835 {
2684 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2685 DejaVuSans.ttf 2837 DejaVuSans.ttf
2686 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2687 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2688 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2689 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2690 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2691 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2692 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2693 ); 2846 );
2694 2847
2695 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2696 2849
2697 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2698 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2699 2852
2700 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2701 2854
… …
2727 }; 2880 };
2728 2881
2729 delete $SIG{__DIE__}; 2882 delete $SIG{__DIE__};
2730 EV::loop; 2883 EV::loop;
2731 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2732#video_shutdown; 2887 #video_shutdown;
2733#audio_shutdown; 2888 #audio_shutdown;
2889
2734 DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2735 DC::SDL_Quit; 2891 DC::SDL_Quit;
2736 DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2737} 2893}
2738 2894
… …
2742 2898
2743deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2744 2900
2745=head1 SYNOPSIS 2901=head1 SYNOPSIS
2746 2902
2747Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2748 2905
2749=head1 USAGE 2906=head1 USAGE
2750 2907
2751deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2908The deliantra client utilises OpenGL for all UI elements and the game. It
2752be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2753 2910
2754=head1 DEBUGGING 2911=head1 DEBUGGING
2755
2756 2912
2757CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2758 2914
2759 1 draw borders around widgets 2915 1 draw borders around widgets
2760 2 add low-level widget info to tooltips 2916 2 add low-level widget info to tooltips

Diff Legend

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