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.77 by root, Fri Sep 26 04:45:48 2008 UTC vs.
Revision 1.117 by root, Tue Aug 31 14:31:50 2010 UTC

… …
21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 require AnyEvent::DNS;
29 AnyEvent::DNS::resolver ();
30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
49 } 53 }
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 58 } else {
75 # OS X 59 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
81 } 63 }
82 64
83 unshift @INC, $root; 65 unshift @INC, $root;
84 } 66 }
85} 67}
86 68
87# prepend private library directory 69# prepend private library directory and prepare env
88BEGIN { 70BEGIN {
89 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 73 if (-d $path) {
92 unshift @INC, $path; 74 unshift @INC, $path;
… …
106 88
107use Deliantra; 89use Deliantra;
108use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
109 91
110use AnyEvent::Util (); 92use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
113 95
114use Compress::LZF; 96use Compress::LZF;
115use JSON::XS; 97use JSON::XS;
116 98
117use DC; 99use DC;
… …
145 127
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
148 130
149$EV::DIED = sub { 131$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
152}; 134};
153 135
154my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
155 139
156our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
157 141
158our $LAST_REFRESH; 142our $LAST_REFRESH;
159our $NOW; 143our $NOW;
160 144
161our $CFG; 145our $CFG;
162our $PROFILE; # current profile 146our $PROFILE; # current profile
163our $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;
164 149
165our $WANT_REFRESH; 150our $WANT_REFRESH;
166 151
167our $MODE_SLIDER; 152our $MODE_SLIDER;
168our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
181 166
182our $MAP; 167our $MAP;
183our $MAPMAP; 168our $MAPMAP;
184our $MAPWIDGET; 169our $MAPWIDGET;
185our $COMPLETER; 170our $COMPLETER;
186our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
187our $METASERVER; 175our $METASERVER;
188our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 177our $QUIT_DIALOG;
190our $HOST_ENTRY; 178our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 205our $FLOORBOX;
218our $GAUGES; 206our $GAUGES;
219our $STATWIDS; 207our $STATWIDS;
220 208
221our $SDL_ACTIVE; 209our $SDL_ACTIVE;
222our %SDL_CB; 210our @SDL_CB;
223 211
224our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 213our $STATUSBOX;
226our $MODBOX; 214our $MODBOX;
227our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
236# 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.
237*crash = sub($;$) { 225*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
239 227
228 warn $msg;
229
240 return unless $CONN; 230 return unless $CONN;
241 231
242 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
243 or return; 233 or return;
244 234
… …
254 244
255 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 247 if $backtrace;
258}; 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}
259 260
260############################################################################# 261#############################################################################
261 262
262sub status { 263sub status {
263 $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]);
… …
345 or return; 346 or return;
346 347
347 $meta->{data} 348 $meta->{data}
348 or return; 349 or return;
349 350
350 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
352 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
353 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 355 &audio_music_push ($face);
355 } 356 }
356 } else { 357 } else {
357 # fetch from database 358 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
361 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;
362 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
364 365
365 audio_sound_push ($face); 366 audio_sound_push ($face);
366 }; 367 };
… …
413 414
414 audio_music_update_volume; 415 audio_music_update_volume;
415 416
416 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
417 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
418 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
419 ? 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
420 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
421 425
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 428
425 my $NOW = time; 429 my $NOW = time;
426 430
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
514 audio_music_push; 518 audio_music_push;
515} 519}
516 520
517sub audio_init { 521sub audio_init {
518 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
519 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
520 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
521 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
522 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
523 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
… …
537 sub audio_tab_update; 550 sub audio_tab_update;
538 audio_tab_update; 551 audio_tab_update;
539} 552}
540 553
541sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
542 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
543 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
544 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
545 563
546 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
… …
548 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
549 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
550 568
551 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
552 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
553} 573}
554 574
555############################################################################# 575#############################################################################
556 576
557sub destroy_query_dialog { 577sub destroy_query_dialog {
… …
786} 806}
787 807
788sub dc_connect { 808sub dc_connect {
789 my ($host, $port) = @_; 809 my ($host, $port) = @_;
790 810
791 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;
792 813
793 $CONN = 814 $CONN =
794 new DC::Protocol 815 new DC::Protocol
795 host => $host, 816 host => $host,
796 port => $port, 817 port => $port,
797 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
799 mapw => $mapsize, 820 mapw => $mapw,
800 maph => $mapsize, 821 maph => $maph,
801 822
823 c_version => {
824 client => "deliantra",
802 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
803 829
804 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
806 map => $MAP, 832 map => $MAP,
807 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
… …
813 839
814 on_connect => sub { 840 on_connect => sub {
815 if ($_[0]) { 841 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
817 843
818 status "login successful"; 844 status "successfully connected to the server";
819 } else { 845 } else {
820 undef $CONN; 846 undef $CONN;
821 status "unable to connect: $!"; 847 status "unable to connect: $!";
822 stop_game(); 848 stop_game();
823 } 849 }
… …
825 ; 851 ;
826} 852}
827 853
828sub start_game { 854sub start_game {
829 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.";
830 860
831 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835 863
836 $MAP = new DC::Map; 864 $MAP = new DC::Map;
837 865
838 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 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) {
843 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
845 } 877 }
846 878
847 dc_connect $host, $port; 879 dc_connect $host, $port;
848 }; 880 };
849 } else { 881 } else {
… …
916 948
917 $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");
918 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
919 951
920 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
921 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
922 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
923 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
924 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
925 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
… …
953 ); 986 );
954 987
955 $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");
956 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
957 state => $CFG->{disable_alpha}, 990 state => $CFG->{disable_alpha},
958 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 "
959 . "by disabling a number of textures and transparency effects. Normally, these " 992 . "by disabling a number of textures and transparency effects. Normally, these "
960 . "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 "
961 . "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 "
962 . "noticably improves the framerate of the client please report this! " 995 . "noticably improves the framerate of the client please report this! "
963 . "<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>",
… …
1017 . "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, "
1018 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
1019 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1020 ); 1053 );
1021 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
1022 $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");
1023 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1024 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1025 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1026 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 }
… …
1038 $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");
1039 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
1040 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
1041 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.",
1042 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 }
1043 ); 1101 );
1044 1102
1045 $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");
1046 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
1047 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1098 ]); 1156 ]);
1099 1157
1100 my $text = !$freq 1158 my $text = !$freq
1101 ? "audio is off" 1159 ? "audio is off"
1102 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1103 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1104 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1105 1166
1106 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1107} 1168}
1108 1169
1109sub audio_setup { 1170sub audio_setup {
… …
1112 $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]);
1113 1174
1114 my $row = 0; 1175 my $row = 0;
1115 1176
1116 $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");
1117 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1118 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1119 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.",
1120 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 }
1121 ); 1195 );
1122 1196
1123 $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");
1124 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1125 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
… …
1138 ); 1212 );
1139 1213
1140 $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");
1141 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1142 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1143 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.",
1144 on_changed => sub { 1218 on_changed => sub {
1145 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1146 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1147 audio_music_push; 1221 audio_music_push;
1148 1 1222 1
… …
1159 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1160 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1161 options => [ 1235 options => [
1162 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1163 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1164 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1165 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1166 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1167 ], 1241 ],
1168 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.",
1169 on_changed => sub { 1243 on_changed => sub {
1170 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1171 audio_tab_update; 1245 audio_tab_update;
… …
1195 $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");
1196 $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
1197 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1198 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1199 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 "
1200 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1201 on_changed => sub { 1275 on_changed => sub {
1202 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1203 audio_tab_update; 1277 audio_tab_update;
1204 1 1278 1
1205 } 1279 }
… …
1249} 1323}
1250 1324
1251sub make_gauge_window { 1325sub make_gauge_window {
1252 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1253 1327
1254 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1255 force_x => 0, 1329 force_x => 0,
1256 force_y => "max", 1330 force_y => "max",
1257 force_w => $WIDTH, 1331 force_w => $WIDTH,
1258 force_h => $gh, 1332 force_h => $gh,
1259 ); 1333 );
… …
1275 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1276 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1277 ], 1351 ],
1278 ); 1352 );
1279 1353
1280 $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");
1281 $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");
1282 $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");
1283 $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");
1284
1285 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1286 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1287 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1288 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1289
1290 $GAUGES = {
1291 exp => $exp, prg => $prg, sklprg => $sklprg,
1292 win => $win, range => $rng,
1293 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1294 };
1295 1358
1296 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1297 1360
1298 $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
1299} 1379}
1300 1380
1301sub debug_setup { 1381sub debug_setup {
1302 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1303 1383
1304 $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");
1305 $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 });
1306 $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");
1307 $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 });
1308 $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");
1309 $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 });
1310 $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");
1311 $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
1312 $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() } );
1313
1314 $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#
1315 1397
1316 $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);
1317 $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);
1318 $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 );
1319 $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);
… …
1440 para => ["Paralysation", 1522 para => ["Paralysation",
1441 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1523 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1442 deat => ["Death", 1524 deat => ["Death",
1443 "<b>Death</b> (resistance against death spells)"], 1525 "<b>Death</b> (resistance against death spells)"],
1444 phys => ["Physical", 1526 phys => ["Physical",
1445 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"], 1527 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed as the 'Arm' secondary stat.)"],
1446 blind => ["Blind", 1528 blind => ["Blind",
1447 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1529 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1448 fear => ["Fear", 1530 fear => ["Fear",
1449 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"], 1531 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1450 tund => ["Turn undead", 1532 tund => ["Turn undead",
… …
1640 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]),
1641 ); 1723 );
1642 1724
1643 $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");
1644 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1645 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1646 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1647 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1648 ); 1730 );
1649 1731
1650 $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");
1651 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1652 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1653 hidden => 1, 1735 hidden => 1,
1654 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1655 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1656 ); 1738 );
1657 1739
1658 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1659 expand => 1, 1741 expand => 1,
1660 text => "Login / Register", 1742 text => "Login / Register",
… …
1696 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1697 1779
1698 $vbox->add ( 1780 $vbox->add (
1699 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1700 expand => 1, 1782 expand => 1,
1701 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1702 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>)",
1703 on_changed => sub { 1785 on_changed => sub {
1704 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1705 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1706 1 1788 1
1707 } 1789 }
1708 ); 1790 );
1709 1791
1710 if (0) { #d# disabled 1792 if (0) { #d# disabled
… …
1753 1835
1754 my $row = 0; 1836 my $row = 0;
1755 1837
1756 $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");
1757 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1758 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1759 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?",
1760 on_changed => sub { 1843 on_changed => sub {
1761 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1762 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
… …
1764 } 1847 }
1765 ); 1848 );
1766 1849
1767 $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");
1768 $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,
1769 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1770 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 "
1771 . "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 "
1772 . "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.",
1773 on_changed => sub { 1857 on_changed => sub {
… …
1775 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1776 0 1860 0
1777 }, 1861 },
1778 ); 1862 );
1779 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
1780 $table 1886 $table
1781} 1887}
1782 1888
1783sub autopickup_setup { 1889sub autopickup_setup {
1784 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
… …
1790 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1791 ); 1897 );
1792 1898
1793 for ( 1899 for (
1794 ["General", 0, 0, 1900 ["General", 0, 0,
1795 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1796 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1797 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1798 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1799 ], 1904 ],
1800 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1801 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
… …
1849 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1850 } else { 1955 } else {
1851 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1852 } 1957 }
1853 1958
1854 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1855 if defined $::CONN; 1960 if defined $::CONN;
1856 1961
1857 0 1962 0
1858 }); 1963 });
1859 1964
… …
1876 }); 1981 });
1877 1982
1878 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1879 text => "set", 1984 text => "set",
1880 on_activate => sub { 1985 on_activate => sub {
1881 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1882 if defined $::CONN; 1987 if defined $::CONN;
1883 0 1988 0
1884 }); 1989 });
1885 1990
1886 $r 1991 $r
1887} 1992}
1888 1993
1889my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1890 type => sub { 1995 type => sub {
1996 use sort 'stable';
1891 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1892 }, 1998 },
1893 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1894 my $NOW = time; 2001 my $NOW = time;
1895 sort { 2002 sort {
1896 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;
1897 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;
1898 2005
1899 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1900 or $btime <=> $atime 2007 or $btime <=> $atime
1901 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1902 } @_ 2009 } @_
1903 }, 2010 },
1904 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1905 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1906 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1907 } @_ }, 2016 } @_
2017 },
1908); 2018);
1909 2019
1910sub inventory_widget { 2020sub inventory_widget {
1911 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1912 2022
… …
1999 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
2000 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
2001 } 2111 }
2002} 2112}
2003 2113
2004sub player_window { 2114sub make_playerbook {
2005 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2006 x => "center", 2116 x => "center",
2007 y => "center", 2117 y => "center",
2008 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
2009 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
… …
2043 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
2044 2154
2045 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
2046 2156
2047 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
2048 $plwin
2049} 2158}
2050 2159
2051sub keyboard_setup { 2160sub keyboard_setup {
2052 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
2053} 2162}
2054 2163
2055sub help_window { 2164sub make_help_window {
2056 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
2057 x => 'center', 2166 x => 'center',
2058 y => 'center', 2167 y => 'center',
2059 z => 4, 2168 z => 4,
2060 name => 'doc_browser', 2169 name => 'doc_browser',
… …
2149 2258
2150 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2151 $win->show; 2260 $win->show;
2152 }; 2261 };
2153 2262
2154 $win 2263 $HELP_WINDOW = $win;
2155}
2156
2157sub open_string_query {
2158 my ($title, $cb, $txt, $tooltip) = @_;
2159 my $dialog = new DC::UI::Toplevel
2160 x => "center",
2161 y => "center",
2162 z => 50,
2163 force_w => $WIDTH * 4/5,
2164 title => $title;
2165
2166 $dialog->add (
2167 my $e = new DC::UI::Entry
2168 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2169 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2170 tooltip => $tooltip
2171 );
2172
2173 $e->grab_focus;
2174 $e->set_text ($txt) if $txt;
2175 $dialog->show;
2176} 2264}
2177 2265
2178sub open_quit_dialog { 2266sub open_quit_dialog {
2179 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2180 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2213 2301
2214 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2215 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2216} 2304}
2217 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
2218sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2219 # find all tips 2415 # find all tips
2220 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2221 2417
2222 DC::DB::get state => "tip_of_the_day", sub { 2418 DC::DB::get state => "tip_of_the_day", sub {
… …
2267 2463
2268 $dialog->show; 2464 $dialog->show;
2269 }; 2465 };
2270} 2466}
2271 2467
2272sub sdl_init {
2273 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2274 and die "SDL::Init failed!\n";
2275}
2276
2277sub video_init { 2468sub video_init {
2278 DC::set_theme $CFG->{uitheme}; 2469 DC::set_theme $CFG->{uitheme};
2279 2470
2280 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2281 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
… …
2340 2531
2341 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2342 padding => 0, 2533 padding => 0,
2343 z => 100, 2534 z => 100,
2344 force_x => "max", 2535 force_x => "max",
2345 force_y => 0; 2536 force_y => 20;
2346 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2347 2538
2348 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2349 2540
2350 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
… …
2361 2552
2362 (new DC::UI::Frame 2553 (new DC::UI::Frame
2363 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2364 force_x => 0, 2555 force_x => 0,
2365 force_y => "max", 2556 force_y => "max",
2366 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2367 )->show; 2558 )->show;
2368 2559
2369 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2370 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2371 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2372 align => 0, 2563 align => 0,
2373 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2374 fontsize => 0.5, 2565 fontsize => 0.5,
2375 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2376 ); 2567 );
2377 2568
2378 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2379 title => "Minimap", 2570 title => "Minimap",
2380 name => "mapmap", 2571 name => "mapmap",
2381 x => 0, 2572 x => 0,
2382 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2383 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2384 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2385 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2386 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.",
2387 ), 2578 ),
… …
2416 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2417 # 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
2418 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2419 name => "message_window2", 2610 name => "message_window2",
2420 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2421 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2422 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2423 ; 2615 ;
2424 2616
2425 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2445 . "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 "
2446 . "binding editor closes"); 2638 . "binding editor closes");
2447 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2448 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2449 2641
2450 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2451 2644
2452 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2453 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2454
2455# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2456# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2457
2458 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
2459
2460 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2461 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2462
2463 $BUTTONBAR->add (new DC::UI::Button
2464 text => "Save Config",
2465 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2466 on_activate => sub {
2467 $::CFG->{layout} = DC::UI::get_layout;
2468 DC::write_cfg;
2469 status "Configuration Saved";
2470 0
2471 },
2472 );
2473
2474 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2475 tooltip => "View Documentation");
2476
2477 $BUTTONBAR->add (new DC::UI::Button
2478 text => "Quit",
2479 tooltip => "Terminates the program",
2480 on_activate => sub {
2481 if ($CONN) {
2482 open_quit_dialog;
2483 } else {
2484 EV::unloop EV::UNLOOP_ALL;
2485 }
2486 0
2487 },
2488 );
2489
2490 $BUTTONBAR->show;
2491 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2492 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2493 } 2647 }
2494 2648
2495 $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]);
2496 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2497 2651
2498 $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;
2499 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2500 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2501 2657
2502 $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]);
2503} 2659}
… …
2513my $animate_timer; 2669my $animate_timer;
2514 2670
2515my $fps = 9; 2671my $fps = 9;
2516 2672
2517sub force_refresh { 2673sub force_refresh {
2518 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2519 $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;
2520 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2521 } 2677 }
2522 2678
2523 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
… …
2531my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2532 2688
2533my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2534 $NOW = EV::now; 2690 $NOW = EV::now;
2535 2691
2536 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2537 for DC::poll_events; 2693 for DC::poll_events;
2538 2694
2539 if (%animate_object) { 2695 if (%animate_object) {
2540 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2541 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
… …
2553sub animation_stop { 2709sub animation_stop {
2554 my ($widget) = @_; 2710 my ($widget) = @_;
2555 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2556} 2712}
2557 2713
2558%SDL_CB = (
2559 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2560 crash "SDL_QUIT"; 2715 crash "SDL_QUIT";
2561 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2562 }, 2717};
2563 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2564 },
2565 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2566 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2567 }, 2721};
2568 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2569# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2570# 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#
2571# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2572# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2573# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2574# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2575 }, 2729};
2576 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2577 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2578 # alt-enter 2732 # alt-enter
2579 video_shutdown; 2733 video_shutdown;
2580 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2581 video_init; 2735 video_init;
2582 } else { 2736 } else {
2583 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2584 } 2738 }
2585 update_modbox; 2739 update_modbox;
2586 }, 2740};
2587 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2588 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2589 update_modbox; 2743 update_modbox;
2590 }, 2744};
2591 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2592 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2593 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2594 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2595 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2596 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2597 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2598 audio_music_finished; 2752 audio_music_finished;
2599 }
2600 }, 2753 }
2601); 2754};
2602 2755
2603############################################################################# 2756#############################################################################
2604 2757
2605$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2606 EV::unloop; 2759 EV::unloop;
2607 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2608}; 2761};
2609 2762
2610# 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
2611sub main { 2764sub main {
2612 { 2765 {
2613 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2614 2767
2615 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2632 DC::DB::open_db; 2785 DC::DB::open_db;
2633 2786
2634 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2635 2788
2636 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2637 sdl_mode => undef, 2791 sdl_mode => undef,
2638 fullscreen => 1, 2792 fullscreen => 1,
2639 fast => 0, 2793 fast => 0,
2640 force_opengl11 => undef, 2794 force_opengl11 => undef,
2641 disable_alpha => 0, 2795 disable_alpha => 0,
2642 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2643 texture_compression => 1, 2798 texture_compression => 1,
2644 map_scale => 1, 2799 map_scale => 1,
2645 fow_enable => 1, 2800 fow_enable => 1,
2646 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2647 map_smoothing => 1, 2803 map_smoothing => 1,
2648 gui_fontsize => 1, 2804 gui_fontsize => 1,
2649 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2650 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2651 gauge_size => 0.35, 2807 gauge_size => 0.35,
… …
2659 effects_enable => 1, 2815 effects_enable => 1,
2660 effects_volume => 1, 2816 effects_volume => 1,
2661 bgm_enable => 1, 2817 bgm_enable => 1,
2662 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2663 output_rate => "", 2819 output_rate => "",
2664 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2665 inv_sort => "mtime", 2821 inv_sort => "mtime",
2666 default => "profile", # default profile 2822 default => "profile", # default profile
2667 show_tips => 1, 2823 show_tips => 1,
2668 logview_max_par => 1000, 2824 logview_max_par => 1000,
2669 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2670 uitheme => "wood", 2826 uitheme => "wood",
2671 ); 2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2672 2829 );
2830
2673 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2674 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2675 } 2833 }
2676 2834
2677 $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} ||= {};
2678 $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;
2679 2862
2680 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2681 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2682 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2683 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
… …
2687 }; 2870 };
2688 } 2871 }
2689 } 2872 }
2690 } 2873 }
2691 2874
2692 sdl_init; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2693 2877
2694 { 2878 {
2695 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2696 DejaVuSans.ttf 2880 DejaVuSans.ttf
2697 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
… …
2699 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2700 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2701 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2702 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2703 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2704 ); 2889 );
2705 2890
2706 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2707 2892
2708 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2709 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2710 2895
2711 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2712 2897
… …
2724# } 2909# }
2725# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2726# warn $t2-$t1; 2911# warn $t2-$t1;
2727# } 2912# }
2728 2913
2914 DC::IMG_Init;
2729 video_init; 2915 video_init;
2730 audio_init; 2916 audio_init;
2731 } 2917 }
2732 2918
2733 show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
… …
2735 our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2736 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2737 $startup_done->(); 2923 $startup_done->();
2738 }; 2924 };
2739 2925
2926 debug_toggle 0;
2927
2740 delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2741 EV::loop; 2929 EV::loop;
2742 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2743#video_shutdown; 2933 #video_shutdown;
2744#audio_shutdown; 2934 #audio_shutdown;
2935
2745 DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2746 DC::SDL_Quit; 2937 DC::SDL_Quit;
2747 DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2748} 2939}
2749 2940
… …
2753 2944
2754deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2755 2946
2756=head1 SYNOPSIS 2947=head1 SYNOPSIS
2757 2948
2758Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2759 2951
2760=head1 USAGE 2952=head1 USAGE
2761 2953
2762deliantra 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
2763be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2764 2956
2765=head1 DEBUGGING 2957=head1 DEBUGGING
2766 2958
2767
2768CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2769 2960
2770 1 draw borders around widgets 2961 1 draw borders around widgets
2771 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2772 4 show fps 2963 4 show fps
2773 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2774 2966
2775=head1 AUTHOR 2967=head1 AUTHOR
2776 2968
2777Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2778 2970

Diff Legend

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