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.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.25 by elmex, Mon May 29 19:49:33 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 $SERVER_SETUP;
86 87
87our $FLOORBOX; 88our $FLOORBOX;
88our $GAUGES; 89our $GAUGES;
89our $STATWIDS; 90our $STATWIDS;
90 91
… …
97 98
98our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
103our $INV_WINDOW;
102our $INV; 104our $INV;
103our $INVR; 105our $INVR;
104our $INVR_LBL; 106our $INVR_LBL;
107
108our $BIND_WINDOW;
105 109
106sub status { 110sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 112}
109 113
… …
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 118}
115 119
116sub start_game { 120sub start_game {
117 status "logging in..."; 121 status "logging in...";
122
123 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide;
118 125
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 126 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 127
121 my ($host, $port) = split /:/, $CFG->{host}; 128 my ($host, $port) = split /:/, $CFG->{host};
122 129
… …
151 }; 158 };
152 159
153 if ($CONN) { 160 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 161 CFClient::lowdelay fileno $CONN->{fh};
155 162
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 163 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 164 } else {
163 status "unable to connect"; 165 status "unable to connect";
164 stop_game(); 166 stop_game();
165 } 167 }
166} 168}
167 169
168sub stop_game { 170sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show;
173 $INV_WINDOW->hide;
174 $LOGVIEW->hide;
175
169 return unless $CONN; 176 return unless $CONN;
170 177
171 status "connection closed"; 178 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 179
173 $CONN->destroy; 180 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 181 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 182}
179 183
180sub client_setup { 184sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 185 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1, 186 req_x => 1,
… …
433 437
434 &set_gauge_window_fontsize; 438 &set_gauge_window_fontsize;
435 439
436 $win 440 $win
437} 441}
442
438 443
439sub make_stats_window { 444sub make_stats_window {
440 my $tgw = new CFClient::UI::FancyFrame 445 my $tgw = new CFClient::UI::FancyFrame
441 req_y => $HEIGHT * (2/8), 446 req_y => $HEIGHT * (2/8),
442 req_x => -1, 447 req_x => -1,
… …
711 } 716 }
712 }); 717 });
713} 718}
714 719
715sub server_setup { 720sub server_setup {
716 my $dialog = new CFClient::UI::FancyFrame 721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
717 x => $WIDTH * (1/3), 722 x => $WIDTH * (1/3),
718 y => $HEIGHT * (1/8), 723 y => $HEIGHT * (1/8),
719 name => "server_setup", 724 name => "server_setup",
720 title => "Server Setup", 725 title => "Server Setup",
721 child => (my $vbox = new CFClient::UI::VBox), 726 child => (my $vbox = new CFClient::UI::VBox),
722 on_visibility_change => sub { 727 on_visibility_change => sub {
723 $_[0]->show_centered if $_[1] 728 my ($self, $visible) = @_;
729 $self->center if $visible;
724 }; 730 },
731 ;
725 732
726 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
727 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 734 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
728 735
729 { 736 {
… …
860 }, 867 },
861 on_activate => sub { 868 on_activate => sub {
862 my ($input, $text) = @_; 869 my ($input, $text) = @_;
863 $input->set_text (''); 870 $input->set_text ('');
864 871
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
865 if ($text =~ /^\/(.*)/) { 874 } elsif ($text =~ /^\/(.*)/) {
866 $::CONN->user_send ($1); 875 $::CONN->user_send ($1);
867 } else { 876 } else {
868 my $say_cmd = $::CFG->{say_command} || 'say'; 877 my $say_cmd = $::CFG->{say_command} || 'say';
869 $::CONN->user_send ("$say_cmd $text"); 878 $::CONN->user_send ("$say_cmd $text");
870 } 879 }
… …
886 $window 895 $window
887} 896}
888 897
889sub open_quit_dialog { 898sub open_quit_dialog {
890 unless ($QUIT_DIALOG) { 899 unless ($QUIT_DIALOG) {
891
892 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
893 901
894 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
895 903
896 $vb->add (new CFClient::UI::Label 904 $vb->add (new CFClient::UI::Label
… …
907 $hb->add (new CFClient::UI::Button 915 $hb->add (new CFClient::UI::Button
908 text => "Quit anyway", 916 text => "Quit anyway",
909 expand => 1, 917 expand => 1,
910 on_activate => sub { exit }, 918 on_activate => sub { exit },
911 ); 919 );
920 }
912 921
922 $QUIT_DIALOG->show;
913 $QUIT_DIALOG->show_centered; 923 $QUIT_DIALOG->center;
914 } else {
915 $QUIT_DIALOG->show_centered;
916 }
917} 924}
918 925
919sub make_inventory_window { 926sub make_inventory_window {
920 my $invwin = new CFClient::UI::FancyFrame 927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
921 def_w => $WIDTH * (7/8), 928 def_w => $WIDTH * 7/8,
922 def_h => $HEIGHT * (7/8), 929 def_h => $HEIGHT * 7/8,
923 title => "Inventory", 930 title => "Inventory",
924 name => "inventory_window", 931 name => "inventory_window",
925 on_visibility_change => sub { 932 on_visibility_change => sub {
926 $_[0]->show_centered if $_[1] 933 my ($self, $visible) = @_;
934 $self->center if $visible;
927 }; 935 },
936 ;
928 937
929 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
930 939
931 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 940 $hb->add (my $vb1 = new CFClient::UI::VBox);
932 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
933 $lbl->set_text ("Player");
934 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
935 943
936 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 944 $hb->add (my $vb2 = new CFClient::UI::VBox);
937 945
938 $vb2->add (my $hb2 = new CFClient::UI::HBox); 946 $vb2->add (my $hb2 = new CFClient::UI::HBox);
939 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
940 $hb2->add (new CFClient::UI::Button 948 $hb2->add (new CFClient::UI::Button
941 text => "Close", 949 text => "Close",
942 tooltip => "Close the currently open container (if one is open)", 950 tooltip => "Close the currently open container (if one is open)",
943 on_activate => sub { 951 on_activate => sub {
944 $CONN->send ("apply $CONN->{open_container}") 952 $CONN->send ("apply $CONN->{open_container}")
945 if $CONN->{open_container} != 0; 953 if $CONN->{open_container} != 0;
946 }, 954 },
947 ); 955 );
948 956
949 $INVR_LBL->set_text ("Floor");
950 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
951 958
952 $invwin 959 $invwin
960}
961
962sub make_binding_window {
963 my $binding_list = new CFClient::UI::VBox;
964
965 my $refresh = sub {
966 $binding_list->clear ();
967
968 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972
973 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button
977 text => "delete",
978 on_activate => sub {
979 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym};
981 });
982 $hb->add (new CFClient::UI::Label text => "($nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 }
985 }
986 };
987
988 $BIND_WINDOW = new CFClient::UI::FancyFrame
989 title => "Bindings",
990 def_w => int $WIDTH * 7/8,
991 def_h => int $HEIGHT * 7/8,
992 on_visibility_change => sub {
993 my ($self, $visible) = @_;
994 if ($visible) {
995 $self->center;
996 $refresh->()
997 }
998 };
999
1000 $BIND_WINDOW->add ($binding_list);
1001 $refresh->();
1002 $BIND_WINDOW
953} 1003}
954 1004
955sub make_help_window { 1005sub make_help_window {
956 my $win = new CFClient::UI::FancyFrame 1006 my $win = new CFClient::UI::FancyFrame
957 def_w => int $WIDTH * 7/8, 1007 def_w => int $WIDTH * 7/8,
… …
1098 }, 1148 },
1099 ); 1149 );
1100 1150
1101 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1102 tooltip => "View Documentation"); 1152 tooltip => "View Documentation");
1153
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1103 1161
1104 $BUTTONBAR->add (new CFClient::UI::Button 1162 $BUTTONBAR->add (new CFClient::UI::Button
1105 text => "Quit", 1163 text => "Quit",
1106 tooltip => "Terminates the program", 1164 tooltip => "Terminates the program",
1107 on_activate => sub { 1165 on_activate => sub {
… …
1115 1173
1116 $BUTTONBAR->show; 1174 $BUTTONBAR->show;
1117 1175
1118 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119 1177
1120 # delay till geometry is constant 1178 $SERVER_SETUP->show;
1121 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1122 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1123 my $widget = $GAUGES->{win};
1124 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1125 });
1126 force_refresh ();
1127 } 1179 }
1128} 1180}
1129 1181
1130sub video_shutdown { 1182sub video_shutdown {
1131 undef $SDL_ACTIVE; 1183 undef $SDL_ACTIVE;

Diff Legend

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