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.58 by root, Mon Jun 5 22:07:43 2006 UTC vs.
Revision 1.63 by root, Wed Jun 7 05:54:09 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::MapWidget; 41use CFClient::MapWidget;
42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
42 44
43$Event::DIED = sub { 45$Event::DIED = sub {
44 # TODO: display dialog box or so 46 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable 47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
… …
89our $SETUP_NOTEBOOK; 91our $SETUP_NOTEBOOK;
90our $SETUP_SERVER; 92our $SETUP_SERVER;
91our $SETUP_KEYBOARD; 93our $SETUP_KEYBOARD;
92our $SETUP_SPELLS; 94our $SETUP_SPELLS;
93 95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
94our $FLOORBOX; 98our $FLOORBOX;
95our $GAUGES; 99our $GAUGES;
96our $STATWIDS; 100our $STATWIDS;
97 101
98our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
120} 124}
121 125
122sub debug { 126sub debug {
123 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
128}
129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
124} 309}
125 310
126sub start_game { 311sub start_game {
127 status "logging in..."; 312 status "logging in...";
128 313
… …
147 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
148 logview => $LOGVIEW, 333 logview => $LOGVIEW,
149 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
150 map => $MAP, 335 map => $MAP,
151 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
152 338
153 sound_play => sub { 339 sound_play => sub {
154 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
155 341
156 $SDL_MIXER 342 $SDL_MIXER
… …
181 367
182 return unless $CONN; 368 return unless $CONN;
183 369
184 status "connection closed"; 370 status "connection closed";
185 371
372 destroy_query_dialog $CONN;
186 $CONN->destroy; 373 $CONN->destroy;
187 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
188} 375}
189 376
190sub graphics_setup { 377sub graphics_setup {
… …
439 626
440 $win 627 $win
441} 628}
442 629
443 630
444sub make_stats_window { 631sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
447 x => "max", 634 x => "max",
448 title => "Stats", 635 title => "Stats",
449 name => "stats_window"; 636 name => "stats_window";
… …
659 846
660 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
661 848
662 $table->clear; 849 $table->clear;
663 850
851 my @tip = (
852 "The current number of users logged in on the server.",
853 "The hostname of the server.",
854 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.",
857 );
664 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
665 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 859 $table->add ($_, 0, new CFClient::UI::Label
860 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_])
666 for 0 .. $#col; 863 for 0 .. $#col;
667 864
668 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
669 866
670 my $y = 0; 867 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
688 885
689 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
690 887
691 $y++; 888 $y++;
692 889
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", on_activate => sub { 891 (new CFClient::UI::Button
892 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub {
695 $HOST_ENTRY->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility; 896 $METASERVER->hide;
897 },
697 }), 898 ),
698 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
699 ]); 900 ]);
700 901
701 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
702 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 903 ellipsise => 0,
904 align => $align[$_],
905 text => $m->[$_],
906 tooltip => $tip[$_],
907 can_hover => 1,
908 can_events => 1,
909 fontsize => 0.8)
703 for 0 .. $#$m; 910 for 0 .. $#$m;
704 } 911 }
705 } 912 }
706 }); 913 });
707} 914}
708 915
709sub metaserver_dialog { 916sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame 917 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List", 918 title => "Server List",
712 name => 'metaserver_dialog', 919 name => 'metaserver_dialog',
713 x => 'center', 920 x => 'center',
714 y => 'center', 921 y => 'center',
715 z => 3, 922 z => 3,
923 force_h => $::HEIGHT * 0.4,
716 child => (my $vbox = new CFClient::UI::VBox), 924 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub { 925 on_visibility_change => sub {
718 update_metaserver if $_[1]; 926 update_metaserver if $_[1];
719 }, 927 },
720 ; 928 ;
721 929
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723 933
724 $dialog 934 $dialog
725} 935}
726 936
727sub server_setup { 937sub server_setup {
… …
750 expand => 1, 960 expand => 1,
751 text => "Server List", 961 text => "Server List",
752 other => $METASERVER, 962 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 964 on_activate => sub { $METASERVER->toggle_visibility },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 ); 966 );
756 } 967 }
757 968
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
849 title => "Messages", 1060 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
852 x => "max", 1063 x => "max",
853 y => 0, 1064 y => 0,
854 force_w => $::WIDTH / 3, 1065 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
857 1068
858 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
859 1070
860 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
985 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 1198 state => $CFG->{pickup} & $mask,
988 on_changed => sub { 1199 on_changed => sub {
989 my ($box, $value) = @_; 1200 my ($box, $value) = @_;
1201
990 if ($value) { 1202 if ($value) {
991 $::CFG->{pickup} |= $mask; 1203 $::CFG->{pickup} |= $mask;
992 } else { 1204 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1205 $::CFG->{pickup} &= ~$mask;
994 } 1206 }
1207
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1208 $::CONN->send_command ("pickup $::CFG->{pickup}")
996 if defined $::CONN; 1209 if defined $::CONN;
997 }); 1210 });
998 } 1211 }
999 } 1212 }
1000 1213
1001 $table 1214 $table
1002} 1215}
1003 1216
1004sub make_inventory_window { 1217sub inventory_window {
1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center", 1219 x => "center",
1007 y => "center", 1220 y => "center",
1008 force_w => $WIDTH * 9/10, 1221 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10, 1222 force_h => $HEIGHT * 9/10,
… …
1252 1465
1253 $LOGVIEW = new CFClient::UI::TextView 1466 $LOGVIEW = new CFClient::UI::TextView
1254 expand => 1, 1467 expand => 1,
1255 font => $FONT_FIXED, 1468 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1469 fontsize => $::CFG->{log_fontsize},
1470 indent => -4,
1257 can_hover => 1, 1471 can_hover => 1,
1258 can_events => 1, 1472 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1473 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1474 ;
1261 1475
… …
1268 force_w => $::WIDTH * 0.6, 1482 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6, 1483 force_h => $::HEIGHT * 0.6,
1270 ; 1484 ;
1271 1485
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1486 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1487 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1274 1488
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1489 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options."); 1490 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1491 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1492 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1507 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294 1508
1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1509 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1296 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1510 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1297 1511
1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1512 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1513 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1300 1514
1301 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 1515 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
1302 1516
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1518 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1520 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1521 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1308 1522
1309 $BUTTONBAR->add (new CFClient::UI::Button 1523 $BUTTONBAR->add (new CFClient::UI::Button
1310 text => "Save Config", 1524 text => "Save Config",
… …
1572 map_scale => 1, 1786 map_scale => 1,
1573 fow_enable => 1, 1787 fow_enable => 1,
1574 fow_intensity => 0.45, 1788 fow_intensity => 0.45,
1575 fow_smooth => 0, 1789 fow_smooth => 0,
1576 gui_fontsize => 1, 1790 gui_fontsize => 1,
1577 log_fontsize => 1, 1791 log_fontsize => 0.7,
1578 gauge_fontsize=> 1, 1792 gauge_fontsize=> 1,
1579 gauge_size => 0.35, 1793 gauge_size => 0.35,
1580 stat_fontsize => 1, 1794 stat_fontsize => 0.7,
1581 mapsize => 100, 1795 mapsize => 100,
1582 host => "crossfire.schmorp.de", 1796 host => "crossfire.schmorp.de",
1583 say_command => 'say', 1797 say_command => 'say',
1584 audio_enable => 1, 1798 audio_enable => 1,
1585 bgm_enable => 1, 1799 bgm_enable => 1,
1586 bgm_volume => 0.25, 1800 bgm_volume => 0.25,
1587 face_prefetch => 0, 1801 face_prefetch => 0,
1588 output_sync => 1, 1802 output_sync => 1,
1589 output_count => 1, 1803 output_count => 1,
1804 pickup => 0,
1590 ); 1805 );
1591 1806
1592 while (my ($k, $v) = each %DEF_CFG) { 1807 while (my ($k, $v) = each %DEF_CFG) {
1593 $CFG->{$k} = $v unless exists $CFG->{$k}; 1808 $CFG->{$k} = $v unless exists $CFG->{$k};
1594 } 1809 }

Diff Legend

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