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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.92 by elmex, Fri Jul 14 17:35:35 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $PICKUP_ENABLE;
89our $SERVER_INFO; 92our $SERVER_INFO;
90 93
91our $SETUP_DIALOG; 94our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 95our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 96our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 97our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 98
99our $PL_NOTEBOOK;
97our $STATS_WINDOW; 100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 107our $MESSAGE_WINDOW;
99our $FLOORBOX; 108our $FLOORBOX;
100our $GAUGES; 109our $GAUGES;
101our $STATWIDS; 110our $STATWIDS;
102 111
… …
109 118
110our $ALT_ENTER_MESSAGE; 119our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 120our $STATUSBOX;
112our $DEBUG_STATUS; 121our $DEBUG_STATUS;
113 122
114our $INV_WINDOW;
115our $INV; 123our $INV;
116our $INVR; 124our $INVR;
117our $INV_RIGHT_HB; 125our $INV_RIGHT_HB;
118 126
119our $BIND_EDITOR; 127our $BIND_EDITOR;
128our $BIND_UPD_CB;
120 129
121our $PICKUP_CFG; 130our $PICKUP_CFG;
122 131
123sub status { 132sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 133 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
155 $hbox->add (new CFClient::UI::Button 164 $hbox->add (new CFClient::UI::Button
156 text => "No", 165 text => "No",
157 on_activate => sub { 166 on_activate => sub {
158 $conn->send ("reply n"); 167 $conn->send ("reply n");
159 $dialog->destroy; 168 $dialog->destroy;
169 0
160 } 170 }
161 ); 171 );
162 $hbox->add (new CFClient::UI::Button 172 $hbox->add (new CFClient::UI::Button
163 text => "Yes", 173 text => "Yes",
164 on_activate => sub { 174 on_activate => sub {
165 $conn->send ("reply y"); 175 $conn->send ("reply y");
166 destroy_query_dialog $conn; 176 destroy_query_dialog $conn;
177 0
167 }, 178 },
168 ); 179 );
169 180
170 $dialog->focus_in; 181 $dialog->grab_focus;
171 182
172 } elsif ($flags & CS_QUERY_SINGLECHAR) { 183 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 184 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174 185
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 186 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
185 $table->add (0, 0, new CFClient::UI::Button 196 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race", 197 text => "Next Race",
187 on_activate => sub { 198 on_activate => sub {
188 $conn->send ("reply n"); 199 $conn->send ("reply n");
189 destroy_query_dialog $conn; 200 destroy_query_dialog $conn;
201 0
190 }, 202 },
191 ); 203 );
192 $table->add (2, 0, new CFClient::UI::Button 204 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept", 205 text => "Accept",
194 on_activate => sub { 206 on_activate => sub {
195 $conn->send ("reply d"); 207 $conn->send ("reply d");
196 destroy_query_dialog $conn; 208 destroy_query_dialog $conn;
209 0
197 }, 210 },
198 ); 211 );
199 212
200 unshift @dialog, new CFClient::UI::Label 213 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4, 214 max_w => $::WIDTH * 0.4,
… …
215 $conn->send ("reply $stat"); 228 $conn->send ("reply $stat");
216 destroy_query_dialog $conn; 229 destroy_query_dialog $conn;
217 return; 230 return;
218 } 231 }
219 232
220 $STATS_WINDOW->show; 233 $STATS_PAGE->show;
221 $MESSAGE_WINDOW->hide; 234 $MESSAGE_WINDOW->hide;
222 235
223 unshift @dialog, new CFClient::UI::Label 236 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4, 237 max_w => $::WIDTH * 0.4,
225 ellipsise => 0, 238 ellipsise => 0,
… …
231 $table->add (0, 0, new CFClient::UI::Button 244 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again", 245 text => "Roll Again",
233 on_activate => sub { 246 on_activate => sub {
234 $conn->send ("reply y"); 247 $conn->send ("reply y");
235 destroy_query_dialog $conn; 248 destroy_query_dialog $conn;
249 0
236 }, 250 },
237 ); 251 );
238 252
239 # center: swap stats 253 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
254 text => "Swap Stats", 268 text => "Swap Stats",
255 on_activate => sub { 269 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value}; 270 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}"); 271 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn; 272 destroy_query_dialog $conn;
273 0
259 }, 274 },
260 ); 275 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 276 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262 277
263 # right: accept 278 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button 279 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept", 280 text => "Accept",
266 on_activate => sub { 281 on_activate => sub {
267 $conn->send ("reply n"); 282 $conn->send ("reply n");
268 $STATS_WINDOW->hide; 283 $STATS_PAGE->hide;
269 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
285 0
270 }, 286 },
271 ); 287 );
272 288
273 unshift @dialog, new CFClient::UI::Label 289 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4, 290 max_w => $::WIDTH * 0.4,
… …
284 300
285 push @dialog, my $entry = new CFClient::UI::Entry 301 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub { 302 on_changed => sub {
287 $conn->send ("reply $_[1]"); 303 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn; 304 destroy_query_dialog $conn;
305 0
289 }, 306 },
290 ; 307 ;
291 308
292 $entry->focus_in; 309 $entry->grab_focus;
293 310
294 } else { 311 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 312 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296 313
297 push @dialog, my $entry = new CFClient::UI::Entry 314 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 315 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub { 316 on_activate => sub {
300 $conn->send ("reply $_[1]"); 317 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn; 318 destroy_query_dialog $conn;
319 0
302 }, 320 },
303 ; 321 ;
304 322
305 $entry->focus_in; 323 $entry->grab_focus;
306 } 324 }
307 325
308 $vbox->add (@dialog); 326 $vbox->add (@dialog);
309 $dialog->show; 327 $dialog->show;
310} 328}
… …
315 $LOGIN_BUTTON->set_text ("Logout"); 333 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide; 334 $SETUP_DIALOG->hide;
317 335
318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 336 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
319 337
320 my ($host, $port) = split /:/, $CFG->{host}; 338 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321 339
322 $MAP = new CFClient::Map $mapsize, $mapsize; 340 $MAP = new CFClient::Map $mapsize, $mapsize;
323 341
324 $CONN = eval { 342 $CONN = eval {
325 new CFClient::Protocol 343 new CFClient::Protocol
326 host => $host, 344 host => $host,
327 port => $port || 13327, 345 port => $port || 13327,
328 user => $CFG->{user}, 346 user => $CFG->{profile}{default}{user},
329 pass => $CFG->{password}, 347 pass => $CFG->{profile}{default}{password},
330 mapw => $mapsize, 348 mapw => $mapsize,
331 maph => $mapsize, 349 maph => $mapsize,
332 350
333 map_widget => $MAPWIDGET, 351 map_widget => $MAPWIDGET,
334 logview => $LOGVIEW, 352 logview => $LOGVIEW,
… …
362 380
363sub stop_game { 381sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show; 384 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide; 385 $PL_WINDOW->hide;
386 $SPELL_PAGE->clear_spells;
368 387
369 return unless $CONN; 388 return unless $CONN;
370 389
371 status "connection closed"; 390 status "connection closed";
372 391
373 destroy_query_dialog $CONN; 392 destroy_query_dialog $CONN;
374 $CONN->destroy; 393 $CONN->destroy;
375 $CONN = 0; # false, does not autovivify 394 $CONN = 0; # false, does not autovivify
395
396 undef $MAP;
376} 397}
377 398
378sub graphics_setup { 399sub graphics_setup {
379 my $vbox = new CFClient::UI::VBox; 400 my $vbox = new CFClient::UI::VBox;
380 401
… …
398 419
399 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
400 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
401 state => $CFG->{fullscreen}, 422 state => $CFG->{fullscreen},
402 tooltip => "Bring the client into fullscreen mode.", 423 tooltip => "Bring the client into fullscreen mode.",
403 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
404 my ($self, $value) = @_;
405 $CFG->{fullscreen} = $value;
406 }
407 ); 425 );
408 426
409 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 428 $table->add (1, $row++, new CFClient::UI::CheckBox
411 state => $CFG->{fast}, 429 state => $CFG->{fast},
412 tooltip => "Lower the visual quality considerably to speed up rendering.", 430 tooltip => "Lower the visual quality considerably to speed up rendering.",
413 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
414 my ($self, $value) = @_;
415 $CFG->{fast} = $value;
416 }
417 ); 432 );
418 433
419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
420 $table->add (1, $row++, new CFClient::UI::Slider 435 $table->add (1, $row++, new CFClient::UI::Slider
421 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
422 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
423 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
424 my ($self, $value) = @_;
425 $CFG->{map_scale} = 2 ** $value;
426 }
427 ); 439 );
428 440
429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 441 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
430 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, new CFClient::UI::CheckBox
431 state => $CFG->{fow_enable}, 443 state => $CFG->{fow_enable},
432 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 444 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
433 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
434 my ($self, $value) = @_;
435 $CFG->{fow_enable} = $value;
436 }
437 ); 446 );
438 447
439 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
440 $table->add (1, $row++, new CFClient::UI::Slider 449 $table->add (1, $row++, new CFClient::UI::Slider
441 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 450 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
442 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 451 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
443 on_changed => sub { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
444 my ($self, $value) = @_;
445 $CFG->{fow_intensity} = $value;
446 }
447 ); 453 );
448 454
449 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 455 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
450 $table->add (1, $row++, new CFClient::UI::CheckBox 456 $table->add (1, $row++, new CFClient::UI::CheckBox
451 state => $CFG->{fow_smooth}, 457 state => $CFG->{fow_smooth},
452 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 458 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
453 on_changed => sub { 459 on_changed => sub {
454 my ($self, $value) = @_; 460 my ($self, $value) = @_;
455 $CFG->{fow_smooth} = $value; 461 $CFG->{fow_smooth} = $value;
456 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 462 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
463 0
457 } 464 }
458 ); 465 );
459 466
460 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
461 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
463 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 470 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
464 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 471 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
465 ); 472 );
466 473
467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
468 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
470 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 477 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 );
473
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
475
476 $table->add (1, $row++, new CFClient::UI::Slider
477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
479 on_changed => sub {
480 $CFG->{stat_fontsize} = $_[1];
481 &set_stats_window_fontsize;
482 }
483 ); 479 );
484 480
485 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
486 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
489 on_changed => sub { 485 on_changed => sub {
490 $CFG->{gauge_fontsize} = $_[1]; 486 $CFG->{gauge_fontsize} = $_[1];
491 &set_gauge_window_fontsize; 487 &set_gauge_window_fontsize;
488 0
492 } 489 }
493 ); 490 );
494 491
495 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
496 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
497 range => [$CFG->{gauge_size}, 0.2, 0.8], 494 range => [$CFG->{gauge_size}, 0.2, 0.8],
498 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 495 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
499 on_changed => sub { 496 on_changed => sub {
500 $CFG->{gauge_size} = $_[1]; 497 $CFG->{gauge_size} = $_[1];
501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0
502 } 500 }
503 ); 501 );
504 502
505 $table->add (1, $row++, new CFClient::UI::Button 503 $table->add (1, $row++, new CFClient::UI::Button
506 expand => 1, align => 0, text => "Apply", 504 expand => 1, align => 0, text => "Apply",
507 tooltip => "Apply the video settings", 505 tooltip => "Apply the video settings",
508 on_activate => sub { 506 on_activate => sub {
509 video_shutdown (); 507 video_shutdown ();
510 video_init (); 508 video_init ();
509 0
511 } 510 }
512 ); 511 );
513 512
514 $vbox 513 $vbox
515} 514}
… …
523 522
524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
526 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
528 on_changed => sub { 527 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 $CFG->{audio_enable} = $_[1];
530 }
531 ); 528 );
532# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 529# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
533# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 530# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
534# $CFG->{effects_volume} = $_[1]; 531# $CFG->{effects_volume} = $_[1];
535# }); 532# });
536 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 533 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 534 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
538 $hbox->add (new CFClient::UI::CheckBox 535 $hbox->add (new CFClient::UI::CheckBox
539 expand => 1, state => $CFG->{bgm_enable}, 536 expand => 1, state => $CFG->{bgm_enable},
540 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 537 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
541 on_changed => sub { 538 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
542 $CFG->{bgm_enable} = $_[1];
543 }
544 ); 539 );
545 $hbox->add (new CFClient::UI::Slider 540 $hbox->add (new CFClient::UI::Slider
546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
547 tooltip => "The volume of the background music. Changes are instant.", 542 tooltip => "The volume of the background music. Changes are instant.",
548 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
549 $CFG->{bgm_volume} = $_[1];
550 CFClient::MixMusic::volume $_[1] * 128;
551 }
552 ); 544 );
553 545
554 $table->add (1, $row++, new CFClient::UI::Button 546 $table->add (1, $row++, new CFClient::UI::Button
555 expand => 1, align => 0, text => "Apply", 547 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the audio settings", 548 tooltip => "Apply the audio settings",
557 on_activate => sub { 549 on_activate => sub {
558 audio_shutdown (); 550 audio_shutdown ();
559 audio_init (); 551 audio_init ();
552 0
560 } 553 }
561 ); 554 );
562 555
563 $vbox 556 $vbox
564}
565
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570} 557}
571 558
572sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
630 617
631sub debug_setup { 618sub debug_setup {
632 my $table = new CFClient::UI::Table; 619 my $table = new CFClient::UI::Table;
633 620
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 621 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 622 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 623 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 624 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 625 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 626 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 627 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 628 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
642 629
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 630 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644 631
645 for my $x (0..2) { 632 for my $x (0..2) {
646 for my $y (0 .. 2) { 633 for my $y (0 .. 2) {
… …
655 642
656 $table 643 $table
657} 644}
658 645
659sub stats_window { 646sub stats_window {
660 my $tgw = new CFClient::UI::FancyFrame 647 my $vb = new CFClient::UI::VBox;
661 y => $HEIGHT * (2/8),
662 x => "max",
663 title => "Stats",
664 name => "stats_window";
665 648
666 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
667 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
668 can_hover => 1, can_events => 1, 650 can_hover => 1, can_events => 1,
669 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 651 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
670 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
671 can_hover => 1, can_events => 1, 653 can_hover => 1, can_events => 1,
… …
695 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
696 678
697 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 679 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
698 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 680 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
699 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 681 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
700 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 682 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
701 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 683 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
702 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 684 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
703 ) { 685 ) {
704 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
705 687
… …
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 689 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
708 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 690 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
709 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 691 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
710 } 692 }
711 693
712 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
713 695
714 my $row = 0; 696 my $row = 0;
715 my $col = 0; 697 my $col = 0;
716 698
717 my %resist_names = ( 699 my %resist_names = (
700 slow => ["Slow",
718 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 701 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
702 holyw => ["Holy Word",
719 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 703 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
704 conf => ["Confusion",
720 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 705 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
706 fire => ["Fire",
721 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 707 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
708 depl => ["Depletion",
722 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 709 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
710 magic => ["Magic",
723 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 711 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
712 drain => ["Draining",
724 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 713 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
714 acid => ["Acid",
725 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 715 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
716 pois => ["Poison",
726 pois => "<b>Poison</b> (resistance to getting poisoned)", 717 "<b>Poison</b> (resistance to getting poisoned)"],
718 para => ["Paralysation",
727 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 719 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
720 deat => ["Death",
728 deat => "<b>Death</b> (resistance against death spells)", 721 "<b>Death</b> (resistance against death spells)"],
729 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 722 phys => ["Physical",
723 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
724 blind => ["Blind",
730 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 725 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
726 fear => ["Fear",
731 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 727 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
728 tund => ["Turn undead",
732 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
730 elec => ["Electricity",
733 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 731 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
732 cold => ["Cold",
734 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 733 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
734 ghit => ["Ghost hit",
735 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 735 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
736 ); 736 );
737 for (qw/slow holyw conf fire depl magic 737 for (qw/slow holyw conf fire depl magic
738 drain acid pois para deat phys 738 drain acid pois para deat phys
739 blind fear tund elec cold ghit/) 739 blind fear tund elec cold ghit/)
740 { 740 {
… …
745 template => "-100%", 745 template => "-100%",
746 align => +1, 746 align => +1,
747 valign => 0, 747 valign => 0,
748 can_events => 1, 748 can_events => 1,
749 can_hover => 1, 749 can_hover => 1,
750 tooltip => $resist_names{$_}, 750 tooltip => $resist_names{$_}->[1],
751 ); 751 );
752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
753 font => $FONT_FIXED, 753 font => $FONT_FIXED,
754 can_hover => 1, 754 can_hover => 1,
755 can_events => 1, 755 can_events => 1,
756 image => "ui/resist/resist_$_.png", 756 path => "ui/resist/resist_$_.png",
757 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
758 );
759 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
760 text => $resist_names{$_}->[0],
761 font => $FONT_FIXED,
762 can_hover => 1,
763 can_events => 1,
764 tooltip => $resist_names{$_}->[1],
758 ); 765 );
759 766
760 $row++; 767 $row++;
761 if ($row % 6 == 0) { 768 if ($row % 6 == 0) {
762 $col += 2; 769 $col += 3;
763 $row = 0; 770 $row = 0;
764 } 771 }
765 } 772 }
766 773
767 &set_stats_window_fontsize;
768 update_stats_window ({}); 774 update_stats_window ({});
769 775
770 $tgw 776 $vb
777}
778
779sub skill_window {
780 my ($self) = @_;
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
771} 782}
772 783
773sub formsep($) { 784sub formsep($) {
774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
775} 786}
… …
809 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 820 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
810 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 821 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
811 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 822 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
812 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 823 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
813 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 824 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
814 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 825 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
815 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 826 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
816 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 827 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
817 828
818 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 829 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
819 830
820 # TODO: replace by CS_STAT_RES_xxx constants
821 my %tbl = ( 831 my %tbl = (
822 phys => 100, 832 phys => CS_STAT_RES_PHYS,
823 magic => 101, 833 magic => CS_STAT_RES_MAG,
824 fire => 102, 834 fire => CS_STAT_RES_FIRE,
825 elec => 103, 835 elec => CS_STAT_RES_ELEC,
826 cold => 104, 836 cold => CS_STAT_RES_COLD,
827 conf => 105, 837 conf => CS_STAT_RES_CONF,
828 acid => 106, 838 acid => CS_STAT_RES_ACID,
829 drain => 107, 839 drain => CS_STAT_RES_DRAIN,
830 ghit => 108, 840 ghit => CS_STAT_RES_GHOSTHIT,
831 pois => 109, 841 pois => CS_STAT_RES_POISON,
832 slow => 110, 842 slow => CS_STAT_RES_SLOW,
833 para => 111, 843 para => CS_STAT_RES_PARA,
834 tund => 112, 844 tund => CS_STAT_TURN_UNDEAD,
835 fear => 113, 845 fear => CS_STAT_RES_FEAR,
836 depl => 113, 846 depl => CS_STAT_RES_DEPLETE,
837 deat => 115, 847 deat => CS_STAT_RES_DEATH,
838 holyw => 116, 848 holyw => CS_STAT_RES_HOLYWORD,
839 blind => 117, 849 blind => CS_STAT_RES_BLIND,
840 ); 850 );
851
852 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
853 my $sktbl = $STATWIDS->{_skill_tbl};
854 $sktbl->clear;
855
856 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
857 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
858 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
859
860 my @skills;
861
862 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
863 push @skills, [$i, $::CONN->{skill_info}{$i}];
864 }
865
866 my $y = 1;
867 for (sort { $a->[1] cmp $b->[1] } @skills) {
868 my ($idx, $name) = @$_;
869
870 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
871 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
872 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
874 }
875 }
876
877 $STATWIDS->{_skill_tbl_init} = 1;
878 }
879
880 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
881 if (exists $stats->{$i}) {
882 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
883 if $STATWIDS->{"sk_xp_$i"};
884 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
885 if $STATWIDS->{"sk_lvl_$i"};
886 }
887 }
841 888
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 889 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl; 890 for keys %tbl;
844} 891}
845 892
846my $METASERVER_ATIME; 893my $METASERVER_ATIME;
847 894
848sub update_metaserver { 895sub update_metaserver {
896 my ($metaserver_dialog) = @_;
897
898 $METASERVER = $metaserver_dialog
899 if defined $metaserver_dialog;
900
849 return if $METASERVER_ATIME > time; 901 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 902 $METASERVER_ATIME = time + 60;
851 903
852 my $table = $METASERVER->{table}; 904 my $table = $METASERVER->{table};
853 $table->clear; 905 $table->clear;
… …
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 970 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 971 (new CFClient::UI::Button
920 text => "Use", 972 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 973 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 974 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 975 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 976 $METASERVER->hide;
977 0
925 }, 978 },
926 ), 979 ),
927 (new CFClient::UI::Empty expand => 1), 980 (new CFClient::UI::Empty expand => 1),
928 ]); 981 ]);
929 982
… …
940 } 993 }
941 }); 994 });
942} 995}
943 996
944sub metaserver_dialog { 997sub metaserver_dialog {
998 my $vbox = new CFClient::UI::VBox;
999 my $table = new CFClient::UI::Table;
1000 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
1001
945 my $dialog = new CFClient::UI::FancyFrame 1002 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 1003 title => "Server List",
947 name => 'metaserver_dialog', 1004 name => 'metaserver_dialog',
948 x => 'center', 1005 x => 'center',
949 y => 'center', 1006 y => 'center',
950 z => 3, 1007 z => 3,
951 force_h => $::HEIGHT * 0.4, 1008 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 1009 child => $vbox,
1010 has_close_button => 1,
1011 table => $table,
953 on_visibility_change => sub { 1012 on_visibility_change => sub {
954 update_metaserver if $_[1]; 1013 update_metaserver ($_[0]) if $_[1];
1014 0
955 }, 1015 },
956 ; 1016 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 1017
962 $dialog 1018 $dialog
963} 1019}
964 1020
965sub server_setup { 1021sub server_setup {
… …
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1028 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 1029
974 $vbox->add ( 1030 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 1031 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 1032 expand => 1,
977 text => $CFG->{host}, 1033 text => $CFG->{profile}{default}{host},
978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1034 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979 on_changed => sub { 1035 on_changed => sub {
980 my ($self, $value) = @_; 1036 my ($self, $value) = @_;
981 $CFG->{host} = $value; 1037 $CFG->{profile}{default}{host} = $value;
1038 0
982 } 1039 }
983 ); 1040 );
984
985 $METASERVER = metaserver_dialog;
986 1041
987 $vbox->add (new CFClient::UI::Button 1042 $vbox->add (new CFClient::UI::Button
988 expand => 1, 1043 expand => 1,
989 text => "Server List", 1044 text => "Server List",
990 other => $METASERVER, 1045 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 1046 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 1047 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1048 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 1049 );
995 } 1050 }
996 1051
997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1052 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
998 $table->add (1, 4, new CFClient::UI::Entry 1053 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 1054 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 1055 tooltip => "The name of your character on the server",
1001 on_changed => sub { 1056 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 1057 );
1006 1058
1007 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1059 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1008 $table->add (1, 5, new CFClient::UI::Entry 1060 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 1061 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 1062 hidden => 1,
1011 tooltip => "The password for your character", 1063 tooltip => "The password for your character",
1012 on_changed => sub { 1064 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 1065 );
1017 1066
1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1067 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1019 $table->add (1, 7, new CFClient::UI::Slider 1068 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 1069 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1070 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 tooltip => "This is the size of the portion of the map update the server sends you. " 1071 tooltip => "This is the size of the portion of the map update the server sends you. "
1023 . "If you set this to a high value you will be able to see further, " 1072 . "If you set this to a high value you will be able to see further, "
1024 . "but you also increase bandwidth requirements and latency. " 1073 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1074 . "This option is only used once at log-in.",
1026 on_changed => sub { 1075 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027 my ($self, $value) = @_;
1028
1029 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030 },
1031 ); 1076 );
1032 1077
1033 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1078 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1079 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1080 state => $CFG->{face_prefetch},
… …
1038 . "This might increase or create lag, but increases the chances " 1083 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1084 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1085 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1086 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1087 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1088 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1089 );
1045 1090
1046 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1091 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1047 $table->add (1, 9, new CFClient::UI::Entry 1092 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1093 text => $CFG->{output_count},
1049 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1050 on_changed => sub { $CFG->{output_count} = $_[1] }, 1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1096 );
1052 1097
1053 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1098 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054 $table->add (1, 10, new CFClient::UI::Entry 1099 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1100 text => $CFG->{output_sync},
1056 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1103 );
1059 1104
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1105 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1106 expand => 1,
1062 align => 0, 1107 align => 0,
1063 text => "Login", 1108 text => "Login",
1064 on_activate => sub { 1109 on_activate => sub {
1065 $CONN ? stop_game 1110 $CONN ? stop_game
1066 : start_game; 1111 : start_game;
1112 0
1067 }, 1113 },
1068 ); 1114 );
1069 1115
1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1116 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1117 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1120 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1121 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub { 1122 on_changed => sub {
1077 my ($self, $value) = @_; 1123 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1124 $CFG->{say_command} = $value;
1125 0
1079 } 1126 }
1080 ); 1127 );
1081 1128
1082 $vbox->add (new CFClient::UI::Label 1129 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1130 text => "Server Info",
… …
1099 bg => [0, 0, 0, 0.75], 1146 bg => [0, 0, 0, 0.75],
1100 x => "max", 1147 x => "max",
1101 y => 0, 1148 y => 0,
1102 force_w => $::WIDTH * 0.4, 1149 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1150 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1151 child => (my $vbox = new CFClient::UI::VBox),
1152 has_close_button => 1;
1105 1153
1106 $vbox->add ($LOGVIEW); 1154 $vbox->add ($LOGVIEW);
1107 1155
1108 $vbox->add (my $input = new CFClient::UI::Entry 1156 $vbox->add (my $input = new CFClient::UI::Entry
1109 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1157 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1117 1165
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1166 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1167 $input->{refocus_map} = 1;
1120 } 1168 }
1121 delete $input->{auto_activated}; 1169 delete $input->{auto_activated};
1170
1171 0
1122 }, 1172 },
1123 on_activate => sub { 1173 on_activate => sub {
1124 my ($input, $text) = @_; 1174 my ($input, $text) = @_;
1125 $input->set_text (''); 1175 $input->set_text ('');
1126 1176
… …
1132 } 1182 }
1133 if ($input->{refocus_map}) { 1183 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1184 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1185 $MAPWIDGET->focus_in
1136 } 1186 }
1187
1188 0
1137 }, 1189 },
1138 on_escape => sub { 1190 on_escape => sub {
1139 $MAPWIDGET->focus_in 1191 $MAPWIDGET->grab_focus;
1192
1193 0
1140 }, 1194 },
1141 ); 1195 );
1142 1196
1143 $CONSOLE = { 1197 $CONSOLE = {
1144 window => $window, 1198 window => $window,
… …
1166 ); 1220 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1221 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1222 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1223 text => "Ok",
1170 expand => 1, 1224 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1225 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1226 );
1173 $hb->add (new CFClient::UI::Button 1227 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1228 text => "Quit anyway",
1175 expand => 1, 1229 expand => 1,
1176 on_activate => sub { exit }, 1230 on_activate => sub { exit },
… …
1183sub autopickup_setup { 1237sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1238 my $table = new CFClient::UI::Table;
1185 1239
1186 for ( 1240 for (
1187 ["General", 0, 0, 1241 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1242 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1243 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1244 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1245 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1246 ],
1193 ["Weapons", 0, 6, 1247 ["Weapons", 0, 6,
… …
1230 for (@bits) { 1284 for (@bits) {
1231 ++$y; 1285 ++$y;
1232 1286
1233 my $mask = $_->[1]; 1287 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1289 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1291 on_changed => sub {
1238 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1239 1293
1240 if ($value) { 1294 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1295 $::CFG->{pickup} |= $mask;
… …
1243 $::CFG->{pickup} &= ~$mask; 1297 $::CFG->{pickup} &= ~$mask;
1244 } 1298 }
1245 1299
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1300 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1301 if defined $::CONN;
1302
1303 0
1248 }); 1304 });
1305
1306 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1307 }
1250 } 1308 }
1251 1309
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1310 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1313 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1314 on_changed => sub {
1256 my ($slider, $value) = @_; 1315 my ($slider, $value) = @_;
1257 1316
1258 $::CFG->{pickup} &= ~0x7; 1317 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1318 $::CFG->{pickup} |= int $value
1260 if $value; 1319 if $value;
1261 1; 1320 1;
1262 }); 1321 });
1322
1263 $table->add (3, 18, new CFClient::UI::Button 1323 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1324 text => "set",
1265 on_activate => sub { 1325 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1327 if defined $::CONN;
1268 1; 1328 0
1269 }); 1329 });
1270 1330
1271 $table 1331 $table
1272} 1332}
1273 1333
1274sub inventory_window { 1334sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336
1337 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1339 $vb1->add ($INV = new CFClient::UI::Inventory);
1340
1341 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344
1345 $vb2->add ($INVR = new CFClient::UI::Inventory);
1346
1347 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349
1350 $hb
1351}
1352
1353sub toggle_player_page {
1354 my ($widget) = @_;
1355
1356 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1357 $PL_WINDOW->hide;
1358 } else {
1359 $PL_NOTEBOOK->set_current_page ($widget);
1360 $PL_WINDOW->show;
1361 }
1362}
1363
1364sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1366 x => "center",
1277 y => "center", 1367 y => "center",
1278 force_w => $WIDTH * 9/10, 1368 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1369 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1370 title => "Player",
1371 name => "playerbook",
1372 has_close_button => 1
1281 ; 1373 ;
1282 1374
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1375 my $ntb =
1376 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1284 1382
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1383 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1384 "Stats" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 );
1387 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window,
1389 "Shows all your Skills."
1390 );
1391 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 );
1395 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 );
1288 1400
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1401 $ntb->set_current_page ($INVENTORY_PAGE);
1290 1402
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1403 $plwin->add ($ntb);
1292 1404 $plwin
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1294
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299} 1405}
1300 1406
1301sub spell_setup { 1407sub update_bindings {
1302 new CFClient::UI::SpellList 1408 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1409}
1304 1410
1305sub keyboard_setup { 1411sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1412 my $binding_list = new CFClient::UI::VBox;
1307 1413
1308 my $refresh; 1414 my $refresh;
1309 $refresh = sub { 1415 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1416 $binding_list->clear ();
1311 1417
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1418 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1422
1317 my $lbl = join "; ", @$cmds; 1423 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1425 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1426 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1427 text => "delete",
1322 tooltip => "Deletes the binding", 1428 tooltip => "Deletes the binding",
1323 on_activate => sub { 1429 on_activate => sub {
1324 $binding_list->remove ($hb); 1430 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1431 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432 0
1326 }); 1433 });
1327 1434
1328 $hb->add (new CFClient::UI::Button 1435 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1436 text => "edit",
1330 tooltip => "Edits the binding", 1437 tooltip => "Edits the binding",
1331 on_activate => sub { 1438 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1439 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1440 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1441 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1442 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1443 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1444 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1445 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1446 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1447 $SETUP_DIALOG->show;
1341 }, 1448 },
1342 sub { 1449 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1450 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1451 $SETUP_DIALOG->show;
1345 }); 1452 });
1346 $::BIND_EDITOR->show; 1453 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1454 $SETUP_DIALOG->hide;
1455 0
1348 }); 1456 });
1349 1457
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1458 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1459 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1460 }
1353 } 1461 }
1354 }; 1462 };
1355 1463
1356 my $vb = new CFClient::UI::VBox; 1464 my $vb = new CFClient::UI::VBox;
1465 $vb->add (my $hb = new CFClient::UI::HBox);
1466 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1467 $hb->add (new CFClient::UI::CheckBox
1468 expand => 1,
1469 state => $CFG->{shift_fire_stop},
1470 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1471 on_changed => sub {
1472 my ($cbox, $value) = @_;
1473 $CFG->{shift_fire_stop} = $value;
1474 0
1475 });
1476
1357 $vb->add ($binding_list); 1477 $vb->add ($binding_list);
1358 $vb->add (my $hb = new CFClient::UI::HBox); 1478 $vb->add (my $hb = new CFClient::UI::HBox);
1359 1479
1360 $hb->add (new CFClient::UI::Button 1480 $hb->add (new CFClient::UI::Button
1361 text => "record new", 1481 text => "record new",
… …
1363 tooltip => "This button opens the binding editor with an empty binding.", 1483 tooltip => "This button opens the binding editor with an empty binding.",
1364 on_activate => sub { 1484 on_activate => sub {
1365 $::BIND_EDITOR->set_binding (undef, undef, [], 1485 $::BIND_EDITOR->set_binding (undef, undef, [],
1366 sub { 1486 sub {
1367 my ($mod, $sym, $cmds) = @_; 1487 my ($mod, $sym, $cmds) = @_;
1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1488 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1369 $refresh->(); 1489 $refresh->();
1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1490 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show; 1491 $SETUP_DIALOG->show;
1372 }, 1492 },
1373 sub { 1493 sub {
… …
1375 $SETUP_DIALOG->show; 1495 $SETUP_DIALOG->show;
1376 }, 1496 },
1377 ); 1497 );
1378 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
1379 $::BIND_EDITOR->show; 1499 $::BIND_EDITOR->show;
1500 0
1380 }, 1501 },
1381 ); 1502 );
1382 1503
1383 $hb->add (new CFClient::UI::Button 1504 $hb->add (new CFClient::UI::Button
1384 text => "close", 1505 text => "close",
1385 tooltip => "Closes the binding window", 1506 tooltip => "Closes the binding window",
1386 expand => 1, 1507 expand => 1,
1387 on_activate => sub { 1508 on_activate => sub {
1388 $SETUP_DIALOG->hide; 1509 $SETUP_DIALOG->hide;
1510 0
1389 } 1511 }
1390 ); 1512 );
1391 1513
1392 $refresh->(); 1514 $refresh->();
1393 1515
… …
1400 y => 'center', 1522 y => 'center',
1401 z => 2, 1523 z => 2,
1402 name => 'doc_browser', 1524 name => 'doc_browser',
1403 force_w => int $WIDTH * 7/8, 1525 force_w => int $WIDTH * 7/8,
1404 force_h => int $HEIGHT * 7/8, 1526 force_h => int $HEIGHT * 7/8,
1405 title => "Documentation"; 1527 title => "Help Browser",
1528 has_close_button => 1;
1406 1529
1407 $win->add (my $vbox = new CFClient::UI::VBox); 1530 $win->add (my $vbox = new CFClient::UI::VBox);
1408 1531
1409 $vbox->add (my $buttons = new CFClient::UI::HBox); 1532 $vbox->add (my $buttons = new CFClient::UI::HBox);
1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1536 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox 1537 $buttons->add (my $combo = new CFClient::UI::Combobox
1415 value => undef, 1538 value => undef,
1416 options => [ 1539 options => [
1417 [intro => "Introduction"], 1540 [intro => "Introduction"],
1418 [manual => "Manual"], 1541 [manual => "Main Manual"],
1419 [skill_help => "Skills"], 1542 [skill_help => "Skill Reference"],
1420 [command_help => "Commands"], 1543 [command_help => "Command Reference"],
1421 [dmcommand_help => "DM Commands"], 1544 [dmcommand_help => "DM Commands"],
1422 [COPYING => "License Terms"], 1545 [COPYING => "License Terms"],
1423 ], 1546 ],
1424 on_changed => sub { 1547 on_changed => sub {
1425 my ($self, $pod) = @_; 1548 my ($self, $pod) = @_;
1426 1549
1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1428 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1429 1552
1430 $viewer->clear; 1553 $viewer->clear;
1554
1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558# ]);#d#
1431 1559
1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1433 for @$pom; 1561 for @$pom;
1434 1562
1435 $viewer->set_offset (0); 1563 $viewer->set_offset (0);
1564
1565 0
1436 }, 1566 },
1437 on_visibility_change => sub { 1567 on_visibility_change => sub {
1438 my ($self, $visible) = @_; 1568 my ($self, $visible) = @_;
1439 return unless $visible; 1569 return unless $visible;
1440 return if $self->{value}; 1570 return if $self->{value};
1441 $self->set_value ("intro"); 1571 $self->set_value ("intro");
1572 0
1442 }, 1573 },
1443 ); 1574 );
1444 1575
1445 $win 1576 $win
1446} 1577}
… …
1485 z => 100, 1616 z => 100,
1486 force_x => "max", 1617 force_x => "max",
1487 force_y => 0; 1618 force_y => 0;
1488 $DEBUG_STATUS->show; 1619 $DEBUG_STATUS->show;
1489 1620
1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1491 1622
1492 $STATUSBOX = new CFClient::UI::Statusbox; 1623 $STATUSBOX = new CFClient::UI::Statusbox;
1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1624 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1494 1625
1495 (new CFClient::UI::Frame 1626 (new CFClient::UI::Frame
… …
1515 $MAPWIDGET->connect (activate_console => sub { 1646 $MAPWIDGET->connect (activate_console => sub {
1516 my ($mapwidget, $preset) = @_; 1647 my ($mapwidget, $preset) = @_;
1517 1648
1518 if ($CONSOLE) { 1649 if ($CONSOLE) {
1519 $CONSOLE->{input}->{auto_activated} = 1; 1650 $CONSOLE->{input}->{auto_activated} = 1;
1520 $CONSOLE->{input}->focus_in; 1651 $CONSOLE->{input}->grab_focus;
1521 1652
1522 if ($preset && $CONSOLE->{input}->get_text eq '') { 1653 if ($preset && $CONSOLE->{input}->get_text eq '') {
1523 $CONSOLE->{input}->set_text ($preset); 1654 $CONSOLE->{input}->set_text ($preset);
1524 } 1655 }
1525 } 1656 }
1526 }); 1657 });
1527 $MAPWIDGET->show; 1658 $MAPWIDGET->show;
1528 $MAPWIDGET->focus_in; 1659 $MAPWIDGET->grab_focus;
1529 1660
1530 $LOGVIEW = new CFClient::UI::TextScroller 1661 $LOGVIEW = new CFClient::UI::TextScroller
1531 expand => 1, 1662 expand => 1,
1532 font => $FONT_FIXED, 1663 font => $FONT_FIXED,
1533 fontsize => $::CFG->{log_fontsize}, 1664 fontsize => $::CFG->{log_fontsize},
… …
1543 x => 'center', 1674 x => 'center',
1544 y => 'center', 1675 y => 'center',
1545 z => 2, 1676 z => 2,
1546 force_w => $::WIDTH * 0.6, 1677 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6, 1678 force_h => $::HEIGHT * 0.6,
1679 has_close_button => 1,
1548 ; 1680 ;
1681
1682 $METASERVER = metaserver_dialog;
1549 1683
1550 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1684 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1685 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552 1686
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1687 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1691 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1692 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1693 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music."); 1694 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1695 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings." 1696 "Lets you define, edit and delete key bindings."
1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1697 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1564 . "with nothing set and the recording started. After doing the actions you " 1698 . "with nothing set and the recording started. After doing the actions you "
1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1699 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1566 . "After pressing the combo the binding will be saved automatically and the " 1700 . "After pressing the combo the binding will be saved automatically and the "
1567 . "binding editor closes"); 1701 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1702 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask."); 1703 "Some debuggin' options. Do not ask.");
1572 1704
1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1574 1706
1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1707 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1576 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1708 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1578 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1711 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1580 1712
1581 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 1713 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
1582 1714
1583 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1584 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1585 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1586 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1716 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1588 1717
1589 $BUTTONBAR->add (new CFClient::UI::Button 1718 $BUTTONBAR->add (new CFClient::UI::Button
1590 text => "Save Config", 1719 text => "Save Config",
1591 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1720 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1592 on_activate => sub { 1721 on_activate => sub {
1593 $::CFG->{layout} = CFClient::UI::get_layout; 1722 $::CFG->{layout} = CFClient::UI::get_layout;
1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1723 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1595 status "Configuration Saved"; 1724 status "Configuration Saved";
1725 0
1596 }, 1726 },
1597 ); 1727 );
1598 1728
1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1729 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1600 tooltip => "View Documentation"); 1730 tooltip => "View Documentation");
1601 1731
1602 $BUTTONBAR->add (new CFClient::UI::Button 1732 $BUTTONBAR->add (new CFClient::UI::Button
1603 text => "Quit", 1733 text => "Quit",
1604 tooltip => "Terminates the program", 1734 tooltip => "Terminates the program",
… …
1606 if ($CONN) { 1736 if ($CONN) {
1607 open_quit_dialog; 1737 open_quit_dialog;
1608 } else { 1738 } else {
1609 exit; 1739 exit;
1610 } 1740 }
1741 0
1611 }, 1742 },
1612 ); 1743 );
1613 1744
1614 $BUTTONBAR->show; 1745 $BUTTONBAR->show;
1615 $SETUP_DIALOG->show; 1746 $SETUP_DIALOG->show;
… …
1617 1748
1618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1749 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1619} 1750}
1620 1751
1621sub video_shutdown { 1752sub video_shutdown {
1753 CFClient::OpenGL::shutdown;
1754
1622 undef $SDL_ACTIVE; 1755 undef $SDL_ACTIVE;
1623} 1756}
1624 1757
1625my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1758my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1626my $bgmusic;#TODO#hack#d# 1759my $bgmusic;#TODO#hack#d#
… …
1842 1975
1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1844 CFClient::UI::set_layout ($::CFG->{layout}); 1977 CFClient::UI::set_layout ($::CFG->{layout});
1845 1978
1846 my %DEF_CFG = ( 1979 my %DEF_CFG = (
1847 sdl_mode => 0, 1980 sdl_mode => 0,
1848 width => 640, 1981 width => 640,
1849 height => 480, 1982 height => 480,
1850 fullscreen => 0, 1983 fullscreen => 0,
1851 fast => 0, 1984 fast => 0,
1852 map_scale => 1, 1985 map_scale => 1,
1853 fow_enable => 1, 1986 fow_enable => 1,
1854 fow_intensity => 0.45, 1987 fow_intensity => 0.45,
1855 fow_smooth => 0, 1988 fow_smooth => 0,
1856 gui_fontsize => 1, 1989 gui_fontsize => 1,
1857 log_fontsize => 0.7, 1990 log_fontsize => 0.7,
1858 gauge_fontsize=> 1, 1991 gauge_fontsize => 1,
1859 gauge_size => 0.35, 1992 gauge_size => 0.35,
1860 stat_fontsize => 0.7, 1993 stat_fontsize => 0.7,
1861 mapsize => 100, 1994 mapsize => 100,
1862 host => "crossfire.schmorp.de",
1863 say_command => 'say', 1995 say_command => 'say',
1864 audio_enable => 1, 1996 audio_enable => 1,
1865 bgm_enable => 1, 1997 bgm_enable => 1,
1866 bgm_volume => 0.25, 1998 bgm_volume => 0.25,
1867 face_prefetch => 0, 1999 face_prefetch => 0,
1868 output_sync => 1, 2000 output_sync => 1,
1869 output_count => 1, 2001 output_count => 1,
1870 pickup => 0, 2002 pickup => 0,
2003 default => "profile", # default profile
2004 );
1871 ); 2005
1872
1873 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1874 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1875 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1876 2011
1877 sdl_init; 2012 sdl_init;
1878 2013
1879 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1880 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1922 video_init; 2057 video_init;
1923 audio_init; 2058 audio_init;
1924} 2059}
1925 2060
1926Event::loop; 2061Event::loop;
2062#CFClient::SDL_Quit;
2063#CFClient::_exit 0;
1927 2064
1928END { CFClient::SDL_Quit } 2065END { CFClient::SDL_Quit }
1929 2066
1930=head1 NAME 2067=head1 NAME
1931 2068

Diff Legend

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