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.42 by root, Fri Jun 2 06:22:55 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;
109 113
110sub status { 114sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 115 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 116}
113 117
114sub debug { 118sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 119 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 120}
119 121
120sub start_game { 122sub start_game {
121 status "logging in..."; 123 status "logging in...";
122 124
… …
181 $CONN = 0; # false, does not autovivify 183 $CONN = 0; # false, does not autovivify
182} 184}
183 185
184sub client_setup { 186sub client_setup {
185 my $dialog = new CFClient::UI::FancyFrame 187 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1, 188 x => 1,
187 req_y => $HEIGHT * (1/8), 189 y => $HEIGHT * (1/8),
188 name => "client_setup", 190 name => "client_setup",
189 title => "Client Setup", 191 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 192 child => (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
… …
389 392
390sub make_gauge_window { 393sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 394 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 395
393 my $win = new CFClient::UI::Frame ( 396 my $win = new CFClient::UI::Frame (
394 req_x => 0, 397 force_x => 0,
395 req_y => -1, 398 force_y => "max",
396 def_w => $WIDTH, 399 force_w => $WIDTH,
397 def_h => $gh, 400 force_h => $gh,
398 ); 401 );
399 402
400 $win->add (my $hbox = new CFClient::UI::HBox 403 $win->add (my $hbox = new CFClient::UI::HBox
401 children => [ 404 children => [
402 (new CFClient::UI::HBox expand => 1), 405 (new CFClient::UI::HBox expand => 1),
… …
441} 444}
442 445
443 446
444sub make_stats_window { 447sub make_stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 448 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8), 449 y => $HEIGHT * (2/8),
447 req_x => -1, 450 x => "max",
448 title => "Stats", 451 title => "Stats",
449 name => "stats_window"; 452 name => "stats_window";
450 453
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 454 $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, 455 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 456 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."); 457 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
626 629
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 630 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 631 for keys %tbl;
629} 632}
630 633
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; 634my $METASERVER_ATIME;
642 635
643sub update_metaserver { 636sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 637 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 638 $METASERVER_ATIME = time + 60;
648 639
649 my $table = $METASERVER->{table}; 640 my $table = $METASERVER->{table};
650 $table->clear; 641 $table->clear;
… …
702 693
703 $y++; 694 $y++;
704 695
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 696 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 697 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 698 $HOST_ENTRY->set_text ($CFG->{host} = $host);
699 $METASERVER->toggle_visibility;
708 }), 700 }),
709 (new CFClient::UI::Empty expand => 1), 701 (new CFClient::UI::Empty expand => 1),
710 ]); 702 ]);
711 703
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 704 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 707 }
716 } 708 }
717 }); 709 });
718} 710}
719 711
712sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List",
715 name => 'metaserver_dialog',
716 x => 'center',
717 y => 'center',
718 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub {
720 update_metaserver if $_[1];
721 },
722 ;
723
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog
727}
728
720sub server_setup { 729sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 730 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 731 x => "center",
723 y => $HEIGHT * (1/8), 732 y => "center",
724 name => "server_setup", 733 name => "server_setup",
725 title => "Server Setup", 734 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 735 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub {
728 my ($self, $visible) = @_;
729 $self->center if $visible;
730 },
731 ; 736 ;
732 737
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 738 $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"); 739 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 740
736 { 741 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 742 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 743
739 $vbox->add ( 744 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 745 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 746 expand => 1,
742 text => $CFG->{host}, 747 text => $CFG->{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 748 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 749 on_changed => sub {
745 my ($self, $value) = @_; 750 my ($self, $value) = @_;
… …
747 } 752 }
748 ); 753 );
749 754
750 $METASERVER = metaserver_dialog; 755 $METASERVER = metaserver_dialog;
751 756
752 $vbox->add (new CFClient::UI::Flopper 757 $vbox->add (new CFClient::UI::Button
753 expand => 1, 758 expand => 1,
754 text => "Server List", 759 text => "Server List",
755 other => $METASERVER, 760 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 761 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 762 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST;
759 }
760 ); 763 );
761 } 764 }
762 765
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 766 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 767 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 784 }
782 ); 785 );
783 786
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 787 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 788 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 789 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 790 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 791 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, " 792 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 793 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 794 . "This option is only used once at log-in.",
… …
840 my $window = new CFClient::UI::FancyFrame 843 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 844 name => "message_window",
842 title => "Messages", 845 title => "Messages",
843 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 847 bg => [0, 0, 0, 0.75],
845 req_x => -1, 848 x => "max",
846 req_y => 0, 849 y => 0,
847 def_w => int $::WIDTH / 3, 850 force_w => $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5, 851 force_h => $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox); 852 child => (my $vbox = new CFClient::UI::VBox);
850 853
851 $vbox->add ($LOGVIEW); 854 $vbox->add ($LOGVIEW);
852 855
853 $vbox->add (my $input = new CFClient::UI::Entry 856 $vbox->add (my $input = new CFClient::UI::Entry
… …
868 on_activate => sub { 871 on_activate => sub {
869 my ($input, $text) = @_; 872 my ($input, $text) = @_;
870 $input->set_text (''); 873 $input->set_text ('');
871 874
872 if ($text =~ /^\/bind\s+(.*)$/) { 875 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]); 876 CFClient::Binder::open_binding_dialog (sub {
877 my ($mod, $sym) = @_;
878 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
879 });
874 } elsif ($text =~ /^\/(.*)/) { 880 } elsif ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 881 $::CONN->user_send ($1);
876 } else { 882 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 883 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 884 $::CONN->user_send ("$say_cmd $text");
… …
887 }, 893 },
888 ); 894 );
889 895
890 $CONSOLE = { 896 $CONSOLE = {
891 window => $window, 897 window => $window,
892 input => $input 898 input => $input,
893 }; 899 };
894 900
895 $window 901 $window
896} 902}
897 903
898sub open_quit_dialog { 904sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 905 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 906 $QUIT_DIALOG = new CFClient::UI::FancyFrame
907 x => "center",
908 y => "center",
909 title => "Really Quit?",
910 ;
901 911
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 913
904 $vb->add (new CFClient::UI::Label 914 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 915 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 928 on_activate => sub { exit },
919 ); 929 );
920 } 930 }
921 931
922 $QUIT_DIALOG->show; 932 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center;
924} 933}
925 934
926sub make_inventory_window { 935sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
937 x => "center",
938 y => "center",
928 def_w => $WIDTH * 7/8, 939 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 940 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 941 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 942 ;
937 943
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 944 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 945
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 946 $hb->add (my $vb1 = new CFClient::UI::VBox);
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 947 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 948 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 949
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 950 $hb->add (my $vb2 = new CFClient::UI::VBox);
945 951
946 $vb2->add (my $hb2 = new CFClient::UI::HBox); 952 $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 953
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 954 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
958 955
956 # XXX: Call after $INVR = ... because set_opencont sets the items
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958
959 $invwin 959 $invwin
960}
961
962sub make_spell_list {
963 $SPELL_LIST = new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
960} 967}
961 968
962sub make_binding_window { 969sub make_binding_window {
963 my $binding_list = new CFClient::UI::VBox; 970 my $binding_list = new CFClient::UI::VBox;
964 971
972 my $refresh;
965 my $refresh = sub { 973 $refresh = sub {
966 $binding_list->clear (); 974 $binding_list->clear ();
967 975
968 for my $mod (keys %{$::CFG->{bindings}}) { 976 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 977 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 978 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 979 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 980
973 my $lbl = join "; ", @$cmds; 981 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 982 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 983 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button 984 $hb->add (new CFClient::UI::Button
977 text => "del", 985 text => "delete",
986 tooltip => "Deletes the binding",
978 on_activate => sub { 987 on_activate => sub {
979 $binding_list->remove ($hb); 988 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 989 delete $::CFG->{bindings}->{$mod}->{$sym};
981 }); 990 });
991
992 $hb->add (new CFClient::UI::Button
993 text => "edit",
994 tooltip => "Edits the binding",
995 on_activate => sub {
996 $::BIND_EDITOR->set_binding (
997 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
998 sub {
999 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->();
1003 $::BIND_WINDOW->show;
1004 },
1005 sub {
1006 $::BIND_WINDOW->show;
1007 });
1008 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide;
1010 });
1011
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 } 1014 }
985 } 1015 }
986 }; 1016 };
987 1017
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1018 $BIND_WINDOW = new CFClient::UI::FancyFrame
989 title => "Bindings", 1019 title => "Bindings",
1020 x => "center",
1021 y => "center",
990 def_w => int $WIDTH * 7/8, 1022 def_w => int $WIDTH * 9/10,
991 def_h => int $HEIGHT * 7/8, 1023 def_h => int $HEIGHT * 9/10,
992 on_visibility_change => sub { 1024 on_visibility_change => sub {
993 my ($self, $visible) = @_; 1025 my ($self, $visible) = @_;
994 if ($visible) { 1026 $refresh->() if $visible;
995 $self->center;
996 $refresh->()
997 }
998 }; 1027 };
999 1028
1029 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1000 $BIND_WINDOW->add ($binding_list); 1030 $vb->add ($binding_list);
1031 $vb->add (my $hb = new CFClient::UI::HBox);
1032 $hb->add (new CFClient::UI::Button
1033 text => "record new",
1034 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub {
1039 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->();
1042 $::BIND_WINDOW->show;
1043 },
1044 sub {
1045 $::BIND_WINDOW->show;
1046 });
1047 $::BIND_WINDOW->hide;
1048 $::BIND_EDITOR->show;
1049 },
1050 );
1051 $hb->add (new CFClient::UI::Button
1052 text => "close",
1053 tooltip => "Closes the binding window",
1054 expand => 1,
1055 on_activate => sub {
1056 $::BIND_WINDOW->hide;
1057 }
1058 );
1059
1001 $refresh->(); 1060 $refresh->();
1002 $BIND_WINDOW 1061 $BIND_WINDOW
1003} 1062}
1004 1063
1005sub make_help_window { 1064sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame 1065 my $win = new CFClient::UI::FancyFrame
1066 x => 'center',
1067 y => 'center',
1068 name => 'doc_browser',
1007 def_w => int $WIDTH * 7/8, 1069 force_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8, 1070 force_h => int $HEIGHT * 7/8,
1009 title => "Documentation"; 1071 title => "Documentation";
1010 1072
1011 $win->add (my $vbox = new CFClient::UI::VBox); 1073 $win->add (my $vbox = new CFClient::UI::VBox);
1012 1074
1013 $vbox->add (my $buttons = new CFClient::UI::HBox); 1075 $vbox->add (my $buttons = new CFClient::UI::HBox);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1076 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1075 if ($DEBUG_STATUS) { 1137 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1138 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1139 } else {
1078 # create the widgets 1140 # create the widgets
1079 1141
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1142 $DEBUG_STATUS = new CFClient::UI::Label
1143 padding => 0,
1144 z => 100,
1145 force_x => "max",
1146 force_y => 0;
1081 $DEBUG_STATUS->show; 1147 $DEBUG_STATUS->show;
1082 1148
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1151 $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]); 1152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1085 1153
1086 (new CFClient::UI::Frame 1154 (new CFClient::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1155 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1156 force_x => 0,
1157 force_y => "max",
1089 child => $STATUSBOX, 1158 child => $STATUSBOX,
1090 )->show; 1159 )->show;
1091 1160
1092 CFClient::UI::FancyFrame->new ( 1161 CFClient::UI::FancyFrame->new (
1162 title => "Mini Map",
1163 name => "mapmap",
1164 x => 0,
1165 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1166 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1167 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1168 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.", 1169 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1097 ), 1170 ),
… …
1120 can_hover => 1, 1193 can_hover => 1,
1121 can_events => 1, 1194 can_events => 1,
1122 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1195 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1123 ; 1196 ;
1124 1197
1125 $BUTTONBAR = new CFClient::UI::HBox; 1198 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1126 1199
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1200 $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."); 1201 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, 1202 $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."); 1203 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 1207 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 1208
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1209 $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."); 1210 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, 1211 $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 :)."); 1212 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1213 ."You can also hit the Tab-key to show/hide the Inventory.");
1140 1214
1141 $BUTTONBAR->add (new CFClient::UI::Button 1215 $BUTTONBAR->add (new CFClient::UI::Button
1142 text => "Save Config", 1216 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.", 1217 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 { 1218 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1219 $::CFG->{layout} = CFClient::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1220 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1221 status "Configuration Saved";
1148 }, 1222 },
1149 ); 1223 );
1150 1224
1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1225 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1152 tooltip => "View Documentation"); 1226 tooltip => "View Documentation");
1153 1227
1154 $BUTTONBAR->add (new CFClient::UI::Flopper 1228 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings", 1229 text => "Bindings",
1156 other => make_binding_window, 1230 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder" 1231 tooltip =>
1158 ); 1232 "Lets you define, edit and delete bindings."
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1233 ."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"); 1234 ."with nothing set and the recording started. After doing the actions you "
1235 ."want to record press Insert and you will be asked to press a key-combo."
1236 ."After pressing the combo the binding will be saved automatically and the "
1237 ."binding editor closes");
1238
1239 $BUTTONBAR->add (new CFClient::UI::Flopper
1240 text => "Spells",
1241 other => make_spell_list,
1242 tooltip => "The spell list");
1161 1243
1162 $BUTTONBAR->add (new CFClient::UI::Button 1244 $BUTTONBAR->add (new CFClient::UI::Button
1163 text => "Quit", 1245 text => "Quit",
1164 tooltip => "Terminates the program", 1246 tooltip => "Terminates the program",
1165 on_activate => sub { 1247 on_activate => sub {
… …
1170 } 1252 }
1171 }, 1253 },
1172 ); 1254 );
1173 1255
1174 $BUTTONBAR->show; 1256 $BUTTONBAR->show;
1257 $SERVER_SETUP->show;
1175 1258
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1259 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 } 1260 }
1180} 1261}
1181 1262
1182sub video_shutdown { 1263sub video_shutdown {
1183 undef $SDL_ACTIVE; 1264 undef $SDL_ACTIVE;
… …
1251 1332
1252my %demo;#d# 1333my %demo;#d#
1253 1334
1254sub force_refresh { 1335sub force_refresh {
1255 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1336 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1256 debug sprintf "%3.2f", $fps; 1337 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1338
1258 $CFClient::UI::ROOT->draw; 1339 $CFClient::UI::ROOT->draw;
1259 1340
1260 $WANT_REFRESH = 0; 1341 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1342 $CAN_REFRESH = 0;
… …
1393############################################################################# 1474#############################################################################
1394 1475
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1476$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1477
1397{ 1478{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1479 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1399 1480
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1481 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1482 CFClient::UI::set_layout ($::CFG->{layout});
1402 1483
1403 my %DEF_CFG = ( 1484 my %DEF_CFG = (
1404 sdl_mode => 0, 1485 sdl_mode => 0,
1405 width => 640, 1486 width => 640,
… …
1483 1564
1484END { CFClient::SDL_Quit } 1565END { CFClient::SDL_Quit }
1485 1566
1486=head1 NAME 1567=head1 NAME
1487 1568
1488pclient - A Crossfire+ and Crossfire game client 1569cfplus - A Crossfire+ and Crossfire game client
1489 1570
1490=head1 SYNOPSIS 1571=head1 SYNOPSIS
1491 1572
1492Just run it - no commandline arguments are supported. 1573Just run it - no commandline arguments are supported.
1493 1574
1494=head1 USAGE 1575=head1 USAGE
1495 1576
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1577cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 1578fullscreen and interactively.
1498 1579
1580=head1 DEBUGGING
1581
1582
1583CFPLUS_DEBUG - environment variable
1584
1585 1 draw borders around widgets
1586 2 add low-level widget info to tooltips
1587 4 show fps
1588 8 suppress tooltips
1589
1499=head1 AUTHOR 1590=head1 AUTHOR
1500 1591
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1592Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 1593
1503 1594

Diff Legend

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