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.68 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.76 by root, Tue Jun 20 08:49:40 2006 UTC

… …
155 $hbox->add (new CFClient::UI::Button 155 $hbox->add (new CFClient::UI::Button
156 text => "No", 156 text => "No",
157 on_activate => sub { 157 on_activate => sub {
158 $conn->send ("reply n"); 158 $conn->send ("reply n");
159 $dialog->destroy; 159 $dialog->destroy;
160 0
160 } 161 }
161 ); 162 );
162 $hbox->add (new CFClient::UI::Button 163 $hbox->add (new CFClient::UI::Button
163 text => "Yes", 164 text => "Yes",
164 on_activate => sub { 165 on_activate => sub {
165 $conn->send ("reply y"); 166 $conn->send ("reply y");
166 destroy_query_dialog $conn; 167 destroy_query_dialog $conn;
168 0
167 }, 169 },
168 ); 170 );
169 171
170 $dialog->focus_in; 172 $dialog->grab_focus;
171 173
172 } elsif ($flags & CS_QUERY_SINGLECHAR) { 174 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 175 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174 176
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 177 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
185 $table->add (0, 0, new CFClient::UI::Button 187 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race", 188 text => "Next Race",
187 on_activate => sub { 189 on_activate => sub {
188 $conn->send ("reply n"); 190 $conn->send ("reply n");
189 destroy_query_dialog $conn; 191 destroy_query_dialog $conn;
192 0
190 }, 193 },
191 ); 194 );
192 $table->add (2, 0, new CFClient::UI::Button 195 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept", 196 text => "Accept",
194 on_activate => sub { 197 on_activate => sub {
195 $conn->send ("reply d"); 198 $conn->send ("reply d");
196 destroy_query_dialog $conn; 199 destroy_query_dialog $conn;
200 0
197 }, 201 },
198 ); 202 );
199 203
200 unshift @dialog, new CFClient::UI::Label 204 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4, 205 max_w => $::WIDTH * 0.4,
… …
231 $table->add (0, 0, new CFClient::UI::Button 235 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again", 236 text => "Roll Again",
233 on_activate => sub { 237 on_activate => sub {
234 $conn->send ("reply y"); 238 $conn->send ("reply y");
235 destroy_query_dialog $conn; 239 destroy_query_dialog $conn;
240 0
236 }, 241 },
237 ); 242 );
238 243
239 # center: swap stats 244 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
254 text => "Swap Stats", 259 text => "Swap Stats",
255 on_activate => sub { 260 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value}; 261 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}"); 262 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn; 263 destroy_query_dialog $conn;
264 0
259 }, 265 },
260 ); 266 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 267 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262 268
263 # right: accept 269 # right: accept
… …
265 text => "Accept", 271 text => "Accept",
266 on_activate => sub { 272 on_activate => sub {
267 $conn->send ("reply n"); 273 $conn->send ("reply n");
268 $STATS_WINDOW->hide; 274 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
276 0
270 }, 277 },
271 ); 278 );
272 279
273 unshift @dialog, new CFClient::UI::Label 280 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4, 281 max_w => $::WIDTH * 0.4,
… …
284 291
285 push @dialog, my $entry = new CFClient::UI::Entry 292 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub { 293 on_changed => sub {
287 $conn->send ("reply $_[1]"); 294 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn; 295 destroy_query_dialog $conn;
296 0
289 }, 297 },
290 ; 298 ;
291 299
292 $entry->focus_in; 300 $entry->grab_focus;
293 301
294 } else { 302 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 303 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296 304
297 push @dialog, my $entry = new CFClient::UI::Entry 305 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 306 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub { 307 on_activate => sub {
300 $conn->send ("reply $_[1]"); 308 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn; 309 destroy_query_dialog $conn;
310 0
302 }, 311 },
303 ; 312 ;
304 313
305 $entry->focus_in; 314 $entry->grab_focus;
306 } 315 }
307 316
308 $vbox->add (@dialog); 317 $vbox->add (@dialog);
309 $dialog->show; 318 $dialog->show;
310} 319}
… …
315 $LOGIN_BUTTON->set_text ("Logout"); 324 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide; 325 $SETUP_DIALOG->hide;
317 326
318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 327 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
319 328
320 my ($host, $port) = split /:/, $CFG->{host}; 329 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321 330
322 $MAP = new CFClient::Map $mapsize, $mapsize; 331 $MAP = new CFClient::Map $mapsize, $mapsize;
323 332
324 $CONN = eval { 333 $CONN = eval {
325 new CFClient::Protocol 334 new CFClient::Protocol
326 host => $host, 335 host => $host,
327 port => $port || 13327, 336 port => $port || 13327,
328 user => $CFG->{user}, 337 user => $CFG->{profile}{default}{user},
329 pass => $CFG->{password}, 338 pass => $CFG->{profile}{default}{password},
330 mapw => $mapsize, 339 mapw => $mapsize,
331 maph => $mapsize, 340 maph => $mapsize,
332 341
333 map_widget => $MAPWIDGET, 342 map_widget => $MAPWIDGET,
334 logview => $LOGVIEW, 343 logview => $LOGVIEW,
… …
372 status "connection closed"; 381 status "connection closed";
373 382
374 destroy_query_dialog $CONN; 383 destroy_query_dialog $CONN;
375 $CONN->destroy; 384 $CONN->destroy;
376 $CONN = 0; # false, does not autovivify 385 $CONN = 0; # false, does not autovivify
386
387 undef $MAP;
377} 388}
378 389
379sub graphics_setup { 390sub graphics_setup {
380 my $vbox = new CFClient::UI::VBox; 391 my $vbox = new CFClient::UI::VBox;
381 392
… …
399 410
400 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 411 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
401 $table->add (1, $row++, new CFClient::UI::CheckBox 412 $table->add (1, $row++, new CFClient::UI::CheckBox
402 state => $CFG->{fullscreen}, 413 state => $CFG->{fullscreen},
403 tooltip => "Bring the client into fullscreen mode.", 414 tooltip => "Bring the client into fullscreen mode.",
404 on_changed => sub { 415 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405 my ($self, $value) = @_;
406 $CFG->{fullscreen} = $value;
407 }
408 ); 416 );
409 417
410 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
411 $table->add (1, $row++, new CFClient::UI::CheckBox 419 $table->add (1, $row++, new CFClient::UI::CheckBox
412 state => $CFG->{fast}, 420 state => $CFG->{fast},
413 tooltip => "Lower the visual quality considerably to speed up rendering.", 421 tooltip => "Lower the visual quality considerably to speed up rendering.",
414 on_changed => sub { 422 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415 my ($self, $value) = @_;
416 $CFG->{fast} = $value;
417 }
418 ); 423 );
419 424
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 425 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
421 $table->add (1, $row++, new CFClient::UI::Slider 426 $table->add (1, $row++, new CFClient::UI::Slider
422 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 427 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 428 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424 on_changed => sub { 429 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425 my ($self, $value) = @_;
426 $CFG->{map_scale} = 2 ** $value;
427 }
428 ); 430 );
429 431
430 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 432 $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 433 $table->add (1, $row++, new CFClient::UI::CheckBox
432 state => $CFG->{fow_enable}, 434 state => $CFG->{fow_enable},
433 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 435 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
434 on_changed => sub { 436 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 my ($self, $value) = @_;
436 $CFG->{fow_enable} = $value;
437 }
438 ); 437 );
439 438
440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 439 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
441 $table->add (1, $row++, new CFClient::UI::Slider 440 $table->add (1, $row++, new CFClient::UI::Slider
442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 441 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.", 442 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 { 443 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445 my ($self, $value) = @_;
446 $CFG->{fow_intensity} = $value;
447 }
448 ); 444 );
449 445
450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 446 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
451 $table->add (1, $row++, new CFClient::UI::CheckBox 447 $table->add (1, $row++, new CFClient::UI::CheckBox
452 state => $CFG->{fow_smooth}, 448 state => $CFG->{fow_smooth},
453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 449 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
454 on_changed => sub { 450 on_changed => sub {
455 my ($self, $value) = @_; 451 my ($self, $value) = @_;
456 $CFG->{fow_smooth} = $value; 452 $CFG->{fow_smooth} = $value;
457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 453 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
454 0
458 } 455 }
459 ); 456 );
460 457
461 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 458 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
462 $table->add (1, $row++, new CFClient::UI::Slider 459 $table->add (1, $row++, new CFClient::UI::Slider
463 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 460 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.", 461 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] }, 462 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466 ); 463 );
467 464
468 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 465 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
469 $table->add (1, $row++, new CFClient::UI::Slider 466 $table->add (1, $row++, new CFClient::UI::Slider
470 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 467 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.", 468 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]) }, 469 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473 ); 470 );
474 471
475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 472 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476 473
477 $table->add (1, $row++, new CFClient::UI::Slider 474 $table->add (1, $row++, new CFClient::UI::Slider
478 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 475 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.", 476 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480 on_changed => sub { 477 on_changed => sub {
481 $CFG->{stat_fontsize} = $_[1]; 478 $CFG->{stat_fontsize} = $_[1];
482 &set_stats_window_fontsize; 479 &set_stats_window_fontsize;
480 0
483 } 481 }
484 ); 482 );
485 483
486 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 485 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 486 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.", 487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 488 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 489 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 490 &set_gauge_window_fontsize;
491 0
493 } 492 }
494 ); 493 );
495 494
496 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 495 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
497 $table->add (1, $row++, new CFClient::UI::Slider 496 $table->add (1, $row++, new CFClient::UI::Slider
498 range => [$CFG->{gauge_size}, 0.2, 0.8], 497 range => [$CFG->{gauge_size}, 0.2, 0.8],
499 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 498 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
500 on_changed => sub { 499 on_changed => sub {
501 $CFG->{gauge_size} = $_[1]; 500 $CFG->{gauge_size} = $_[1];
502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
502 0
503 } 503 }
504 ); 504 );
505 505
506 $table->add (1, $row++, new CFClient::UI::Button 506 $table->add (1, $row++, new CFClient::UI::Button
507 expand => 1, align => 0, text => "Apply", 507 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 508 tooltip => "Apply the video settings",
509 on_activate => sub { 509 on_activate => sub {
510 video_shutdown (); 510 video_shutdown ();
511 video_init (); 511 video_init ();
512 0
512 } 513 }
513 ); 514 );
514 515
515 $vbox 516 $vbox
516} 517}
… …
524 525
525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 526 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 527 $table->add (1, $row++, new CFClient::UI::CheckBox
527 state => $CFG->{audio_enable}, 528 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.", 529 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 { 530 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 $CFG->{audio_enable} = $_[1];
531 }
532 ); 531 );
533# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 532# $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 { 533# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
535# $CFG->{effects_volume} = $_[1]; 534# $CFG->{effects_volume} = $_[1];
536# }); 535# });
537 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 536 $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); 537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539 $hbox->add (new CFClient::UI::CheckBox 538 $hbox->add (new CFClient::UI::CheckBox
540 expand => 1, state => $CFG->{bgm_enable}, 539 expand => 1, state => $CFG->{bgm_enable},
541 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 540 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
542 on_changed => sub { 541 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543 $CFG->{bgm_enable} = $_[1];
544 }
545 ); 542 );
546 $hbox->add (new CFClient::UI::Slider 543 $hbox->add (new CFClient::UI::Slider
547 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 544 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548 tooltip => "The volume of the background music. Changes are instant.", 545 tooltip => "The volume of the background music. Changes are instant.",
549 on_changed => sub { 546 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 ); 547 );
554 548
555 $table->add (1, $row++, new CFClient::UI::Button 549 $table->add (1, $row++, new CFClient::UI::Button
556 expand => 1, align => 0, text => "Apply", 550 expand => 1, align => 0, text => "Apply",
557 tooltip => "Apply the audio settings", 551 tooltip => "Apply the audio settings",
558 on_activate => sub { 552 on_activate => sub {
559 audio_shutdown (); 553 audio_shutdown ();
560 audio_init (); 554 audio_init ();
555 0
561 } 556 }
562 ); 557 );
563 558
564 $vbox 559 $vbox
565} 560}
… …
631 626
632sub debug_setup { 627sub debug_setup {
633 my $table = new CFClient::UI::Table; 628 my $table = new CFClient::UI::Table;
634 629
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 630 $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 }); 631 $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"); 632 $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 }); 633 $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"); 634 $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 }); 635 $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"); 636 $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 }); 637 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643 638
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 639 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645 640
646 for my $x (0..2) { 641 for my $x (0..2) {
647 for my $y (0 .. 2) { 642 for my $y (0 .. 2) {
… …
660sub stats_window { 655sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 656 my $tgw = new CFClient::UI::FancyFrame
662 y => $HEIGHT * (2/8), 657 y => $HEIGHT * (2/8),
663 x => "max", 658 x => "max",
664 title => "Stats", 659 title => "Stats",
665 name => "stats_window"; 660 name => "stats_window",
661 has_close_button => 1;
666 662
667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 663 $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.");
… …
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
821 # TODO: replace by CS_STAT_RES_xxx constants
822 my %tbl = ( 817 my %tbl = (
823 phys => 100, 818 phys => CS_STAT_RES_PHYS,
824 magic => 101, 819 magic => CS_STAT_RES_MAG,
825 fire => 102, 820 fire => CS_STAT_RES_FIRE,
826 elec => 103, 821 elec => CS_STAT_RES_ELEC,
827 cold => 104, 822 cold => CS_STAT_RES_COLD,
828 conf => 105, 823 conf => CS_STAT_RES_CONF,
829 acid => 106, 824 acid => CS_STAT_RES_ACID,
830 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
831 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
832 pois => 109, 827 pois => CS_STAT_RES_POISON,
833 slow => 110, 828 slow => CS_STAT_RES_SLOW,
834 para => 111, 829 para => CS_STAT_RES_PARA,
835 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
836 fear => 113, 831 fear => CS_STAT_RES_FEAR,
837 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
838 deat => 115, 833 deat => CS_STAT_RES_DEATH,
839 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
840 blind => 117, 835 blind => CS_STAT_RES_BLIND,
841 ); 836 );
842 837
843 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
844 for keys %tbl; 839 for keys %tbl;
845} 840}
… …
919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 914 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
920 (new CFClient::UI::Button 915 (new CFClient::UI::Button
921 text => "Use", 916 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field", 917 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub { 918 on_activate => sub {
924 $HOST_ENTRY->set_text ($CFG->{host} = $host); 919 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925 $METASERVER->hide; 920 $METASERVER->hide;
921 0
926 }, 922 },
927 ), 923 ),
928 (new CFClient::UI::Empty expand => 1), 924 (new CFClient::UI::Empty expand => 1),
929 ]); 925 ]);
930 926
… …
951 z => 3, 947 z => 3,
952 force_h => $::HEIGHT * 0.4, 948 force_h => $::HEIGHT * 0.4,
953 child => (my $vbox = new CFClient::UI::VBox), 949 child => (my $vbox = new CFClient::UI::VBox),
954 on_visibility_change => sub { 950 on_visibility_change => sub {
955 update_metaserver if $_[1]; 951 update_metaserver if $_[1];
952 0
956 }, 953 },
957 ; 954 ;
958 955
959 $dialog->{table} = new CFClient::UI::Table; 956 $dialog->{table} = new CFClient::UI::Table;
960 957
… …
973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 970 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
974 971
975 $vbox->add ( 972 $vbox->add (
976 $HOST_ENTRY = new CFClient::UI::Entry 973 $HOST_ENTRY = new CFClient::UI::Entry
977 expand => 1, 974 expand => 1,
978 text => $CFG->{host}, 975 text => $CFG->{profile}{default}{host},
979 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 976 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
980 on_changed => sub { 977 on_changed => sub {
981 my ($self, $value) = @_; 978 my ($self, $value) = @_;
982 $CFG->{host} = $value; 979 $CFG->{profile}{default}{host} = $value;
980 0
983 } 981 }
984 ); 982 );
985 983
986 $METASERVER = metaserver_dialog; 984 $METASERVER = metaserver_dialog;
987 985
988 $vbox->add (new CFClient::UI::Button 986 $vbox->add (new CFClient::UI::Button
989 expand => 1, 987 expand => 1,
990 text => "Server List", 988 text => "Server List",
991 other => $METASERVER, 989 other => $METASERVER,
992 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
993 on_activate => sub { $METASERVER->toggle_visibility }, 991 on_activate => sub { $METASERVER->toggle_visibility; 0 },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 992 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
995 ); 993 );
996 } 994 }
997 995
998 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
999 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
1000 text => $CFG->{user}, 998 text => $CFG->{profile}{default}{user},
1001 tooltip => "The name of your character on the server", 999 tooltip => "The name of your character on the server",
1002 on_changed => sub { 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1003 my ($self, $value) = @_;
1004 $CFG->{user} = $value;
1005 }
1006 ); 1001 );
1007 1002
1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1003 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1009 $table->add (1, 5, new CFClient::UI::Entry 1004 $table->add (1, 5, new CFClient::UI::Entry
1010 text => $CFG->{password}, 1005 text => $CFG->{profile}{default}{password},
1011 hidden => 1, 1006 hidden => 1,
1012 tooltip => "The password for your character", 1007 tooltip => "The password for your character",
1013 on_changed => sub { 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1014 my ($self, $value) = @_;
1015 $CFG->{password} = $value;
1016 }
1017 ); 1009 );
1018 1010
1019 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1011 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1020 $table->add (1, 7, new CFClient::UI::Slider 1012 $table->add (1, 7, new CFClient::UI::Slider
1021 force_w => 100, 1013 force_w => 100,
1022 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1014 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1023 tooltip => "This is the size of the portion of the map update the server sends you. " 1015 tooltip => "This is the size of the portion of the map update the server sends you. "
1024 . "If you set this to a high value you will be able to see further, " 1016 . "If you set this to a high value you will be able to see further, "
1025 . "but you also increase bandwidth requirements and latency. " 1017 . "but you also increase bandwidth requirements and latency. "
1026 . "This option is only used once at log-in.", 1018 . "This option is only used once at log-in.",
1027 on_changed => sub { 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1028 my ($self, $value) = @_;
1029
1030 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1031 },
1032 ); 1020 );
1033 1021
1034 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1022 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1035 $table->add (1, 8, new CFClient::UI::CheckBox 1023 $table->add (1, 8, new CFClient::UI::CheckBox
1036 state => $CFG->{face_prefetch}, 1024 state => $CFG->{face_prefetch},
… …
1039 . "This might increase or create lag, but increases the chances " 1027 . "This might increase or create lag, but increases the chances "
1040 . "of faces being ready for display when you encounter them. " 1028 . "of faces being ready for display when you encounter them. "
1041 . "It also uses up server bandwidth on every connect, " 1029 . "It also uses up server bandwidth on every connect, "
1042 . "so only set it if you really need to prefetch images. " 1030 . "so only set it if you really need to prefetch images. "
1043 . "This option can be set and unset any time.", 1031 . "This option can be set and unset any time.",
1044 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1032 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1045 ); 1033 );
1046 1034
1047 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1035 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1048 $table->add (1, 9, new CFClient::UI::Entry 1036 $table->add (1, 9, new CFClient::UI::Entry
1049 text => $CFG->{output_count}, 1037 text => $CFG->{output_count},
1050 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1038 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1051 on_changed => sub { $CFG->{output_count} = $_[1] }, 1039 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1052 ); 1040 );
1053 1041
1054 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1042 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1055 $table->add (1, 10, new CFClient::UI::Entry 1043 $table->add (1, 10, new CFClient::UI::Entry
1056 text => $CFG->{output_sync}, 1044 text => $CFG->{output_sync},
1057 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1045 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1058 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1046 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1059 ); 1047 );
1060 1048
1061 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1049 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1062 expand => 1, 1050 expand => 1,
1063 align => 0, 1051 align => 0,
1064 text => "Login", 1052 text => "Login",
1065 on_activate => sub { 1053 on_activate => sub {
1066 $CONN ? stop_game 1054 $CONN ? stop_game
1067 : start_game; 1055 : start_game;
1056 0
1068 }, 1057 },
1069 ); 1058 );
1070 1059
1071 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1060 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1061 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1075 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1064 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1065 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077 on_changed => sub { 1066 on_changed => sub {
1078 my ($self, $value) = @_; 1067 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value; 1068 $CFG->{say_command} = $value;
1069 0
1080 } 1070 }
1081 ); 1071 );
1082 1072
1083 $vbox->add (new CFClient::UI::Label 1073 $vbox->add (new CFClient::UI::Label
1084 text => "Server Info", 1074 text => "Server Info",
… …
1100 bg => [0, 0, 0, 0.75], 1090 bg => [0, 0, 0, 0.75],
1101 x => "max", 1091 x => "max",
1102 y => 0, 1092 y => 0,
1103 force_w => $::WIDTH * 0.4, 1093 force_w => $::WIDTH * 0.4,
1104 force_h => $::HEIGHT * 0.5, 1094 force_h => $::HEIGHT * 0.5,
1105 child => (my $vbox = new CFClient::UI::VBox); 1095 child => (my $vbox = new CFClient::UI::VBox),
1096 has_close_button => 1;
1106 1097
1107 $vbox->add ($LOGVIEW); 1098 $vbox->add ($LOGVIEW);
1108 1099
1109 $vbox->add (my $input = new CFClient::UI::Entry 1100 $vbox->add (my $input = new CFClient::UI::Entry
1110 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1101 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1118 1109
1119 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1110 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1120 $input->{refocus_map} = 1; 1111 $input->{refocus_map} = 1;
1121 } 1112 }
1122 delete $input->{auto_activated}; 1113 delete $input->{auto_activated};
1114
1115 0
1123 }, 1116 },
1124 on_activate => sub { 1117 on_activate => sub {
1125 my ($input, $text) = @_; 1118 my ($input, $text) = @_;
1126 $input->set_text (''); 1119 $input->set_text ('');
1127 1120
… …
1133 } 1126 }
1134 if ($input->{refocus_map}) { 1127 if ($input->{refocus_map}) {
1135 delete $input->{refocus_map}; 1128 delete $input->{refocus_map};
1136 $MAPWIDGET->focus_in 1129 $MAPWIDGET->focus_in
1137 } 1130 }
1131
1132 0
1138 }, 1133 },
1139 on_escape => sub { 1134 on_escape => sub {
1140 $MAPWIDGET->focus_in 1135 $MAPWIDGET->grab_focus;
1136
1137 0
1141 }, 1138 },
1142 ); 1139 );
1143 1140
1144 $CONSOLE = { 1141 $CONSOLE = {
1145 window => $window, 1142 window => $window,
… …
1167 ); 1164 );
1168 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1165 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1169 $hb->add (new CFClient::UI::Button 1166 $hb->add (new CFClient::UI::Button
1170 text => "Ok", 1167 text => "Ok",
1171 expand => 1, 1168 expand => 1,
1172 on_activate => sub { $QUIT_DIALOG->hide }, 1169 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1173 ); 1170 );
1174 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
1175 text => "Quit anyway", 1172 text => "Quit anyway",
1176 expand => 1, 1173 expand => 1,
1177 on_activate => sub { exit }, 1174 on_activate => sub { exit },
… …
1244 $::CFG->{pickup} &= ~$mask; 1241 $::CFG->{pickup} &= ~$mask;
1245 } 1242 }
1246 1243
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1244 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1245 if defined $::CONN;
1246
1247 0
1249 }); 1248 });
1250 } 1249 }
1251 } 1250 }
1252 1251
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1252 $table->add (2, 18, new CFClient::UI::ValSlider
… …
1264 $table->add (3, 18, new CFClient::UI::Button 1263 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set", 1264 text => "set",
1266 on_activate => sub { 1265 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1267 if defined $::CONN;
1269 1; 1268 0
1270 }); 1269 });
1271 1270
1272 $table 1271 $table
1273} 1272}
1274 1273
… …
1277 x => "center", 1276 x => "center",
1278 y => "center", 1277 y => "center",
1279 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1280 title => "Inventory",
1281 has_close_button => 1,
1282 ; 1282 ;
1283 1283
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1285 1285
1286 $hb->add (my $vb1 = new CFClient::UI::VBox); 1286 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
1308 1308
1309 my $refresh; 1309 my $refresh;
1310 $refresh = sub { 1310 $refresh = sub {
1311 $binding_list->clear (); 1311 $binding_list->clear ();
1312 1312
1313 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1317
1318 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
1322 text => "delete", 1322 text => "delete",
1323 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
1324 on_activate => sub { 1324 on_activate => sub {
1325 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
1326 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0
1327 }); 1328 });
1328 1329
1329 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
1330 text => "edit", 1331 text => "edit",
1331 tooltip => "Edits the binding", 1332 tooltip => "Edits the binding",
1332 on_activate => sub { 1333 on_activate => sub {
1333 $::BIND_EDITOR->set_binding ( 1334 $::BIND_EDITOR->set_binding (
1334 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1335 sub { 1336 sub {
1336 my ($nmod, $nsym, $ncmds) = @_; 1337 my ($nmod, $nsym, $ncmds) = @_;
1337 delete $::CFG->{bindings}->{$mod}->{$sym}; 1338 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1339 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds;
1339 $refresh->(); 1340 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show; 1342 $SETUP_DIALOG->show;
1342 }, 1343 },
1343 sub { 1344 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1345 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345 $SETUP_DIALOG->show; 1346 $SETUP_DIALOG->show;
1346 }); 1347 });
1347 $::BIND_EDITOR->show; 1348 $::BIND_EDITOR->show;
1348 $SETUP_DIALOG->hide; 1349 $SETUP_DIALOG->hide;
1350 0
1349 }); 1351 });
1350 1352
1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1353 } 1355 }
1354 } 1356 }
1355 }; 1357 };
1356 1358
1357 my $vb = new CFClient::UI::VBox; 1359 my $vb = new CFClient::UI::VBox;
1360 $vb->add (my $hb = new CFClient::UI::HBox);
1361 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1362 $hb->add (new CFClient::UI::CheckBox
1363 expand => 1,
1364 state => $CFG->{shift_fire_stop},
1365 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1366 on_changed => sub {
1367 my ($cbox, $value) = @_;
1368 $CFG->{shift_fire_stop} = $value;
1369 0
1370 });
1371
1358 $vb->add ($binding_list); 1372 $vb->add ($binding_list);
1359 $vb->add (my $hb = new CFClient::UI::HBox); 1373 $vb->add (my $hb = new CFClient::UI::HBox);
1360 1374
1361 $hb->add (new CFClient::UI::Button 1375 $hb->add (new CFClient::UI::Button
1362 text => "record new", 1376 text => "record new",
… …
1364 tooltip => "This button opens the binding editor with an empty binding.", 1378 tooltip => "This button opens the binding editor with an empty binding.",
1365 on_activate => sub { 1379 on_activate => sub {
1366 $::BIND_EDITOR->set_binding (undef, undef, [], 1380 $::BIND_EDITOR->set_binding (undef, undef, [],
1367 sub { 1381 sub {
1368 my ($mod, $sym, $cmds) = @_; 1382 my ($mod, $sym, $cmds) = @_;
1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1383 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
1370 $refresh->(); 1384 $refresh->();
1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show; 1386 $SETUP_DIALOG->show;
1373 }, 1387 },
1374 sub { 1388 sub {
… …
1376 $SETUP_DIALOG->show; 1390 $SETUP_DIALOG->show;
1377 }, 1391 },
1378 ); 1392 );
1379 $SETUP_DIALOG->hide; 1393 $SETUP_DIALOG->hide;
1380 $::BIND_EDITOR->show; 1394 $::BIND_EDITOR->show;
1395 0
1381 }, 1396 },
1382 ); 1397 );
1383 1398
1384 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1385 text => "close", 1400 text => "close",
1386 tooltip => "Closes the binding window", 1401 tooltip => "Closes the binding window",
1387 expand => 1, 1402 expand => 1,
1388 on_activate => sub { 1403 on_activate => sub {
1389 $SETUP_DIALOG->hide; 1404 $SETUP_DIALOG->hide;
1405 0
1390 } 1406 }
1391 ); 1407 );
1392 1408
1393 $refresh->(); 1409 $refresh->();
1394 1410
… …
1432 1448
1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1449 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1434 for @$pom; 1450 for @$pom;
1435 1451
1436 $viewer->set_offset (0); 1452 $viewer->set_offset (0);
1453 0
1437 }, 1454 },
1438 on_visibility_change => sub { 1455 on_visibility_change => sub {
1439 my ($self, $visible) = @_; 1456 my ($self, $visible) = @_;
1440 return unless $visible; 1457 return unless $visible;
1441 return if $self->{value}; 1458 return if $self->{value};
1442 $self->set_value ("intro"); 1459 $self->set_value ("intro");
1460 0
1443 }, 1461 },
1444 ); 1462 );
1445 1463
1446 $win 1464 $win
1447} 1465}
… …
1516 $MAPWIDGET->connect (activate_console => sub { 1534 $MAPWIDGET->connect (activate_console => sub {
1517 my ($mapwidget, $preset) = @_; 1535 my ($mapwidget, $preset) = @_;
1518 1536
1519 if ($CONSOLE) { 1537 if ($CONSOLE) {
1520 $CONSOLE->{input}->{auto_activated} = 1; 1538 $CONSOLE->{input}->{auto_activated} = 1;
1521 $CONSOLE->{input}->focus_in; 1539 $CONSOLE->{input}->grab_focus;
1522 1540
1523 if ($preset && $CONSOLE->{input}->get_text eq '') { 1541 if ($preset && $CONSOLE->{input}->get_text eq '') {
1524 $CONSOLE->{input}->set_text ($preset); 1542 $CONSOLE->{input}->set_text ($preset);
1525 } 1543 }
1526 } 1544 }
1527 }); 1545 });
1528 $MAPWIDGET->show; 1546 $MAPWIDGET->show;
1529 $MAPWIDGET->focus_in; 1547 $MAPWIDGET->grab_focus;
1530 1548
1531 $LOGVIEW = new CFClient::UI::TextScroller 1549 $LOGVIEW = new CFClient::UI::TextScroller
1532 expand => 1, 1550 expand => 1,
1533 font => $FONT_FIXED, 1551 font => $FONT_FIXED,
1534 fontsize => $::CFG->{log_fontsize}, 1552 fontsize => $::CFG->{log_fontsize},
… …
1544 x => 'center', 1562 x => 'center',
1545 y => 'center', 1563 y => 'center',
1546 z => 2, 1564 z => 2,
1547 force_w => $::WIDTH * 0.6, 1565 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6, 1566 force_h => $::HEIGHT * 0.6,
1567 has_close_button => 1,
1549 ; 1568 ;
1550 1569
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1570 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1571 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553 1572
… …
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1577 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1578 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1579 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music."); 1580 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1581 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings." 1582 "Lets you define, edit and delete key bindings."
1564 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1583 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1565 . "with nothing set and the recording started. After doing the actions you " 1584 . "with nothing set and the recording started. After doing the actions you "
1566 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1585 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567 . "After pressing the combo the binding will be saved automatically and the " 1586 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes"); 1587 . "binding editor closes");
1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1588 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1589 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1590 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask."); 1591 "Some debuggin' options. Do not ask.");
1573 1592
1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1593 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575 1594
1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1577 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1596 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1592 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1611 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1593 on_activate => sub { 1612 on_activate => sub {
1594 $::CFG->{layout} = CFClient::UI::get_layout; 1613 $::CFG->{layout} = CFClient::UI::get_layout;
1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1614 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1596 status "Configuration Saved"; 1615 status "Configuration Saved";
1616 0
1597 }, 1617 },
1598 ); 1618 );
1599 1619
1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1620 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1601 tooltip => "View Documentation"); 1621 tooltip => "View Documentation");
… …
1607 if ($CONN) { 1627 if ($CONN) {
1608 open_quit_dialog; 1628 open_quit_dialog;
1609 } else { 1629 } else {
1610 exit; 1630 exit;
1611 } 1631 }
1632 0
1612 }, 1633 },
1613 ); 1634 );
1614 1635
1615 $BUTTONBAR->show; 1636 $BUTTONBAR->show;
1616 $SETUP_DIALOG->show; 1637 $SETUP_DIALOG->show;
… …
1618 1639
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1640 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1620} 1641}
1621 1642
1622sub video_shutdown { 1643sub video_shutdown {
1644 CFClient::OpenGL::shutdown;
1645
1623 undef $SDL_ACTIVE; 1646 undef $SDL_ACTIVE;
1624} 1647}
1625 1648
1626my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1649my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1627my $bgmusic;#TODO#hack#d# 1650my $bgmusic;#TODO#hack#d#
… …
1843 1866
1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1867 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1845 CFClient::UI::set_layout ($::CFG->{layout}); 1868 CFClient::UI::set_layout ($::CFG->{layout});
1846 1869
1847 my %DEF_CFG = ( 1870 my %DEF_CFG = (
1848 sdl_mode => 0, 1871 sdl_mode => 0,
1849 width => 640, 1872 width => 640,
1850 height => 480, 1873 height => 480,
1851 fullscreen => 0, 1874 fullscreen => 0,
1852 fast => 0, 1875 fast => 0,
1853 map_scale => 1, 1876 map_scale => 1,
1854 fow_enable => 1, 1877 fow_enable => 1,
1855 fow_intensity => 0.45, 1878 fow_intensity => 0.45,
1856 fow_smooth => 0, 1879 fow_smooth => 0,
1857 gui_fontsize => 1, 1880 gui_fontsize => 1,
1858 log_fontsize => 0.7, 1881 log_fontsize => 0.7,
1859 gauge_fontsize=> 1, 1882 gauge_fontsize => 1,
1860 gauge_size => 0.35, 1883 gauge_size => 0.35,
1861 stat_fontsize => 0.7, 1884 stat_fontsize => 0.7,
1862 mapsize => 100, 1885 mapsize => 100,
1863 host => "crossfire.schmorp.de",
1864 say_command => 'say', 1886 say_command => 'say',
1865 audio_enable => 1, 1887 audio_enable => 1,
1866 bgm_enable => 1, 1888 bgm_enable => 1,
1867 bgm_volume => 0.25, 1889 bgm_volume => 0.25,
1868 face_prefetch => 0, 1890 face_prefetch => 0,
1869 output_sync => 1, 1891 output_sync => 1,
1870 output_count => 1, 1892 output_count => 1,
1871 pickup => 0, 1893 pickup => 0,
1894 default => "profile", # default profile
1895 );
1872 ); 1896
1873
1874 while (my ($k, $v) = each %DEF_CFG) { 1897 while (my ($k, $v) = each %DEF_CFG) {
1875 $CFG->{$k} = $v unless exists $CFG->{$k}; 1898 $CFG->{$k} = $v unless exists $CFG->{$k};
1876 } 1899 }
1900
1901 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1877 1902
1878 sdl_init; 1903 sdl_init;
1879 1904
1880 @SDL_MODES = reverse 1905 @SDL_MODES = reverse
1881 grep $_->[0] >= 640 && $_->[1] >= 480, 1906 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1923 video_init; 1948 video_init;
1924 audio_init; 1949 audio_init;
1925} 1950}
1926 1951
1927Event::loop; 1952Event::loop;
1953#CFClient::SDL_Quit;
1954#CFClient::_exit 0;
1928 1955
1929END { CFClient::SDL_Quit } 1956END { CFClient::SDL_Quit }
1930 1957
1931=head1 NAME 1958=head1 NAME
1932 1959

Diff Legend

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