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.108 by root, Thu Apr 8 04:49:32 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
811 version => {
812 client => "deliantra",
803 client => "$DC::VERSION $] $^O", 813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
804 817
805 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
807 map => $MAP, 820 map => $MAP,
808 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
… …
814 827
815 on_connect => sub { 828 on_connect => sub {
816 if ($_[0]) { 829 if ($_[0]) {
817 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
818 831
819 status "login successful"; 832 status "successfully connected to the server";
820 } else { 833 } else {
821 undef $CONN; 834 undef $CONN;
822 status "unable to connect: $!"; 835 status "unable to connect: $!";
823 stop_game(); 836 stop_game();
824 } 837 }
… …
826 ; 839 ;
827} 840}
828 841
829sub start_game { 842sub start_game {
830 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.";
831 848
832 $LOGIN_BUTTON->set_text ("Logout"); 849 $LOGIN_BUTTON->set_text ("Logout");
833 $SETUP_DIALOG->hide; 850 $SETUP_DIALOG->hide;
834
835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
836 851
837 $MAP = new DC::Map; 852 $MAP = new DC::Map;
838 853
839 # hack to make SURE we find the IP address all right 854 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable. 855 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") { 856 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 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) {
844 status "dns failure, using hardcoded address"; 862 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95"; 863 $host = "129.13.162.95";
864 }
846 } 865 }
847 866
848 dc_connect $host, $port; 867 dc_connect $host, $port;
849 }; 868 };
850 } else { 869 } else {
… …
876} 895}
877 896
878sub graphics_setup { 897sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 898 my $vbox = new DC::UI::VBox;
880 899
900 {
901 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
902
881 $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]);
882 904
883 my $row = 0; 905 my $row = 0;
884 906
885 $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");
886 $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,
887 can_events => 1, 909 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 910 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 911
890 $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");
891 $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,
892 can_events => 1, 914 can_events => 1,
893 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 "
894 . "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 "
895 . "by selecting a different video mode, changing the settings below or " 917 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 918 . "by installing the right driver for your graphics card.");
897 919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
922 value => $CFG->{uitheme},
923 options => [
924 [wood => "Wood (the default)"],
925 [plain => "Plain (very)"],
926 [blue => "Blue (dark)"],
927 [metal => "Metal (light)"],
928 ],
929 tooltip => "Choose the User Interface theme that you like most :)",
930 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
931 );
932
898 my $vidmode_tooltip = 933 my $vidmode_tooltip =
899 "<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). "
900 . "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>.";
901 936
902 $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");
903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 939
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
941 c_rescale => 1,
906 force_w => $WIDTH * 0.1, expand => 1, 942 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 943 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 947 can_events => 1, tooltip => $vidmode_tooltip);
912 948
913 $MODE_SLIDER->connect (changed => sub { 949 $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) = @_; 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) = @_;
951 $CFG->{disable_alpha} = $value; 987 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 988 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
989 0
953 0 990 }
954 } 991 );
955 );
956 992
957 $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");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 994 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 995 state => $CFG->{texture_compression},
960 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 "
961 . "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). "
962 . "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 "
963 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 999 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 1001 );
966 1002
967 $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");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 1004 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 1005 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 1006 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 1008 );
973 1009
974 $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");
975 $table->add_at (1, $row++, new DC::UI::Slider 1011 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1012 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.", 1013 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 }, 1014 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 1015 );
980 1016
981 $table->add_at (1, $row++, new DC::UI::Button 1017 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 1018 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 1019 tooltip => "Apply the video settings above.",
984 on_activate => sub { 1020 on_activate => sub {
985 video_shutdown (); 1021 video_shutdown ();
986 video_init (); 1022 video_init ();
1023 0
987 0 1024 }
988 } 1025 );
989 ); 1026 }
990 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;
991 $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");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1035 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1036 state => $CFG->{smooth_movement},
994 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. "
995 . "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, "
996 . "then disable this option. Changes take effect immdiately.", 1039 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1041 );
999 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
1000 $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");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 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 }
1005 ); 1058 );
1006 1059
1007 $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");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1061 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1062 state => $CFG->{map_smoothing},
1010 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. "
1011 . "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. "
1012 . "Changes take effect at next login only.", 1065 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1067 );
1015 1068
1016 $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");
1017 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
1019 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.",
1020 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1074 );
1022 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
1023 $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");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 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.", 1094 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 } 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1096 );
1029 1097
1030 $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");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1100 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, " 1101 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.", 1102 . "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 }, 1103 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1036 ); 1104 );
1037 1105
1038 $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");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1107 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1108 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.", 1109 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1042 on_changed => sub { 1110 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1111 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
1113 0
1045 0 1114 }
1046 } 1115 );
1047 );
1048 1116
1049 $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");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1118 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1119 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 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.",
1053 on_changed => sub { 1121 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1122 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1123 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1124 0
1056 0 1125 }
1057 } 1126 );
1058 ); 1127 }
1059 1128
1060 $vbox 1129 $vbox
1061} 1130}
1062 1131
1063our $AUDIO_HW_CHUNKSIZE; 1132our $AUDIO_HW_CHUNKSIZE;
… …
1076 1145
1077 my $text = !$freq 1146 my $text = !$freq
1078 ? "audio is off" 1147 ? "audio is off"
1079 : "audio is enabled\n" 1148 : "audio is enabled\n"
1080 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
1081 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1082 1153
1083 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
1084} 1155}
1085 1156
1086sub audio_setup { 1157sub audio_setup {
… …
1226} 1297}
1227 1298
1228sub make_gauge_window { 1299sub make_gauge_window {
1229 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1230 1301
1231 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1232 force_x => 0, 1303 force_x => 0,
1233 force_y => "max", 1304 force_y => "max",
1234 force_w => $WIDTH, 1305 force_w => $WIDTH,
1235 force_h => $gh, 1306 force_h => $gh,
1236 ); 1307 );
… …
1252 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1253 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1254 ], 1325 ],
1255 ); 1326 );
1256 1327
1257 $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");
1258 $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");
1259 $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");
1260 $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");
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 1332
1273 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1274 1334
1275 $win 1335 $win
1276} 1336}
… …
1617 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]),
1618 ); 1678 );
1619 1679
1620 $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");
1621 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1622 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1623 tooltip => "The name of your character on the server.", 1683 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 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1625 ); 1685 );
1626 1686
1627 $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");
1628 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1629 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1630 hidden => 1, 1690 hidden => 1,
1631 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1632 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1633 ); 1693 );
1634 1694
1635 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1636 expand => 1, 1696 expand => 1,
1637 text => "Login / Register", 1697 text => "Login / Register",
… …
1673 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1674 1734
1675 $vbox->add ( 1735 $vbox->add (
1676 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1677 expand => 1, 1737 expand => 1,
1678 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1679 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>)",
1680 on_changed => sub { 1740 on_changed => sub {
1681 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1682 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1683 1 1743 1
1684 } 1744 }
1685 ); 1745 );
1686 1746
1687 if (0) { #d# disabled 1747 if (0) { #d# disabled
… …
1730 1790
1731 my $row = 0; 1791 my $row = 0;
1732 1792
1733 $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");
1734 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1735 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1736 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?",
1737 on_changed => sub { 1798 on_changed => sub {
1738 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1739 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
… …
1741 } 1802 }
1742 ); 1803 );
1743 1804
1744 $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");
1745 $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,
1746 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1747 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 "
1748 . "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 "
1749 . "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.",
1750 on_changed => sub { 1812 on_changed => sub {
… …
1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1753 0 1815 0
1754 }, 1816 },
1755 ); 1817 );
1756 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
1757 $table 1841 $table
1758} 1842}
1759 1843
1760sub autopickup_setup { 1844sub autopickup_setup {
1761 my $r = new DC::UI::ScrolledWindow ( 1845 my $r = new DC::UI::ScrolledWindow (
… …
1767 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1768 ); 1852 );
1769 1853
1770 for ( 1854 for (
1771 ["General", 0, 0, 1855 ["General", 0, 0,
1772 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1773 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1774 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1775 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1776 ], 1859 ],
1777 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1778 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
… …
1826 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1827 } else { 1910 } else {
1828 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1829 } 1912 }
1830 1913
1831 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1832 if defined $::CONN; 1915 if defined $::CONN;
1833 1916
1834 0 1917 0
1835 }); 1918 });
1836 1919
… …
1853 }); 1936 });
1854 1937
1855 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1856 text => "set", 1939 text => "set",
1857 on_activate => sub { 1940 on_activate => sub {
1858 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1859 if defined $::CONN; 1942 if defined $::CONN;
1860 0 1943 0
1861 }); 1944 });
1862 1945
1863 $r 1946 $r
1864} 1947}
1865 1948
1866my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1867 type => sub { 1950 type => sub {
1951 use sort 'stable';
1868 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1869 }, 1953 },
1870 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1871 my $NOW = time; 1956 my $NOW = time;
1872 sort { 1957 sort {
1873 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;
1874 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;
1875 1960
1876 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1877 or $btime <=> $atime 1962 or $btime <=> $atime
1878 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1879 } @_ 1964 } @_
1880 }, 1965 },
1881 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1882 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1883 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1884 } @_ }, 1971 } @_
1972 },
1885); 1973);
1886 1974
1887sub inventory_widget { 1975sub inventory_widget {
1888 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1889 1977
… …
1976 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1977 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1978 } 2066 }
1979} 2067}
1980 2068
1981sub player_window { 2069sub make_playerbook {
1982 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1983 x => "center", 2071 x => "center",
1984 y => "center", 2072 y => "center",
1985 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1986 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
… …
2020 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
2021 2109
2022 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
2023 2111
2024 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
2025 $plwin
2026} 2113}
2027 2114
2028sub keyboard_setup { 2115sub keyboard_setup {
2029 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
2030} 2117}
2031 2118
2032sub help_window { 2119sub make_help_window {
2033 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
2034 x => 'center', 2121 x => 'center',
2035 y => 'center', 2122 y => 'center',
2036 z => 4, 2123 z => 4,
2037 name => 'doc_browser', 2124 name => 'doc_browser',
… …
2126 2213
2127 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
2128 $win->show; 2215 $win->show;
2129 }; 2216 };
2130 2217
2131 $win 2218 $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} 2219}
2154 2220
2155sub open_quit_dialog { 2221sub open_quit_dialog {
2156 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2157 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2190 2256
2191 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2192 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2193} 2259}
2194 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
2195sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2196 # find all tips 2370 # find all tips
2197 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2198 2372
2199 DC::DB::get state => "tip_of_the_day", sub { 2373 DC::DB::get state => "tip_of_the_day", sub {
… …
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2424 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n"; 2425 and die "SDL::Init failed!\n";
2252} 2426}
2253 2427
2254sub video_init { 2428sub video_init {
2429 DC::set_theme $CFG->{uitheme};
2430
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2431 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2432 $SDL_REINIT = 0;
2257 2433
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2434 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2435 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2439 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264 2440
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2441 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2442 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2443
2268 # now choose biggets mode <= 1024x768 2444 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2445 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2446 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2447 $CFG->{sdl_mode} = $_;
2272 } 2448 }
2273 } 2449 }
… …
2336 2512
2337 (new DC::UI::Frame 2513 (new DC::UI::Frame
2338 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2339 force_x => 0, 2515 force_x => 0,
2340 force_y => "max", 2516 force_y => "max",
2341 child => (my $LR = new DC::UI::VBox), 2517 child => (my $LL = new DC::UI::VBox),
2342 )->show; 2518 )->show;
2343 2519
2344 $LR->add ($STATUSBOX); 2520 $LL->add ($STATUSBOX);
2345 $LR->add ($MODBOX); 2521 $LL->add ($MODBOX);
2346 $LR->add (new DC::UI::Label 2522 $LL->add (new DC::UI::Label
2347 align => 0, 2523 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5, 2525 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7], 2526 fg => [1, 1, 0, 0.7],
2351 ); 2527 );
2352 2528
2353 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2354 title => "Minimap", 2530 title => "Minimap",
2355 name => "mapmap", 2531 name => "mapmap",
2356 x => 0, 2532 x => 0,
2357 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2358 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 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.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2362 ), 2538 ),
2363 )->show; 2539 )->show;
2364 2540
2365 $MAPWIDGET = new DC::MapWidget; 2541 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2542 $MAPWIDGET->connect (activate_console => sub {
… …
2391 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2392 # 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
2393 $MESSAGE_WINDOW = new DC::UI::Dockbar 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2", 2570 name => "message_window2",
2395 title => 'Messages', 2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2396 force_w => $::WIDTH * 0.6, 2573 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25, 2574 force_h => $::HEIGHT * 0.25,
2398 ; 2575 ;
2399 2576
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2420 . "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 "
2421 . "binding editor closes"); 2598 . "binding editor closes");
2422 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2423 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2424 2601
2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2426 2604
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; 2605 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2468 } 2607 }
2469 2608
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2611
2473 $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;
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476 2617
2477 $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]);
2478} 2619}
… …
2506my $want_refresh = EV::prepare_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2507 2648
2508my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2509 $NOW = EV::now; 2650 $NOW = EV::now;
2510 2651
2511 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2512 for DC::poll_events; 2653 for DC::poll_events;
2513 2654
2514 if (%animate_object) { 2655 if (%animate_object) {
2515 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2516 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
… …
2528sub animation_stop { 2669sub animation_stop {
2529 my ($widget) = @_; 2670 my ($widget) = @_;
2530 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2531} 2672}
2532 2673
2533%SDL_CB = (
2534 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2535 crash "SDL_QUIT"; 2675 crash "SDL_QUIT";
2536 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2537 }, 2677};
2538 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2539 },
2540 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2541 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2542 }, 2681};
2543 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2544# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# 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# 2684# 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# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2547# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2548# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2550 }, 2689};
2551 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2553 # alt-enter 2692 # alt-enter
2554 video_shutdown; 2693 video_shutdown;
2555 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2556 video_init; 2695 video_init;
2557 } else { 2696 } else {
2558 &DC::UI::feed_sdl_key_down_event; 2697 &DC::UI::feed_sdl_key_down_event;
2559 } 2698 }
2560 update_modbox; 2699 update_modbox;
2561 }, 2700};
2562 DC::SDL_KEYUP => sub { 2701$SDL_CB[DC::SDL_KEYUP] = sub {
2563 &DC::UI::feed_sdl_key_up_event; 2702 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox; 2703 update_modbox;
2565 }, 2704};
2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2569 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2570 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2571 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2572 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2573 audio_music_finished; 2712 audio_music_finished;
2574 }
2575 }, 2713 }
2576); 2714};
2577 2715
2578############################################################################# 2716#############################################################################
2579 2717
2580$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2581 EV::unloop; 2719 EV::unloop;
2582 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2583}; 2721};
2584 2722
2585# 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
2586sub main { 2724sub main {
2587 { 2725 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589 2727
2590 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2607 DC::DB::open_db; 2745 DC::DB::open_db;
2608 2746
2609 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2610 2748
2611 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2612 sdl_mode => undef, 2751 sdl_mode => undef,
2613 fullscreen => 1, 2752 fullscreen => 1,
2614 fast => 0, 2753 fast => 0,
2615 force_opengl11 => undef, 2754 force_opengl11 => undef,
2616 disable_alpha => 0, 2755 disable_alpha => 0,
2617 smooth_movement => 1, 2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2618 texture_compression => 1, 2758 texture_compression => 1,
2619 map_scale => 1, 2759 map_scale => 1,
2620 fow_enable => 1, 2760 fow_enable => 1,
2621 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2622 map_smoothing => 1, 2763 map_smoothing => 1,
2623 gui_fontsize => 1, 2764 gui_fontsize => 1,
2624 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2625 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2626 gauge_size => 0.35, 2767 gauge_size => 0.35,
… …
2634 effects_enable => 1, 2775 effects_enable => 1,
2635 effects_volume => 1, 2776 effects_volume => 1,
2636 bgm_enable => 1, 2777 bgm_enable => 1,
2637 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2638 output_rate => "", 2779 output_rate => "",
2639 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2640 inv_sort => "mtime", 2781 inv_sort => "mtime",
2641 default => "profile", # default profile 2782 default => "profile", # default profile
2642 show_tips => 1, 2783 show_tips => 1,
2643 logview_max_par => 1000, 2784 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2785 shift_fire_stop => 0,
2645 ); 2786 uitheme => "wood",
2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2646 2789 );
2790
2647 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2793 }
2650 2794
2651 $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} ||= {};
2652 $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;
2653 2817
2654 # convert old bindings (only default profile matters) 2818 # convert old bindings (only default profile matters)
2655 if (my $bindings = delete $PROFILE->{bindings}) { 2819 if (my $bindings = delete $PROFILE->{bindings}) {
2656 while (my ($mod, $syms) = each %$bindings) { 2820 while (my ($mod, $syms) = each %$bindings) {
2657 while (my ($sym, $cmds) = each %$syms) { 2821 while (my ($sym, $cmds) = each %$syms) {
… …
2663 } 2827 }
2664 } 2828 }
2665 2829
2666 sdl_init; 2830 sdl_init;
2667 2831
2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2834
2668 { 2835 {
2669 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2670 DejaVuSans.ttf 2837 DejaVuSans.ttf
2671 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2672 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2673 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2674 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2675 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2676 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2677 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2678 ); 2846 );
2679 2847
2680 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2681 2849
2682 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2683 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2684 2852
2685 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2686 2854
… …
2712 }; 2880 };
2713 2881
2714 delete $SIG{__DIE__}; 2882 delete $SIG{__DIE__};
2715 EV::loop; 2883 EV::loop;
2716 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2717#video_shutdown; 2887 #video_shutdown;
2718#audio_shutdown; 2888 #audio_shutdown;
2889
2719 DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2720 DC::SDL_Quit; 2891 DC::SDL_Quit;
2721 DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2722} 2893}
2723 2894
… …
2727 2898
2728deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2729 2900
2730=head1 SYNOPSIS 2901=head1 SYNOPSIS
2731 2902
2732Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2733 2905
2734=head1 USAGE 2906=head1 USAGE
2735 2907
2736deliantra 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
2737be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2738 2910
2739=head1 DEBUGGING 2911=head1 DEBUGGING
2740
2741 2912
2742CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2743 2914
2744 1 draw borders around widgets 2915 1 draw borders around widgets
2745 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