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.70 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.77 by elmex, Wed Jun 21 12:59:23 2006 UTC

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

Diff Legend

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