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.78 by root, Tue Sep 30 03:05:07 2008 UTC vs.
Revision 1.115 by root, Sat Apr 24 09:53:09 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 {
… …
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 } else { 58 } else {
55 # OS X 59 # OS X
56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
61 } 63 }
62 64
63 unshift @INC, $root; 65 unshift @INC, $root;
64 } 66 }
65} 67}
66 68
67# prepend private library directory 69# prepend private library directory and prepare env
68BEGIN { 70BEGIN {
69 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 73 if (-d $path) {
72 unshift @INC, $path; 74 unshift @INC, $path;
… …
86 88
87use Deliantra; 89use Deliantra;
88use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
89 91
90use AnyEvent::Util (); 92use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
93 95
94use Compress::LZF; 96use Compress::LZF;
95use JSON::XS; 97use JSON::XS;
96 98
97use DC; 99use DC;
… …
125 127
126$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
127$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
128 130
129$EV::DIED = sub { 131$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
131 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
132}; 134};
133 135
134my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
135 139
136our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
137 141
138our $LAST_REFRESH; 142our $LAST_REFRESH;
139our $NOW; 143our $NOW;
140 144
141our $CFG; 145our $CFG;
142our $PROFILE; # current profile 146our $PROFILE; # current profile
143our $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;
144 149
145our $WANT_REFRESH; 150our $WANT_REFRESH;
146 151
147our $MODE_SLIDER; 152our $MODE_SLIDER;
148our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
161 166
162our $MAP; 167our $MAP;
163our $MAPMAP; 168our $MAPMAP;
164our $MAPWIDGET; 169our $MAPWIDGET;
165our $COMPLETER; 170our $COMPLETER;
166our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
167our $METASERVER; 175our $METASERVER;
168our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 177our $QUIT_DIALOG;
170our $HOST_ENTRY; 178our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
197our $FLOORBOX; 205our $FLOORBOX;
198our $GAUGES; 206our $GAUGES;
199our $STATWIDS; 207our $STATWIDS;
200 208
201our $SDL_ACTIVE; 209our $SDL_ACTIVE;
202our %SDL_CB; 210our @SDL_CB;
203 211
204our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 213our $STATUSBOX;
206our $MODBOX; 214our $MODBOX;
207our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
215# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) { 225*crash = sub($;$) {
218 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
219 227
228 warn $msg;
229
220 return unless $CONN; 230 return unless $CONN;
221 231
222 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
223 or return; 233 or return;
224 234
… …
234 244
235 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace; 247 if $backtrace;
238}; 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}
239 260
240############################################################################# 261#############################################################################
241 262
242sub status { 263sub status {
243 $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]);
… …
325 or return; 346 or return;
326 347
327 $meta->{data} 348 $meta->{data}
328 or return; 349 or return;
329 350
330 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
331 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
332 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
333 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
334 &audio_music_push ($face); 355 &audio_music_push ($face);
335 } 356 }
336 } else { 357 } else {
337 # fetch from database 358 # fetch from database
338 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
339 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
340 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
341 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;
342 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
343 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
344 365
345 audio_sound_push ($face); 366 audio_sound_push ($face);
346 }; 367 };
… …
393 414
394 audio_music_update_volume; 415 audio_music_update_volume;
395 416
396 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
397 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
398 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
399 ? 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
400 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
401 425
402 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
403 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
404 428
405 my $NOW = time; 429 my $NOW = time;
406 430
407 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
408 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
494 audio_music_push; 518 audio_music_push;
495} 519}
496 520
497sub audio_init { 521sub audio_init {
498 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
499 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
500 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
501 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
502 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
503 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
… …
517 sub audio_tab_update; 550 sub audio_tab_update;
518 audio_tab_update; 551 audio_tab_update;
519} 552}
520 553
521sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
522 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
523 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
524 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
525 563
526 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
… …
528 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
529 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
530 568
531 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
532 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
533} 573}
534 574
535############################################################################# 575#############################################################################
536 576
537sub destroy_query_dialog { 577sub destroy_query_dialog {
… …
766} 806}
767 807
768sub dc_connect { 808sub dc_connect {
769 my ($host, $port) = @_; 809 my ($host, $port) = @_;
770 810
771 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;
772 813
773 $CONN = 814 $CONN =
774 new DC::Protocol 815 new DC::Protocol
775 host => $host, 816 host => $host,
776 port => $port, 817 port => $port,
777 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
778 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
779 mapw => $mapsize, 820 mapw => $mapw,
780 maph => $mapsize, 821 maph => $maph,
781 822
823 c_version => {
824 client => "deliantra",
782 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
783 829
784 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
785 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
786 map => $MAP, 832 map => $MAP,
787 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
… …
793 839
794 on_connect => sub { 840 on_connect => sub {
795 if ($_[0]) { 841 if ($_[0]) {
796 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
797 843
798 status "login successful"; 844 status "successfully connected to the server";
799 } else { 845 } else {
800 undef $CONN; 846 undef $CONN;
801 status "unable to connect: $!"; 847 status "unable to connect: $!";
802 stop_game(); 848 stop_game();
803 } 849 }
… …
805 ; 851 ;
806} 852}
807 853
808sub start_game { 854sub start_game {
809 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.";
810 860
811 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
812 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
813
814 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
815 863
816 $MAP = new DC::Map; 864 $MAP = new DC::Map;
817 865
818 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
819 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
820 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
821 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
822 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) {
823 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
824 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
825 } 877 }
826 878
827 dc_connect $host, $port; 879 dc_connect $host, $port;
828 }; 880 };
829 } else { 881 } else {
… …
896 948
897 $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");
898 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
899 951
900 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
901 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
902 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
903 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
904 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
905 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
… …
933 ); 986 );
934 987
935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
936 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
937 state => $CFG->{disable_alpha}, 990 state => $CFG->{disable_alpha},
938 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse " 991 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
939 . "by disabling a number of textures and transparency effects. Normally, these " 992 . "by disabling a number of textures and transparency effects. Normally, these "
940 . "effects do not cost a lot of resources, but some graphics cards might fall " 993 . "effects do not cost a lot of resources, but some graphics cards might fall "
941 . "back to extremely slow rendering if this is enabled. If disabling this option " 994 . "back to extremely slow rendering if this is enabled. If disabling this option "
942 . "noticably improves the framerate of the client please report this! " 995 . "noticably improves the framerate of the client please report this! "
943 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>", 996 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
… …
997 . "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, "
998 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1000 ); 1053 );
1001 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
1002 $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");
1003 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1004 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1005 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1006 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 }
… …
1018 $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");
1019 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
1020 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
1021 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.",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1086 );
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 }
1023 ); 1101 );
1024 1102
1025 $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");
1026 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
1027 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1078 ]); 1156 ]);
1079 1157
1080 my $text = !$freq 1158 my $text = !$freq
1081 ? "audio is off" 1159 ? "audio is off"
1082 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1083 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1084 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1085 1166
1086 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1087} 1168}
1088 1169
1089sub audio_setup { 1170sub audio_setup {
… …
1092 $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]);
1093 1174
1094 my $row = 0; 1175 my $row = 0;
1095 1176
1096 $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");
1097 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1098 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1099 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.",
1100 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 }
1101 ); 1195 );
1102 1196
1103 $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");
1104 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1105 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
… …
1118 ); 1212 );
1119 1213
1120 $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");
1121 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1122 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1123 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.",
1124 on_changed => sub { 1218 on_changed => sub {
1125 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1126 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1127 audio_music_push; 1221 audio_music_push;
1128 1 1222 1
… …
1139 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1140 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1141 options => [ 1235 options => [
1142 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1143 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1144 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1145 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1146 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1147 ], 1241 ],
1148 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.",
1149 on_changed => sub { 1243 on_changed => sub {
1150 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1151 audio_tab_update; 1245 audio_tab_update;
… …
1175 $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");
1176 $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
1177 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1178 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1179 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 "
1180 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1181 on_changed => sub { 1275 on_changed => sub {
1182 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1183 audio_tab_update; 1277 audio_tab_update;
1184 1 1278 1
1185 } 1279 }
… …
1229} 1323}
1230 1324
1231sub make_gauge_window { 1325sub make_gauge_window {
1232 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1233 1327
1234 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1235 force_x => 0, 1329 force_x => 0,
1236 force_y => "max", 1330 force_y => "max",
1237 force_w => $WIDTH, 1331 force_w => $WIDTH,
1238 force_h => $gh, 1332 force_h => $gh,
1239 ); 1333 );
… …
1255 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1256 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1257 ], 1351 ],
1258 ); 1352 );
1259 1353
1260 $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");
1261 $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");
1262 $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");
1263 $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");
1264
1265 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1266 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1267 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1268 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1269
1270 $GAUGES = {
1271 exp => $exp, prg => $prg, sklprg => $sklprg,
1272 win => $win, range => $rng,
1273 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1274 };
1275 1358
1276 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1277 1360
1278 $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
1279} 1379}
1280 1380
1281sub debug_setup { 1381sub debug_setup {
1282 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1283 1383
1284 $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");
1285 $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 });
1286 $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");
1287 $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 });
1288 $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");
1289 $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 });
1290 $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");
1291 $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
1292 $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() } );
1293
1294 $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#
1295 1397
1296 $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);
1297 $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);
1298 $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 );
1299 $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);
… …
1620 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]),
1621 ); 1723 );
1622 1724
1623 $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");
1624 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1625 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1626 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1627 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1628 ); 1730 );
1629 1731
1630 $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");
1631 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1632 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1633 hidden => 1, 1735 hidden => 1,
1634 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1635 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1636 ); 1738 );
1637 1739
1638 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1639 expand => 1, 1741 expand => 1,
1640 text => "Login / Register", 1742 text => "Login / Register",
… …
1676 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1677 1779
1678 $vbox->add ( 1780 $vbox->add (
1679 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1680 expand => 1, 1782 expand => 1,
1681 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1682 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>)",
1683 on_changed => sub { 1785 on_changed => sub {
1684 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1685 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1686 1 1788 1
1687 } 1789 }
1688 ); 1790 );
1689 1791
1690 if (0) { #d# disabled 1792 if (0) { #d# disabled
… …
1733 1835
1734 my $row = 0; 1836 my $row = 0;
1735 1837
1736 $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");
1737 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1738 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1739 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?",
1740 on_changed => sub { 1843 on_changed => sub {
1741 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1742 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
… …
1744 } 1847 }
1745 ); 1848 );
1746 1849
1747 $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");
1748 $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,
1749 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1750 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 "
1751 . "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 "
1752 . "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.",
1753 on_changed => sub { 1857 on_changed => sub {
… …
1755 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1756 0 1860 0
1757 }, 1861 },
1758 ); 1862 );
1759 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
1760 $table 1886 $table
1761} 1887}
1762 1888
1763sub autopickup_setup { 1889sub autopickup_setup {
1764 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
… …
1770 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1771 ); 1897 );
1772 1898
1773 for ( 1899 for (
1774 ["General", 0, 0, 1900 ["General", 0, 0,
1775 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1776 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1777 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1778 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1779 ], 1904 ],
1780 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1781 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
… …
1829 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1830 } else { 1955 } else {
1831 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1832 } 1957 }
1833 1958
1834 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1835 if defined $::CONN; 1960 if defined $::CONN;
1836 1961
1837 0 1962 0
1838 }); 1963 });
1839 1964
… …
1856 }); 1981 });
1857 1982
1858 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1859 text => "set", 1984 text => "set",
1860 on_activate => sub { 1985 on_activate => sub {
1861 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1862 if defined $::CONN; 1987 if defined $::CONN;
1863 0 1988 0
1864 }); 1989 });
1865 1990
1866 $r 1991 $r
1867} 1992}
1868 1993
1869my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1870 type => sub { 1995 type => sub {
1996 use sort 'stable';
1871 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1872 }, 1998 },
1873 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1874 my $NOW = time; 2001 my $NOW = time;
1875 sort { 2002 sort {
1876 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;
1877 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;
1878 2005
1879 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1880 or $btime <=> $atime 2007 or $btime <=> $atime
1881 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1882 } @_ 2009 } @_
1883 }, 2010 },
1884 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1885 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1886 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1887 } @_ }, 2016 } @_
2017 },
1888); 2018);
1889 2019
1890sub inventory_widget { 2020sub inventory_widget {
1891 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1892 2022
… …
1979 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1980 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1981 } 2111 }
1982} 2112}
1983 2113
1984sub player_window { 2114sub make_playerbook {
1985 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1986 x => "center", 2116 x => "center",
1987 y => "center", 2117 y => "center",
1988 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1989 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
… …
2023 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
2024 2154
2025 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
2026 2156
2027 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
2028 $plwin
2029} 2158}
2030 2159
2031sub keyboard_setup { 2160sub keyboard_setup {
2032 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
2033} 2162}
2034 2163
2035sub help_window { 2164sub make_help_window {
2036 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
2037 x => 'center', 2166 x => 'center',
2038 y => 'center', 2167 y => 'center',
2039 z => 4, 2168 z => 4,
2040 name => 'doc_browser', 2169 name => 'doc_browser',
… …
2129 2258
2130 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2131 $win->show; 2260 $win->show;
2132 }; 2261 };
2133 2262
2134 $win 2263 $HELP_WINDOW = $win;
2135}
2136
2137sub open_string_query {
2138 my ($title, $cb, $txt, $tooltip) = @_;
2139 my $dialog = new DC::UI::Toplevel
2140 x => "center",
2141 y => "center",
2142 z => 50,
2143 force_w => $WIDTH * 4/5,
2144 title => $title;
2145
2146 $dialog->add (
2147 my $e = new DC::UI::Entry
2148 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2149 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2150 tooltip => $tooltip
2151 );
2152
2153 $e->grab_focus;
2154 $e->set_text ($txt) if $txt;
2155 $dialog->show;
2156} 2264}
2157 2265
2158sub open_quit_dialog { 2266sub open_quit_dialog {
2159 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2160 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2193 2301
2194 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2195 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2196} 2304}
2197 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
2198sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2199 # find all tips 2415 # find all tips
2200 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2201 2417
2202 DC::DB::get state => "tip_of_the_day", sub { 2418 DC::DB::get state => "tip_of_the_day", sub {
… …
2247 2463
2248 $dialog->show; 2464 $dialog->show;
2249 }; 2465 };
2250} 2466}
2251 2467
2252sub sdl_init {
2253 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2254 and die "SDL::Init failed!\n";
2255}
2256
2257sub video_init { 2468sub video_init {
2258 DC::set_theme $CFG->{uitheme}; 2469 DC::set_theme $CFG->{uitheme};
2259 2470
2260 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2261 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
… …
2320 2531
2321 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2322 padding => 0, 2533 padding => 0,
2323 z => 100, 2534 z => 100,
2324 force_x => "max", 2535 force_x => "max",
2325 force_y => 0; 2536 force_y => 20;
2326 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2327 2538
2328 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2329 2540
2330 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
… …
2341 2552
2342 (new DC::UI::Frame 2553 (new DC::UI::Frame
2343 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2344 force_x => 0, 2555 force_x => 0,
2345 force_y => "max", 2556 force_y => "max",
2346 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2347 )->show; 2558 )->show;
2348 2559
2349 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2350 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2351 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2352 align => 0, 2563 align => 0,
2353 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2354 fontsize => 0.5, 2565 fontsize => 0.5,
2355 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2356 ); 2567 );
2357 2568
2358 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2359 title => "Minimap", 2570 title => "Minimap",
2360 name => "mapmap", 2571 name => "mapmap",
2361 x => 0, 2572 x => 0,
2362 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2363 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2364 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2365 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2366 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2577 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2367 ), 2578 ),
… …
2396 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2397 # 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
2398 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2399 name => "message_window2", 2610 name => "message_window2",
2400 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2401 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2402 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2403 ; 2615 ;
2404 2616
2405 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2425 . "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 "
2426 . "binding editor closes"); 2638 . "binding editor closes");
2427 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2428 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2429 2641
2430 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2431 2644
2432 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2433 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2434
2435# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2436# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2437
2438 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
2439
2440 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2441 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2442
2443 $BUTTONBAR->add (new DC::UI::Button
2444 text => "Save Config",
2445 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2446 on_activate => sub {
2447 $::CFG->{layout} = DC::UI::get_layout;
2448 DC::write_cfg;
2449 status "Configuration Saved";
2450 0
2451 },
2452 );
2453
2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2455 tooltip => "View Documentation");
2456
2457 $BUTTONBAR->add (new DC::UI::Button
2458 text => "Quit",
2459 tooltip => "Terminates the program",
2460 on_activate => sub {
2461 if ($CONN) {
2462 open_quit_dialog;
2463 } else {
2464 EV::unloop EV::UNLOOP_ALL;
2465 }
2466 0
2467 },
2468 );
2469
2470 $BUTTONBAR->show;
2471 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2472 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2473 } 2647 }
2474 2648
2475 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2649 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2476 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2477 2651
2478 $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;
2479 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2480 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2481 2657
2482 $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]);
2483} 2659}
… …
2493my $animate_timer; 2669my $animate_timer;
2494 2670
2495my $fps = 9; 2671my $fps = 9;
2496 2672
2497sub force_refresh { 2673sub force_refresh {
2498 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2499 $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;
2500 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2501 } 2677 }
2502 2678
2503 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
… …
2511my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2512 2688
2513my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2514 $NOW = EV::now; 2690 $NOW = EV::now;
2515 2691
2516 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2517 for DC::poll_events; 2693 for DC::poll_events;
2518 2694
2519 if (%animate_object) { 2695 if (%animate_object) {
2520 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2521 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
… …
2533sub animation_stop { 2709sub animation_stop {
2534 my ($widget) = @_; 2710 my ($widget) = @_;
2535 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2536} 2712}
2537 2713
2538%SDL_CB = (
2539 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2540 crash "SDL_QUIT"; 2715 crash "SDL_QUIT";
2541 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2542 }, 2717};
2543 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2544 },
2545 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2546 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2547 }, 2721};
2548 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2549# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2550# 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#
2551# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2552# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2553# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2554# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2555 }, 2729};
2556 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2557 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2558 # alt-enter 2732 # alt-enter
2559 video_shutdown; 2733 video_shutdown;
2560 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2561 video_init; 2735 video_init;
2562 } else { 2736 } else {
2563 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2564 } 2738 }
2565 update_modbox; 2739 update_modbox;
2566 }, 2740};
2567 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2568 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2569 update_modbox; 2743 update_modbox;
2570 }, 2744};
2571 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2572 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2573 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2574 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2575 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2576 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2577 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2578 audio_music_finished; 2752 audio_music_finished;
2579 }
2580 }, 2753 }
2581); 2754};
2582 2755
2583############################################################################# 2756#############################################################################
2584 2757
2585$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2586 EV::unloop; 2759 EV::unloop;
2587 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2588}; 2761};
2589 2762
2590# 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
2591sub main { 2764sub main {
2592 { 2765 {
2593 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2594 2767
2595 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2612 DC::DB::open_db; 2785 DC::DB::open_db;
2613 2786
2614 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2615 2788
2616 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2617 sdl_mode => undef, 2791 sdl_mode => undef,
2618 fullscreen => 1, 2792 fullscreen => 1,
2619 fast => 0, 2793 fast => 0,
2620 force_opengl11 => undef, 2794 force_opengl11 => undef,
2621 disable_alpha => 0, 2795 disable_alpha => 0,
2622 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2623 texture_compression => 1, 2798 texture_compression => 1,
2624 map_scale => 1, 2799 map_scale => 1,
2625 fow_enable => 1, 2800 fow_enable => 1,
2626 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2627 map_smoothing => 1, 2803 map_smoothing => 1,
2628 gui_fontsize => 1, 2804 gui_fontsize => 1,
2629 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2630 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2631 gauge_size => 0.35, 2807 gauge_size => 0.35,
… …
2639 effects_enable => 1, 2815 effects_enable => 1,
2640 effects_volume => 1, 2816 effects_volume => 1,
2641 bgm_enable => 1, 2817 bgm_enable => 1,
2642 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2643 output_rate => "", 2819 output_rate => "",
2644 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2645 inv_sort => "mtime", 2821 inv_sort => "mtime",
2646 default => "profile", # default profile 2822 default => "profile", # default profile
2647 show_tips => 1, 2823 show_tips => 1,
2648 logview_max_par => 1000, 2824 logview_max_par => 1000,
2649 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2650 uitheme => "wood", 2826 uitheme => "wood",
2651 ); 2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2652 2829 );
2830
2653 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2654 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2655 } 2833 }
2656 2834
2657 $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} ||= {};
2658 $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;
2659 2862
2660 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2661 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2662 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2663 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
… …
2667 }; 2870 };
2668 } 2871 }
2669 } 2872 }
2670 } 2873 }
2671 2874
2672 sdl_init; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2673 2877
2674 { 2878 {
2675 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2676 DejaVuSans.ttf 2880 DejaVuSans.ttf
2677 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
… …
2679 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2680 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2681 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2682 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2683 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2684 ); 2889 );
2685 2890
2686 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2687 2892
2688 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2689 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2690 2895
2691 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2692 2897
… …
2715 our $STARTUP_CANCEL = EV::idle sub { 2920 our $STARTUP_CANCEL = EV::idle sub {
2716 undef $::STARTUP_CANCEL; 2921 undef $::STARTUP_CANCEL;
2717 $startup_done->(); 2922 $startup_done->();
2718 }; 2923 };
2719 2924
2925 debug_toggle 0;
2926
2720 delete $SIG{__DIE__}; 2927 delete $SIG{__DIE__};
2721 EV::loop; 2928 EV::loop;
2722 2929
2930 DC::write_cfg if $CFG->{config_autosave};
2931
2723#video_shutdown; 2932 #video_shutdown;
2724#audio_shutdown; 2933 #audio_shutdown;
2934
2725 DC::OpenGL::quit; 2935 DC::OpenGL::quit;
2726 DC::SDL_Quit; 2936 DC::SDL_Quit;
2727 DC::DB::Server::stop; 2937 DC::DB::Server::stop;
2728} 2938}
2729 2939
… …
2733 2943
2734deliantra - A Deliantra MORPG game client 2944deliantra - A Deliantra MORPG game client
2735 2945
2736=head1 SYNOPSIS 2946=head1 SYNOPSIS
2737 2947
2738Just run it - no commandline arguments are supported. 2948 deliantra [--profile name] [host [user [password]]]
2949 deliantra --help
2739 2950
2740=head1 USAGE 2951=head1 USAGE
2741 2952
2742deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2953The deliantra client utilises OpenGL for all UI elements and the game. It
2743be used in fullscreen mode and interactively. 2954is supposed to be used in fullscreen mode and interactively.
2744 2955
2745=head1 DEBUGGING 2956=head1 DEBUGGING
2746 2957
2747
2748CFPLUS_DEBUG - environment variable 2958DELIANTRA_DEBUG - environment variable
2749 2959
2750 1 draw borders around widgets 2960 1 draw borders around widgets
2751 2 add low-level widget info to tooltips 2961 2 add low-level widget info to tooltips
2752 4 show fps 2962 4 show fps
2753 8 suppress tooltips 2963 8 suppress tooltips
2964 16 show bandwidth downstream
2754 2965
2755=head1 AUTHOR 2966=head1 AUTHOR
2756 2967
2757Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2968Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2758 2969

Diff Legend

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