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.181 by root, Sat Jul 21 16:07:53 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}
… …
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
63use CFPlus::DB; 85use CFPlus::DB;
64use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 88use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 89use CFPlus::UI::SpellList;
67use CFPlus::Pod; 90use CFPlus::Pod;
68use CFPlus::MapWidget; 91use CFPlus::MapWidget;
69use CFPlus::Macro; 92use CFPlus::Macro;
… …
137 160
138our $SDL_ACTIVE; 161our $SDL_ACTIVE;
139our %SDL_CB; 162our %SDL_CB;
140 163
141our $SDL_MIXER; 164our $SDL_MIXER;
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT;
167our $MUSIC_START;
168our $MUSIC_PLAYING;
169our $MUSIC_PLAYER;
170our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
142our @SOUNDS; # event => file mapping 171our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files 172our %AUDIO_CHUNKS; # audio files
144 173
145our $ALT_ENTER_MESSAGE; 174our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 175our $STATUSBOX;
… …
207 title => "Server Query", 236 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 237 child => my $vbox = new CFPlus::UI::VBox,
209 ; 238 ;
210 239
211 my @dialog = my $label = new CFPlus::UI::Label 240 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 241 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 242 ellipsise => 0,
214 text => $prompt; 243 text => $prompt;
215 244
216 if ($flags & CS_QUERY_YESNO) { 245 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 246 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 263 );
235 264
236 $dialog->grab_focus; 265 $dialog->grab_focus;
237 266
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 267 } 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) { 268 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242 $MESSAGE_WINDOW->show; 269 $dialog->{tooltip} = "#charcreation_focus";
243 270
244 unshift @dialog, new CFPlus::UI::Label 271 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 272 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 273 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 274 markup => "\nOr use your keyboard and the text entry below:\n";
248 275
249 unshift @dialog, my $table = new CFPlus::UI::Table; 276 unshift @dialog, my $table = new CFPlus::UI::Table;
250 277
251 $table->add (0, 0, new CFPlus::UI::Button 278 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 279 text => "Next Race",
253 on_activate => sub { 280 on_activate => sub {
254 $conn->send ("reply n"); 281 $conn->send ("reply n");
255 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
256 0 283 0
257 }, 284 },
258 ); 285 );
259 $table->add (2, 0, new CFPlus::UI::Button 286 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 287 text => "Accept",
261 on_activate => sub { 288 on_activate => sub {
262 $conn->send ("reply d"); 289 $conn->send ("reply d");
263 destroy_query_dialog $conn; 290 destroy_query_dialog $conn;
264 0 291 0
265 }, 292 },
266 ); 293 );
267 294
295 if ($conn->{chargen_race_description}) {
296 unshift @dialog, new CFPlus::UI::Label
297 max_w => $::WIDTH * 0.8,
298 ellipsise => 0,
299 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
300 ;
301 }
302
303 unshift @dialog, new CFPlus::UI::Face
304 face => $conn->{player}{face},
305 bg => [.2, .2, .2, 1],
306 min_w => 64,
307 min_h => 64,
308 ;
309
310 if ($conn->{chargen_race_title}) {
311 unshift @dialog, new CFPlus::UI::Label
312 allign => 1,
313 ellipsise => 0,
314 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
315 ;
316 }
317
268 unshift @dialog, new CFPlus::UI::Label 318 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 319 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 320 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 321 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 322 ;
… …
276 $conn->send ("reply $stat"); 326 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 327 destroy_query_dialog $conn;
278 return; 328 return;
279 } 329 }
280 330
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 331 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 332 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 333 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 334 markup => "\nOr use your keyboard and the text entry below:\n";
288 335
289 unshift @dialog, my $table = new CFPlus::UI::Table; 336 unshift @dialog, my $table = new CFPlus::UI::Table;
290 337
291 # left: re-roll 338 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 339 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 340 text => "Roll Again",
294 on_activate => sub { 341 on_activate => sub {
295 $conn->send ("reply y"); 342 $conn->send ("reply y");
296 destroy_query_dialog $conn; 343 destroy_query_dialog $conn;
297 0 344 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 360 ],
314 ), 1 .. 2; 361 ), 1 .. 2;
315 362
316 $table->add (2, 0, new CFPlus::UI::Button 363 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 364 text => "Swap Stats",
318 on_activate => sub { 365 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 366 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 367 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 368 destroy_query_dialog $conn;
322 0 369 0
323 }, 370 },
324 ); 371 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 372 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 373
327 # right: accept 374 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 375 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 376 text => "Accept",
330 on_activate => sub { 377 on_activate => sub {
331 $conn->send ("reply n"); 378 $conn->send ("reply n");
332 $STATS_PAGE->hide; 379 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 380 destroy_query_dialog $conn;
… …
453 $LOGIN_BUTTON->set_text ("Login"); 500 $LOGIN_BUTTON->set_text ("Login");
454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 501 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455 $SETUP_DIALOG->show; 502 $SETUP_DIALOG->show;
456 $PL_WINDOW->hide; 503 $PL_WINDOW->hide;
457 $SPELL_LIST->clear_spells; 504 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506
507 &audio_music_set ([]);
458 508
459 return unless $CONN; 509 return unless $CONN;
460 510
461 status "connection closed"; 511 status "connection closed";
462 512
… …
472 522
473 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 523 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
474 524
475 my $row = 0; 525 my $row = 0;
476 526
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 527 $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, 528 $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, 529 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 530 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481 531
532 my $vidmode_tooltip =
533 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
534 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
535
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 536 $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); 537 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484 538
539 $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]); 540 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"); 541 tooltip => $vidmode_tooltip);
542 $hbox->add (my $mode_label = new CFPlus::UI::Label
543 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
544 can_events => 1, tooltip => $vidmode_tooltip);
487 545
488 $mode_slider->connect (changed => sub { 546 $mode_slider->connect (changed => sub {
489 my ($self, $value) = @_; 547 my ($self, $value) = @_;
490 548
491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 549 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 550 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493 }); 551 });
494 $mode_slider->emit (changed => $mode_slider->{range}[0]); 552 $mode_slider->emit (changed => $mode_slider->{range}[0]);
495 553
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 554 $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 555 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498 state => $CFG->{fullscreen}, 556 state => $CFG->{fullscreen},
499 tooltip => "Bring the client into fullscreen mode.", 557 tooltip => "Bring the client into fullscreen mode.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 558 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501 ); 559 );
502 560
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 561 $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 562 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fast}, 563 state => $CFG->{fast},
506 tooltip => "Lower the visual quality considerably to speed up rendering.", 564 tooltip => "Lower the visual quality considerably to speed up rendering.",
507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 565 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508 ); 566 );
509 567
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 568 $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 569 $table->add_at (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 570 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.", 571 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 }, 572 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 ); 573 );
516 574
517 $table->add (1, $row++, new CFPlus::UI::Button 575 $table->add_at (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply", 576 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.", 577 tooltip => "Apply the video settings above.",
520 on_activate => sub { 578 on_activate => sub {
521 video_shutdown (); 579 video_shutdown ();
522 video_init (); 580 video_init ();
523 0 581 0
524 } 582 }
525 ); 583 );
526 584
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 585 $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 586 $table->add_at (1, $row++, new CFPlus::UI::Slider
529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 587 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 588 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 589 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532 ); 590 );
533 591
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 592 $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 593 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing}, 594 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 595 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. " 596 . "This increases load on the graphics subsystem and works only with 2.x servers. "
539 . "Changes take effect at next connection only.", 597 . "Changes take effect at next connection only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 598 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541 ); 599 );
542 600
543 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 601 $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 602 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
545 state => $CFG->{fow_enable}, 603 state => $CFG->{fow_enable},
546 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 604 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 } 605 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548 ); 606 );
549 607
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 608 $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 609 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 610 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.", 611 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 } 612 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555 ); 613 );
556 614
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"); 615 $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 616 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 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.", 618 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 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574 ); 620 );
575 621
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 622 $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 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 624 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.", 625 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
580 on_changed => sub { 626 on_changed => sub {
581 $CFG->{gauge_fontsize} = $_[1]; 627 $CFG->{gauge_fontsize} = $_[1];
582 &set_gauge_window_fontsize; 628 &set_gauge_window_fontsize;
583 0 629 0
584 } 630 }
585 ); 631 );
586 632
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 633 $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 634 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
590 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 636 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
591 on_changed => sub { 637 on_changed => sub {
592 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
603 649
604 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 650 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
605 651
606 my $row = 0; 652 my $row = 0;
607 653
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 654 $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 655 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
610 state => $CFG->{audio_enable}, 656 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.", 657 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 } 658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
613 ); 659 );
614# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 660# $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 { 661# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
616# $CFG->{effects_volume} = $_[1]; 662# $CFG->{effects_volume} = $_[1];
617# }); 663# });
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 664 $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); 665 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
620 $hbox->add (new CFPlus::UI::CheckBox 666 $hbox->add (new CFPlus::UI::CheckBox
621 expand => 1, state => $CFG->{bgm_enable}, 667 expand => 1, state => $CFG->{bgm_enable},
622 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 668 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 } 669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
624 ); 670 );
… …
626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627 tooltip => "The volume of the background music. Changes are instant.", 673 tooltip => "The volume of the background music. Changes are instant.",
628 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 674 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
629 ); 675 );
630 676
631 $table->add (1, $row++, new CFPlus::UI::Button 677 $table->add_at (1, $row++, new CFPlus::UI::Button
632 expand => 1, align => 0, text => "Apply", 678 expand => 1, align => 0, text => "Apply",
633 tooltip => "Apply the audio settings", 679 tooltip => "Apply the audio settings",
634 on_activate => sub { 680 on_activate => sub {
635 audio_shutdown (); 681 audio_shutdown ();
636 audio_init (); 682 audio_init ();
… …
695} 741}
696 742
697sub debug_setup { 743sub debug_setup {
698 my $table = new CFPlus::UI::Table; 744 my $table = new CFPlus::UI::Table;
699 745
700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 746 $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 }); 747 $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"); 748 $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 }); 749 $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"); 750 $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 }); 751 $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"); 752 $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 }); 753 $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" } ); 754 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
709 755
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# 756 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
757
758 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
759 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
760 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
761 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
762 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
763 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
764
765 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
766
767 $c->add_items ({
768 type => "line_loop",
769 color => [0, 1, 0],
770 width => 9,
771 coord_mode => "abs",
772 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
773 });
774
775 $c->add_items ({
776 type => "lines",
777 color => [1, 1, 0],
778 width => 2,
779 coord_mode => "rel",
780 coord => [[0,0], [1,1], [1,0], [0,1]],
781 });
782
783 $c->add_items ({
784 type => "polygon",
785 color => [0, 0.43, 0],
786 width => 2,
787 coord_mode => "rel",
788 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
789 });
723 790
724 $table 791 $table
725} 792}
726 793
727sub stats_window { 794sub stats_window {
… …
775 [2, 4, st_spd => "Spd", 10.54], 842 [2, 4, st_spd => "Spd", 10.54],
776 [2, 5, st_wspd => "WSp", 10.54], 843 [2, 5, st_wspd => "WSp", 10.54],
777 ) { 844 ) {
778 my ($col, $row, $id, $label, $template) = @$_; 845 my ($col, $row, $id, $label, $template) = @$_;
779 846
780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 847 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 848 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782 align => +1, template => $template, tooltip => "#stat_$label"); 849 align => +1, template => $template, tooltip => "#stat_$label");
783 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 850 $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, 851 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785 align => -1, text => $label, tooltip => "#stat_$label"); 852 align => -1, text => $label, tooltip => "#stat_$label");
786 } 853 }
787 854
788 $vb->add (new CFPlus::UI::FancyFrame 855 $vb->add (new CFPlus::UI::FancyFrame
… …
829 cold => ["Cold", 896 cold => ["Cold",
830 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 897 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831 ghit => ["Ghost hit", 898 ghit => ["Ghost hit",
832 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 899 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833 ); 900 );
901
834 for (qw/slow holyw conf fire depl magic 902 for (qw/slow holyw conf fire depl magic
835 drain acid pois para deat phys 903 drain acid pois para deat phys
836 blind fear tund elec cold ghit/) 904 blind fear tund elec cold ghit/)
837 { 905 {
838 $tbl2->add ($col, $row, 906 $tbl2->add_at ($col, $row,
839 $STATWIDS->{"res_$_"} = 907 $STATWIDS->{"res_$_"} =
840 new CFPlus::UI::Label 908 new CFPlus::UI::Label
841 font => $FONT_FIXED, 909 font => $FONT_FIXED,
842 template => "-100%", 910 template => "-100%",
843 align => +1, 911 align => +1,
844 valign => 0, 912 valign => 0,
845 can_events => 1, 913 can_events => 1,
846 can_hover => 1, 914 can_hover => 1,
847 tooltip => $resist_names{$_}->[1], 915 tooltip => $resist_names{$_}->[1],
848 ); 916 );
849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 917 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850 font => $FONT_FIXED, 918 font => $FONT_FIXED,
851 can_hover => 1, 919 can_hover => 1,
852 can_events => 1, 920 can_events => 1,
853 path => "ui/resist/resist_$_.png", 921 path => "ui/resist/resist_$_.png",
854 tooltip => $resist_names{$_}->[1], 922 tooltip => $resist_names{$_}->[1],
855 ); 923 );
856 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 924 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857 text => $resist_names{$_}->[0], 925 text => $resist_names{$_}->[0],
858 font => $FONT_FIXED, 926 font => $FONT_FIXED,
859 can_hover => 1, 927 can_hover => 1,
860 can_events => 1, 928 can_events => 1,
861 tooltip => $resist_names{$_}->[1], 929 tooltip => $resist_names{$_}->[1],
… …
894 return if $METASERVER_ATIME > time; 962 return if $METASERVER_ATIME > time;
895 $METASERVER_ATIME = time + 60; 963 $METASERVER_ATIME = time + 60;
896 964
897 my $table = $METASERVER->{table}; 965 my $table = $METASERVER->{table};
898 $table->clear; 966 $table->clear;
899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 967 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900 968
901 my $ok = 0; 969 my $ok = 0;
902 970
903 CFPlus::background { 971 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent; 972 my $ua = CFPlus::lwp_useragent;
… …
915 "The time this server has been running without being restarted.", 983 "The time this server has been running without being restarted.",
916 "The server software version - a '+' indicates a Crossfire+ server.", 984 "The server software version - a '+' indicates a Crossfire+ server.",
917 "Short information about this server provided by its admins.", 985 "Short information about this server provided by its admins.",
918 ); 986 );
919 my @col = qw(#Users Host Uptime Version Description); 987 my @col = qw(#Users Host Uptime Version Description);
920 $table->add ($_, 0, new CFPlus::UI::Label 988 $table->add_at ($_, 0, new CFPlus::UI::Label
921 can_hover => 1, can_events => 1, 989 can_hover => 1, can_events => 1,
922 align => 0, fg => [1, 1, 0], 990 align => 0, fg => [1, 1, 0],
923 text => $col[$_], tooltip => $tip[$_]) 991 text => $col[$_], tooltip => $tip[$_])
924 for 0 .. $#col; 992 for 0 .. $#col;
925 993
… …
947 1015
948 $m = [$users, $host, $uptime, $version, $desc]; 1016 $m = [$users, $host, $uptime, $version, $desc];
949 1017
950 $y++; 1018 $y++;
951 1019
952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1020 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953 (new CFPlus::UI::Button 1021 (new CFPlus::UI::Button
954 text => "Use", 1022 text => "Use",
955 tooltip => "Put this server into the <b>Host:Port</b> field", 1023 tooltip => "Put this server into the <b>Host:Port</b> field",
956 on_activate => sub { 1024 on_activate => sub {
957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1025 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
960 }, 1028 },
961 ), 1029 ),
962 (new CFPlus::UI::Empty expand => 1), 1030 (new CFPlus::UI::Empty expand => 1),
963 ]); 1031 ]);
964 1032
965 $table->add ($_, $y, new CFPlus::UI::Label 1033 $table->add_at ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4, 1034 max_w => $::WIDTH * 0.4,
967 ellipsise => 0, 1035 ellipsise => 0,
968 align => $align[$_], 1036 align => $align[$_],
969 text => $m->[$_], 1037 text => $m->[$_],
970 tooltip => $tip[$_], 1038 tooltip => $tip[$_],
… …
1011 1079
1012 $vbox->add (new CFPlus::UI::FancyFrame 1080 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings", 1081 label => "Connection Settings",
1014 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1082 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015 ); 1083 );
1016 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1084 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017 1085
1018 { 1086 {
1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1087 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020 1088
1021 $vbox->add ( 1089 $vbox->add (
1022 $HOST_ENTRY = new CFPlus::UI::Entry 1090 $HOST_ENTRY = new CFPlus::UI::Entry
1023 expand => 1, 1091 expand => 1,
1024 text => $CFG->{profile}{default}{host}, 1092 text => $CFG->{profile}{default}{host},
… …
1038 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1106 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1107 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1040 ); 1108 );
1041 } 1109 }
1042 1110
1043 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1111 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044 $table->add (1, 4, new CFPlus::UI::Entry 1112 $table->add_at (1, 4, new CFPlus::UI::Entry
1045 text => $CFG->{profile}{default}{user}, 1113 text => $CFG->{profile}{default}{user},
1046 tooltip => "The name of your character on the server", 1114 tooltip => "The name of your character on the server",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1048 ); 1116 );
1049 1117
1050 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1118 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051 $table->add (1, 5, new CFPlus::UI::Entry 1119 $table->add_at (1, 5, new CFPlus::UI::Entry
1052 text => $CFG->{profile}{default}{password}, 1120 text => $CFG->{profile}{default}{password},
1053 hidden => 1, 1121 hidden => 1,
1054 tooltip => "The password for your character", 1122 tooltip => "The password for your character",
1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1056 ); 1124 );
1057 1125
1058 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1126 $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 1127 $table->add_at (1, 7, new CFPlus::UI::Slider
1060 force_w => 100, 1128 force_w => 100,
1061 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1129 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062 tooltip => "This is the size of the portion of the map update the server sends you. " 1130 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, " 1131 . "If you set this to a high value you will be able to see further, "
1064 . "but you also increase bandwidth requirements and latency. " 1132 . "but you also increase bandwidth requirements and latency. "
1065 . "This option is only used once at log-in.", 1133 . "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 }, 1134 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1067 ); 1135 );
1068 1136
1069 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1137 $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 1138 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1071 state => $CFG->{face_prefetch}, 1139 state => $CFG->{face_prefetch},
1072 tooltip => "<b>Background Image Prefetch</b>\n\n" 1140 tooltip => "<b>Background Image Prefetch</b>\n\n"
1073 . "If enabled, the client automatically pre-fetches images from the server. " 1141 . "If enabled, the client automatically pre-fetches images from the server. "
1074 . "This might increase or create lag, but increases the chances " 1142 . "This might increase or create lag, but increases the chances "
1075 . "of faces being ready for display when you encounter them. " 1143 . "of faces being ready for display when you encounter them. "
… …
1077 . "so only set it if you really need to prefetch images. " 1145 . "so only set it if you really need to prefetch images. "
1078 . "This option can be set and unset any time.", 1146 . "This option can be set and unset any time.",
1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080 ); 1148 );
1081 1149
1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1150 $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 1151 $table->add_at (1, 9, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate}, 1152 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1153 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 " 1154 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.", 1155 . "default will be used, which is usually around 100kb/s.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1156 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1089 ); 1157 );
1090 1158
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1159 $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 1160 $table->add_at (1, 10, new CFPlus::UI::Entry
1093 text => $CFG->{output_count}, 1161 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.", 1162 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 }, 1163 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1096 ); 1164 );
1097 1165
1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1166 $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 1167 $table->add_at (1, 11, new CFPlus::UI::Entry
1100 text => $CFG->{output_sync}, 1168 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.", 1169 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 }, 1170 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1103 ); 1171 );
1104 1172
1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1173 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1106 expand => 1, 1174 expand => 1,
1107 align => 0, 1175 align => 0,
1108 text => "Login", 1176 text => "Login",
1109 on_activate => sub { 1177 on_activate => sub {
1110 $CONN ? stop_game 1178 $CONN ? stop_game
… …
1124sub client_setup { 1192sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1193 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126 1194
1127 my $row = 0; 1195 my $row = 0;
1128 1196
1129 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1197 $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 1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131 text => $CFG->{say_command}, 1199 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. " 1200 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. " 1201 . "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.", 1202 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135 on_changed => sub { 1203 on_changed => sub {
… …
1137 $CFG->{say_command} = $value; 1205 $CFG->{say_command} = $value;
1138 0 1206 0
1139 } 1207 }
1140 ); 1208 );
1141 1209
1142 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1210 $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 1211 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144 state => $CFG->{show_tips}, 1212 state => $CFG->{show_tips},
1145 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1213 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146 on_changed => sub { 1214 on_changed => sub {
1147 my ($self, $value) = @_; 1215 my ($self, $value) = @_;
1148 $CFG->{show_tips} = $value; 1216 $CFG->{show_tips} = $value;
1149 0 1217 0
1150 } 1218 }
1151 ); 1219 );
1152 1220
1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1221 $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 1222 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155 text => $CFG->{logview_max_par}, 1223 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1224 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 " 1225 . "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.", 1226 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub { 1227 on_changed => sub {
… …
1228 1296
1229 $window 1297 $window
1230} 1298}
1231 1299
1232sub autopickup_setup { 1300sub autopickup_setup {
1301 my $r = new CFPlus::UI::ScrolledWindow (
1302 expand => 1,
1303 scroll_y => 1
1304 );
1233 my $table = new CFPlus::UI::Table; 1305 $r->add (my $table = new CFPlus::UI::Table
1306 row_expand => [0],
1307 col_expand => [0, 1, 0, 1],
1308 );
1234 1309
1235 for ( 1310 for (
1236 ["General", 0, 0, 1311 ["General", 0, 0,
1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1312 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238 ["Inhibit autopickup" => PICKUP_INHIBIT], 1313 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 ], 1348 ],
1274 ["Weight/Value ratio", 2, 17] 1349 ["Weight/Value ratio", 2, 17]
1275 ) 1350 )
1276 { 1351 {
1277 my ($title, $x, $y, @bits) = @$_; 1352 my ($title, $x, $y, @bits) = @$_;
1278 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1353 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279 1354
1280 for (@bits) { 1355 for (@bits) {
1281 ++$y; 1356 ++$y;
1282 1357
1283 my $mask = $_->[1]; 1358 my $mask = $_->[1];
1284 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1359 $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 1360 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286 state => $::CFG->{pickup} & $mask, 1361 state => $::CFG->{pickup} & $mask,
1287 on_changed => sub { 1362 on_changed => sub {
1288 my ($box, $value) = @_; 1363 my ($box, $value) = @_;
1289 1364
1290 if ($value) { 1365 if ($value) {
… …
1301 1376
1302 ${$_->[2]} = $checkbox if $_->[2]; 1377 ${$_->[2]} = $checkbox if $_->[2];
1303 } 1378 }
1304 } 1379 }
1305 1380
1306 $table->add (2, 18, new CFPlus::UI::ValSlider 1381 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1382 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99", 1383 template => ">= 99",
1309 to_value => sub { ">= " . 5 * $_[0] }, 1384 to_value => sub { ">= " . 5 * $_[0] },
1310 on_changed => sub { 1385 on_changed => sub {
1311 my ($slider, $value) = @_; 1386 my ($slider, $value) = @_;
… …
1314 $::CFG->{pickup} |= int $value 1389 $::CFG->{pickup} |= int $value
1315 if $value; 1390 if $value;
1316 1; 1391 1;
1317 }); 1392 });
1318 1393
1319 $table->add (3, 18, new CFPlus::UI::Button 1394 $table->add_at (3, 18, new CFPlus::UI::Button
1320 text => "set", 1395 text => "set",
1321 on_activate => sub { 1396 on_activate => sub {
1322 $::CONN->send_command ("pickup $::CFG->{pickup}") 1397 $::CONN->send_command ("pickup $::CFG->{pickup}")
1323 if defined $::CONN; 1398 if defined $::CONN;
1324 0 1399 0
1325 }); 1400 });
1326 1401
1327 $table 1402 $r
1328} 1403}
1329 1404
1330my %SORT_ORDER = ( 1405my %SORT_ORDER = (
1331 type => undef, 1406 type => undef,
1332 mtime => sub { 1407 mtime => sub {
… …
1411 has_close_button => 1 1486 has_close_button => 1
1412 ; 1487 ;
1413 1488
1414 my $ntb = 1489 my $ntb =
1415 $PL_NOTEBOOK = 1490 $PL_NOTEBOOK =
1416 new CFPlus::UI::Notebook expand => 1, debug => 1; 1491 new CFPlus::UI::Notebook expand => 1;
1417 1492
1418 $ntb->add ( 1493 $ntb->add (
1419 "Statistics (F2)" => $STATS_PAGE = stats_window, 1494 "Statistics (F2)" => $STATS_PAGE = stats_window,
1420 "Shows statistics, where all your Stats and Resistances are shown." 1495 "Shows statistics, where all your Stats and Resistances are shown."
1421 ); 1496 );
… …
1433 $ntb->add ( 1508 $ntb->add (
1434 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1509 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1510 "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." 1511 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437 ); 1512 );
1513 $ntb->add (Pickup => autopickup_setup,
1514 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1438 1515
1439 $ntb->set_current_page ($INVENTORY_PAGE); 1516 $ntb->set_current_page ($INVENTORY_PAGE);
1440 1517
1441 $plwin->add ($ntb); 1518 $plwin->add ($ntb);
1442 $plwin 1519 $plwin
… …
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1716 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]); 1717 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641 1718
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1719 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643 1720
1644 $table->add (0, 0, new CFPlus::UI::Button 1721 $table->add_at (0, 0, new CFPlus::UI::Button
1645 text => "Close", 1722 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>.", 1723 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, 1724 on_activate => $close,
1648 ); 1725 );
1649 1726
1650 $table->add (2, 0, new CFPlus::UI::Button 1727 $table->add_at (2, 0, new CFPlus::UI::Button
1651 text => "Next", 1728 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.", 1729 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub { 1730 on_activate => sub {
1654 $close->(); 1731 $close->();
1655 &show_tip_of_the_day; 1732 &show_tip_of_the_day;
… …
1664 CFPlus::SDL_Init 1741 CFPlus::SDL_Init
1665 and die "SDL::Init failed!\n"; 1742 and die "SDL::Init failed!\n";
1666} 1743}
1667 1744
1668sub video_init { 1745sub video_init {
1669 sdl_init;
1670
1671 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1746 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672 1747
1673 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1748 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674 1749
1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1750 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676 $FULLSCREEN = $CFG->{fullscreen}; 1751 $FULLSCREEN = $CFG->{fullscreen};
1677 $FAST = $CFG->{fast}; 1752 $FAST = $CFG->{fast};
1678 1753
1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1754 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1755 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681 1756
1682 $SDL_ACTIVE = 1; 1757 $SDL_ACTIVE = 1;
1683 $LAST_REFRESH = time - 0.01; 1758 $LAST_REFRESH = time - 0.01;
1684 1759
… …
1769 1844
1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1845 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1771 "Configure the server to play on, your username, password and other server-related options."); 1846 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup, 1847 $SETUP_NOTEBOOK->add (Client => client_setup,
1773 "Configure various client-specific settings."); 1848 "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, 1849 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1777 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1850 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1851 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1779 "Configure the use of audio, sound effects and background music."); 1852 "Configure the use of audio, sound effects and background music.");
1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1853 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1999 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927 2000
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 2001 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0; 2002 my $row = 0;
1930 if ($info->{has_name}) { 2003 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 2004 $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 }); 2005 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 } 2006 }
1934 if ($info->{has_text}) { 2007 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 2008 $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 }); 2009 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 } 2010 }
1938 if ($info->{has_connection}) { 2011 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 2012 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++, 2013 $table->add_at (1, $row++,
1941 new CFPlus::UI::Entry 2014 new CFPlus::UI::Entry
1942 expand => 1, 2015 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 2016 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" 2017 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 ); 2018 );
… …
1958 CFPlus::OpenGL::shutdown; 2031 CFPlus::OpenGL::shutdown;
1959 2032
1960 undef $SDL_ACTIVE; 2033 undef $SDL_ACTIVE;
1961} 2034}
1962 2035
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 { 2036sub audio_channel_finished {
1967 my ($channel) = @_; 2037 my ($channel) = @_;
1968 2038
1969 #warn "channel $channel finished\n";#d# 2039 #warn "channel $channel finished\n";#d#
1970} 2040}
1971 2041
2042sub audio_music_set {
2043 my ($songs) = @_;
2044
2045 my @want =
2046 grep $_,
2047 map $CONN->{music_meta}{$_},
2048 @$songs;
2049
2050 if (@want) {
2051 @MUSIC_WANT = @want;
2052 &audio_music_changed ();
2053 }
2054}
2055
2056sub audio_music_start {
2057 my $path = $MUSIC_PLAYING->{path}
2058 or return;
2059
2060 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2061 # music might have changed...
2062 $path eq $MUSIC_PLAYING->{path}
2063 or return &audio_music_start ();
2064
2065 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2066
2067 my $NOW = time;
2068
2069 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2070 my $pos = $MUSIC_PLAYING->{stop_pos};
2071 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2072 $MUSIC_START = time - $pos;
2073 } else {
2074 $MUSIC_PLAYER->play (0);
2075 $MUSIC_START = time;
2076 }
2077
2078 delete $MUSIC_PLAYING->{stop_time};
2079 delete $MUSIC_PLAYING->{stop_pos};
2080 }
2081}
2082
2083sub audio_music_changed {
2084 return unless $CFG->{bgm_enable};
2085
2086 # default MUSIC_WANT == MUSIC_DEFAULT
2087 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2088
2089 # if the currently playing song is acceptable, let it continue
2090 return if $MUSIC_PLAYING
2091 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2092
2093 my $NOW = time;
2094
2095 if ($MUSIC_PLAYING) {
2096 $MUSIC_PLAYING->{stop_time} = $NOW;
2097 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2098 CFPlus::MixMusic::fade_out 1000;
2099 } else {
2100 # sort by stop time, oldest first
2101 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2102
2103 # if the most recently-played piece played very recently,
2104 # resume it, else choose the oldest piece for rotation.
2105 $MUSIC_PLAYING =
2106 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2107 ? $MUSIC_WANT[-1]
2108 : $MUSIC_WANT[0];
2109
2110 audio_music_start;
2111 }
2112}
2113
1972sub audio_music_finished { 2114sub audio_music_finished {
1973 return unless $CFG->{bgm_enable}; 2115 $MUSIC_PLAYING = undef;
2116 undef $MUSIC_PLAYER;
1974 2117
1975 # TODO: hack, do play loop and mood music 2118 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} 2119}
1981 2120
1982sub audio_init { 2121sub audio_init {
1983 if ($CFG->{audio_enable}) { 2122 if ($CFG->{audio_enable}) {
1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2123 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2173 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2035 2174
2036 $CFPlus::UI::ROOT->draw; 2175 $CFPlus::UI::ROOT->draw;
2037 2176
2038 $WANT_REFRESH = 0; 2177 $WANT_REFRESH = 0;
2039 $CAN_REFRESH = 0; 2178 $CAN_REFRESH = 0;
2040 $LAST_REFRESH = $NOW; 2179 $LAST_REFRESH = $NOW;
2041 2180
2042 CFPlus::SDL_GL_SwapBuffers; 2181 CFPlus::SDL_GL_SwapBuffers;
2043} 2182}
2044 2183
2045my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2184my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2046 $NOW = time; 2185 $NOW = time;
2047 2186
2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2187 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049 for CFPlus::SDL_PollEvent; 2188 for CFPlus::poll_events;
2050 2189
2051 if (%animate_object) { 2190 if (%animate_object) {
2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2191 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053 $WANT_REFRESH++; 2192 ++$WANT_REFRESH;
2054 } 2193 }
2055 2194
2056 if ($WANT_REFRESH) { 2195 if ($WANT_REFRESH) {
2057 force_refresh; 2196 force_refresh;
2058 } else { 2197 } else {
… …
2088 CFPlus::SDL_VIDEOEXPOSE => sub { 2227 CFPlus::SDL_VIDEOEXPOSE => sub {
2089 CFPlus::UI::full_refresh; 2228 CFPlus::UI::full_refresh;
2090 }, 2229 },
2091 CFPlus::SDL_ACTIVEEVENT => sub { 2230 CFPlus::SDL_ACTIVEEVENT => sub {
2092# not useful, as APPACTIVE include sonly iconified state, not unmapped 2231# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2232# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2233# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2234# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2235# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2236# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097 }, 2237 },
2098 CFPlus::SDL_KEYDOWN => sub { 2238 CFPlus::SDL_KEYDOWN => sub {
… …
2134 height => 480, 2274 height => 480,
2135 fullscreen => 0, 2275 fullscreen => 0,
2136 fast => 0, 2276 fast => 0,
2137 map_scale => 1, 2277 map_scale => 1,
2138 fow_enable => 1, 2278 fow_enable => 1,
2139 fow_intensity => 0.45, 2279 fow_intensity => 0,
2140 fow_smooth => 0,
2141 map_smoothing => 1, 2280 map_smoothing => 1,
2142 gui_fontsize => 1, 2281 gui_fontsize => 1,
2143 log_fontsize => 0.7, 2282 log_fontsize => 0.7,
2144 gauge_fontsize => 1, 2283 gauge_fontsize => 1,
2145 gauge_size => 0.35, 2284 gauge_size => 0.35,
… …
2179 } 2318 }
2180 } 2319 }
2181 2320
2182 sdl_init; 2321 sdl_init;
2183 2322
2184 @SDL_MODES = reverse 2323 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185 grep $_->[0] >= 640 && $_->[1] >= 480, 2324 @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)"; 2325 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2326
2327 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189 2328
2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2329 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191 2330
2192 { 2331 {
2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2332 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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