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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 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" };
44 45
45$Event::DIED = sub { 46$Event::DIED = sub {
… …
84our $CONSOLE; 85our $CONSOLE;
85our $METASERVER; 86our $METASERVER;
86our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 88our $QUIT_DIALOG;
88our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $SERVER_INFO;
89 91
90our $SETUP_DIALOG; 92our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 93our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 94our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 95our $SETUP_KEYBOARD;
… …
108 110
109our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 112our $STATUSBOX;
111our $DEBUG_STATUS; 113our $DEBUG_STATUS;
112 114
113our $INV_WINDOW;
114our $INV; 115our $INV;
115our $INVR; 116our $INVR;
116our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
117 118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
118our $BIND_EDITOR; 122our $BIND_EDITOR;
123our $BIND_UPD_CB;
119 124
120our $PICKUP_CFG; 125our $PICKUP_CFG;
121 126
122sub status { 127sub status {
123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 128 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
154 $hbox->add (new CFClient::UI::Button 159 $hbox->add (new CFClient::UI::Button
155 text => "No", 160 text => "No",
156 on_activate => sub { 161 on_activate => sub {
157 $conn->send ("reply n"); 162 $conn->send ("reply n");
158 $dialog->destroy; 163 $dialog->destroy;
164 0
159 } 165 }
160 ); 166 );
161 $hbox->add (new CFClient::UI::Button 167 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 168 text => "Yes",
163 on_activate => sub { 169 on_activate => sub {
164 $conn->send ("reply y"); 170 $conn->send ("reply y");
165 destroy_query_dialog $conn; 171 destroy_query_dialog $conn;
172 0
166 }, 173 },
167 ); 174 );
168 175
169 $dialog->focus_in; 176 $dialog->grab_focus;
170 177
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 178 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 179 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173 180
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 181 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
184 $table->add (0, 0, new CFClient::UI::Button 191 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 192 text => "Next Race",
186 on_activate => sub { 193 on_activate => sub {
187 $conn->send ("reply n"); 194 $conn->send ("reply n");
188 destroy_query_dialog $conn; 195 destroy_query_dialog $conn;
196 0
189 }, 197 },
190 ); 198 );
191 $table->add (2, 0, new CFClient::UI::Button 199 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 200 text => "Accept",
193 on_activate => sub { 201 on_activate => sub {
194 $conn->send ("reply d"); 202 $conn->send ("reply d");
195 destroy_query_dialog $conn; 203 destroy_query_dialog $conn;
204 0
196 }, 205 },
197 ); 206 );
198 207
199 unshift @dialog, new CFClient::UI::Label 208 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 209 max_w => $::WIDTH * 0.4,
… …
230 $table->add (0, 0, new CFClient::UI::Button 239 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 240 text => "Roll Again",
232 on_activate => sub { 241 on_activate => sub {
233 $conn->send ("reply y"); 242 $conn->send ("reply y");
234 destroy_query_dialog $conn; 243 destroy_query_dialog $conn;
244 0
235 }, 245 },
236 ); 246 );
237 247
238 # center: swap stats 248 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
253 text => "Swap Stats", 263 text => "Swap Stats",
254 on_activate => sub { 264 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 265 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 266 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 267 destroy_query_dialog $conn;
268 0
258 }, 269 },
259 ); 270 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 271 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 272
262 # right: accept 273 # right: accept
… …
264 text => "Accept", 275 text => "Accept",
265 on_activate => sub { 276 on_activate => sub {
266 $conn->send ("reply n"); 277 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 278 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn; 279 destroy_query_dialog $conn;
280 0
269 }, 281 },
270 ); 282 );
271 283
272 unshift @dialog, new CFClient::UI::Label 284 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 285 max_w => $::WIDTH * 0.4,
… …
283 295
284 push @dialog, my $entry = new CFClient::UI::Entry 296 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 297 on_changed => sub {
286 $conn->send ("reply $_[1]"); 298 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 299 destroy_query_dialog $conn;
300 0
288 }, 301 },
289 ; 302 ;
290 303
291 $entry->focus_in; 304 $entry->grab_focus;
292 305
293 } else { 306 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 307 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295 308
296 push @dialog, my $entry = new CFClient::UI::Entry 309 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 310 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 311 on_activate => sub {
299 $conn->send ("reply $_[1]"); 312 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 313 destroy_query_dialog $conn;
314 0
301 }, 315 },
302 ; 316 ;
303 317
304 $entry->focus_in; 318 $entry->grab_focus;
305 } 319 }
306 320
307 $vbox->add (@dialog); 321 $vbox->add (@dialog);
308 $dialog->show; 322 $dialog->show;
309} 323}
… …
314 $LOGIN_BUTTON->set_text ("Logout"); 328 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 329 $SETUP_DIALOG->hide;
316 330
317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 331 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318 332
319 my ($host, $port) = split /:/, $CFG->{host}; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 334
321 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
322 336
323 $CONN = eval { 337 $CONN = eval {
324 new CFClient::Protocol 338 new CFClient::Protocol
325 host => $host, 339 host => $host,
326 port => $port || 13327, 340 port => $port || 13327,
327 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 343 mapw => $mapsize,
330 maph => $mapsize, 344 maph => $mapsize,
331 345
332 map_widget => $MAPWIDGET, 346 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 347 logview => $LOGVIEW,
… …
361 375
362sub stop_game { 376sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 377 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 379 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 380 $PL_WINDOW->hide;
381 $SETUP_SPELLS->clear_spells;
367 382
368 return unless $CONN; 383 return unless $CONN;
369 384
370 status "connection closed"; 385 status "connection closed";
371 386
372 destroy_query_dialog $CONN; 387 destroy_query_dialog $CONN;
373 $CONN->destroy; 388 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
390
391 undef $MAP;
375} 392}
376 393
377sub graphics_setup { 394sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 395 my $vbox = new CFClient::UI::VBox;
379 396
… …
397 414
398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 415 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 416 $table->add (1, $row++, new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 417 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 418 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 420 );
407 421
408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 424 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 425 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 427 );
417 428
418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419 $table->add (1, $row++, new CFClient::UI::Slider 430 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 431 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 432 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 434 );
427 435
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 436 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 437 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 438 state => $CFG->{fow_enable},
431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 439 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 441 );
437 442
438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 443 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439 $table->add (1, $row++, new CFClient::UI::Slider 444 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 445 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 446 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 448 );
447 449
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 451 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 452 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub { 454 on_changed => sub {
453 my ($self, $value) = @_; 455 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 456 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
458 0
456 } 459 }
457 ); 460 );
458 461
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 462 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider 463 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 464 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 465 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 466 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 467 );
465 468
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 469 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 472 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 474 );
472 475
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474 477
475 $table->add (1, $row++, new CFClient::UI::Slider 478 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub { 481 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1]; 482 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize; 483 &set_stats_window_fontsize;
484 0
481 } 485 }
482 ); 486 );
483 487
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 492 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 493 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 494 &set_gauge_window_fontsize;
495 0
491 } 496 }
492 ); 497 );
493 498
494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 501 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 502 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498 on_changed => sub { 503 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 504 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 505 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
506 0
501 } 507 }
502 ); 508 );
503 509
504 $table->add (1, $row++, new CFClient::UI::Button 510 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 511 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 512 tooltip => "Apply the video settings",
507 on_activate => sub { 513 on_activate => sub {
508 video_shutdown (); 514 video_shutdown ();
509 video_init (); 515 video_init ();
516 0
510 } 517 }
511 ); 518 );
512 519
513 $vbox 520 $vbox
514} 521}
… …
522 529
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 530 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 531 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 532 state => $CFG->{audio_enable},
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.", 533 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.",
527 on_changed => sub { 534 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 535 );
531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 536# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 537# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533# $CFG->{effects_volume} = $_[1]; 538# $CFG->{effects_volume} = $_[1];
534# }); 539# });
535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 540 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 541 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 542 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 543 expand => 1, state => $CFG->{bgm_enable},
539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 544 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 546 );
544 $hbox->add (new CFClient::UI::Slider 547 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 548 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 549 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 550 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 551 );
552 552
553 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
556 on_activate => sub { 556 on_activate => sub {
557 audio_shutdown (); 557 audio_shutdown ();
558 audio_init (); 558 audio_init ();
559 0
559 } 560 }
560 ); 561 );
561 562
562 $vbox 563 $vbox
563} 564}
… …
629 630
630sub debug_setup { 631sub debug_setup {
631 my $table = new CFClient::UI::Table; 632 my $table = new CFClient::UI::Table;
632 633
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
641 642
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643 644
644 for my $x (0..2) { 645 for my $x (0..2) {
645 for my $y (0 .. 2) { 646 for my $y (0 .. 2) {
… …
654 655
655 $table 656 $table
656} 657}
657 658
658sub stats_window { 659sub stats_window {
659 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw =
660 y => $HEIGHT * (2/8), 661 new CFClient::UI::Window
661 x => "max", 662 child => my $vb = new CFClient::UI::VBox;
662 title => "Stats",
663 name => "stats_window";
664 663
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
669 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
… …
694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
695 693
696 [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."], 694 [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."],
697 [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."], 695 [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."],
698 [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."], 696 [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."],
699 [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."], 697 [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."],
700 [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."], 698 [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."],
701 [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."], 699 [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."],
702 ) { 700 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
704 702
… …
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
727 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 phys => "<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.)",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
730 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)", 728 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)",
731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
750 ); 748 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
752 font => $FONT_FIXED, 750 font => $FONT_FIXED,
753 can_hover => 1, 751 can_hover => 1,
754 can_events => 1, 752 can_events => 1,
755 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
757 ); 755 );
758 756
759 $row++; 757 $row++;
760 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
… …
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816 814
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818 816
819 # TODO: replace by CS_STAT_RES_xxx constants
820 my %tbl = ( 817 my %tbl = (
821 phys => 100, 818 phys => CS_STAT_RES_PHYS,
822 magic => 101, 819 magic => CS_STAT_RES_MAG,
823 fire => 102, 820 fire => CS_STAT_RES_FIRE,
824 elec => 103, 821 elec => CS_STAT_RES_ELEC,
825 cold => 104, 822 cold => CS_STAT_RES_COLD,
826 conf => 105, 823 conf => CS_STAT_RES_CONF,
827 acid => 106, 824 acid => CS_STAT_RES_ACID,
828 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
829 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
830 pois => 109, 827 pois => CS_STAT_RES_POISON,
831 slow => 110, 828 slow => CS_STAT_RES_SLOW,
832 para => 111, 829 para => CS_STAT_RES_PARA,
833 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
834 fear => 113, 831 fear => CS_STAT_RES_FEAR,
835 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
836 deat => 115, 833 deat => CS_STAT_RES_DEATH,
837 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
838 blind => 117, 835 blind => CS_STAT_RES_BLIND,
839 ); 836 );
840 837
841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
842 for keys %tbl; 839 for keys %tbl;
843} 840}
844 841
845my $METASERVER_ATIME; 842my $METASERVER_ATIME;
846 843
847sub update_metaserver { 844sub update_metaserver {
845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
849
848 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
849 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
850 852
851 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
852 $table->clear; 854 $table->clear;
… …
917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
918 (new CFClient::UI::Button 920 (new CFClient::UI::Button
919 text => "Use", 921 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field", 922 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub { 923 on_activate => sub {
922 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
923 $METASERVER->hide; 925 $METASERVER->hide;
926 0
924 }, 927 },
925 ), 928 ),
926 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
927 ]); 930 ]);
928 931
… …
939 } 942 }
940 }); 943 });
941} 944}
942 945
943sub metaserver_dialog { 946sub metaserver_dialog {
947 my $vbox = new CFClient::UI::VBox;
948 my $table = new CFClient::UI::Table;
949 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
950
944 my $dialog = new CFClient::UI::FancyFrame 951 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List", 952 title => "Server List",
946 name => 'metaserver_dialog', 953 name => 'metaserver_dialog',
947 x => 'center', 954 x => 'center',
948 y => 'center', 955 y => 'center',
949 z => 3, 956 z => 3,
950 force_h => $::HEIGHT * 0.4, 957 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
952 on_visibility_change => sub { 961 on_visibility_change => sub {
953 update_metaserver if $_[1]; 962 update_metaserver ($_[0]) if $_[1];
963 0
954 }, 964 },
955 ; 965 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 966
961 $dialog 967 $dialog
962} 968}
963 969
964sub server_setup { 970sub server_setup {
… …
971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
972 978
973 $vbox->add ( 979 $vbox->add (
974 $HOST_ENTRY = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
975 expand => 1, 981 expand => 1,
976 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 983 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
978 on_changed => sub { 984 on_changed => sub {
979 my ($self, $value) = @_; 985 my ($self, $value) = @_;
980 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
987 0
981 } 988 }
982 ); 989 );
983
984 $METASERVER = metaserver_dialog;
985 990
986 $vbox->add (new CFClient::UI::Button 991 $vbox->add (new CFClient::UI::Button
987 expand => 1, 992 expand => 1,
988 text => "Server List", 993 text => "Server List",
989 other => $METASERVER, 994 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 995 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility }, 996 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 997 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 998 );
994 } 999 }
995 1000
996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1001 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
997 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
998 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
1000 on_changed => sub { 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 my ($self, $value) = @_;
1002 $CFG->{user} = $value;
1003 }
1004 ); 1006 );
1005 1007
1006 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1007 $table->add (1, 5, new CFClient::UI::Entry 1009 $table->add (1, 5, new CFClient::UI::Entry
1008 text => $CFG->{password}, 1010 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 1011 hidden => 1,
1010 tooltip => "The password for your character", 1012 tooltip => "The password for your character",
1011 on_changed => sub { 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 my ($self, $value) = @_;
1013 $CFG->{password} = $value;
1014 }
1015 ); 1014 );
1016 1015
1017 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1016 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1018 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
1019 force_w => 100, 1018 force_w => 100,
1020 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1019 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1021 tooltip => "This is the size of the portion of the map update the server sends you. " 1020 tooltip => "This is the size of the portion of the map update the server sends you. "
1022 . "If you set this to a high value you will be able to see further, " 1021 . "If you set this to a high value you will be able to see further, "
1023 . "but you also increase bandwidth requirements and latency. " 1022 . "but you also increase bandwidth requirements and latency. "
1024 . "This option is only used once at log-in.", 1023 . "This option is only used once at log-in.",
1025 on_changed => sub { 1024 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1026 my ($self, $value) = @_;
1027
1028 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1029 },
1030 ); 1025 );
1031 1026
1032 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1027 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1033 $table->add (1, 8, new CFClient::UI::CheckBox 1028 $table->add (1, 8, new CFClient::UI::CheckBox
1034 state => $CFG->{face_prefetch}, 1029 state => $CFG->{face_prefetch},
… …
1037 . "This might increase or create lag, but increases the chances " 1032 . "This might increase or create lag, but increases the chances "
1038 . "of faces being ready for display when you encounter them. " 1033 . "of faces being ready for display when you encounter them. "
1039 . "It also uses up server bandwidth on every connect, " 1034 . "It also uses up server bandwidth on every connect, "
1040 . "so only set it if you really need to prefetch images. " 1035 . "so only set it if you really need to prefetch images. "
1041 . "This option can be set and unset any time.", 1036 . "This option can be set and unset any time.",
1042 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1037 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1043 ); 1038 );
1044 1039
1045 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1040 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1046 $table->add (1, 9, new CFClient::UI::Entry 1041 $table->add (1, 9, new CFClient::UI::Entry
1047 text => $CFG->{output_count}, 1042 text => $CFG->{output_count},
1048 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1043 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1049 on_changed => sub { $CFG->{output_count} = $_[1] }, 1044 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1050 ); 1045 );
1051 1046
1052 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1047 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1053 $table->add (1, 10, new CFClient::UI::Entry 1048 $table->add (1, 10, new CFClient::UI::Entry
1054 text => $CFG->{output_sync}, 1049 text => $CFG->{output_sync},
1055 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1050 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1056 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1051 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1057 ); 1052 );
1058 1053
1059 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1054 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1060 expand => 1, 1055 expand => 1,
1061 align => 0, 1056 align => 0,
1062 text => "Login", 1057 text => "Login",
1063 on_activate => sub { 1058 on_activate => sub {
1064 $CONN ? stop_game 1059 $CONN ? stop_game
1065 : start_game; 1060 : start_game;
1061 0
1066 }, 1062 },
1067 ); 1063 );
1068 1064
1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1065 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1066 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1073 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1069 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1074 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1070 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub { 1071 on_changed => sub {
1076 my ($self, $value) = @_; 1072 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1073 $CFG->{say_command} = $value;
1074 0
1078 } 1075 }
1079 ); 1076 );
1077
1078 $vbox->add (new CFClient::UI::Label
1079 text => "Server Info",
1080 fontsize => 1.2,
1081 padding_y => 8,
1082 fg => [1, 1, 0, 1],
1083 );
1084
1085 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1080 1086
1081 $vbox 1087 $vbox
1082} 1088}
1083 1089
1084sub message_window { 1090sub message_window {
… …
1089 bg => [0, 0, 0, 0.75], 1095 bg => [0, 0, 0, 0.75],
1090 x => "max", 1096 x => "max",
1091 y => 0, 1097 y => 0,
1092 force_w => $::WIDTH * 0.4, 1098 force_w => $::WIDTH * 0.4,
1093 force_h => $::HEIGHT * 0.5, 1099 force_h => $::HEIGHT * 0.5,
1094 child => (my $vbox = new CFClient::UI::VBox); 1100 child => (my $vbox = new CFClient::UI::VBox),
1101 has_close_button => 1;
1095 1102
1096 $vbox->add ($LOGVIEW); 1103 $vbox->add ($LOGVIEW);
1097 1104
1098 $vbox->add (my $input = new CFClient::UI::Entry 1105 $vbox->add (my $input = new CFClient::UI::Entry
1099 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1106 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1107 1114
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1115 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1; 1116 $input->{refocus_map} = 1;
1110 } 1117 }
1111 delete $input->{auto_activated}; 1118 delete $input->{auto_activated};
1119
1120 0
1112 }, 1121 },
1113 on_activate => sub { 1122 on_activate => sub {
1114 my ($input, $text) = @_; 1123 my ($input, $text) = @_;
1115 $input->set_text (''); 1124 $input->set_text ('');
1116 1125
… …
1122 } 1131 }
1123 if ($input->{refocus_map}) { 1132 if ($input->{refocus_map}) {
1124 delete $input->{refocus_map}; 1133 delete $input->{refocus_map};
1125 $MAPWIDGET->focus_in 1134 $MAPWIDGET->focus_in
1126 } 1135 }
1136
1137 0
1127 }, 1138 },
1128 on_escape => sub { 1139 on_escape => sub {
1129 $MAPWIDGET->focus_in 1140 $MAPWIDGET->grab_focus;
1141
1142 0
1130 }, 1143 },
1131 ); 1144 );
1132 1145
1133 $CONSOLE = { 1146 $CONSOLE = {
1134 window => $window, 1147 window => $window,
… …
1156 ); 1169 );
1157 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1170 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1158 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
1159 text => "Ok", 1172 text => "Ok",
1160 expand => 1, 1173 expand => 1,
1161 on_activate => sub { $QUIT_DIALOG->hide }, 1174 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1162 ); 1175 );
1163 $hb->add (new CFClient::UI::Button 1176 $hb->add (new CFClient::UI::Button
1164 text => "Quit anyway", 1177 text => "Quit anyway",
1165 expand => 1, 1178 expand => 1,
1166 on_activate => sub { exit }, 1179 on_activate => sub { exit },
… …
1209 ["Potions" => PICKUP_POTION], 1222 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED], 1224 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS], 1225 ["Jewelery" => PICKUP_JEWELS],
1213 ], 1226 ],
1227 ["Weight/Value ratio", 2, 17]
1214 ) 1228 )
1215 { 1229 {
1216 my ($title, $x, $y, @bits) = @$_; 1230 my ($title, $x, $y, @bits) = @$_;
1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1231 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1218 1232
… …
1220 ++$y; 1234 ++$y;
1221 1235
1222 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1225 state => $CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1226 on_changed => sub { 1240 on_changed => sub {
1227 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1228 1242
1229 if ($value) { 1243 if ($value) {
1230 $::CFG->{pickup} |= $mask; 1244 $::CFG->{pickup} |= $mask;
… …
1232 $::CFG->{pickup} &= ~$mask; 1246 $::CFG->{pickup} &= ~$mask;
1233 } 1247 }
1234 1248
1235 $::CONN->send_command ("pickup $::CFG->{pickup}") 1249 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN; 1250 if defined $::CONN;
1251
1252 0
1237 }); 1253 });
1238 } 1254 }
1239 } 1255 }
1240 1256
1257 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub {
1262 my ($slider, $value) = @_;
1263
1264 $::CFG->{pickup} &= ~0xF;
1265 $::CFG->{pickup} |= int $value
1266 if $value;
1267 1;
1268 });
1269
1270 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set",
1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275 0
1276 });
1277
1241 $table 1278 $table
1242} 1279}
1243 1280
1244sub inventory_window { 1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $hb
1298}
1299
1300sub player_window {
1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1246 x => "center", 1302 x => "center",
1247 y => "center", 1303 y => "center",
1248 force_w => $WIDTH * 9/10, 1304 force_w => $WIDTH * 9/10,
1249 force_h => $HEIGHT * 9/10, 1305 force_h => $HEIGHT * 9/10,
1250 title => "Inventory", 1306 title => "Player",
1307 has_close_button => 1
1251 ; 1308 ;
1252 1309
1253 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 );
1254 1322
1255 $hb->add (my $vb1 = new CFClient::UI::VBox); 1323 $ntb->add (
1256 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1324 Stats => $STATS_WINDOW = stats_window,
1257 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1258 1331
1259 $hb->add (my $vb2 = new CFClient::UI::VBox); 1332 $plwin->add ($ntb);
1260 1333 $plwin
1261 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1262
1263 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1264
1265 # XXX: Call after $INVR = ... because set_opencont sets the items
1266 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1267
1268 $invwin
1269} 1334}
1270 1335
1271sub spell_setup { 1336sub update_bindings {
1272 new CFClient::UI::SpellList 1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1273} 1338}
1274 1339
1275sub keyboard_setup { 1340sub keyboard_setup {
1276 my $binding_list = new CFClient::UI::VBox; 1341 my $binding_list = new CFClient::UI::VBox;
1277 1342
1278 my $refresh; 1343 my $refresh;
1279 $refresh = sub { 1344 $refresh = $BIND_UPD_CB = sub {
1280 $binding_list->clear (); 1345 $binding_list->clear ();
1281 1346
1282 for my $mod (keys %{$::CFG->{bindings}}) { 1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1283 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1284 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1285 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1286 1351
1287 my $lbl = join "; ", @$cmds; 1352 my $lbl = join "; ", @$cmds;
1288 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1289 $binding_list->add (my $hb = new CFClient::UI::HBox); 1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1290 $hb->add (new CFClient::UI::Button 1355 $hb->add (new CFClient::UI::Button
1291 text => "delete", 1356 text => "delete",
1292 tooltip => "Deletes the binding", 1357 tooltip => "Deletes the binding",
1293 on_activate => sub { 1358 on_activate => sub {
1294 $binding_list->remove ($hb); 1359 $binding_list->remove ($hb);
1295 delete $::CFG->{bindings}->{$mod}->{$sym}; 1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1361 0
1296 }); 1362 });
1297 1363
1298 $hb->add (new CFClient::UI::Button 1364 $hb->add (new CFClient::UI::Button
1299 text => "edit", 1365 text => "edit",
1300 tooltip => "Edits the binding", 1366 tooltip => "Edits the binding",
1301 on_activate => sub { 1367 on_activate => sub {
1302 $::BIND_EDITOR->set_binding ( 1368 $::BIND_EDITOR->set_binding (
1303 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1304 sub { 1370 sub {
1305 my ($nmod, $nsym, $ncmds) = @_; 1371 my ($nmod, $nsym, $ncmds) = @_;
1306 delete $::CFG->{bindings}->{$mod}->{$sym}; 1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1307 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1308 $refresh->(); 1374 $refresh->();
1309 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1310 $SETUP_DIALOG->show; 1376 $SETUP_DIALOG->show;
1311 }, 1377 },
1312 sub { 1378 sub {
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1380 $SETUP_DIALOG->show;
1315 }); 1381 });
1316 $::BIND_EDITOR->show; 1382 $::BIND_EDITOR->show;
1317 $SETUP_DIALOG->hide; 1383 $SETUP_DIALOG->hide;
1384 0
1318 }); 1385 });
1319 1386
1320 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1387 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1321 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1388 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1322 } 1389 }
1323 } 1390 }
1324 }; 1391 };
1325 1392
1326 my $vb = new CFClient::UI::VBox; 1393 my $vb = new CFClient::UI::VBox;
1394 $vb->add (my $hb = new CFClient::UI::HBox);
1395 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1396 $hb->add (new CFClient::UI::CheckBox
1397 expand => 1,
1398 state => $CFG->{shift_fire_stop},
1399 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1400 on_changed => sub {
1401 my ($cbox, $value) = @_;
1402 $CFG->{shift_fire_stop} = $value;
1403 0
1404 });
1405
1327 $vb->add ($binding_list); 1406 $vb->add ($binding_list);
1328 $vb->add (my $hb = new CFClient::UI::HBox); 1407 $vb->add (my $hb = new CFClient::UI::HBox);
1329 1408
1330 $hb->add (new CFClient::UI::Button 1409 $hb->add (new CFClient::UI::Button
1331 text => "record new", 1410 text => "record new",
… …
1333 tooltip => "This button opens the binding editor with an empty binding.", 1412 tooltip => "This button opens the binding editor with an empty binding.",
1334 on_activate => sub { 1413 on_activate => sub {
1335 $::BIND_EDITOR->set_binding (undef, undef, [], 1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1336 sub { 1415 sub {
1337 my ($mod, $sym, $cmds) = @_; 1416 my ($mod, $sym, $cmds) = @_;
1338 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1339 $refresh->(); 1418 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1342 }, 1421 },
1343 sub { 1422 sub {
… …
1345 $SETUP_DIALOG->show; 1424 $SETUP_DIALOG->show;
1346 }, 1425 },
1347 ); 1426 );
1348 $SETUP_DIALOG->hide; 1427 $SETUP_DIALOG->hide;
1349 $::BIND_EDITOR->show; 1428 $::BIND_EDITOR->show;
1429 0
1350 }, 1430 },
1351 ); 1431 );
1352 1432
1353 $hb->add (new CFClient::UI::Button 1433 $hb->add (new CFClient::UI::Button
1354 text => "close", 1434 text => "close",
1355 tooltip => "Closes the binding window", 1435 tooltip => "Closes the binding window",
1356 expand => 1, 1436 expand => 1,
1357 on_activate => sub { 1437 on_activate => sub {
1358 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1439 0
1359 } 1440 }
1360 ); 1441 );
1361 1442
1362 $refresh->(); 1443 $refresh->();
1363 1444
… …
1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1464 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox 1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef, 1466 value => undef,
1386 options => [ 1467 options => [
1387 [intro => "Introduction"], 1468 [intro => "Introduction"],
1388 [manual => "Manual"], 1469 [manual => "Main Manual"],
1389 [skill_help => "Skills"], 1470 [skill_help => "Skill Reference"],
1390 [command_help => "Commands"], 1471 [command_help => "Command Reference"],
1391 [dmcommand_help => "DM Commands"], 1472 [dmcommand_help => "DM Commands"],
1392 [COPYING => "License Terms"], 1473 [COPYING => "License Terms"],
1393 ], 1474 ],
1394 on_changed => sub { 1475 on_changed => sub {
1395 my ($self, $pod) = @_; 1476 my ($self, $pod) = @_;
1396 1477
1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1399 1480
1400 $viewer->clear; 1481 $viewer->clear;
1482
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d#
1401 1487
1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1403 for @$pom; 1489 for @$pom;
1404 1490
1405 $viewer->set_offset (0); 1491 $viewer->set_offset (0);
1492
1493 0
1406 }, 1494 },
1407 on_visibility_change => sub { 1495 on_visibility_change => sub {
1408 my ($self, $visible) = @_; 1496 my ($self, $visible) = @_;
1409 return unless $visible; 1497 return unless $visible;
1410 return if $self->{value}; 1498 return if $self->{value};
1411 $self->set_value ("intro"); 1499 $self->set_value ("intro");
1500 0
1412 }, 1501 },
1413 ); 1502 );
1414 1503
1415 $win 1504 $win
1416} 1505}
… …
1455 z => 100, 1544 z => 100,
1456 force_x => "max", 1545 force_x => "max",
1457 force_y => 0; 1546 force_y => 0;
1458 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
1459 1548
1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1461 1550
1462 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $STATUSBOX = new CFClient::UI::Statusbox;
1463 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1552 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1464 1553
1465 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
… …
1485 $MAPWIDGET->connect (activate_console => sub { 1574 $MAPWIDGET->connect (activate_console => sub {
1486 my ($mapwidget, $preset) = @_; 1575 my ($mapwidget, $preset) = @_;
1487 1576
1488 if ($CONSOLE) { 1577 if ($CONSOLE) {
1489 $CONSOLE->{input}->{auto_activated} = 1; 1578 $CONSOLE->{input}->{auto_activated} = 1;
1490 $CONSOLE->{input}->focus_in; 1579 $CONSOLE->{input}->grab_focus;
1491 1580
1492 if ($preset && $CONSOLE->{input}->get_text eq '') { 1581 if ($preset && $CONSOLE->{input}->get_text eq '') {
1493 $CONSOLE->{input}->set_text ($preset); 1582 $CONSOLE->{input}->set_text ($preset);
1494 } 1583 }
1495 } 1584 }
1496 }); 1585 });
1497 $MAPWIDGET->show; 1586 $MAPWIDGET->show;
1498 $MAPWIDGET->focus_in; 1587 $MAPWIDGET->grab_focus;
1499 1588
1500 $LOGVIEW = new CFClient::UI::TextScroller 1589 $LOGVIEW = new CFClient::UI::TextScroller
1501 expand => 1, 1590 expand => 1,
1502 font => $FONT_FIXED, 1591 font => $FONT_FIXED,
1503 fontsize => $::CFG->{log_fontsize}, 1592 fontsize => $::CFG->{log_fontsize},
… …
1513 x => 'center', 1602 x => 'center',
1514 y => 'center', 1603 y => 'center',
1515 z => 2, 1604 z => 2,
1516 force_w => $::WIDTH * 0.6, 1605 force_w => $::WIDTH * 0.6,
1517 force_h => $::HEIGHT * 0.6, 1606 force_h => $::HEIGHT * 0.6,
1607 has_close_button => 1,
1518 ; 1608 ;
1609
1610 $METASERVER = metaserver_dialog;
1519 1611
1520 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1612 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1522 1614
1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1527 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1528 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1620 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1529 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1530 "Configure the use of audio, sound effects and background music."); 1622 "Configure the use of audio, sound effects and background music.");
1531 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1532 "Lets you define, edit and delete bindings." 1624 "Lets you define, edit and delete key bindings."
1533 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1534 . "with nothing set and the recording started. After doing the actions you " 1626 . "with nothing set and the recording started. After doing the actions you "
1535 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1536 . "After pressing the combo the binding will be saved automatically and the " 1628 . "After pressing the combo the binding will be saved automatically and the "
1537 . "binding editor closes"); 1629 . "binding editor closes");
1538 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1539 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1540 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask."); 1631 "Some debuggin' options. Do not ask.");
1542 1632
1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1544 1634
1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1635 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1546 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1636 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1548 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1549 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1550 1640
1551 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 1641 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
1552 1642
1553 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1554 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1555 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1556 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1557 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1558 1645
1559 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1560 text => "Save Config", 1647 text => "Save Config",
1561 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1562 on_activate => sub { 1649 on_activate => sub {
1563 $::CFG->{layout} = CFClient::UI::get_layout; 1650 $::CFG->{layout} = CFClient::UI::get_layout;
1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1651 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1565 status "Configuration Saved"; 1652 status "Configuration Saved";
1653 0
1566 }, 1654 },
1567 ); 1655 );
1568 1656
1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1570 tooltip => "View Documentation"); 1658 tooltip => "View Documentation");
… …
1576 if ($CONN) { 1664 if ($CONN) {
1577 open_quit_dialog; 1665 open_quit_dialog;
1578 } else { 1666 } else {
1579 exit; 1667 exit;
1580 } 1668 }
1669 0
1581 }, 1670 },
1582 ); 1671 );
1583 1672
1584 $BUTTONBAR->show; 1673 $BUTTONBAR->show;
1585 $SETUP_DIALOG->show; 1674 $SETUP_DIALOG->show;
… …
1587 1676
1588 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1677 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1589} 1678}
1590 1679
1591sub video_shutdown { 1680sub video_shutdown {
1681 CFClient::OpenGL::shutdown;
1682
1592 undef $SDL_ACTIVE; 1683 undef $SDL_ACTIVE;
1593} 1684}
1594 1685
1595my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1686my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1596my $bgmusic;#TODO#hack#d# 1687my $bgmusic;#TODO#hack#d#
… …
1812 1903
1813 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1814 CFClient::UI::set_layout ($::CFG->{layout}); 1905 CFClient::UI::set_layout ($::CFG->{layout});
1815 1906
1816 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1817 sdl_mode => 0, 1908 sdl_mode => 0,
1818 width => 640, 1909 width => 640,
1819 height => 480, 1910 height => 480,
1820 fullscreen => 0, 1911 fullscreen => 0,
1821 fast => 0, 1912 fast => 0,
1822 map_scale => 1, 1913 map_scale => 1,
1823 fow_enable => 1, 1914 fow_enable => 1,
1824 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1825 fow_smooth => 0, 1916 fow_smooth => 0,
1826 gui_fontsize => 1, 1917 gui_fontsize => 1,
1827 log_fontsize => 0.7, 1918 log_fontsize => 0.7,
1828 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1829 gauge_size => 0.35, 1920 gauge_size => 0.35,
1830 stat_fontsize => 0.7, 1921 stat_fontsize => 0.7,
1831 mapsize => 100, 1922 mapsize => 100,
1832 host => "crossfire.schmorp.de",
1833 say_command => 'say', 1923 say_command => 'say',
1834 audio_enable => 1, 1924 audio_enable => 1,
1835 bgm_enable => 1, 1925 bgm_enable => 1,
1836 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1837 face_prefetch => 0, 1927 face_prefetch => 0,
1838 output_sync => 1, 1928 output_sync => 1,
1839 output_count => 1, 1929 output_count => 1,
1840 pickup => 0, 1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1841 ); 1933
1842
1843 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1844 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1845 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1846 1939
1847 sdl_init; 1940 sdl_init;
1848 1941
1849 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1850 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1892 video_init; 1985 video_init;
1893 audio_init; 1986 audio_init;
1894} 1987}
1895 1988
1896Event::loop; 1989Event::loop;
1990#CFClient::SDL_Quit;
1991#CFClient::_exit 0;
1897 1992
1898END { CFClient::SDL_Quit } 1993END { CFClient::SDL_Quit }
1899 1994
1900=head1 NAME 1995=head1 NAME
1901 1996

Diff Legend

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