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.119 by root, Mon Dec 26 22:30:21 2011 UTC

5 use Coro; 5 use Coro;
6 use Coro::EV; 6 use Coro::EV;
7 use Coro::Debug; 7 use Coro::Debug;
8 our $debug = new_unix_server Coro::Debug "/tmp/dc"; 8 our $debug = new_unix_server Coro::Debug "/tmp/dc";
9 '; 9 ';
10 die if $@;
10} 11}
11 12
12# do splash-screen thingy on win32 13# do splash-screen thingy on win32
13my $startup_done = sub { }; 14my $startup_done = sub { };
14BEGIN { 15BEGIN {
21 22
22 Win32::GUI::SplashScreen::Show ( 23 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 24 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 25 );
25 26
27 # initialise the resolver now, as vista forces us back to the desktop
28 # when doing this later.
29 require AnyEvent::DNS;
30 AnyEvent::DNS::resolver ();
31
26 $startup_done = sub { 32 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 33 Win32::GUI::SplashScreen::Done (1);
28 }; 34 };
29 } 35 }
30} 36}
31 37
32use strict; 38use common::sense;
33use utf8;
34 39
35use Carp 'verbose'; 40use Carp 'verbose';
36 41
37# do things only needed for single-binary version (par) 42# do things only needed for single-binary version (par)
38BEGIN { 43BEGIN {
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 # OS X 60 # 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"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
61 } 64 }
62 65
63 unshift @INC, $root; 66 unshift @INC, $root;
64 } 67 }
65} 68}
66 69
67# prepend private library directory 70# prepend private library directory and prepare env
68BEGIN { 71BEGIN {
69 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 74 if (-d $path) {
72 unshift @INC, $path; 75 unshift @INC, $path;
86 89
87use Deliantra; 90use Deliantra;
88use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
89 92
90use AnyEvent::Util (); 93use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
93 96
94use Compress::LZF; 97use Compress::LZF;
95use JSON::XS; 98use JSON::XS;
96 99
97use DC; 100use DC;
125 128
126$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
127$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
128 131
129$EV::DIED = sub { 132$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1; 133 crash "CRASH/EV::DIED: $@" => 0;
131 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
132}; 135};
133 136
134my $MAX_FPS = 60; 137my $MAX_FPS = 60;
138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
135 140
136our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
137 142
138our $LAST_REFRESH; 143our $LAST_REFRESH;
139our $NOW; 144our $NOW;
140 145
141our $CFG; 146our $CFG;
142our $PROFILE; # current profile 147our $PROFILE; # current profile
143our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
149our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
144 150
145our $WANT_REFRESH; 151our $WANT_REFRESH;
146 152
147our $MODE_SLIDER; 153our $MODE_SLIDER;
148our $CAVEAT_LABEL; 154our $CAVEAT_LABEL;
161 167
162our $MAP; 168our $MAP;
163our $MAPMAP; 169our $MAPMAP;
164our $MAPWIDGET; 170our $MAPWIDGET;
165our $COMPLETER; 171our $COMPLETER;
166our $BUTTONBAR; 172our $MENUFRAME; # the rectangle at the top
173our $MENUBAR; # the hbox at the top
174our $MENUPOPUP;
175our $BUTTONBAR; # the menu buttons
167our $METASERVER; 176our $METASERVER;
168our $LOGIN_BUTTON; 177our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 178our $QUIT_DIALOG;
170our $HOST_ENTRY; 179our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 180our $FULLSCREEN_ENABLE;
197our $FLOORBOX; 206our $FLOORBOX;
198our $GAUGES; 207our $GAUGES;
199our $STATWIDS; 208our $STATWIDS;
200 209
201our $SDL_ACTIVE; 210our $SDL_ACTIVE;
202our %SDL_CB; 211our @SDL_CB;
203 212
204our $ALT_ENTER_MESSAGE; 213our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 214our $STATUSBOX;
206our $MODBOX; 215our $MODBOX;
207our $DEBUG_STATUS; 216our $DEBUG_STATUS;
215# write a crash message blockingly to the socket, if possible 224# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy. 225# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) { 226*crash = sub($;$) {
218 my ($msg, $backtrace) = @_; 227 my ($msg, $backtrace) = @_;
219 228
229 warn $msg;
230
220 return unless $CONN; 231 return unless $CONN;
221 232
222 my $fh = $CONN->{fh} 233 my $fh = $CONN->{fh}
223 or return; 234 or return;
224 235
234 245
235 # backtrace as second step, in case it crashes, too 246 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 247 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace; 248 if $backtrace;
238}; 249};
250
251sub clienterror($;$) {
252 my ($msg, $backtrace) = @_;
253
254 warn $msg;
255
256 return unless $CONN;
257
258 $CONN->send_exti_msg (clientlog => $msg);
259 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
260}
239 261
240############################################################################# 262#############################################################################
241 263
242sub status { 264sub status {
243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 265 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
325 or return; 347 or return;
326 348
327 $meta->{data} 349 $meta->{data}
328 or return; 350 or return;
329 351
330 # if its a jingle, play it as ambient music 352 # if it's a jingle, play it as ambient music
331 if ($meta->{data}{jingle}) { 353 if ($meta->{data}{jingle}) {
332 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 354 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
333 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 355 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
334 &audio_music_push ($face); 356 &audio_music_push ($face);
335 } 357 }
336 } else { 358 } else {
337 # fetch from database 359 # fetch from database
338 DC::DB::get res_data => $meta->{name}, sub { 360 DC::DB::get res_data => $meta->{name}, sub {
339 my $rwops = new DC::RW $_[0]; 361 my $rwops = new DC::RW $_[0];
340 my $chunk = new DC::MixChunk $rwops 362 my $chunk = new DC::MixChunk $rwops
341 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 363 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
342 $chunk->volume (($meta->{data}{volume} || 1) * 128); 364 $chunk->volume (($meta->{data}{volume} || 1) * 128);
343 $AUDIO_CHUNK{$face} = $chunk; 365 $AUDIO_CHUNK{$face} = $chunk;
344 366
345 audio_sound_push ($face); 367 audio_sound_push ($face);
346 }; 368 };
393 415
394 audio_music_update_volume; 416 audio_music_update_volume;
395 417
396 $MUSIC_PLAYING_DATA = \$_[0]; 418 $MUSIC_PLAYING_DATA = \$_[0];
397 419
420 $meta->{path} or length $_[0]
421 or return clienterror "empty music face from res_data ($meta->{face})";#d#
422
398 my $rwops = $meta->{path} 423 my $rwops = $meta->{path}
399 ? new_from_file DC::RW $meta->{path} 424 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
400 : new DC::RW $$MUSIC_PLAYING_DATA; 425 : new DC::RW $$MUSIC_PLAYING_DATA;
401 426
402 $MUSIC_PLAYER = new DC::MixMusic $rwops 427 $MUSIC_PLAYER = new DC::MixMusic $rwops
403 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 428 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
404 429
405 my $NOW = time; 430 my $NOW = time;
406 431
407 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 432 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
408 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 433 my $pos = $MUSIC_PLAYING_META->{stop_pos};
494 audio_music_push; 519 audio_music_push;
495} 520}
496 521
497sub audio_init { 522sub audio_init {
498 if ($CFG->{audio_enable}) { 523 if ($CFG->{audio_enable}) {
524 if (length $CFG->{audio_driver}) {
525 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
526 DC::SDL_Init DC::SDL_INIT_AUDIO
527 and die "SDL::Init failed!\n";
528 } else {
529 DC::SDL_Init DC::SDL_INIT_AUDIO
530 and die "SDL::Init failed!\n";
531 }
532
499 $ENV{MIX_EFFECTSMAXSPEED} = 1; 533 $ENV{MIX_EFFECTSMAXSPEED} = 1;
500 $SDL_MIXER = !DC::Mix_OpenAudio 534 $SDL_MIXER = !DC::Mix_OpenAudio
501 $CFG->{audio_hw_frequency}, 535 $CFG->{audio_hw_frequency},
502 DC::MIX_DEFAULT_FORMAT, 536 DC::MIX_DEFAULT_FORMAT,
503 $CFG->{audio_hw_channels}, 537 $CFG->{audio_hw_channels},
517 sub audio_tab_update; 551 sub audio_tab_update;
518 audio_tab_update; 552 audio_tab_update;
519} 553}
520 554
521sub audio_shutdown { 555sub audio_shutdown {
556 if ($SDL_MIXER) {
557 DC::MixMusic::halt;
558 DC::Mix_AllocateChannels 0;
559 }
560
522 undef $MUSIC_PLAYER; 561 undef $MUSIC_PLAYER;
523 undef $MUSIC_PLAYING_META; 562 undef $MUSIC_PLAYING_META;
524 undef $MUSIC_PLAYING_DATA; 563 undef $MUSIC_PLAYING_DATA;
525 564
526 $MUSIC_WANT = []; 565 $MUSIC_WANT = [];
528 %AUDIO_PLAY = (); 567 %AUDIO_PLAY = ();
529 %AUDIO_CHUNK = (); 568 %AUDIO_CHUNK = ();
530 569
531 DC::Mix_CloseAudio if $SDL_MIXER; 570 DC::Mix_CloseAudio if $SDL_MIXER;
532 undef $SDL_MIXER; 571 undef $SDL_MIXER;
572
573 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
533} 574}
534 575
535############################################################################# 576#############################################################################
536 577
537sub destroy_query_dialog { 578sub destroy_query_dialog {
766} 807}
767 808
768sub dc_connect { 809sub dc_connect {
769 my ($host, $port) = @_; 810 my ($host, $port) = @_;
770 811
771 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 812 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
813 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
772 814
773 $CONN = 815 $CONN =
774 new DC::Protocol 816 new DC::Protocol
775 host => $host, 817 host => $host,
776 port => $port, 818 port => $port,
777 user => $PROFILE->{user}, 819 user => $PROFILE->{user},
778 pass => $PROFILE->{password}, 820 pass => $PROFILE->{password},
779 mapw => $mapsize, 821 mapw => $mapw,
780 maph => $mapsize, 822 maph => $maph,
781 823
824 c_version => {
825 client => "deliantra",
782 client => "$DC::VERSION $] $^O", 826 clientver => $DC::VERSION,
827 gl_vendor => DC::OpenGL::gl_vendor,
828 gl_version => DC::OpenGL::gl_version,
829 },
783 830
784 map_widget => $MAPWIDGET, 831 map_widget => $MAPWIDGET,
785 statusbox => $STATUSBOX, 832 statusbox => $STATUSBOX,
786 map => $MAP, 833 map => $MAP,
787 mapmap => $MAPMAP, 834 mapmap => $MAPMAP,
793 840
794 on_connect => sub { 841 on_connect => sub {
795 if ($_[0]) { 842 if ($_[0]) {
796 DC::lowdelay fileno $CONN->{fh}; 843 DC::lowdelay fileno $CONN->{fh};
797 844
798 status "login successful"; 845 status "successfully connected to the server";
799 } else { 846 } else {
800 undef $CONN; 847 undef $CONN;
801 status "unable to connect: $!"; 848 status "unable to connect: $!";
802 stop_game(); 849 stop_game();
803 } 850 }
805 ; 852 ;
806} 853}
807 854
808sub start_game { 855sub start_game {
809 status "logging in..."; 856 status "logging in...";
857
858 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
859 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
860 or return status "$server: unable to parse server address, try an empty field.";
810 861
811 $LOGIN_BUTTON->set_text ("Logout"); 862 $LOGIN_BUTTON->set_text ("Logout");
812 $SETUP_DIALOG->hide; 863 $SETUP_DIALOG->hide;
813
814 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
815 864
816 $MAP = new DC::Map; 865 $MAP = new DC::Map;
817 866
818 # hack to make SURE we find the IP address all right 867 # hack to make SURE we find the IP address all right
819 # can be removed once AnyEvent::DNS is proven stable. 868 # can be removed once AnyEvent::DNS is proven stable.
820 if ($host eq "gameserver.deliantra.net") { 869 if ($host eq "gameserver.deliantra.net") {
821 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 870 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
822 if ($_[0] ne "80.101.114.108") { # Perl 871 if ($_[0] ne "80.101.114.108") { # P-e-r-l
872 status "dns failure, trying differently";
873 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
874 unless (defined $host) {
823 status "dns failure, using hardcoded address"; 875 status "dns failure, using hardcoded address";
824 $host = "129.13.162.95"; 876 $host = "194.126.175.154";
877 }
825 } 878 }
826 879
827 dc_connect $host, $port; 880 dc_connect $host, $port;
828 }; 881 };
829 } else { 882 } else {
896 949
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
898 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 951 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
899 952
900 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 953 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
954 c_rescale => 1,
901 force_w => $WIDTH * 0.1, expand => 1, 955 force_w => $WIDTH * 0.1, expand => 1,
902 range => [ ($CFG->{sdl_mode}) x 3 ], 956 range => [ ($CFG->{sdl_mode}) x 3 ],
903 tooltip => $vidmode_tooltip); 957 tooltip => $vidmode_tooltip);
904 $hbox->add (my $mode_label = new DC::UI::Label 958 $hbox->add (my $mode_label = new DC::UI::Label
905 height => 0.8, template => "9999x9999@9+9", 959 height => 0.8, template => "9999x9999@9+9",
933 ); 987 );
934 988
935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha"); 989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
936 $table->add_at (1, $row++, new DC::UI::CheckBox 990 $table->add_at (1, $row++, new DC::UI::CheckBox
937 state => $CFG->{disable_alpha}, 991 state => $CFG->{disable_alpha},
938 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse " 992 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 " 993 . "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 " 994 . "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 " 995 . "back to extremely slow rendering if this is enabled. If disabling this option "
942 . "noticably improves the framerate of the client please report this! " 996 . "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>", 997 . "<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, " 1051 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
998 . "then disable this option. Changes take effect immdiately.", 1052 . "then disable this option. Changes take effect immdiately.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1000 ); 1054 );
1001 1055
1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1057 $table->add_at (1, $row++, new DC::UI::CheckBox
1058 state => $CFG->{smooth_transitions},
1059 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1060 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1061 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1062 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1063 );
1064
1065
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1003 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
1004 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1068 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1005 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1069 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1006 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1070 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1082 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1019 $table->add_at (1, $row++, new DC::UI::CheckBox 1083 $table->add_at (1, $row++, new DC::UI::CheckBox
1020 state => $CFG->{fow_enable}, 1084 state => $CFG->{fow_enable},
1021 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1085 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1086 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1087 );
1088
1089 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1090 $table->add_at (1, $row++, new DC::UI::ImageButton
1091 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1092 bg => [0.3, 0.3, 0.2],
1093 force_w => 64,
1094 force_h => 64,
1095 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1096 on_activate => sub {
1097 my ($self) = @_;
1098 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1099 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1100 $MAPWIDGET->update;
1101 }
1023 ); 1102 );
1024 1103
1025 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1104 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1026 $table->add_at (1, $row++, new DC::UI::Slider 1105 $table->add_at (1, $row++, new DC::UI::Slider
1027 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1106 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1078 ]); 1157 ]);
1079 1158
1080 my $text = !$freq 1159 my $text = !$freq
1081 ? "audio is off" 1160 ? "audio is off"
1082 : "audio is enabled\n" 1161 : "audio is enabled\n"
1162 . "driver: " . DC::SDL_AudioDriverName . "\n"
1083 . "frequency (Hz): $freq\n" 1163 . "frequency (Hz): $freq\n"
1084 . "channels: $chans"; 1164 . "channels: $chans\n"
1165 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1166 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1085 1167
1086 $AUDIO_INFO->set_text ($text); 1168 $AUDIO_INFO->set_text ($text);
1087} 1169}
1088 1170
1089sub audio_setup { 1171sub audio_setup {
1092 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1174 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
1093 1175
1094 my $row = 0; 1176 my $row = 0;
1095 1177
1096 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable"); 1178 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
1097 $table->add_at (1, $row++, new DC::UI::CheckBox 1179 $table->add_at (1, $row, new DC::UI::CheckBox
1098 state => $CFG->{audio_enable}, 1180 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.", 1181 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
1100 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1182 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
1183 );
1184 $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
1185
1186 $driver->add (new DC::UI::Label align => 1, text => " Audio driver override");
1187 $driver->add (new DC::UI::Entry
1188 text => $CFG->{audio_driver},
1189 template => "dsound1234",
1190 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1191 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1192 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1193 . "or other system-specific drivers. Selecting the wrong driver here will simply result"
1194 . "in no sound.",
1195 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1101 ); 1196 );
1102 1197
1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1198 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
1104 $table->add_at (1, $row, new DC::UI::CheckBox 1199 $table->add_at (1, $row, new DC::UI::CheckBox
1105 expand => 1, state => $CFG->{effects_enable}, 1200 expand => 1, state => $CFG->{effects_enable},
1118 ); 1213 );
1119 1214
1120 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1215 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1121 $table->add_at (1, $row, new DC::UI::CheckBox 1216 $table->add_at (1, $row, new DC::UI::CheckBox
1122 expand => 1, state => $CFG->{bgm_enable}, 1217 expand => 1, state => $CFG->{bgm_enable},
1123 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1218 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1124 on_changed => sub { 1219 on_changed => sub {
1125 $CFG->{bgm_enable} = $_[1]; 1220 $CFG->{bgm_enable} = $_[1];
1126 $CONN->update_fx_want if $CONN; 1221 $CONN->update_fx_want if $CONN;
1127 audio_music_push; 1222 audio_music_push;
1128 1 1223 1
1139 c_colspan => 2, expand => 1, 1234 c_colspan => 2, expand => 1,
1140 value => $CFG->{audio_hw_frequency}, 1235 value => $CFG->{audio_hw_frequency},
1141 options => [ 1236 options => [
1142 [ 0, "default" , "Use System Default"], 1237 [ 0, "default" , "Use System Default"],
1143 [11025, "11 kHz" , "11kHz (low quality)"], 1238 [11025, "11 kHz" , "11kHz (low quality)"],
1144 [22050, "22 kHz" , "22kHz (reduced quality)"], 1239 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1145 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1240 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1146 [48000, "48 kHz" , "48kHz (studio quality)"], 1241 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1147 ], 1242 ],
1148 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1243 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1149 on_changed => sub { 1244 on_changed => sub {
1150 $CFG->{audio_hw_frequency} = $_[1]; 1245 $CFG->{audio_hw_frequency} = $_[1];
1151 audio_tab_update; 1246 audio_tab_update;
1175 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency"); 1270 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1176 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1271 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1177 c_colspan => 2, expand => 1, 1272 c_colspan => 2, expand => 1,
1178 value => $CFG->{audio_hw_chunksize}, 1273 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 " 1274 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.", 1275 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1181 on_changed => sub { 1276 on_changed => sub {
1182 $CFG->{audio_hw_chunksize} = $_[1]; 1277 $CFG->{audio_hw_chunksize} = $_[1];
1183 audio_tab_update; 1278 audio_tab_update;
1184 1 1279 1
1185 } 1280 }
1229} 1324}
1230 1325
1231sub make_gauge_window { 1326sub make_gauge_window {
1232 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1327 my $gh = int $HEIGHT * $CFG->{gauge_size};
1233 1328
1234 my $win = new DC::UI::Frame ( 1329 $GAUGES->{win} = my $win = new DC::UI::Frame (
1235 force_x => 0, 1330 force_x => 0,
1236 force_y => "max", 1331 force_y => "max",
1237 force_w => $WIDTH, 1332 force_w => $WIDTH,
1238 force_h => $gh, 1333 force_h => $gh,
1239 ); 1334 );
1255 (new DC::UI::Empty expand => 1), 1350 (new DC::UI::Empty expand => 1),
1256 (my $hb = new DC::UI::HBox), 1351 (my $hb = new DC::UI::HBox),
1257 ], 1352 ],
1258 ); 1353 );
1259 1354
1260 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1355 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1261 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1356 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1262 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1357 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1263 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1358 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
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 1359
1276 &set_gauge_window_fontsize; 1360 &set_gauge_window_fontsize;
1277 1361
1278 $win 1362 $win
1363}
1364
1365our $BW_WATCHER;
1366
1367sub debug_toggle($) {
1368 $DELIANTRA_DEBUG ^= $_[0];
1369
1370 if ($DELIANTRA_DEBUG & 16) {
1371 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1372 return unless $CONN;
1373 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1374 $CONN->{octets_in} = 0;
1375 };
1376 } else {
1377 undef $BW_WATCHER;
1378 }
1379
1279} 1380}
1280 1381
1281sub debug_setup { 1382sub debug_setup {
1282 my $table = new DC::UI::Table; 1383 my $table = new DC::UI::Table;
1283 1384
1284 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1385 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1285 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1386 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1286 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1387 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1287 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1388 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1288 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1389 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1289 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1390 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1290 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1391 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1291 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1392 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1393 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1394 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1395
1292 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1396 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1293
1294 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1397 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1295 1398
1296 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1399 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1297 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1400 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1298 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1401 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1299 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1402 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1420 para => ["Paralysation", 1523 para => ["Paralysation",
1421 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1524 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1422 deat => ["Death", 1525 deat => ["Death",
1423 "<b>Death</b> (resistance against death spells)"], 1526 "<b>Death</b> (resistance against death spells)"],
1424 phys => ["Physical", 1527 phys => ["Physical",
1425 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"], 1528 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed as the 'Arm' secondary stat.)"],
1426 blind => ["Blind", 1529 blind => ["Blind",
1427 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1530 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1428 fear => ["Fear", 1531 fear => ["Fear",
1429 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"], 1532 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1430 tund => ["Turn undead", 1533 tund => ["Turn undead",
1620 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1723 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1621 ); 1724 );
1622 1725
1623 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1726 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1624 $table->add_at (1, 4, new DC::UI::Entry 1727 $table->add_at (1, 4, new DC::UI::Entry
1625 text => $CFG->{profile}{default}{user}, 1728 text => $PROFILE->{user},
1626 tooltip => "The name of your character on the server.", 1729 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 } 1730 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1628 ); 1731 );
1629 1732
1630 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1733 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1631 $table->add_at (1, 5, new DC::UI::Entry 1734 $table->add_at (1, 5, new DC::UI::Entry
1632 text => $CFG->{profile}{default}{password}, 1735 text => $PROFILE->{password},
1633 hidden => 1, 1736 hidden => 1,
1634 tooltip => "The password for your character.", 1737 tooltip => "The password for your character.",
1635 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1738 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1636 ); 1739 );
1637 1740
1638 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1741 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1639 expand => 1, 1742 expand => 1,
1640 text => "Login / Register", 1743 text => "Login / Register",
1676 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1779 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1677 1780
1678 $vbox->add ( 1781 $vbox->add (
1679 $HOST_ENTRY = new DC::UI::Entry 1782 $HOST_ENTRY = new DC::UI::Entry
1680 expand => 1, 1783 expand => 1,
1681 text => $CFG->{profile}{default}{host}, 1784 text => $PROFILE->{host},
1682 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1785 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1683 on_changed => sub { 1786 on_changed => sub {
1684 my ($self, $value) = @_; 1787 my ($self, $value) = @_;
1685 $CFG->{profile}{default}{host} = $value; 1788 $PROFILE->{host} = $value;
1686 1 1789 1
1687 } 1790 }
1688 ); 1791 );
1689 1792
1690 if (0) { #d# disabled 1793 if (0) { #d# disabled
1733 1836
1734 my $row = 0; 1837 my $row = 0;
1735 1838
1736 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1737 $table->add_at (1, $row++, new DC::UI::CheckBox 1840 $table->add_at (1, $row++, new DC::UI::CheckBox
1841 c_colspan => 2,
1738 state => $CFG->{show_tips}, 1842 state => $CFG->{show_tips},
1739 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1843 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1740 on_changed => sub { 1844 on_changed => sub {
1741 my ($self, $value) = @_; 1845 my ($self, $value) = @_;
1742 $CFG->{show_tips} = $value; 1846 $CFG->{show_tips} = $value;
1744 } 1848 }
1745 ); 1849 );
1746 1850
1747 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1851 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1748 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1852 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1853 c_colspan => 2,
1749 text => $CFG->{logview_max_par}, 1854 text => $CFG->{logview_max_par},
1750 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1855 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1751 . "sends more messages than this number, older messages get removed to save memory and " 1856 . "sends more messages than this number, older messages get removed to save memory and "
1752 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1857 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1753 on_changed => sub { 1858 on_changed => sub {
1755 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1860 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1756 0 1861 0
1757 }, 1862 },
1758 ); 1863 );
1759 1864
1865 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1866 $table->add_at (1, $row, new DC::UI::CheckBox
1867 state => $CFG->{config_autosave},
1868 tooltip => "Normally, configuration settings and the user interface layout "
1869 . "are saved on client exit. You can disable this behaviour by "
1870 . "unchecking this checkbox.",
1871 on_changed => sub {
1872 my ($self, $value) = @_;
1873 $CFG->{config_autosave} = $value;
1874 0
1875 }
1876 );
1877 $table->add_at (2, $row++, new DC::UI::Button
1878 text => "Save Now",
1879 tooltip => "Use this to manually save configuration and UI layout when "
1880 . "autosave is disabled.",
1881 on_activate => sub {
1882 DC::write_cfg;
1883 0
1884 }
1885 );
1886
1760 $table 1887 $table
1761} 1888}
1762 1889
1763sub autopickup_setup { 1890sub autopickup_setup {
1764 my $r = new DC::UI::ScrolledWindow ( 1891 my $r = new DC::UI::ScrolledWindow (
1770 col_expand => [0, 1, 0, 1], 1897 col_expand => [0, 1, 0, 1],
1771 ); 1898 );
1772 1899
1773 for ( 1900 for (
1774 ["General", 0, 0, 1901 ["General", 0, 0,
1775 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1776 ["Inhibit autopickup" => PICKUP_INHIBIT], 1902# ["Inhibit autopickup" => PICKUP_INHIBIT],
1777 ["Stop before pickup" => PICKUP_STOP], 1903 ["Stop before pickup" => PICKUP_STOP],
1778 ["Debug autopickup" => PICKUP_DEBUG], 1904 ["Debug autopickup" => PICKUP_DEBUG],
1779 ], 1905 ],
1780 ["Weapons", 0, 6, 1906 ["Weapons", 0, 6,
1781 ["All weapons" => PICKUP_ALLWEAPON], 1907 ["All weapons" => PICKUP_ALLWEAPON],
1829 $::CFG->{pickup} |= $mask; 1955 $::CFG->{pickup} |= $mask;
1830 } else { 1956 } else {
1831 $::CFG->{pickup} &= ~$mask; 1957 $::CFG->{pickup} &= ~$mask;
1832 } 1958 }
1833 1959
1834 $::CONN->send_command ("pickup $::CFG->{pickup}") 1960 $::CONN->send_pickup ($::CFG->{pickup})
1835 if defined $::CONN; 1961 if defined $::CONN;
1836 1962
1837 0 1963 0
1838 }); 1964 });
1839 1965
1856 }); 1982 });
1857 1983
1858 $table->add_at (3, 18, new DC::UI::Button 1984 $table->add_at (3, 18, new DC::UI::Button
1859 text => "set", 1985 text => "set",
1860 on_activate => sub { 1986 on_activate => sub {
1861 $::CONN->send_command ("pickup $::CFG->{pickup}") 1987 $::CONN->send_pickup ($::CFG->{pickup})
1862 if defined $::CONN; 1988 if defined $::CONN;
1863 0 1989 0
1864 }); 1990 });
1865 1991
1866 $r 1992 $r
1867} 1993}
1868 1994
1869my %SORT_ORDER = ( 1995my %SORT_ORDER = (
1870 type => sub { 1996 type => sub {
1997 use sort 'stable';
1871 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1998 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1872 }, 1999 },
1873 mtime => sub { 2000 mtime => sub {
2001 use sort 'stable';
1874 my $NOW = time; 2002 my $NOW = time;
1875 sort { 2003 sort {
1876 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 2004 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1877 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 2005 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1878 2006
1879 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2007 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1880 or $btime <=> $atime 2008 or $btime <=> $atime
1881 or $a->{type} <=> $b->{type} 2009 or $a->{type} <=> $b->{type}
1882 } @_ 2010 } @_
1883 }, 2011 },
1884 weight => sub { sort { 2012 weight => sub {
2013 use sort 'stable';
2014 sort {
1885 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2015 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1886 or $a->{type} <=> $b->{type} 2016 or $a->{type} <=> $b->{type}
1887 } @_ }, 2017 } @_
2018 },
1888); 2019);
1889 2020
1890sub inventory_widget { 2021sub inventory_widget {
1891 my $hb = new DC::UI::HBox homogeneous => 1; 2022 my $hb = new DC::UI::HBox homogeneous => 1;
1892 2023
1979 $PL_NOTEBOOK->set_current_page ($widget); 2110 $PL_NOTEBOOK->set_current_page ($widget);
1980 $PL_WINDOW->show; 2111 $PL_WINDOW->show;
1981 } 2112 }
1982} 2113}
1983 2114
1984sub player_window { 2115sub make_playerbook {
1985 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2116 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1986 x => "center", 2117 x => "center",
1987 y => "center", 2118 y => "center",
1988 force_w => $WIDTH * 9/10, 2119 force_w => $WIDTH * 9/10,
1989 force_h => $HEIGHT * 9/10, 2120 force_h => $HEIGHT * 9/10,
2023 "License, Author and Source info for media sent by the server."); 2154 "License, Author and Source info for media sent by the server.");
2024 2155
2025 $ntb->set_current_page ($INVENTORY_PAGE); 2156 $ntb->set_current_page ($INVENTORY_PAGE);
2026 2157
2027 $plwin->add ($ntb); 2158 $plwin->add ($ntb);
2028 $plwin
2029} 2159}
2030 2160
2031sub keyboard_setup { 2161sub keyboard_setup {
2032 DC::Macro::keyboard_setup 2162 DC::Macro::keyboard_setup
2033} 2163}
2034 2164
2035sub help_window { 2165sub make_help_window {
2036 my $win = new DC::UI::Toplevel 2166 my $win = new DC::UI::Toplevel
2037 x => 'center', 2167 x => 'center',
2038 y => 'center', 2168 y => 'center',
2039 z => 4, 2169 z => 4,
2040 name => 'doc_browser', 2170 name => 'doc_browser',
2129 2259
2130 $load_node->((DC::Pod::find @path)[0]); 2260 $load_node->((DC::Pod::find @path)[0]);
2131 $win->show; 2261 $win->show;
2132 }; 2262 };
2133 2263
2134 $win 2264 $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} 2265}
2157 2266
2158sub open_quit_dialog { 2267sub open_quit_dialog {
2159 unless ($QUIT_DIALOG) { 2268 unless ($QUIT_DIALOG) {
2160 $QUIT_DIALOG = new DC::UI::Toplevel 2269 $QUIT_DIALOG = new DC::UI::Toplevel
2193 2302
2194 $QUIT_DIALOG->show; 2303 $QUIT_DIALOG->show;
2195 $QUIT_DIALOG->grab_focus; 2304 $QUIT_DIALOG->grab_focus;
2196} 2305}
2197 2306
2307sub make_menubar {
2308 $MENUFRAME = new DC::UI::Toplevel
2309 border => 0,
2310 force_x => 0,
2311 force_y => 0,
2312 force_w => $::WIDTH,
2313 child => ($MENUBAR = new DC::UI::HBox),
2314 ;
2315
2316 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2317
2318 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2319 make_gauge_window->show;
2320
2321# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2322# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2323
2324 make_playerbook;
2325
2326 $MENUPOPUP = DC::UI::Menu->new (items => [
2327 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2328 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2329 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2330 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2331 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2332 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2333 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2334 ["Quit…" , sub {
2335 if ($CONN) {
2336 open_quit_dialog;
2337 } else {
2338 EV::unloop EV::UNLOOP_ALL;
2339 }
2340 }],
2341 ]);
2342
2343 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2344 tooltip => "Shows the main menu",
2345 on_button_down => sub {
2346 my ($self, $ev) = @_;
2347 local $ev->{x} = 0;
2348 local $ev->{y} = 0;
2349 $MENUPOPUP->popup ($ev);
2350 },
2351 );
2352
2353 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2354 padding_x => 6,
2355 padding_y => 3,
2356 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2357 template => " Exp: 888,888,888,888 (lvl 188) ",
2358 );
2359
2360 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2361 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2362 . "will automatically pick up items as defined by your item pickup settings "
2363 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2364 . "disable autopickup by disabling this checkbox.",
2365 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2366 on_changed => sub {
2367 my ($self, $value) = @_;
2368 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2369 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2370 $CONN->send_pickup ($CFG->{pickup})
2371 if $CONN;
2372 },
2373 );
2374
2375 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2376 c_rescale => 1,
2377 padding_x => 6,
2378 padding_y => 3,
2379 force_w => $::WIDTH * 0.2,
2380 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2381 template => "two handed weapons 99%",
2382 );
2383
2384 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2385 expand => 1,
2386 align => 1, can_hover => 1, can_events => 1,
2387 text => "Range and Combat Slots",
2388 tooltip => "#stat_ranged",
2389 );
2390
2391 $MENUFRAME->show;
2392}
2393
2394sub open_string_query {
2395 my ($title, $cb, $txt, $tooltip) = @_;
2396 my $dialog = new DC::UI::Toplevel
2397 x => "center",
2398 y => "center",
2399 z => 50,
2400 force_w => $WIDTH * 4/5,
2401 title => $title;
2402
2403 $dialog->add (
2404 my $e = new DC::UI::Entry
2405 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2406 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2407 tooltip => $tooltip
2408 );
2409
2410 $e->grab_focus;
2411 $e->set_text ($txt) if $txt;
2412 $dialog->show;
2413}
2414
2198sub show_tip_of_the_day { 2415sub show_tip_of_the_day {
2199 # find all tips 2416 # find all tips
2200 my @tod = DC::Pod::find tip_of_the_day => "*"; 2417 my @tod = DC::Pod::find tip_of_the_day => "*";
2201 2418
2202 DC::DB::get state => "tip_of_the_day", sub { 2419 DC::DB::get state => "tip_of_the_day", sub {
2247 2464
2248 $dialog->show; 2465 $dialog->show;
2249 }; 2466 };
2250} 2467}
2251 2468
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 { 2469sub video_init {
2258 DC::set_theme $CFG->{uitheme}; 2470 DC::set_theme $CFG->{uitheme};
2259 2471
2260 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2472 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2261 $SDL_REINIT = 0; 2473 $SDL_REINIT = 0;
2320 2532
2321 $DEBUG_STATUS = new DC::UI::Label 2533 $DEBUG_STATUS = new DC::UI::Label
2322 padding => 0, 2534 padding => 0,
2323 z => 100, 2535 z => 100,
2324 force_x => "max", 2536 force_x => "max",
2325 force_y => 0; 2537 force_y => 20;
2326 $DEBUG_STATUS->show; 2538 $DEBUG_STATUS->show;
2327 2539
2328 $STATUSBOX = new DC::UI::Statusbox; 2540 $STATUSBOX = new DC::UI::Statusbox;
2329 2541
2330 $MODBOX = new DC::UI::Label 2542 $MODBOX = new DC::UI::Label
2341 2553
2342 (new DC::UI::Frame 2554 (new DC::UI::Frame
2343 bg => [0, 0, 0, 0.4], 2555 bg => [0, 0, 0, 0.4],
2344 force_x => 0, 2556 force_x => 0,
2345 force_y => "max", 2557 force_y => "max",
2346 child => (my $LR = new DC::UI::VBox), 2558 child => (my $LL = new DC::UI::VBox),
2347 )->show; 2559 )->show;
2348 2560
2349 $LR->add ($STATUSBOX); 2561 $LL->add ($STATUSBOX);
2350 $LR->add ($MODBOX); 2562 $LL->add ($MODBOX);
2351 $LR->add (new DC::UI::Label 2563 $LL->add (new DC::UI::Label
2352 align => 0, 2564 align => 0,
2353 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2565 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2354 fontsize => 0.5, 2566 fontsize => 0.5,
2355 fg => [1, 1, 0, 0.7], 2567 fg => [1, 1, 0, 0.7],
2356 ); 2568 );
2357 2569
2358 DC::UI::Toplevel->new ( 2570 DC::UI::Toplevel->new (
2359 title => "Minimap", 2571 title => "Minimap",
2360 name => "mapmap", 2572 name => "mapmap",
2361 x => 0, 2573 x => 0,
2362 y => $FONTSIZE + 8, 2574 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2363 border_bg => [1, 1, 1, 192/255], 2575 border_bg => [1, 1, 1, 192/255],
2364 bg => [1, 1, 1, 0], 2576 bg => [1, 1, 1, 0],
2365 child => ($MAPMAP = new DC::MapWidget::MapMap 2577 child => ($MAPMAP = new DC::MapWidget::MapMap
2366 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2578 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2367 ), 2579 ),
2396 $METASERVER = metaserver_dialog; 2608 $METASERVER = metaserver_dialog;
2397 # the name is changed to not conflict with the older name as users could have hidden it 2609 # the name is changed to not conflict with the older name as users could have hidden it
2398 $MESSAGE_WINDOW = new DC::UI::Dockbar 2610 $MESSAGE_WINDOW = new DC::UI::Dockbar
2399 name => "message_window2", 2611 name => "message_window2",
2400 title => 'Messages', 2612 title => 'Messages',
2613 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2401 force_w => $::WIDTH * 0.6, 2614 force_w => $::WIDTH * 0.6,
2402 force_h => $::HEIGHT * 0.25, 2615 force_h => $::HEIGHT * 0.25,
2403 ; 2616 ;
2404 2617
2405 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2618 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2425 . "After pressing the combo the binding will be saved automatically and the " 2638 . "After pressing the combo the binding will be saved automatically and the "
2426 . "binding editor closes"); 2639 . "binding editor closes");
2427 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2640 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2428 "Some debuggin' options. Do not ask."); 2641 "Some debuggin' options. Do not ask.");
2429 2642
2430 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2643 make_help_window;
2644 make_menubar;
2431 2645
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; 2646 $SETUP_DIALOG->show;
2472 $MESSAGE_WINDOW->show; 2647 $MESSAGE_WINDOW->show;
2473 } 2648 }
2474 2649
2475 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2650 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2476 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2651 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2477 2652
2478 $CAVEAT_LABEL->set_text ("None :)"); 2653 $CAVEAT_LABEL->set_text ("None :)");
2654 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2655 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2479 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2656 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2480 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2657 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2481 2658
2482 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2659 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2483} 2660}
2493my $animate_timer; 2670my $animate_timer;
2494 2671
2495my $fps = 9; 2672my $fps = 9;
2496 2673
2497sub force_refresh { 2674sub force_refresh {
2498 if ($ENV{CFPLUS_DEBUG} & 4) { 2675 if ($DELIANTRA_DEBUG & 4) {
2499 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2676 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2500 debug sprintf "%3.2f", $fps; 2677 debug sprintf "%3.2f", $fps;
2501 } 2678 }
2502 2679
2503 undef $WANT_REFRESH; 2680 undef $WANT_REFRESH;
2511my $want_refresh = EV::prepare_ns \&force_refresh; 2688my $want_refresh = EV::prepare_ns \&force_refresh;
2512 2689
2513my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2690my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2514 $NOW = EV::now; 2691 $NOW = EV::now;
2515 2692
2516 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2693 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2517 for DC::poll_events; 2694 for DC::poll_events;
2518 2695
2519 if (%animate_object) { 2696 if (%animate_object) {
2520 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2697 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2521 $WANT_REFRESH = 1; 2698 $WANT_REFRESH = 1;
2533sub animation_stop { 2710sub animation_stop {
2534 my ($widget) = @_; 2711 my ($widget) = @_;
2535 delete $animate_object{$widget}; 2712 delete $animate_object{$widget};
2536} 2713}
2537 2714
2538%SDL_CB = (
2539 DC::SDL_QUIT => sub { 2715$SDL_CB[DC::SDL_QUIT] = sub {
2540 crash "SDL_QUIT"; 2716 crash "SDL_QUIT";
2541 EV::unloop EV::UNLOOP_ALL; 2717 EV::unloop EV::UNLOOP_ALL;
2542 }, 2718};
2543 DC::SDL_VIDEORESIZE => sub { 2719$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2544 },
2545 DC::SDL_VIDEOEXPOSE => sub { 2720$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2546 DC::UI::full_refresh; 2721 DC::UI::full_refresh;
2547 }, 2722};
2548 DC::SDL_ACTIVEEVENT => sub { 2723$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2549# not useful, as APPACTIVE includes only iconified state, not unmapped 2724# 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# 2725# 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# 2726# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2552# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2727# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2553# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2728# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2554# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2729# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2555 }, 2730};
2556 DC::SDL_KEYDOWN => sub { 2731$SDL_CB[DC::SDL_KEYDOWN] = sub {
2557 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2732 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2558 # alt-enter 2733 # alt-enter
2559 video_shutdown; 2734 video_shutdown;
2560 $FULLSCREEN_ENABLE->toggle; 2735 $FULLSCREEN_ENABLE->toggle;
2561 video_init; 2736 video_init;
2562 } else { 2737 } else {
2563 &DC::UI::feed_sdl_key_down_event; 2738 &DC::UI::feed_sdl_key_down_event;
2564 } 2739 }
2565 update_modbox; 2740 update_modbox;
2566 }, 2741};
2567 DC::SDL_KEYUP => sub { 2742$SDL_CB[DC::SDL_KEYUP] = sub {
2568 &DC::UI::feed_sdl_key_up_event; 2743 &DC::UI::feed_sdl_key_up_event;
2569 update_modbox; 2744 update_modbox;
2570 }, 2745};
2571 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2746$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2572 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2573 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2748$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2574 DC::SDL_USEREVENT => sub { 2749$SDL_CB[DC::SDL_USEREVENT] = sub {
2575 if ($_[0]{code} == 1) { 2750 if ($_[0]{code} == 1) {
2576 audio_channel_finished $_[0]{data1}; 2751 audio_channel_finished $_[0]{data1};
2577 } elsif ($_[0]{code} == 0) { 2752 } elsif ($_[0]{code} == 0) {
2578 audio_music_finished; 2753 audio_music_finished;
2579 }
2580 }, 2754 }
2581); 2755};
2582 2756
2583############################################################################# 2757#############################################################################
2584 2758
2585$SIG{INT} = $SIG{TERM} = sub { 2759$SIG{INT} = $SIG{TERM} = sub {
2586 EV::unloop; 2760 EV::unloop;
2587 #d# TODO calling exit here hangs the process in some futex 2761 #d# TODO calling exit here hangs the process in some futex
2588}; 2762};
2589 2763
2590# due to mac os x + sdl combined briandamage, we need this contortion 2764# due to mac os x + sdl combined braindamage, we need this contortion
2591sub main { 2765sub main {
2592 { 2766 {
2593 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2767 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2594 2768
2595 if (-e "$Deliantra::VARDIR/client.cf") { 2769 if (-e "$Deliantra::VARDIR/client.cf") {
2612 DC::DB::open_db; 2786 DC::DB::open_db;
2613 2787
2614 DC::UI::set_layout ($::CFG->{layout}); 2788 DC::UI::set_layout ($::CFG->{layout});
2615 2789
2616 my %DEF_CFG = ( 2790 my %DEF_CFG = (
2791 config_autosave => 1,
2617 sdl_mode => undef, 2792 sdl_mode => undef,
2618 fullscreen => 1, 2793 fullscreen => 1,
2619 fast => 0, 2794 fast => 0,
2620 force_opengl11 => undef, 2795 force_opengl11 => undef,
2621 disable_alpha => 0, 2796 disable_alpha => 0,
2622 smooth_movement => 1, 2797 smooth_movement => 1,
2798 smooth_transitions => 1,
2623 texture_compression => 1, 2799 texture_compression => 1,
2624 map_scale => 1, 2800 map_scale => 1,
2625 fow_enable => 1, 2801 fow_enable => 1,
2626 fow_intensity => 0, 2802 fow_intensity => 0,
2803 fow_texture => 0,
2627 map_smoothing => 1, 2804 map_smoothing => 1,
2628 gui_fontsize => 1, 2805 gui_fontsize => 1,
2629 log_fontsize => 0.7, 2806 log_fontsize => 0.7,
2630 gauge_fontsize => 1, 2807 gauge_fontsize => 1,
2631 gauge_size => 0.35, 2808 gauge_size => 0.35,
2639 effects_enable => 1, 2816 effects_enable => 1,
2640 effects_volume => 1, 2817 effects_volume => 1,
2641 bgm_enable => 1, 2818 bgm_enable => 1,
2642 bgm_volume => 0.5, 2819 bgm_volume => 0.5,
2643 output_rate => "", 2820 output_rate => "",
2644 pickup => 0, 2821 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2645 inv_sort => "mtime", 2822 inv_sort => "mtime",
2646 default => "profile", # default profile 2823 default => "profile", # default profile
2647 show_tips => 1, 2824 show_tips => 1,
2648 logview_max_par => 1000, 2825 logview_max_par => 1000,
2649 shift_fire_stop => 0, 2826 shift_fire_stop => 0,
2650 uitheme => "wood", 2827 uitheme => "wood",
2651 ); 2828 map_shift_x => -24, # arbitrary
2829 map_shift_y => +24, # arbitrary
2652 2830 );
2831
2653 while (my ($k, $v) = each %DEF_CFG) { 2832 while (my ($k, $v) = each %DEF_CFG) {
2654 $CFG->{$k} = $v unless exists $CFG->{$k}; 2833 $CFG->{$k} = $v unless exists $CFG->{$k};
2655 } 2834 }
2656 2835
2657 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2836 my @args = @ARGV;
2837
2838 # OS X passes some process serial number of other shit. they
2839 # could have used an env var or any other sane mechanism. but
2840 # would it be os x then? no...
2841 shift @args if $args[0] =~ /^-psn_/;
2842
2843 my $profile = 'default';
2844
2845 for (my $i = 0; $i < @args; $i++) {
2846 if ($args[$i] =~ /^--?profile$/) {
2847 $profile = $args[$i + 1];
2848 splice @args, $i, 2, ();
2849 $i = 0;
2850 } elsif ($args[$i] =~ /^--?h/) {
2851 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2852 exit 0;
2853 }
2854 }
2855
2856 $CFG->{profile}{$profile} ||= {};
2658 $PROFILE = $CFG->{profile}{default}; 2857 $PROFILE = $CFG->{profile}{$profile};
2858 $PROFILE->{host} ||= "gameserver.deliantra.net";
2859
2860 $PROFILE->{host} = $args[0] if @args > 0;
2861 $PROFILE->{user} = $args[1] if @args > 1;
2862 $PROFILE->{password} = $args[2] if @args > 2;
2659 2863
2660 # convert old bindings (only default profile matters) 2864 # convert old bindings (only default profile matters)
2661 if (my $bindings = delete $PROFILE->{bindings}) { 2865 if (my $bindings = delete $PROFILE->{bindings}) {
2662 while (my ($mod, $syms) = each %$bindings) { 2866 while (my ($mod, $syms) = each %$bindings) {
2663 while (my ($sym, $cmds) = each %$syms) { 2867 while (my ($sym, $cmds) = each %$syms) {
2667 }; 2871 };
2668 } 2872 }
2669 } 2873 }
2670 } 2874 }
2671 2875
2672 sdl_init; 2876 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2877 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2673 2878
2674 { 2879 {
2675 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2880 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2676 DejaVuSans.ttf 2881 DejaVuSans.ttf
2677 DejaVuSansMono.ttf 2882 DejaVuSansMono.ttf
2679 DejaVuSansMono-Bold.ttf 2884 DejaVuSansMono-Bold.ttf
2680 DejaVuSans-Oblique.ttf 2885 DejaVuSans-Oblique.ttf
2681 DejaVuSansMono-Oblique.ttf 2886 DejaVuSansMono-Oblique.ttf
2682 DejaVuSans-BoldOblique.ttf 2887 DejaVuSans-BoldOblique.ttf
2683 DejaVuSansMono-BoldOblique.ttf 2888 DejaVuSansMono-BoldOblique.ttf
2889 mona.ttf
2684 ); 2890 );
2685 2891
2686 DC::add_font $_ for @fonts; 2892 DC::add_font $_ for @fonts;
2687 2893
2688 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2894 $FONT_PROP = new_from_file DC::Font $fonts[0];
2689 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2895 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2690 2896
2691 $FONT_PROP->make_default; 2897 $FONT_PROP->make_default;
2692 2898
2704# } 2910# }
2705# my $t2 = Time::HiRes::time; 2911# my $t2 = Time::HiRes::time;
2706# warn $t2-$t1; 2912# warn $t2-$t1;
2707# } 2913# }
2708 2914
2709 video_init; 2915 DC::IMG_Init; video_init;
2710 audio_init; 2916 DC::Mix_Init; audio_init;
2711 } 2917 }
2712 2918
2713 show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
2714 2920
2715 our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2716 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2717 $startup_done->(); 2923 $startup_done->();
2718 }; 2924 };
2719 2925
2926 debug_toggle 0;
2927
2720 delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2721 EV::loop; 2929 EV::loop;
2722 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2723#video_shutdown; 2933 #video_shutdown;
2724#audio_shutdown; 2934 #audio_shutdown;
2935
2725 DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2726 DC::SDL_Quit; 2937 DC::SDL_Quit;
2727 DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2728} 2939}
2729 2940
2733 2944
2734deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2735 2946
2736=head1 SYNOPSIS 2947=head1 SYNOPSIS
2737 2948
2738Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2739 2951
2740=head1 USAGE 2952=head1 USAGE
2741 2953
2742deliantra 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
2743be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2744 2956
2745=head1 DEBUGGING 2957=head1 DEBUGGING
2746 2958
2747
2748CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2749 2960
2750 1 draw borders around widgets 2961 1 draw borders around widgets
2751 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2752 4 show fps 2963 4 show fps
2753 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2754 2966
2755=head1 AUTHOR 2967=head1 AUTHOR
2756 2968
2757Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2758 2970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines