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.18 by root, Wed Dec 26 21:03:21 2007 UTC

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

Diff Legend

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