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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.82 by elmex, Wed Jun 28 10:37:19 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines