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.176 by root, Thu Jul 19 14:54:51 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
… …
333 markup => "\nOr use your keyboard and the text entry below:\n"; 334 markup => "\nOr use your keyboard and the text entry below:\n";
334 335
335 unshift @dialog, my $table = new CFPlus::UI::Table; 336 unshift @dialog, my $table = new CFPlus::UI::Table;
336 337
337 # left: re-roll 338 # left: re-roll
338 $table->add (0, 0, new CFPlus::UI::Button 339 $table->add_at (0, 0, new CFPlus::UI::Button
339 text => "Roll Again", 340 text => "Roll Again",
340 on_activate => sub { 341 on_activate => sub {
341 $conn->send ("reply y"); 342 $conn->send ("reply y");
342 destroy_query_dialog $conn; 343 destroy_query_dialog $conn;
343 0 344 0
… …
357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
359 ], 360 ],
360 ), 1 .. 2; 361 ), 1 .. 2;
361 362
362 $table->add (2, 0, new CFPlus::UI::Button 363 $table->add_at (2, 0, new CFPlus::UI::Button
363 text => "Swap Stats", 364 text => "Swap Stats",
364 on_activate => sub { 365 on_activate => sub {
365 $conn->{stat_change_with} = $sw2->{value}; 366 $conn->{stat_change_with} = $sw2->{value};
366 $conn->send ("reply $sw1->{value}"); 367 $conn->send ("reply $sw1->{value}");
367 destroy_query_dialog $conn; 368 destroy_query_dialog $conn;
368 0 369 0
369 }, 370 },
370 ); 371 );
371 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 372 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
372 373
373 # right: accept 374 # right: accept
374 $table->add (4, 0, new CFPlus::UI::Button 375 $table->add_at (4, 0, new CFPlus::UI::Button
375 text => "Accept", 376 text => "Accept",
376 on_activate => sub { 377 on_activate => sub {
377 $conn->send ("reply n"); 378 $conn->send ("reply n");
378 $STATS_PAGE->hide; 379 $STATS_PAGE->hide;
379 destroy_query_dialog $conn; 380 destroy_query_dialog $conn;
… …
521 522
522 $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]);
523 524
524 my $row = 0; 525 my $row = 0;
525 526
526 $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");
527 $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,
528 can_events => 1, 529 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 530 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530 531
531 my $vidmode_tooltip = 532 my $vidmode_tooltip =
532 "<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). "
533 . "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>.";
534 535
535 $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");
536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 537 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
537 538
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 539 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
539 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],
540 tooltip => $vidmode_tooltip); 541 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label 542 $hbox->add (my $mode_label = new CFPlus::UI::Label
… …
548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 549 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
549 $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]});
550 }); 551 });
551 $mode_slider->emit (changed => $mode_slider->{range}[0]); 552 $mode_slider->emit (changed => $mode_slider->{range}[0]);
552 553
553 $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");
554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 555 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
555 state => $CFG->{fullscreen}, 556 state => $CFG->{fullscreen},
556 tooltip => "Bring the client into fullscreen mode.", 557 tooltip => "Bring the client into fullscreen mode.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 558 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
558 ); 559 );
559 560
560 $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");
561 $table->add (1, $row++, new CFPlus::UI::CheckBox 562 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
562 state => $CFG->{fast}, 563 state => $CFG->{fast},
563 tooltip => "Lower the visual quality considerably to speed up rendering.", 564 tooltip => "Lower the visual quality considerably to speed up rendering.",
564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 565 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
565 ); 566 );
566 567
567 $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");
568 $table->add (1, $row++, new CFPlus::UI::Slider 569 $table->add_at (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 570 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 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.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 572 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 ); 573 );
573 574
574 $table->add (1, $row++, new CFPlus::UI::Button 575 $table->add_at (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply", 576 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.", 577 tooltip => "Apply the video settings above.",
577 on_activate => sub { 578 on_activate => sub {
578 video_shutdown (); 579 video_shutdown ();
579 video_init (); 580 video_init ();
580 0 581 0
581 } 582 }
582 ); 583 );
583 584
584 $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");
585 $table->add (1, $row++, new CFPlus::UI::Slider 586 $table->add_at (1, $row++, new CFPlus::UI::Slider
586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 587 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 588 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
588 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 }
589 ); 590 );
590 591
591 $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");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox 593 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing}, 594 state => $CFG->{map_smoothing},
594 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. "
595 . "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. "
596 . "Changes take effect at next connection only.", 597 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 598 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 ); 599 );
599 600
600 $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");
601 $table->add (1, $row++, new CFPlus::UI::CheckBox 602 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
602 state => $CFG->{fow_enable}, 603 state => $CFG->{fow_enable},
603 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.",
604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 605 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
605 ); 606 );
606 607
607 $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");
608 $table->add (1, $row++, new CFPlus::UI::Slider 609 $table->add_at (1, $row++, new CFPlus::UI::Slider
609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 610 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
610 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.",
611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 612 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
612 ); 613 );
613 614
614 $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");
615 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add_at (1, $row++, new CFPlus::UI::Slider
616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
617 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.",
618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
619 ); 620 );
620 621
621 $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");
622 $table->add (1, $row++, new CFPlus::UI::Slider 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
624 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.",
625 on_changed => sub { 626 on_changed => sub {
626 $CFG->{gauge_fontsize} = $_[1]; 627 $CFG->{gauge_fontsize} = $_[1];
627 &set_gauge_window_fontsize; 628 &set_gauge_window_fontsize;
628 0 629 0
629 } 630 }
630 ); 631 );
631 632
632 $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");
633 $table->add (1, $row++, new CFPlus::UI::Slider 634 $table->add_at (1, $row++, new CFPlus::UI::Slider
634 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
635 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.",
636 on_changed => sub { 637 on_changed => sub {
637 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
648 649
649 $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]);
650 651
651 my $row = 0; 652 my $row = 0;
652 653
653 $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");
654 $table->add (1, $row++, new CFPlus::UI::CheckBox 655 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
655 state => $CFG->{audio_enable}, 656 state => $CFG->{audio_enable},
656 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.",
657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
658 ); 659 );
659# $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");
660# $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 {
661# $CFG->{effects_volume} = $_[1]; 662# $CFG->{effects_volume} = $_[1];
662# }); 663# });
663 $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");
664 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 665 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
665 $hbox->add (new CFPlus::UI::CheckBox 666 $hbox->add (new CFPlus::UI::CheckBox
666 expand => 1, state => $CFG->{bgm_enable}, 667 expand => 1, state => $CFG->{bgm_enable},
667 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.",
668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
669 ); 670 );
… …
671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
672 tooltip => "The volume of the background music. Changes are instant.", 673 tooltip => "The volume of the background music. Changes are instant.",
673 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 }
674 ); 675 );
675 676
676 $table->add (1, $row++, new CFPlus::UI::Button 677 $table->add_at (1, $row++, new CFPlus::UI::Button
677 expand => 1, align => 0, text => "Apply", 678 expand => 1, align => 0, text => "Apply",
678 tooltip => "Apply the audio settings", 679 tooltip => "Apply the audio settings",
679 on_activate => sub { 680 on_activate => sub {
680 audio_shutdown (); 681 audio_shutdown ();
681 audio_init (); 682 audio_init ();
… …
740} 741}
741 742
742sub debug_setup { 743sub debug_setup {
743 my $table = new CFPlus::UI::Table; 744 my $table = new CFPlus::UI::Table;
744 745
745 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 746 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
746 $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 });
747 $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");
748 $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 });
749 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 750 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
750 $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 });
751 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 752 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
752 $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 });
753 $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() } );
754 755
755 $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 });
756 790
757 $table 791 $table
758} 792}
759 793
760sub stats_window { 794sub stats_window {
… …
808 [2, 4, st_spd => "Spd", 10.54], 842 [2, 4, st_spd => "Spd", 10.54],
809 [2, 5, st_wspd => "WSp", 10.54], 843 [2, 5, st_wspd => "WSp", 10.54],
810 ) { 844 ) {
811 my ($col, $row, $id, $label, $template) = @$_; 845 my ($col, $row, $id, $label, $template) = @$_;
812 846
813 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 847 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
814 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 848 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
815 align => +1, template => $template, tooltip => "#stat_$label"); 849 align => +1, template => $template, tooltip => "#stat_$label");
816 $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
817 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,
818 align => -1, text => $label, tooltip => "#stat_$label"); 852 align => -1, text => $label, tooltip => "#stat_$label");
819 } 853 }
820 854
821 $vb->add (new CFPlus::UI::FancyFrame 855 $vb->add (new CFPlus::UI::FancyFrame
… …
862 cold => ["Cold", 896 cold => ["Cold",
863 "<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, ...)"],
864 ghit => ["Ghost hit", 898 ghit => ["Ghost hit",
865 "<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)"],
866 ); 900 );
901
867 for (qw/slow holyw conf fire depl magic 902 for (qw/slow holyw conf fire depl magic
868 drain acid pois para deat phys 903 drain acid pois para deat phys
869 blind fear tund elec cold ghit/) 904 blind fear tund elec cold ghit/)
870 { 905 {
871 $tbl2->add ($col, $row, 906 $tbl2->add_at ($col, $row,
872 $STATWIDS->{"res_$_"} = 907 $STATWIDS->{"res_$_"} =
873 new CFPlus::UI::Label 908 new CFPlus::UI::Label
874 font => $FONT_FIXED, 909 font => $FONT_FIXED,
875 template => "-100%", 910 template => "-100%",
876 align => +1, 911 align => +1,
877 valign => 0, 912 valign => 0,
878 can_events => 1, 913 can_events => 1,
879 can_hover => 1, 914 can_hover => 1,
880 tooltip => $resist_names{$_}->[1], 915 tooltip => $resist_names{$_}->[1],
881 ); 916 );
882 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 917 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
883 font => $FONT_FIXED, 918 font => $FONT_FIXED,
884 can_hover => 1, 919 can_hover => 1,
885 can_events => 1, 920 can_events => 1,
886 path => "ui/resist/resist_$_.png", 921 path => "ui/resist/resist_$_.png",
887 tooltip => $resist_names{$_}->[1], 922 tooltip => $resist_names{$_}->[1],
888 ); 923 );
889 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 924 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
890 text => $resist_names{$_}->[0], 925 text => $resist_names{$_}->[0],
891 font => $FONT_FIXED, 926 font => $FONT_FIXED,
892 can_hover => 1, 927 can_hover => 1,
893 can_events => 1, 928 can_events => 1,
894 tooltip => $resist_names{$_}->[1], 929 tooltip => $resist_names{$_}->[1],
… …
927 return if $METASERVER_ATIME > time; 962 return if $METASERVER_ATIME > time;
928 $METASERVER_ATIME = time + 60; 963 $METASERVER_ATIME = time + 60;
929 964
930 my $table = $METASERVER->{table}; 965 my $table = $METASERVER->{table};
931 $table->clear; 966 $table->clear;
932 $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...");
933 968
934 my $ok = 0; 969 my $ok = 0;
935 970
936 CFPlus::background { 971 CFPlus::background {
937 my $ua = CFPlus::lwp_useragent; 972 my $ua = CFPlus::lwp_useragent;
… …
948 "The time this server has been running without being restarted.", 983 "The time this server has been running without being restarted.",
949 "The server software version - a '+' indicates a Crossfire+ server.", 984 "The server software version - a '+' indicates a Crossfire+ server.",
950 "Short information about this server provided by its admins.", 985 "Short information about this server provided by its admins.",
951 ); 986 );
952 my @col = qw(#Users Host Uptime Version Description); 987 my @col = qw(#Users Host Uptime Version Description);
953 $table->add ($_, 0, new CFPlus::UI::Label 988 $table->add_at ($_, 0, new CFPlus::UI::Label
954 can_hover => 1, can_events => 1, 989 can_hover => 1, can_events => 1,
955 align => 0, fg => [1, 1, 0], 990 align => 0, fg => [1, 1, 0],
956 text => $col[$_], tooltip => $tip[$_]) 991 text => $col[$_], tooltip => $tip[$_])
957 for 0 .. $#col; 992 for 0 .. $#col;
958 993
… …
980 1015
981 $m = [$users, $host, $uptime, $version, $desc]; 1016 $m = [$users, $host, $uptime, $version, $desc];
982 1017
983 $y++; 1018 $y++;
984 1019
985 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1020 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
986 (new CFPlus::UI::Button 1021 (new CFPlus::UI::Button
987 text => "Use", 1022 text => "Use",
988 tooltip => "Put this server into the <b>Host:Port</b> field", 1023 tooltip => "Put this server into the <b>Host:Port</b> field",
989 on_activate => sub { 1024 on_activate => sub {
990 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1025 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
993 }, 1028 },
994 ), 1029 ),
995 (new CFPlus::UI::Empty expand => 1), 1030 (new CFPlus::UI::Empty expand => 1),
996 ]); 1031 ]);
997 1032
998 $table->add ($_, $y, new CFPlus::UI::Label 1033 $table->add_at ($_, $y, new CFPlus::UI::Label
999 max_w => $::WIDTH * 0.4, 1034 max_w => $::WIDTH * 0.4,
1000 ellipsise => 0, 1035 ellipsise => 0,
1001 align => $align[$_], 1036 align => $align[$_],
1002 text => $m->[$_], 1037 text => $m->[$_],
1003 tooltip => $tip[$_], 1038 tooltip => $tip[$_],
… …
1044 1079
1045 $vbox->add (new CFPlus::UI::FancyFrame 1080 $vbox->add (new CFPlus::UI::FancyFrame
1046 label => "Connection Settings", 1081 label => "Connection Settings",
1047 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]),
1048 ); 1083 );
1049 $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");
1050 1085
1051 { 1086 {
1052 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1087 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1053 1088
1054 $vbox->add ( 1089 $vbox->add (
1055 $HOST_ENTRY = new CFPlus::UI::Entry 1090 $HOST_ENTRY = new CFPlus::UI::Entry
1056 expand => 1, 1091 expand => 1,
1057 text => $CFG->{profile}{default}{host}, 1092 text => $CFG->{profile}{default}{host},
… …
1071 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1106 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1072 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1107 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1073 ); 1108 );
1074 } 1109 }
1075 1110
1076 $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");
1077 $table->add (1, 4, new CFPlus::UI::Entry 1112 $table->add_at (1, 4, new CFPlus::UI::Entry
1078 text => $CFG->{profile}{default}{user}, 1113 text => $CFG->{profile}{default}{user},
1079 tooltip => "The name of your character on the server", 1114 tooltip => "The name of your character on the server",
1080 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1081 ); 1116 );
1082 1117
1083 $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");
1084 $table->add (1, 5, new CFPlus::UI::Entry 1119 $table->add_at (1, 5, new CFPlus::UI::Entry
1085 text => $CFG->{profile}{default}{password}, 1120 text => $CFG->{profile}{default}{password},
1086 hidden => 1, 1121 hidden => 1,
1087 tooltip => "The password for your character", 1122 tooltip => "The password for your character",
1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1089 ); 1124 );
1090 1125
1091 $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");
1092 $table->add (1, 7, new CFPlus::UI::Slider 1127 $table->add_at (1, 7, new CFPlus::UI::Slider
1093 force_w => 100, 1128 force_w => 100,
1094 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1129 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1095 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. "
1096 . "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, "
1097 . "but you also increase bandwidth requirements and latency. " 1132 . "but you also increase bandwidth requirements and latency. "
1098 . "This option is only used once at log-in.", 1133 . "This option is only used once at log-in.",
1099 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 },
1100 ); 1135 );
1101 1136
1102 $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");
1103 $table->add (1, 8, new CFPlus::UI::CheckBox 1138 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1104 state => $CFG->{face_prefetch}, 1139 state => $CFG->{face_prefetch},
1105 tooltip => "<b>Background Image Prefetch</b>\n\n" 1140 tooltip => "<b>Background Image Prefetch</b>\n\n"
1106 . "If enabled, the client automatically pre-fetches images from the server. " 1141 . "If enabled, the client automatically pre-fetches images from the server. "
1107 . "This might increase or create lag, but increases the chances " 1142 . "This might increase or create lag, but increases the chances "
1108 . "of faces being ready for display when you encounter them. " 1143 . "of faces being ready for display when you encounter them. "
… …
1110 . "so only set it if you really need to prefetch images. " 1145 . "so only set it if you really need to prefetch images. "
1111 . "This option can be set and unset any time.", 1146 . "This option can be set and unset any time.",
1112 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1113 ); 1148 );
1114 1149
1115 $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");
1116 $table->add (1, 9, new CFPlus::UI::Entry 1151 $table->add_at (1, 9, new CFPlus::UI::Entry
1117 text => $CFG->{output_rate}, 1152 text => $CFG->{output_rate},
1118 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 "
1119 . "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 "
1120 . "default will be used, which is usually around 100kb/s.", 1155 . "default will be used, which is usually around 100kb/s.",
1121 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1156 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1122 ); 1157 );
1123 1158
1124 $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");
1125 $table->add (1, 10, new CFPlus::UI::Entry 1160 $table->add_at (1, 10, new CFPlus::UI::Entry
1126 text => $CFG->{output_count}, 1161 text => $CFG->{output_count},
1127 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.",
1128 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1163 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1129 ); 1164 );
1130 1165
1131 $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");
1132 $table->add (1, 11, new CFPlus::UI::Entry 1167 $table->add_at (1, 11, new CFPlus::UI::Entry
1133 text => $CFG->{output_sync}, 1168 text => $CFG->{output_sync},
1134 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.",
1135 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1170 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1136 ); 1171 );
1137 1172
1138 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1173 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1139 expand => 1, 1174 expand => 1,
1140 align => 0, 1175 align => 0,
1141 text => "Login", 1176 text => "Login",
1142 on_activate => sub { 1177 on_activate => sub {
1143 $CONN ? stop_game 1178 $CONN ? stop_game
… …
1157sub client_setup { 1192sub client_setup {
1158 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];
1159 1194
1160 my $row = 0; 1195 my $row = 0;
1161 1196
1162 $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");
1163 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1164 text => $CFG->{say_command}, 1199 text => $CFG->{say_command},
1165 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. "
1166 . "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. "
1167 . "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.",
1168 on_changed => sub { 1203 on_changed => sub {
… …
1170 $CFG->{say_command} = $value; 1205 $CFG->{say_command} = $value;
1171 0 1206 0
1172 } 1207 }
1173 ); 1208 );
1174 1209
1175 $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");
1176 $table->add (1, $row++, new CFPlus::UI::CheckBox 1211 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1177 state => $CFG->{show_tips}, 1212 state => $CFG->{show_tips},
1178 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?",
1179 on_changed => sub { 1214 on_changed => sub {
1180 my ($self, $value) = @_; 1215 my ($self, $value) = @_;
1181 $CFG->{show_tips} = $value; 1216 $CFG->{show_tips} = $value;
1182 0 1217 0
1183 } 1218 }
1184 ); 1219 );
1185 1220
1186 $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");
1187 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1222 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1188 text => $CFG->{logview_max_par}, 1223 text => $CFG->{logview_max_par},
1189 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 "
1190 . "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 "
1191 . "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.",
1192 on_changed => sub { 1227 on_changed => sub {
… …
1313 ], 1348 ],
1314 ["Weight/Value ratio", 2, 17] 1349 ["Weight/Value ratio", 2, 17]
1315 ) 1350 )
1316 { 1351 {
1317 my ($title, $x, $y, @bits) = @$_; 1352 my ($title, $x, $y, @bits) = @$_;
1318 $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]);
1319 1354
1320 for (@bits) { 1355 for (@bits) {
1321 ++$y; 1356 ++$y;
1322 1357
1323 my $mask = $_->[1]; 1358 my $mask = $_->[1];
1324 $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);
1325 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1360 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1326 state => $::CFG->{pickup} & $mask, 1361 state => $::CFG->{pickup} & $mask,
1327 on_changed => sub { 1362 on_changed => sub {
1328 my ($box, $value) = @_; 1363 my ($box, $value) = @_;
1329 1364
1330 if ($value) { 1365 if ($value) {
… …
1341 1376
1342 ${$_->[2]} = $checkbox if $_->[2]; 1377 ${$_->[2]} = $checkbox if $_->[2];
1343 } 1378 }
1344 } 1379 }
1345 1380
1346 $table->add (2, 18, new CFPlus::UI::ValSlider 1381 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1347 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1382 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1348 template => ">= 99", 1383 template => ">= 99",
1349 to_value => sub { ">= " . 5 * $_[0] }, 1384 to_value => sub { ">= " . 5 * $_[0] },
1350 on_changed => sub { 1385 on_changed => sub {
1351 my ($slider, $value) = @_; 1386 my ($slider, $value) = @_;
… …
1354 $::CFG->{pickup} |= int $value 1389 $::CFG->{pickup} |= int $value
1355 if $value; 1390 if $value;
1356 1; 1391 1;
1357 }); 1392 });
1358 1393
1359 $table->add (3, 18, new CFPlus::UI::Button 1394 $table->add_at (3, 18, new CFPlus::UI::Button
1360 text => "set", 1395 text => "set",
1361 on_activate => sub { 1396 on_activate => sub {
1362 $::CONN->send_command ("pickup $::CFG->{pickup}") 1397 $::CONN->send_command ("pickup $::CFG->{pickup}")
1363 if defined $::CONN; 1398 if defined $::CONN;
1364 0 1399 0
… …
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1716 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $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]);
1683 1718
1684 $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]);
1685 1720
1686 $table->add (0, 0, new CFPlus::UI::Button 1721 $table->add_at (0, 0, new CFPlus::UI::Button
1687 text => "Close", 1722 text => "Close",
1688 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>.",
1689 on_activate => $close, 1724 on_activate => $close,
1690 ); 1725 );
1691 1726
1692 $table->add (2, 0, new CFPlus::UI::Button 1727 $table->add_at (2, 0, new CFPlus::UI::Button
1693 text => "Next", 1728 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 1729 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 1730 on_activate => sub {
1696 $close->(); 1731 $close->();
1697 &show_tip_of_the_day; 1732 &show_tip_of_the_day;
… …
1964 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1999 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1965 2000
1966 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 2001 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1967 my $row = 0; 2002 my $row = 0;
1968 if ($info->{has_name}) { 2003 if ($info->{has_name}) {
1969 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 2004 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1970 $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 });
1971 } 2006 }
1972 if ($info->{has_text}) { 2007 if ($info->{has_text}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 2008 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1974 $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 });
1975 } 2010 }
1976 if ($info->{has_connection}) { 2011 if ($info->{has_connection}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 2012 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1978 $table->add (1, $row++, 2013 $table->add_at (1, $row++,
1979 new CFPlus::UI::Entry 2014 new CFPlus::UI::Entry
1980 expand => 1, 2015 expand => 1,
1981 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 2016 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1982 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"
1983 ); 2018 );
… …
2287 2322
2288 @SDL_MODES = CFPlus::SDL_ListModes 8, 8; 2323 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2289 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; 2324 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2290 @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)";
2291 2326
2327 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2328
2292 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2329 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2293 2330
2294 { 2331 {
2295 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2332 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2296 DejaVuSans.ttf 2333 DejaVuSans.ttf

Diff Legend

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