ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.76 by root, Wed Sep 3 12:50:43 2008 UTC vs.
Revision 1.118 by root, Mon Dec 26 03:58:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines