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.66 by root, Mon Sep 1 09:12:08 2008 UTC vs.
Revision 1.117 by root, Tue Aug 31 14:31:50 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 } 63 }
82 64
83 unshift @INC, $root; 65 unshift @INC, $root;
84 } 66 }
85} 67}
86 68
87# prepend private library directory 69# prepend private library directory and prepare env
88BEGIN { 70BEGIN {
89 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 73 if (-d $path) {
92 unshift @INC, $path; 74 unshift @INC, $path;
97 79
98# need to do it again because that pile of garbage called PAR nukes it before main 80# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 82 if %PAR::LibCache;
101 83
102use Time::HiRes 'time';
103use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
104use List::Util qw(max min); 87use List::Util qw(max min);
105 88
106use Deliantra; 89use Deliantra;
107use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
108 91
109use AnyEvent::Util (); 92use AnyEvent::Util ();
110use AnyEvent::DNS;
111use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
112 95
113use Compress::LZF; 96use Compress::LZF;
114use JSON::XS; 97use JSON::XS;
115 98
116use DC; 99use DC;
117 100
118#############################################################################
119
120our $CONN;
121
122# write a crash message blockingly to the socket, if possible
123# this is a bit too complicated for my tastes, but it was easy.
124sub crash($;$) { 101sub crash($;$) {
125 my ($msg, $backtrace) = @_; 102 # nop during compiletime
126
127 return unless $CONN;
128
129 my $fh = $CONN->{fh}
130 or return;
131
132 my $buf = delete $CONN->{wbuf};
133
134 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
135
136 AnyEvent::Util::fh_nonblocking $fh, 0;
137
138 syswrite $fh, $buf;
139 AnyEvent::Util::fh_nonblocking $fh, 1;
140
141 $msg =~ s/\s+$//;
142
143 # backtrace as second step, in case it crashes, too
144 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
145 if $backtrace;
146} 103}
147
148#############################################################################
149 104
150BEGIN { 105BEGIN {
151 $SIG{__DIE__} = sub { 106 $SIG{__DIE__} = sub {
152 return if $^S; 107 return if $^S;
153 crash ("CRASH/DIE: $_[0]" => 1); 108 crash "CRASH/DIE: $_[0]" => 1;
154 DC::fatal Carp::longmess "$_[0]"; 109 DC::fatal Carp::longmess "$_[0]";
155 } 110 }
156} 111}
157 112
158use DC::OpenGL (); 113use DC::OpenGL ();
172 127
173$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
174$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
175 130
176$EV::DIED = sub { 131$EV::DIED = sub {
177 crash ("CRASH/EV::DIED: $@" => 1); 132 crash "CRASH/EV::DIED: $@" => 0;
178 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
179}; 134};
180 135
181my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
182 139
183our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
184 141
185our $LAST_REFRESH; 142our $LAST_REFRESH;
186our $NOW; 143our $NOW;
187 144
188our $CFG; 145our $CFG;
189our $PROFILE; # current profile 146our $PROFILE; # current profile
190our $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;
191 149
192our $WANT_REFRESH; 150our $WANT_REFRESH;
193 151
194our $MODE_SLIDER; 152our $MODE_SLIDER;
195our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
202our $FONTSIZE; 160our $FONTSIZE;
203 161
204our $FONT_PROP; 162our $FONT_PROP;
205our $FONT_FIXED; 163our $FONT_FIXED;
206 164
165our $CONN;
166
207our $MAP; 167our $MAP;
208our $MAPMAP; 168our $MAPMAP;
209our $MAPWIDGET; 169our $MAPWIDGET;
210our $COMPLETER; 170our $COMPLETER;
211our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
212our $METASERVER; 175our $METASERVER;
213our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
214our $QUIT_DIALOG; 177our $QUIT_DIALOG;
215our $HOST_ENTRY; 178our $HOST_ENTRY;
216our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
242our $FLOORBOX; 205our $FLOORBOX;
243our $GAUGES; 206our $GAUGES;
244our $STATWIDS; 207our $STATWIDS;
245 208
246our $SDL_ACTIVE; 209our $SDL_ACTIVE;
247our %SDL_CB; 210our @SDL_CB;
248 211
249our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
250our $STATUSBOX; 213our $STATUSBOX;
251our $MODBOX; 214our $MODBOX;
252our $DEBUG_STATUS; 215our $DEBUG_STATUS;
253 216
254our $INV; 217our $INV;
255our $INVR; 218our $INVR;
256our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
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}
257 260
258############################################################################# 261#############################################################################
259 262
260sub status { 263sub status {
261 $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]);
343 or return; 346 or return;
344 347
345 $meta->{data} 348 $meta->{data}
346 or return; 349 or return;
347 350
348 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
349 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
350 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
351 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
352 &audio_music_push ($face); 355 &audio_music_push ($face);
353 } 356 }
354 } else { 357 } else {
355 # fetch from database 358 # fetch from database
356 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
357 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
358 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
359 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;
360 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
361 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
362 365
363 audio_sound_push ($face); 366 audio_sound_push ($face);
364 }; 367 };
411 414
412 audio_music_update_volume; 415 audio_music_update_volume;
413 416
414 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
415 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
416 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
417 ? 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
418 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
419 425
420 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
421 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
422 428
423 my $NOW = time; 429 my $NOW = time;
424 430
425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
426 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
512 audio_music_push; 518 audio_music_push;
513} 519}
514 520
515sub audio_init { 521sub audio_init {
516 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
517 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
518 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
519 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
520 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
521 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
535 sub audio_tab_update; 550 sub audio_tab_update;
536 audio_tab_update; 551 audio_tab_update;
537} 552}
538 553
539sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
540 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
541 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
542 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
543 563
544 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
546 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
547 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
548 568
549 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
550 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
551} 573}
552 574
553############################################################################# 575#############################################################################
554 576
555sub destroy_query_dialog { 577sub destroy_query_dialog {
784} 806}
785 807
786sub dc_connect { 808sub dc_connect {
787 my ($host, $port) = @_; 809 my ($host, $port) = @_;
788 810
789 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;
790 813
791 $CONN = 814 $CONN =
792 new DC::Protocol 815 new DC::Protocol
793 host => $host, 816 host => $host,
794 port => $port, 817 port => $port,
795 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
796 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
797 mapw => $mapsize, 820 mapw => $mapw,
798 maph => $mapsize, 821 maph => $maph,
799 822
823 c_version => {
824 client => "deliantra",
800 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
801 829
802 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
803 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
804 map => $MAP, 832 map => $MAP,
805 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
811 839
812 on_connect => sub { 840 on_connect => sub {
813 if ($_[0]) { 841 if ($_[0]) {
814 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
815 843
816 status "login successful"; 844 status "successfully connected to the server";
817 } else { 845 } else {
818 undef $CONN; 846 undef $CONN;
819 status "unable to connect: $!"; 847 status "unable to connect: $!";
820 stop_game(); 848 stop_game();
821 } 849 }
823 ; 851 ;
824} 852}
825 853
826sub start_game { 854sub start_game {
827 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.";
828 860
829 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
830 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
831
832 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
833 863
834 $MAP = new DC::Map; 864 $MAP = new DC::Map;
835 865
836 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
837 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
838 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
839 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
840 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) {
841 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
842 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
843 } 877 }
844 878
845 dc_connect $host, $port; 879 dc_connect $host, $port;
846 }; 880 };
847 } else { 881 } else {
873} 907}
874 908
875sub graphics_setup { 909sub graphics_setup {
876 my $vbox = new DC::UI::VBox; 910 my $vbox = new DC::UI::VBox;
877 911
912 {
913 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
914
878 $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]);
879 916
880 my $row = 0; 917 my $row = 0;
881 918
882 $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");
883 $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,
884 can_events => 1, 921 can_events => 1,
885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 922 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
886 923
887 $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");
888 $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,
889 can_events => 1, 926 can_events => 1,
890 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 "
891 . "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 "
892 . "by selecting a different video mode, changing the settings below or " 929 . "by selecting a different video mode, changing the settings below or "
893 . "by installing the right driver for your graphics card."); 930 . "by installing the right driver for your graphics card.");
894 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
895 my $vidmode_tooltip = 945 my $vidmode_tooltip =
896 "<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). "
897 . "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>.";
898 948
899 $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");
900 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
901 951
902 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
903 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
904 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
905 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
906 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
907 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
908 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
909 960
910 $MODE_SLIDER->connect (changed => sub { 961 $MODE_SLIDER->connect (changed => sub {
911 my ($self, $value) = @_;
912
913 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
914 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
915 });
916 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
917
918 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
919 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
920 state => $CFG->{fullscreen},
921 tooltip => "Bring the client into fullscreen mode.",
922 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
923 );
924
925 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
926 $table->add_at (1, $row++, new DC::UI::CheckBox
927 state => $CFG->{force_opengl11},
928 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
929 . "higher memory usage and slower performance. It will, however, help tremendously on "
930 . "cards that claim to support a feature but fall back to software rendering. "
931 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
932 . "but cards and drivers from other vendors (ATI) are often just as bad. "
933 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
935 );
936
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
938 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{disable_alpha},
940 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
941 . "by disabling a number of textures and transparency effects. Normally, these "
942 . "effects do not cost a lot of resources, but some graphics cards might fall "
943 . "back to etxremely slow rendering if this is enabled. If disabling this option "
944 . "noticably improves the framerate of the client please report this! "
945 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
946 on_changed => sub {
947 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) = @_;
948 $CFG->{disable_alpha} = $value; 999 $CFG->{disable_alpha} = $value;
949 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 1000 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
1001 0
950 0 1002 }
951 } 1003 );
952 );
953 1004
954 $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");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
957 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 "
958 . "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). "
959 . "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 "
960 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
961 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
962 ); 1013 );
963 1014
964 $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");
965 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
966 state => $CFG->{fast}, 1017 state => $CFG->{fast},
967 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
968 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
969 ); 1020 );
970 1021
971 $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");
972 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
973 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
974 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.",
975 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
976 ); 1027 );
977 1028
978 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
979 expand => 1, text => "Apply", 1030 expand => 1, text => "Apply",
980 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
981 on_activate => sub { 1032 on_activate => sub {
982 video_shutdown (); 1033 video_shutdown ();
983 video_init (); 1034 video_init ();
1035 0
984 0 1036 }
985 } 1037 );
986 ); 1038 }
987 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;
988 $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");
989 $table->add_at (1, $row++, new DC::UI::CheckBox 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{smooth_movement}, 1048 state => $CFG->{smooth_movement},
991 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. "
992 . "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, "
993 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
995 ); 1053 );
996 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
997 $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");
998 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
999 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1000 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1001 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 }
1002 ); 1070 );
1003 1071
1004 $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");
1005 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
1006 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
1007 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. "
1008 . "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. "
1009 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
1010 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1011 ); 1079 );
1012 1080
1013 $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");
1014 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
1015 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
1016 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.",
1017 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1018 ); 1086 );
1019 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
1020 $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");
1021 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
1022 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1023 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.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1025 ); 1108 );
1026 1109
1027 $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");
1028 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
1029 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1030 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, "
1031 . "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.",
1032 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 },
1033 ); 1116 );
1034 1117
1035 $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");
1036 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
1037 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1038 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.",
1039 on_changed => sub { 1122 on_changed => sub {
1040 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
1041 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
1042 0 1126 }
1043 } 1127 );
1044 );
1045 1128
1046 $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");
1047 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
1048 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
1049 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.",
1050 on_changed => sub { 1133 on_changed => sub {
1051 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
1052 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
1053 0 1137 }
1054 } 1138 );
1055 ); 1139 }
1056 1140
1057 $vbox 1141 $vbox
1058} 1142}
1059 1143
1060our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
1072 ]); 1156 ]);
1073 1157
1074 my $text = !$freq 1158 my $text = !$freq
1075 ? "audio is off" 1159 ? "audio is off"
1076 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1077 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1078 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1079 1166
1080 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1081} 1168}
1082 1169
1083sub audio_setup { 1170sub audio_setup {
1086 $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]);
1087 1174
1088 my $row = 0; 1175 my $row = 0;
1089 1176
1090 $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");
1091 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1092 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1093 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.",
1094 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 }
1095 ); 1195 );
1096 1196
1097 $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");
1098 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1099 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
1112 ); 1212 );
1113 1213
1114 $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");
1115 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1116 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1117 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.",
1118 on_changed => sub { 1218 on_changed => sub {
1119 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1120 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1121 audio_music_push; 1221 audio_music_push;
1122 1 1222 1
1133 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1134 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1135 options => [ 1235 options => [
1136 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1137 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1138 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1139 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1140 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1141 ], 1241 ],
1142 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.",
1143 on_changed => sub { 1243 on_changed => sub {
1144 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1145 audio_tab_update; 1245 audio_tab_update;
1169 $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");
1170 $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
1171 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1172 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1173 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 "
1174 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1175 on_changed => sub { 1275 on_changed => sub {
1176 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1177 audio_tab_update; 1277 audio_tab_update;
1178 1 1278 1
1179 } 1279 }
1223} 1323}
1224 1324
1225sub make_gauge_window { 1325sub make_gauge_window {
1226 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1227 1327
1228 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1229 force_x => 0, 1329 force_x => 0,
1230 force_y => "max", 1330 force_y => "max",
1231 force_w => $WIDTH, 1331 force_w => $WIDTH,
1232 force_h => $gh, 1332 force_h => $gh,
1233 ); 1333 );
1249 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1250 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1251 ], 1351 ],
1252 ); 1352 );
1253 1353
1254 $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");
1255 $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");
1256 $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");
1257 $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");
1258
1259 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1260 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1261 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1262 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1263
1264 $GAUGES = {
1265 exp => $exp, prg => $prg, sklprg => $sklprg,
1266 win => $win, range => $rng,
1267 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1268 };
1269 1358
1270 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1271 1360
1272 $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
1273} 1379}
1274 1380
1275sub debug_setup { 1381sub debug_setup {
1276 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1277 1383
1278 $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");
1279 $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 });
1280 $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");
1281 $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 });
1282 $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");
1283 $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 });
1284 $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");
1285 $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
1286 $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() } );
1287
1288 $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#
1289 1397
1290 $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);
1291 $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);
1292 $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 );
1293 $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);
1414 para => ["Paralysation", 1522 para => ["Paralysation",
1415 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1523 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1416 deat => ["Death", 1524 deat => ["Death",
1417 "<b>Death</b> (resistance against death spells)"], 1525 "<b>Death</b> (resistance against death spells)"],
1418 phys => ["Physical", 1526 phys => ["Physical",
1419 "<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.)"], 1527 "<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.)"],
1420 blind => ["Blind", 1528 blind => ["Blind",
1421 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1529 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1422 fear => ["Fear", 1530 fear => ["Fear",
1423 "<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)"], 1531 "<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)"],
1424 tund => ["Turn undead", 1532 tund => ["Turn undead",
1614 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]),
1615 ); 1723 );
1616 1724
1617 $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");
1618 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1619 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1620 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1621 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1622 ); 1730 );
1623 1731
1624 $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");
1625 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1626 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1627 hidden => 1, 1735 hidden => 1,
1628 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1629 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1630 ); 1738 );
1631 1739
1632 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1633 expand => 1, 1741 expand => 1,
1634 text => "Login / Register", 1742 text => "Login / Register",
1670 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1671 1779
1672 $vbox->add ( 1780 $vbox->add (
1673 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1674 expand => 1, 1782 expand => 1,
1675 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1676 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>)",
1677 on_changed => sub { 1785 on_changed => sub {
1678 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1679 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1680 1 1788 1
1681 } 1789 }
1682 ); 1790 );
1683 1791
1684 if (0) { #d# disabled 1792 if (0) { #d# disabled
1727 1835
1728 my $row = 0; 1836 my $row = 0;
1729 1837
1730 $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");
1731 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1732 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1733 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?",
1734 on_changed => sub { 1843 on_changed => sub {
1735 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1736 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
1738 } 1847 }
1739 ); 1848 );
1740 1849
1741 $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");
1742 $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,
1743 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1744 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 "
1745 . "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 "
1746 . "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.",
1747 on_changed => sub { 1857 on_changed => sub {
1749 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1750 0 1860 0
1751 }, 1861 },
1752 ); 1862 );
1753 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
1754 $table 1886 $table
1755} 1887}
1756 1888
1757sub autopickup_setup { 1889sub autopickup_setup {
1758 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
1764 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1765 ); 1897 );
1766 1898
1767 for ( 1899 for (
1768 ["General", 0, 0, 1900 ["General", 0, 0,
1769 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1770 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1771 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1772 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1773 ], 1904 ],
1774 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1775 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
1823 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1824 } else { 1955 } else {
1825 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1826 } 1957 }
1827 1958
1828 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1829 if defined $::CONN; 1960 if defined $::CONN;
1830 1961
1831 0 1962 0
1832 }); 1963 });
1833 1964
1850 }); 1981 });
1851 1982
1852 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1853 text => "set", 1984 text => "set",
1854 on_activate => sub { 1985 on_activate => sub {
1855 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1856 if defined $::CONN; 1987 if defined $::CONN;
1857 0 1988 0
1858 }); 1989 });
1859 1990
1860 $r 1991 $r
1861} 1992}
1862 1993
1863my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1864 type => sub { 1995 type => sub {
1996 use sort 'stable';
1865 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1866 }, 1998 },
1867 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1868 my $NOW = time; 2001 my $NOW = time;
1869 sort { 2002 sort {
1870 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;
1871 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;
1872 2005
1873 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1874 or $btime <=> $atime 2007 or $btime <=> $atime
1875 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1876 } @_ 2009 } @_
1877 }, 2010 },
1878 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1879 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1880 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1881 } @_ }, 2016 } @_
2017 },
1882); 2018);
1883 2019
1884sub inventory_widget { 2020sub inventory_widget {
1885 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1886 2022
1973 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1974 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1975 } 2111 }
1976} 2112}
1977 2113
1978sub player_window { 2114sub make_playerbook {
1979 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1980 x => "center", 2116 x => "center",
1981 y => "center", 2117 y => "center",
1982 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1983 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
2017 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
2018 2154
2019 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
2020 2156
2021 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
2022 $plwin
2023} 2158}
2024 2159
2025sub keyboard_setup { 2160sub keyboard_setup {
2026 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
2027} 2162}
2028 2163
2029sub help_window { 2164sub make_help_window {
2030 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
2031 x => 'center', 2166 x => 'center',
2032 y => 'center', 2167 y => 'center',
2033 z => 4, 2168 z => 4,
2034 name => 'doc_browser', 2169 name => 'doc_browser',
2123 2258
2124 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2125 $win->show; 2260 $win->show;
2126 }; 2261 };
2127 2262
2128 $win 2263 $HELP_WINDOW = $win;
2129}
2130
2131sub open_string_query {
2132 my ($title, $cb, $txt, $tooltip) = @_;
2133 my $dialog = new DC::UI::Toplevel
2134 x => "center",
2135 y => "center",
2136 z => 50,
2137 force_w => $WIDTH * 4/5,
2138 title => $title;
2139
2140 $dialog->add (
2141 my $e = new DC::UI::Entry
2142 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2143 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2144 tooltip => $tooltip
2145 );
2146
2147 $e->grab_focus;
2148 $e->set_text ($txt) if $txt;
2149 $dialog->show;
2150} 2264}
2151 2265
2152sub open_quit_dialog { 2266sub open_quit_dialog {
2153 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2154 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
2187 2301
2188 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2189 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2190} 2304}
2191 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
2192sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2193 # find all tips 2415 # find all tips
2194 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2195 2417
2196 DC::DB::get state => "tip_of_the_day", sub { 2418 DC::DB::get state => "tip_of_the_day", sub {
2241 2463
2242 $dialog->show; 2464 $dialog->show;
2243 }; 2465 };
2244} 2466}
2245 2467
2246sub sdl_init {
2247 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2248 and die "SDL::Init failed!\n";
2249}
2250
2251sub video_init { 2468sub video_init {
2469 DC::set_theme $CFG->{uitheme};
2470
2252 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2253 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
2254 2473
2255 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2474 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2256 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2475 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2260 @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;
2261 2480
2262 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2481 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2263 $CFG->{sdl_mode} = 0; # lowest resolution by default 2482 $CFG->{sdl_mode} = 0; # lowest resolution by default
2264 2483
2265 # now choose biggets mode <= 1024x768 2484 # now choose biggest mode <= 1024x768
2266 for (0 .. $#SDL_MODES) { 2485 for (0 .. $#SDL_MODES) {
2267 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2486 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2268 $CFG->{sdl_mode} = $_; 2487 $CFG->{sdl_mode} = $_;
2269 } 2488 }
2270 } 2489 }
2312 2531
2313 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2314 padding => 0, 2533 padding => 0,
2315 z => 100, 2534 z => 100,
2316 force_x => "max", 2535 force_x => "max",
2317 force_y => 0; 2536 force_y => 20;
2318 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2319 2538
2320 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2321 2540
2322 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
2333 2552
2334 (new DC::UI::Frame 2553 (new DC::UI::Frame
2335 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2336 force_x => 0, 2555 force_x => 0,
2337 force_y => "max", 2556 force_y => "max",
2338 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2339 )->show; 2558 )->show;
2340 2559
2341 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2342 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2343 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2344 align => 0, 2563 align => 0,
2345 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2346 fontsize => 0.5, 2565 fontsize => 0.5,
2347 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2348 ); 2567 );
2349 2568
2350 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2351 title => "Minimap", 2570 title => "Minimap",
2352 name => "mapmap", 2571 name => "mapmap",
2353 x => 0, 2572 x => 0,
2354 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2355 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2356 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2357 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2358 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.",
2359 ), 2578 ),
2360 )->show; 2579 )->show;
2361 2580
2362 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2363 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
2388 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2389 # 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
2390 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2391 name => "message_window2", 2610 name => "message_window2",
2392 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2393 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2394 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2395 ; 2615 ;
2396 2616
2397 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2417 . "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 "
2418 . "binding editor closes"); 2638 . "binding editor closes");
2419 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2420 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2421 2641
2422 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2423 2644
2424 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2425 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2426
2427# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2428# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2429
2430 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
2431
2432 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2433 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2434
2435 $BUTTONBAR->add (new DC::UI::Button
2436 text => "Save Config",
2437 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2438 on_activate => sub {
2439 $::CFG->{layout} = DC::UI::get_layout;
2440 DC::write_cfg;
2441 status "Configuration Saved";
2442 0
2443 },
2444 );
2445
2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2447 tooltip => "View Documentation");
2448
2449 $BUTTONBAR->add (new DC::UI::Button
2450 text => "Quit",
2451 tooltip => "Terminates the program",
2452 on_activate => sub {
2453 if ($CONN) {
2454 open_quit_dialog;
2455 } else {
2456 EV::unloop EV::UNLOOP_ALL;
2457 }
2458 0
2459 },
2460 );
2461
2462 $BUTTONBAR->show;
2463 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2464 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2465 } 2647 }
2466 2648
2467 $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]);
2468 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2469 2651
2470 $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;
2471 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2472 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2473 2657
2474 $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]);
2475} 2659}
2485my $animate_timer; 2669my $animate_timer;
2486 2670
2487my $fps = 9; 2671my $fps = 9;
2488 2672
2489sub force_refresh { 2673sub force_refresh {
2490 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2491 $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;
2492 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2493 } 2677 }
2494 2678
2495 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
2503my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2504 2688
2505my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2506 $NOW = EV::now; 2690 $NOW = EV::now;
2507 2691
2508 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2509 for DC::poll_events; 2693 for DC::poll_events;
2510 2694
2511 if (%animate_object) { 2695 if (%animate_object) {
2512 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2513 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
2525sub animation_stop { 2709sub animation_stop {
2526 my ($widget) = @_; 2710 my ($widget) = @_;
2527 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2528} 2712}
2529 2713
2530%SDL_CB = (
2531 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2532 crash "SDL_QUIT"; 2715 crash "SDL_QUIT";
2533 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2534 }, 2717};
2535 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2536 },
2537 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2538 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2539 }, 2721};
2540 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2541# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2542# 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#
2543# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2544# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2545# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2546# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2547 }, 2729};
2548 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2549 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2550 # alt-enter 2732 # alt-enter
2551 video_shutdown; 2733 video_shutdown;
2552 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2553 video_init; 2735 video_init;
2554 } else { 2736 } else {
2555 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2556 } 2738 }
2557 update_modbox; 2739 update_modbox;
2558 }, 2740};
2559 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2560 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2561 update_modbox; 2743 update_modbox;
2562 }, 2744};
2563 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2564 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2565 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2566 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2567 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2568 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2569 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2570 audio_music_finished; 2752 audio_music_finished;
2571 }
2572 }, 2753 }
2573); 2754};
2574 2755
2575############################################################################# 2756#############################################################################
2576 2757
2577$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2578 EV::unloop; 2759 EV::unloop;
2579 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2580}; 2761};
2581 2762
2582# 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
2583sub main { 2764sub main {
2584 { 2765 {
2585 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2586 2767
2587 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
2604 DC::DB::open_db; 2785 DC::DB::open_db;
2605 2786
2606 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2607 2788
2608 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2609 sdl_mode => undef, 2791 sdl_mode => undef,
2610 fullscreen => 1, 2792 fullscreen => 1,
2611 fast => 0, 2793 fast => 0,
2612 force_opengl11 => undef, 2794 force_opengl11 => undef,
2613 disable_alpha => 0, 2795 disable_alpha => 0,
2614 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2615 texture_compression => 1, 2798 texture_compression => 1,
2616 map_scale => 1, 2799 map_scale => 1,
2617 fow_enable => 1, 2800 fow_enable => 1,
2618 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2619 map_smoothing => 1, 2803 map_smoothing => 1,
2620 gui_fontsize => 1, 2804 gui_fontsize => 1,
2621 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2622 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2623 gauge_size => 0.35, 2807 gauge_size => 0.35,
2631 effects_enable => 1, 2815 effects_enable => 1,
2632 effects_volume => 1, 2816 effects_volume => 1,
2633 bgm_enable => 1, 2817 bgm_enable => 1,
2634 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2635 output_rate => "", 2819 output_rate => "",
2636 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2637 inv_sort => "mtime", 2821 inv_sort => "mtime",
2638 default => "profile", # default profile 2822 default => "profile", # default profile
2639 show_tips => 1, 2823 show_tips => 1,
2640 logview_max_par => 1000, 2824 logview_max_par => 1000,
2641 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2642 ); 2826 uitheme => "wood",
2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2643 2829 );
2830
2644 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2645 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2646 } 2833 }
2647 2834
2648 $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} ||= {};
2649 $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;
2650 2862
2651 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2652 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2653 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2654 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
2658 }; 2870 };
2659 } 2871 }
2660 } 2872 }
2661 } 2873 }
2662 2874
2663 sdl_init; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2664 2877
2665 { 2878 {
2666 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2667 DejaVuSans.ttf 2880 DejaVuSans.ttf
2668 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
2670 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2671 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2672 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2673 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2674 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2675 ); 2889 );
2676 2890
2677 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2678 2892
2679 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2680 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2681 2895
2682 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2683 2897
2695# } 2909# }
2696# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2697# warn $t2-$t1; 2911# warn $t2-$t1;
2698# } 2912# }
2699 2913
2914 DC::IMG_Init;
2700 video_init; 2915 video_init;
2701 audio_init; 2916 audio_init;
2702 } 2917 }
2703 2918
2704 show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
2706 our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2707 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2708 $startup_done->(); 2923 $startup_done->();
2709 }; 2924 };
2710 2925
2926 debug_toggle 0;
2927
2711 delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2712 EV::loop; 2929 EV::loop;
2713 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2714#video_shutdown; 2933 #video_shutdown;
2715#audio_shutdown; 2934 #audio_shutdown;
2935
2716 DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2717 DC::SDL_Quit; 2937 DC::SDL_Quit;
2718 DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2719} 2939}
2720 2940
2724 2944
2725deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2726 2946
2727=head1 SYNOPSIS 2947=head1 SYNOPSIS
2728 2948
2729Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2730 2951
2731=head1 USAGE 2952=head1 USAGE
2732 2953
2733deliantra 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
2734be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2735 2956
2736=head1 DEBUGGING 2957=head1 DEBUGGING
2737 2958
2738
2739CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2740 2960
2741 1 draw borders around widgets 2961 1 draw borders around widgets
2742 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2743 4 show fps 2963 4 show fps
2744 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2745 2966
2746=head1 AUTHOR 2967=head1 AUTHOR
2747 2968
2748Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2749 2970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines