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.148 by root, Mon Apr 9 04:39:11 2007 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
137 159
138our $SDL_ACTIVE; 160our $SDL_ACTIVE;
139our %SDL_CB; 161our %SDL_CB;
140 162
141our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
142our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
144 172
145our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 174our $STATUSBOX;
… …
207 title => "Server Query", 235 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
209 ; 237 ;
210 238
211 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 241 ellipsise => 0,
214 text => $prompt; 242 text => $prompt;
215 243
216 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 262 );
235 263
236 $dialog->grab_focus; 264 $dialog->grab_focus;
237 265
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
239 $dialog->{tooltip} = "#charcreation_focus";
240
241 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
243 269
244 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 272 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
248 274
249 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
250 276
251 $table->add (0, 0, new CFPlus::UI::Button 277 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 278 text => "Next Race",
253 on_activate => sub { 279 on_activate => sub {
254 $conn->send ("reply n"); 280 $conn->send ("reply n");
255 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
256 0 282 0
257 }, 283 },
258 ); 284 );
259 $table->add (2, 0, new CFPlus::UI::Button 285 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 286 text => "Accept",
261 on_activate => sub { 287 on_activate => sub {
262 $conn->send ("reply d"); 288 $conn->send ("reply d");
263 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
264 0 290 0
265 }, 291 },
266 ); 292 );
267 293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
316
268 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 319 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 321 ;
… …
276 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
278 return; 327 return;
279 } 328 }
280 329
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 332 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
288 334
289 unshift @dialog, my $table = new CFPlus::UI::Table; 335 unshift @dialog, my $table = new CFPlus::UI::Table;
290 336
291 # left: re-roll 337 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 338 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 339 text => "Roll Again",
294 on_activate => sub { 340 on_activate => sub {
295 $conn->send ("reply y"); 341 $conn->send ("reply y");
296 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
297 0 343 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 359 ],
314 ), 1 .. 2; 360 ), 1 .. 2;
315 361
316 $table->add (2, 0, new CFPlus::UI::Button 362 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 363 text => "Swap Stats",
318 on_activate => sub { 364 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 365 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 366 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 367 destroy_query_dialog $conn;
322 0 368 0
323 }, 369 },
324 ); 370 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 371 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 372
327 # right: accept 373 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 374 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 375 text => "Accept",
330 on_activate => sub { 376 on_activate => sub {
331 $conn->send ("reply n"); 377 $conn->send ("reply n");
332 $STATS_PAGE->hide; 378 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 379 destroy_query_dialog $conn;
… …
420 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
421 map => $MAP, 467 map => $MAP,
422 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
423 query => \&server_query, 469 query => \&server_query,
424 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
425 sound_play => sub { 475 sound_play => sub {
426 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
427 477
428 $SDL_MIXER 478 $SDL_MIXER
429 or return; 479 or return;
… …
449 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
450 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
451 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
452 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
453 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
454 507
455 return unless $CONN; 508 return unless $CONN;
456 509
457 status "connection closed"; 510 status "connection closed";
458 511
… …
468 521
469 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
470 523
471 my $row = 0; 524 my $row = 0;
472 525
473 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 526 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
474 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 527 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
475 can_events => 1, 528 can_events => 1,
476 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
477 530
531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534
478 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
480 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
481 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
482 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label
542 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
543 can_events => 1, tooltip => $vidmode_tooltip);
483 544
484 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
485 my ($self, $value) = @_; 546 my ($self, $value) = @_;
486 547
487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
489 }); 550 });
490 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
491 552
492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
494 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
495 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
496 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
497 ); 558 );
498 559
499 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
500 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
501 state => $CFG->{fast}, 562 state => $CFG->{fast},
502 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
503 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
504 ); 565 );
505 566
567 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add_at (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 );
573
574 $table->add_at (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
506 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
507 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add_at (1, $row++, new CFPlus::UI::Slider
508 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
509 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
510 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
511 ); 589 );
512 590
591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 );
599
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
514 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
515 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
516 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
517 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
518 ); 605 );
519 606
520 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
521 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
522 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
523 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
524 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
525 ); 612 );
526 613
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
528 $table->add (1, $row++, new CFPlus::UI::CheckBox
529 state => $CFG->{fow_smooth},
530 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
531 on_changed => sub {
532 my ($self, $value) = @_;
533 $CFG->{fow_smooth} = $value;
534 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
535 0
536 }
537 );
538
539 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
540 $table->add (1, $row++, new CFPlus::UI::Slider
541 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
542 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
543 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
544 );
545
546 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
547 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
548 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
549 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
550 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
551 ); 619 );
552 620
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 621 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
554 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
555 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
556 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 624 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
557 on_changed => sub { 625 on_changed => sub {
558 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
559 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
560 0 628 0
561 } 629 }
562 ); 630 );
563 631
564 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 632 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
565 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
566 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
567 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 635 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
568 on_changed => sub { 636 on_changed => sub {
569 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
570 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
571 0 639 0
572 } 640 }
573 ); 641 );
574 642
575 $table->add (1, $row++, new CFPlus::UI::Button
576 expand => 1, align => 0, text => "Apply",
577 tooltip => "Apply the video settings",
578 on_activate => sub {
579 video_shutdown ();
580 video_init ();
581 0
582 }
583 );
584
585 $vbox 643 $vbox
586} 644}
587 645
588sub audio_setup { 646sub audio_setup {
589 my $vbox = new CFPlus::UI::VBox; 647 my $vbox = new CFPlus::UI::VBox;
590 648
591 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
592 650
593 my $row = 0; 651 my $row = 0;
594 652
595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
596 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
598 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.", 656 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.",
599 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
600 ); 658 );
601# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 659# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
602# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 660# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
603# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
604# }); 662# });
605 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 663 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
606 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
607 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
608 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
609 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
610 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
611 ); 669 );
… …
613 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
614 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
615 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
616 ); 674 );
617 675
618 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
619 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
620 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
621 on_activate => sub { 679 on_activate => sub {
622 audio_shutdown (); 680 audio_shutdown ();
623 audio_init (); 681 audio_init ();
… …
682} 740}
683 741
684sub debug_setup { 742sub debug_setup {
685 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
686 744
687 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
688 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 746 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
689 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 747 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
690 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
692 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 750 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
694 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 752 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
695 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 753 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
696 754
697 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
698
699 for my $x (0..2) {
700 for my $y (0 .. 2) {
701 $table->add ($x + 3, $y,
702 new CFPlus::UI::Entry
703 text => $default_smooth[$x * 3 + $y],
704 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
705 );
706 }
707 }
708
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 755 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
710 756
711 $table 757 $table
712} 758}
713 759
714sub stats_window { 760sub stats_window {
… …
762 [2, 4, st_spd => "Spd", 10.54], 808 [2, 4, st_spd => "Spd", 10.54],
763 [2, 5, st_wspd => "WSp", 10.54], 809 [2, 5, st_wspd => "WSp", 10.54],
764 ) { 810 ) {
765 my ($col, $row, $id, $label, $template) = @$_; 811 my ($col, $row, $id, $label, $template) = @$_;
766 812
767 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 813 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
768 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 814 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
769 align => +1, template => $template, tooltip => "#stat_$label"); 815 align => +1, template => $template, tooltip => "#stat_$label");
770 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 816 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
771 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 817 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
772 align => -1, text => $label, tooltip => "#stat_$label"); 818 align => -1, text => $label, tooltip => "#stat_$label");
773 } 819 }
774 820
775 $vb->add (new CFPlus::UI::FancyFrame 821 $vb->add (new CFPlus::UI::FancyFrame
… …
816 cold => ["Cold", 862 cold => ["Cold",
817 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 863 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
818 ghit => ["Ghost hit", 864 ghit => ["Ghost hit",
819 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 865 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
820 ); 866 );
867
821 for (qw/slow holyw conf fire depl magic 868 for (qw/slow holyw conf fire depl magic
822 drain acid pois para deat phys 869 drain acid pois para deat phys
823 blind fear tund elec cold ghit/) 870 blind fear tund elec cold ghit/)
824 { 871 {
825 $tbl2->add ($col, $row, 872 $tbl2->add_at ($col, $row,
826 $STATWIDS->{"res_$_"} = 873 $STATWIDS->{"res_$_"} =
827 new CFPlus::UI::Label 874 new CFPlus::UI::Label
828 font => $FONT_FIXED, 875 font => $FONT_FIXED,
829 template => "-100%", 876 template => "-100%",
830 align => +1, 877 align => +1,
831 valign => 0, 878 valign => 0,
832 can_events => 1, 879 can_events => 1,
833 can_hover => 1, 880 can_hover => 1,
834 tooltip => $resist_names{$_}->[1], 881 tooltip => $resist_names{$_}->[1],
835 ); 882 );
836 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 883 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
837 font => $FONT_FIXED, 884 font => $FONT_FIXED,
838 can_hover => 1, 885 can_hover => 1,
839 can_events => 1, 886 can_events => 1,
840 path => "ui/resist/resist_$_.png", 887 path => "ui/resist/resist_$_.png",
841 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
842 ); 889 );
843 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 890 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
844 text => $resist_names{$_}->[0], 891 text => $resist_names{$_}->[0],
845 font => $FONT_FIXED, 892 font => $FONT_FIXED,
846 can_hover => 1, 893 can_hover => 1,
847 can_events => 1, 894 can_events => 1,
848 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
… …
881 return if $METASERVER_ATIME > time; 928 return if $METASERVER_ATIME > time;
882 $METASERVER_ATIME = time + 60; 929 $METASERVER_ATIME = time + 60;
883 930
884 my $table = $METASERVER->{table}; 931 my $table = $METASERVER->{table};
885 $table->clear; 932 $table->clear;
886 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 933 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
887 934
888 my $ok = 0; 935 my $ok = 0;
889 936
890 CFPlus::background { 937 CFPlus::background {
891 my $ua = CFPlus::lwp_useragent; 938 my $ua = CFPlus::lwp_useragent;
… …
902 "The time this server has been running without being restarted.", 949 "The time this server has been running without being restarted.",
903 "The server software version - a '+' indicates a Crossfire+ server.", 950 "The server software version - a '+' indicates a Crossfire+ server.",
904 "Short information about this server provided by its admins.", 951 "Short information about this server provided by its admins.",
905 ); 952 );
906 my @col = qw(#Users Host Uptime Version Description); 953 my @col = qw(#Users Host Uptime Version Description);
907 $table->add ($_, 0, new CFPlus::UI::Label 954 $table->add_at ($_, 0, new CFPlus::UI::Label
908 can_hover => 1, can_events => 1, 955 can_hover => 1, can_events => 1,
909 align => 0, fg => [1, 1, 0], 956 align => 0, fg => [1, 1, 0],
910 text => $col[$_], tooltip => $tip[$_]) 957 text => $col[$_], tooltip => $tip[$_])
911 for 0 .. $#col; 958 for 0 .. $#col;
912 959
… …
934 981
935 $m = [$users, $host, $uptime, $version, $desc]; 982 $m = [$users, $host, $uptime, $version, $desc];
936 983
937 $y++; 984 $y++;
938 985
939 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 986 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
940 (new CFPlus::UI::Button 987 (new CFPlus::UI::Button
941 text => "Use", 988 text => "Use",
942 tooltip => "Put this server into the <b>Host:Port</b> field", 989 tooltip => "Put this server into the <b>Host:Port</b> field",
943 on_activate => sub { 990 on_activate => sub {
944 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 991 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
947 }, 994 },
948 ), 995 ),
949 (new CFPlus::UI::Empty expand => 1), 996 (new CFPlus::UI::Empty expand => 1),
950 ]); 997 ]);
951 998
952 $table->add ($_, $y, new CFPlus::UI::Label 999 $table->add_at ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4, 1000 max_w => $::WIDTH * 0.4,
954 ellipsise => 0, 1001 ellipsise => 0,
955 align => $align[$_], 1002 align => $align[$_],
956 text => $m->[$_], 1003 text => $m->[$_],
957 tooltip => $tip[$_], 1004 tooltip => $tip[$_],
… …
998 1045
999 $vbox->add (new CFPlus::UI::FancyFrame 1046 $vbox->add (new CFPlus::UI::FancyFrame
1000 label => "Connection Settings", 1047 label => "Connection Settings",
1001 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1048 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1002 ); 1049 );
1003 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1050 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1004 1051
1005 { 1052 {
1006 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1053 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1007 1054
1008 $vbox->add ( 1055 $vbox->add (
1009 $HOST_ENTRY = new CFPlus::UI::Entry 1056 $HOST_ENTRY = new CFPlus::UI::Entry
1010 expand => 1, 1057 expand => 1,
1011 text => $CFG->{profile}{default}{host}, 1058 text => $CFG->{profile}{default}{host},
… …
1025 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1072 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1026 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1073 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1027 ); 1074 );
1028 } 1075 }
1029 1076
1030 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1077 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1031 $table->add (1, 4, new CFPlus::UI::Entry 1078 $table->add_at (1, 4, new CFPlus::UI::Entry
1032 text => $CFG->{profile}{default}{user}, 1079 text => $CFG->{profile}{default}{user},
1033 tooltip => "The name of your character on the server", 1080 tooltip => "The name of your character on the server",
1034 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1081 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1035 ); 1082 );
1036 1083
1037 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1084 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1038 $table->add (1, 5, new CFPlus::UI::Entry 1085 $table->add_at (1, 5, new CFPlus::UI::Entry
1039 text => $CFG->{profile}{default}{password}, 1086 text => $CFG->{profile}{default}{password},
1040 hidden => 1, 1087 hidden => 1,
1041 tooltip => "The password for your character", 1088 tooltip => "The password for your character",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1043 ); 1090 );
1044 1091
1045 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1092 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1046 $table->add (1, 7, new CFPlus::UI::Slider 1093 $table->add_at (1, 7, new CFPlus::UI::Slider
1047 force_w => 100, 1094 force_w => 100,
1048 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1095 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1049 tooltip => "This is the size of the portion of the map update the server sends you. " 1096 tooltip => "This is the size of the portion of the map update the server sends you. "
1050 . "If you set this to a high value you will be able to see further, " 1097 . "If you set this to a high value you will be able to see further, "
1051 . "but you also increase bandwidth requirements and latency. " 1098 . "but you also increase bandwidth requirements and latency. "
1052 . "This option is only used once at log-in.", 1099 . "This option is only used once at log-in.",
1053 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1100 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1054 ); 1101 );
1055 1102
1056 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1103 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1057 $table->add (1, 8, new CFPlus::UI::CheckBox 1104 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1058 state => $CFG->{face_prefetch}, 1105 state => $CFG->{face_prefetch},
1059 tooltip => "<b>Background Image Prefetch</b>\n\n" 1106 tooltip => "<b>Background Image Prefetch</b>\n\n"
1060 . "If enabled, the client automatically pre-fetches images from the server. " 1107 . "If enabled, the client automatically pre-fetches images from the server. "
1061 . "This might increase or create lag, but increases the chances " 1108 . "This might increase or create lag, but increases the chances "
1062 . "of faces being ready for display when you encounter them. " 1109 . "of faces being ready for display when you encounter them. "
… …
1064 . "so only set it if you really need to prefetch images. " 1111 . "so only set it if you really need to prefetch images. "
1065 . "This option can be set and unset any time.", 1112 . "This option can be set and unset any time.",
1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1113 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1067 ); 1114 );
1068 1115
1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1116 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1070 $table->add (1, 9, new CFPlus::UI::Entry 1117 $table->add_at (1, 9, new CFPlus::UI::Entry
1071 text => $CFG->{output_rate}, 1118 text => $CFG->{output_rate},
1072 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1073 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1074 . "default will be used, which is usually around 100kb/s.", 1121 . "default will be used, which is usually around 100kb/s.",
1075 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1076 ); 1123 );
1077 1124
1078 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1079 $table->add (1, 10, new CFPlus::UI::Entry 1126 $table->add_at (1, 10, new CFPlus::UI::Entry
1080 text => $CFG->{output_count}, 1127 text => $CFG->{output_count},
1081 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1128 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1083 ); 1130 );
1084 1131
1085 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1132 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1086 $table->add (1, 11, new CFPlus::UI::Entry 1133 $table->add_at (1, 11, new CFPlus::UI::Entry
1087 text => $CFG->{output_sync}, 1134 text => $CFG->{output_sync},
1088 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1090 ); 1137 );
1091 1138
1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1139 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1093 expand => 1, 1140 expand => 1,
1094 align => 0, 1141 align => 0,
1095 text => "Login", 1142 text => "Login",
1096 on_activate => sub { 1143 on_activate => sub {
1097 $CONN ? stop_game 1144 $CONN ? stop_game
1098 : start_game; 1145 : start_game;
1099 0 1146 0
1100 }, 1147 },
1101 ); 1148 );
1102 1149
1150 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info",
1152 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1153 );
1154
1155 $vbox
1156}
1157
1158sub client_setup {
1159 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1160
1161 my $row = 0;
1162
1103 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1163 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1164 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1105 text => $CFG->{say_command}, 1165 text => $CFG->{say_command},
1106 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1166 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1107 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1167 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1108 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1168 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1109 on_changed => sub { 1169 on_changed => sub {
1110 my ($self, $value) = @_; 1170 my ($self, $value) = @_;
1111 $CFG->{say_command} = $value; 1171 $CFG->{say_command} = $value;
1112 0 1172 0
1113 } 1173 }
1114 ); 1174 );
1115 1175
1116 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1176 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1117 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1177 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1118 state => $CFG->{show_tips}, 1178 state => $CFG->{show_tips},
1119 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1179 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1120 on_changed => sub { 1180 on_changed => sub {
1121 my ($self, $value) = @_; 1181 my ($self, $value) = @_;
1122 $CFG->{show_tips} = $value; 1182 $CFG->{show_tips} = $value;
1123 0 1183 0
1124 } 1184 }
1125 ); 1185 );
1126 1186
1127 $vbox->add (new CFPlus::UI::FancyFrame 1187 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1128 label => "Server Info", 1188 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1129 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1189 text => $CFG->{logview_max_par},
1190 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1191 . "sends more messages than this number, older messages get removed to save memory and "
1192 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1193 on_changed => sub {
1194 my ($self, $value) = @_;
1195 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1196 0
1197 },
1130 ); 1198 );
1131 1199
1132 $vbox 1200 $table
1133} 1201}
1134 1202
1135sub message_window { 1203sub message_window {
1136 my $window = new CFPlus::UI::Toplevel 1204 my $window = new CFPlus::UI::Toplevel
1137 name => "message_window", 1205 name => "message_window",
… …
1194 1262
1195 $window 1263 $window
1196} 1264}
1197 1265
1198sub autopickup_setup { 1266sub autopickup_setup {
1267 my $r = new CFPlus::UI::ScrolledWindow (
1268 expand => 1,
1269 scroll_y => 1
1270 );
1199 my $table = new CFPlus::UI::Table; 1271 $r->add (my $table = new CFPlus::UI::Table
1272 row_expand => [0],
1273 col_expand => [0, 1, 0, 1],
1274 );
1200 1275
1201 for ( 1276 for (
1202 ["General", 0, 0, 1277 ["General", 0, 0,
1203 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1278 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1204 ["Inhibit autopickup" => PICKUP_INHIBIT], 1279 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1239 ], 1314 ],
1240 ["Weight/Value ratio", 2, 17] 1315 ["Weight/Value ratio", 2, 17]
1241 ) 1316 )
1242 { 1317 {
1243 my ($title, $x, $y, @bits) = @$_; 1318 my ($title, $x, $y, @bits) = @$_;
1244 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1319 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1245 1320
1246 for (@bits) { 1321 for (@bits) {
1247 ++$y; 1322 ++$y;
1248 1323
1249 my $mask = $_->[1]; 1324 my $mask = $_->[1];
1250 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1325 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1251 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1326 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1252 state => $::CFG->{pickup} & $mask, 1327 state => $::CFG->{pickup} & $mask,
1253 on_changed => sub { 1328 on_changed => sub {
1254 my ($box, $value) = @_; 1329 my ($box, $value) = @_;
1255 1330
1256 if ($value) { 1331 if ($value) {
… …
1267 1342
1268 ${$_->[2]} = $checkbox if $_->[2]; 1343 ${$_->[2]} = $checkbox if $_->[2];
1269 } 1344 }
1270 } 1345 }
1271 1346
1272 $table->add (2, 18, new CFPlus::UI::ValSlider 1347 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1273 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1348 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1274 template => ">= 99", 1349 template => ">= 99",
1275 to_value => sub { ">= " . 5 * $_[0] }, 1350 to_value => sub { ">= " . 5 * $_[0] },
1276 on_changed => sub { 1351 on_changed => sub {
1277 my ($slider, $value) = @_; 1352 my ($slider, $value) = @_;
… …
1280 $::CFG->{pickup} |= int $value 1355 $::CFG->{pickup} |= int $value
1281 if $value; 1356 if $value;
1282 1; 1357 1;
1283 }); 1358 });
1284 1359
1285 $table->add (3, 18, new CFPlus::UI::Button 1360 $table->add_at (3, 18, new CFPlus::UI::Button
1286 text => "set", 1361 text => "set",
1287 on_activate => sub { 1362 on_activate => sub {
1288 $::CONN->send_command ("pickup $::CFG->{pickup}") 1363 $::CONN->send_command ("pickup $::CFG->{pickup}")
1289 if defined $::CONN; 1364 if defined $::CONN;
1290 0 1365 0
1291 }); 1366 });
1292 1367
1293 $table 1368 $r
1294} 1369}
1295 1370
1296my %SORT_ORDER = ( 1371my %SORT_ORDER = (
1297 type => undef, 1372 type => undef,
1298 mtime => sub { 1373 mtime => sub {
… …
1377 has_close_button => 1 1452 has_close_button => 1
1378 ; 1453 ;
1379 1454
1380 my $ntb = 1455 my $ntb =
1381 $PL_NOTEBOOK = 1456 $PL_NOTEBOOK =
1382 new CFPlus::UI::Notebook expand => 1, debug => 1; 1457 new CFPlus::UI::Notebook expand => 1;
1383 1458
1384 $ntb->add ( 1459 $ntb->add (
1385 "Statistics (F2)" => $STATS_PAGE = stats_window, 1460 "Statistics (F2)" => $STATS_PAGE = stats_window,
1386 "Shows statistics, where all your Stats and Resistances are shown." 1461 "Shows statistics, where all your Stats and Resistances are shown."
1387 ); 1462 );
… …
1399 $ntb->add ( 1474 $ntb->add (
1400 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1475 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1401 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1476 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1402 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1477 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1403 ); 1478 );
1479 $ntb->add (Pickup => autopickup_setup,
1480 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1404 1481
1405 $ntb->set_current_page ($INVENTORY_PAGE); 1482 $ntb->set_current_page ($INVENTORY_PAGE);
1406 1483
1407 $plwin->add ($ntb); 1484 $plwin->add ($ntb);
1408 $plwin 1485 $plwin
… …
1605 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1606 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1607 1684
1608 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1685 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1609 1686
1610 $table->add (0, 0, new CFPlus::UI::Button 1687 $table->add_at (0, 0, new CFPlus::UI::Button
1611 text => "Close", 1688 text => "Close",
1612 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1689 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1613 on_activate => $close, 1690 on_activate => $close,
1614 ); 1691 );
1615 1692
1616 $table->add (2, 0, new CFPlus::UI::Button 1693 $table->add_at (2, 0, new CFPlus::UI::Button
1617 text => "Next", 1694 text => "Next",
1618 tooltip => "Show the next <b>Tip of the day</b>.", 1695 tooltip => "Show the next <b>Tip of the day</b>.",
1619 on_activate => sub { 1696 on_activate => sub {
1620 $close->(); 1697 $close->();
1621 &show_tip_of_the_day; 1698 &show_tip_of_the_day;
… …
1630 CFPlus::SDL_Init 1707 CFPlus::SDL_Init
1631 and die "SDL::Init failed!\n"; 1708 and die "SDL::Init failed!\n";
1632} 1709}
1633 1710
1634sub video_init { 1711sub video_init {
1635 sdl_init;
1636
1637 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1712 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1638 1713
1639 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1714 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1640 1715
1641 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1716 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1642 $FULLSCREEN = $CFG->{fullscreen}; 1717 $FULLSCREEN = $CFG->{fullscreen};
1643 $FAST = $CFG->{fast}; 1718 $FAST = $CFG->{fast};
1644 1719
1645 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1720 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1646 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1721 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1647 1722
1648 $SDL_ACTIVE = 1; 1723 $SDL_ACTIVE = 1;
1649 $LAST_REFRESH = time - 0.01; 1724 $LAST_REFRESH = time - 0.01;
1650 1725
… …
1711 font => $FONT_FIXED, 1786 font => $FONT_FIXED,
1712 fontsize => $::CFG->{log_fontsize}, 1787 fontsize => $::CFG->{log_fontsize},
1713 indent => -4, 1788 indent => -4,
1714 can_hover => 1, 1789 can_hover => 1,
1715 can_events => 1, 1790 can_events => 1,
1791 max_par => $CFG->{logview_max_par},
1716 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1792 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1717 ; 1793 ;
1718 1794
1719 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1795 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1720 title => "Setup", 1796 title => "Setup",
1721 name => "setup_dialog", 1797 name => "setup_dialog",
… …
1732 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1808 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1733 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1809 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1734 1810
1735 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1811 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1736 "Configure the server to play on, your username, password and other server-related options."); 1812 "Configure the server to play on, your username, password and other server-related options.");
1737 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1813 $SETUP_NOTEBOOK->add (Client => client_setup,
1738 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1814 "Configure various client-specific settings.");
1739 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1815 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1740 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1816 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1741 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1817 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1742 "Configure the use of audio, sound effects and background music."); 1818 "Configure the use of audio, sound effects and background music.");
1743 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1819 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1889 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1965 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1890 1966
1891 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1967 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1892 my $row = 0; 1968 my $row = 0;
1893 if ($info->{has_name}) { 1969 if ($info->{has_name}) {
1894 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1970 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1895 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1971 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1896 } 1972 }
1897 if ($info->{has_text}) { 1973 if ($info->{has_text}) {
1898 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1974 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1899 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1975 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1900 } 1976 }
1901 if ($info->{has_connection}) { 1977 if ($info->{has_connection}) {
1902 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1978 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1903 $table->add (1, $row++, 1979 $table->add_at (1, $row++,
1904 new CFPlus::UI::Entry 1980 new CFPlus::UI::Entry
1905 expand => 1, 1981 expand => 1,
1906 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1982 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1907 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1983 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1908 ); 1984 );
… …
1921 CFPlus::OpenGL::shutdown; 1997 CFPlus::OpenGL::shutdown;
1922 1998
1923 undef $SDL_ACTIVE; 1999 undef $SDL_ACTIVE;
1924} 2000}
1925 2001
1926my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1927my $bgmusic;#TODO#hack#d#
1928
1929sub audio_channel_finished { 2002sub audio_channel_finished {
1930 my ($channel) = @_; 2003 my ($channel) = @_;
1931 2004
1932 #warn "channel $channel finished\n";#d# 2005 #warn "channel $channel finished\n";#d#
1933} 2006}
1934 2007
2008sub audio_music_set {
2009 my ($songs) = @_;
2010
2011 my @want =
2012 grep $_,
2013 map $CONN->{music_meta}{$_},
2014 @$songs;
2015
2016 if (@want) {
2017 @MUSIC_WANT = @want;
2018 &audio_music_changed ();
2019 }
2020}
2021
2022sub audio_music_start {
2023 my $path = $MUSIC_PLAYING->{path}
2024 or return;
2025
2026 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2027 # music might have changed...
2028 $path eq $MUSIC_PLAYING->{path}
2029 or return &audio_music_start ();
2030
2031 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2032
2033 my $NOW = time;
2034
2035 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2036 my $pos = $MUSIC_PLAYING->{stop_pos};
2037 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2038 $MUSIC_START = time - $pos;
2039 } else {
2040 $MUSIC_PLAYER->play (0);
2041 $MUSIC_START = time;
2042 }
2043
2044 delete $MUSIC_PLAYING->{stop_time};
2045 delete $MUSIC_PLAYING->{stop_pos};
2046 }
2047}
2048
2049sub audio_music_changed {
2050 return unless $CFG->{bgm_enable};
2051
2052 # default MUSIC_WANT == MUSIC_DEFAULT
2053 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2054
2055 # if the currently playing song is acceptable, let it continue
2056 return if $MUSIC_PLAYING
2057 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2058
2059 my $NOW = time;
2060
2061 if ($MUSIC_PLAYING) {
2062 $MUSIC_PLAYING->{stop_time} = $NOW;
2063 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2064 CFPlus::MixMusic::fade_out 1000;
2065 } else {
2066 # sort by stop time, oldest first
2067 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2068
2069 # if the most recently-played piece played very recently,
2070 # resume it, else choose the oldest piece for rotation.
2071 $MUSIC_PLAYING =
2072 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2073 ? $MUSIC_WANT[-1]
2074 : $MUSIC_WANT[0];
2075
2076 audio_music_start;
2077 }
2078}
2079
1935sub audio_music_finished { 2080sub audio_music_finished {
1936 return unless $CFG->{bgm_enable}; 2081 $MUSIC_PLAYING = undef;
2082 undef $MUSIC_PLAYER;
1937 2083
1938 # TODO: hack, do play loop and mood music 2084 audio_music_changed;
1939 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1940 $bgmusic->play (0);
1941
1942 push @bgmusic, shift @bgmusic;
1943} 2085}
1944 2086
1945sub audio_init { 2087sub audio_init {
1946 if ($CFG->{audio_enable}) { 2088 if ($CFG->{audio_enable}) {
1947 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2089 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1997 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2139 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1998 2140
1999 $CFPlus::UI::ROOT->draw; 2141 $CFPlus::UI::ROOT->draw;
2000 2142
2001 $WANT_REFRESH = 0; 2143 $WANT_REFRESH = 0;
2002 $CAN_REFRESH = 0; 2144 $CAN_REFRESH = 0;
2003 $LAST_REFRESH = $NOW; 2145 $LAST_REFRESH = $NOW;
2004 2146
2005 CFPlus::SDL_GL_SwapBuffers; 2147 CFPlus::SDL_GL_SwapBuffers;
2006} 2148}
2007 2149
2008my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2150my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2009 $NOW = time; 2151 $NOW = time;
2010 2152
2011 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2153 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2012 for CFPlus::SDL_PollEvent; 2154 for CFPlus::poll_events;
2013 2155
2014 if (%animate_object) { 2156 if (%animate_object) {
2015 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2157 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2016 $WANT_REFRESH++; 2158 ++$WANT_REFRESH;
2017 } 2159 }
2018 2160
2019 if ($WANT_REFRESH) { 2161 if ($WANT_REFRESH) {
2020 force_refresh; 2162 force_refresh;
2021 } else { 2163 } else {
… …
2042 if $CONN; 2184 if $CONN;
2043}); 2185});
2044 2186
2045%SDL_CB = ( 2187%SDL_CB = (
2046 CFPlus::SDL_QUIT => sub { 2188 CFPlus::SDL_QUIT => sub {
2047 Event::unloop -1; 2189 exit;
2048 }, 2190 },
2049 CFPlus::SDL_VIDEORESIZE => sub { 2191 CFPlus::SDL_VIDEORESIZE => sub {
2050 }, 2192 },
2051 CFPlus::SDL_VIDEOEXPOSE => sub { 2193 CFPlus::SDL_VIDEOEXPOSE => sub {
2052 CFPlus::UI::full_refresh; 2194 CFPlus::UI::full_refresh;
2053 }, 2195 },
2054 CFPlus::SDL_ACTIVEEVENT => sub { 2196 CFPlus::SDL_ACTIVEEVENT => sub {
2055# not useful, as APPACTIVE include sonly iconified state, not unmapped 2197# not useful, as APPACTIVE include sonly iconified state, not unmapped
2056# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2198# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2199# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2057# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2200# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2058# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2201# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2059# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2202# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2060 }, 2203 },
2061 CFPlus::SDL_KEYDOWN => sub { 2204 CFPlus::SDL_KEYDOWN => sub {
… …
2090 CFPlus::DB::Server::run; 2233 CFPlus::DB::Server::run;
2091 2234
2092 CFPlus::UI::set_layout ($::CFG->{layout}); 2235 CFPlus::UI::set_layout ($::CFG->{layout});
2093 2236
2094 my %DEF_CFG = ( 2237 my %DEF_CFG = (
2095 sdl_mode => 0, 2238 sdl_mode => 0,
2096 width => 640, 2239 width => 640,
2097 height => 480, 2240 height => 480,
2098 fullscreen => 0, 2241 fullscreen => 0,
2099 fast => 0, 2242 fast => 0,
2100 map_scale => 1, 2243 map_scale => 1,
2101 fow_enable => 1, 2244 fow_enable => 1,
2102 fow_intensity => 0.45, 2245 fow_intensity => 0,
2103 fow_smooth => 0, 2246 map_smoothing => 1,
2104 gui_fontsize => 1, 2247 gui_fontsize => 1,
2105 log_fontsize => 0.7, 2248 log_fontsize => 0.7,
2106 gauge_fontsize => 1, 2249 gauge_fontsize => 1,
2107 gauge_size => 0.35, 2250 gauge_size => 0.35,
2108 stat_fontsize => 0.7, 2251 stat_fontsize => 0.7,
2109 mapsize => 100, 2252 mapsize => 100,
2110 say_command => 'chat', 2253 say_command => 'chat',
2111 audio_enable => 1, 2254 audio_enable => 1,
2112 bgm_enable => 1, 2255 bgm_enable => 1,
2113 bgm_volume => 0.25, 2256 bgm_volume => 0.25,
2114 face_prefetch => 0, 2257 face_prefetch => 0,
2115 output_sync => 1, 2258 output_sync => 1,
2116 output_count => 1, 2259 output_count => 1,
2117 output_rate => "", 2260 output_rate => "",
2118 pickup => 0, 2261 pickup => 0,
2119 inv_sort => "mtime", 2262 inv_sort => "mtime",
2120 default => "profile", # default profile 2263 default => "profile", # default profile
2121 show_tips => 1, 2264 show_tips => 1,
2265 logview_max_par => 1000,
2122 ); 2266 );
2123 2267
2124 while (my ($k, $v) = each %DEF_CFG) { 2268 while (my ($k, $v) = each %DEF_CFG) {
2125 $CFG->{$k} = $v unless exists $CFG->{$k}; 2269 $CFG->{$k} = $v unless exists $CFG->{$k};
2126 } 2270 }
… …
2140 } 2284 }
2141 } 2285 }
2142 2286
2143 sdl_init; 2287 sdl_init;
2144 2288
2145 @SDL_MODES = reverse 2289 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2146 grep $_->[0] >= 640 && $_->[1] >= 480, 2290 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2147 CFPlus::SDL_ListModes;
2148
2149 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2291 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2292
2293 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2150 2294
2151 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2295 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2152 2296
2153 { 2297 {
2154 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2298 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2195 2339
2196Event::loop; 2340Event::loop;
2197#CFPlus::SDL_Quit; 2341#CFPlus::SDL_Quit;
2198#CFPlus::_exit 0; 2342#CFPlus::_exit 0;
2199 2343
2344END {
2200END { CFPlus::SDL_Quit } 2345 CFPlus::SDL_Quit;
2346 CFPlus::DB::Server::stop;
2347}
2201 2348
2202=head1 NAME 2349=head1 NAME
2203 2350
2204cfplus - A Crossfire+ and Crossfire game client 2351cfplus - A Crossfire+ and Crossfire game client
2205 2352

Diff Legend

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