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.17 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.37 by root, Mon May 5 16:19:19 2008 UTC

… …
78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
… …
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use Compress::LZF; 102use Compress::LZF;
103 103
104use dc; 104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use dc::OpenGL (); 105use DC::OpenGL ();
106use dc::Protocol; 106use DC::Protocol;
107use dc::DB; 107use DC::DB;
108use dc::UI; 108use DC::UI;
109use dc::UI::Canvas; 109use DC::UI::Canvas;
110use dc::UI::Inventory; 110use DC::UI::Inventory;
111use dc::UI::SpellList; 111use DC::UI::SpellList;
112use dc::UI::Dockable; 112use DC::UI::Dockable;
113use DC::UI::Dockbar;
113use dc::UI::MessageWindow; 114use DC::UI::MessageWindow;
114use dc::UI::ChatView; 115use DC::UI::ChatView;
116use DC::MessageDistributor;
115use dc::Pod; 117use DC::Pod;
116use dc::MapWidget; 118use DC::MapWidget;
117use dc::Macro; 119use DC::Macro;
118 120
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 121$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 122$SIG{PIPE} = 'IGNORE';
121 123
122$EV::DIED = sub { 124$EV::DIED = sub {
123 dc::fatal Carp::longmess $@; 125 DC::fatal Carp::longmess $@;
124}; 126};
125 127
126my $MAX_FPS = 60; 128my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet
128 129
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 130our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 131
131our $LAST_REFRESH; 132our $LAST_REFRESH;
132our $NOW; 133our $NOW;
… …
179our $SPELL_PAGE; 180our $SPELL_PAGE;
180our $SPELL_LIST; 181our $SPELL_LIST;
181 182
182our $HELP_WINDOW; 183our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 184our $MESSAGE_WINDOW;
185our $MESSAGE_DIST;
184our $FLOORBOX; 186our $FLOORBOX;
185our $GAUGES; 187our $GAUGES;
186our $STATWIDS; 188our $STATWIDS;
187 189
188our $SDL_ACTIVE; 190our $SDL_ACTIVE;
189our %SDL_CB; 191our %SDL_CB;
190 192
191our $ALT_ENTER_MESSAGE; 193our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 194our $STATUSBOX;
195our $MODBOX;
193our $DEBUG_STATUS; 196our $DEBUG_STATUS;
194 197
195our $INV; 198our $INV;
196our $INVR; 199our $INVR;
197our $INVR_HB; 200our $INVR_HB;
198 201
199############################################################################# 202#############################################################################
200 203
201sub status { 204sub status {
202 $STATUSBOX->add (dc::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
203} 206}
204 207
205sub debug { 208sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 209 $DEBUG_STATUS->set_text ($_[0]);
207} 210}
208 211
209sub message { 212sub message {
210 $MESSAGE_WINDOW->message (@_); 213 $MESSAGE_DIST->message (@_);
214}
215
216sub update_modbox {
217 my $mod = DC::SDL_GetModState;
218
219 my $markup;
220
221 $markup .= $mod & DC::KMOD_CTRL
222 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
223 : "[<span foreground='#888'> once </span>]";
224
225 $markup .= $mod & DC::KMOD_SHIFT
226 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
227 : "[<span foreground='#888'>move</span>]";
228
229 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
230 ? "[ALT]"
231 : "[<span foreground='#888'>alt</span>]";
232
233 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]";
236
237 # <tt> around next statement works around some bug that keeps the
238 # "font =>" from being used on windows
239 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 240}
212 241
213############################################################################# 242#############################################################################
214#TODO: maybe move into own audio module... 243#TODO: maybe move into own audio module...
215 244
… …
245 274
246 if (my $chunk = $AUDIO_CHUNK{$face}) { 275 if (my $chunk = $AUDIO_CHUNK{$face}) {
247 for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) { 276 for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
248 my (undef, $dx, $dy, $vol) = @$_; 277 my (undef, $dx, $dy, $vol) = @$_;
249 278
250 my $channel = dc::Channel::find; 279 my $channel = DC::Channel::find;
251 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 280 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
252 $channel->set_position_r ($dx, $dy, 20); 281 $channel->set_position_r ($dx, $dy, 20);
253 $chunk->play ($channel); 282 $chunk->play ($channel);
254 } 283 }
255 } else { 284 } else {
… …
266 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
267 &audio_music_push ($face); 296 &audio_music_push ($face);
268 } 297 }
269 } else { 298 } else {
270 # fetch from database 299 # fetch from database
271 dc::DB::get res_data => $meta->{name}, sub { 300 DC::DB::get res_data => $meta->{name}, sub {
272 my $rwops = new dc::RW $_[0]; 301 my $rwops = new DC::RW $_[0];
273 my $chunk = new dc::MixChunk $rwops 302 my $chunk = new DC::MixChunk $rwops
274 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . dc::Mix_GetError; 303 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;
275 $chunk->volume (($meta->{data}{volume} || 1) * 128); 304 $chunk->volume (($meta->{data}{volume} || 1) * 128);
276 $AUDIO_CHUNK{$face} = $chunk; 305 $AUDIO_CHUNK{$face} = $chunk;
277 306
278 audio_sound_push ($face); 307 audio_sound_push ($face);
279 }; 308 };
… …
298sub audio_music_set_meta { 327sub audio_music_set_meta {
299 my ($meta) = @_; 328 my ($meta) = @_;
300 329
301 $MUSIC_PLAYING_META = $meta; 330 $MUSIC_PLAYING_META = $meta;
302 $MUSIC_PLAYING_WIDGET->set_markup ( 331 $MUSIC_PLAYING_WIDGET->set_markup (
303 "<b>Name</b>: " . (dc::asxml $meta->{data}{name}) . "\n" 332 "<b>Name</b>: " . (DC::asxml $meta->{data}{name}) . "\n"
304 . "<b>Author</b>: " . (dc::asxml $meta->{data}{author}) . "\n" 333 . "<b>Author</b>: " . (DC::asxml $meta->{data}{author}) . "\n"
305 . "<b>Source</b>: " . (dc::asxml $meta->{data}{source}) . "\n" 334 . "<b>Source</b>: " . (DC::asxml $meta->{data}{source}) . "\n"
306 . "<b>License</b>: " . (dc::asxml $meta->{data}{license}) 335 . "<b>License</b>: " . (DC::asxml $meta->{data}{license})
307 ); 336 );
308} 337}
309 338
310sub audio_music_update_volume { 339sub audio_music_update_volume {
311 return unless $MUSIC_PLAYING_META; 340 return unless $MUSIC_PLAYING_META;
312 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1; 341 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
313 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume}; 342 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
314 dc::MixMusic::volume $base * $volume * 128; 343 DC::MixMusic::volume $base * $volume * 128;
315} 344}
316 345
317sub audio_music_start { 346sub audio_music_start {
318 my $meta = $MUSIC_PLAYING_META; 347 my $meta = $MUSIC_PLAYING_META;
319 348
320 dc::DB::get res_data => $meta->{name}, sub { 349 DC::DB::get res_data => $meta->{name}, sub {
321 return unless $SDL_MIXER; 350 return unless $SDL_MIXER;
322 351
323 # music might have changed... 352 # music might have changed...
324 $meta eq $MUSIC_PLAYING_META 353 $meta eq $MUSIC_PLAYING_META
325 or return &audio_music_start (); 354 or return &audio_music_start ();
… …
327 audio_music_update_volume; 356 audio_music_update_volume;
328 357
329 $MUSIC_PLAYING_DATA = \$_[0]; 358 $MUSIC_PLAYING_DATA = \$_[0];
330 359
331 my $rwops = $meta->{path} 360 my $rwops = $meta->{path}
332 ? new_from_file dc::RW $meta->{path} 361 ? new_from_file DC::RW $meta->{path}
333 : new dc::RW $$MUSIC_PLAYING_DATA; 362 : new DC::RW $$MUSIC_PLAYING_DATA;
334 363
335 $MUSIC_PLAYER = new dc::MixMusic $rwops 364 $MUSIC_PLAYER = new DC::MixMusic $rwops
336 or Carp::confess "music face $meta->{face} unloadable: " . dc::Mix_GetError; 365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
337 366
338 my $NOW = time; 367 my $NOW = time;
339 368
340 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
341 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 370 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
372 401
373 # randomize music a bit so that the order is not always the same 402 # randomize music a bit so that the order is not always the same
374 $_->{stop_time} ||= rand for @MUSIC_HAVE; 403 $_->{stop_time} ||= rand for @MUSIC_HAVE;
375 404
376 # default MUSIC_HAVE == MUSIC_DEFAULT 405 # default MUSIC_HAVE == MUSIC_DEFAULT
377 @MUSIC_HAVE = { path => dc::find_rcfile "music/$MUSIC_DEFAULT" } 406 @MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
378 unless @MUSIC_HAVE; 407 unless @MUSIC_HAVE;
379 } 408 }
380 409
381 # if the currently playing song is acceptable, let it continue 410 # if the currently playing song is acceptable, let it continue
382 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 411 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
… …
384 my $NOW = time; 413 my $NOW = time;
385 414
386 if ($MUSIC_PLAYING_META) { 415 if ($MUSIC_PLAYING_META) {
387 $MUSIC_PLAYING_META->{stop_time} = $NOW; 416 $MUSIC_PLAYING_META->{stop_time} = $NOW;
388 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START; 417 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
389 dc::MixMusic::fade_out $fade_out; 418 DC::MixMusic::fade_out $fade_out;
390 } else { 419 } else {
391 # sort by stop time, oldest first 420 # sort by stop time, oldest first
392 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 421 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
393 422
394 # if the most recently-played piece played very recently, 423 # if the most recently-played piece played very recently,
… …
428} 457}
429 458
430sub audio_init { 459sub audio_init {
431 if ($CFG->{audio_enable}) { 460 if ($CFG->{audio_enable}) {
432 $ENV{MIX_EFFECTSMAXSPEED} = 1; 461 $ENV{MIX_EFFECTSMAXSPEED} = 1;
433 $SDL_MIXER = !dc::Mix_OpenAudio 462 $SDL_MIXER = !DC::Mix_OpenAudio
434 $CFG->{audio_hw_frequency}, 463 $CFG->{audio_hw_frequency},
435 dc::MIX_DEFAULT_FORMAT, 464 DC::MIX_DEFAULT_FORMAT,
436 $CFG->{audio_hw_channels}, 465 $CFG->{audio_hw_channels},
437 $CFG->{audio_hw_chunksize}; 466 $CFG->{audio_hw_chunksize};
438 467
439 if ($SDL_MIXER) { 468 if ($SDL_MIXER) {
440 dc::Mix_AllocateChannels $CFG->{audio_mix_channels}; 469 DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
441 470
442 audio_music_finished; 471 audio_music_finished;
443 } else { 472 } else {
444 status "Unable to open sound device: there will be no sound"; 473 status "Unable to open sound device: there will be no sound";
445 } 474 }
… …
459 $MUSIC_WANT = []; 488 $MUSIC_WANT = [];
460 @MUSIC_JINGLE = (); 489 @MUSIC_JINGLE = ();
461 %AUDIO_PLAY = (); 490 %AUDIO_PLAY = ();
462 %AUDIO_CHUNK = (); 491 %AUDIO_CHUNK = ();
463 492
464 dc::Mix_CloseAudio if $SDL_MIXER; 493 DC::Mix_CloseAudio if $SDL_MIXER;
465 undef $SDL_MIXER; 494 undef $SDL_MIXER;
466} 495}
467 496
468############################################################################# 497#############################################################################
469 498
… …
489 518
490 return; 519 return;
491 } 520 }
492 } 521 }
493 522
494 $conn->{query_dialog} = my $dialog = new dc::UI::Toplevel 523 $conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
495 x => "center", 524 x => "center",
496 y => "center", 525 y => "center",
497 title => "Server Query", 526 title => "Server Query",
498 child => my $vbox = new dc::UI::VBox, 527 child => my $vbox = new DC::UI::VBox,
499 ; 528 ;
500 529
501 my @dialog = my $label = new dc::UI::Label 530 my @dialog = my $label = new DC::UI::Label
502 max_w => $::WIDTH * 0.8, 531 max_w => $::WIDTH * 0.8,
503 ellipsise => 0, 532 ellipsise => 0,
504 text => $prompt; 533 text => $prompt;
505 534
506 if ($flags & CS_QUERY_YESNO) { 535 if ($flags & CS_QUERY_YESNO) {
507 push @dialog, my $hbox = new dc::UI::HBox; 536 push @dialog, my $hbox = new DC::UI::HBox;
508 537
509 $hbox->add (new dc::UI::Button 538 $hbox->add (new DC::UI::Button
510 text => "No", 539 text => "No",
511 on_activate => sub { 540 on_activate => sub {
512 $conn->send ("reply n"); 541 $conn->send ("reply n");
513 $dialog->destroy; 542 $dialog->destroy;
514 0 543 0
515 } 544 }
516 ); 545 );
517 $hbox->add (new dc::UI::Button 546 $hbox->add (new DC::UI::Button
518 text => "Yes", 547 text => "Yes",
519 on_activate => sub { 548 on_activate => sub {
520 $conn->send ("reply y"); 549 $conn->send ("reply y");
521 destroy_query_dialog $conn; 550 destroy_query_dialog $conn;
522 0 551 0
… …
527 556
528 } elsif ($flags & CS_QUERY_SINGLECHAR) { 557 } elsif ($flags & CS_QUERY_SINGLECHAR) {
529 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 558 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
530 $dialog->{tooltip} = "#charcreation_focus"; 559 $dialog->{tooltip} = "#charcreation_focus";
531 560
532 unshift @dialog, new dc::UI::Label 561 unshift @dialog, new DC::UI::Label
533 max_w => $::WIDTH * 0.8, 562 max_w => $::WIDTH * 0.8,
534 ellipsise => 0, 563 ellipsise => 0,
535 markup => "\nOr use your keyboard and the text entry below:\n"; 564 markup => "\nOr use your keyboard and the text entry below:\n";
536 565
537 unshift @dialog, my $table = new dc::UI::Table; 566 unshift @dialog, my $table = new DC::UI::Table;
538 567
539 $table->add_at (0, 0, new dc::UI::Button 568 $table->add_at (0, 0, new DC::UI::Button
540 text => "Next Race", 569 text => "Next Race",
541 on_activate => sub { 570 on_activate => sub {
542 $conn->send ("reply n"); 571 $conn->send ("reply n");
543 destroy_query_dialog $conn; 572 destroy_query_dialog $conn;
544 0 573 0
545 }, 574 },
546 ); 575 );
547 $table->add_at (2, 0, new dc::UI::Button 576 $table->add_at (2, 0, new DC::UI::Button
548 text => "Accept", 577 text => "Accept",
549 on_activate => sub { 578 on_activate => sub {
550 $conn->send ("reply d"); 579 $conn->send ("reply d");
551 destroy_query_dialog $conn; 580 destroy_query_dialog $conn;
552 0 581 0
553 }, 582 },
554 ); 583 );
555 584
556 if ($conn->{chargen_race_description}) { 585 if ($conn->{chargen_race_description}) {
557 unshift @dialog, new dc::UI::Label 586 unshift @dialog, new DC::UI::Label
558 max_w => $::WIDTH * 0.8, 587 max_w => $::WIDTH * 0.8,
559 ellipsise => 0, 588 ellipsise => 0,
560 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 589 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
561 ; 590 ;
562 } 591 }
563 592
564 unshift @dialog, new dc::UI::Face 593 unshift @dialog, new DC::UI::Face
565 face => $conn->{player}{face}, 594 face => $conn->{player}{face},
566 bg => [.2, .2, .2, 1], 595 bg => [.2, .2, .2, 1],
567 min_w => 64, 596 min_w => 64,
568 min_h => 64, 597 min_h => 64,
569 ; 598 ;
570 599
571 if ($conn->{chargen_race_title}) { 600 if ($conn->{chargen_race_title}) {
572 unshift @dialog, new dc::UI::Label 601 unshift @dialog, new DC::UI::Label
573 allign => 1, 602 allign => 1,
574 ellipsise => 0, 603 ellipsise => 0,
575 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>", 604 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
576 ; 605 ;
577 } 606 }
578 607
579 unshift @dialog, new dc::UI::Label 608 unshift @dialog, new DC::UI::Label
580 max_w => $::WIDTH * 0.4, 609 max_w => $::WIDTH * 0.4,
581 ellipsise => 0, 610 ellipsise => 0,
582 markup => (dc::Pod::section_label ui => "chargen_race"), 611 markup => (DC::Pod::section_label ui => "chargen_race"),
583 ; 612 ;
584 613
585 } elsif ($prompt =~ /roll new stats/) { 614 } elsif ($prompt =~ /roll new stats/) {
586 if (my $stat = delete $conn->{stat_change_with}) { 615 if (my $stat = delete $conn->{stat_change_with}) {
587 $conn->send ("reply $stat"); 616 $conn->send ("reply $stat");
588 destroy_query_dialog $conn; 617 destroy_query_dialog $conn;
589 return; 618 return;
590 } 619 }
591 620
592 unshift @dialog, new dc::UI::Label 621 unshift @dialog, new DC::UI::Label
593 max_w => $::WIDTH * 0.4, 622 max_w => $::WIDTH * 0.4,
594 ellipsise => 0, 623 ellipsise => 0,
595 markup => "\nOr use your keyboard and the text entry below:\n"; 624 markup => "\nOr use your keyboard and the text entry below:\n";
596 625
597 unshift @dialog, my $table = new dc::UI::Table; 626 unshift @dialog, my $table = new DC::UI::Table;
598 627
599 # left: re-roll 628 # left: re-roll
600 $table->add_at (0, 0, new dc::UI::Button 629 $table->add_at (0, 0, new DC::UI::Button
601 text => "Roll Again", 630 text => "Roll Again",
602 on_activate => sub { 631 on_activate => sub {
603 $conn->send ("reply y"); 632 $conn->send ("reply y");
604 destroy_query_dialog $conn; 633 destroy_query_dialog $conn;
605 0 634 0
606 }, 635 },
607 ); 636 );
608 637
609 # center: swap stats 638 # center: swap stats
610 my ($sw1, $sw2) = map +(new dc::UI::Selector 639 my ($sw1, $sw2) = map +(new DC::UI::Selector
611 expand => 1, 640 expand => 1,
612 value => $_, 641 value => $_,
613 options => [ 642 options => [
614 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 643 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
615 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 644 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
619 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 648 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
620 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 649 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
621 ], 650 ],
622 ), 1 .. 2; 651 ), 1 .. 2;
623 652
624 $table->add_at (2, 0, new dc::UI::Button 653 $table->add_at (2, 0, new DC::UI::Button
625 text => "Swap Stats", 654 text => "Swap Stats",
626 on_activate => sub { 655 on_activate => sub {
627 $conn->{stat_change_with} = $sw2->{value}; 656 $conn->{stat_change_with} = $sw2->{value};
628 $conn->send ("reply $sw1->{value}"); 657 $conn->send ("reply $sw1->{value}");
629 destroy_query_dialog $conn; 658 destroy_query_dialog $conn;
630 0 659 0
631 }, 660 },
632 ); 661 );
633 $table->add_at (2, 1, new dc::UI::HBox children => [$sw1, $sw2]); 662 $table->add_at (2, 1, new DC::UI::HBox children => [$sw1, $sw2]);
634 663
635 # right: accept 664 # right: accept
636 $table->add_at (4, 0, new dc::UI::Button 665 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 666 text => "Accept",
638 on_activate => sub { 667 on_activate => sub {
639 $conn->send ("reply n"); 668 $conn->send ("reply n");
640 $STATS_PAGE->hide; 669 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 670 destroy_query_dialog $conn;
642 0 671 0
643 }, 672 },
644 ); 673 );
645 674
646 unshift @dialog, my $hbox = new dc::UI::HBox; 675 unshift @dialog, my $hbox = new DC::UI::HBox;
647 for ( 676 for (
648 [Str => CS_STAT_STR], 677 [Str => CS_STAT_STR],
649 [Dex => CS_STAT_DEX], 678 [Dex => CS_STAT_DEX],
650 [Con => CS_STAT_CON], 679 [Con => CS_STAT_CON],
651 [Int => CS_STAT_INT], 680 [Int => CS_STAT_INT],
652 [Wis => CS_STAT_WIS], 681 [Wis => CS_STAT_WIS],
653 [Pow => CS_STAT_POW], 682 [Pow => CS_STAT_POW],
654 [Cha => CS_STAT_CHA], 683 [Cha => CS_STAT_CHA],
655 ) { 684 ) {
656 my ($name, $id) = @$_; 685 my ($name, $id) = @$_;
657 $hbox->add (new dc::UI::Label 686 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 687 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 688 expand => 1,
661 can_events => 1, 689 can_events => 1,
662 can_hover => 1, 690 can_hover => 1,
663 tooltip => "#stat_$name", 691 tooltip => "#stat_$name",
664 ); 692 );
665 } 693 }
666 694
667 unshift @dialog, new dc::UI::Label 695 unshift @dialog, new DC::UI::Label
668 max_w => $::WIDTH * 0.4, 696 max_w => $::WIDTH * 0.4,
669 ellipsise => 0, 697 ellipsise => 0,
670 markup => (dc::Pod::section_label ui => "chargen_stats"), 698 markup => (DC::Pod::section_label ui => "chargen_stats"),
671 ; 699 ;
672 } 700 }
673 701
674 push @dialog, my $entry = new dc::UI::Entry 702 push @dialog, my $entry = new DC::UI::Entry
675 on_changed => sub { 703 on_changed => sub {
676 $conn->send ("reply $_[1]"); 704 $conn->send ("reply $_[1]");
677 destroy_query_dialog $conn; 705 destroy_query_dialog $conn;
678 0 706 0
679 }, 707 },
… …
682 $entry->grab_focus; 710 $entry->grab_focus;
683 711
684 } else { 712 } else {
685 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 713 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
686 714
687 push @dialog, my $entry = new dc::UI::Entry 715 push @dialog, my $entry = new DC::UI::Entry
688 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 716 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
689 on_activate => sub { 717 on_activate => sub {
690 $conn->send ("reply $_[1]"); 718 $conn->send ("reply $_[1]");
691 destroy_query_dialog $conn; 719 destroy_query_dialog $conn;
692 0 720 0
… …
708 736
709 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
710 738
711 my ($host, $port) = split /:/, $PROFILE->{host}; 739 my ($host, $port) = split /:/, $PROFILE->{host};
712 740
713 $MAP = new dc::Map; 741 $MAP = new DC::Map;
714 742
715 $CONN = eval { 743 $CONN = eval {
716 new dc::Protocol 744 new DC::Protocol
717 host => $host, 745 host => $host,
718 port => $port || 13327, 746 port => $port || 13327,
719 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
721 mapw => $mapsize, 749 mapw => $mapsize,
722 maph => $mapsize, 750 maph => $mapsize,
723 751
724 client => "cfplus $dc::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
725 753
726 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
728 map => $MAP, 756 map => $MAP,
729 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
… …
733 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
734 }, 762 },
735 }; 763 };
736 764
737 if ($CONN) { 765 if ($CONN) {
738 dc::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
739 767
740 status "login successful"; 768 status "login successful";
741 } else { 769 } else {
770 warn $@;
742 status "unable to connect"; 771 status "unable to connect";
743 stop_game(); 772 stop_game();
744 } 773 }
745} 774}
746 775
… …
748 $LOGIN_BUTTON->set_text ("Login / Register"); 777 $LOGIN_BUTTON->set_text ("Login / Register");
749 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 778 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
750 $SETUP_DIALOG->show; 779 $SETUP_DIALOG->show;
751 $PL_WINDOW->hide; 780 $PL_WINDOW->hide;
752 $SPELL_LIST->clear_spells; 781 $SPELL_LIST->clear_spells;
753 $dc::UI::ROOT->emit (stop_game => ! ! $CONN); 782 $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
754 783
755 &audio_music_set_ambient ([]); 784 &audio_music_set_ambient ([]);
756 785
757 return unless $CONN; 786 return unless $CONN;
758 787
… …
764 793
765 undef $MAP; 794 undef $MAP;
766} 795}
767 796
768sub graphics_setup { 797sub graphics_setup {
769 my $vbox = new dc::UI::VBox; 798 my $vbox = new DC::UI::VBox;
770 799
771 $vbox->add (my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]); 800 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 801
773 my $row = 0; 802 my $row = 0;
774 803
775 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 804 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
776 $table->add_at (1, $row++, new dc::UI::Label valign => 0, fontsize => 0.8, text => dc::OpenGL::gl_vendor . ", " . dc::OpenGL::gl_version, 805 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
777 can_events => 1, 806 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (dc::OpenGL::gl_extensions) . "</span></tt>"); 807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 808
780 my $vidmode_tooltip = 809 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 810 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
782 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 811 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 812
784 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Video Mode"); 813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
785 $table->add_at (1, $row++, my $hbox = new dc::UI::HBox); 814 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 815
787 $hbox->add (my $mode_slider = new dc::UI::Slider 816 $hbox->add (my $mode_slider = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 817 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
789 tooltip => $vidmode_tooltip); 818 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new dc::UI::Label 819 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 820 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 821 can_events => 1, tooltip => $vidmode_tooltip);
793 822
794 $mode_slider->connect (changed => sub { 823 $mode_slider->connect (changed => sub {
795 my ($self, $value) = @_; 824 my ($self, $value) = @_;
796 825
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 827 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 828 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 829 $mode_slider->emit (changed => $mode_slider->{range}[0]);
801 830
802 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fullscreen"); 831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new dc::UI::CheckBox 832 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 833 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 834 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 835 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 836 );
808 837
809 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
810 $table->add_at (1, $row++, new dc::UI::CheckBox 839 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 840 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 841 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
813 . "higher memory usage and slower performance. It will, however, help tremendously on " 842 . "higher memory usage and slower performance. It will, however, help tremendously on "
814 . "cards that claim to support a feature but fall back to software rendering. " 843 . "cards that claim to support a feature but fall back to software rendering. "
815 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 844 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
816 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 845 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
817 . "experience extremely low framerates and your card should do better, try this option.</b>", 846 . "experience extremely low framerates and your card should do better, try this option.</b>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 847 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 848 );
820 849
821 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Compress Textures"); 850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
822 $table->add_at (1, $row++, new dc::UI::CheckBox 851 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 852 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 853 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
825 . "will save a lot of memory and increase performance. The compression algorithm " 854 . "will save a lot of memory and increase performance. The compression algorithm "
826 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 855 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 856 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 857 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 858 );
830 859
831 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 860 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new dc::UI::CheckBox 861 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 862 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 863 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 864 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 865 );
837 866
838 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new dc::UI::Slider 868 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 869 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
841 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 870 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
842 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 871 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 872 );
844 873
845 $table->add_at (1, $row++, new dc::UI::Button 874 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 875 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 876 tooltip => "Apply the video settings above.",
848 on_activate => sub { 877 on_activate => sub {
849 video_shutdown (); 878 video_shutdown ();
850 video_init (); 879 video_init ();
851 0 880 0
852 } 881 }
853 ); 882 );
854 883
855 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Map Scale"); 884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new dc::UI::Slider 885 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 887 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 888 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 889 );
861 890
862 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new dc::UI::CheckBox 892 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 893 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 894 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
866 . "This increases load on the graphics subsystem and works only with TRT servers. " 895 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 896 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 897 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 898 );
870 899
871 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fog of War"); 900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
872 $table->add_at (1, $row++, new dc::UI::CheckBox 901 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 902 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 903 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 904 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 905 );
877 906
878 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new dc::UI::Slider 908 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 909 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
881 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 910 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
882 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 911 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 912 );
884 913
885 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new dc::UI::Slider 915 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 916 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
888 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 917 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
889 . "but you still need to press apply to correctly re-layout the widget.", 918 . "but you still need to press apply to correctly re-layout the widget.",
890 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 919 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 920 );
892 921
893 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 922 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new dc::UI::Slider 923 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 924 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
896 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 925 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 926 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 927 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 928 &set_gauge_window_fontsize;
900 0 929 0
901 } 930 }
902 ); 931 );
903 932
904 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Gauge size"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new dc::UI::Slider 934 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 935 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 936 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 937 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 938 $CFG->{gauge_size} = $_[1];
910 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 939 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
917 946
918our $AUDIO_HW_CHUNKSIZE; 947our $AUDIO_HW_CHUNKSIZE;
919our $AUDIO_INFO; 948our $AUDIO_INFO;
920 949
921sub audio_tab_update { 950sub audio_tab_update {
922 my ($freq, $format, $chans) = dc::Mix_QuerySpec; 951 my ($freq, $format, $chans) = DC::Mix_QuerySpec;
923 952
924 $AUDIO_HW_CHUNKSIZE->set_options ([ 953 $AUDIO_HW_CHUNKSIZE->set_options ([
925 [0, "default", "Use System Default"], 954 [0, "default", "Use System Default"],
926 map { 955 map {
927 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050); 956 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
… …
937 966
938 $AUDIO_INFO->set_text ($text); 967 $AUDIO_INFO->set_text ($text);
939} 968}
940 969
941sub audio_setup { 970sub audio_setup {
942 my $vbox = new dc::UI::VBox; 971 my $vbox = new DC::UI::VBox;
943 972
944 $vbox->add (my $table = new dc::UI::Table expand => 1, col_expand => [0, 0, 1]); 973 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 974
946 my $row = 0; 975 my $row = 0;
947 976
948 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Audio Enable"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new dc::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 979 state => $CFG->{audio_enable},
951 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.", 980 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.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 981 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 982 );
954 983
955 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Sound Effects"); 984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new dc::UI::CheckBox 985 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 986 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 987 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 988 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 989 $CFG->{effects_enable} = $_[1];
961 $CONN->update_fx_want if $CONN; 990 $CONN->update_fx_want if $CONN;
962 1 991 1
963 } 992 }
964 ); 993 );
965 $table->add_at (2, $row++, new dc::UI::Slider 994 $table->add_at (2, $row++, new DC::UI::Slider
966 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 995 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 996 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
968 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 997 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 998 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 999 );
971 1000
972 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Background Music"); 1001 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new dc::UI::CheckBox 1002 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1003 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1004 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1005 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1006 $CFG->{bgm_enable} = $_[1];
978 $CONN->update_fx_want if $CONN; 1007 $CONN->update_fx_want if $CONN;
979 audio_music_push; 1008 audio_music_push;
980 1 1009 1
981 } 1010 }
982 ); 1011 );
983 $table->add_at (2, $row++, new dc::UI::Slider 1012 $table->add_at (2, $row++, new DC::UI::Slider
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1013 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1014 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1015 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1016 );
988 1017
989 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Frequency"); 1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new dc::UI::Selector 1019 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1020 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1021 value => $CFG->{audio_hw_frequency},
993 options => [ 1022 options => [
994 [ 0, "default" , "Use System Default"], 1023 [ 0, "default" , "Use System Default"],
995 [11025, "11 kHz" , "11kHz (low quality)"], 1024 [11025, "11 kHz" , "11kHz (low quality)"],
… …
1003 audio_tab_update; 1032 audio_tab_update;
1004 1 1033 1
1005 } 1034 }
1006 ); 1035 );
1007 1036
1008 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Channels"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new dc::UI::Selector 1038 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1039 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1040 value => $CFG->{audio_hw_channels},
1012 options => [ 1041 options => [
1013 [0, "default" , "Use System Default"], 1042 [0, "default" , "Use System Default"],
1014 [1, "Mono" , "Mono (single channel, low quality)"], 1043 [1, "Mono" , "Mono (single channel, low quality)"],
… …
1022 audio_tab_update; 1051 audio_tab_update;
1023 1 1052 1
1024 } 1053 }
1025 ); 1054 );
1026 1055
1027 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Latency"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1028 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new dc::UI::Selector 1057 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1058 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1059 value => $CFG->{audio_hw_chunksize},
1031 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1060 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1032 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1061 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1033 on_changed => sub { 1062 on_changed => sub {
… …
1036 1 1065 1
1037 } 1066 }
1038 ); 1067 );
1039 1068
1040 # should really be a slider 1069 # should really be a slider
1041 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new dc::UI::ValSlider 1071 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1072 c_colspan => 2, expand => 1,
1044 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1073 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1045 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1074 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1075 template => ">= 99",
1047 on_changed => sub { 1076 on_changed => sub {
… …
1051 if $value; 1080 if $value;
1052 1; 1081 1;
1053 } 1082 }
1054 ); 1083 );
1055 1084
1056 $table->add_at (1, $row++, new dc::UI::Button 1085 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1086 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1087 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1088 on_activate => sub {
1060 audio_shutdown (); 1089 audio_shutdown ();
1061 audio_init (); 1090 audio_init ();
1062 0 1091 0
1063 } 1092 }
1064 ); 1093 );
1065 1094
1066 $vbox->add (new dc::UI::FancyFrame 1095 $vbox->add (new DC::UI::FancyFrame
1067 expand => 1, 1096 expand => 1,
1068 label => "Audio Info", 1097 label => "Audio Info",
1069 child => ($AUDIO_INFO = new dc::UI::Label ellipsise => 0), 1098 child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1070 ); 1099 );
1071 1100
1072 audio_tab_update; 1101 audio_tab_update;
1073 1102
1074 $vbox 1103 $vbox
… …
1081} 1110}
1082 1111
1083sub make_gauge_window { 1112sub make_gauge_window {
1084 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1113 my $gh = int $HEIGHT * $CFG->{gauge_size};
1085 1114
1086 my $win = new dc::UI::Frame ( 1115 my $win = new DC::UI::Frame (
1087 force_x => 0, 1116 force_x => 0,
1088 force_y => "max", 1117 force_y => "max",
1089 force_w => $WIDTH, 1118 force_w => $WIDTH,
1090 force_h => $gh, 1119 force_h => $gh,
1091 ); 1120 );
1092 1121
1093 $win->add (my $hbox = new dc::UI::HBox 1122 $win->add (my $hbox = new DC::UI::HBox
1094 children => [ 1123 children => [
1095 (new dc::UI::HBox expand => 1), 1124 (new DC::UI::HBox expand => 1),
1096 (new dc::UI::VBox children => [ 1125 (new DC::UI::VBox children => [
1097 (new dc::UI::Empty expand => 1), 1126 (new DC::UI::Empty expand => 1),
1098 (new dc::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new dc::UI::Table)), 1127 (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1099 ]), 1128 ]),
1100 (my $vbox = new dc::UI::VBox), 1129 (my $vbox = new DC::UI::VBox),
1101 ], 1130 ],
1102 ); 1131 );
1103 1132
1104 $vbox->add (new dc::UI::HBox 1133 $vbox->add (new DC::UI::HBox
1105 expand => 1, 1134 expand => 1,
1106 children => [ 1135 children => [
1107 (new dc::UI::Empty expand => 1), 1136 (new DC::UI::Empty expand => 1),
1108 (my $hb = new dc::UI::HBox), 1137 (my $hb = new DC::UI::HBox),
1109 ], 1138 ],
1110 ); 1139 );
1111 1140
1112 $hb->add (my $hg = new dc::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1141 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1113 $hb->add (my $mg = new dc::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1142 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1114 $hb->add (my $gg = new dc::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1143 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1115 $hb->add (my $fg = new dc::UI::Gauge type => 'food', tooltip => "#stat_food"); 1144 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116 1145
1117 $vbox->add (my $exp = new dc::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1146 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1118 $vbox->add (my $prg = new dc::UI::ExperienceProgress); 1147 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new dc::UI::ExperienceProgress); 1148 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $rng = new dc::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1149 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1150
1122 $GAUGES = { 1151 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1152 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1153 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1154 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1129 1158
1130 $win 1159 $win
1131} 1160}
1132 1161
1133sub debug_setup { 1162sub debug_setup {
1134 my $table = new dc::UI::Table; 1163 my $table = new DC::UI::Table;
1135 1164
1136 $table->add_at (0, 0, new dc::UI::Label text => "Widget Borders"); 1165 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1137 $table->add_at (1, 0, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1166 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
1138 $table->add_at (0, 1, new dc::UI::Label text => "Tooltip Widget Info"); 1167 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1139 $table->add_at (1, 1, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1168 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
1140 $table->add_at (0, 2, new dc::UI::Label text => "Show FPS"); 1169 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1141 $table->add_at (1, 2, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1170 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1142 $table->add_at (0, 3, new dc::UI::Label text => "Suppress Tooltips"); 1171 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1143 $table->add_at (1, 3, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1172 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1144 $table->add_at (0, 4, new dc::UI::Button text => "die on click(tm)", on_activate => sub { &dc::debug() } ); 1173 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1174
1146 $table->add_at (0, 5, new dc::UI::TextEdit text => "line1\0152\0153");#d# 1175 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1176
1148 $table->add_at (7,7, my $t = new dc::UI::Table expand => 0); 1177 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1149 $t->add_at (0,0, new dc::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2); 1178 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1150 $t->add_at (2,0, new dc::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1); 1179 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1151 $t->add_at (1,2, new dc::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2); 1180 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1152 $t->add_at (0,1, new dc::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1181 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1153 $t->add_at (1,1, new dc::UI::Label text => "e"); 1182 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1183
1155 $table->add_at (7, 6, my $c = new dc::UI::Canvas); 1184 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1185
1157 $c->add_items ({ 1186 $c->add_items ({
1158 type => "line_loop", 1187 type => "line_loop",
1159 color => [0, 1, 0], 1188 color => [0, 1, 0],
1160 width => 9, 1189 width => 9,
… …
1180 1209
1181 $table 1210 $table
1182} 1211}
1183 1212
1184sub stats_window { 1213sub stats_window {
1185 my $r = new dc::UI::ScrolledWindow ( 1214 my $r = new DC::UI::ScrolledWindow (
1186 expand => 1, 1215 expand => 1,
1187 scroll_y => 1 1216 scroll_y => 1
1188 ); 1217 );
1189 $r->add (my $vb = new dc::UI::VBox); 1218 $r->add (my $vb = new DC::UI::VBox);
1190 1219
1191 $vb->add (new dc::UI::FancyFrame 1220 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1221 label => "Player",
1193 child => (my $pi = new dc::UI::VBox), 1222 child => (my $pi = new DC::UI::VBox),
1194 ); 1223 );
1195 1224
1196 $pi->add ($STATWIDS->{title} = new dc::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1225 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1226 can_hover => 1, can_events => 1,
1198 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1227 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1199 $pi->add ($STATWIDS->{map} = new dc::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1228 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1229 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1230 tooltip => "The map you are currently on (if supported by the server).");
1202 1231
1203 $pi->add (my $hb0 = new dc::UI::HBox); 1232 $pi->add (my $hb0 = new DC::UI::HBox);
1204 $hb0->add ($STATWIDS->{weight} = new dc::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1233 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1234 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1235 tooltip => "The weight of the player including all inventory items.");
1207 $hb0->add ($STATWIDS->{m_weight} = new dc::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1236 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1237 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1238 tooltip => "The weight limit: you cannot carry more than this.");
1210 1239
1211 $vb->add (new dc::UI::FancyFrame 1240 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1241 label => "Primary/Secondary Statistics",
1213 child => (my $hb = new dc::UI::HBox expand => 1), 1242 child => (my $hb = new DC::UI::HBox expand => 1),
1214 ); 1243 );
1215 $hb->add (my $tbl = new dc::UI::Table expand => 1); 1244 $hb->add (my $tbl = new DC::UI::Table expand => 1);
1216 1245
1217 my $color2 = [1, 1, 0]; 1246 my $color2 = [1, 1, 0];
1218 1247
1219 for ( 1248 for (
1220 [0, 0, st_str => "Str", 30], 1249 [0, 0, st_str => "Str", 30],
… …
1232 [2, 4, st_spd => "Spd", 10.54], 1261 [2, 4, st_spd => "Spd", 10.54],
1233 [2, 5, st_wspd => "WSp", 10.54], 1262 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1263 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1264 my ($col, $row, $id, $label, $template) = @$_;
1236 1265
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new dc::UI::Label 1266 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1267 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1268 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new dc::UI::Label 1269 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1241 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1270 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1271 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1272 }
1244 1273
1245 $vb->add (new dc::UI::FancyFrame 1274 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1275 label => "Resistancies",
1247 child => (my $tbl2 = new dc::UI::Table expand => 1), 1276 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1277 );
1249 1278
1250 my $row = 0; 1279 my $row = 0;
1251 my $col = 0; 1280 my $col = 0;
1252 1281
… …
1291 1320
1292 for (qw/slow holyw conf fire depl magic 1321 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1322 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1323 blind fear tund elec cold ghit/)
1295 { 1324 {
1296 $tbl2->add_at ($col, $row, 1325 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1326 $STATWIDS->{"res_$_"} =
1298 new dc::UI::Label 1327 new DC::UI::Label
1299 font => $FONT_FIXED, 1328 font => $FONT_FIXED,
1300 template => "-100%", 1329 template => "-100%",
1301 align => +1, 1330 align => 1,
1302 valign => 0,
1303 can_events => 1, 1331 can_events => 1,
1304 can_hover => 1, 1332 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1333 tooltip => $resist_names{$_}->[1],
1306 ); 1334 );
1307 $tbl2->add_at ($col + 1, $row, new dc::UI::Image 1335 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 font => $FONT_FIXED, 1336 font => $FONT_FIXED,
1309 can_hover => 1, 1337 can_hover => 1,
1310 can_events => 1, 1338 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1339 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1340 tooltip => $resist_names{$_}->[1],
1313 ); 1341 );
1314 $tbl2->add_at ($col + 2, $row, new dc::UI::Label 1342 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1343 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1344 font => $FONT_FIXED,
1345 align => 1,
1317 can_hover => 1, 1346 can_hover => 1,
1318 can_events => 1, 1347 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1348 tooltip => $resist_names{$_}->[1],
1320 ); 1349 );
1321 1350
1322 $row++; 1351 $row++;
1323 if ($row % 6 == 0) { 1352 if ($row % 6 == 0) {
1324 $col += 3; 1353 $col += 4;
1325 $row = 0; 1354 $row = 0;
1326 } 1355 }
1327 } 1356 }
1328 1357
1329 #update_stats_window ({}); 1358 #update_stats_window ({});
1330 1359
1331 $r 1360 $r
1332} 1361}
1333 1362
1334sub skill_window { 1363sub skill_window {
1335 my $sw = new dc::UI::ScrolledWindow (expand => 1); 1364 my $sw = new DC::UI::ScrolledWindow (expand => 1);
1336 1365
1337 $sw->add ($STATWIDS->{skill_tbl} = new dc::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]); 1366 $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1338 1367
1339 $sw 1368 $sw
1340} 1369}
1341 1370
1342sub formsep($) { 1371sub formsep($) {
… …
1354 return if $METASERVER_ATIME > time; 1383 return if $METASERVER_ATIME > time;
1355 $METASERVER_ATIME = time + 60; 1384 $METASERVER_ATIME = time + 60;
1356 1385
1357 my $table = $METASERVER->{table}; 1386 my $table = $METASERVER->{table};
1358 $table->clear; 1387 $table->clear;
1359 $table->add_at (0, 0, my $label = new dc::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1388 $table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1360 1389
1361 my $ok = 0; 1390 my $ok = 0;
1362 1391
1363 dc::background { 1392 DC::background {
1364 my $ua = dc::lwp_useragent; 1393 my $ua = DC::lwp_useragent;
1365 1394
1366 dc::background_msg dc::decode_json +(dc::lwp_check $ua->get ($META_SERVER))->decoded_content; 1395 DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1367 } sub { 1396 } sub {
1368 my ($msg) = @_; 1397 my ($msg) = @_;
1369 if ($msg) { 1398 if ($msg) {
1370 $table->clear; 1399 $table->clear;
1371 1400
… …
1374 "The hostname of the server.", 1403 "The hostname of the server.",
1375 "The time this server has been running without being restarted.", 1404 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1405 "Short information about this server provided by its admins.",
1377 ); 1406 );
1378 my @col = qw(#Users Host Uptime Version Description); 1407 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new dc::UI::Label 1408 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1409 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1410 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1411 for 0 .. $#col;
1384 1412
1385 my @align = qw(1 0 1 1 -1); 1413 my @align = qw(1 0.5 1 1 0);
1386 1414
1387 my $y = 0; 1415 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1416 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1417 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1418 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1406 1434
1407 $m = [$users, $host, $uptime, $version, $desc]; 1435 $m = [$users, $host, $uptime, $version, $desc];
1408 1436
1409 $y++; 1437 $y++;
1410 1438
1411 $table->add_at (scalar @$m, $y, new dc::UI::VBox children => [ 1439 $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1412 (new dc::UI::Button 1440 (new DC::UI::Button
1413 text => "Use", 1441 text => "Use",
1414 tooltip => "Put this server into the <b>Host:Port</b> field", 1442 tooltip => "Put this server into the <b>Host:Port</b> field",
1415 on_activate => sub { 1443 on_activate => sub {
1416 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1444 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1417 $METASERVER->hide; 1445 $METASERVER->hide;
1418 0 1446 0
1419 }, 1447 },
1420 ), 1448 ),
1421 (new dc::UI::Empty expand => 1), 1449 (new DC::UI::Empty expand => 1),
1422 ]); 1450 ]);
1423 1451
1424 $table->add_at ($_, $y, new dc::UI::Label 1452 $table->add_at ($_, $y, new DC::UI::Label
1425 max_w => $::WIDTH * 0.4, 1453 max_w => $::WIDTH * 0.4,
1426 ellipsise => 0, 1454 ellipsise => 0,
1427 align => $align[$_], 1455 align => $align[$_],
1428 text => $m->[$_], 1456 text => $m->[$_],
1429 tooltip => $tip[$_], 1457 tooltip => $tip[$_],
… …
1439 }; 1467 };
1440 1468
1441} 1469}
1442 1470
1443sub metaserver_dialog { 1471sub metaserver_dialog {
1444 my $vbox = new dc::UI::VBox; 1472 my $vbox = new DC::UI::VBox;
1445 my $table = new dc::UI::Table; 1473 my $table = new DC::UI::Table;
1446 $vbox->add (new dc::UI::ScrolledWindow expand => 1, child => $table); 1474 $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1447 1475
1448 my $dialog = new dc::UI::Toplevel 1476 my $dialog = new DC::UI::Toplevel
1449 title => "Server List", 1477 title => "Server List",
1450 name => 'metaserver_dialog', 1478 name => 'metaserver_dialog',
1451 x => 'center', 1479 x => 'center',
1452 y => 'center', 1480 y => 'center',
1453 z => 3, 1481 z => 3,
… …
1464 1492
1465 $dialog 1493 $dialog
1466} 1494}
1467 1495
1468sub login_setup { 1496sub login_setup {
1469 my $vbox = new dc::UI::VBox; 1497 my $vbox = new DC::UI::VBox;
1470 1498
1471 $vbox->add (new dc::UI::FancyFrame 1499 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1500 label => "Login Settings",
1473 child => (my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]), 1501 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1502 );
1475 1503
1476 $table->add_at (0, 4, new dc::UI::Label valign => 0, align => 1, text => "Username"); 1504 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new dc::UI::Entry 1505 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1506 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1507 tooltip => "The name of your character on the server.",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1508 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1509 );
1482 1510
1483 $table->add_at (0, 5, new dc::UI::Label valign => 0, align => 1, text => "Password"); 1511 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new dc::UI::Entry 1512 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1513 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1514 hidden => 1,
1487 tooltip => "The password for your character.", 1515 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1516 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1517 );
1490 1518
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new dc::UI::Button 1519 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1520 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1521 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1522 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1523 on_activate => sub {
1497 $CONN ? stop_game 1524 $CONN ? stop_game
1498 : start_game; 1525 : start_game;
1499 1 1526 1
1500 }, 1527 },
1501 ); 1528 );
1502 1529
1503 $vbox->add (new dc::UI::FancyFrame 1530 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1531 label => "Registering",
1505 min_h => 200, 1532 min_h => 200,
1506 child => (new dc::UI::Label valign => -1, ellipsise => 0, 1533 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1534 markup =>
1508 "To register a new account, choose a username that hasn't been taken yet and " 1535 "To register a new account, choose a username that hasn't been taken yet and "
1509 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1536 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1537 ),
1511 ); 1538 );
1512 1539
1513 $vbox 1540 $vbox
1514} 1541}
1515 1542
1516sub server_setup { 1543sub server_setup {
1517 my $vbox = new dc::UI::VBox; 1544 my $vbox = new DC::UI::VBox;
1518 1545
1519 $vbox->add (new dc::UI::FancyFrame 1546 $vbox->add (new DC::UI::FancyFrame
1520 label => "Connection Settings", 1547 label => "Connection Settings",
1521 child => (my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]), 1548 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1549 );
1523 1550
1524 my $row = 0; 1551 my $row = 0;
1525 1552
1526 $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Host:Port"); 1553 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1554 {
1528 $table->add_at (1, $row, my $vbox = new dc::UI::VBox); 1555 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1556
1530 $vbox->add ( 1557 $vbox->add (
1531 $HOST_ENTRY = new dc::UI::Entry 1558 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1559 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1560 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1561 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1562 on_changed => sub {
1536 my ($self, $value) = @_; 1563 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1564 $CFG->{profile}{default}{host} = $value;
1538 1 1565 1
1539 } 1566 }
1540 ); 1567 );
1541 1568
1542 if (0) { #d# disabled 1569 if (0) { #d# disabled
1543 $vbox->add (new dc::UI::Button 1570 $vbox->add (new DC::UI::Button
1544 expand => 1, 1571 expand => 1,
1545 text => "Server List", 1572 text => "Server List",
1546 other => $METASERVER, 1573 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1574 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1575 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1576 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1577 );
1551 }#d# 1578 }#d#
1552 } 1579 }
1553 1580
1554 $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Map Size"); 1581 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new dc::UI::Slider 1582 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1583 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1584 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1585 tooltip => "This is the size of the portion of the map update the server sends you. "
1559 . "If you set this to a high value you will be able to see further, " 1586 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1587 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1588 . "This option is only used once at log-in.",
1562 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1589 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1590 );
1564 1591
1565 $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1592 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new dc::UI::Entry 1593 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1594 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1595 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1596 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1597 . "default will be used, which is usually around 100kb/s. Most servers will "
1571 . "dynamically find an optimal rate, so adjust this only when necessary.", 1598 . "dynamically find an optimal rate, so adjust this only when necessary.",
1572 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 }, 1599 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1573 ); 1600 );
1574 1601
1575 $vbox->add (new dc::UI::FancyFrame 1602 $vbox->add (new DC::UI::FancyFrame
1576 label => "Server Info", 1603 label => "Server Info",
1577 child => ($SERVER_INFO = new dc::UI::Label ellipsise => 0), 1604 child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1578 ); 1605 );
1579 1606
1580 $vbox 1607 $vbox
1581} 1608}
1582 1609
1583sub client_setup { 1610sub client_setup {
1584 my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]; 1611 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1612
1586 my $row = 0; 1613 my $row = 0;
1587 1614
1588 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1615 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1589 $table->add_at (1, $row++, new dc::UI::CheckBox 1616 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1617 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1618 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1619 on_changed => sub {
1593 my ($self, $value) = @_; 1620 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1621 $CFG->{show_tips} = $value;
1595 0 1622 0
1596 } 1623 }
1597 ); 1624 );
1598 1625
1599 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1626 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1600 $table->add_at (1, $row++, my $saycmd = new dc::UI::Entry 1627 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1628 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1629 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1603 . "sends more messages than this number, older messages get removed to save memory and " 1630 . "sends more messages than this number, older messages get removed to save memory and "
1604 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1631 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1632 on_changed => sub {
1606 my ($self, $value) = @_; 1633 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1635 0
1609 }, 1636 },
1610 ); 1637 );
1611 1638
1612 $table 1639 $table
1613} 1640}
1614 1641
1615sub autopickup_setup { 1642sub autopickup_setup {
1616 my $r = new dc::UI::ScrolledWindow ( 1643 my $r = new DC::UI::ScrolledWindow (
1617 expand => 1, 1644 expand => 1,
1618 scroll_y => 1 1645 scroll_y => 1
1619 ); 1646 );
1620 $r->add (my $table = new dc::UI::Table 1647 $r->add (my $table = new DC::UI::Table
1621 row_expand => [0], 1648 row_expand => [0],
1622 col_expand => [0, 1, 0, 1], 1649 col_expand => [0, 1, 0, 1],
1623 ); 1650 );
1624 1651
1625 for ( 1652 for (
… …
1663 ], 1690 ],
1664 ["Weight/Value ratio", 2, 17] 1691 ["Weight/Value ratio", 2, 17]
1665 ) 1692 )
1666 { 1693 {
1667 my ($title, $x, $y, @bits) = @$_; 1694 my ($title, $x, $y, @bits) = @$_;
1668 $table->add_at ($x, $y, new dc::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1695 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1669 1696
1670 for (@bits) { 1697 for (@bits) {
1671 ++$y; 1698 ++$y;
1672 1699
1673 my $mask = $_->[1]; 1700 my $mask = $_->[1];
1674 $table->add_at ($x , $y, new dc::UI::Label text => $_->[0], align => 1, expand => 1); 1701 $table->add_at ($x , $y, new DC::UI::Label text => $_->[0], align => 1, expand => 1);
1675 $table->add_at ($x+1, $y, my $checkbox = new dc::UI::CheckBox 1702 $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1676 state => $::CFG->{pickup} & $mask, 1703 state => $::CFG->{pickup} & $mask,
1677 on_changed => sub { 1704 on_changed => sub {
1678 my ($box, $value) = @_; 1705 my ($box, $value) = @_;
1679 1706
1680 if ($value) { 1707 if ($value) {
… …
1691 1718
1692 ${$_->[2]} = $checkbox if $_->[2]; 1719 ${$_->[2]} = $checkbox if $_->[2];
1693 } 1720 }
1694 } 1721 }
1695 1722
1696 $table->add_at (2, 18, new dc::UI::ValSlider 1723 $table->add_at (2, 18, new DC::UI::ValSlider
1697 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1724 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1698 template => ">= 99", 1725 template => ">= 99",
1699 to_value => sub { ">= " . 5 * $_[0] }, 1726 to_value => sub { ">= " . 5 * $_[0] },
1700 on_changed => sub { 1727 on_changed => sub {
1701 my ($slider, $value) = @_; 1728 my ($slider, $value) = @_;
… …
1704 $::CFG->{pickup} |= int $value 1731 $::CFG->{pickup} |= int $value
1705 if $value; 1732 if $value;
1706 1; 1733 1;
1707 }); 1734 });
1708 1735
1709 $table->add_at (3, 18, new dc::UI::Button 1736 $table->add_at (3, 18, new DC::UI::Button
1710 text => "set", 1737 text => "set",
1711 on_activate => sub { 1738 on_activate => sub {
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1739 $::CONN->send_command ("pickup $::CFG->{pickup}")
1713 if defined $::CONN; 1740 if defined $::CONN;
1714 0 1741 0
… …
1735 or $a->{type} <=> $b->{type} 1762 or $a->{type} <=> $b->{type}
1736 } @_ }, 1763 } @_ },
1737); 1764);
1738 1765
1739sub inventory_widget { 1766sub inventory_widget {
1740 my $hb = new dc::UI::HBox homogeneous => 1; 1767 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1768
1742 $hb->add (my $vb1 = new dc::UI::VBox); 1769 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new dc::UI::Label align => 0, text => "Player"); 1770 $vb1->add (new DC::UI::Label text => "Player");
1744 1771
1745 $vb1->add (my $hb1 = new dc::UI::HBox); 1772 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1773
1747 use sort 'stable'; 1774 use sort 'stable';
1748 1775
1749 $hb1->add (new dc::UI::Selector 1776 $hb1->add (new DC::UI::Selector
1750 value => $::CFG->{inv_sort}, 1777 value => $::CFG->{inv_sort},
1751 options => [ 1778 options => [
1752 [type => "Type/Name"], 1779 [type => "Type/Name"],
1753 [mtime => "Recent/Normal/Locked"], 1780 [mtime => "Recent/Normal/Locked"],
1754 [weight => "Weight/Type"], 1781 [weight => "Weight/Type"],
… …
1756 on_changed => sub { 1783 on_changed => sub {
1757 $::CFG->{inv_sort} = $_[1]; 1784 $::CFG->{inv_sort} = $_[1];
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1785 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1786 },
1760 ); 1787 );
1761 $hb1->add (new dc::UI::Label text => "Weight: ", align => 1, expand => 1); 1788 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1789 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new dc::UI::Label align => -1); 1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1791
1765 $vb1->add (my $sw1 = new dc::UI::ScrolledWindow expand => 1, scroll_y => 1); 1792 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new dc::UI::Inventory); 1793 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1795
1769 $hb->add (my $vb2 = new dc::UI::VBox); 1796 $hb->add (my $vb2 = new DC::UI::VBox);
1770 1797
1771 $vb2->add ($INVR_HB = new dc::UI::HBox); 1798 $vb2->add ($INVR_HB = new DC::UI::HBox);
1772 1799
1773 $vb2->add (my $sw2 = new dc::UI::ScrolledWindow expand => 1, scroll_y => 1); 1800 $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1774 $sw2->add ($INVR = new dc::UI::Inventory); 1801 $sw2->add ($INVR = new DC::UI::Inventory);
1775 1802
1776 # XXX: Call after $INVR = ... because set_opencont sets the items 1803 # XXX: Call after $INVR = ... because set_opencont sets the items
1777 dc::Protocol::set_opencont ($::CONN, 0, "Floor"); 1804 DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1778 1805
1779 $hb 1806 $hb
1780} 1807}
1781 1808
1782sub media_window { 1809sub media_window {
1783 my $vb = new dc::UI::VBox; 1810 my $vb = new DC::UI::VBox;
1784 1811
1785 $vb->add (new dc::UI::FancyFrame 1812 $vb->add (new DC::UI::FancyFrame
1786 label => "Currently playing music", 1813 label => "Currently playing music",
1787 child => new dc::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 1814 child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1788 child => ($MUSIC_PLAYING_WIDGET = new dc::UI::Label ellipsise => 0, fontsize => 0.8), 1815 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1789 ); 1816 );
1790 1817
1791 $vb->add (new dc::UI::FancyFrame 1818 $vb->add (new DC::UI::FancyFrame
1792 label => "Other media used in this session", 1819 label => "Other media used in this session",
1793 expand => 1, 1820 expand => 1,
1794 child => ($LICENSE_WIDGET = new dc::UI::TextScroller 1821 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1795 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1822 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1796 ); 1823 );
1797 1824
1798 $vb 1825 $vb
1799} 1826}
… …
1808 or return; 1835 or return;
1809 1836
1810 $LICENSE_WIDGET->add_paragraph ({ 1837 $LICENSE_WIDGET->add_paragraph ({
1811 fg => [1, 1, 1, 1], 1838 fg => [1, 1, 1, 1],
1812 markup => "<small>" 1839 markup => "<small>"
1813 . "<b>Name:</b> " . (dc::asxml $meta->{name}) . "\n" 1840 . "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1814 . "<b>Author:</b> " . (dc::asxml $meta->{author}) . "\n" 1841 . "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1815 . "<b>Source:</b> " . (dc::asxml $meta->{source}) . "\n" 1842 . "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1816 . "<b>License:</b> " . (dc::asxml $meta->{license}) . "\n" 1843 . "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1817 . "</small>", 1844 . "</small>",
1818 }); 1845 });
1819 $LICENSE_WIDGET->scroll_to_bottom; 1846 $LICENSE_WIDGET->scroll_to_bottom;
1820} 1847}
1821 1848
… …
1829 $PL_WINDOW->show; 1856 $PL_WINDOW->show;
1830 } 1857 }
1831} 1858}
1832 1859
1833sub player_window { 1860sub player_window {
1834 my $plwin = $PL_WINDOW = new dc::UI::Toplevel 1861 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1835 x => "center", 1862 x => "center",
1836 y => "center", 1863 y => "center",
1837 force_w => $WIDTH * 9/10, 1864 force_w => $WIDTH * 9/10,
1838 force_h => $HEIGHT * 9/10, 1865 force_h => $HEIGHT * 9/10,
1839 title => "Player", 1866 title => "Player",
… …
1841 has_close_button => 1 1868 has_close_button => 1
1842 ; 1869 ;
1843 1870
1844 my $ntb = 1871 my $ntb =
1845 $PL_NOTEBOOK = 1872 $PL_NOTEBOOK =
1846 new dc::UI::Notebook expand => 1; 1873 new DC::UI::Notebook expand => 1;
1847 1874
1848 $ntb->add_tab ( 1875 $ntb->add_tab (
1849 "Statistics (F2)" => $STATS_PAGE = stats_window, 1876 "Statistics (F2)" => $STATS_PAGE = stats_window,
1850 "Shows statistics, where all your Stats and Resistances are shown." 1877 "Shows statistics, where all your Stats and Resistances are shown."
1851 ); 1878 );
1852 $ntb->add_tab ( 1879 $ntb->add_tab (
1853 "Skills (F3)" => $SKILL_PAGE = skill_window, 1880 "Skills (F3)" => $SKILL_PAGE = skill_window,
1854 "Shows all your Skills." 1881 "Shows all your Skills."
1855 ); 1882 );
1856 1883
1857 my $spellsw = $SPELL_PAGE = new dc::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1884 my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1858 $spellsw->add ($SPELL_LIST = new dc::UI::SpellList); 1885 $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1859 $ntb->add_tab ( 1886 $ntb->add_tab (
1860 "Spellbook (F4)" => $spellsw, 1887 "Spellbook (F4)" => $spellsw,
1861 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1888 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1862 ); 1889 );
1863 $ntb->add_tab ( 1890 $ntb->add_tab (
… …
1876 $plwin->add ($ntb); 1903 $plwin->add ($ntb);
1877 $plwin 1904 $plwin
1878} 1905}
1879 1906
1880sub keyboard_setup { 1907sub keyboard_setup {
1881 dc::Macro::keyboard_setup 1908 DC::Macro::keyboard_setup
1882} 1909}
1883 1910
1884sub help_window { 1911sub help_window {
1885 my $win = new dc::UI::Toplevel 1912 my $win = new DC::UI::Toplevel
1886 x => 'center', 1913 x => 'center',
1887 y => 'center', 1914 y => 'center',
1888 z => 4, 1915 z => 4,
1889 name => 'doc_browser', 1916 name => 'doc_browser',
1890 force_w => int $WIDTH * 7/8, 1917 force_w => int $WIDTH * 7/8,
1891 force_h => int $HEIGHT * 7/8, 1918 force_h => int $HEIGHT * 7/8,
1892 title => "Help Browser", 1919 title => "Help Browser",
1893 has_close_button => 1; 1920 has_close_button => 1;
1894 1921
1895 $win->add (my $vbox = new dc::UI::VBox); 1922 $win->add (my $vbox = new DC::UI::VBox);
1896 1923
1897 $vbox->add (new dc::UI::FancyFrame 1924 $vbox->add (new DC::UI::FancyFrame
1898 label => "Navigation", 1925 label => "Navigation",
1899 child => (my $buttons = new dc::UI::HBox), 1926 child => (my $buttons = new DC::UI::HBox),
1900 ); 1927 );
1901 $vbox->add (my $viewer = new dc::UI::TextScroller 1928 $vbox->add (my $viewer = new DC::UI::TextScroller
1902 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1929 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1903 1930
1904 my @history; 1931 my @history;
1905 my @future; 1932 my @future;
1906 my $curnode; 1933 my $curnode;
… …
1908 my $load_node; $load_node = sub { 1935 my $load_node; $load_node = sub {
1909 my ($node, $para) = @_; 1936 my ($node, $para) = @_;
1910 1937
1911 $buttons->clear; 1938 $buttons->clear;
1912 1939
1913 $buttons->add (new dc::UI::Button 1940 $buttons->add (new DC::UI::Button
1914 text => "⇤", 1941 text => "⇤",
1915 tooltip => "back to the starting page", 1942 tooltip => "back to the starting page",
1916 on_activate => sub { 1943 on_activate => sub {
1917 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1944 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1918 unshift @future, @history; 1945 unshift @future, @history;
… …
1920 $load_node->(@{shift @future}); 1947 $load_node->(@{shift @future});
1921 }, 1948 },
1922 ); 1949 );
1923 1950
1924 if (@history) { 1951 if (@history) {
1925 $buttons->add (new dc::UI::Button 1952 $buttons->add (new DC::UI::Button
1926 text => "⋘", 1953 text => "⋘",
1927 tooltip => "back to <i>" . (dc::asxml dc::Pod::full_path $history[-1][0]) . "</i>", 1954 tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1928 on_activate => sub { 1955 on_activate => sub {
1929 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1956 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1930 $load_node->(@{pop @history}); 1957 $load_node->(@{pop @history});
1931 }, 1958 },
1932 ); 1959 );
1933 } 1960 }
1934 1961
1935 if (@future) { 1962 if (@future) {
1936 $buttons->add (new dc::UI::Button 1963 $buttons->add (new DC::UI::Button
1937 text => "⋙", 1964 text => "⋙",
1938 tooltip => "forward to <i>" . (dc::asxml dc::Pod::full_path $future[0][0]) . "</i>", 1965 tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1939 on_activate => sub { 1966 on_activate => sub {
1940 push @history, [$curnode, $viewer->current_paragraph]; 1967 push @history, [$curnode, $viewer->current_paragraph];
1941 $load_node->(@{shift @future}); 1968 $load_node->(@{shift @future});
1942 }, 1969 },
1943 ); 1970 );
1944 } 1971 }
1945 1972
1946 $buttons->add (new dc::UI::Label text => " "); 1973 $buttons->add (new DC::UI::Label text => " ");
1947 1974
1948 my @path = dc::Pod::full_path_of $node; 1975 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 1976 pop @path; # drop current node
1950 1977
1951 for my $node (@path) { 1978 for my $node (@path) {
1952 $buttons->add (new dc::UI::Button 1979 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 1980 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (dc::asxml dc::Pod::full_path $node) . "</i>", 1981 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 1982 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1983 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 1984 $load_node->($node);
1958 }, 1985 },
1959 ); 1986 );
1960 $buttons->add (new dc::UI::Label text => "/"); 1987 $buttons->add (new DC::UI::Label text => "/");
1961 } 1988 }
1962 1989
1963 $buttons->add (new dc::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1990 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 1991
1965 $curnode = $node; 1992 $curnode = $node;
1966 1993
1967 $viewer->clear; 1994 $viewer->clear;
1968 $viewer->add_paragraph (dc::Pod::as_paragraphs dc::Pod::section_of $curnode); 1995 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1969 $viewer->scroll_to ($para); 1996 $viewer->scroll_to ($para);
1970 }; 1997 };
1971 1998
1972 $load_node->(dc::Pod::find pod => "mainpage"); 1999 $load_node->(DC::Pod::find pod => "mainpage");
1973 2000
1974 $dc::Pod::goto_document = sub { 2001 $DC::Pod::goto_document = sub {
1975 my (@path) = @_; 2002 my (@path) = @_;
1976 2003
1977 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2004 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1978 2005
1979 $load_node->((dc::Pod::find @path)[0]); 2006 $load_node->((DC::Pod::find @path)[0]);
1980 $win->show; 2007 $win->show;
1981 }; 2008 };
1982 2009
1983 $win 2010 $win
1984} 2011}
1985 2012
1986sub open_string_query { 2013sub open_string_query {
1987 my ($title, $cb, $txt, $tooltip) = @_; 2014 my ($title, $cb, $txt, $tooltip) = @_;
1988 my $dialog = new dc::UI::Toplevel 2015 my $dialog = new DC::UI::Toplevel
1989 x => "center", 2016 x => "center",
1990 y => "center", 2017 y => "center",
1991 z => 50, 2018 z => 50,
1992 force_w => $WIDTH * 4/5, 2019 force_w => $WIDTH * 4/5,
1993 title => $title; 2020 title => $title;
1994 2021
1995 $dialog->add ( 2022 $dialog->add (
1996 my $e = new dc::UI::Entry 2023 my $e = new DC::UI::Entry
1997 on_activate => sub { $cb->(@_); $dialog->hide; 0 }, 2024 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1998 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, 2025 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1999 tooltip => $tooltip 2026 tooltip => $tooltip
2000 ); 2027 );
2001 2028
… …
2004 $dialog->show; 2031 $dialog->show;
2005} 2032}
2006 2033
2007sub open_quit_dialog { 2034sub open_quit_dialog {
2008 unless ($QUIT_DIALOG) { 2035 unless ($QUIT_DIALOG) {
2009 $QUIT_DIALOG = new dc::UI::Toplevel 2036 $QUIT_DIALOG = new DC::UI::Toplevel
2010 x => "center", 2037 x => "center",
2011 y => "center", 2038 y => "center",
2012 z => 50, 2039 z => 50,
2013 title => "Really Quit?", 2040 title => "Really Quit?",
2014 on_key_down => sub { 2041 on_key_down => sub {
2015 my ($dialog, $ev) = @_; 2042 my ($dialog, $ev) = @_;
2016 $ev->{sym} == 27 and $dialog->hide; 2043 $ev->{sym} == 27 and $dialog->hide;
2017 } 2044 }
2018 ; 2045 ;
2019 2046
2020 $QUIT_DIALOG->add (my $vb = new dc::UI::VBox expand => 1); 2047 $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2021 2048
2022 $vb->add (new dc::UI::Label 2049 $vb->add (new DC::UI::Label
2023 text => "You should find a savebed and apply it first!", 2050 text => "You should find a savebed and apply it first!",
2024 max_w => $WIDTH * 0.25, 2051 max_w => $WIDTH * 0.25,
2025 ellipsize => 0, 2052 ellipsize => 0,
2026 ); 2053 );
2027 $vb->add (my $hb = new dc::UI::HBox expand => 1); 2054 $vb->add (my $hb = new DC::UI::HBox expand => 1);
2028 $hb->add (new dc::UI::Button 2055 $hb->add (new DC::UI::Button
2029 text => "Ok", 2056 text => "Ok",
2030 expand => 1, 2057 expand => 1,
2031 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2058 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2032 ); 2059 );
2033 $hb->add (new dc::UI::Button 2060 $hb->add (new DC::UI::Button
2034 text => "Quit anyway", 2061 text => "Quit anyway",
2035 expand => 1, 2062 expand => 1,
2036 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2063 on_activate => sub { EV::unloop EV::UNLOOP_ALL },
2037 ); 2064 );
2038 } 2065 }
… …
2041 $QUIT_DIALOG->grab_focus; 2068 $QUIT_DIALOG->grab_focus;
2042} 2069}
2043 2070
2044sub show_tip_of_the_day { 2071sub show_tip_of_the_day {
2045 # find all tips 2072 # find all tips
2046 my @tod = dc::Pod::find tip_of_the_day => "*"; 2073 my @tod = DC::Pod::find tip_of_the_day => "*";
2047 2074
2048 dc::DB::get state => "tip_of_the_day", sub { 2075 DC::DB::get state => "tip_of_the_day", sub {
2049 my ($todindex) = @_; 2076 my ($todindex) = @_;
2050 $todindex = 0 if $todindex >= @tod; 2077 $todindex = 0 if $todindex >= @tod;
2051 dc::DB::put state => tip_of_the_day => $todindex + 1, sub { }; 2078 DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2052 2079
2053 # create dialog 2080 # create dialog
2054 my $dialog; 2081 my $dialog;
2055 2082
2056 my $close = sub { 2083 my $close = sub {
2057 $dialog->destroy; 2084 $dialog->destroy;
2058 }; 2085 };
2059 2086
2060 $dialog = new dc::UI::Toplevel 2087 $dialog = new DC::UI::Toplevel
2061 x => "center", 2088 x => "center",
2062 y => "center", 2089 y => "center",
2063 z => 3, 2090 z => 3,
2064 name => 'tip_of_the_day', 2091 name => 'tip_of_the_day',
2065 force_w => int $WIDTH * 4/9, 2092 force_w => int $WIDTH * 4/9,
2066 force_h => int $WIDTH * 2/9, 2093 force_h => int $WIDTH * 2/9,
2067 title => "Tip of the day #" . (1 + $todindex), 2094 title => "Tip of the day #" . (1 + $todindex),
2068 child => my $vbox = new dc::UI::VBox, 2095 child => my $vbox = new DC::UI::VBox,
2069 has_close_button => 1, 2096 has_close_button => 1,
2070 on_delete => $close, 2097 on_delete => $close,
2071 ; 2098 ;
2072 2099
2073 $vbox->add (my $viewer = new dc::UI::TextScroller 2100 $vbox->add (my $viewer = new DC::UI::TextScroller
2074 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2101 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2075 $viewer->add_paragraph (dc::Pod::as_paragraphs dc::Pod::section_of $tod[$todindex]); 2102 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2076 2103
2077 $vbox->add (my $table = new dc::UI::Table col_expand => [0, 1]); 2104 $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2078 2105
2079 $table->add_at (0, 0, new dc::UI::Button 2106 $table->add_at (0, 0, new DC::UI::Button
2080 text => "Close", 2107 text => "Close",
2081 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 2108 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
2082 on_activate => $close, 2109 on_activate => $close,
2083 ); 2110 );
2084 2111
2085 $table->add_at (2, 0, new dc::UI::Button 2112 $table->add_at (2, 0, new DC::UI::Button
2086 text => "Next", 2113 text => "Next",
2087 tooltip => "Show the next <b>Tip of the day</b>.", 2114 tooltip => "Show the next <b>Tip of the day</b>.",
2088 on_activate => sub { 2115 on_activate => sub {
2089 $close->(); 2116 $close->();
2090 &show_tip_of_the_day; 2117 &show_tip_of_the_day;
… …
2094 $dialog->show; 2121 $dialog->show;
2095 }; 2122 };
2096} 2123}
2097 2124
2098sub sdl_init { 2125sub sdl_init {
2099 dc::SDL_Init 2126 DC::SDL_Init
2100 and die "SDL::Init failed!\n"; 2127 and die "SDL::Init failed!\n";
2101} 2128}
2102 2129
2103sub video_init { 2130sub video_init {
2104 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
… …
2107 2134
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2136 $FULLSCREEN = $CFG->{fullscreen};
2110 $FAST = $CFG->{fast}; 2137 $FAST = $CFG->{fast};
2111 2138
2112 dc::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2139 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2113 or die "SDL_SetVideoMode failed: " . (dc::SDL_GetError) . "\n"; 2140 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2114 2141
2115 $SDL_ACTIVE = 1; 2142 $SDL_ACTIVE = 1;
2116 $LAST_REFRESH = time - 0.01; 2143 $LAST_REFRESH = time - 0.01;
2117 2144
2118 dc::OpenGL::init; 2145 DC::OpenGL::init;
2119 dc::Macro::init; 2146 DC::Macro::init;
2120 2147
2121 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2148 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2122 2149
2123 $dc::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2150 $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2124 2151
2125 ############################################################################# 2152 #############################################################################
2126 2153
2127 if ($DEBUG_STATUS) { 2154 if ($DEBUG_STATUS) {
2128 dc::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2155 DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2129 } else { 2156 } else {
2130 # create/configure the widgets 2157 # create/configure the widgets
2131 2158
2132 $dc::UI::ROOT->connect (key_down => sub { 2159 $DC::UI::ROOT->connect (key_down => sub {
2133 my (undef, $ev) = @_; 2160 my (undef, $ev) = @_;
2134 2161
2135 if (my @macros = dc::Macro::find $ev) { 2162 if (my @macros = DC::Macro::find $ev) {
2136 dc::Macro::execute $_ for @macros; 2163 DC::Macro::execute $_ for @macros;
2137 2164
2138 return 1; 2165 return 1;
2139 } 2166 }
2140 2167
2141 0 2168 0
2142 }); 2169 });
2143 2170
2144 $DEBUG_STATUS = new dc::UI::Label 2171 $DEBUG_STATUS = new DC::UI::Label
2145 padding => 0, 2172 padding => 0,
2146 z => 100, 2173 z => 100,
2147 force_x => "max", 2174 force_x => "max",
2148 force_y => 0; 2175 force_y => 0;
2149 $DEBUG_STATUS->show; 2176 $DEBUG_STATUS->show;
2150 2177
2151 $STATUSBOX = new dc::UI::Statusbox; 2178 $STATUSBOX = new DC::UI::Statusbox;
2152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
2153 2179
2180 $MODBOX = new DC::UI::Label
2181 can_events => 1,
2182 can_hover => 1,
2183 markup => "",
2184 align => 0,
2185 font => $FONT_FIXED,
2186 tooltip => "#modifier_box",
2187 tooltip_width => 0.67,
2188 ;
2189
2190 update_modbox;
2191
2154 (new dc::UI::Frame 2192 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2193 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2194 force_x => 0,
2157 force_y => "max", 2195 force_y => "max",
2158 child => $STATUSBOX, 2196 child => (my $LR = new DC::UI::VBox),
2159 )->show; 2197 )->show;
2160 2198
2199 $LR->add ($STATUSBOX);
2200 $LR->add ($MODBOX);
2201 $LR->add (new DC::UI::Label
2202 align => 0,
2203 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2204 fontsize => 0.5,
2205 fg => [1, 1, 0, 0.7],
2206 );
2207
2161 dc::UI::Toplevel->new ( 2208 DC::UI::Toplevel->new (
2162 title => "Minimap", 2209 title => "Minimap",
2163 name => "mapmap", 2210 name => "mapmap",
2164 x => 0, 2211 x => 0,
2165 y => $FONTSIZE + 8, 2212 y => $FONTSIZE + 8,
2166 border_bg => [1, 1, 1, 192/255], 2213 border_bg => [1, 1, 1, 192/255],
2167 bg => [1, 1, 1, 0], 2214 bg => [1, 1, 1, 0],
2168 child => ($MAPMAP = new dc::MapWidget::MapMap 2215 child => ($MAPMAP = new DC::MapWidget::MapMap
2169 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2216 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2170 ), 2217 ),
2171 )->show; 2218 )->show;
2172 2219
2173 $MAPWIDGET = new dc::MapWidget; 2220 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2221 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2222 my ($mapwidget, $preset) = @_;
2176 2223
2177 $MESSAGE_WINDOW->activate_console ($preset) 2224 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2225 if $MESSAGE_DIST;
2179 }); 2226 });
2180 $MAPWIDGET->show; 2227 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2228 $MAPWIDGET->grab_focus;
2182 2229
2183 $COMPLETER = new dc::MapWidget::Command:: 2230 $COMPLETER = new DC::MapWidget::Command::
2184 command => { }, 2231 command => { },
2185 tooltip => "#completer_help", 2232 tooltip => "#completer_help",
2186 ; 2233 ;
2187 2234
2188 $SETUP_DIALOG = new dc::UI::Toplevel 2235 $SETUP_DIALOG = new DC::UI::Toplevel
2189 title => "Setup", 2236 title => "Setup",
2190 name => "setup_dialog", 2237 name => "setup_dialog",
2191 x => 'center', 2238 x => 'center',
2192 y => 'center', 2239 y => 'center',
2193 z => 2, 2240 z => 2,
… …
2195 force_h => $::HEIGHT * 0.6, 2242 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2243 has_close_button => 1,
2197 ; 2244 ;
2198 2245
2199 $METASERVER = metaserver_dialog; 2246 $METASERVER = metaserver_dialog;
2200 $MESSAGE_WINDOW = new dc::UI::MessageWindow; 2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages');
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2249
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new dc::UI::Notebook expand => 1, debug => 1, 2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
2203 filter => new dc::UI::ScrolledWindow expand => 1, scroll_y => 1); 2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2252
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2254 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2208 "Configure other server related options."); 2256 "Configure other server related options.");
… …
2220 . "After pressing the combo the binding will be saved automatically and the " 2268 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2269 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2270 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2271 "Some debuggin' options. Do not ask.");
2224 2272
2225 $BUTTONBAR = new dc::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2274
2227 $BUTTONBAR->add (new dc::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2276 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2277
2230 $BUTTONBAR->add (new dc::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2278# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2279# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2280
2233 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 2281 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
2234 2282
2235 $BUTTONBAR->add (new dc::UI::Flopper text => "Playerbook", other => player_window, 2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2284 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237 2285
2238 $BUTTONBAR->add (new dc::UI::Button 2286 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2287 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2288 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2289 on_activate => sub {
2242 $::CFG->{layout} = dc::UI::get_layout; 2290 $::CFG->{layout} = DC::UI::get_layout;
2243 dc::write_cfg "$Deliantra::VARDIR/client.cf"; 2291 DC::write_cfg;
2244 status "Configuration Saved"; 2292 status "Configuration Saved";
2245 0 2293 0
2246 }, 2294 },
2247 ); 2295 );
2248 2296
2249 $BUTTONBAR->add (new dc::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2298 tooltip => "View Documentation");
2251 2299
2252 2300
2253 $BUTTONBAR->add (new dc::UI::Button 2301 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2302 text => "Quit",
2255 tooltip => "Terminates the program", 2303 tooltip => "Terminates the program",
2256 on_activate => sub { 2304 on_activate => sub {
2257 if ($CONN) { 2305 if ($CONN) {
2258 open_quit_dialog; 2306 open_quit_dialog;
… …
2270 2318
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2320}
2273 2321
2274sub video_shutdown { 2322sub video_shutdown {
2275 dc::OpenGL::shutdown; 2323 DC::OpenGL::shutdown;
2276 2324
2277 undef $SDL_ACTIVE; 2325 undef $SDL_ACTIVE;
2278} 2326}
2279 2327
2280my %animate_object; 2328my %animate_object;
… …
2289 } 2337 }
2290 2338
2291 undef $WANT_REFRESH; 2339 undef $WANT_REFRESH;
2292 $_[0]->stop; 2340 $_[0]->stop;
2293 2341
2294 $dc::UI::ROOT->draw; 2342 $DC::UI::ROOT->draw;
2295 dc::SDL_GL_SwapBuffers; 2343 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2344 $LAST_REFRESH = $NOW;
2297} 2345}
2298 2346
2299my $want_refresh = EV::idle_ns \&force_refresh; 2347my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2348
2301my $input = EV::periodic 0, 1/60, undef, sub { 2349my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2350 $NOW = EV::now;
2303 2351
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2352 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for dc::poll_events; 2353 for DC::poll_events;
2306 2354
2307 if (%animate_object) { 2355 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2356 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2357 $WANT_REFRESH = 1;
2310 } 2358 }
… …
2322 my ($widget) = @_; 2370 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2371 delete $animate_object{$widget};
2324} 2372}
2325 2373
2326%SDL_CB = ( 2374%SDL_CB = (
2327 dc::SDL_QUIT => sub { 2375 DC::SDL_QUIT => sub {
2328 EV::unloop EV::UNLOOP_ALL; 2376 EV::unloop EV::UNLOOP_ALL;
2329 }, 2377 },
2330 dc::SDL_VIDEORESIZE => sub { 2378 DC::SDL_VIDEORESIZE => sub {
2331 }, 2379 },
2332 dc::SDL_VIDEOEXPOSE => sub { 2380 DC::SDL_VIDEOEXPOSE => sub {
2333 dc::UI::full_refresh; 2381 DC::UI::full_refresh;
2334 }, 2382 },
2335 dc::SDL_ACTIVEEVENT => sub { 2383 DC::SDL_ACTIVEEVENT => sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2384# not useful, as APPACTIVE includes only iconified state, not unmapped
2337# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, dc::SDL_GetAppState;#d# 2385# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2338# printf "a %x\n", dc::SDL_GetAppState & dc::SDL_APPACTIVE;#d# 2386# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & dc::SDL_APPACTIVE; 2387# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & dc::SDL_APPINPUTFOCUS; 2388# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & dc::SDL_APPMOUSEFOCUS; 2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2390 },
2343 dc::SDL_KEYDOWN => sub { 2391 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & dc::KMOD_ALT && $_[0]{sym} == 13) { 2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2393 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2394 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2395 video_shutdown;
2348 video_init; 2396 video_init;
2349 } else { 2397 } else {
2350 dc::UI::feed_sdl_key_down_event ($_[0]); 2398 &DC::UI::feed_sdl_key_down_event;
2351 } 2399 }
2400 update_modbox;
2352 }, 2401 },
2353 dc::SDL_KEYUP => \&dc::UI::feed_sdl_key_up_event, 2402 DC::SDL_KEYUP => sub {
2403 &DC::UI::feed_sdl_key_up_event;
2404 update_modbox;
2405 },
2354 dc::SDL_MOUSEMOTION => \&dc::UI::feed_sdl_motion_event, 2406 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 dc::SDL_MOUSEBUTTONDOWN => \&dc::UI::feed_sdl_button_down_event, 2407 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 dc::SDL_MOUSEBUTTONUP => \&dc::UI::feed_sdl_button_up_event, 2408 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 dc::SDL_USEREVENT => sub { 2409 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2410 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2411 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2412 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2413 audio_music_finished;
2362 } 2414 }
… …
2369 EV::unloop; 2421 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2422 #d# TODO calling exit here hangs the process in some futex
2371}; 2423};
2372 2424
2373{ 2425{
2426 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2427
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2428 if (-e "$Deliantra::VARDIR/client.cf") {
2375 dc::read_cfg "$Deliantra::VARDIR/client.cf"; 2429 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2430 } else {
2377 #TODO: compatibility cruft 2431 #TODO: compatibility cruft
2378 dc::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2432 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2433 print STDERR "INFO: used old configuration file\n";
2380 } 2434 }
2381 2435
2382 dc::DB::Server::run; 2436 DC::DB::Server::run;
2383 2437
2438 if ($CFG->{db_schema} < 1) {
2439 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2440 DC::DB::nuke_db;
2441 $CFG->{db_schema} = 1;
2442 DC::write_cfg;
2443 }
2444
2445 DC::DB::open_db;
2446
2384 dc::UI::set_layout ($::CFG->{layout}); 2447 DC::UI::set_layout ($::CFG->{layout});
2385 2448
2386 my %DEF_CFG = ( 2449 my %DEF_CFG = (
2387 sdl_mode => 0, 2450 sdl_mode => 0,
2388 fullscreen => 1, 2451 fullscreen => 1,
2389 fast => 0, 2452 fast => 0,
… …
2435 } 2498 }
2436 } 2499 }
2437 2500
2438 sdl_init; 2501 sdl_init;
2439 2502
2440 @SDL_MODES = dc::SDL_ListModes 8, 8; 2503 @SDL_MODES = DC::SDL_ListModes 8, 8;
2441 @SDL_MODES = dc::SDL_ListModes 5, 0 unless @SDL_MODES; 2504 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or dc::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2505 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443 2506
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2507 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445 2508
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2509 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447 2510
2448 { 2511 {
2449 my @fonts = map dc::find_rcfile "fonts/$_", qw( 2512 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2513 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2514 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2515 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2516 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2517 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2518 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2519 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2520 DejaVuSansMono-BoldOblique.ttf
2458 ); 2521 );
2459 2522
2460 dc::add_font $_ for @fonts; 2523 DC::add_font $_ for @fonts;
2461 2524
2462 dc::pango_init;
2463
2464 $FONT_PROP = new_from_file dc::Font $fonts[0]; 2525 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file dc::Font $fonts[1]; 2526 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2527
2467 $FONT_PROP->make_default; 2528 $FONT_PROP->make_default;
2529
2530 DC::pango_init;
2468 } 2531 }
2469 2532
2470# compare mono (ft) vs. rgba (cairo) 2533# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2534# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2535# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2536# my $t1 = Time::HiRes::time;
2474# for (1..1000) { 2537# for (1..1000) {
2475# my $layout = dc::Layout->new ($rgba); 2538# my $layout = DC::Layout->new ($rgba);
2476# $layout->set_text ("hallo" x 100); 2539# $layout->set_text ("hallo" x 100);
2477# $layout->render; 2540# $layout->render;
2478# } 2541# }
2479# my $t2 = Time::HiRes::time; 2542# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2543# warn $t2-$t1;
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2552our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2553 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2554 $startup_done->();
2492}; 2555};
2493 2556
2557delete $SIG{__DIE__};
2494EV::loop; 2558EV::loop;
2495 2559
2496#video_shutdown; 2560#video_shutdown;
2497#audio_shutdown; 2561#audio_shutdown;
2498dc::OpenGL::quit; 2562DC::OpenGL::quit;
2499dc::SDL_Quit; 2563DC::SDL_Quit;
2500dc::DB::Server::stop; 2564DC::DB::Server::stop;
2501 2565
2502=head1 NAME 2566=head1 NAME
2503 2567
2504deliantra - A Deliantra MORPG game client 2568deliantra - A Deliantra MORPG game client
2505 2569

Diff Legend

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