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.116 by root, Sun May 2 21:22:20 2010 UTC

… …
21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 require AnyEvent::DNS;
29 AnyEvent::DNS::resolver ();
30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
49 } 53 }
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 58 } else {
75 # OS X 59 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
81 symlink "libjpeg.62.dylib", "libjpeg.dylib";
82 } 63 }
83 64
84 unshift @INC, $root; 65 unshift @INC, $root;
85 } 66 }
86} 67}
87 68
88# prepend private library directory 69# prepend private library directory and prepare env
89BEGIN { 70BEGIN {
90 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
91 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
92 if (-d $path) { 73 if (-d $path) {
93 unshift @INC, $path; 74 unshift @INC, $path;
… …
107 88
108use Deliantra; 89use Deliantra;
109use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
110 91
111use AnyEvent::Util (); 92use AnyEvent::Util ();
112use AnyEvent::DNS;
113use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
114 95
115use Compress::LZF; 96use Compress::LZF;
116use JSON::XS; 97use JSON::XS;
117 98
118use DC; 99use DC;
… …
146 127
147$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
148$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
149 130
150$EV::DIED = sub { 131$EV::DIED = sub {
151 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
152 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
153}; 134};
154 135
155my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
156 139
157our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
158 141
159our $LAST_REFRESH; 142our $LAST_REFRESH;
160our $NOW; 143our $NOW;
161 144
162our $CFG; 145our $CFG;
163our $PROFILE; # current profile 146our $PROFILE; # current profile
164our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
165 149
166our $WANT_REFRESH; 150our $WANT_REFRESH;
167 151
168our $MODE_SLIDER; 152our $MODE_SLIDER;
169our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
182 166
183our $MAP; 167our $MAP;
184our $MAPMAP; 168our $MAPMAP;
185our $MAPWIDGET; 169our $MAPWIDGET;
186our $COMPLETER; 170our $COMPLETER;
187our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
188our $METASERVER; 175our $METASERVER;
189our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
190our $QUIT_DIALOG; 177our $QUIT_DIALOG;
191our $HOST_ENTRY; 178our $HOST_ENTRY;
192our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
218our $FLOORBOX; 205our $FLOORBOX;
219our $GAUGES; 206our $GAUGES;
220our $STATWIDS; 207our $STATWIDS;
221 208
222our $SDL_ACTIVE; 209our $SDL_ACTIVE;
223our %SDL_CB; 210our @SDL_CB;
224 211
225our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
226our $STATUSBOX; 213our $STATUSBOX;
227our $MODBOX; 214our $MODBOX;
228our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
236# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) { 225*crash = sub($;$) {
239 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
240 227
228 warn $msg;
229
241 return unless $CONN; 230 return unless $CONN;
242 231
243 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
244 or return; 233 or return;
245 234
… …
255 244
256 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
257 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace; 247 if $backtrace;
259}; 248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
260 260
261############################################################################# 261#############################################################################
262 262
263sub status { 263sub status {
264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
346 or return; 346 or return;
347 347
348 $meta->{data} 348 $meta->{data}
349 or return; 349 or return;
350 350
351 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
352 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
354 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
355 &audio_music_push ($face); 355 &audio_music_push ($face);
356 } 356 }
357 } else { 357 } else {
358 # fetch from database 358 # fetch from database
359 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
360 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
361 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
363 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
364 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
365 365
366 audio_sound_push ($face); 366 audio_sound_push ($face);
367 }; 367 };
… …
414 414
415 audio_music_update_volume; 415 audio_music_update_volume;
416 416
417 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
418 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
419 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
420 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
421 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
422 425
423 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
424 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
425 428
426 my $NOW = time; 429 my $NOW = time;
427 430
428 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
429 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
515 audio_music_push; 518 audio_music_push;
516} 519}
517 520
518sub audio_init { 521sub audio_init {
519 if ($CFG->{audio_enable}) { 522 if ($CFG->{audio_enable}) {
523 if (length $CFG->{audio_driver}) {
524 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
525 DC::SDL_Init DC::SDL_INIT_AUDIO
526 and die "SDL::Init failed!\n";
527 } else {
528 DC::SDL_Init DC::SDL_INIT_AUDIO
529 and die "SDL::Init failed!\n";
530 }
531
520 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
521 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
522 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
523 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
524 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
… …
538 sub audio_tab_update; 550 sub audio_tab_update;
539 audio_tab_update; 551 audio_tab_update;
540} 552}
541 553
542sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
543 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
544 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
545 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
546 563
547 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
… …
549 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
550 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
551 568
552 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
553 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
554} 573}
555 574
556############################################################################# 575#############################################################################
557 576
558sub destroy_query_dialog { 577sub destroy_query_dialog {
… …
787} 806}
788 807
789sub dc_connect { 808sub dc_connect {
790 my ($host, $port) = @_; 809 my ($host, $port) = @_;
791 810
792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 811 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
812 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
793 813
794 $CONN = 814 $CONN =
795 new DC::Protocol 815 new DC::Protocol
796 host => $host, 816 host => $host,
797 port => $port, 817 port => $port,
798 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
799 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
800 mapw => $mapsize, 820 mapw => $mapw,
801 maph => $mapsize, 821 maph => $maph,
802 822
823 c_version => {
824 client => "deliantra",
803 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
804 829
805 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
807 map => $MAP, 832 map => $MAP,
808 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
… …
814 839
815 on_connect => sub { 840 on_connect => sub {
816 if ($_[0]) { 841 if ($_[0]) {
817 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
818 843
819 status "login successful"; 844 status "successfully connected to the server";
820 } else { 845 } else {
821 undef $CONN; 846 undef $CONN;
822 status "unable to connect: $!"; 847 status "unable to connect: $!";
823 stop_game(); 848 stop_game();
824 } 849 }
… …
826 ; 851 ;
827} 852}
828 853
829sub start_game { 854sub start_game {
830 status "logging in..."; 855 status "logging in...";
856
857 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
858 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
859 or return status "$server: unable to parse server address, try an empty field.";
831 860
832 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
833 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
834
835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
836 863
837 $MAP = new DC::Map; 864 $MAP = new DC::Map;
838 865
839 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 if ($_[0] ne "80.101.114.108") { # Perl 870 if ($_[0] ne "80.101.114.108") { # P-e-r-l
871 status "dns failure, trying differently";
872 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
873 unless (defined $host) {
844 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
846 } 877 }
847 878
848 dc_connect $host, $port; 879 dc_connect $host, $port;
849 }; 880 };
850 } else { 881 } else {
… …
876} 907}
877 908
878sub graphics_setup { 909sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 910 my $vbox = new DC::UI::VBox;
880 911
912 {
913 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
914
881 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 915 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
882 916
883 my $row = 0; 917 my $row = 0;
884 918
885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 919 $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, 920 $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, 921 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 922 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 923
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 924 $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, 925 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1, 926 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as " 927 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 " 928 . "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 " 929 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 930 . "by installing the right driver for your graphics card.");
897 931
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
933 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
934 value => $CFG->{uitheme},
935 options => [
936 [wood => "Wood (the default)"],
937 [plain => "Plain (very)"],
938 [blue => "Blue (dark)"],
939 [metal => "Metal (light)"],
940 ],
941 tooltip => "Choose the User Interface theme that you like most :)",
942 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
943 );
944
898 my $vidmode_tooltip = 945 my $vidmode_tooltip =
899 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 946 "<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>."; 947 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
901 948
902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 949 $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); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 951
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
906 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
912 960
913 $MODE_SLIDER->connect (changed => sub { 961 $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) = @_; 962 my ($self, $value) = @_;
963
964 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
965 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
966 });
967 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
968
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
970 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
971 state => $CFG->{fullscreen},
972 tooltip => "Bring the client into fullscreen mode.",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
974 );
975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{force_opengl11},
979 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
980 . "higher memory usage and slower performance. It will, however, help tremendously on "
981 . "cards that claim to support a feature but fall back to software rendering. "
982 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
983 . "but cards and drivers from other vendors (ATI) are often just as bad. "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
986 );
987
988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
989 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{disable_alpha},
991 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
992 . "by disabling a number of textures and transparency effects. Normally, these "
993 . "effects do not cost a lot of resources, but some graphics cards might fall "
994 . "back to extremely slow rendering if this is enabled. If disabling this option "
995 . "noticably improves the framerate of the client please report this! "
996 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
997 on_changed => sub {
998 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value; 999 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 1000 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
1001 0
953 0 1002 }
954 } 1003 );
955 );
956 1004
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 1008 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). " 1009 . "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 " 1010 . "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.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 1013 );
966 1014
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 1017 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 1020 );
973 1021
974 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
975 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 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.", 1025 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 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 1027 );
980 1028
981 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 1030 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
984 on_activate => sub { 1032 on_activate => sub {
985 video_shutdown (); 1033 video_shutdown ();
986 video_init (); 1034 video_init ();
1035 0
987 0 1036 }
988 } 1037 );
989 ); 1038 }
990 1039
1040 {
1041 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1042
1043 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1044
1045 my $row = 0;
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1048 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1049 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, " 1050 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1053 );
999 1054
1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1056 $table->add_at (1, $row++, new DC::UI::CheckBox
1057 state => $CFG->{smooth_transitions},
1058 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1059 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1060 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1061 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1062 );
1063
1064
1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1005 ); 1070 );
1006 1071
1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
1010 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1075 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. " 1076 . "This increases load on the graphics subsystem and works only with TRT servers. "
1012 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1079 );
1015 1080
1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1081 $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 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
1019 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1084 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 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1086 );
1022 1087
1088 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1089 $table->add_at (1, $row++, new DC::UI::ImageButton
1090 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1091 bg => [0.3, 0.3, 0.2],
1092 force_w => 64,
1093 force_h => 64,
1094 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.",
1095 on_activate => sub {
1096 my ($self) = @_;
1097 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1098 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1099 $MAPWIDGET->update;
1100 }
1101 );
1102
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 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.", 1106 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 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1108 );
1029 1109
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1110 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 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, " 1113 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.", 1114 . "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 }, 1115 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1036 ); 1116 );
1037 1117
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 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.", 1121 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1042 on_changed => sub { 1122 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
1045 0 1126 }
1046 } 1127 );
1047 );
1048 1128
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1129 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1132 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1133 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
1056 0 1137 }
1057 } 1138 );
1058 ); 1139 }
1059 1140
1060 $vbox 1141 $vbox
1061} 1142}
1062 1143
1063our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
… …
1075 ]); 1156 ]);
1076 1157
1077 my $text = !$freq 1158 my $text = !$freq
1078 ? "audio is off" 1159 ? "audio is off"
1079 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1080 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1081 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1082 1166
1083 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1084} 1168}
1085 1169
1086sub audio_setup { 1170sub audio_setup {
… …
1089 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1173 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
1090 1174
1091 my $row = 0; 1175 my $row = 0;
1092 1176
1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable"); 1177 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
1094 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1095 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1096 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1180 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
1097 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1181 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
1182 );
1183 $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
1184
1185 $driver->add (new DC::UI::Label align => 1, text => " Audio driver override");
1186 $driver->add (new DC::UI::Entry
1187 text => $CFG->{audio_driver},
1188 template => "dsound1234",
1189 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1190 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1191 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1192 . "or other system-specific drivers. Selecting the wrong driver here will simply result"
1193 . "in no sound.",
1194 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1098 ); 1195 );
1099 1196
1100 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1197 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
1101 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1102 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
… …
1115 ); 1212 );
1116 1213
1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1214 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1118 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1119 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1120 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1217 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1121 on_changed => sub { 1218 on_changed => sub {
1122 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1123 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1124 audio_music_push; 1221 audio_music_push;
1125 1 1222 1
… …
1136 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1137 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1138 options => [ 1235 options => [
1139 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1140 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1141 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1142 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1143 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1144 ], 1241 ],
1145 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1242 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1146 on_changed => sub { 1243 on_changed => sub {
1147 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1148 audio_tab_update; 1245 audio_tab_update;
… …
1172 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency"); 1269 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1173 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1270 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1174 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1175 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1176 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1273 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1177 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1178 on_changed => sub { 1275 on_changed => sub {
1179 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1180 audio_tab_update; 1277 audio_tab_update;
1181 1 1278 1
1182 } 1279 }
… …
1226} 1323}
1227 1324
1228sub make_gauge_window { 1325sub make_gauge_window {
1229 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1230 1327
1231 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1232 force_x => 0, 1329 force_x => 0,
1233 force_y => "max", 1330 force_y => "max",
1234 force_w => $WIDTH, 1331 force_w => $WIDTH,
1235 force_h => $gh, 1332 force_h => $gh,
1236 ); 1333 );
… …
1252 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1253 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1254 ], 1351 ],
1255 ); 1352 );
1256 1353
1257 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1354 $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"); 1355 $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"); 1356 $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"); 1357 $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 1358
1273 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1274 1360
1275 $win 1361 $win
1362}
1363
1364our $BW_WATCHER;
1365
1366sub debug_toggle($) {
1367 $DELIANTRA_DEBUG ^= $_[0];
1368
1369 if ($DELIANTRA_DEBUG & 16) {
1370 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1371 return unless $CONN;
1372 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1373 $CONN->{octets_in} = 0;
1374 };
1375 } else {
1376 undef $BW_WATCHER;
1377 }
1378
1276} 1379}
1277 1380
1278sub debug_setup { 1381sub debug_setup {
1279 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1280 1383
1281 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1384 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1282 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1385 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1283 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1386 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1284 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1387 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1285 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1388 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1286 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1389 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1287 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1390 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1288 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1391 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1392 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1393 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1394
1289 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1395 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1290
1291 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1396 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1292 1397
1293 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1398 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1294 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1399 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1295 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1400 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1296 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1401 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1617 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1722 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1618 ); 1723 );
1619 1724
1620 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1725 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1621 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1622 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1623 tooltip => "The name of your character on the server.", 1728 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 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1625 ); 1730 );
1626 1731
1627 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1732 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1628 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1629 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1630 hidden => 1, 1735 hidden => 1,
1631 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1632 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1633 ); 1738 );
1634 1739
1635 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1636 expand => 1, 1741 expand => 1,
1637 text => "Login / Register", 1742 text => "Login / Register",
… …
1673 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1674 1779
1675 $vbox->add ( 1780 $vbox->add (
1676 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1677 expand => 1, 1782 expand => 1,
1678 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1679 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1784 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1680 on_changed => sub { 1785 on_changed => sub {
1681 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1682 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1683 1 1788 1
1684 } 1789 }
1685 ); 1790 );
1686 1791
1687 if (0) { #d# disabled 1792 if (0) { #d# disabled
… …
1730 1835
1731 my $row = 0; 1836 my $row = 0;
1732 1837
1733 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1838 $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 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1735 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1736 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1842 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1737 on_changed => sub { 1843 on_changed => sub {
1738 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1739 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
… …
1741 } 1847 }
1742 ); 1848 );
1743 1849
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1850 $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 1851 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1852 c_colspan => 2,
1746 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1747 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1854 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 " 1855 . "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.", 1856 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1750 on_changed => sub { 1857 on_changed => sub {
… …
1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1753 0 1860 0
1754 }, 1861 },
1755 ); 1862 );
1756 1863
1864 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1865 $table->add_at (1, $row, new DC::UI::CheckBox
1866 state => $CFG->{config_autosave},
1867 tooltip => "Normally, configuration settings and the user interface layout "
1868 . "are saved on client exit. You can disable this behaviour by "
1869 . "unchecking this checkbox.",
1870 on_changed => sub {
1871 my ($self, $value) = @_;
1872 $CFG->{config_autosave} = $value;
1873 0
1874 }
1875 );
1876 $table->add_at (2, $row++, new DC::UI::Button
1877 text => "Save Now",
1878 tooltip => "Use this to manually save configuration and UI layout when "
1879 . "autosave is disabled.",
1880 on_activate => sub {
1881 DC::write_cfg;
1882 0
1883 }
1884 );
1885
1757 $table 1886 $table
1758} 1887}
1759 1888
1760sub autopickup_setup { 1889sub autopickup_setup {
1761 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
… …
1767 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1768 ); 1897 );
1769 1898
1770 for ( 1899 for (
1771 ["General", 0, 0, 1900 ["General", 0, 0,
1772 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1773 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1774 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1775 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1776 ], 1904 ],
1777 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1778 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
… …
1826 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1827 } else { 1955 } else {
1828 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1829 } 1957 }
1830 1958
1831 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1832 if defined $::CONN; 1960 if defined $::CONN;
1833 1961
1834 0 1962 0
1835 }); 1963 });
1836 1964
… …
1853 }); 1981 });
1854 1982
1855 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1856 text => "set", 1984 text => "set",
1857 on_activate => sub { 1985 on_activate => sub {
1858 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1859 if defined $::CONN; 1987 if defined $::CONN;
1860 0 1988 0
1861 }); 1989 });
1862 1990
1863 $r 1991 $r
1864} 1992}
1865 1993
1866my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1867 type => sub { 1995 type => sub {
1996 use sort 'stable';
1868 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1869 }, 1998 },
1870 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1871 my $NOW = time; 2001 my $NOW = time;
1872 sort { 2002 sort {
1873 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 2003 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; 2004 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1875 2005
1876 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1877 or $btime <=> $atime 2007 or $btime <=> $atime
1878 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1879 } @_ 2009 } @_
1880 }, 2010 },
1881 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1882 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1883 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1884 } @_ }, 2016 } @_
2017 },
1885); 2018);
1886 2019
1887sub inventory_widget { 2020sub inventory_widget {
1888 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1889 2022
… …
1976 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1977 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1978 } 2111 }
1979} 2112}
1980 2113
1981sub player_window { 2114sub make_playerbook {
1982 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1983 x => "center", 2116 x => "center",
1984 y => "center", 2117 y => "center",
1985 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1986 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
… …
2020 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
2021 2154
2022 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
2023 2156
2024 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
2025 $plwin
2026} 2158}
2027 2159
2028sub keyboard_setup { 2160sub keyboard_setup {
2029 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
2030} 2162}
2031 2163
2032sub help_window { 2164sub make_help_window {
2033 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
2034 x => 'center', 2166 x => 'center',
2035 y => 'center', 2167 y => 'center',
2036 z => 4, 2168 z => 4,
2037 name => 'doc_browser', 2169 name => 'doc_browser',
… …
2126 2258
2127 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2128 $win->show; 2260 $win->show;
2129 }; 2261 };
2130 2262
2131 $win 2263 $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} 2264}
2154 2265
2155sub open_quit_dialog { 2266sub open_quit_dialog {
2156 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2157 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2190 2301
2191 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2192 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2193} 2304}
2194 2305
2306sub make_menubar {
2307 $MENUFRAME = new DC::UI::Toplevel
2308 border => 0,
2309 force_x => 0,
2310 force_y => 0,
2311 force_w => $::WIDTH,
2312 child => ($MENUBAR = new DC::UI::HBox),
2313 ;
2314
2315 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2316
2317 # 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
2318 make_gauge_window->show;
2319
2320# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2321# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2322
2323 make_playerbook;
2324
2325 $MENUPOPUP = DC::UI::Menu->new (items => [
2326 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2327 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2328 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2329 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2330 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2331 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2332 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2333 ["Quit…" , sub {
2334 if ($CONN) {
2335 open_quit_dialog;
2336 } else {
2337 EV::unloop EV::UNLOOP_ALL;
2338 }
2339 }],
2340 ]);
2341
2342 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2343 tooltip => "Shows the main menu",
2344 on_button_down => sub {
2345 my ($self, $ev) = @_;
2346 local $ev->{x} = 0;
2347 local $ev->{y} = 0;
2348 $MENUPOPUP->popup ($ev);
2349 },
2350 );
2351
2352 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2353 padding_x => 6,
2354 padding_y => 3,
2355 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2356 template => " Exp: 888,888,888,888 (lvl 188) ",
2357 );
2358
2359 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2360 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2361 . "will automatically pick up items as defined by your item pickup settings "
2362 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2363 . "disable autopickup by disabling this checkbox.",
2364 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2365 on_changed => sub {
2366 my ($self, $value) = @_;
2367 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2368 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2369 $CONN->send_pickup ($CFG->{pickup})
2370 if $CONN;
2371 },
2372 );
2373
2374 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2375 c_rescale => 1,
2376 padding_x => 6,
2377 padding_y => 3,
2378 force_w => $::WIDTH * 0.2,
2379 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2380 template => "two handed weapons 99%",
2381 );
2382
2383 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2384 expand => 1,
2385 align => 1, can_hover => 1, can_events => 1,
2386 text => "Range and Combat Slots",
2387 tooltip => "#stat_ranged",
2388 );
2389
2390 $MENUFRAME->show;
2391}
2392
2393sub open_string_query {
2394 my ($title, $cb, $txt, $tooltip) = @_;
2395 my $dialog = new DC::UI::Toplevel
2396 x => "center",
2397 y => "center",
2398 z => 50,
2399 force_w => $WIDTH * 4/5,
2400 title => $title;
2401
2402 $dialog->add (
2403 my $e = new DC::UI::Entry
2404 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2405 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2406 tooltip => $tooltip
2407 );
2408
2409 $e->grab_focus;
2410 $e->set_text ($txt) if $txt;
2411 $dialog->show;
2412}
2413
2195sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2196 # find all tips 2415 # find all tips
2197 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2198 2417
2199 DC::DB::get state => "tip_of_the_day", sub { 2418 DC::DB::get state => "tip_of_the_day", sub {
… …
2244 2463
2245 $dialog->show; 2464 $dialog->show;
2246 }; 2465 };
2247} 2466}
2248 2467
2249sub sdl_init {
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n";
2252}
2253
2254sub video_init { 2468sub video_init {
2469 DC::set_theme $CFG->{uitheme};
2470
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
2257 2473
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2474 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2475 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2479 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264 2480
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2481 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2482 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2483
2268 # now choose biggets mode <= 1024x768 2484 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2485 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2486 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2487 $CFG->{sdl_mode} = $_;
2272 } 2488 }
2273 } 2489 }
… …
2315 2531
2316 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2317 padding => 0, 2533 padding => 0,
2318 z => 100, 2534 z => 100,
2319 force_x => "max", 2535 force_x => "max",
2320 force_y => 0; 2536 force_y => 20;
2321 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2322 2538
2323 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2324 2540
2325 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
… …
2336 2552
2337 (new DC::UI::Frame 2553 (new DC::UI::Frame
2338 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2339 force_x => 0, 2555 force_x => 0,
2340 force_y => "max", 2556 force_y => "max",
2341 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2342 )->show; 2558 )->show;
2343 2559
2344 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2345 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2346 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2347 align => 0, 2563 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5, 2565 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2351 ); 2567 );
2352 2568
2353 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2354 title => "Minimap", 2570 title => "Minimap",
2355 name => "mapmap", 2571 name => "mapmap",
2356 x => 0, 2572 x => 0,
2357 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2358 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 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.", 2577 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2362 ), 2578 ),
2363 )->show; 2579 )->show;
2364 2580
2365 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
… …
2391 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2392 # the name is changed to not conflict with the older name as users could have hidden it 2608 # the name is changed to not conflict with the older name as users could have hidden it
2393 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2", 2610 name => "message_window2",
2395 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2396 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2398 ; 2615 ;
2399 2616
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2420 . "After pressing the combo the binding will be saved automatically and the " 2637 . "After pressing the combo the binding will be saved automatically and the "
2421 . "binding editor closes"); 2638 . "binding editor closes");
2422 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2423 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2424 2641
2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2426 2644
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; 2645 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2468 } 2647 }
2469 2648
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2649 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2651
2473 $CAVEAT_LABEL->set_text ("None :)"); 2652 $CAVEAT_LABEL->set_text ("None :)");
2653 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2654 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476 2657
2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2658 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2478} 2659}
… …
2488my $animate_timer; 2669my $animate_timer;
2489 2670
2490my $fps = 9; 2671my $fps = 9;
2491 2672
2492sub force_refresh { 2673sub force_refresh {
2493 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2494 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2675 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2495 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2496 } 2677 }
2497 2678
2498 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
… …
2506my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2507 2688
2508my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2509 $NOW = EV::now; 2690 $NOW = EV::now;
2510 2691
2511 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2512 for DC::poll_events; 2693 for DC::poll_events;
2513 2694
2514 if (%animate_object) { 2695 if (%animate_object) {
2515 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2516 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
… …
2528sub animation_stop { 2709sub animation_stop {
2529 my ($widget) = @_; 2710 my ($widget) = @_;
2530 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2531} 2712}
2532 2713
2533%SDL_CB = (
2534 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2535 crash "SDL_QUIT"; 2715 crash "SDL_QUIT";
2536 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2537 }, 2717};
2538 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2539 },
2540 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2541 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2542 }, 2721};
2543 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2544# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# 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# 2724# 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# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2547# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2548# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2550 }, 2729};
2551 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2553 # alt-enter 2732 # alt-enter
2554 video_shutdown; 2733 video_shutdown;
2555 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2556 video_init; 2735 video_init;
2557 } else { 2736 } else {
2558 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2559 } 2738 }
2560 update_modbox; 2739 update_modbox;
2561 }, 2740};
2562 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2563 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox; 2743 update_modbox;
2565 }, 2744};
2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2569 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2570 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2571 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2572 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2573 audio_music_finished; 2752 audio_music_finished;
2574 }
2575 }, 2753 }
2576); 2754};
2577 2755
2578############################################################################# 2756#############################################################################
2579 2757
2580$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2581 EV::unloop; 2759 EV::unloop;
2582 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2583}; 2761};
2584 2762
2585# due to mac os x + sdl combined briandamage, we need this contortion 2763# due to mac os x + sdl combined braindamage, we need this contortion
2586sub main { 2764sub main {
2587 { 2765 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589 2767
2590 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2607 DC::DB::open_db; 2785 DC::DB::open_db;
2608 2786
2609 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2610 2788
2611 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2612 sdl_mode => undef, 2791 sdl_mode => undef,
2613 fullscreen => 1, 2792 fullscreen => 1,
2614 fast => 0, 2793 fast => 0,
2615 force_opengl11 => undef, 2794 force_opengl11 => undef,
2616 disable_alpha => 0, 2795 disable_alpha => 0,
2617 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2618 texture_compression => 1, 2798 texture_compression => 1,
2619 map_scale => 1, 2799 map_scale => 1,
2620 fow_enable => 1, 2800 fow_enable => 1,
2621 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2622 map_smoothing => 1, 2803 map_smoothing => 1,
2623 gui_fontsize => 1, 2804 gui_fontsize => 1,
2624 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2625 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2626 gauge_size => 0.35, 2807 gauge_size => 0.35,
… …
2634 effects_enable => 1, 2815 effects_enable => 1,
2635 effects_volume => 1, 2816 effects_volume => 1,
2636 bgm_enable => 1, 2817 bgm_enable => 1,
2637 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2638 output_rate => "", 2819 output_rate => "",
2639 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2640 inv_sort => "mtime", 2821 inv_sort => "mtime",
2641 default => "profile", # default profile 2822 default => "profile", # default profile
2642 show_tips => 1, 2823 show_tips => 1,
2643 logview_max_par => 1000, 2824 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2645 ); 2826 uitheme => "wood",
2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2646 2829 );
2830
2647 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2833 }
2650 2834
2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2836
2837 # OS X passes some process serial number of other shit. they
2838 # could have used an env var or any other sane mechanism. but
2839 # would it be os x then? no...
2840 shift @args if $args[0] =~ /^-psn_/;
2841
2842 my $profile = 'default';
2843
2844 for (my $i = 0; $i < @args; $i++) {
2845 if ($args[$i] =~ /^--?profile$/) {
2846 $profile = $args[$i + 1];
2847 splice @args, $i, 2, ();
2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2852 }
2853 }
2854
2855 $CFG->{profile}{$profile} ||= {};
2652 $PROFILE = $CFG->{profile}{default}; 2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2858
2859 $PROFILE->{host} = $args[0] if @args > 0;
2860 $PROFILE->{user} = $args[1] if @args > 1;
2861 $PROFILE->{password} = $args[2] if @args > 2;
2653 2862
2654 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2655 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2656 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2657 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
… …
2661 }; 2870 };
2662 } 2871 }
2663 } 2872 }
2664 } 2873 }
2665 2874
2666 sdl_init; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2667 2877
2668 { 2878 {
2669 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2670 DejaVuSans.ttf 2880 DejaVuSans.ttf
2671 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
… …
2673 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2674 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2675 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2676 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2677 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2678 ); 2889 );
2679 2890
2680 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2681 2892
2682 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2683 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2684 2895
2685 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2686 2897
… …
2698# } 2909# }
2699# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2700# warn $t2-$t1; 2911# warn $t2-$t1;
2701# } 2912# }
2702 2913
2914 DC::IMG_Init;
2703 video_init; 2915 video_init;
2704 audio_init; 2916 audio_init;
2705 } 2917 }
2706 2918
2707 show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
… …
2709 our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2710 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2711 $startup_done->(); 2923 $startup_done->();
2712 }; 2924 };
2713 2925
2926 debug_toggle 0;
2927
2714 delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2715 EV::loop; 2929 EV::loop;
2716 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2717#video_shutdown; 2933 #video_shutdown;
2718#audio_shutdown; 2934 #audio_shutdown;
2935
2719 DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2720 DC::SDL_Quit; 2937 DC::SDL_Quit;
2721 DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2722} 2939}
2723 2940
… …
2727 2944
2728deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2729 2946
2730=head1 SYNOPSIS 2947=head1 SYNOPSIS
2731 2948
2732Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2733 2951
2734=head1 USAGE 2952=head1 USAGE
2735 2953
2736deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2954The deliantra client utilises OpenGL for all UI elements and the game. It
2737be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2738 2956
2739=head1 DEBUGGING 2957=head1 DEBUGGING
2740 2958
2741
2742CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2743 2960
2744 1 draw borders around widgets 2961 1 draw borders around widgets
2745 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2746 4 show fps 2963 4 show fps
2747 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2748 2966
2749=head1 AUTHOR 2967=head1 AUTHOR
2750 2968
2751Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2752 2970

Diff Legend

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