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.72 by elmex, Tue Jun 13 18:14:03 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 {
109 110
110our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 112our $STATUSBOX;
112our $DEBUG_STATUS; 113our $DEBUG_STATUS;
113 114
114our $INV_WINDOW;
115our $INV; 115our $INV;
116our $INVR; 116our $INVR;
117our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
118 118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
119our $BIND_EDITOR; 122our $BIND_EDITOR;
123our $BIND_UPD_CB;
120 124
121our $PICKUP_CFG; 125our $PICKUP_CFG;
122 126
123sub status { 127sub status {
124 $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]);
155 $hbox->add (new CFClient::UI::Button 159 $hbox->add (new CFClient::UI::Button
156 text => "No", 160 text => "No",
157 on_activate => sub { 161 on_activate => sub {
158 $conn->send ("reply n"); 162 $conn->send ("reply n");
159 $dialog->destroy; 163 $dialog->destroy;
164 0
160 } 165 }
161 ); 166 );
162 $hbox->add (new CFClient::UI::Button 167 $hbox->add (new CFClient::UI::Button
163 text => "Yes", 168 text => "Yes",
164 on_activate => sub { 169 on_activate => sub {
165 $conn->send ("reply y"); 170 $conn->send ("reply y");
166 destroy_query_dialog $conn; 171 destroy_query_dialog $conn;
172 0
167 }, 173 },
168 ); 174 );
169 175
170 $dialog->focus_in; 176 $dialog->grab_focus;
171 177
172 } elsif ($flags & CS_QUERY_SINGLECHAR) { 178 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $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)";
174 180
175 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) {
185 $table->add (0, 0, new CFClient::UI::Button 191 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race", 192 text => "Next Race",
187 on_activate => sub { 193 on_activate => sub {
188 $conn->send ("reply n"); 194 $conn->send ("reply n");
189 destroy_query_dialog $conn; 195 destroy_query_dialog $conn;
196 0
190 }, 197 },
191 ); 198 );
192 $table->add (2, 0, new CFClient::UI::Button 199 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept", 200 text => "Accept",
194 on_activate => sub { 201 on_activate => sub {
195 $conn->send ("reply d"); 202 $conn->send ("reply d");
196 destroy_query_dialog $conn; 203 destroy_query_dialog $conn;
204 0
197 }, 205 },
198 ); 206 );
199 207
200 unshift @dialog, new CFClient::UI::Label 208 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4, 209 max_w => $::WIDTH * 0.4,
231 $table->add (0, 0, new CFClient::UI::Button 239 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again", 240 text => "Roll Again",
233 on_activate => sub { 241 on_activate => sub {
234 $conn->send ("reply y"); 242 $conn->send ("reply y");
235 destroy_query_dialog $conn; 243 destroy_query_dialog $conn;
244 0
236 }, 245 },
237 ); 246 );
238 247
239 # center: swap stats 248 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
254 text => "Swap Stats", 263 text => "Swap Stats",
255 on_activate => sub { 264 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value}; 265 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}"); 266 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn; 267 destroy_query_dialog $conn;
268 0
259 }, 269 },
260 ); 270 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 271 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262 272
263 # right: accept 273 # right: accept
265 text => "Accept", 275 text => "Accept",
266 on_activate => sub { 276 on_activate => sub {
267 $conn->send ("reply n"); 277 $conn->send ("reply n");
268 $STATS_WINDOW->hide; 278 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn; 279 destroy_query_dialog $conn;
280 0
270 }, 281 },
271 ); 282 );
272 283
273 unshift @dialog, new CFClient::UI::Label 284 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4, 285 max_w => $::WIDTH * 0.4,
284 295
285 push @dialog, my $entry = new CFClient::UI::Entry 296 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub { 297 on_changed => sub {
287 $conn->send ("reply $_[1]"); 298 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn; 299 destroy_query_dialog $conn;
300 0
289 }, 301 },
290 ; 302 ;
291 303
292 $entry->focus_in; 304 $entry->grab_focus;
293 305
294 } else { 306 } else {
295 $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)";
296 308
297 push @dialog, my $entry = new CFClient::UI::Entry 309 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 310 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub { 311 on_activate => sub {
300 $conn->send ("reply $_[1]"); 312 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn; 313 destroy_query_dialog $conn;
314 0
302 }, 315 },
303 ; 316 ;
304 317
305 $entry->focus_in; 318 $entry->grab_focus;
306 } 319 }
307 320
308 $vbox->add (@dialog); 321 $vbox->add (@dialog);
309 $dialog->show; 322 $dialog->show;
310} 323}
315 $LOGIN_BUTTON->set_text ("Logout"); 328 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide; 329 $SETUP_DIALOG->hide;
317 330
318 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;
319 332
320 my ($host, $port) = split /:/, $CFG->{host}; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321 334
322 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
323 336
324 $CONN = eval { 337 $CONN = eval {
325 new CFClient::Protocol 338 new CFClient::Protocol
326 host => $host, 339 host => $host,
327 port => $port || 13327, 340 port => $port || 13327,
328 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
329 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
330 mapw => $mapsize, 343 mapw => $mapsize,
331 maph => $mapsize, 344 maph => $mapsize,
332 345
333 map_widget => $MAPWIDGET, 346 map_widget => $MAPWIDGET,
334 logview => $LOGVIEW, 347 logview => $LOGVIEW,
362 375
363sub stop_game { 376sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login"); 377 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show; 379 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide; 380 $PL_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells; 381 $SETUP_SPELLS->clear_spells;
369 382
370 return unless $CONN; 383 return unless $CONN;
371 384
372 status "connection closed"; 385 status "connection closed";
373 386
374 destroy_query_dialog $CONN; 387 destroy_query_dialog $CONN;
375 $CONN->destroy; 388 $CONN->destroy;
376 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
390
391 undef $MAP;
377} 392}
378 393
379sub graphics_setup { 394sub graphics_setup {
380 my $vbox = new CFClient::UI::VBox; 395 my $vbox = new CFClient::UI::VBox;
381 396
399 414
400 $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");
401 $table->add (1, $row++, new CFClient::UI::CheckBox 416 $table->add (1, $row++, new CFClient::UI::CheckBox
402 state => $CFG->{fullscreen}, 417 state => $CFG->{fullscreen},
403 tooltip => "Bring the client into fullscreen mode.", 418 tooltip => "Bring the client into fullscreen mode.",
404 on_changed => sub { 419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405 my ($self, $value) = @_;
406 $CFG->{fullscreen} = $value;
407 }
408 ); 420 );
409 421
410 $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");
411 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, new CFClient::UI::CheckBox
412 state => $CFG->{fast}, 424 state => $CFG->{fast},
413 tooltip => "Lower the visual quality considerably to speed up rendering.", 425 tooltip => "Lower the visual quality considerably to speed up rendering.",
414 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415 my ($self, $value) = @_;
416 $CFG->{fast} = $value;
417 }
418 ); 427 );
419 428
420 $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");
421 $table->add (1, $row++, new CFClient::UI::Slider 430 $table->add (1, $row++, new CFClient::UI::Slider
422 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 431 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 432 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425 my ($self, $value) = @_;
426 $CFG->{map_scale} = 2 ** $value;
427 }
428 ); 434 );
429 435
430 $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");
431 $table->add (1, $row++, new CFClient::UI::CheckBox 437 $table->add (1, $row++, new CFClient::UI::CheckBox
432 state => $CFG->{fow_enable}, 438 state => $CFG->{fow_enable},
433 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.",
434 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 my ($self, $value) = @_;
436 $CFG->{fow_enable} = $value;
437 }
438 ); 441 );
439 442
440 $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");
441 $table->add (1, $row++, new CFClient::UI::Slider 444 $table->add (1, $row++, new CFClient::UI::Slider
442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 445 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
443 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.",
444 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445 my ($self, $value) = @_;
446 $CFG->{fow_intensity} = $value;
447 }
448 ); 448 );
449 449
450 $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");
451 $table->add (1, $row++, new CFClient::UI::CheckBox 451 $table->add (1, $row++, new CFClient::UI::CheckBox
452 state => $CFG->{fow_smooth}, 452 state => $CFG->{fow_smooth},
453 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.",
454 on_changed => sub { 454 on_changed => sub {
455 my ($self, $value) = @_; 455 my ($self, $value) = @_;
456 $CFG->{fow_smooth} = $value; 456 $CFG->{fow_smooth} = $value;
457 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
458 } 459 }
459 ); 460 );
460 461
461 $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");
462 $table->add (1, $row++, new CFClient::UI::Slider 463 $table->add (1, $row++, new CFClient::UI::Slider
463 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 464 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
464 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.",
465 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 466 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466 ); 467 );
467 468
468 $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");
469 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
470 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
471 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.",
472 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473 ); 474 );
474 475
475 $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");
476 477
477 $table->add (1, $row++, new CFClient::UI::Slider 478 $table->add (1, $row++, new CFClient::UI::Slider
478 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
479 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.",
480 on_changed => sub { 481 on_changed => sub {
481 $CFG->{stat_fontsize} = $_[1]; 482 $CFG->{stat_fontsize} = $_[1];
482 &set_stats_window_fontsize; 483 &set_stats_window_fontsize;
484 0
483 } 485 }
484 ); 486 );
485 487
486 $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");
487 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489 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.",
490 on_changed => sub { 492 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 493 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 494 &set_gauge_window_fontsize;
495 0
493 } 496 }
494 ); 497 );
495 498
496 $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");
497 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
498 range => [$CFG->{gauge_size}, 0.2, 0.8], 501 range => [$CFG->{gauge_size}, 0.2, 0.8],
499 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.",
500 on_changed => sub { 503 on_changed => sub {
501 $CFG->{gauge_size} = $_[1]; 504 $CFG->{gauge_size} = $_[1];
502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 505 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
506 0
503 } 507 }
504 ); 508 );
505 509
506 $table->add (1, $row++, new CFClient::UI::Button 510 $table->add (1, $row++, new CFClient::UI::Button
507 expand => 1, align => 0, text => "Apply", 511 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 512 tooltip => "Apply the video settings",
509 on_activate => sub { 513 on_activate => sub {
510 video_shutdown (); 514 video_shutdown ();
511 video_init (); 515 video_init ();
516 0
512 } 517 }
513 ); 518 );
514 519
515 $vbox 520 $vbox
516} 521}
524 529
525 $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");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 531 $table->add (1, $row++, new CFClient::UI::CheckBox
527 state => $CFG->{audio_enable}, 532 state => $CFG->{audio_enable},
528 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.",
529 on_changed => sub { 534 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 $CFG->{audio_enable} = $_[1];
531 }
532 ); 535 );
533# $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");
534# $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 {
535# $CFG->{effects_volume} = $_[1]; 538# $CFG->{effects_volume} = $_[1];
536# }); 539# });
537 $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");
538 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 541 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539 $hbox->add (new CFClient::UI::CheckBox 542 $hbox->add (new CFClient::UI::CheckBox
540 expand => 1, state => $CFG->{bgm_enable}, 543 expand => 1, state => $CFG->{bgm_enable},
541 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.",
542 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543 $CFG->{bgm_enable} = $_[1];
544 }
545 ); 546 );
546 $hbox->add (new CFClient::UI::Slider 547 $hbox->add (new CFClient::UI::Slider
547 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 548 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548 tooltip => "The volume of the background music. Changes are instant.", 549 tooltip => "The volume of the background music. Changes are instant.",
549 on_changed => sub { 550 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
550 $CFG->{bgm_volume} = $_[1];
551 CFClient::MixMusic::volume $_[1] * 128;
552 }
553 ); 551 );
554 552
555 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
556 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
557 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
558 on_activate => sub { 556 on_activate => sub {
559 audio_shutdown (); 557 audio_shutdown ();
560 audio_init (); 558 audio_init ();
559 0
561 } 560 }
562 ); 561 );
563 562
564 $vbox 563 $vbox
565} 564}
631 630
632sub debug_setup { 631sub debug_setup {
633 my $table = new CFClient::UI::Table; 632 my $table = new CFClient::UI::Table;
634 633
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $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 });
637 $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");
638 $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 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $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 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $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 });
643 642
644 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);
645 644
646 for my $x (0..2) { 645 for my $x (0..2) {
647 for my $y (0 .. 2) { 646 for my $y (0 .. 2) {
656 655
657 $table 656 $table
658} 657}
659 658
660sub stats_window { 659sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw =
662 y => $HEIGHT * (2/8), 661 new CFClient::UI::Window
663 x => "max", 662 child => my $vb = new CFClient::UI::VBox;
664 title => "Stats",
665 name => "stats_window";
666 663
667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
668 $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,
669 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
670 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.");
671 $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,
672 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
696 [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."],
697 693
698 [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."],
699 [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."],
700 [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."],
701 [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."],
702 [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."],
703 [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."],
704 ) { 700 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
706 702
725 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)",
726 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)",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
728 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)",
729 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
730 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.)",
731 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)",
732 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)",
733 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...",
734 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, ...)",
735 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, ...)",
752 ); 748 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 750 font => $FONT_FIXED,
755 can_hover => 1, 751 can_hover => 1,
756 can_events => 1, 752 can_events => 1,
757 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
759 ); 755 );
760 756
761 $row++; 757 $row++;
762 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817 $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});
818 814
819 $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);
820 816
844} 840}
845 841
846my $METASERVER_ATIME; 842my $METASERVER_ATIME;
847 843
848sub update_metaserver { 844sub update_metaserver {
845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
849
849 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
851 852
852 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
853 $table->clear; 854 $table->clear;
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 920 (new CFClient::UI::Button
920 text => "Use", 921 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 922 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 923 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 925 $METASERVER->hide;
926 0
925 }, 927 },
926 ), 928 ),
927 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
928 ]); 930 ]);
929 931
940 } 942 }
941 }); 943 });
942} 944}
943 945
944sub 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
945 my $dialog = new CFClient::UI::FancyFrame 951 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 952 title => "Server List",
947 name => 'metaserver_dialog', 953 name => 'metaserver_dialog',
948 x => 'center', 954 x => 'center',
949 y => 'center', 955 y => 'center',
950 z => 3, 956 z => 3,
951 force_h => $::HEIGHT * 0.4, 957 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
953 on_visibility_change => sub { 961 on_visibility_change => sub {
954 update_metaserver if $_[1]; 962 update_metaserver ($_[0]) if $_[1];
963 0
955 }, 964 },
956 ; 965 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 966
962 $dialog 967 $dialog
963} 968}
964 969
965sub server_setup { 970sub server_setup {
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 978
974 $vbox->add ( 979 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 981 expand => 1,
977 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
978 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",
979 on_changed => sub { 984 on_changed => sub {
980 my ($self, $value) = @_; 985 my ($self, $value) = @_;
981 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
987 0
982 } 988 }
983 ); 989 );
984
985 $METASERVER = metaserver_dialog;
986 990
987 $vbox->add (new CFClient::UI::Button 991 $vbox->add (new CFClient::UI::Button
988 expand => 1, 992 expand => 1,
989 text => "Server List", 993 text => "Server List",
990 other => $METASERVER, 994 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 995 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 996 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 997 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 998 );
995 } 999 }
996 1000
997 $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");
998 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
1001 on_changed => sub { 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 1006 );
1006 1007
1007 $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");
1008 $table->add (1, 5, new CFClient::UI::Entry 1009 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 1010 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 1011 hidden => 1,
1011 tooltip => "The password for your character", 1012 tooltip => "The password for your character",
1012 on_changed => sub { 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 1014 );
1017 1015
1018 $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");
1019 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 1018 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1019 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 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. "
1023 . "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, "
1024 . "but you also increase bandwidth requirements and latency. " 1022 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1023 . "This option is only used once at log-in.",
1026 on_changed => sub { 1024 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 ); 1025 );
1032 1026
1033 $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");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1028 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1029 state => $CFG->{face_prefetch},
1038 . "This might increase or create lag, but increases the chances " 1032 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1033 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1034 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1035 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1036 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1037 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1038 );
1045 1039
1046 $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");
1047 $table->add (1, 9, new CFClient::UI::Entry 1041 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1042 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.", 1043 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] }, 1044 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1045 );
1052 1046
1053 $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");
1054 $table->add (1, 10, new CFClient::UI::Entry 1048 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1049 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.", 1050 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] }, 1051 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1052 );
1059 1053
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1054 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1055 expand => 1,
1062 align => 0, 1056 align => 0,
1063 text => "Login", 1057 text => "Login",
1064 on_activate => sub { 1058 on_activate => sub {
1065 $CONN ? stop_game 1059 $CONN ? stop_game
1066 : start_game; 1060 : start_game;
1061 0
1067 }, 1062 },
1068 ); 1063 );
1069 1064
1070 $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");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1066 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1074 . "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. "
1075 . "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.",
1076 on_changed => sub { 1071 on_changed => sub {
1077 my ($self, $value) = @_; 1072 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1073 $CFG->{say_command} = $value;
1074 0
1079 } 1075 }
1080 ); 1076 );
1081 1077
1082 $vbox->add (new CFClient::UI::Label 1078 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1079 text => "Server Info",
1099 bg => [0, 0, 0, 0.75], 1095 bg => [0, 0, 0, 0.75],
1100 x => "max", 1096 x => "max",
1101 y => 0, 1097 y => 0,
1102 force_w => $::WIDTH * 0.4, 1098 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1099 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1100 child => (my $vbox = new CFClient::UI::VBox),
1101 has_close_button => 1;
1105 1102
1106 $vbox->add ($LOGVIEW); 1103 $vbox->add ($LOGVIEW);
1107 1104
1108 $vbox->add (my $input = new CFClient::UI::Entry 1105 $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> " 1106 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1117 1114
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1115 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1116 $input->{refocus_map} = 1;
1120 } 1117 }
1121 delete $input->{auto_activated}; 1118 delete $input->{auto_activated};
1119
1120 0
1122 }, 1121 },
1123 on_activate => sub { 1122 on_activate => sub {
1124 my ($input, $text) = @_; 1123 my ($input, $text) = @_;
1125 $input->set_text (''); 1124 $input->set_text ('');
1126 1125
1132 } 1131 }
1133 if ($input->{refocus_map}) { 1132 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1133 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1134 $MAPWIDGET->focus_in
1136 } 1135 }
1136
1137 0
1137 }, 1138 },
1138 on_escape => sub { 1139 on_escape => sub {
1139 $MAPWIDGET->focus_in 1140 $MAPWIDGET->grab_focus;
1141
1142 0
1140 }, 1143 },
1141 ); 1144 );
1142 1145
1143 $CONSOLE = { 1146 $CONSOLE = {
1144 window => $window, 1147 window => $window,
1166 ); 1169 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1170 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1172 text => "Ok",
1170 expand => 1, 1173 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1174 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1175 );
1173 $hb->add (new CFClient::UI::Button 1176 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1177 text => "Quit anyway",
1175 expand => 1, 1178 expand => 1,
1176 on_activate => sub { exit }, 1179 on_activate => sub { exit },
1231 ++$y; 1234 ++$y;
1232 1235
1233 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1234 $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);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1240 on_changed => sub {
1238 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1239 1242
1240 if ($value) { 1243 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1244 $::CFG->{pickup} |= $mask;
1243 $::CFG->{pickup} &= ~$mask; 1246 $::CFG->{pickup} &= ~$mask;
1244 } 1247 }
1245 1248
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1249 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1250 if defined $::CONN;
1251
1252 0
1248 }); 1253 });
1249 } 1254 }
1250 } 1255 }
1251 1256
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1257 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1260 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1261 on_changed => sub {
1256 my ($slider, $value) = @_; 1262 my ($slider, $value) = @_;
1257 1263
1258 $::CFG->{pickup} &= ~0x7; 1264 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1265 $::CFG->{pickup} |= int $value
1260 if $value; 1266 if $value;
1261 1; 1267 1;
1262 }); 1268 });
1269
1263 $table->add (3, 18, new CFClient::UI::Button 1270 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1271 text => "set",
1265 on_activate => sub { 1272 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1274 if defined $::CONN;
1268 1; 1275 0
1269 }); 1276 });
1270 1277
1271 $table 1278 $table
1272} 1279}
1273 1280
1274sub 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 {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1302 x => "center",
1277 y => "center", 1303 y => "center",
1278 force_w => $WIDTH * 9/10, 1304 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1305 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1306 title => "Player",
1307 has_close_button => 1
1281 ; 1308 ;
1282 1309
1283 $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 );
1284 1322
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1323 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1324 Stats => $STATS_WINDOW = stats_window,
1287 $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 );
1288 1331
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1332 $plwin->add ($ntb);
1290 1333 $plwin
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1292
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} 1334}
1300 1335
1301sub spell_setup { 1336sub update_bindings {
1302 new CFClient::UI::SpellList 1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1338}
1304 1339
1305sub keyboard_setup { 1340sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1341 my $binding_list = new CFClient::UI::VBox;
1307 1342
1308 my $refresh; 1343 my $refresh;
1309 $refresh = sub { 1344 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1345 $binding_list->clear ();
1311 1346
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1351
1317 my $lbl = join "; ", @$cmds; 1352 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1355 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1356 text => "delete",
1322 tooltip => "Deletes the binding", 1357 tooltip => "Deletes the binding",
1323 on_activate => sub { 1358 on_activate => sub {
1324 $binding_list->remove ($hb); 1359 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1361 0
1326 }); 1362 });
1327 1363
1328 $hb->add (new CFClient::UI::Button 1364 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1365 text => "edit",
1330 tooltip => "Edits the binding", 1366 tooltip => "Edits the binding",
1331 on_activate => sub { 1367 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1368 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1370 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1371 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1374 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1376 $SETUP_DIALOG->show;
1341 }, 1377 },
1342 sub { 1378 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1380 $SETUP_DIALOG->show;
1345 }); 1381 });
1346 $::BIND_EDITOR->show; 1382 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1383 $SETUP_DIALOG->hide;
1384 0
1348 }); 1385 });
1349 1386
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1387 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1388 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1389 }
1361 state => $CFG->{shift_fire_stop}, 1398 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1399 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1400 on_changed => sub {
1364 my ($cbox, $value) = @_; 1401 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1402 $CFG->{shift_fire_stop} = $value;
1403 0
1366 }); 1404 });
1367 1405
1368 $vb->add ($binding_list); 1406 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1407 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1408
1374 tooltip => "This button opens the binding editor with an empty binding.", 1412 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1413 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1415 sub {
1378 my ($mod, $sym, $cmds) = @_; 1416 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1418 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1383 }, 1421 },
1384 sub { 1422 sub {
1386 $SETUP_DIALOG->show; 1424 $SETUP_DIALOG->show;
1387 }, 1425 },
1388 ); 1426 );
1389 $SETUP_DIALOG->hide; 1427 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1428 $::BIND_EDITOR->show;
1429 0
1391 }, 1430 },
1392 ); 1431 );
1393 1432
1394 $hb->add (new CFClient::UI::Button 1433 $hb->add (new CFClient::UI::Button
1395 text => "close", 1434 text => "close",
1396 tooltip => "Closes the binding window", 1435 tooltip => "Closes the binding window",
1397 expand => 1, 1436 expand => 1,
1398 on_activate => sub { 1437 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1439 0
1400 } 1440 }
1401 ); 1441 );
1402 1442
1403 $refresh->(); 1443 $refresh->();
1404 1444
1424 $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: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1466 value => undef,
1427 options => [ 1467 options => [
1428 [intro => "Introduction"], 1468 [intro => "Introduction"],
1429 [manual => "Manual"], 1469 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1470 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1471 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1472 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1473 [COPYING => "License Terms"],
1434 ], 1474 ],
1435 on_changed => sub { 1475 on_changed => sub {
1436 my ($self, $pod) = @_; 1476 my ($self, $pod) = @_;
1437 1477
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1480
1441 $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#
1442 1487
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1489 for @$pom;
1445 1490
1446 $viewer->set_offset (0); 1491 $viewer->set_offset (0);
1492
1493 0
1447 }, 1494 },
1448 on_visibility_change => sub { 1495 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1496 my ($self, $visible) = @_;
1450 return unless $visible; 1497 return unless $visible;
1451 return if $self->{value}; 1498 return if $self->{value};
1452 $self->set_value ("intro"); 1499 $self->set_value ("intro");
1500 0
1453 }, 1501 },
1454 ); 1502 );
1455 1503
1456 $win 1504 $win
1457} 1505}
1496 z => 100, 1544 z => 100,
1497 force_x => "max", 1545 force_x => "max",
1498 force_y => 0; 1546 force_y => 0;
1499 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
1500 1548
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1550
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $STATUSBOX = new CFClient::UI::Statusbox;
1504 $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]);
1505 1553
1506 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
1515 name => "mapmap", 1563 name => "mapmap",
1516 x => 0, 1564 x => 0,
1517 y => $FONTSIZE + 8, 1565 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1566 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1567 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1568 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1569 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1570 ),
1524 )->show; 1571 )->show;
1525 1572
1527 $MAPWIDGET->connect (activate_console => sub { 1574 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1575 my ($mapwidget, $preset) = @_;
1529 1576
1530 if ($CONSOLE) { 1577 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1578 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1579 $CONSOLE->{input}->grab_focus;
1533 1580
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1581 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1582 $CONSOLE->{input}->set_text ($preset);
1536 } 1583 }
1537 } 1584 }
1538 }); 1585 });
1539 $MAPWIDGET->show; 1586 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1587 $MAPWIDGET->grab_focus;
1541 1588
1542 $LOGVIEW = new CFClient::UI::TextScroller 1589 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1590 expand => 1,
1544 font => $FONT_FIXED, 1591 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1592 fontsize => $::CFG->{log_fontsize},
1555 x => 'center', 1602 x => 'center',
1556 y => 'center', 1603 y => 'center',
1557 z => 2, 1604 z => 2,
1558 force_w => $::WIDTH * 0.6, 1605 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1606 force_h => $::HEIGHT * 0.6,
1607 has_close_button => 1,
1560 ; 1608 ;
1609
1610 $METASERVER = metaserver_dialog;
1561 1611
1562 $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,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1614
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "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.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1622 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1624 "Lets you define, edit and delete key bindings."
1575 . "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 "
1576 . "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 "
1577 . "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. "
1578 . "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 "
1579 . "binding editor closes"); 1629 . "binding editor closes");
1580 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1631 "Some debuggin' options. Do not ask.");
1584 1632
1585 $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
1586 1634
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1635 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1588 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.");
1590 $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,
1591 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.");
1592 1640
1593 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
1594 1642
1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1596 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1597 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1598 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.");
1599 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1600 1645
1601 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1647 text => "Save Config",
1603 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.",
1604 on_activate => sub { 1649 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1650 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1651 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1652 status "Configuration Saved";
1653 0
1608 }, 1654 },
1609 ); 1655 );
1610 1656
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1612 tooltip => "View Documentation"); 1658 tooltip => "View Documentation");
1618 if ($CONN) { 1664 if ($CONN) {
1619 open_quit_dialog; 1665 open_quit_dialog;
1620 } else { 1666 } else {
1621 exit; 1667 exit;
1622 } 1668 }
1669 0
1623 }, 1670 },
1624 ); 1671 );
1625 1672
1626 $BUTTONBAR->show; 1673 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1674 $SETUP_DIALOG->show;
1629 1676
1630 $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]);
1631} 1678}
1632 1679
1633sub video_shutdown { 1680sub video_shutdown {
1681 CFClient::OpenGL::shutdown;
1682
1634 undef $SDL_ACTIVE; 1683 undef $SDL_ACTIVE;
1635} 1684}
1636 1685
1637my @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#
1638my $bgmusic;#TODO#hack#d# 1687my $bgmusic;#TODO#hack#d#
1854 1903
1855 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1856 CFClient::UI::set_layout ($::CFG->{layout}); 1905 CFClient::UI::set_layout ($::CFG->{layout});
1857 1906
1858 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1859 sdl_mode => 0, 1908 sdl_mode => 0,
1860 width => 640, 1909 width => 640,
1861 height => 480, 1910 height => 480,
1862 fullscreen => 0, 1911 fullscreen => 0,
1863 fast => 0, 1912 fast => 0,
1864 map_scale => 1, 1913 map_scale => 1,
1865 fow_enable => 1, 1914 fow_enable => 1,
1866 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1867 fow_smooth => 0, 1916 fow_smooth => 0,
1868 gui_fontsize => 1, 1917 gui_fontsize => 1,
1869 log_fontsize => 0.7, 1918 log_fontsize => 0.7,
1870 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1871 gauge_size => 0.35, 1920 gauge_size => 0.35,
1872 stat_fontsize => 0.7, 1921 stat_fontsize => 0.7,
1873 mapsize => 100, 1922 mapsize => 100,
1874 host => "crossfire.schmorp.de",
1875 say_command => 'say', 1923 say_command => 'say',
1876 audio_enable => 1, 1924 audio_enable => 1,
1877 bgm_enable => 1, 1925 bgm_enable => 1,
1878 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1879 face_prefetch => 0, 1927 face_prefetch => 0,
1880 output_sync => 1, 1928 output_sync => 1,
1881 output_count => 1, 1929 output_count => 1,
1882 pickup => 0, 1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1883 ); 1933
1884
1885 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1886 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1887 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1888 1939
1889 sdl_init; 1940 sdl_init;
1890 1941
1891 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1892 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines