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.29 by root, Mon May 29 21:54:16 2006 UTC vs.
Revision 1.45 by elmex, Fri Jun 2 16:52:49 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;
… …
104our $INV; 105our $INV;
105our $INVR; 106our $INVR;
106our $INV_RIGHT_HB; 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
… …
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+(.*)$/) { 876 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]); 877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
874 } elsif ($text =~ /^\/(.*)/) { 881 } elsif ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
876 } else { 883 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
… …
887 }, 894 },
888 ); 895 );
889 896
890 $CONSOLE = { 897 $CONSOLE = {
891 window => $window, 898 window => $window,
892 input => $input 899 input => $input,
893 }; 900 };
894 901
895 $window 902 $window
896} 903}
897 904
898sub open_quit_dialog { 905sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center",
909 y => "center",
910 title => "Really Quit?",
911 ;
901 912
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 913 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 914
904 $vb->add (new CFClient::UI::Label 915 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 916 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 929 on_activate => sub { exit },
919 ); 930 );
920 } 931 }
921 932
922 $QUIT_DIALOG->show; 933 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 934}
935
936sub make_pickup_cfg_window {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 title => "Autopickup configuration",
939 x => "center",
940 y => "center",
941 force_w => $WIDTH * 6/10,
942 force_h => $HEIGHT * 9/10;
943
944
945 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
946 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
947 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
948 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
949 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
950
951 my $tbl = 0;
952 my $tblrow = 0;
953
954 for (
955 ["General", $gen_tbl],
956 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
957 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
958 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
959 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
960 ["Weapons", $ltbl],
961 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
962 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
963 ["Bows" => CFClient::Pickup::PU_BOW],
964 ["Arrows" => CFClient::Pickup::PU_ARROW],
965 ["Armour"],
966 ["Helmets" => CFClient::Pickup::PU_HELMET],
967 ["Shields" => CFClient::Pickup::PU_SHIELD],
968 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
969 ["Boots" => CFClient::Pickup::PU_BOOTS],
970 ["Gloves" => CFClient::Pickup::PU_GLOVES],
971 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
972 ["Readables", $rtbl],
973 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
974 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
975 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
976 ["Misc"],
977 ["Food" => CFClient::Pickup::PU_FOOD],
978 ["Drinks" => CFClient::Pickup::PU_DRINK],
979 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
980 ["Keys" => CFClient::Pickup::PU_KEY],
981 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
982 ["Potions" => CFClient::Pickup::PU_POTION],
983 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
984 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
985 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
986 )
987 {
988 if (ref $_->[1]) {
989 $tbl = $_->[1];
990 $tblrow = 0;
991 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
992 } elsif (not defined $_->[1]) {
993 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
994 } else {
995 my $mask = $_->[1];
996 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
997 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
998 state => $CFG->{pickup} & $mask,
999 on_changed => sub {
1000 my ($box, $value) = @_;
1001 if ($value) {
1002 $::CFG->{pickup} |= $mask;
1003 } else {
1004 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1005 }
1006 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1007 if defined $::CONN;
1008 });
1009 }
1010 }
1011
1012 $PICKUP_CFG
924} 1013}
925 1014
926sub make_inventory_window { 1015sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1016 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1017 x => "center",
1018 y => "center",
928 def_w => $WIDTH * 7/8, 1019 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 1020 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1021 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 1022 ;
937 1023
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1024 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1025
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1026 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1037 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 1038
953 $invwin 1039 $invwin
954} 1040}
955 1041
1042sub make_spell_list {
1043 $SPELL_LIST = new CFClient::UI::SpellList
1044 force_w => $WIDTH * (9/10),
1045 force_h => $HEIGHT * (9/10);
1046 $SPELL_LIST
1047}
1048
956sub make_binding_window { 1049sub make_binding_window {
957 my $binding_list = new CFClient::UI::VBox; 1050 my $binding_list = new CFClient::UI::VBox;
958 1051
1052 my $refresh;
959 my $refresh = sub { 1053 $refresh = sub {
960 $binding_list->clear (); 1054 $binding_list->clear ();
961 1055
962 for my $mod (keys %{$::CFG->{bindings}}) { 1056 for my $mod (keys %{$::CFG->{bindings}}) {
963 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1057 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
964 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1058 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
965 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1059 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966 1060
967 my $lbl = join "; ", @$cmds; 1061 my $lbl = join "; ", @$cmds;
968 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1062 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
969 $binding_list->add (my $hb = new CFClient::UI::HBox); 1063 $binding_list->add (my $hb = new CFClient::UI::HBox);
970 $hb->add (new CFClient::UI::Button 1064 $hb->add (new CFClient::UI::Button
971 text => "delete", 1065 text => "delete",
1066 tooltip => "Deletes the binding",
972 on_activate => sub { 1067 on_activate => sub {
973 $binding_list->remove ($hb); 1068 $binding_list->remove ($hb);
974 delete $::CFG->{bindings}->{$mod}->{$sym}; 1069 delete $::CFG->{bindings}->{$mod}->{$sym};
975 }); 1070 });
1071
1072 $hb->add (new CFClient::UI::Button
1073 text => "edit",
1074 tooltip => "Edits the binding",
1075 on_activate => sub {
1076 $::BIND_EDITOR->set_binding (
1077 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1078 sub {
1079 my ($nmod, $nsym, $ncmds) = @_;
1080 delete $::CFG->{bindings}->{$mod}->{$sym};
1081 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1082 $refresh->();
1083 $::BIND_WINDOW->show;
1084 },
1085 sub {
1086 $::BIND_WINDOW->show;
1087 });
1088 $::BIND_EDITOR->show;
1089 $::BIND_WINDOW->hide;
1090 });
1091
976 $hb->add (new CFClient::UI::Label text => "($nam)"); 1092 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
977 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1093 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
978 } 1094 }
979 } 1095 }
980 }; 1096 };
981 1097
982 $BIND_WINDOW = new CFClient::UI::FancyFrame 1098 $BIND_WINDOW = new CFClient::UI::FancyFrame
983 title => "Bindings", 1099 title => "Bindings",
1100 x => "center",
1101 y => "center",
984 def_w => int $WIDTH * 7/8, 1102 def_w => int $WIDTH * 9/10,
985 def_h => int $HEIGHT * 7/8, 1103 def_h => int $HEIGHT * 9/10,
986 on_visibility_change => sub { 1104 on_visibility_change => sub {
987 my ($self, $visible) = @_; 1105 my ($self, $visible) = @_;
988 if ($visible) { 1106 $refresh->() if $visible;
989 $self->center;
990 $refresh->()
991 }
992 }; 1107 };
993 1108
1109 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
994 $BIND_WINDOW->add ($binding_list); 1110 $vb->add ($binding_list);
1111 $vb->add (my $hb = new CFClient::UI::HBox);
1112 $hb->add (new CFClient::UI::Button
1113 text => "record new",
1114 expand => 1,
1115 tooltip => "This button opens the binding editor with an empty binding.",
1116 on_activate => sub {
1117 $::BIND_EDITOR->set_binding (undef, undef, [],
1118 sub {
1119 my ($mod, $sym, $cmds) = @_;
1120 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1121 $refresh->();
1122 $::BIND_WINDOW->show;
1123 },
1124 sub {
1125 $::BIND_WINDOW->show;
1126 });
1127 $::BIND_WINDOW->hide;
1128 $::BIND_EDITOR->show;
1129 },
1130 );
1131 $hb->add (new CFClient::UI::Button
1132 text => "close",
1133 tooltip => "Closes the binding window",
1134 expand => 1,
1135 on_activate => sub {
1136 $::BIND_WINDOW->hide;
1137 }
1138 );
1139
995 $refresh->(); 1140 $refresh->();
996 $BIND_WINDOW 1141 $BIND_WINDOW
997} 1142}
998 1143
999sub make_help_window { 1144sub make_help_window {
1000 my $win = new CFClient::UI::FancyFrame 1145 my $win = new CFClient::UI::FancyFrame
1146 x => 'center',
1147 y => 'center',
1148 name => 'doc_browser',
1001 def_w => int $WIDTH * 7/8, 1149 force_w => int $WIDTH * 7/8,
1002 def_h => int $HEIGHT * 7/8, 1150 force_h => int $HEIGHT * 7/8,
1003 title => "Documentation"; 1151 title => "Documentation";
1004 1152
1005 $win->add (my $vbox = new CFClient::UI::VBox); 1153 $win->add (my $vbox = new CFClient::UI::VBox);
1006 1154
1007 $vbox->add (my $buttons = new CFClient::UI::HBox); 1155 $vbox->add (my $buttons = new CFClient::UI::HBox);
1008 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1156 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1069 if ($DEBUG_STATUS) { 1217 if ($DEBUG_STATUS) {
1070 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1218 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1071 } else { 1219 } else {
1072 # create the widgets 1220 # create the widgets
1073 1221
1074 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1222 $DEBUG_STATUS = new CFClient::UI::Label
1223 padding => 0,
1224 z => 100,
1225 force_x => "max",
1226 force_y => 0;
1075 $DEBUG_STATUS->show; 1227 $DEBUG_STATUS->show;
1076 1228
1229 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1230
1077 $STATUSBOX = new CFClient::UI::Statusbox; 1231 $STATUSBOX = new CFClient::UI::Statusbox;
1078 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1232 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1079 1233
1080 (new CFClient::UI::Frame 1234 (new CFClient::UI::Frame
1081 bg => [0, 0, 0, 0.4], 1235 bg => [0, 0, 0, 0.4],
1082 req_y => -1, 1236 force_x => 0,
1237 force_y => "max",
1083 child => $STATUSBOX, 1238 child => $STATUSBOX,
1084 )->show; 1239 )->show;
1085 1240
1086 CFClient::UI::FancyFrame->new ( 1241 CFClient::UI::FancyFrame->new (
1242 title => "Mini Map",
1243 name => "mapmap",
1244 x => 0,
1245 y => $FONTSIZE + 8,
1087 border_bg => [1, 1, 1, 192/255], 1246 border_bg => [1, 1, 1, 192/255],
1088 bg => [1, 1, 1, 0], 1247 bg => [1, 1, 1, 0],
1089 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1248 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1090 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1249 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1091 ), 1250 ),
… …
1114 can_hover => 1, 1273 can_hover => 1,
1115 can_events => 1, 1274 can_events => 1,
1116 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1275 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1117 ; 1276 ;
1118 1277
1119 $BUTTONBAR = new CFClient::UI::HBox; 1278 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1120 1279
1121 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1280 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1122 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1281 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1282 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1124 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1283 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1128 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 1287 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
1129 1288
1130 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1289 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1131 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1290 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1133 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1292 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1293 ."You can also hit the Tab-key to show/hide the Inventory.");
1134 1294
1135 $BUTTONBAR->add (new CFClient::UI::Button 1295 $BUTTONBAR->add (new CFClient::UI::Button
1136 text => "Save Config", 1296 text => "Save Config",
1137 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1297 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1138 on_activate => sub { 1298 on_activate => sub {
… …
1146 tooltip => "View Documentation"); 1306 tooltip => "View Documentation");
1147 1307
1148 $BUTTONBAR->add (new CFClient::UI::Flopper 1308 $BUTTONBAR->add (new CFClient::UI::Flopper
1149 text => "Bindings", 1309 text => "Bindings",
1150 other => make_binding_window, 1310 other => make_binding_window,
1151 tooltip => "Lets you delete bindings you have made with the recorder" 1311 tooltip =>
1152 ); 1312 "Lets you define, edit and delete bindings."
1153 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1313 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1154 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys"); 1314 ."with nothing set and the recording started. After doing the actions you "
1315 ."want to record press Insert and you will be asked to press a key-combo."
1316 ."After pressing the combo the binding will be saved automatically and the "
1317 ."binding editor closes");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Spells",
1321 other => make_spell_list,
1322 tooltip => "The spell list");
1323
1324 $BUTTONBAR->add (new CFClient::UI::Flopper
1325 text => "Pickup",
1326 other => make_pickup_cfg_window,
1327 tooltip => "The pickup dialog");
1328
1155 1329
1156 $BUTTONBAR->add (new CFClient::UI::Button 1330 $BUTTONBAR->add (new CFClient::UI::Button
1157 text => "Quit", 1331 text => "Quit",
1158 tooltip => "Terminates the program", 1332 tooltip => "Terminates the program",
1159 on_activate => sub { 1333 on_activate => sub {
… …
1164 } 1338 }
1165 }, 1339 },
1166 ); 1340 );
1167 1341
1168 $BUTTONBAR->show; 1342 $BUTTONBAR->show;
1343 $SERVER_SETUP->show;
1169 1344
1170 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1345 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1171
1172 $SERVER_SETUP->show;
1173 } 1346 }
1174} 1347}
1175 1348
1176sub video_shutdown { 1349sub video_shutdown {
1177 undef $SDL_ACTIVE; 1350 undef $SDL_ACTIVE;
… …
1245 1418
1246my %demo;#d# 1419my %demo;#d#
1247 1420
1248sub force_refresh { 1421sub force_refresh {
1249 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1422 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1250 debug sprintf "%3.2f", $fps; 1423 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1251 1424
1252 $CFClient::UI::ROOT->draw; 1425 $CFClient::UI::ROOT->draw;
1253 1426
1254 $WANT_REFRESH = 0; 1427 $WANT_REFRESH = 0;
1255 $CAN_REFRESH = 0; 1428 $CAN_REFRESH = 0;
… …
1488=head1 USAGE 1661=head1 USAGE
1489 1662
1490cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1663cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1491fullscreen and interactively. 1664fullscreen and interactively.
1492 1665
1666=head1 DEBUGGING
1667
1668
1669CFPLUS_DEBUG - environment variable
1670
1671 1 draw borders around widgets
1672 2 add low-level widget info to tooltips
1673 4 show fps
1674 8 suppress tooltips
1675
1493=head1 AUTHOR 1676=head1 AUTHOR
1494 1677
1495Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1678Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1496 1679
1497 1680

Diff Legend

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