ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.173 by root, Tue Jul 17 17:39:08 2007 UTC vs.
Revision 1.181 by root, Sat Jul 21 16:07:53 2007 UTC

… …
82use CFPlus; 82use CFPlus;
83use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
84use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB; 85use CFPlus::DB;
86use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 88use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 89use CFPlus::UI::SpellList;
89use CFPlus::Pod; 90use CFPlus::Pod;
90use CFPlus::MapWidget; 91use CFPlus::MapWidget;
91use CFPlus::Macro; 92use CFPlus::Macro;
… …
272 ellipsise => 0, 273 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 274 markup => "\nOr use your keyboard and the text entry below:\n";
274 275
275 unshift @dialog, my $table = new CFPlus::UI::Table; 276 unshift @dialog, my $table = new CFPlus::UI::Table;
276 277
277 $table->add (0, 0, new CFPlus::UI::Button 278 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 279 text => "Next Race",
279 on_activate => sub { 280 on_activate => sub {
280 $conn->send ("reply n"); 281 $conn->send ("reply n");
281 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
282 0 283 0
283 }, 284 },
284 ); 285 );
285 $table->add (2, 0, new CFPlus::UI::Button 286 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 287 text => "Accept",
287 on_activate => sub { 288 on_activate => sub {
288 $conn->send ("reply d"); 289 $conn->send ("reply d");
289 destroy_query_dialog $conn; 290 destroy_query_dialog $conn;
290 0 291 0
… …
325 $conn->send ("reply $stat"); 326 $conn->send ("reply $stat");
326 destroy_query_dialog $conn; 327 destroy_query_dialog $conn;
327 return; 328 return;
328 } 329 }
329 330
330 $STATS_PAGE->show;
331 $MESSAGE_WINDOW->hide;
332
333 unshift @dialog, new CFPlus::UI::Label 331 unshift @dialog, new CFPlus::UI::Label
334 max_w => $::WIDTH * 0.4, 332 max_w => $::WIDTH * 0.4,
335 ellipsise => 0, 333 ellipsise => 0,
336 markup => "\nOr use your keyboard and the text entry below:\n"; 334 markup => "\nOr use your keyboard and the text entry below:\n";
337 335
338 unshift @dialog, my $table = new CFPlus::UI::Table; 336 unshift @dialog, my $table = new CFPlus::UI::Table;
339 337
340 # left: re-roll 338 # left: re-roll
341 $table->add (0, 0, new CFPlus::UI::Button 339 $table->add_at (0, 0, new CFPlus::UI::Button
342 text => "Roll Again", 340 text => "Roll Again",
343 on_activate => sub { 341 on_activate => sub {
344 $conn->send ("reply y"); 342 $conn->send ("reply y");
345 destroy_query_dialog $conn; 343 destroy_query_dialog $conn;
346 0 344 0
… …
360 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
361 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
362 ], 360 ],
363 ), 1 .. 2; 361 ), 1 .. 2;
364 362
365 $table->add (2, 0, new CFPlus::UI::Button 363 $table->add_at (2, 0, new CFPlus::UI::Button
366 text => "Swap Stats", 364 text => "Swap Stats",
367 on_activate => sub { 365 on_activate => sub {
368 $conn->{stat_change_with} = $sw2->{value}; 366 $conn->{stat_change_with} = $sw2->{value};
369 $conn->send ("reply $sw1->{value}"); 367 $conn->send ("reply $sw1->{value}");
370 destroy_query_dialog $conn; 368 destroy_query_dialog $conn;
371 0 369 0
372 }, 370 },
373 ); 371 );
374 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 372 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
375 373
376 # right: accept 374 # right: accept
377 $table->add (4, 0, new CFPlus::UI::Button 375 $table->add_at (4, 0, new CFPlus::UI::Button
378 text => "Accept", 376 text => "Accept",
379 on_activate => sub { 377 on_activate => sub {
380 $conn->send ("reply n"); 378 $conn->send ("reply n");
381 $STATS_PAGE->hide; 379 $STATS_PAGE->hide;
382 destroy_query_dialog $conn; 380 destroy_query_dialog $conn;
… …
524 522
525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 523 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
526 524
527 my $row = 0; 525 my $row = 0;
528 526
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 527 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 528 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1, 529 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 530 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533 531
534 my $vidmode_tooltip = 532 my $vidmode_tooltip =
535 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 533 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
536 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 534 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
537 535
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 536 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 537 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
540 538
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 539 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
542 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 540 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
543 tooltip => $vidmode_tooltip); 541 tooltip => $vidmode_tooltip);
544 $hbox->add (my $mode_label = new CFPlus::UI::Label 542 $hbox->add (my $mode_label = new CFPlus::UI::Label
… …
551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 549 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 550 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
553 }); 551 });
554 $mode_slider->emit (changed => $mode_slider->{range}[0]); 552 $mode_slider->emit (changed => $mode_slider->{range}[0]);
555 553
556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 554 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 555 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
558 state => $CFG->{fullscreen}, 556 state => $CFG->{fullscreen},
559 tooltip => "Bring the client into fullscreen mode.", 557 tooltip => "Bring the client into fullscreen mode.",
560 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 558 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
561 ); 559 );
562 560
563 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 561 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
564 $table->add (1, $row++, new CFPlus::UI::CheckBox 562 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
565 state => $CFG->{fast}, 563 state => $CFG->{fast},
566 tooltip => "Lower the visual quality considerably to speed up rendering.", 564 tooltip => "Lower the visual quality considerably to speed up rendering.",
567 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 565 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
568 ); 566 );
569 567
570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 568 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
571 $table->add (1, $row++, new CFPlus::UI::Slider 569 $table->add_at (1, $row++, new CFPlus::UI::Slider
572 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 570 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
573 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 571 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
574 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 572 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
575 ); 573 );
576 574
577 $table->add (1, $row++, new CFPlus::UI::Button 575 $table->add_at (1, $row++, new CFPlus::UI::Button
578 expand => 1, align => 0, text => "Apply", 576 expand => 1, align => 0, text => "Apply",
579 tooltip => "Apply the video settings above.", 577 tooltip => "Apply the video settings above.",
580 on_activate => sub { 578 on_activate => sub {
581 video_shutdown (); 579 video_shutdown ();
582 video_init (); 580 video_init ();
583 0 581 0
584 } 582 }
585 ); 583 );
586 584
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 585 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
588 $table->add (1, $row++, new CFPlus::UI::Slider 586 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 587 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 588 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
591 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 589 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
592 ); 590 );
593 591
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 592 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
595 $table->add (1, $row++, new CFPlus::UI::CheckBox 593 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
596 state => $CFG->{map_smoothing}, 594 state => $CFG->{map_smoothing},
597 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 595 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
598 . "This increases load on the graphics subsystem and works only with 2.x servers. " 596 . "This increases load on the graphics subsystem and works only with 2.x servers. "
599 . "Changes take effect at next connection only.", 597 . "Changes take effect at next connection only.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 598 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
601 ); 599 );
602 600
603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
604 $table->add (1, $row++, new CFPlus::UI::CheckBox 602 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
605 state => $CFG->{fow_enable}, 603 state => $CFG->{fow_enable},
606 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 604 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
607 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 605 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
608 ); 606 );
609 607
610 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 608 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
611 $table->add (1, $row++, new CFPlus::UI::Slider 609 $table->add_at (1, $row++, new CFPlus::UI::Slider
612 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 610 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
613 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 611 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
614 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 612 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
615 ); 613 );
616 614
617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
618 $table->add (1, $row++, new CFPlus::UI::CheckBox
619 state => $CFG->{fow_smooth},
620 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
621 on_changed => sub {
622 my ($self, $value) = @_;
623 $CFG->{fow_smooth} = $value;
624 0
625 }
626 );
627
628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 615 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
629 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add_at (1, $row++, new CFPlus::UI::Slider
630 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
631 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 618 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
632 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
633 ); 620 );
634 621
635 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 622 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
636 $table->add (1, $row++, new CFPlus::UI::Slider 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
637 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
638 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 625 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
639 on_changed => sub { 626 on_changed => sub {
640 $CFG->{gauge_fontsize} = $_[1]; 627 $CFG->{gauge_fontsize} = $_[1];
641 &set_gauge_window_fontsize; 628 &set_gauge_window_fontsize;
642 0 629 0
643 } 630 }
644 ); 631 );
645 632
646 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
647 $table->add (1, $row++, new CFPlus::UI::Slider 634 $table->add_at (1, $row++, new CFPlus::UI::Slider
648 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
649 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 636 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
650 on_changed => sub { 637 on_changed => sub {
651 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
652 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
662 649
663 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 650 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
664 651
665 my $row = 0; 652 my $row = 0;
666 653
667 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 654 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
668 $table->add (1, $row++, new CFPlus::UI::CheckBox 655 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
669 state => $CFG->{audio_enable}, 656 state => $CFG->{audio_enable},
670 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.", 657 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.",
671 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
672 ); 659 );
673# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 660# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
674# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 661# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
675# $CFG->{effects_volume} = $_[1]; 662# $CFG->{effects_volume} = $_[1];
676# }); 663# });
677 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 664 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
678 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 665 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
679 $hbox->add (new CFPlus::UI::CheckBox 666 $hbox->add (new CFPlus::UI::CheckBox
680 expand => 1, state => $CFG->{bgm_enable}, 667 expand => 1, state => $CFG->{bgm_enable},
681 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 668 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
682 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
683 ); 670 );
… …
685 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
686 tooltip => "The volume of the background music. Changes are instant.", 673 tooltip => "The volume of the background music. Changes are instant.",
687 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 674 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
688 ); 675 );
689 676
690 $table->add (1, $row++, new CFPlus::UI::Button 677 $table->add_at (1, $row++, new CFPlus::UI::Button
691 expand => 1, align => 0, text => "Apply", 678 expand => 1, align => 0, text => "Apply",
692 tooltip => "Apply the audio settings", 679 tooltip => "Apply the audio settings",
693 on_activate => sub { 680 on_activate => sub {
694 audio_shutdown (); 681 audio_shutdown ();
695 audio_init (); 682 audio_init ();
… …
754} 741}
755 742
756sub debug_setup { 743sub debug_setup {
757 my $table = new CFPlus::UI::Table; 744 my $table = new CFPlus::UI::Table;
758 745
759 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 746 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
760 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 747 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
761 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 748 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
762 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 749 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
763 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 750 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
764 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 751 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
765 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 752 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
766 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 753 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
767 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 754 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
768 755
769 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 756 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
757
758 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
759 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
760 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
761 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
762 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
763 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
764
765 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
766
767 $c->add_items ({
768 type => "line_loop",
769 color => [0, 1, 0],
770 width => 9,
771 coord_mode => "abs",
772 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
773 });
774
775 $c->add_items ({
776 type => "lines",
777 color => [1, 1, 0],
778 width => 2,
779 coord_mode => "rel",
780 coord => [[0,0], [1,1], [1,0], [0,1]],
781 });
782
783 $c->add_items ({
784 type => "polygon",
785 color => [0, 0.43, 0],
786 width => 2,
787 coord_mode => "rel",
788 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
789 });
770 790
771 $table 791 $table
772} 792}
773 793
774sub stats_window { 794sub stats_window {
… …
822 [2, 4, st_spd => "Spd", 10.54], 842 [2, 4, st_spd => "Spd", 10.54],
823 [2, 5, st_wspd => "WSp", 10.54], 843 [2, 5, st_wspd => "WSp", 10.54],
824 ) { 844 ) {
825 my ($col, $row, $id, $label, $template) = @$_; 845 my ($col, $row, $id, $label, $template) = @$_;
826 846
827 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 847 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
828 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 848 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
829 align => +1, template => $template, tooltip => "#stat_$label"); 849 align => +1, template => $template, tooltip => "#stat_$label");
830 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 850 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
831 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 851 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
832 align => -1, text => $label, tooltip => "#stat_$label"); 852 align => -1, text => $label, tooltip => "#stat_$label");
833 } 853 }
834 854
835 $vb->add (new CFPlus::UI::FancyFrame 855 $vb->add (new CFPlus::UI::FancyFrame
… …
876 cold => ["Cold", 896 cold => ["Cold",
877 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 897 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
878 ghit => ["Ghost hit", 898 ghit => ["Ghost hit",
879 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 899 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
880 ); 900 );
901
881 for (qw/slow holyw conf fire depl magic 902 for (qw/slow holyw conf fire depl magic
882 drain acid pois para deat phys 903 drain acid pois para deat phys
883 blind fear tund elec cold ghit/) 904 blind fear tund elec cold ghit/)
884 { 905 {
885 $tbl2->add ($col, $row, 906 $tbl2->add_at ($col, $row,
886 $STATWIDS->{"res_$_"} = 907 $STATWIDS->{"res_$_"} =
887 new CFPlus::UI::Label 908 new CFPlus::UI::Label
888 font => $FONT_FIXED, 909 font => $FONT_FIXED,
889 template => "-100%", 910 template => "-100%",
890 align => +1, 911 align => +1,
891 valign => 0, 912 valign => 0,
892 can_events => 1, 913 can_events => 1,
893 can_hover => 1, 914 can_hover => 1,
894 tooltip => $resist_names{$_}->[1], 915 tooltip => $resist_names{$_}->[1],
895 ); 916 );
896 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 917 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
897 font => $FONT_FIXED, 918 font => $FONT_FIXED,
898 can_hover => 1, 919 can_hover => 1,
899 can_events => 1, 920 can_events => 1,
900 path => "ui/resist/resist_$_.png", 921 path => "ui/resist/resist_$_.png",
901 tooltip => $resist_names{$_}->[1], 922 tooltip => $resist_names{$_}->[1],
902 ); 923 );
903 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 924 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
904 text => $resist_names{$_}->[0], 925 text => $resist_names{$_}->[0],
905 font => $FONT_FIXED, 926 font => $FONT_FIXED,
906 can_hover => 1, 927 can_hover => 1,
907 can_events => 1, 928 can_events => 1,
908 tooltip => $resist_names{$_}->[1], 929 tooltip => $resist_names{$_}->[1],
… …
941 return if $METASERVER_ATIME > time; 962 return if $METASERVER_ATIME > time;
942 $METASERVER_ATIME = time + 60; 963 $METASERVER_ATIME = time + 60;
943 964
944 my $table = $METASERVER->{table}; 965 my $table = $METASERVER->{table};
945 $table->clear; 966 $table->clear;
946 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 967 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
947 968
948 my $ok = 0; 969 my $ok = 0;
949 970
950 CFPlus::background { 971 CFPlus::background {
951 my $ua = CFPlus::lwp_useragent; 972 my $ua = CFPlus::lwp_useragent;
… …
962 "The time this server has been running without being restarted.", 983 "The time this server has been running without being restarted.",
963 "The server software version - a '+' indicates a Crossfire+ server.", 984 "The server software version - a '+' indicates a Crossfire+ server.",
964 "Short information about this server provided by its admins.", 985 "Short information about this server provided by its admins.",
965 ); 986 );
966 my @col = qw(#Users Host Uptime Version Description); 987 my @col = qw(#Users Host Uptime Version Description);
967 $table->add ($_, 0, new CFPlus::UI::Label 988 $table->add_at ($_, 0, new CFPlus::UI::Label
968 can_hover => 1, can_events => 1, 989 can_hover => 1, can_events => 1,
969 align => 0, fg => [1, 1, 0], 990 align => 0, fg => [1, 1, 0],
970 text => $col[$_], tooltip => $tip[$_]) 991 text => $col[$_], tooltip => $tip[$_])
971 for 0 .. $#col; 992 for 0 .. $#col;
972 993
… …
994 1015
995 $m = [$users, $host, $uptime, $version, $desc]; 1016 $m = [$users, $host, $uptime, $version, $desc];
996 1017
997 $y++; 1018 $y++;
998 1019
999 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1020 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1000 (new CFPlus::UI::Button 1021 (new CFPlus::UI::Button
1001 text => "Use", 1022 text => "Use",
1002 tooltip => "Put this server into the <b>Host:Port</b> field", 1023 tooltip => "Put this server into the <b>Host:Port</b> field",
1003 on_activate => sub { 1024 on_activate => sub {
1004 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1025 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1007 }, 1028 },
1008 ), 1029 ),
1009 (new CFPlus::UI::Empty expand => 1), 1030 (new CFPlus::UI::Empty expand => 1),
1010 ]); 1031 ]);
1011 1032
1012 $table->add ($_, $y, new CFPlus::UI::Label 1033 $table->add_at ($_, $y, new CFPlus::UI::Label
1013 max_w => $::WIDTH * 0.4, 1034 max_w => $::WIDTH * 0.4,
1014 ellipsise => 0, 1035 ellipsise => 0,
1015 align => $align[$_], 1036 align => $align[$_],
1016 text => $m->[$_], 1037 text => $m->[$_],
1017 tooltip => $tip[$_], 1038 tooltip => $tip[$_],
… …
1058 1079
1059 $vbox->add (new CFPlus::UI::FancyFrame 1080 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Connection Settings", 1081 label => "Connection Settings",
1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1082 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1062 ); 1083 );
1063 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1084 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1064 1085
1065 { 1086 {
1066 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1087 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1067 1088
1068 $vbox->add ( 1089 $vbox->add (
1069 $HOST_ENTRY = new CFPlus::UI::Entry 1090 $HOST_ENTRY = new CFPlus::UI::Entry
1070 expand => 1, 1091 expand => 1,
1071 text => $CFG->{profile}{default}{host}, 1092 text => $CFG->{profile}{default}{host},
… …
1085 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1106 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1107 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1087 ); 1108 );
1088 } 1109 }
1089 1110
1090 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1111 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1091 $table->add (1, 4, new CFPlus::UI::Entry 1112 $table->add_at (1, 4, new CFPlus::UI::Entry
1092 text => $CFG->{profile}{default}{user}, 1113 text => $CFG->{profile}{default}{user},
1093 tooltip => "The name of your character on the server", 1114 tooltip => "The name of your character on the server",
1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1095 ); 1116 );
1096 1117
1097 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1118 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1098 $table->add (1, 5, new CFPlus::UI::Entry 1119 $table->add_at (1, 5, new CFPlus::UI::Entry
1099 text => $CFG->{profile}{default}{password}, 1120 text => $CFG->{profile}{default}{password},
1100 hidden => 1, 1121 hidden => 1,
1101 tooltip => "The password for your character", 1122 tooltip => "The password for your character",
1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1103 ); 1124 );
1104 1125
1105 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1126 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1106 $table->add (1, 7, new CFPlus::UI::Slider 1127 $table->add_at (1, 7, new CFPlus::UI::Slider
1107 force_w => 100, 1128 force_w => 100,
1108 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1129 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1109 tooltip => "This is the size of the portion of the map update the server sends you. " 1130 tooltip => "This is the size of the portion of the map update the server sends you. "
1110 . "If you set this to a high value you will be able to see further, " 1131 . "If you set this to a high value you will be able to see further, "
1111 . "but you also increase bandwidth requirements and latency. " 1132 . "but you also increase bandwidth requirements and latency. "
1112 . "This option is only used once at log-in.", 1133 . "This option is only used once at log-in.",
1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1134 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1114 ); 1135 );
1115 1136
1116 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1137 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1117 $table->add (1, 8, new CFPlus::UI::CheckBox 1138 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1118 state => $CFG->{face_prefetch}, 1139 state => $CFG->{face_prefetch},
1119 tooltip => "<b>Background Image Prefetch</b>\n\n" 1140 tooltip => "<b>Background Image Prefetch</b>\n\n"
1120 . "If enabled, the client automatically pre-fetches images from the server. " 1141 . "If enabled, the client automatically pre-fetches images from the server. "
1121 . "This might increase or create lag, but increases the chances " 1142 . "This might increase or create lag, but increases the chances "
1122 . "of faces being ready for display when you encounter them. " 1143 . "of faces being ready for display when you encounter them. "
… …
1124 . "so only set it if you really need to prefetch images. " 1145 . "so only set it if you really need to prefetch images. "
1125 . "This option can be set and unset any time.", 1146 . "This option can be set and unset any time.",
1126 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1127 ); 1148 );
1128 1149
1129 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1150 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1130 $table->add (1, 9, new CFPlus::UI::Entry 1151 $table->add_at (1, 9, new CFPlus::UI::Entry
1131 text => $CFG->{output_rate}, 1152 text => $CFG->{output_rate},
1132 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1153 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1133 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1154 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1134 . "default will be used, which is usually around 100kb/s.", 1155 . "default will be used, which is usually around 100kb/s.",
1135 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1156 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1136 ); 1157 );
1137 1158
1138 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1159 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1139 $table->add (1, 10, new CFPlus::UI::Entry 1160 $table->add_at (1, 10, new CFPlus::UI::Entry
1140 text => $CFG->{output_count}, 1161 text => $CFG->{output_count},
1141 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1162 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1142 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1163 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1143 ); 1164 );
1144 1165
1145 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1166 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1146 $table->add (1, 11, new CFPlus::UI::Entry 1167 $table->add_at (1, 11, new CFPlus::UI::Entry
1147 text => $CFG->{output_sync}, 1168 text => $CFG->{output_sync},
1148 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1169 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1149 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1170 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1150 ); 1171 );
1151 1172
1152 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1173 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1153 expand => 1, 1174 expand => 1,
1154 align => 0, 1175 align => 0,
1155 text => "Login", 1176 text => "Login",
1156 on_activate => sub { 1177 on_activate => sub {
1157 $CONN ? stop_game 1178 $CONN ? stop_game
… …
1171sub client_setup { 1192sub client_setup {
1172 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1193 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1173 1194
1174 my $row = 0; 1195 my $row = 0;
1175 1196
1176 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1197 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1178 text => $CFG->{say_command}, 1199 text => $CFG->{say_command},
1179 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1200 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1180 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1201 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1181 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1202 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1182 on_changed => sub { 1203 on_changed => sub {
… …
1184 $CFG->{say_command} = $value; 1205 $CFG->{say_command} = $value;
1185 0 1206 0
1186 } 1207 }
1187 ); 1208 );
1188 1209
1189 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1210 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1190 $table->add (1, $row++, new CFPlus::UI::CheckBox 1211 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1191 state => $CFG->{show_tips}, 1212 state => $CFG->{show_tips},
1192 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1213 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1193 on_changed => sub { 1214 on_changed => sub {
1194 my ($self, $value) = @_; 1215 my ($self, $value) = @_;
1195 $CFG->{show_tips} = $value; 1216 $CFG->{show_tips} = $value;
1196 0 1217 0
1197 } 1218 }
1198 ); 1219 );
1199 1220
1200 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1221 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1201 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1222 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1202 text => $CFG->{logview_max_par}, 1223 text => $CFG->{logview_max_par},
1203 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1224 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1204 . "sends more messages than this number, older messages get removed to save memory and " 1225 . "sends more messages than this number, older messages get removed to save memory and "
1205 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1226 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1206 on_changed => sub { 1227 on_changed => sub {
… …
1327 ], 1348 ],
1328 ["Weight/Value ratio", 2, 17] 1349 ["Weight/Value ratio", 2, 17]
1329 ) 1350 )
1330 { 1351 {
1331 my ($title, $x, $y, @bits) = @$_; 1352 my ($title, $x, $y, @bits) = @$_;
1332 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1353 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1333 1354
1334 for (@bits) { 1355 for (@bits) {
1335 ++$y; 1356 ++$y;
1336 1357
1337 my $mask = $_->[1]; 1358 my $mask = $_->[1];
1338 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1359 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1339 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1360 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1340 state => $::CFG->{pickup} & $mask, 1361 state => $::CFG->{pickup} & $mask,
1341 on_changed => sub { 1362 on_changed => sub {
1342 my ($box, $value) = @_; 1363 my ($box, $value) = @_;
1343 1364
1344 if ($value) { 1365 if ($value) {
… …
1355 1376
1356 ${$_->[2]} = $checkbox if $_->[2]; 1377 ${$_->[2]} = $checkbox if $_->[2];
1357 } 1378 }
1358 } 1379 }
1359 1380
1360 $table->add (2, 18, new CFPlus::UI::ValSlider 1381 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1361 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1382 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1362 template => ">= 99", 1383 template => ">= 99",
1363 to_value => sub { ">= " . 5 * $_[0] }, 1384 to_value => sub { ">= " . 5 * $_[0] },
1364 on_changed => sub { 1385 on_changed => sub {
1365 my ($slider, $value) = @_; 1386 my ($slider, $value) = @_;
… …
1368 $::CFG->{pickup} |= int $value 1389 $::CFG->{pickup} |= int $value
1369 if $value; 1390 if $value;
1370 1; 1391 1;
1371 }); 1392 });
1372 1393
1373 $table->add (3, 18, new CFPlus::UI::Button 1394 $table->add_at (3, 18, new CFPlus::UI::Button
1374 text => "set", 1395 text => "set",
1375 on_activate => sub { 1396 on_activate => sub {
1376 $::CONN->send_command ("pickup $::CFG->{pickup}") 1397 $::CONN->send_command ("pickup $::CFG->{pickup}")
1377 if defined $::CONN; 1398 if defined $::CONN;
1378 0 1399 0
… …
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1716 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1717 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697 1718
1698 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1719 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699 1720
1700 $table->add (0, 0, new CFPlus::UI::Button 1721 $table->add_at (0, 0, new CFPlus::UI::Button
1701 text => "Close", 1722 text => "Close",
1702 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>.", 1723 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>.",
1703 on_activate => $close, 1724 on_activate => $close,
1704 ); 1725 );
1705 1726
1706 $table->add (2, 0, new CFPlus::UI::Button 1727 $table->add_at (2, 0, new CFPlus::UI::Button
1707 text => "Next", 1728 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.", 1729 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub { 1730 on_activate => sub {
1710 $close->(); 1731 $close->();
1711 &show_tip_of_the_day; 1732 &show_tip_of_the_day;
… …
1978 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1999 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1979 2000
1980 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 2001 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1981 my $row = 0; 2002 my $row = 0;
1982 if ($info->{has_name}) { 2003 if ($info->{has_name}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 2004 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 2005 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1985 } 2006 }
1986 if ($info->{has_text}) { 2007 if ($info->{has_text}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 2008 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1988 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 2009 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1989 } 2010 }
1990 if ($info->{has_connection}) { 2011 if ($info->{has_connection}) {
1991 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 2012 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1992 $table->add (1, $row++, 2013 $table->add_at (1, $row++,
1993 new CFPlus::UI::Entry 2014 new CFPlus::UI::Entry
1994 expand => 1, 2015 expand => 1,
1995 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 2016 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1996 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 2017 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1997 ); 2018 );
… …
2152 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2173 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2153 2174
2154 $CFPlus::UI::ROOT->draw; 2175 $CFPlus::UI::ROOT->draw;
2155 2176
2156 $WANT_REFRESH = 0; 2177 $WANT_REFRESH = 0;
2157 $CAN_REFRESH = 0; 2178 $CAN_REFRESH = 0;
2158 $LAST_REFRESH = $NOW; 2179 $LAST_REFRESH = $NOW;
2159 2180
2160 CFPlus::SDL_GL_SwapBuffers; 2181 CFPlus::SDL_GL_SwapBuffers;
2161} 2182}
2162 2183
… …
2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2187 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2167 for CFPlus::poll_events; 2188 for CFPlus::poll_events;
2168 2189
2169 if (%animate_object) { 2190 if (%animate_object) {
2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2191 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2171 $WANT_REFRESH++; 2192 ++$WANT_REFRESH;
2172 } 2193 }
2173 2194
2174 if ($WANT_REFRESH) { 2195 if ($WANT_REFRESH) {
2175 force_refresh; 2196 force_refresh;
2176 } else { 2197 } else {
… …
2254 fullscreen => 0, 2275 fullscreen => 0,
2255 fast => 0, 2276 fast => 0,
2256 map_scale => 1, 2277 map_scale => 1,
2257 fow_enable => 1, 2278 fow_enable => 1,
2258 fow_intensity => 0, 2279 fow_intensity => 0,
2259 fow_smooth => 1,
2260 map_smoothing => 1, 2280 map_smoothing => 1,
2261 gui_fontsize => 1, 2281 gui_fontsize => 1,
2262 log_fontsize => 0.7, 2282 log_fontsize => 0.7,
2263 gauge_fontsize => 1, 2283 gauge_fontsize => 1,
2264 gauge_size => 0.35, 2284 gauge_size => 0.35,
… …
2302 2322
2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8; 2323 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2304 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; 2324 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2305 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2325 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2306 2326
2327 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2328
2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2329 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2308 2330
2309 { 2331 {
2310 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2332 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2311 DejaVuSans.ttf 2333 DejaVuSans.ttf

Diff Legend

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