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.40 by root, Fri Jun 2 02:12:04 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;
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 x => 'center',
716 y => 'center',
717 child => (my $vbox = new CFClient::UI::VBox),
718 on_visibility_change => sub {
719 update_metaserver if $_[1];
720 },
721 ;
722
723 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
724
725 $dialog
726}
727
720sub server_setup { 728sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 729 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 730 x => "center",
723 y => $HEIGHT * (1/8), 731 y => "center",
724 name => "server_setup", 732 name => "server_setup",
725 title => "Server Setup", 733 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 734 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub {
728 my ($self, $visible) = @_;
729 $self->center if $visible;
730 },
731 ; 735 ;
732 736
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 737 $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"); 738 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 739
736 { 740 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 741 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 742
739 $vbox->add ( 743 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 744 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 745 expand => 1,
742 text => $CFG->{host}, 746 text => $CFG->{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 747 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 748 on_changed => sub {
745 my ($self, $value) = @_; 749 my ($self, $value) = @_;
… …
747 } 751 }
748 ); 752 );
749 753
750 $METASERVER = metaserver_dialog; 754 $METASERVER = metaserver_dialog;
751 755
752 $vbox->add (new CFClient::UI::Flopper 756 $vbox->add (new CFClient::UI::Button
753 expand => 1, 757 expand => 1,
754 text => "Server List", 758 text => "Server List",
755 other => $METASERVER, 759 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 760 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 761 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST;
759 }
760 ); 762 );
761 } 763 }
762 764
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 765 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 766 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 783 }
782 ); 784 );
783 785
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 786 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 787 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 788 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 789 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 790 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, " 791 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 792 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 793 . "This option is only used once at log-in.",
… …
840 my $window = new CFClient::UI::FancyFrame 842 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 843 name => "message_window",
842 title => "Messages", 844 title => "Messages",
843 border_bg => [1, 1, 1, 1], 845 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 846 bg => [0, 0, 0, 0.75],
845 req_x => -1, 847 x => "max",
846 req_y => 0, 848 y => 0,
847 def_w => int $::WIDTH / 3, 849 force_w => $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5, 850 force_h => $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox); 851 child => (my $vbox = new CFClient::UI::VBox);
850 852
851 $vbox->add ($LOGVIEW); 853 $vbox->add ($LOGVIEW);
852 854
853 $vbox->add (my $input = new CFClient::UI::Entry 855 $vbox->add (my $input = new CFClient::UI::Entry
… …
868 on_activate => sub { 870 on_activate => sub {
869 my ($input, $text) = @_; 871 my ($input, $text) = @_;
870 $input->set_text (''); 872 $input->set_text ('');
871 873
872 if ($text =~ /^\/bind\s+(.*)$/) { 874 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]); 875 CFClient::Binder::open_binding_dialog (sub {
876 my ($mod, $sym) = @_;
877 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
878 });
874 } elsif ($text =~ /^\/(.*)/) { 879 } elsif ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
876 } else { 881 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 882 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 883 $::CONN->user_send ("$say_cmd $text");
… …
887 }, 892 },
888 ); 893 );
889 894
890 $CONSOLE = { 895 $CONSOLE = {
891 window => $window, 896 window => $window,
892 input => $input 897 input => $input,
893 }; 898 };
894 899
895 $window 900 $window
896} 901}
897 902
898sub open_quit_dialog { 903sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 title => "Really Quit?",
909 ;
901 910
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 912
904 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 927 on_activate => sub { exit },
919 ); 928 );
920 } 929 }
921 930
922 $QUIT_DIALOG->show; 931 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center;
924} 932}
925 933
926sub make_inventory_window { 934sub make_inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 935 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
936 x => "center",
937 y => "center",
928 def_w => $WIDTH * 7/8, 938 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 939 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 940 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 941 ;
937 942
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 943 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 944
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 945 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 956 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 957
953 $invwin 958 $invwin
954} 959}
955 960
961sub make_spell_list {
962 $SPELL_LIST = new CFClient::UI::SpellList
963 force_w => $WIDTH * (9/10),
964 force_h => $HEIGHT * (9/10);
965 $SPELL_LIST
966}
967
956sub make_binding_window { 968sub make_binding_window {
957 my $binding_list = new CFClient::UI::VBox; 969 my $binding_list = new CFClient::UI::VBox;
958 970
971 my $refresh;
959 my $refresh = sub { 972 $refresh = sub {
960 $binding_list->clear (); 973 $binding_list->clear ();
961 974
962 for my $mod (keys %{$::CFG->{bindings}}) { 975 for my $mod (keys %{$::CFG->{bindings}}) {
963 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 976 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
964 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 977 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
965 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 978 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966 979
967 my $lbl = join "; ", @$cmds; 980 my $lbl = join "; ", @$cmds;
968 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 981 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
969 $binding_list->add (my $hb = new CFClient::UI::HBox); 982 $binding_list->add (my $hb = new CFClient::UI::HBox);
970 $hb->add (new CFClient::UI::Button 983 $hb->add (new CFClient::UI::Button
971 text => "delete", 984 text => "delete",
985 tooltip => "Deletes the binding",
972 on_activate => sub { 986 on_activate => sub {
973 $binding_list->remove ($hb); 987 $binding_list->remove ($hb);
974 delete $::CFG->{bindings}->{$mod}->{$sym}; 988 delete $::CFG->{bindings}->{$mod}->{$sym};
975 }); 989 });
990
991 $hb->add (new CFClient::UI::Button
992 text => "edit",
993 tooltip => "Edits the binding",
994 on_activate => sub {
995 $::BIND_EDITOR->set_binding (
996 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
997 sub {
998 my ($nmod, $nsym, $ncmds) = @_;
999 delete $::CFG->{bindings}->{$mod}->{$sym};
1000 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1001 $refresh->();
1002 $::BIND_WINDOW->show;
1003 },
1004 sub {
1005 $::BIND_WINDOW->show;
1006 });
1007 $::BIND_EDITOR->show;
1008 $::BIND_WINDOW->hide;
1009 });
1010
976 $hb->add (new CFClient::UI::Label text => "($nam)"); 1011 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
977 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1012 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
978 } 1013 }
979 } 1014 }
980 }; 1015 };
981 1016
982 $BIND_WINDOW = new CFClient::UI::FancyFrame 1017 $BIND_WINDOW = new CFClient::UI::FancyFrame
983 title => "Bindings", 1018 title => "Bindings",
1019 x => "center",
1020 y => "center",
984 def_w => int $WIDTH * 7/8, 1021 def_w => int $WIDTH * 9/10,
985 def_h => int $HEIGHT * 7/8, 1022 def_h => int $HEIGHT * 9/10,
986 on_visibility_change => sub { 1023 on_visibility_change => sub {
987 my ($self, $visible) = @_; 1024 my ($self, $visible) = @_;
988 if ($visible) { 1025 $refresh->() if $visible;
989 $self->center;
990 $refresh->()
991 }
992 }; 1026 };
993 1027
1028 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
994 $BIND_WINDOW->add ($binding_list); 1029 $vb->add ($binding_list);
1030 $vb->add (my $hb = new CFClient::UI::HBox);
1031 $hb->add (new CFClient::UI::Button
1032 text => "record new",
1033 expand => 1,
1034 tooltip => "This button opens the binding editor with an empty binding.",
1035 on_activate => sub {
1036 $::BIND_EDITOR->set_binding (undef, undef, [],
1037 sub {
1038 my ($mod, $sym, $cmds) = @_;
1039 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1040 $refresh->();
1041 $::BIND_WINDOW->show;
1042 },
1043 sub {
1044 $::BIND_WINDOW->show;
1045 });
1046 $::BIND_WINDOW->hide;
1047 $::BIND_EDITOR->show;
1048 },
1049 );
1050 $hb->add (new CFClient::UI::Button
1051 text => "close",
1052 tooltip => "Closes the binding window",
1053 expand => 1,
1054 on_activate => sub {
1055 $::BIND_WINDOW->hide;
1056 }
1057 );
1058
995 $refresh->(); 1059 $refresh->();
996 $BIND_WINDOW 1060 $BIND_WINDOW
997} 1061}
998 1062
999sub make_help_window { 1063sub make_help_window {
… …
1069 if ($DEBUG_STATUS) { 1133 if ($DEBUG_STATUS) {
1070 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1134 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1071 } else { 1135 } else {
1072 # create the widgets 1136 # create the widgets
1073 1137
1074 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1138 $DEBUG_STATUS = new CFClient::UI::Label
1139 padding => 0,
1140 z => 100,
1141 force_x => "max",
1142 force_y => 0;
1075 $DEBUG_STATUS->show; 1143 $DEBUG_STATUS->show;
1076 1144
1145 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1146
1077 $STATUSBOX = new CFClient::UI::Statusbox; 1147 $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]); 1148 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1079 1149
1080 (new CFClient::UI::Frame 1150 (new CFClient::UI::Frame
1081 bg => [0, 0, 0, 0.4], 1151 bg => [0, 0, 0, 0.4],
1082 req_y => -1, 1152 force_x => 0,
1153 force_y => "max",
1083 child => $STATUSBOX, 1154 child => $STATUSBOX,
1084 )->show; 1155 )->show;
1085 1156
1086 CFClient::UI::FancyFrame->new ( 1157 CFClient::UI::FancyFrame->new (
1158 x => 0,
1159 y => $FONTSIZE + 8,
1087 border_bg => [1, 1, 1, 192/255], 1160 border_bg => [1, 1, 1, 192/255],
1088 bg => [1, 1, 1, 0], 1161 bg => [1, 1, 1, 0],
1089 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1162 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.", 1163 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1091 ), 1164 ),
… …
1114 can_hover => 1, 1187 can_hover => 1,
1115 can_events => 1, 1188 can_events => 1,
1116 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1189 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1117 ; 1190 ;
1118 1191
1119 $BUTTONBAR = new CFClient::UI::HBox; 1192 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1120 1193
1121 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1194 $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."); 1195 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, 1196 $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."); 1197 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 1201 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 1202
1130 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1203 $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."); 1204 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, 1205 $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 :)."); 1206 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1207 ."You can also hit the Tab-key to show/hide the Inventory.");
1134 1208
1135 $BUTTONBAR->add (new CFClient::UI::Button 1209 $BUTTONBAR->add (new CFClient::UI::Button
1136 text => "Save Config", 1210 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.", 1211 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 { 1212 on_activate => sub {
… …
1146 tooltip => "View Documentation"); 1220 tooltip => "View Documentation");
1147 1221
1148 $BUTTONBAR->add (new CFClient::UI::Flopper 1222 $BUTTONBAR->add (new CFClient::UI::Flopper
1149 text => "Bindings", 1223 text => "Bindings",
1150 other => make_binding_window, 1224 other => make_binding_window,
1151 tooltip => "Lets you delete bindings you have made with the recorder" 1225 tooltip =>
1152 ); 1226 "Lets you define, edit and delete bindings."
1153 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1227 ."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"); 1228 ."with nothing set and the recording started. After doing the actions you "
1229 ."want to record press Insert and you will be asked to press a key-combo."
1230 ."After pressing the combo the binding will be saved automatically and the "
1231 ."binding editor closes");
1232
1233 $BUTTONBAR->add (new CFClient::UI::Flopper
1234 text => "Spells",
1235 other => make_spell_list,
1236 tooltip => "The spell list");
1155 1237
1156 $BUTTONBAR->add (new CFClient::UI::Button 1238 $BUTTONBAR->add (new CFClient::UI::Button
1157 text => "Quit", 1239 text => "Quit",
1158 tooltip => "Terminates the program", 1240 tooltip => "Terminates the program",
1159 on_activate => sub { 1241 on_activate => sub {
… …
1164 } 1246 }
1165 }, 1247 },
1166 ); 1248 );
1167 1249
1168 $BUTTONBAR->show; 1250 $BUTTONBAR->show;
1251 $SERVER_SETUP->show;
1169 1252
1170 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1253 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1171
1172 $SERVER_SETUP->show;
1173 } 1254 }
1174} 1255}
1175 1256
1176sub video_shutdown { 1257sub video_shutdown {
1177 undef $SDL_ACTIVE; 1258 undef $SDL_ACTIVE;
… …
1245 1326
1246my %demo;#d# 1327my %demo;#d#
1247 1328
1248sub force_refresh { 1329sub force_refresh {
1249 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1330 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1250 debug sprintf "%3.2f", $fps; 1331 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1251 1332
1252 $CFClient::UI::ROOT->draw; 1333 $CFClient::UI::ROOT->draw;
1253 1334
1254 $WANT_REFRESH = 0; 1335 $WANT_REFRESH = 0;
1255 $CAN_REFRESH = 0; 1336 $CAN_REFRESH = 0;
… …
1488=head1 USAGE 1569=head1 USAGE
1489 1570
1490cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1571cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1491fullscreen and interactively. 1572fullscreen and interactively.
1492 1573
1574=head1 DEBUGGING
1575
1576
1577CFPLUS_DEBUG - environment variable
1578
1579 1 draw borders around widgets
1580 2 add low-level widget info to tooltips
1581 4 show fps
1582 8 suppress tooltips
1583
1493=head1 AUTHOR 1584=head1 AUTHOR
1494 1585
1495Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1586Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1496 1587
1497 1588

Diff Legend

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