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.24 by elmex, Mon May 29 19:30:28 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC

… …
41use CFClient::UI; 41use CFClient::UI;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43 43
44$Event::DIED = sub { 44$Event::DIED = sub {
45 # TODO: display dialog box or so 45 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 47 CFClient::error $_[1];
47}; 48};
48 49
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 51
… …
81our $LOGVIEW; 82our $LOGVIEW;
82our $CONSOLE; 83our $CONSOLE;
83our $METASERVER; 84our $METASERVER;
84our $LOGIN_BUTTON; 85our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 86our $QUIT_DIALOG;
86our $SERVER_SETUP; 87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
87 94
88our $FLOORBOX; 95our $FLOORBOX;
89our $GAUGES; 96our $GAUGES;
90our $STATWIDS; 97our $STATWIDS;
91 98
… …
101our $DEBUG_STATUS; 108our $DEBUG_STATUS;
102 109
103our $INV_WINDOW; 110our $INV_WINDOW;
104our $INV; 111our $INV;
105our $INVR; 112our $INVR;
106our $INVR_LBL; 113our $INV_RIGHT_HB;
107 114
108our $BIND_WINDOW; 115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
109 118
110sub status { 119sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 121}
113 122
114sub debug { 123sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 124 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 125}
119 126
120sub start_game { 127sub start_game {
121 status "logging in..."; 128 status "logging in...";
122 129
123 $LOGIN_BUTTON->set_text ("Logout"); 130 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 131 $SETUP_DIALOG->hide;
125 132
126 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
127 134
128 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
129 136
… …
167 } 174 }
168} 175}
169 176
170sub stop_game { 177sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 178 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 179 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 180 $INV_WINDOW->hide;
174 $LOGVIEW->hide; 181 $LOGVIEW->hide;
175 182
176 return unless $CONN; 183 return unless $CONN;
177 184
… …
179 186
180 $CONN->destroy; 187 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
182} 189}
183 190
184sub client_setup { 191sub graphics_setup {
185 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1,
187 req_y => $HEIGHT * (1/8),
188 name => "client_setup",
189 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
193
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 194 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
192 195
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 196 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
195 198
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 199 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
197 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 200 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
198 201
199 $mode_slider->connect (changed => sub { 202 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 203 my ($self, $value) = @_;
201 204
… …
318 on_activate => sub { 321 on_activate => sub {
319 video_shutdown (); 322 video_shutdown ();
320 video_init (); 323 video_init ();
321 } 324 }
322 ); 325 );
326
327 $vbox
328}
329
330sub audio_setup {
331 my $vbox = new CFClient::UI::VBox;
332
333 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
334
335 my $row = 0;
323 336
324 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 339 state => $CFG->{audio_enable},
327 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.", 340 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.",
… …
358 audio_shutdown (); 371 audio_shutdown ();
359 audio_init (); 372 audio_init ();
360 } 373 }
361 ); 374 );
362 375
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376} 377}
377 378
378sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
389 390
390sub make_gauge_window { 391sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 392 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 393
393 my $win = new CFClient::UI::Frame ( 394 my $win = new CFClient::UI::Frame (
394 req_x => 0, 395 force_x => 0,
395 req_y => -1, 396 force_y => "max",
396 def_w => $WIDTH, 397 force_w => $WIDTH,
397 def_h => $gh, 398 force_h => $gh,
398 ); 399 );
399 400
400 $win->add (my $hbox = new CFClient::UI::HBox 401 $win->add (my $hbox = new CFClient::UI::HBox
401 children => [ 402 children => [
402 (new CFClient::UI::HBox expand => 1), 403 (new CFClient::UI::HBox expand => 1),
… …
441} 442}
442 443
443 444
444sub make_stats_window { 445sub make_stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 446 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8), 447 y => $HEIGHT * (2/8),
447 req_x => -1, 448 x => "max",
448 title => "Stats", 449 title => "Stats",
449 name => "stats_window"; 450 name => "stats_window";
450 451
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 452 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 453 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 454 can_hover => 1, can_events => 1,
454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
553 update_stats_window ({}); 554 update_stats_window ({});
554 555
555 $tgw 556 $tgw
556} 557}
557 558
558sub formsep { 559sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 561}
561 562
562sub update_stats_window { 563sub update_stats_window {
563 my ($stats) = @_; 564 my ($stats) = @_;
564 565
… …
626 627
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 629 for keys %tbl;
629} 630}
630 631
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 632my $METASERVER_ATIME;
642 633
643sub update_metaserver { 634sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
648 637
649 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
650 $table->clear; 639 $table->clear;
… …
702 691
703 $y++; 692 $y++;
704 693
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
708 }), 698 }),
709 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
710 ]); 700 ]);
711 701
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 705 }
716 } 706 }
717 }); 707 });
718} 708}
719 709
720sub server_setup { 710sub metaserver_dialog {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 711 my $dialog = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 712 title => "Server List",
723 y => $HEIGHT * (1/8), 713 name => 'metaserver_dialog',
724 name => "server_setup", 714 x => 'center',
725 title => "Server Setup", 715 y => 'center',
726 child => (my $vbox = new CFClient::UI::VBox), 716 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub { 717 on_visibility_change => sub {
728 my ($self, $visible) = @_; 718 update_metaserver if $_[1];
729 $self->center if $visible;
730 }, 719 },
731 ; 720 ;
732 721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
727sub server_setup {
728 my $vbox = new CFClient::UI::VBox;
729
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
734 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 732
736 { 733 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 735
739 $vbox->add ( 736 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 738 expand => 1,
742 text => $CFG->{host}, 739 text => $CFG->{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 741 on_changed => sub {
745 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
747 } 744 }
748 ); 745 );
749 746
750 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
751 748
752 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
753 expand => 1, 750 expand => 1,
754 text => "Server List", 751 text => "Server List",
755 other => $METASERVER, 752 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST;
759 }
760 ); 755 );
761 } 756 }
762 757
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 776 }
782 ); 777 );
783 778
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 781 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 783 tooltip => "This is the size of the portion of the map update the server sends you. "
789 . "If you set this to a high value you will be able to see further, " 784 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
… …
831 $CONN ? stop_game 826 $CONN ? stop_game
832 : start_game; 827 : start_game;
833 }, 828 },
834 ); 829 );
835 830
836 $dialog 831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
833 text => $CFG->{say_command},
834 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub {
838 my ($self, $value) = @_;
839 $CFG->{say_command} = $value;
840 }
841 );
842
843 $vbox
837} 844}
838 845
839sub message_window { 846sub message_window {
840 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 848 name => "message_window",
842 title => "Messages", 849 title => "Messages",
843 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
845 req_x => -1, 852 x => "max",
846 req_y => 0, 853 y => 0,
847 def_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
850 857
851 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
852 859
853 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
… …
867 }, 874 },
868 on_activate => sub { 875 on_activate => sub {
869 my ($input, $text) = @_; 876 my ($input, $text) = @_;
870 $input->set_text (''); 877 $input->set_text ('');
871 878
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
876 } else { 881 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 882 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 883 $::CONN->user_send ("$say_cmd $text");
879 } 884 }
… …
887 }, 892 },
888 ); 893 );
889 894
890 $CONSOLE = { 895 $CONSOLE = {
891 window => $window, 896 window => $window,
892 input => $input 897 input => $input,
893 }; 898 };
894 899
895 $window 900 $window
896} 901}
897 902
898sub open_quit_dialog { 903sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 title => "Really Quit?",
909 ;
901 910
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 912
904 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 927 on_activate => sub { exit },
919 ); 928 );
920 } 929 }
921 930
922 $QUIT_DIALOG->show; 931 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 932}
933
934sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944
945 for (
946 ["General", $gen_tbl],
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
951 ["Weapons", $ltbl],
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW],
956 ["Armour"],
957 ["Helmets" => CFClient::Pickup::PU_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
963 ["Readables", $rtbl],
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
967 ["Misc"],
968 ["Food" => CFClient::Pickup::PU_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
977 )
978 {
979 if (ref $_->[1]) {
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
983 } elsif (not defined $_->[1]) {
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
985 } else {
986 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask,
990 on_changed => sub {
991 my ($box, $value) = @_;
992 if ($value) {
993 $::CFG->{pickup} |= $mask;
994 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
996 }
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
998 if defined $::CONN;
999 });
1000 }
1001 }
1002
1003 $vb
924} 1004}
925 1005
926sub make_inventory_window { 1006sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center",
1009 y => "center",
928 def_w => $WIDTH * 7/8, 1010 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 1011 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1012 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 1013 ;
937 1014
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1016
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 1020
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 1021 $hb->add (my $vb2 = new CFClient::UI::VBox);
945 1022
946 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
948 $hb2->add (new CFClient::UI::Button
949 text => "Close",
950 tooltip => "Close the currently open container (if one is open)",
951 on_activate => sub {
952 $CONN->send ("apply $CONN->{open_container}")
953 if $CONN->{open_container} != 0;
954 },
955 );
956 1024
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
958 1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
959 $invwin 1030 $invwin
960} 1031}
961 1032
962sub make_binding_window { 1033sub spell_setup {
1034 new CFClient::UI::SpellList
1035}
1036
1037sub keyboard_setup {
963 my $binding_list = new CFClient::UI::VBox; 1038 my $binding_list = new CFClient::UI::VBox;
964 1039
1040 my $refresh;
965 my $refresh = sub { 1041 $refresh = sub {
966 $binding_list->clear (); 1042 $binding_list->clear ();
967 1043
968 for my $mod (keys %{$::CFG->{bindings}}) { 1044 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 1048
973 my $lbl = join "; ", @$cmds; 1049 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button 1052 $hb->add (new CFClient::UI::Button
977 text => "del", 1053 text => "delete",
1054 tooltip => "Deletes the binding",
978 on_activate => sub { 1055 on_activate => sub {
979 $binding_list->remove ($hb); 1056 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 1057 delete $::CFG->{bindings}->{$mod}->{$sym};
981 }); 1058 });
1059
1060 $hb->add (new CFClient::UI::Button
1061 text => "edit",
1062 tooltip => "Edits the binding",
1063 on_activate => sub {
1064 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1066 sub {
1067 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show;
1073 },
1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show;
1077 });
1078 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide;
1080 });
1081
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 } 1084 }
985 } 1085 }
986 }; 1086 };
987 1087
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1088 my $vb = new CFClient::UI::VBox;
989 title => "Bindings", 1089 $vb->add ($binding_list);
990 def_w => int $WIDTH * 7/8, 1090 $vb->add (my $hb = new CFClient::UI::HBox);
991 def_h => int $HEIGHT * 7/8, 1091
992 on_visibility_change => sub { 1092 $hb->add (new CFClient::UI::Button
993 my ($self, $visible) = @_; 1093 text => "record new",
994 if ($visible) { 1094 expand => 1,
995 $self->center; 1095 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub {
1099 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
996 $refresh->() 1101 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
997 } 1104 },
1105 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1108 });
1109 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show;
1111 },
1112 );
1113
1114 $hb->add (new CFClient::UI::Button
1115 text => "close",
1116 tooltip => "Closes the binding window",
1117 expand => 1,
1118 on_activate => sub {
1119 $SETUP_DIALOG->hide;
998 }; 1120 }
1121 );
999 1122
1000 $BIND_WINDOW->add ($binding_list);
1001 $refresh->(); 1123 $refresh->();
1002 $BIND_WINDOW 1124
1125 $vb
1003} 1126}
1004 1127
1005sub make_help_window { 1128sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame 1129 my $win = new CFClient::UI::FancyFrame
1130 x => 'center',
1131 y => 'center',
1132 name => 'doc_browser',
1007 def_w => int $WIDTH * 7/8, 1133 force_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8, 1134 force_h => int $HEIGHT * 7/8,
1009 title => "Documentation"; 1135 title => "Documentation";
1010 1136
1011 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
1012 1138
1013 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1075 if ($DEBUG_STATUS) { 1201 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1202 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1203 } else {
1078 # create the widgets 1204 # create the widgets
1079 1205
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1206 $DEBUG_STATUS = new CFClient::UI::Label
1207 padding => 0,
1208 z => 100,
1209 force_x => "max",
1210 force_y => 0;
1081 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
1082 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
1084 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1085 1217
1086 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1220 force_x => 0,
1221 force_y => "max",
1089 child => $STATUSBOX, 1222 child => $STATUSBOX,
1090 )->show; 1223 )->show;
1091 1224
1092 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1228 x => 0,
1229 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1096 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1233 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1097 ), 1234 ),
… …
1120 can_hover => 1, 1257 can_hover => 1,
1121 can_events => 1, 1258 can_events => 1,
1122 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1123 ; 1260 ;
1124 1261
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup",
1264 name => "setup_dialog",
1265 x => 'center',
1266 y => 'center',
1267 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6,
1269 ;
1270
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook);
1272
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings."
1283 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press Insert and you will be asked to press a key-combo."
1286 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1290
1125 $BUTTONBAR = new CFClient::UI::HBox; 1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1126 1292
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1294 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1129 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1295
1130 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1131 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1132 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1133 1298
1134 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1299 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1135 1300
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1137 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1138 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1139 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1305 ."You can also hit the Tab-key to show/hide the Inventory.");
1140 1306
1141 $BUTTONBAR->add (new CFClient::UI::Button 1307 $BUTTONBAR->add (new CFClient::UI::Button
1142 text => "Save Config", 1308 text => "Save Config",
1143 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1144 on_activate => sub { 1310 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1311 $::CFG->{layout} = CFClient::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1313 status "Configuration Saved";
1148 }, 1314 },
1149 ); 1315 );
1150 1316
1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1152 tooltip => "View Documentation"); 1318 tooltip => "View Documentation");
1153
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1161 1319
1162 $BUTTONBAR->add (new CFClient::UI::Button 1320 $BUTTONBAR->add (new CFClient::UI::Button
1163 text => "Quit", 1321 text => "Quit",
1164 tooltip => "Terminates the program", 1322 tooltip => "Terminates the program",
1165 on_activate => sub { 1323 on_activate => sub {
… …
1170 } 1328 }
1171 }, 1329 },
1172 ); 1330 );
1173 1331
1174 $BUTTONBAR->show; 1332 $BUTTONBAR->show;
1333 $SETUP_DIALOG->show;
1334 }
1175 1335
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1336 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 }
1180} 1337}
1181 1338
1182sub video_shutdown { 1339sub video_shutdown {
1183 undef $SDL_ACTIVE; 1340 undef $SDL_ACTIVE;
1184} 1341}
… …
1251 1408
1252my %demo;#d# 1409my %demo;#d#
1253 1410
1254sub force_refresh { 1411sub force_refresh {
1255 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1412 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1256 debug sprintf "%3.2f", $fps; 1413 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1414
1258 $CFClient::UI::ROOT->draw; 1415 $CFClient::UI::ROOT->draw;
1259 1416
1260 $WANT_REFRESH = 0; 1417 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1418 $CAN_REFRESH = 0;
… …
1316}; 1473};
1317 1474
1318 CFClient::SDL_GL_SwapBuffers; 1475 CFClient::SDL_GL_SwapBuffers;
1319} 1476}
1320 1477
1321my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1478my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1322 $NOW = time; 1479 $NOW = time;
1323 1480
1324 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1481 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1325 for CFClient::SDL_PollEvent; 1482 for CFClient::SDL_PollEvent;
1326 1483
… …
1393############################################################################# 1550#############################################################################
1394 1551
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1552$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1553
1397{ 1554{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1555 local $SIG{__DIE__} = sub {
1556 return unless defined $^S && !$^S;
1557 Carp::confess $_[1];#d#TODO: remove when stable
1558 CFClient::fatal $_[0];
1559 };
1399 1560
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1562 CFClient::UI::set_layout ($::CFG->{layout});
1402 1563
1403 my %DEF_CFG = ( 1564 my %DEF_CFG = (
1404 sdl_mode => 0, 1565 sdl_mode => 0,
1405 width => 640, 1566 width => 640,
… …
1483 1644
1484END { CFClient::SDL_Quit } 1645END { CFClient::SDL_Quit }
1485 1646
1486=head1 NAME 1647=head1 NAME
1487 1648
1488pclient - A Crossfire+ and Crossfire game client 1649cfplus - A Crossfire+ and Crossfire game client
1489 1650
1490=head1 SYNOPSIS 1651=head1 SYNOPSIS
1491 1652
1492Just run it - no commandline arguments are supported. 1653Just run it - no commandline arguments are supported.
1493 1654
1494=head1 USAGE 1655=head1 USAGE
1495 1656
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1657cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 1658fullscreen and interactively.
1498 1659
1660=head1 DEBUGGING
1661
1662
1663CFPLUS_DEBUG - environment variable
1664
1665 1 draw borders around widgets
1666 2 add low-level widget info to tooltips
1667 4 show fps
1668 8 suppress tooltips
1669
1499=head1 AUTHOR 1670=head1 AUTHOR
1500 1671
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1672Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 1673
1503 1674

Diff Legend

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