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.46 by elmex, Fri Jun 2 18:46:16 2006 UTC

… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
86our $SERVER_SETUP; 87our $SERVER_SETUP;
87 88
88our $FLOORBOX; 89our $FLOORBOX;
89our $GAUGES; 90our $GAUGES;
90our $STATWIDS; 91our $STATWIDS;
… …
101our $DEBUG_STATUS; 102our $DEBUG_STATUS;
102 103
103our $INV_WINDOW; 104our $INV_WINDOW;
104our $INV; 105our $INV;
105our $INVR; 106our $INVR;
106our $INVR_LBL; 107our $INV_RIGHT_HB;
107 108
108our $BIND_WINDOW; 109our $BIND_WINDOW;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
113our $PICKUP_CFG;
109 114
110sub status { 115sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 117}
113 118
114sub debug { 119sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 120 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 121}
119 122
120sub start_game { 123sub start_game {
121 status "logging in..."; 124 status "logging in...";
122 125
… …
181 $CONN = 0; # false, does not autovivify 184 $CONN = 0; # false, does not autovivify
182} 185}
183 186
184sub client_setup { 187sub client_setup {
185 my $dialog = new CFClient::UI::FancyFrame 188 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1, 189 x => 1,
187 req_y => $HEIGHT * (1/8), 190 y => $HEIGHT * (1/8),
188 name => "client_setup", 191 name => "client_setup",
189 title => "Client Setup", 192 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 193 child => (my $vbox = new CFClient::UI::VBox);
194
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
192 196
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 197 $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); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
195 199
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 200 $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"); 201 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
198 202
199 $mode_slider->connect (changed => sub { 203 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 204 my ($self, $value) = @_;
201 205
… …
389 393
390sub make_gauge_window { 394sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 395 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 396
393 my $win = new CFClient::UI::Frame ( 397 my $win = new CFClient::UI::Frame (
394 req_x => 0, 398 force_x => 0,
395 req_y => -1, 399 force_y => "max",
396 def_w => $WIDTH, 400 force_w => $WIDTH,
397 def_h => $gh, 401 force_h => $gh,
398 ); 402 );
399 403
400 $win->add (my $hbox = new CFClient::UI::HBox 404 $win->add (my $hbox = new CFClient::UI::HBox
401 children => [ 405 children => [
402 (new CFClient::UI::HBox expand => 1), 406 (new CFClient::UI::HBox expand => 1),
… …
441} 445}
442 446
443 447
444sub make_stats_window { 448sub make_stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 449 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8), 450 y => $HEIGHT * (2/8),
447 req_x => -1, 451 x => "max",
448 title => "Stats", 452 title => "Stats",
449 name => "stats_window"; 453 name => "stats_window";
450 454
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 455 $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, 456 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 457 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."); 458 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
626 630
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 632 for keys %tbl;
629} 633}
630 634
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; 635my $METASERVER_ATIME;
642 636
643sub update_metaserver { 637sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 638 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 639 $METASERVER_ATIME = time + 60;
648 640
649 my $table = $METASERVER->{table}; 641 my $table = $METASERVER->{table};
650 $table->clear; 642 $table->clear;
… …
702 694
703 $y++; 695 $y++;
704 696
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 697 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 698 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 699 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility;
708 }), 701 }),
709 (new CFClient::UI::Empty expand => 1), 702 (new CFClient::UI::Empty expand => 1),
710 ]); 703 ]);
711 704
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 705 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 708 }
716 } 709 }
717 }); 710 });
718} 711}
719 712
713sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List",
716 name => 'metaserver_dialog',
717 x => 'center',
718 y => 'center',
719 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub {
721 update_metaserver if $_[1];
722 },
723 ;
724
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
726
727 $dialog
728}
729
720sub server_setup { 730sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 732 x => "center",
723 y => $HEIGHT * (1/8), 733 y => "center",
724 name => "server_setup", 734 name => "server_setup",
725 title => "Server Setup", 735 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 736 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub {
728 my ($self, $visible) = @_;
729 $self->center if $visible;
730 },
731 ; 737 ;
732 738
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 739 $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"); 740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 741
736 { 742 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 744
739 $vbox->add ( 745 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 746 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 747 expand => 1,
742 text => $CFG->{host}, 748 text => $CFG->{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 749 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 750 on_changed => sub {
745 my ($self, $value) = @_; 751 my ($self, $value) = @_;
… …
747 } 753 }
748 ); 754 );
749 755
750 $METASERVER = metaserver_dialog; 756 $METASERVER = metaserver_dialog;
751 757
752 $vbox->add (new CFClient::UI::Flopper 758 $vbox->add (new CFClient::UI::Button
753 expand => 1, 759 expand => 1,
754 text => "Server List", 760 text => "Server List",
755 other => $METASERVER, 761 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 762 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 763 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST;
759 }
760 ); 764 );
761 } 765 }
762 766
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 768 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 785 }
782 ); 786 );
783 787
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 788 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 789 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 790 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 791 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 792 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, " 793 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 794 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 795 . "This option is only used once at log-in.",
… …
840 my $window = new CFClient::UI::FancyFrame 844 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 845 name => "message_window",
842 title => "Messages", 846 title => "Messages",
843 border_bg => [1, 1, 1, 1], 847 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 848 bg => [0, 0, 0, 0.75],
845 req_x => -1, 849 x => "max",
846 req_y => 0, 850 y => 0,
847 def_w => int $::WIDTH / 3, 851 force_w => $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5, 852 force_h => $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox); 853 child => (my $vbox = new CFClient::UI::VBox);
850 854
851 $vbox->add ($LOGVIEW); 855 $vbox->add ($LOGVIEW);
852 856
853 $vbox->add (my $input = new CFClient::UI::Entry 857 $vbox->add (my $input = new CFClient::UI::Entry
… …
867 }, 871 },
868 on_activate => sub { 872 on_activate => sub {
869 my ($input, $text) = @_; 873 my ($input, $text) = @_;
870 $input->set_text (''); 874 $input->set_text ('');
871 875
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 876 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 877 $::CONN->user_send ($1);
876 } else { 878 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 879 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 880 $::CONN->user_send ("$say_cmd $text");
879 } 881 }
… …
887 }, 889 },
888 ); 890 );
889 891
890 $CONSOLE = { 892 $CONSOLE = {
891 window => $window, 893 window => $window,
892 input => $input 894 input => $input,
893 }; 895 };
894 896
895 $window 897 $window
896} 898}
897 899
898sub open_quit_dialog { 900sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 901 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 902 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center",
904 y => "center",
905 title => "Really Quit?",
906 ;
901 907
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 909
904 $vb->add (new CFClient::UI::Label 910 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 911 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 924 on_activate => sub { exit },
919 ); 925 );
920 } 926 }
921 927
922 $QUIT_DIALOG->show; 928 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 929}
930
931sub make_pickup_cfg_window {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame
933 title => "Autopickup configuration",
934 x => "center",
935 y => "center",
936 force_w => $WIDTH * 6/10,
937 force_h => $HEIGHT * 9/10;
938
939
940 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
941 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
942 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
943 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
944 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
945
946 my $tbl = 0;
947 my $tblrow = 0;
948
949 for (
950 ["General", $gen_tbl],
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
955 ["Weapons", $ltbl],
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW],
960 ["Armour"],
961 ["Helmets" => CFClient::Pickup::PU_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
967 ["Readables", $rtbl],
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
971 ["Misc"],
972 ["Food" => CFClient::Pickup::PU_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
981 )
982 {
983 if (ref $_->[1]) {
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
987 } elsif (not defined $_->[1]) {
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
989 } else {
990 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask,
994 on_changed => sub {
995 my ($box, $value) = @_;
996 if ($value) {
997 $::CFG->{pickup} |= $mask;
998 } else {
999 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1000 }
1001 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1002 if defined $::CONN;
1003 });
1004 }
1005 }
1006
1007 $PICKUP_CFG
924} 1008}
925 1009
926sub make_inventory_window { 1010sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1012 x => "center",
1013 y => "center",
928 def_w => $WIDTH * 7/8, 1014 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 1015 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1016 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 1017 ;
937 1018
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1019 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1020
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1021 $hb->add (my $vb1 = new CFClient::UI::VBox);
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1022 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1023 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 1024
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 1025 $hb->add (my $vb2 = new CFClient::UI::VBox);
945 1026
946 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1027 $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 1028
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1029 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
958 1030
1031 # XXX: Call after $INVR = ... because set_opencont sets the items
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033
959 $invwin 1034 $invwin
1035}
1036
1037sub make_spell_list {
1038 $SPELL_LIST = new CFClient::UI::SpellList
1039 force_w => $WIDTH * (9/10),
1040 force_h => $HEIGHT * (9/10);
1041 $SPELL_LIST
960} 1042}
961 1043
962sub make_binding_window { 1044sub make_binding_window {
963 my $binding_list = new CFClient::UI::VBox; 1045 my $binding_list = new CFClient::UI::VBox;
964 1046
1047 my $refresh;
965 my $refresh = sub { 1048 $refresh = sub {
966 $binding_list->clear (); 1049 $binding_list->clear ();
967 1050
968 for my $mod (keys %{$::CFG->{bindings}}) { 1051 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1052 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1053 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1054 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 1055
973 my $lbl = join "; ", @$cmds; 1056 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1057 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 1058 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button 1059 $hb->add (new CFClient::UI::Button
977 text => "del", 1060 text => "delete",
1061 tooltip => "Deletes the binding",
978 on_activate => sub { 1062 on_activate => sub {
979 $binding_list->remove ($hb); 1063 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 1064 delete $::CFG->{bindings}->{$mod}->{$sym};
981 }); 1065 });
1066
1067 $hb->add (new CFClient::UI::Button
1068 text => "edit",
1069 tooltip => "Edits the binding",
1070 on_activate => sub {
1071 $::BIND_EDITOR->set_binding (
1072 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1073 sub {
1074 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym};
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1077 $refresh->();
1078 $::BIND_WINDOW->show;
1079 },
1080 sub {
1081 $::BIND_WINDOW->show;
1082 });
1083 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide;
1085 });
1086
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 } 1089 }
985 } 1090 }
986 }; 1091 };
987 1092
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1093 $BIND_WINDOW = new CFClient::UI::FancyFrame
989 title => "Bindings", 1094 title => "Bindings",
1095 x => "center",
1096 y => "center",
990 def_w => int $WIDTH * 7/8, 1097 def_w => int $WIDTH * 9/10,
991 def_h => int $HEIGHT * 7/8, 1098 def_h => int $HEIGHT * 9/10,
992 on_visibility_change => sub { 1099 on_visibility_change => sub {
993 my ($self, $visible) = @_; 1100 my ($self, $visible) = @_;
994 if ($visible) { 1101 $refresh->() if $visible;
995 $self->center;
996 $refresh->()
997 }
998 }; 1102 };
999 1103
1104 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1000 $BIND_WINDOW->add ($binding_list); 1105 $vb->add ($binding_list);
1106 $vb->add (my $hb = new CFClient::UI::HBox);
1107 $hb->add (new CFClient::UI::Button
1108 text => "record new",
1109 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.",
1111 on_activate => sub {
1112 $::BIND_EDITOR->set_binding (undef, undef, [],
1113 sub {
1114 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1116 $refresh->();
1117 $::BIND_WINDOW->show;
1118 },
1119 sub {
1120 $::BIND_WINDOW->show;
1121 });
1122 $::BIND_WINDOW->hide;
1123 $::BIND_EDITOR->show;
1124 },
1125 );
1126 $hb->add (new CFClient::UI::Button
1127 text => "close",
1128 tooltip => "Closes the binding window",
1129 expand => 1,
1130 on_activate => sub {
1131 $::BIND_WINDOW->hide;
1132 }
1133 );
1134
1001 $refresh->(); 1135 $refresh->();
1002 $BIND_WINDOW 1136 $BIND_WINDOW
1003} 1137}
1004 1138
1005sub make_help_window { 1139sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame 1140 my $win = new CFClient::UI::FancyFrame
1141 x => 'center',
1142 y => 'center',
1143 name => 'doc_browser',
1007 def_w => int $WIDTH * 7/8, 1144 force_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8, 1145 force_h => int $HEIGHT * 7/8,
1009 title => "Documentation"; 1146 title => "Documentation";
1010 1147
1011 $win->add (my $vbox = new CFClient::UI::VBox); 1148 $win->add (my $vbox = new CFClient::UI::VBox);
1012 1149
1013 $vbox->add (my $buttons = new CFClient::UI::HBox); 1150 $vbox->add (my $buttons = new CFClient::UI::HBox);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1151 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1075 if ($DEBUG_STATUS) { 1212 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1213 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1214 } else {
1078 # create the widgets 1215 # create the widgets
1079 1216
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1217 $DEBUG_STATUS = new CFClient::UI::Label
1218 padding => 0,
1219 z => 100,
1220 force_x => "max",
1221 force_y => 0;
1081 $DEBUG_STATUS->show; 1222 $DEBUG_STATUS->show;
1082 1223
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1225
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1226 $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]); 1227 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1085 1228
1086 (new CFClient::UI::Frame 1229 (new CFClient::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1230 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1231 force_x => 0,
1232 force_y => "max",
1089 child => $STATUSBOX, 1233 child => $STATUSBOX,
1090 )->show; 1234 )->show;
1091 1235
1092 CFClient::UI::FancyFrame->new ( 1236 CFClient::UI::FancyFrame->new (
1237 title => "Mini Map",
1238 name => "mapmap",
1239 x => 0,
1240 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1241 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1242 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1243 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.", 1244 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1097 ), 1245 ),
… …
1120 can_hover => 1, 1268 can_hover => 1,
1121 can_events => 1, 1269 can_events => 1,
1122 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1270 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1123 ; 1271 ;
1124 1272
1125 $BUTTONBAR = new CFClient::UI::HBox; 1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1126 1274
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1276 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1129 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1130 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1278 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
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 1282 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 1283
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1284 $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."); 1285 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, 1286 $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 :)."); 1287 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1288 ."You can also hit the Tab-key to show/hide the Inventory.");
1140 1289
1141 $BUTTONBAR->add (new CFClient::UI::Button 1290 $BUTTONBAR->add (new CFClient::UI::Button
1142 text => "Save Config", 1291 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.", 1292 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 { 1293 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1294 $::CFG->{layout} = CFClient::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1295 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1296 status "Configuration Saved";
1148 }, 1297 },
1149 ); 1298 );
1150 1299
1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1152 tooltip => "View Documentation"); 1301 tooltip => "View Documentation");
1153 1302
1154 $BUTTONBAR->add (new CFClient::UI::Flopper 1303 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings", 1304 text => "Bindings",
1156 other => make_binding_window, 1305 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder" 1306 tooltip =>
1158 ); 1307 "Lets you define, edit and delete bindings."
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1308 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys"); 1309 ."with nothing set and the recording started. After doing the actions you "
1310 ."want to record press Insert and you will be asked to press a key-combo."
1311 ."After pressing the combo the binding will be saved automatically and the "
1312 ."binding editor closes");
1313
1314 $BUTTONBAR->add (new CFClient::UI::Flopper
1315 text => "Spells",
1316 other => make_spell_list,
1317 tooltip => "The spell list");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Pickup",
1321 other => make_pickup_cfg_window,
1322 tooltip => "The pickup dialog");
1323
1161 1324
1162 $BUTTONBAR->add (new CFClient::UI::Button 1325 $BUTTONBAR->add (new CFClient::UI::Button
1163 text => "Quit", 1326 text => "Quit",
1164 tooltip => "Terminates the program", 1327 tooltip => "Terminates the program",
1165 on_activate => sub { 1328 on_activate => sub {
… …
1170 } 1333 }
1171 }, 1334 },
1172 ); 1335 );
1173 1336
1174 $BUTTONBAR->show; 1337 $BUTTONBAR->show;
1338 $SERVER_SETUP->show;
1175 1339
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 } 1341 }
1180} 1342}
1181 1343
1182sub video_shutdown { 1344sub video_shutdown {
1183 undef $SDL_ACTIVE; 1345 undef $SDL_ACTIVE;
… …
1251 1413
1252my %demo;#d# 1414my %demo;#d#
1253 1415
1254sub force_refresh { 1416sub force_refresh {
1255 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1417 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1256 debug sprintf "%3.2f", $fps; 1418 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1419
1258 $CFClient::UI::ROOT->draw; 1420 $CFClient::UI::ROOT->draw;
1259 1421
1260 $WANT_REFRESH = 0; 1422 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1423 $CAN_REFRESH = 0;
… …
1393############################################################################# 1555#############################################################################
1394 1556
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1557$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1558
1397{ 1559{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1560 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1399 1561
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1563 CFClient::UI::set_layout ($::CFG->{layout});
1402 1564
1403 my %DEF_CFG = ( 1565 my %DEF_CFG = (
1404 sdl_mode => 0, 1566 sdl_mode => 0,
1405 width => 640, 1567 width => 640,
… …
1483 1645
1484END { CFClient::SDL_Quit } 1646END { CFClient::SDL_Quit }
1485 1647
1486=head1 NAME 1648=head1 NAME
1487 1649
1488pclient - A Crossfire+ and Crossfire game client 1650cfplus - A Crossfire+ and Crossfire game client
1489 1651
1490=head1 SYNOPSIS 1652=head1 SYNOPSIS
1491 1653
1492Just run it - no commandline arguments are supported. 1654Just run it - no commandline arguments are supported.
1493 1655
1494=head1 USAGE 1656=head1 USAGE
1495 1657
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1658cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 1659fullscreen and interactively.
1498 1660
1661=head1 DEBUGGING
1662
1663
1664CFPLUS_DEBUG - environment variable
1665
1666 1 draw borders around widgets
1667 2 add low-level widget info to tooltips
1668 4 show fps
1669 8 suppress tooltips
1670
1499=head1 AUTHOR 1671=head1 AUTHOR
1500 1672
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1673Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 1674
1503 1675

Diff Legend

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