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.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.180 by root, Sat Jul 21 13:37:09 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;
… …
453 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
456 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
457 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
458 507
459 return unless $CONN; 508 return unless $CONN;
460 509
461 status "connection closed"; 510 status "connection closed";
462 511
… …
472 521
473 $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]);
474 523
475 my $row = 0; 524 my $row = 0;
476 525
477 $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");
478 $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,
479 can_events => 1, 528 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481 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
482 $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");
483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
485 $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],
486 $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);
487 544
488 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
489 my ($self, $value) = @_; 546 my ($self, $value) = @_;
490 547
491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493 }); 550 });
494 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
495 552
496 $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");
497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
499 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501 ); 558 );
502 559
503 $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");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fast}, 562 state => $CFG->{fast},
506 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508 ); 565 );
509 566
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 567 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511 $table->add (1, $row++, new CFPlus::UI::Slider 568 $table->add_at (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 ); 572 );
516 573
517 $table->add (1, $row++, new CFPlus::UI::Button 574 $table->add_at (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply", 575 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.", 576 tooltip => "Apply the video settings above.",
520 on_activate => sub { 577 on_activate => sub {
521 video_shutdown (); 578 video_shutdown ();
522 video_init (); 579 video_init ();
523 0 580 0
524 } 581 }
525 ); 582 );
526 583
527 $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");
528 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add_at (1, $row++, new CFPlus::UI::Slider
529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531 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 }
532 ); 589 );
533 590
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
535 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing}, 593 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538 . "This increases load on the graphics subsystem and works only with 2.x servers. " 595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
539 . "Changes take effect at next connection only.", 596 . "Changes take effect at next connection only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541 ); 598 );
542 599
543 $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");
544 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
545 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
546 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.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548 ); 605 );
549 606
550 $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");
551 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
553 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.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555 ); 612 );
556 613
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{fow_smooth},
560 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
561 on_changed => sub {
562 my ($self, $value) = @_;
563 $CFG->{fow_smooth} = $value;
564 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
565 0
566 }
567 );
568
569 $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");
570 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
572 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.",
573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574 ); 619 );
575 620
576 $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");
577 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
579 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.",
580 on_changed => sub { 625 on_changed => sub {
581 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
582 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
583 0 628 0
584 } 629 }
585 ); 630 );
586 631
587 $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");
588 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
590 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.",
591 on_changed => sub { 636 on_changed => sub {
592 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
603 648
604 $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]);
605 650
606 my $row = 0; 651 my $row = 0;
607 652
608 $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");
609 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
610 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
611 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.",
612 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
613 ); 658 );
614# $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");
615# $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 {
616# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
617# }); 662# });
618 $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");
619 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
620 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
621 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
622 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.",
623 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
624 ); 669 );
… …
626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
628 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 }
629 ); 674 );
630 675
631 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
632 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
633 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
634 on_activate => sub { 679 on_activate => sub {
635 audio_shutdown (); 680 audio_shutdown ();
636 audio_init (); 681 audio_init ();
… …
695} 740}
696 741
697sub debug_setup { 742sub debug_setup {
698 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
699 744
700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
701 $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 });
702 $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");
703 $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 });
704 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
705 $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 });
706 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
707 $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 });
708 $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() } );
709 754
710 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
711
712 for my $x (0..2) {
713 for my $y (0 .. 2) {
714 $table->add ($x + 3, $y,
715 new CFPlus::UI::Entry
716 text => $default_smooth[$x * 3 + $y],
717 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
718 );
719 }
720 }
721
722 $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#
756
757 $table->add_at (7,7, my $t = new CFPlus::UI::Table);
758 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
759 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
760 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
761 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
762 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
723 763
724 $table 764 $table
725} 765}
726 766
727sub stats_window { 767sub stats_window {
… …
775 [2, 4, st_spd => "Spd", 10.54], 815 [2, 4, st_spd => "Spd", 10.54],
776 [2, 5, st_wspd => "WSp", 10.54], 816 [2, 5, st_wspd => "WSp", 10.54],
777 ) { 817 ) {
778 my ($col, $row, $id, $label, $template) = @$_; 818 my ($col, $row, $id, $label, $template) = @$_;
779 819
780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 820 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 821 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782 align => +1, template => $template, tooltip => "#stat_$label"); 822 align => +1, template => $template, tooltip => "#stat_$label");
783 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 823 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
784 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 824 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785 align => -1, text => $label, tooltip => "#stat_$label"); 825 align => -1, text => $label, tooltip => "#stat_$label");
786 } 826 }
787 827
788 $vb->add (new CFPlus::UI::FancyFrame 828 $vb->add (new CFPlus::UI::FancyFrame
… …
829 cold => ["Cold", 869 cold => ["Cold",
830 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 870 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831 ghit => ["Ghost hit", 871 ghit => ["Ghost hit",
832 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 872 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833 ); 873 );
874
834 for (qw/slow holyw conf fire depl magic 875 for (qw/slow holyw conf fire depl magic
835 drain acid pois para deat phys 876 drain acid pois para deat phys
836 blind fear tund elec cold ghit/) 877 blind fear tund elec cold ghit/)
837 { 878 {
838 $tbl2->add ($col, $row, 879 $tbl2->add_at ($col, $row,
839 $STATWIDS->{"res_$_"} = 880 $STATWIDS->{"res_$_"} =
840 new CFPlus::UI::Label 881 new CFPlus::UI::Label
841 font => $FONT_FIXED, 882 font => $FONT_FIXED,
842 template => "-100%", 883 template => "-100%",
843 align => +1, 884 align => +1,
844 valign => 0, 885 valign => 0,
845 can_events => 1, 886 can_events => 1,
846 can_hover => 1, 887 can_hover => 1,
847 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
848 ); 889 );
849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 890 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850 font => $FONT_FIXED, 891 font => $FONT_FIXED,
851 can_hover => 1, 892 can_hover => 1,
852 can_events => 1, 893 can_events => 1,
853 path => "ui/resist/resist_$_.png", 894 path => "ui/resist/resist_$_.png",
854 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
855 ); 896 );
856 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 897 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857 text => $resist_names{$_}->[0], 898 text => $resist_names{$_}->[0],
858 font => $FONT_FIXED, 899 font => $FONT_FIXED,
859 can_hover => 1, 900 can_hover => 1,
860 can_events => 1, 901 can_events => 1,
861 tooltip => $resist_names{$_}->[1], 902 tooltip => $resist_names{$_}->[1],
… …
894 return if $METASERVER_ATIME > time; 935 return if $METASERVER_ATIME > time;
895 $METASERVER_ATIME = time + 60; 936 $METASERVER_ATIME = time + 60;
896 937
897 my $table = $METASERVER->{table}; 938 my $table = $METASERVER->{table};
898 $table->clear; 939 $table->clear;
899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 940 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900 941
901 my $ok = 0; 942 my $ok = 0;
902 943
903 CFPlus::background { 944 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent; 945 my $ua = CFPlus::lwp_useragent;
… …
915 "The time this server has been running without being restarted.", 956 "The time this server has been running without being restarted.",
916 "The server software version - a '+' indicates a Crossfire+ server.", 957 "The server software version - a '+' indicates a Crossfire+ server.",
917 "Short information about this server provided by its admins.", 958 "Short information about this server provided by its admins.",
918 ); 959 );
919 my @col = qw(#Users Host Uptime Version Description); 960 my @col = qw(#Users Host Uptime Version Description);
920 $table->add ($_, 0, new CFPlus::UI::Label 961 $table->add_at ($_, 0, new CFPlus::UI::Label
921 can_hover => 1, can_events => 1, 962 can_hover => 1, can_events => 1,
922 align => 0, fg => [1, 1, 0], 963 align => 0, fg => [1, 1, 0],
923 text => $col[$_], tooltip => $tip[$_]) 964 text => $col[$_], tooltip => $tip[$_])
924 for 0 .. $#col; 965 for 0 .. $#col;
925 966
… …
947 988
948 $m = [$users, $host, $uptime, $version, $desc]; 989 $m = [$users, $host, $uptime, $version, $desc];
949 990
950 $y++; 991 $y++;
951 992
952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 993 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953 (new CFPlus::UI::Button 994 (new CFPlus::UI::Button
954 text => "Use", 995 text => "Use",
955 tooltip => "Put this server into the <b>Host:Port</b> field", 996 tooltip => "Put this server into the <b>Host:Port</b> field",
956 on_activate => sub { 997 on_activate => sub {
957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 998 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
960 }, 1001 },
961 ), 1002 ),
962 (new CFPlus::UI::Empty expand => 1), 1003 (new CFPlus::UI::Empty expand => 1),
963 ]); 1004 ]);
964 1005
965 $table->add ($_, $y, new CFPlus::UI::Label 1006 $table->add_at ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4, 1007 max_w => $::WIDTH * 0.4,
967 ellipsise => 0, 1008 ellipsise => 0,
968 align => $align[$_], 1009 align => $align[$_],
969 text => $m->[$_], 1010 text => $m->[$_],
970 tooltip => $tip[$_], 1011 tooltip => $tip[$_],
… …
1011 1052
1012 $vbox->add (new CFPlus::UI::FancyFrame 1053 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings", 1054 label => "Connection Settings",
1014 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1055 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015 ); 1056 );
1016 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1057 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017 1058
1018 { 1059 {
1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1060 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020 1061
1021 $vbox->add ( 1062 $vbox->add (
1022 $HOST_ENTRY = new CFPlus::UI::Entry 1063 $HOST_ENTRY = new CFPlus::UI::Entry
1023 expand => 1, 1064 expand => 1,
1024 text => $CFG->{profile}{default}{host}, 1065 text => $CFG->{profile}{default}{host},
… …
1038 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1079 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1080 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1040 ); 1081 );
1041 } 1082 }
1042 1083
1043 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1084 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044 $table->add (1, 4, new CFPlus::UI::Entry 1085 $table->add_at (1, 4, new CFPlus::UI::Entry
1045 text => $CFG->{profile}{default}{user}, 1086 text => $CFG->{profile}{default}{user},
1046 tooltip => "The name of your character on the server", 1087 tooltip => "The name of your character on the server",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1048 ); 1089 );
1049 1090
1050 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1091 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051 $table->add (1, 5, new CFPlus::UI::Entry 1092 $table->add_at (1, 5, new CFPlus::UI::Entry
1052 text => $CFG->{profile}{default}{password}, 1093 text => $CFG->{profile}{default}{password},
1053 hidden => 1, 1094 hidden => 1,
1054 tooltip => "The password for your character", 1095 tooltip => "The password for your character",
1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1056 ); 1097 );
1057 1098
1058 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1099 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1059 $table->add (1, 7, new CFPlus::UI::Slider 1100 $table->add_at (1, 7, new CFPlus::UI::Slider
1060 force_w => 100, 1101 force_w => 100,
1061 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1102 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062 tooltip => "This is the size of the portion of the map update the server sends you. " 1103 tooltip => "This is the size of the portion of the map update the server sends you. "
1063 . "If you set this to a high value you will be able to see further, " 1104 . "If you set this to a high value you will be able to see further, "
1064 . "but you also increase bandwidth requirements and latency. " 1105 . "but you also increase bandwidth requirements and latency. "
1065 . "This option is only used once at log-in.", 1106 . "This option is only used once at log-in.",
1066 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1067 ); 1108 );
1068 1109
1069 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1110 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1070 $table->add (1, 8, new CFPlus::UI::CheckBox 1111 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1071 state => $CFG->{face_prefetch}, 1112 state => $CFG->{face_prefetch},
1072 tooltip => "<b>Background Image Prefetch</b>\n\n" 1113 tooltip => "<b>Background Image Prefetch</b>\n\n"
1073 . "If enabled, the client automatically pre-fetches images from the server. " 1114 . "If enabled, the client automatically pre-fetches images from the server. "
1074 . "This might increase or create lag, but increases the chances " 1115 . "This might increase or create lag, but increases the chances "
1075 . "of faces being ready for display when you encounter them. " 1116 . "of faces being ready for display when you encounter them. "
… …
1077 . "so only set it if you really need to prefetch images. " 1118 . "so only set it if you really need to prefetch images. "
1078 . "This option can be set and unset any time.", 1119 . "This option can be set and unset any time.",
1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1120 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080 ); 1121 );
1081 1122
1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1123 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1083 $table->add (1, 9, new CFPlus::UI::Entry 1124 $table->add_at (1, 9, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate}, 1125 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1126 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1086 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1127 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.", 1128 . "default will be used, which is usually around 100kb/s.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1129 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1089 ); 1130 );
1090 1131
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092 $table->add (1, 10, new CFPlus::UI::Entry 1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1093 text => $CFG->{output_count}, 1134 text => $CFG->{output_count},
1094 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.",
1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1096 ); 1137 );
1097 1138
1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1139 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099 $table->add (1, 11, new CFPlus::UI::Entry 1140 $table->add_at (1, 11, new CFPlus::UI::Entry
1100 text => $CFG->{output_sync}, 1141 text => $CFG->{output_sync},
1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1142 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1143 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1103 ); 1144 );
1104 1145
1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1146 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1106 expand => 1, 1147 expand => 1,
1107 align => 0, 1148 align => 0,
1108 text => "Login", 1149 text => "Login",
1109 on_activate => sub { 1150 on_activate => sub {
1110 $CONN ? stop_game 1151 $CONN ? stop_game
… …
1124sub client_setup { 1165sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1166 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126 1167
1127 my $row = 0; 1168 my $row = 0;
1128 1169
1129 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1170 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1171 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131 text => $CFG->{say_command}, 1172 text => $CFG->{say_command},
1132 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. " 1173 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. "
1133 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1174 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1134 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1175 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135 on_changed => sub { 1176 on_changed => sub {
… …
1137 $CFG->{say_command} = $value; 1178 $CFG->{say_command} = $value;
1138 0 1179 0
1139 } 1180 }
1140 ); 1181 );
1141 1182
1142 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1183 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1143 $table->add (1, $row++, new CFPlus::UI::CheckBox 1184 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144 state => $CFG->{show_tips}, 1185 state => $CFG->{show_tips},
1145 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1186 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146 on_changed => sub { 1187 on_changed => sub {
1147 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1148 $CFG->{show_tips} = $value; 1189 $CFG->{show_tips} = $value;
1149 0 1190 0
1150 } 1191 }
1151 ); 1192 );
1152 1193
1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1194 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1154 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1195 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155 text => $CFG->{logview_max_par}, 1196 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1197 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157 . "sends more messages than this number, older messages get removed to save memory and " 1198 . "sends more messages than this number, older messages get removed to save memory and "
1158 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1199 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub { 1200 on_changed => sub {
… …
1228 1269
1229 $window 1270 $window
1230} 1271}
1231 1272
1232sub autopickup_setup { 1273sub autopickup_setup {
1274 my $r = new CFPlus::UI::ScrolledWindow (
1275 expand => 1,
1276 scroll_y => 1
1277 );
1233 my $table = new CFPlus::UI::Table; 1278 $r->add (my $table = new CFPlus::UI::Table
1279 row_expand => [0],
1280 col_expand => [0, 1, 0, 1],
1281 );
1234 1282
1235 for ( 1283 for (
1236 ["General", 0, 0, 1284 ["General", 0, 0,
1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238 ["Inhibit autopickup" => PICKUP_INHIBIT], 1286 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 ], 1321 ],
1274 ["Weight/Value ratio", 2, 17] 1322 ["Weight/Value ratio", 2, 17]
1275 ) 1323 )
1276 { 1324 {
1277 my ($title, $x, $y, @bits) = @$_; 1325 my ($title, $x, $y, @bits) = @$_;
1278 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1326 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279 1327
1280 for (@bits) { 1328 for (@bits) {
1281 ++$y; 1329 ++$y;
1282 1330
1283 my $mask = $_->[1]; 1331 my $mask = $_->[1];
1284 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1332 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1285 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1333 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286 state => $::CFG->{pickup} & $mask, 1334 state => $::CFG->{pickup} & $mask,
1287 on_changed => sub { 1335 on_changed => sub {
1288 my ($box, $value) = @_; 1336 my ($box, $value) = @_;
1289 1337
1290 if ($value) { 1338 if ($value) {
… …
1301 1349
1302 ${$_->[2]} = $checkbox if $_->[2]; 1350 ${$_->[2]} = $checkbox if $_->[2];
1303 } 1351 }
1304 } 1352 }
1305 1353
1306 $table->add (2, 18, new CFPlus::UI::ValSlider 1354 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99", 1356 template => ">= 99",
1309 to_value => sub { ">= " . 5 * $_[0] }, 1357 to_value => sub { ">= " . 5 * $_[0] },
1310 on_changed => sub { 1358 on_changed => sub {
1311 my ($slider, $value) = @_; 1359 my ($slider, $value) = @_;
… …
1314 $::CFG->{pickup} |= int $value 1362 $::CFG->{pickup} |= int $value
1315 if $value; 1363 if $value;
1316 1; 1364 1;
1317 }); 1365 });
1318 1366
1319 $table->add (3, 18, new CFPlus::UI::Button 1367 $table->add_at (3, 18, new CFPlus::UI::Button
1320 text => "set", 1368 text => "set",
1321 on_activate => sub { 1369 on_activate => sub {
1322 $::CONN->send_command ("pickup $::CFG->{pickup}") 1370 $::CONN->send_command ("pickup $::CFG->{pickup}")
1323 if defined $::CONN; 1371 if defined $::CONN;
1324 0 1372 0
1325 }); 1373 });
1326 1374
1327 $table 1375 $r
1328} 1376}
1329 1377
1330my %SORT_ORDER = ( 1378my %SORT_ORDER = (
1331 type => undef, 1379 type => undef,
1332 mtime => sub { 1380 mtime => sub {
… …
1411 has_close_button => 1 1459 has_close_button => 1
1412 ; 1460 ;
1413 1461
1414 my $ntb = 1462 my $ntb =
1415 $PL_NOTEBOOK = 1463 $PL_NOTEBOOK =
1416 new CFPlus::UI::Notebook expand => 1, debug => 1; 1464 new CFPlus::UI::Notebook expand => 1;
1417 1465
1418 $ntb->add ( 1466 $ntb->add (
1419 "Statistics (F2)" => $STATS_PAGE = stats_window, 1467 "Statistics (F2)" => $STATS_PAGE = stats_window,
1420 "Shows statistics, where all your Stats and Resistances are shown." 1468 "Shows statistics, where all your Stats and Resistances are shown."
1421 ); 1469 );
… …
1433 $ntb->add ( 1481 $ntb->add (
1434 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1483 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1436 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437 ); 1485 );
1486 $ntb->add (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1438 1488
1439 $ntb->set_current_page ($INVENTORY_PAGE); 1489 $ntb->set_current_page ($INVENTORY_PAGE);
1440 1490
1441 $plwin->add ($ntb); 1491 $plwin->add ($ntb);
1442 $plwin 1492 $plwin
… …
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641 1691
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643 1693
1644 $table->add (0, 0, new CFPlus::UI::Button 1694 $table->add_at (0, 0, new CFPlus::UI::Button
1645 text => "Close", 1695 text => "Close",
1646 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>.", 1696 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>.",
1647 on_activate => $close, 1697 on_activate => $close,
1648 ); 1698 );
1649 1699
1650 $table->add (2, 0, new CFPlus::UI::Button 1700 $table->add_at (2, 0, new CFPlus::UI::Button
1651 text => "Next", 1701 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.", 1702 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub { 1703 on_activate => sub {
1654 $close->(); 1704 $close->();
1655 &show_tip_of_the_day; 1705 &show_tip_of_the_day;
… …
1664 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1665 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
1666} 1716}
1667 1717
1668sub video_init { 1718sub video_init {
1669 sdl_init;
1670
1671 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672 1720
1673 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674 1722
1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1723 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676 $FULLSCREEN = $CFG->{fullscreen}; 1724 $FULLSCREEN = $CFG->{fullscreen};
1677 $FAST = $CFG->{fast}; 1725 $FAST = $CFG->{fast};
1678 1726
1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681 1729
1682 $SDL_ACTIVE = 1; 1730 $SDL_ACTIVE = 1;
1683 $LAST_REFRESH = time - 0.01; 1731 $LAST_REFRESH = time - 0.01;
1684 1732
… …
1769 1817
1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1771 "Configure the server to play on, your username, password and other server-related options."); 1819 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup, 1820 $SETUP_NOTEBOOK->add (Client => client_setup,
1773 "Configure various client-specific settings."); 1821 "Configure various client-specific settings.");
1774 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1775 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1777 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1823 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1779 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927 1973
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0; 1975 my $row = 0;
1930 if ($info->{has_name}) { 1976 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1977 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1932 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1978 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 } 1979 }
1934 if ($info->{has_text}) { 1980 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1981 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1936 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1982 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 } 1983 }
1938 if ($info->{has_connection}) { 1984 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1985 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++, 1986 $table->add_at (1, $row++,
1941 new CFPlus::UI::Entry 1987 new CFPlus::UI::Entry
1942 expand => 1, 1988 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945 ); 1991 );
… …
1958 CFPlus::OpenGL::shutdown; 2004 CFPlus::OpenGL::shutdown;
1959 2005
1960 undef $SDL_ACTIVE; 2006 undef $SDL_ACTIVE;
1961} 2007}
1962 2008
1963my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1964my $bgmusic;#TODO#hack#d#
1965
1966sub audio_channel_finished { 2009sub audio_channel_finished {
1967 my ($channel) = @_; 2010 my ($channel) = @_;
1968 2011
1969 #warn "channel $channel finished\n";#d# 2012 #warn "channel $channel finished\n";#d#
1970} 2013}
1971 2014
2015sub audio_music_set {
2016 my ($songs) = @_;
2017
2018 my @want =
2019 grep $_,
2020 map $CONN->{music_meta}{$_},
2021 @$songs;
2022
2023 if (@want) {
2024 @MUSIC_WANT = @want;
2025 &audio_music_changed ();
2026 }
2027}
2028
2029sub audio_music_start {
2030 my $path = $MUSIC_PLAYING->{path}
2031 or return;
2032
2033 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2034 # music might have changed...
2035 $path eq $MUSIC_PLAYING->{path}
2036 or return &audio_music_start ();
2037
2038 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2039
2040 my $NOW = time;
2041
2042 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2043 my $pos = $MUSIC_PLAYING->{stop_pos};
2044 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2045 $MUSIC_START = time - $pos;
2046 } else {
2047 $MUSIC_PLAYER->play (0);
2048 $MUSIC_START = time;
2049 }
2050
2051 delete $MUSIC_PLAYING->{stop_time};
2052 delete $MUSIC_PLAYING->{stop_pos};
2053 }
2054}
2055
2056sub audio_music_changed {
2057 return unless $CFG->{bgm_enable};
2058
2059 # default MUSIC_WANT == MUSIC_DEFAULT
2060 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2061
2062 # if the currently playing song is acceptable, let it continue
2063 return if $MUSIC_PLAYING
2064 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2065
2066 my $NOW = time;
2067
2068 if ($MUSIC_PLAYING) {
2069 $MUSIC_PLAYING->{stop_time} = $NOW;
2070 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2071 CFPlus::MixMusic::fade_out 1000;
2072 } else {
2073 # sort by stop time, oldest first
2074 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2075
2076 # if the most recently-played piece played very recently,
2077 # resume it, else choose the oldest piece for rotation.
2078 $MUSIC_PLAYING =
2079 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2080 ? $MUSIC_WANT[-1]
2081 : $MUSIC_WANT[0];
2082
2083 audio_music_start;
2084 }
2085}
2086
1972sub audio_music_finished { 2087sub audio_music_finished {
1973 return unless $CFG->{bgm_enable}; 2088 $MUSIC_PLAYING = undef;
2089 undef $MUSIC_PLAYER;
1974 2090
1975 # TODO: hack, do play loop and mood music 2091 audio_music_changed;
1976 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1977 $bgmusic->play (0);
1978
1979 push @bgmusic, shift @bgmusic;
1980} 2092}
1981 2093
1982sub audio_init { 2094sub audio_init {
1983 if ($CFG->{audio_enable}) { 2095 if ($CFG->{audio_enable}) {
1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2096 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2146 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2035 2147
2036 $CFPlus::UI::ROOT->draw; 2148 $CFPlus::UI::ROOT->draw;
2037 2149
2038 $WANT_REFRESH = 0; 2150 $WANT_REFRESH = 0;
2039 $CAN_REFRESH = 0; 2151 $CAN_REFRESH = 0;
2040 $LAST_REFRESH = $NOW; 2152 $LAST_REFRESH = $NOW;
2041 2153
2042 CFPlus::SDL_GL_SwapBuffers; 2154 CFPlus::SDL_GL_SwapBuffers;
2043} 2155}
2044 2156
2045my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2157my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2046 $NOW = time; 2158 $NOW = time;
2047 2159
2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2160 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049 for CFPlus::SDL_PollEvent; 2161 for CFPlus::poll_events;
2050 2162
2051 if (%animate_object) { 2163 if (%animate_object) {
2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2164 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053 $WANT_REFRESH++; 2165 ++$WANT_REFRESH;
2054 } 2166 }
2055 2167
2056 if ($WANT_REFRESH) { 2168 if ($WANT_REFRESH) {
2057 force_refresh; 2169 force_refresh;
2058 } else { 2170 } else {
… …
2088 CFPlus::SDL_VIDEOEXPOSE => sub { 2200 CFPlus::SDL_VIDEOEXPOSE => sub {
2089 CFPlus::UI::full_refresh; 2201 CFPlus::UI::full_refresh;
2090 }, 2202 },
2091 CFPlus::SDL_ACTIVEEVENT => sub { 2203 CFPlus::SDL_ACTIVEEVENT => sub {
2092# not useful, as APPACTIVE include sonly iconified state, not unmapped 2204# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2205# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2206# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2207# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2208# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2209# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097 }, 2210 },
2098 CFPlus::SDL_KEYDOWN => sub { 2211 CFPlus::SDL_KEYDOWN => sub {
… …
2134 height => 480, 2247 height => 480,
2135 fullscreen => 0, 2248 fullscreen => 0,
2136 fast => 0, 2249 fast => 0,
2137 map_scale => 1, 2250 map_scale => 1,
2138 fow_enable => 1, 2251 fow_enable => 1,
2139 fow_intensity => 0.45, 2252 fow_intensity => 0,
2140 fow_smooth => 0,
2141 map_smoothing => 1, 2253 map_smoothing => 1,
2142 gui_fontsize => 1, 2254 gui_fontsize => 1,
2143 log_fontsize => 0.7, 2255 log_fontsize => 0.7,
2144 gauge_fontsize => 1, 2256 gauge_fontsize => 1,
2145 gauge_size => 0.35, 2257 gauge_size => 0.35,
… …
2179 } 2291 }
2180 } 2292 }
2181 2293
2182 sdl_init; 2294 sdl_init;
2183 2295
2184 @SDL_MODES = reverse 2296 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185 grep $_->[0] >= 640 && $_->[1] >= 480, 2297 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2186 CFPlus::SDL_ListModes;
2187
2188 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2298 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2299
2300 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189 2301
2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2302 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191 2303
2192 { 2304 {
2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2305 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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