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.66 by elmex, Thu Jun 8 19:43:26 2006 UTC vs.
Revision 1.77 by elmex, Wed Jun 21 12:59:23 2006 UTC

84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
89 90
90our $SETUP_DIALOG; 91our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 93our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
114our $INV; 115our $INV;
115our $INVR; 116our $INVR;
116our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
117 118
118our $BIND_EDITOR; 119our $BIND_EDITOR;
120our $BIND_UPD_CB;
119 121
120our $PICKUP_CFG; 122our $PICKUP_CFG;
121 123
122sub status { 124sub status {
123 $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]);
154 $hbox->add (new CFClient::UI::Button 156 $hbox->add (new CFClient::UI::Button
155 text => "No", 157 text => "No",
156 on_activate => sub { 158 on_activate => sub {
157 $conn->send ("reply n"); 159 $conn->send ("reply n");
158 $dialog->destroy; 160 $dialog->destroy;
161 0
159 } 162 }
160 ); 163 );
161 $hbox->add (new CFClient::UI::Button 164 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 165 text => "Yes",
163 on_activate => sub { 166 on_activate => sub {
164 $conn->send ("reply y"); 167 $conn->send ("reply y");
165 destroy_query_dialog $conn; 168 destroy_query_dialog $conn;
169 0
166 }, 170 },
167 ); 171 );
168 172
169 $dialog->focus_in; 173 $dialog->grab_focus;
170 174
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 175 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $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)";
173 177
174 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) {
184 $table->add (0, 0, new CFClient::UI::Button 188 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 189 text => "Next Race",
186 on_activate => sub { 190 on_activate => sub {
187 $conn->send ("reply n"); 191 $conn->send ("reply n");
188 destroy_query_dialog $conn; 192 destroy_query_dialog $conn;
193 0
189 }, 194 },
190 ); 195 );
191 $table->add (2, 0, new CFClient::UI::Button 196 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 197 text => "Accept",
193 on_activate => sub { 198 on_activate => sub {
194 $conn->send ("reply d"); 199 $conn->send ("reply d");
195 destroy_query_dialog $conn; 200 destroy_query_dialog $conn;
201 0
196 }, 202 },
197 ); 203 );
198 204
199 unshift @dialog, new CFClient::UI::Label 205 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 206 max_w => $::WIDTH * 0.4,
230 $table->add (0, 0, new CFClient::UI::Button 236 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 237 text => "Roll Again",
232 on_activate => sub { 238 on_activate => sub {
233 $conn->send ("reply y"); 239 $conn->send ("reply y");
234 destroy_query_dialog $conn; 240 destroy_query_dialog $conn;
241 0
235 }, 242 },
236 ); 243 );
237 244
238 # center: swap stats 245 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 246 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
253 text => "Swap Stats", 260 text => "Swap Stats",
254 on_activate => sub { 261 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 262 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 263 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 264 destroy_query_dialog $conn;
265 0
258 }, 266 },
259 ); 267 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 268 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 269
262 # right: accept 270 # right: accept
264 text => "Accept", 272 text => "Accept",
265 on_activate => sub { 273 on_activate => sub {
266 $conn->send ("reply n"); 274 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 275 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn; 276 destroy_query_dialog $conn;
277 0
269 }, 278 },
270 ); 279 );
271 280
272 unshift @dialog, new CFClient::UI::Label 281 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 282 max_w => $::WIDTH * 0.4,
283 292
284 push @dialog, my $entry = new CFClient::UI::Entry 293 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 294 on_changed => sub {
286 $conn->send ("reply $_[1]"); 295 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 296 destroy_query_dialog $conn;
297 0
288 }, 298 },
289 ; 299 ;
290 300
291 $entry->focus_in; 301 $entry->grab_focus;
292 302
293 } else { 303 } else {
294 $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)";
295 305
296 push @dialog, my $entry = new CFClient::UI::Entry 306 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 307 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 308 on_activate => sub {
299 $conn->send ("reply $_[1]"); 309 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 310 destroy_query_dialog $conn;
311 0
301 }, 312 },
302 ; 313 ;
303 314
304 $entry->focus_in; 315 $entry->grab_focus;
305 } 316 }
306 317
307 $vbox->add (@dialog); 318 $vbox->add (@dialog);
308 $dialog->show; 319 $dialog->show;
309} 320}
314 $LOGIN_BUTTON->set_text ("Logout"); 325 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 326 $SETUP_DIALOG->hide;
316 327
317 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;
318 329
319 my ($host, $port) = split /:/, $CFG->{host}; 330 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 331
321 $MAP = new CFClient::Map $mapsize, $mapsize; 332 $MAP = new CFClient::Map $mapsize, $mapsize;
322 333
323 $CONN = eval { 334 $CONN = eval {
324 new CFClient::Protocol 335 new CFClient::Protocol
325 host => $host, 336 host => $host,
326 port => $port || 13327, 337 port => $port || 13327,
327 user => $CFG->{user}, 338 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 339 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 340 mapw => $mapsize,
330 maph => $mapsize, 341 maph => $mapsize,
331 342
332 map_widget => $MAPWIDGET, 343 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 344 logview => $LOGVIEW,
362sub stop_game { 373sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 374 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 376 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 377 $INV_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells;
367 379
368 return unless $CONN; 380 return unless $CONN;
369 381
370 status "connection closed"; 382 status "connection closed";
371 383
372 destroy_query_dialog $CONN; 384 destroy_query_dialog $CONN;
373 $CONN->destroy; 385 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 386 $CONN = 0; # false, does not autovivify
387
388 undef $MAP;
375} 389}
376 390
377sub graphics_setup { 391sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 392 my $vbox = new CFClient::UI::VBox;
379 393
397 411
398 $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");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 413 $table->add (1, $row++, new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 414 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 415 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 416 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 417 );
407 418
408 $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");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 420 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 421 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 422 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 423 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 424 );
417 425
418 $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");
419 $table->add (1, $row++, new CFClient::UI::Slider 427 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 428 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 429 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 430 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 431 );
427 432
428 $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");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 434 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 435 state => $CFG->{fow_enable},
431 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.",
432 on_changed => sub { 437 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 438 );
437 439
438 $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");
439 $table->add (1, $row++, new CFClient::UI::Slider 441 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 443 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442 on_changed => sub { 444 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 445 );
447 446
448 $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");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 448 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 449 state => $CFG->{fow_smooth},
451 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.",
452 on_changed => sub { 451 on_changed => sub {
453 my ($self, $value) = @_; 452 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 453 $CFG->{fow_smooth} = $value;
455 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
456 } 456 }
457 ); 457 );
458 458
459 $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");
460 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 462 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 463 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 464 );
465 465
466 $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");
467 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 471 );
472 472
473 $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");
474 474
475 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub { 478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1]; 479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize; 480 &set_stats_window_fontsize;
481 0
481 } 482 }
482 ); 483 );
483 484
484 $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");
485 $table->add (1, $row++, new CFClient::UI::Slider 486 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 489 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 490 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 491 &set_gauge_window_fontsize;
492 0
491 } 493 }
492 ); 494 );
493 495
494 $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");
495 $table->add (1, $row++, new CFClient::UI::Slider 497 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 498 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 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.",
498 on_changed => sub { 500 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 501 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
503 0
501 } 504 }
502 ); 505 );
503 506
504 $table->add (1, $row++, new CFClient::UI::Button 507 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 508 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 509 tooltip => "Apply the video settings",
507 on_activate => sub { 510 on_activate => sub {
508 video_shutdown (); 511 video_shutdown ();
509 video_init (); 512 video_init ();
513 0
510 } 514 }
511 ); 515 );
512 516
513 $vbox 517 $vbox
514} 518}
522 526
523 $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");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 528 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 529 state => $CFG->{audio_enable},
526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
527 on_changed => sub { 531 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 532 );
531# $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");
532# $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 {
533# $CFG->{effects_volume} = $_[1]; 535# $CFG->{effects_volume} = $_[1];
534# }); 536# });
535 $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");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 538 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 539 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 540 expand => 1, state => $CFG->{bgm_enable},
539 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.",
540 on_changed => sub { 542 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 543 );
544 $hbox->add (new CFClient::UI::Slider 544 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 546 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 547 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 548 );
552 549
553 $table->add (1, $row++, new CFClient::UI::Button 550 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 551 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 552 tooltip => "Apply the audio settings",
556 on_activate => sub { 553 on_activate => sub {
557 audio_shutdown (); 554 audio_shutdown ();
558 audio_init (); 555 audio_init ();
556 0
559 } 557 }
560 ); 558 );
561 559
562 $vbox 560 $vbox
563} 561}
629 627
630sub debug_setup { 628sub debug_setup {
631 my $table = new CFClient::UI::Table; 629 my $table = new CFClient::UI::Table;
632 630
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 631 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 632 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 633 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 634 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 635 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 636 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 637 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 638 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
641 639
642 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);
643 641
644 for my $x (0..2) { 642 for my $x (0..2) {
645 for my $y (0 .. 2) { 643 for my $y (0 .. 2) {
658sub stats_window { 656sub stats_window {
659 my $tgw = new CFClient::UI::FancyFrame 657 my $tgw = new CFClient::UI::FancyFrame
660 y => $HEIGHT * (2/8), 658 y => $HEIGHT * (2/8),
661 x => "max", 659 x => "max",
662 title => "Stats", 660 title => "Stats",
663 name => "stats_window"; 661 name => "stats_window",
662 has_close_button => 1;
664 663
665 $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);
666 $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,
667 can_hover => 1, can_events => 1, 666 can_hover => 1, can_events => 1,
668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 667 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $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});
816 815
817 $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);
818 817
819 # TODO: replace by CS_STAT_RES_xxx constants
820 my %tbl = ( 818 my %tbl = (
821 phys => 100, 819 phys => CS_STAT_RES_PHYS,
822 magic => 101, 820 magic => CS_STAT_RES_MAG,
823 fire => 102, 821 fire => CS_STAT_RES_FIRE,
824 elec => 103, 822 elec => CS_STAT_RES_ELEC,
825 cold => 104, 823 cold => CS_STAT_RES_COLD,
826 conf => 105, 824 conf => CS_STAT_RES_CONF,
827 acid => 106, 825 acid => CS_STAT_RES_ACID,
828 drain => 107, 826 drain => CS_STAT_RES_DRAIN,
829 ghit => 108, 827 ghit => CS_STAT_RES_GHOSTHIT,
830 pois => 109, 828 pois => CS_STAT_RES_POISON,
831 slow => 110, 829 slow => CS_STAT_RES_SLOW,
832 para => 111, 830 para => CS_STAT_RES_PARA,
833 tund => 112, 831 tund => CS_STAT_TURN_UNDEAD,
834 fear => 113, 832 fear => CS_STAT_RES_FEAR,
835 depl => 113, 833 depl => CS_STAT_RES_DEPLETE,
836 deat => 115, 834 deat => CS_STAT_RES_DEATH,
837 holyw => 116, 835 holyw => CS_STAT_RES_HOLYWORD,
838 blind => 117, 836 blind => CS_STAT_RES_BLIND,
839 ); 837 );
840 838
841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
842 for keys %tbl; 840 for keys %tbl;
843} 841}
917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 915 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
918 (new CFClient::UI::Button 916 (new CFClient::UI::Button
919 text => "Use", 917 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field", 918 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub { 919 on_activate => sub {
922 $HOST_ENTRY->set_text ($CFG->{host} = $host); 920 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
923 $METASERVER->hide; 921 $METASERVER->hide;
922 0
924 }, 923 },
925 ), 924 ),
926 (new CFClient::UI::Empty expand => 1), 925 (new CFClient::UI::Empty expand => 1),
927 ]); 926 ]);
928 927
949 z => 3, 948 z => 3,
950 force_h => $::HEIGHT * 0.4, 949 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 950 child => (my $vbox = new CFClient::UI::VBox),
952 on_visibility_change => sub { 951 on_visibility_change => sub {
953 update_metaserver if $_[1]; 952 update_metaserver if $_[1];
953 0
954 }, 954 },
955 ; 955 ;
956 956
957 $dialog->{table} = new CFClient::UI::Table; 957 $dialog->{table} = new CFClient::UI::Table;
958 958
971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
972 972
973 $vbox->add ( 973 $vbox->add (
974 $HOST_ENTRY = new CFClient::UI::Entry 974 $HOST_ENTRY = new CFClient::UI::Entry
975 expand => 1, 975 expand => 1,
976 text => $CFG->{host}, 976 text => $CFG->{profile}{default}{host},
977 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",
978 on_changed => sub { 978 on_changed => sub {
979 my ($self, $value) = @_; 979 my ($self, $value) = @_;
980 $CFG->{host} = $value; 980 $CFG->{profile}{default}{host} = $value;
981 0
981 } 982 }
982 ); 983 );
983 984
984 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
985 986
986 $vbox->add (new CFClient::UI::Button 987 $vbox->add (new CFClient::UI::Button
987 expand => 1, 988 expand => 1,
988 text => "Server List", 989 text => "Server List",
989 other => $METASERVER, 990 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility }, 992 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 993 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 994 );
994 } 995 }
995 996
996 $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");
997 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
998 text => $CFG->{user}, 999 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 1000 tooltip => "The name of your character on the server",
1000 on_changed => sub { 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 my ($self, $value) = @_;
1002 $CFG->{user} = $value;
1003 }
1004 ); 1002 );
1005 1003
1006 $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");
1007 $table->add (1, 5, new CFClient::UI::Entry 1005 $table->add (1, 5, new CFClient::UI::Entry
1008 text => $CFG->{password}, 1006 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 1007 hidden => 1,
1010 tooltip => "The password for your character", 1008 tooltip => "The password for your character",
1011 on_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 my ($self, $value) = @_;
1013 $CFG->{password} = $value;
1014 }
1015 ); 1010 );
1016 1011
1017 $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");
1018 $table->add (1, 7, new CFClient::UI::Slider 1013 $table->add (1, 7, new CFClient::UI::Slider
1019 force_w => 100, 1014 force_w => 100,
1020 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1015 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1021 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. "
1022 . "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, "
1023 . "but you also increase bandwidth requirements and latency. " 1018 . "but you also increase bandwidth requirements and latency. "
1024 . "This option is only used once at log-in.", 1019 . "This option is only used once at log-in.",
1025 on_changed => sub { 1020 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1026 my ($self, $value) = @_;
1027
1028 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1029 },
1030 ); 1021 );
1031 1022
1032 $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");
1033 $table->add (1, 8, new CFClient::UI::CheckBox 1024 $table->add (1, 8, new CFClient::UI::CheckBox
1034 state => $CFG->{face_prefetch}, 1025 state => $CFG->{face_prefetch},
1037 . "This might increase or create lag, but increases the chances " 1028 . "This might increase or create lag, but increases the chances "
1038 . "of faces being ready for display when you encounter them. " 1029 . "of faces being ready for display when you encounter them. "
1039 . "It also uses up server bandwidth on every connect, " 1030 . "It also uses up server bandwidth on every connect, "
1040 . "so only set it if you really need to prefetch images. " 1031 . "so only set it if you really need to prefetch images. "
1041 . "This option can be set and unset any time.", 1032 . "This option can be set and unset any time.",
1042 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1033 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1043 ); 1034 );
1044 1035
1045 $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");
1046 $table->add (1, 9, new CFClient::UI::Entry 1037 $table->add (1, 9, new CFClient::UI::Entry
1047 text => $CFG->{output_count}, 1038 text => $CFG->{output_count},
1048 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1039 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1049 on_changed => sub { $CFG->{output_count} = $_[1] }, 1040 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1050 ); 1041 );
1051 1042
1052 $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");
1053 $table->add (1, 10, new CFClient::UI::Entry 1044 $table->add (1, 10, new CFClient::UI::Entry
1054 text => $CFG->{output_sync}, 1045 text => $CFG->{output_sync},
1055 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1046 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1056 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1047 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1057 ); 1048 );
1058 1049
1059 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1050 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1060 expand => 1, 1051 expand => 1,
1061 align => 0, 1052 align => 0,
1062 text => "Login", 1053 text => "Login",
1063 on_activate => sub { 1054 on_activate => sub {
1064 $CONN ? stop_game 1055 $CONN ? stop_game
1065 : start_game; 1056 : start_game;
1057 0
1066 }, 1058 },
1067 ); 1059 );
1068 1060
1069 $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");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1062 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1073 . "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. "
1074 . "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.",
1075 on_changed => sub { 1067 on_changed => sub {
1076 my ($self, $value) = @_; 1068 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1069 $CFG->{say_command} = $value;
1070 0
1078 } 1071 }
1079 ); 1072 );
1073
1074 $vbox->add (new CFClient::UI::Label
1075 text => "Server Info",
1076 fontsize => 1.2,
1077 padding_y => 8,
1078 fg => [1, 1, 0, 1],
1079 );
1080
1081 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1080 1082
1081 $vbox 1083 $vbox
1082} 1084}
1083 1085
1084sub message_window { 1086sub message_window {
1089 bg => [0, 0, 0, 0.75], 1091 bg => [0, 0, 0, 0.75],
1090 x => "max", 1092 x => "max",
1091 y => 0, 1093 y => 0,
1092 force_w => $::WIDTH * 0.4, 1094 force_w => $::WIDTH * 0.4,
1093 force_h => $::HEIGHT * 0.5, 1095 force_h => $::HEIGHT * 0.5,
1094 child => (my $vbox = new CFClient::UI::VBox); 1096 child => (my $vbox = new CFClient::UI::VBox),
1097 has_close_button => 1;
1095 1098
1096 $vbox->add ($LOGVIEW); 1099 $vbox->add ($LOGVIEW);
1097 1100
1098 $vbox->add (my $input = new CFClient::UI::Entry 1101 $vbox->add (my $input = new CFClient::UI::Entry
1099 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1102 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1107 1110
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1111 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1; 1112 $input->{refocus_map} = 1;
1110 } 1113 }
1111 delete $input->{auto_activated}; 1114 delete $input->{auto_activated};
1115
1116 0
1112 }, 1117 },
1113 on_activate => sub { 1118 on_activate => sub {
1114 my ($input, $text) = @_; 1119 my ($input, $text) = @_;
1115 $input->set_text (''); 1120 $input->set_text ('');
1116 1121
1122 } 1127 }
1123 if ($input->{refocus_map}) { 1128 if ($input->{refocus_map}) {
1124 delete $input->{refocus_map}; 1129 delete $input->{refocus_map};
1125 $MAPWIDGET->focus_in 1130 $MAPWIDGET->focus_in
1126 } 1131 }
1132
1133 0
1127 }, 1134 },
1128 on_escape => sub { 1135 on_escape => sub {
1129 $MAPWIDGET->focus_in 1136 $MAPWIDGET->grab_focus;
1137
1138 0
1130 }, 1139 },
1131 ); 1140 );
1132 1141
1133 $CONSOLE = { 1142 $CONSOLE = {
1134 window => $window, 1143 window => $window,
1156 ); 1165 );
1157 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1166 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1158 $hb->add (new CFClient::UI::Button 1167 $hb->add (new CFClient::UI::Button
1159 text => "Ok", 1168 text => "Ok",
1160 expand => 1, 1169 expand => 1,
1161 on_activate => sub { $QUIT_DIALOG->hide }, 1170 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1162 ); 1171 );
1163 $hb->add (new CFClient::UI::Button 1172 $hb->add (new CFClient::UI::Button
1164 text => "Quit anyway", 1173 text => "Quit anyway",
1165 expand => 1, 1174 expand => 1,
1166 on_activate => sub { exit }, 1175 on_activate => sub { exit },
1233 $::CFG->{pickup} &= ~$mask; 1242 $::CFG->{pickup} &= ~$mask;
1234 } 1243 }
1235 1244
1236 $::CONN->send_command ("pickup $::CFG->{pickup}") 1245 $::CONN->send_command ("pickup $::CFG->{pickup}")
1237 if defined $::CONN; 1246 if defined $::CONN;
1247
1248 0
1238 }); 1249 });
1239 } 1250 }
1240 } 1251 }
1241 1252
1242 $table->add (2, 18, new CFClient::UI::ValSlider 1253 $table->add (2, 18, new CFClient::UI::ValSlider
1253 $table->add (3, 18, new CFClient::UI::Button 1264 $table->add (3, 18, new CFClient::UI::Button
1254 text => "set", 1265 text => "set",
1255 on_activate => sub { 1266 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}") 1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN; 1268 if defined $::CONN;
1258 1; 1269 0
1259 }); 1270 });
1260 1271
1261 $table 1272 $table
1262} 1273}
1263 1274
1266 x => "center", 1277 x => "center",
1267 y => "center", 1278 y => "center",
1268 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
1269 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
1270 title => "Inventory", 1281 title => "Inventory",
1282 has_close_button => 1,
1271 ; 1283 ;
1272 1284
1273 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1274 1286
1275 $hb->add (my $vb1 = new CFClient::UI::VBox); 1287 $hb->add (my $vb1 = new CFClient::UI::VBox);
1290 1302
1291sub spell_setup { 1303sub spell_setup {
1292 new CFClient::UI::SpellList 1304 new CFClient::UI::SpellList
1293} 1305}
1294 1306
1307sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309}
1310
1295sub keyboard_setup { 1311sub keyboard_setup {
1296 my $binding_list = new CFClient::UI::VBox; 1312 my $binding_list = new CFClient::UI::VBox;
1297 1313
1298 my $refresh; 1314 my $refresh;
1299 $refresh = sub { 1315 $refresh = $BIND_UPD_CB = sub {
1300 $binding_list->clear (); 1316 $binding_list->clear ();
1301 1317
1302 for my $mod (keys %{$::CFG->{bindings}}) { 1318 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1303 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1304 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1305 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1306 1322
1307 my $lbl = join "; ", @$cmds; 1323 my $lbl = join "; ", @$cmds;
1308 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1309 $binding_list->add (my $hb = new CFClient::UI::HBox); 1325 $binding_list->add (my $hb = new CFClient::UI::HBox);
1310 $hb->add (new CFClient::UI::Button 1326 $hb->add (new CFClient::UI::Button
1311 text => "delete", 1327 text => "delete",
1312 tooltip => "Deletes the binding", 1328 tooltip => "Deletes the binding",
1313 on_activate => sub { 1329 on_activate => sub {
1314 $binding_list->remove ($hb); 1330 $binding_list->remove ($hb);
1315 delete $::CFG->{bindings}->{$mod}->{$sym}; 1331 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1332 0
1316 }); 1333 });
1317 1334
1318 $hb->add (new CFClient::UI::Button 1335 $hb->add (new CFClient::UI::Button
1319 text => "edit", 1336 text => "edit",
1320 tooltip => "Edits the binding", 1337 tooltip => "Edits the binding",
1321 on_activate => sub { 1338 on_activate => sub {
1322 $::BIND_EDITOR->set_binding ( 1339 $::BIND_EDITOR->set_binding (
1323 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1340 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1324 sub { 1341 sub {
1325 my ($nmod, $nsym, $ncmds) = @_; 1342 my ($nmod, $nsym, $ncmds) = @_;
1326 delete $::CFG->{bindings}->{$mod}->{$sym}; 1343 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1327 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1344 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1328 $refresh->(); 1345 $refresh->();
1329 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1346 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1330 $SETUP_DIALOG->show; 1347 $SETUP_DIALOG->show;
1331 }, 1348 },
1332 sub { 1349 sub {
1333 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1350 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1334 $SETUP_DIALOG->show; 1351 $SETUP_DIALOG->show;
1335 }); 1352 });
1336 $::BIND_EDITOR->show; 1353 $::BIND_EDITOR->show;
1337 $SETUP_DIALOG->hide; 1354 $SETUP_DIALOG->hide;
1355 0
1338 }); 1356 });
1339 1357
1340 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1358 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1341 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1359 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1342 } 1360 }
1343 } 1361 }
1344 }; 1362 };
1345 1363
1346 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
1347 $vb->add ($binding_list); 1377 $vb->add ($binding_list);
1348 $vb->add (my $hb = new CFClient::UI::HBox); 1378 $vb->add (my $hb = new CFClient::UI::HBox);
1349 1379
1350 $hb->add (new CFClient::UI::Button 1380 $hb->add (new CFClient::UI::Button
1351 text => "record new", 1381 text => "record new",
1353 tooltip => "This button opens the binding editor with an empty binding.", 1383 tooltip => "This button opens the binding editor with an empty binding.",
1354 on_activate => sub { 1384 on_activate => sub {
1355 $::BIND_EDITOR->set_binding (undef, undef, [], 1385 $::BIND_EDITOR->set_binding (undef, undef, [],
1356 sub { 1386 sub {
1357 my ($mod, $sym, $cmds) = @_; 1387 my ($mod, $sym, $cmds) = @_;
1358 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1388 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1359 $refresh->(); 1389 $refresh->();
1360 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1390 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1361 $SETUP_DIALOG->show; 1391 $SETUP_DIALOG->show;
1362 }, 1392 },
1363 sub { 1393 sub {
1365 $SETUP_DIALOG->show; 1395 $SETUP_DIALOG->show;
1366 }, 1396 },
1367 ); 1397 );
1368 $SETUP_DIALOG->hide; 1398 $SETUP_DIALOG->hide;
1369 $::BIND_EDITOR->show; 1399 $::BIND_EDITOR->show;
1400 0
1370 }, 1401 },
1371 ); 1402 );
1372 1403
1373 $hb->add (new CFClient::UI::Button 1404 $hb->add (new CFClient::UI::Button
1374 text => "close", 1405 text => "close",
1375 tooltip => "Closes the binding window", 1406 tooltip => "Closes the binding window",
1376 expand => 1, 1407 expand => 1,
1377 on_activate => sub { 1408 on_activate => sub {
1378 $SETUP_DIALOG->hide; 1409 $SETUP_DIALOG->hide;
1410 0
1379 } 1411 }
1380 ); 1412 );
1381 1413
1382 $refresh->(); 1414 $refresh->();
1383 1415
1421 1453
1422 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1454 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1423 for @$pom; 1455 for @$pom;
1424 1456
1425 $viewer->set_offset (0); 1457 $viewer->set_offset (0);
1458 0
1426 }, 1459 },
1427 on_visibility_change => sub { 1460 on_visibility_change => sub {
1428 my ($self, $visible) = @_; 1461 my ($self, $visible) = @_;
1429 return unless $visible; 1462 return unless $visible;
1430 return if $self->{value}; 1463 return if $self->{value};
1431 $self->set_value ("intro"); 1464 $self->set_value ("intro");
1465 0
1432 }, 1466 },
1433 ); 1467 );
1434 1468
1435 $win 1469 $win
1436} 1470}
1505 $MAPWIDGET->connect (activate_console => sub { 1539 $MAPWIDGET->connect (activate_console => sub {
1506 my ($mapwidget, $preset) = @_; 1540 my ($mapwidget, $preset) = @_;
1507 1541
1508 if ($CONSOLE) { 1542 if ($CONSOLE) {
1509 $CONSOLE->{input}->{auto_activated} = 1; 1543 $CONSOLE->{input}->{auto_activated} = 1;
1510 $CONSOLE->{input}->focus_in; 1544 $CONSOLE->{input}->grab_focus;
1511 1545
1512 if ($preset && $CONSOLE->{input}->get_text eq '') { 1546 if ($preset && $CONSOLE->{input}->get_text eq '') {
1513 $CONSOLE->{input}->set_text ($preset); 1547 $CONSOLE->{input}->set_text ($preset);
1514 } 1548 }
1515 } 1549 }
1516 }); 1550 });
1517 $MAPWIDGET->show; 1551 $MAPWIDGET->show;
1518 $MAPWIDGET->focus_in; 1552 $MAPWIDGET->grab_focus;
1519 1553
1520 $LOGVIEW = new CFClient::UI::TextScroller 1554 $LOGVIEW = new CFClient::UI::TextScroller
1521 expand => 1, 1555 expand => 1,
1522 font => $FONT_FIXED, 1556 font => $FONT_FIXED,
1523 fontsize => $::CFG->{log_fontsize}, 1557 fontsize => $::CFG->{log_fontsize},
1533 x => 'center', 1567 x => 'center',
1534 y => 'center', 1568 y => 'center',
1535 z => 2, 1569 z => 2,
1536 force_w => $::WIDTH * 0.6, 1570 force_w => $::WIDTH * 0.6,
1537 force_h => $::HEIGHT * 0.6, 1571 force_h => $::HEIGHT * 0.6,
1572 has_close_button => 1,
1538 ; 1573 ;
1539 1574
1540 $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,
1541 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1576 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1542 1577
1547 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1582 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1548 "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.");
1549 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1584 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1550 "Configure the use of audio, sound effects and background music."); 1585 "Configure the use of audio, sound effects and background music.");
1551 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1586 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1552 "Lets you define, edit and delete bindings." 1587 "Lets you define, edit and delete key bindings."
1553 . "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 "
1554 . "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 "
1555 . "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. "
1556 . "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 "
1557 . "binding editor closes"); 1592 . "binding editor closes");
1558 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1593 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1559 "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.");
1560 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1595 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1561 "Some debuggign options. Do not ask."); 1596 "Some debuggin' options. Do not ask.");
1562 1597
1563 $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
1564 1599
1565 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1566 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.");
1581 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.",
1582 on_activate => sub { 1617 on_activate => sub {
1583 $::CFG->{layout} = CFClient::UI::get_layout; 1618 $::CFG->{layout} = CFClient::UI::get_layout;
1584 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1619 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1585 status "Configuration Saved"; 1620 status "Configuration Saved";
1621 0
1586 }, 1622 },
1587 ); 1623 );
1588 1624
1589 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1625 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1590 tooltip => "View Documentation"); 1626 tooltip => "View Documentation");
1596 if ($CONN) { 1632 if ($CONN) {
1597 open_quit_dialog; 1633 open_quit_dialog;
1598 } else { 1634 } else {
1599 exit; 1635 exit;
1600 } 1636 }
1637 0
1601 }, 1638 },
1602 ); 1639 );
1603 1640
1604 $BUTTONBAR->show; 1641 $BUTTONBAR->show;
1605 $SETUP_DIALOG->show; 1642 $SETUP_DIALOG->show;
1607 1644
1608 $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]);
1609} 1646}
1610 1647
1611sub video_shutdown { 1648sub video_shutdown {
1649 CFClient::OpenGL::shutdown;
1650
1612 undef $SDL_ACTIVE; 1651 undef $SDL_ACTIVE;
1613} 1652}
1614 1653
1615my @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#
1616my $bgmusic;#TODO#hack#d# 1655my $bgmusic;#TODO#hack#d#
1832 1871
1833 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1872 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1834 CFClient::UI::set_layout ($::CFG->{layout}); 1873 CFClient::UI::set_layout ($::CFG->{layout});
1835 1874
1836 my %DEF_CFG = ( 1875 my %DEF_CFG = (
1837 sdl_mode => 0, 1876 sdl_mode => 0,
1838 width => 640, 1877 width => 640,
1839 height => 480, 1878 height => 480,
1840 fullscreen => 0, 1879 fullscreen => 0,
1841 fast => 0, 1880 fast => 0,
1842 map_scale => 1, 1881 map_scale => 1,
1843 fow_enable => 1, 1882 fow_enable => 1,
1844 fow_intensity => 0.45, 1883 fow_intensity => 0.45,
1845 fow_smooth => 0, 1884 fow_smooth => 0,
1846 gui_fontsize => 1, 1885 gui_fontsize => 1,
1847 log_fontsize => 0.7, 1886 log_fontsize => 0.7,
1848 gauge_fontsize=> 1, 1887 gauge_fontsize => 1,
1849 gauge_size => 0.35, 1888 gauge_size => 0.35,
1850 stat_fontsize => 0.7, 1889 stat_fontsize => 0.7,
1851 mapsize => 100, 1890 mapsize => 100,
1852 host => "crossfire.schmorp.de",
1853 say_command => 'say', 1891 say_command => 'say',
1854 audio_enable => 1, 1892 audio_enable => 1,
1855 bgm_enable => 1, 1893 bgm_enable => 1,
1856 bgm_volume => 0.25, 1894 bgm_volume => 0.25,
1857 face_prefetch => 0, 1895 face_prefetch => 0,
1858 output_sync => 1, 1896 output_sync => 1,
1859 output_count => 1, 1897 output_count => 1,
1860 pickup => 0, 1898 pickup => 0,
1899 default => "profile", # default profile
1900 );
1861 ); 1901
1862
1863 while (my ($k, $v) = each %DEF_CFG) { 1902 while (my ($k, $v) = each %DEF_CFG) {
1864 $CFG->{$k} = $v unless exists $CFG->{$k}; 1903 $CFG->{$k} = $v unless exists $CFG->{$k};
1865 } 1904 }
1905
1906 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1866 1907
1867 sdl_init; 1908 sdl_init;
1868 1909
1869 @SDL_MODES = reverse 1910 @SDL_MODES = reverse
1870 grep $_->[0] >= 640 && $_->[1] >= 480, 1911 grep $_->[0] >= 640 && $_->[1] >= 480,
1912 video_init; 1953 video_init;
1913 audio_init; 1954 audio_init;
1914} 1955}
1915 1956
1916Event::loop; 1957Event::loop;
1958#CFClient::SDL_Quit;
1959#CFClient::_exit 0;
1917 1960
1918END { CFClient::SDL_Quit } 1961END { CFClient::SDL_Quit }
1919 1962
1920=head1 NAME 1963=head1 NAME
1921 1964

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines