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.168 by root, Sat Jul 14 12:05:53 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
532 my $vidmode_tooltip =
533 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
534 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
535
534 $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");
535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 537 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
536 538
539 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
537 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 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],
538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 541 tooltip => $vidmode_tooltip);
542 $hbox->add (my $mode_label = new CFPlus::UI::Label
543 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
544 can_events => 1, tooltip => $vidmode_tooltip);
539 545
540 $mode_slider->connect (changed => sub { 546 $mode_slider->connect (changed => sub {
541 my ($self, $value) = @_; 547 my ($self, $value) = @_;
542 548
543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 549 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 550 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
545 }); 551 });
546 $mode_slider->emit (changed => $mode_slider->{range}[0]); 552 $mode_slider->emit (changed => $mode_slider->{range}[0]);
547 553
548 $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");
549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 555 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
550 state => $CFG->{fullscreen}, 556 state => $CFG->{fullscreen},
551 tooltip => "Bring the client into fullscreen mode.", 557 tooltip => "Bring the client into fullscreen mode.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 558 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
553 ); 559 );
554 560
555 $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");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox 562 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{fast}, 563 state => $CFG->{fast},
558 tooltip => "Lower the visual quality considerably to speed up rendering.", 564 tooltip => "Lower the visual quality considerably to speed up rendering.",
559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 565 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
560 ); 566 );
561 567
562 $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");
563 $table->add (1, $row++, new CFPlus::UI::Slider 569 $table->add_at (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 570 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 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.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 572 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 ); 573 );
568 574
569 $table->add (1, $row++, new CFPlus::UI::Button 575 $table->add_at (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply", 576 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.", 577 tooltip => "Apply the video settings above.",
572 on_activate => sub { 578 on_activate => sub {
573 video_shutdown (); 579 video_shutdown ();
574 video_init (); 580 video_init ();
575 0 581 0
576 } 582 }
577 ); 583 );
578 584
579 $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");
580 $table->add (1, $row++, new CFPlus::UI::Slider 586 $table->add_at (1, $row++, new CFPlus::UI::Slider
581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 587 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 588 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
583 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 }
584 ); 590 );
585 591
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 592 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox 593 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing}, 594 state => $CFG->{map_smoothing},
589 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. "
590 . "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. "
591 . "Changes take effect at next connection only.", 597 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 598 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
593 ); 599 );
594 600
595 $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");
596 $table->add (1, $row++, new CFPlus::UI::CheckBox 602 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{fow_enable}, 603 state => $CFG->{fow_enable},
598 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.",
599 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 605 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
600 ); 606 );
601 607
602 $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");
603 $table->add (1, $row++, new CFPlus::UI::Slider 609 $table->add_at (1, $row++, new CFPlus::UI::Slider
604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 610 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
605 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.",
606 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 612 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
607 ); 613 );
608 614
609 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
610 $table->add (1, $row++, new CFPlus::UI::CheckBox
611 state => $CFG->{fow_smooth},
612 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
613 on_changed => sub {
614 my ($self, $value) = @_;
615 $CFG->{fow_smooth} = $value;
616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
617 0
618 }
619 );
620
621 $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");
622 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
624 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.",
625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
626 ); 620 );
627 621
628 $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");
629 $table->add (1, $row++, new CFPlus::UI::Slider 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
630 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
631 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.",
632 on_changed => sub { 626 on_changed => sub {
633 $CFG->{gauge_fontsize} = $_[1]; 627 $CFG->{gauge_fontsize} = $_[1];
634 &set_gauge_window_fontsize; 628 &set_gauge_window_fontsize;
635 0 629 0
636 } 630 }
637 ); 631 );
638 632
639 $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");
640 $table->add (1, $row++, new CFPlus::UI::Slider 634 $table->add_at (1, $row++, new CFPlus::UI::Slider
641 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
642 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.",
643 on_changed => sub { 637 on_changed => sub {
644 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
655 649
656 $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]);
657 651
658 my $row = 0; 652 my $row = 0;
659 653
660 $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");
661 $table->add (1, $row++, new CFPlus::UI::CheckBox 655 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
662 state => $CFG->{audio_enable}, 656 state => $CFG->{audio_enable},
663 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.",
664 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
665 ); 659 );
666# $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");
667# $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 {
668# $CFG->{effects_volume} = $_[1]; 662# $CFG->{effects_volume} = $_[1];
669# }); 663# });
670 $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");
671 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 665 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
672 $hbox->add (new CFPlus::UI::CheckBox 666 $hbox->add (new CFPlus::UI::CheckBox
673 expand => 1, state => $CFG->{bgm_enable}, 667 expand => 1, state => $CFG->{bgm_enable},
674 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.",
675 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
676 ); 670 );
… …
678 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
679 tooltip => "The volume of the background music. Changes are instant.", 673 tooltip => "The volume of the background music. Changes are instant.",
680 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 }
681 ); 675 );
682 676
683 $table->add (1, $row++, new CFPlus::UI::Button 677 $table->add_at (1, $row++, new CFPlus::UI::Button
684 expand => 1, align => 0, text => "Apply", 678 expand => 1, align => 0, text => "Apply",
685 tooltip => "Apply the audio settings", 679 tooltip => "Apply the audio settings",
686 on_activate => sub { 680 on_activate => sub {
687 audio_shutdown (); 681 audio_shutdown ();
688 audio_init (); 682 audio_init ();
… …
747} 741}
748 742
749sub debug_setup { 743sub debug_setup {
750 my $table = new CFPlus::UI::Table; 744 my $table = new CFPlus::UI::Table;
751 745
752 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 746 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
753 $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 });
754 $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");
755 $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 });
756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 750 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
757 $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 });
758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 752 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
759 $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 });
760 $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() } );
761 755
762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
763
764 for my $x (0..2) {
765 for my $y (0 .. 2) {
766 $table->add ($x + 3, $y,
767 new CFPlus::UI::Entry
768 text => $default_smooth[$x * 3 + $y],
769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
770 );
771 }
772 }
773
774 $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 });
775 790
776 $table 791 $table
777} 792}
778 793
779sub stats_window { 794sub stats_window {
… …
827 [2, 4, st_spd => "Spd", 10.54], 842 [2, 4, st_spd => "Spd", 10.54],
828 [2, 5, st_wspd => "WSp", 10.54], 843 [2, 5, st_wspd => "WSp", 10.54],
829 ) { 844 ) {
830 my ($col, $row, $id, $label, $template) = @$_; 845 my ($col, $row, $id, $label, $template) = @$_;
831 846
832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 847 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
833 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 848 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
834 align => +1, template => $template, tooltip => "#stat_$label"); 849 align => +1, template => $template, tooltip => "#stat_$label");
835 $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
836 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,
837 align => -1, text => $label, tooltip => "#stat_$label"); 852 align => -1, text => $label, tooltip => "#stat_$label");
838 } 853 }
839 854
840 $vb->add (new CFPlus::UI::FancyFrame 855 $vb->add (new CFPlus::UI::FancyFrame
… …
881 cold => ["Cold", 896 cold => ["Cold",
882 "<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, ...)"],
883 ghit => ["Ghost hit", 898 ghit => ["Ghost hit",
884 "<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)"],
885 ); 900 );
901
886 for (qw/slow holyw conf fire depl magic 902 for (qw/slow holyw conf fire depl magic
887 drain acid pois para deat phys 903 drain acid pois para deat phys
888 blind fear tund elec cold ghit/) 904 blind fear tund elec cold ghit/)
889 { 905 {
890 $tbl2->add ($col, $row, 906 $tbl2->add_at ($col, $row,
891 $STATWIDS->{"res_$_"} = 907 $STATWIDS->{"res_$_"} =
892 new CFPlus::UI::Label 908 new CFPlus::UI::Label
893 font => $FONT_FIXED, 909 font => $FONT_FIXED,
894 template => "-100%", 910 template => "-100%",
895 align => +1, 911 align => +1,
896 valign => 0, 912 valign => 0,
897 can_events => 1, 913 can_events => 1,
898 can_hover => 1, 914 can_hover => 1,
899 tooltip => $resist_names{$_}->[1], 915 tooltip => $resist_names{$_}->[1],
900 ); 916 );
901 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 917 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
902 font => $FONT_FIXED, 918 font => $FONT_FIXED,
903 can_hover => 1, 919 can_hover => 1,
904 can_events => 1, 920 can_events => 1,
905 path => "ui/resist/resist_$_.png", 921 path => "ui/resist/resist_$_.png",
906 tooltip => $resist_names{$_}->[1], 922 tooltip => $resist_names{$_}->[1],
907 ); 923 );
908 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 924 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
909 text => $resist_names{$_}->[0], 925 text => $resist_names{$_}->[0],
910 font => $FONT_FIXED, 926 font => $FONT_FIXED,
911 can_hover => 1, 927 can_hover => 1,
912 can_events => 1, 928 can_events => 1,
913 tooltip => $resist_names{$_}->[1], 929 tooltip => $resist_names{$_}->[1],
… …
946 return if $METASERVER_ATIME > time; 962 return if $METASERVER_ATIME > time;
947 $METASERVER_ATIME = time + 60; 963 $METASERVER_ATIME = time + 60;
948 964
949 my $table = $METASERVER->{table}; 965 my $table = $METASERVER->{table};
950 $table->clear; 966 $table->clear;
951 $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...");
952 968
953 my $ok = 0; 969 my $ok = 0;
954 970
955 CFPlus::background { 971 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent; 972 my $ua = CFPlus::lwp_useragent;
… …
967 "The time this server has been running without being restarted.", 983 "The time this server has been running without being restarted.",
968 "The server software version - a '+' indicates a Crossfire+ server.", 984 "The server software version - a '+' indicates a Crossfire+ server.",
969 "Short information about this server provided by its admins.", 985 "Short information about this server provided by its admins.",
970 ); 986 );
971 my @col = qw(#Users Host Uptime Version Description); 987 my @col = qw(#Users Host Uptime Version Description);
972 $table->add ($_, 0, new CFPlus::UI::Label 988 $table->add_at ($_, 0, new CFPlus::UI::Label
973 can_hover => 1, can_events => 1, 989 can_hover => 1, can_events => 1,
974 align => 0, fg => [1, 1, 0], 990 align => 0, fg => [1, 1, 0],
975 text => $col[$_], tooltip => $tip[$_]) 991 text => $col[$_], tooltip => $tip[$_])
976 for 0 .. $#col; 992 for 0 .. $#col;
977 993
… …
999 1015
1000 $m = [$users, $host, $uptime, $version, $desc]; 1016 $m = [$users, $host, $uptime, $version, $desc];
1001 1017
1002 $y++; 1018 $y++;
1003 1019
1004 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1020 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1005 (new CFPlus::UI::Button 1021 (new CFPlus::UI::Button
1006 text => "Use", 1022 text => "Use",
1007 tooltip => "Put this server into the <b>Host:Port</b> field", 1023 tooltip => "Put this server into the <b>Host:Port</b> field",
1008 on_activate => sub { 1024 on_activate => sub {
1009 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1025 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1012 }, 1028 },
1013 ), 1029 ),
1014 (new CFPlus::UI::Empty expand => 1), 1030 (new CFPlus::UI::Empty expand => 1),
1015 ]); 1031 ]);
1016 1032
1017 $table->add ($_, $y, new CFPlus::UI::Label 1033 $table->add_at ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4, 1034 max_w => $::WIDTH * 0.4,
1019 ellipsise => 0, 1035 ellipsise => 0,
1020 align => $align[$_], 1036 align => $align[$_],
1021 text => $m->[$_], 1037 text => $m->[$_],
1022 tooltip => $tip[$_], 1038 tooltip => $tip[$_],
… …
1063 1079
1064 $vbox->add (new CFPlus::UI::FancyFrame 1080 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings", 1081 label => "Connection Settings",
1066 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]),
1067 ); 1083 );
1068 $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");
1069 1085
1070 { 1086 {
1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1087 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1072 1088
1073 $vbox->add ( 1089 $vbox->add (
1074 $HOST_ENTRY = new CFPlus::UI::Entry 1090 $HOST_ENTRY = new CFPlus::UI::Entry
1075 expand => 1, 1091 expand => 1,
1076 text => $CFG->{profile}{default}{host}, 1092 text => $CFG->{profile}{default}{host},
… …
1090 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1106 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1091 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1107 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1092 ); 1108 );
1093 } 1109 }
1094 1110
1095 $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");
1096 $table->add (1, 4, new CFPlus::UI::Entry 1112 $table->add_at (1, 4, new CFPlus::UI::Entry
1097 text => $CFG->{profile}{default}{user}, 1113 text => $CFG->{profile}{default}{user},
1098 tooltip => "The name of your character on the server", 1114 tooltip => "The name of your character on the server",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1100 ); 1116 );
1101 1117
1102 $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");
1103 $table->add (1, 5, new CFPlus::UI::Entry 1119 $table->add_at (1, 5, new CFPlus::UI::Entry
1104 text => $CFG->{profile}{default}{password}, 1120 text => $CFG->{profile}{default}{password},
1105 hidden => 1, 1121 hidden => 1,
1106 tooltip => "The password for your character", 1122 tooltip => "The password for your character",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1108 ); 1124 );
1109 1125
1110 $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");
1111 $table->add (1, 7, new CFPlus::UI::Slider 1127 $table->add_at (1, 7, new CFPlus::UI::Slider
1112 force_w => 100, 1128 force_w => 100,
1113 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1129 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1114 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. "
1115 . "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, "
1116 . "but you also increase bandwidth requirements and latency. " 1132 . "but you also increase bandwidth requirements and latency. "
1117 . "This option is only used once at log-in.", 1133 . "This option is only used once at log-in.",
1118 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 },
1119 ); 1135 );
1120 1136
1121 $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");
1122 $table->add (1, 8, new CFPlus::UI::CheckBox 1138 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1123 state => $CFG->{face_prefetch}, 1139 state => $CFG->{face_prefetch},
1124 tooltip => "<b>Background Image Prefetch</b>\n\n" 1140 tooltip => "<b>Background Image Prefetch</b>\n\n"
1125 . "If enabled, the client automatically pre-fetches images from the server. " 1141 . "If enabled, the client automatically pre-fetches images from the server. "
1126 . "This might increase or create lag, but increases the chances " 1142 . "This might increase or create lag, but increases the chances "
1127 . "of faces being ready for display when you encounter them. " 1143 . "of faces being ready for display when you encounter them. "
… …
1129 . "so only set it if you really need to prefetch images. " 1145 . "so only set it if you really need to prefetch images. "
1130 . "This option can be set and unset any time.", 1146 . "This option can be set and unset any time.",
1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1132 ); 1148 );
1133 1149
1134 $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");
1135 $table->add (1, 9, new CFPlus::UI::Entry 1151 $table->add_at (1, 9, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate}, 1152 text => $CFG->{output_rate},
1137 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 "
1138 . "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 "
1139 . "default will be used, which is usually around 100kb/s.", 1155 . "default will be used, which is usually around 100kb/s.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1156 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1141 ); 1157 );
1142 1158
1143 $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");
1144 $table->add (1, 10, new CFPlus::UI::Entry 1160 $table->add_at (1, 10, new CFPlus::UI::Entry
1145 text => $CFG->{output_count}, 1161 text => $CFG->{output_count},
1146 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.",
1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1163 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1148 ); 1164 );
1149 1165
1150 $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");
1151 $table->add (1, 11, new CFPlus::UI::Entry 1167 $table->add_at (1, 11, new CFPlus::UI::Entry
1152 text => $CFG->{output_sync}, 1168 text => $CFG->{output_sync},
1153 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.",
1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1170 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1155 ); 1171 );
1156 1172
1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1173 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1158 expand => 1, 1174 expand => 1,
1159 align => 0, 1175 align => 0,
1160 text => "Login", 1176 text => "Login",
1161 on_activate => sub { 1177 on_activate => sub {
1162 $CONN ? stop_game 1178 $CONN ? stop_game
… …
1176sub client_setup { 1192sub client_setup {
1177 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];
1178 1194
1179 my $row = 0; 1195 my $row = 0;
1180 1196
1181 $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");
1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1183 text => $CFG->{say_command}, 1199 text => $CFG->{say_command},
1184 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. "
1185 . "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. "
1186 . "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.",
1187 on_changed => sub { 1203 on_changed => sub {
… …
1189 $CFG->{say_command} = $value; 1205 $CFG->{say_command} = $value;
1190 0 1206 0
1191 } 1207 }
1192 ); 1208 );
1193 1209
1194 $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");
1195 $table->add (1, $row++, new CFPlus::UI::CheckBox 1211 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1196 state => $CFG->{show_tips}, 1212 state => $CFG->{show_tips},
1197 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?",
1198 on_changed => sub { 1214 on_changed => sub {
1199 my ($self, $value) = @_; 1215 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value; 1216 $CFG->{show_tips} = $value;
1201 0 1217 0
1202 } 1218 }
1203 ); 1219 );
1204 1220
1205 $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");
1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1222 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par}, 1223 text => $CFG->{logview_max_par},
1208 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 "
1209 . "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 "
1210 . "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.",
1211 on_changed => sub { 1227 on_changed => sub {
… …
1280 1296
1281 $window 1297 $window
1282} 1298}
1283 1299
1284sub autopickup_setup { 1300sub autopickup_setup {
1301 my $r = new CFPlus::UI::ScrolledWindow (
1302 expand => 1,
1303 scroll_y => 1
1304 );
1285 my $table = new CFPlus::UI::Table; 1305 $r->add (my $table = new CFPlus::UI::Table
1306 row_expand => [0],
1307 col_expand => [0, 1, 0, 1],
1308 );
1286 1309
1287 for ( 1310 for (
1288 ["General", 0, 0, 1311 ["General", 0, 0,
1289 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1312 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1290 ["Inhibit autopickup" => PICKUP_INHIBIT], 1313 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1325 ], 1348 ],
1326 ["Weight/Value ratio", 2, 17] 1349 ["Weight/Value ratio", 2, 17]
1327 ) 1350 )
1328 { 1351 {
1329 my ($title, $x, $y, @bits) = @$_; 1352 my ($title, $x, $y, @bits) = @$_;
1330 $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]);
1331 1354
1332 for (@bits) { 1355 for (@bits) {
1333 ++$y; 1356 ++$y;
1334 1357
1335 my $mask = $_->[1]; 1358 my $mask = $_->[1];
1336 $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);
1337 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1360 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1338 state => $::CFG->{pickup} & $mask, 1361 state => $::CFG->{pickup} & $mask,
1339 on_changed => sub { 1362 on_changed => sub {
1340 my ($box, $value) = @_; 1363 my ($box, $value) = @_;
1341 1364
1342 if ($value) { 1365 if ($value) {
… …
1353 1376
1354 ${$_->[2]} = $checkbox if $_->[2]; 1377 ${$_->[2]} = $checkbox if $_->[2];
1355 } 1378 }
1356 } 1379 }
1357 1380
1358 $table->add (2, 18, new CFPlus::UI::ValSlider 1381 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1359 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1382 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1360 template => ">= 99", 1383 template => ">= 99",
1361 to_value => sub { ">= " . 5 * $_[0] }, 1384 to_value => sub { ">= " . 5 * $_[0] },
1362 on_changed => sub { 1385 on_changed => sub {
1363 my ($slider, $value) = @_; 1386 my ($slider, $value) = @_;
… …
1366 $::CFG->{pickup} |= int $value 1389 $::CFG->{pickup} |= int $value
1367 if $value; 1390 if $value;
1368 1; 1391 1;
1369 }); 1392 });
1370 1393
1371 $table->add (3, 18, new CFPlus::UI::Button 1394 $table->add_at (3, 18, new CFPlus::UI::Button
1372 text => "set", 1395 text => "set",
1373 on_activate => sub { 1396 on_activate => sub {
1374 $::CONN->send_command ("pickup $::CFG->{pickup}") 1397 $::CONN->send_command ("pickup $::CFG->{pickup}")
1375 if defined $::CONN; 1398 if defined $::CONN;
1376 0 1399 0
1377 }); 1400 });
1378 1401
1379 $table 1402 $r
1380} 1403}
1381 1404
1382my %SORT_ORDER = ( 1405my %SORT_ORDER = (
1383 type => undef, 1406 type => undef,
1384 mtime => sub { 1407 mtime => sub {
… …
1693 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1716 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1694 $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]);
1695 1718
1696 $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]);
1697 1720
1698 $table->add (0, 0, new CFPlus::UI::Button 1721 $table->add_at (0, 0, new CFPlus::UI::Button
1699 text => "Close", 1722 text => "Close",
1700 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>.",
1701 on_activate => $close, 1724 on_activate => $close,
1702 ); 1725 );
1703 1726
1704 $table->add (2, 0, new CFPlus::UI::Button 1727 $table->add_at (2, 0, new CFPlus::UI::Button
1705 text => "Next", 1728 text => "Next",
1706 tooltip => "Show the next <b>Tip of the day</b>.", 1729 tooltip => "Show the next <b>Tip of the day</b>.",
1707 on_activate => sub { 1730 on_activate => sub {
1708 $close->(); 1731 $close->();
1709 &show_tip_of_the_day; 1732 &show_tip_of_the_day;
… …
1718 CFPlus::SDL_Init 1741 CFPlus::SDL_Init
1719 and die "SDL::Init failed!\n"; 1742 and die "SDL::Init failed!\n";
1720} 1743}
1721 1744
1722sub video_init { 1745sub video_init {
1723 sdl_init;
1724
1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1746 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1726 1747
1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1748 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1728 1749
1729 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1750 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1730 $FULLSCREEN = $CFG->{fullscreen}; 1751 $FULLSCREEN = $CFG->{fullscreen};
1731 $FAST = $CFG->{fast}; 1752 $FAST = $CFG->{fast};
1732 1753
1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1754 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1755 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1735 1756
1736 $SDL_ACTIVE = 1; 1757 $SDL_ACTIVE = 1;
1737 $LAST_REFRESH = time - 0.01; 1758 $LAST_REFRESH = time - 0.01;
1738 1759
… …
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
2163my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2184my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2164 $NOW = time; 2185 $NOW = time;
2165 2186
2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2187 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2167 for CFPlus::SDL_PollEvent; 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 {
… …
2206 CFPlus::SDL_VIDEOEXPOSE => sub { 2227 CFPlus::SDL_VIDEOEXPOSE => sub {
2207 CFPlus::UI::full_refresh; 2228 CFPlus::UI::full_refresh;
2208 }, 2229 },
2209 CFPlus::SDL_ACTIVEEVENT => sub { 2230 CFPlus::SDL_ACTIVEEVENT => sub {
2210# not useful, as APPACTIVE include sonly iconified state, not unmapped 2231# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2232# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2233# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2212# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2234# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2213# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2235# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2214# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2236# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2215 }, 2237 },
2216 CFPlus::SDL_KEYDOWN => sub { 2238 CFPlus::SDL_KEYDOWN => sub {
… …
2252 height => 480, 2274 height => 480,
2253 fullscreen => 0, 2275 fullscreen => 0,
2254 fast => 0, 2276 fast => 0,
2255 map_scale => 1, 2277 map_scale => 1,
2256 fow_enable => 1, 2278 fow_enable => 1,
2257 fow_intensity => 0.45, 2279 fow_intensity => 0,
2258 fow_smooth => 0,
2259 map_smoothing => 1, 2280 map_smoothing => 1,
2260 gui_fontsize => 1, 2281 gui_fontsize => 1,
2261 log_fontsize => 0.7, 2282 log_fontsize => 0.7,
2262 gauge_fontsize => 1, 2283 gauge_fontsize => 1,
2263 gauge_size => 0.35, 2284 gauge_size => 0.35,
… …
2297 } 2318 }
2298 } 2319 }
2299 2320
2300 sdl_init; 2321 sdl_init;
2301 2322
2302 @SDL_MODES = reverse 2323 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2303 grep $_->[0] >= 640 && $_->[1] >= 480, 2324 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2304 CFPlus::SDL_ListModes;
2305
2306 @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)";
2326
2327 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2307 2328
2308 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2329 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2309 2330
2310 { 2331 {
2311 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2332 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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