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.155 by root, Sat May 12 08:13:34 2007 UTC vs.
Revision 1.185 by elmex, Tue Jul 24 18:39:39 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) {
… …
43 44
44 if ($^O eq "MSWin32") { 45 if ($^O eq "MSWin32") {
45 # relocatable 46 # relocatable
46 } else { 47 } else {
47 # unix, need to patch pango rc file 48 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules" 49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!"; 50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
50 local $/; 51 local $/;
51 my $rc = <$fh>; 52 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
53 54
54 mkdir "$tmp/pango-modules"; 55 mkdir "$tmp/pango-modules";
… …
81use CFPlus; 82use CFPlus;
82use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
83use CFPlus::Protocol; 84use CFPlus::Protocol;
84use CFPlus::DB; 85use CFPlus::DB;
85use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
86use CFPlus::UI::Inventory; 88use CFPlus::UI::Inventory;
87use CFPlus::UI::SpellList; 89use CFPlus::UI::SpellList;
90use CFPlus::UI::MessageWindow;
88use CFPlus::Pod; 91use CFPlus::Pod;
89use CFPlus::MapWidget; 92use CFPlus::MapWidget;
90use CFPlus::Macro; 93use CFPlus::Macro;
91 94
92$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 95$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
124 127
125our $MAP; 128our $MAP;
126our $MAPMAP; 129our $MAPMAP;
127our $MAPWIDGET; 130our $MAPWIDGET;
128our $BUTTONBAR; 131our $BUTTONBAR;
129our $LOGVIEW;
130our $CONSOLE;
131our $METASERVER; 132our $METASERVER;
132our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
133our $QUIT_DIALOG; 134our $QUIT_DIALOG;
134our $HOST_ENTRY; 135our $HOST_ENTRY;
135our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
158 159
159our $SDL_ACTIVE; 160our $SDL_ACTIVE;
160our %SDL_CB; 161our %SDL_CB;
161 162
162our $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
163our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
164our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
165 172
166our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
167our $STATUSBOX; 174our $STATUSBOX;
… …
184 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
185} 192}
186 193
187sub message { 194sub message {
188 my ($para) = @_; 195 my ($para) = @_;
189 196 $MESSAGE_WINDOW->message ($para);
190 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
191
192 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
193
194 $LOGVIEW->add_paragraph ($para);
195 $LOGVIEW->scroll_to_bottom;
196} 197}
197 198
198sub destroy_query_dialog { 199sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
… …
265 ellipsise => 0, 266 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
267 268
268 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
269 270
270 $table->add (0, 0, new CFPlus::UI::Button 271 $table->add_at (0, 0, new CFPlus::UI::Button
271 text => "Next Race", 272 text => "Next Race",
272 on_activate => sub { 273 on_activate => sub {
273 $conn->send ("reply n"); 274 $conn->send ("reply n");
274 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
275 0 276 0
276 }, 277 },
277 ); 278 );
278 $table->add (2, 0, new CFPlus::UI::Button 279 $table->add_at (2, 0, new CFPlus::UI::Button
279 text => "Accept", 280 text => "Accept",
280 on_activate => sub { 281 on_activate => sub {
281 $conn->send ("reply d"); 282 $conn->send ("reply d");
282 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
283 0 284 0
… …
318 $conn->send ("reply $stat"); 319 $conn->send ("reply $stat");
319 destroy_query_dialog $conn; 320 destroy_query_dialog $conn;
320 return; 321 return;
321 } 322 }
322 323
323 $STATS_PAGE->show;
324 $MESSAGE_WINDOW->hide;
325
326 unshift @dialog, new CFPlus::UI::Label 324 unshift @dialog, new CFPlus::UI::Label
327 max_w => $::WIDTH * 0.4, 325 max_w => $::WIDTH * 0.4,
328 ellipsise => 0, 326 ellipsise => 0,
329 markup => "\nOr use your keyboard and the text entry below:\n"; 327 markup => "\nOr use your keyboard and the text entry below:\n";
330 328
331 unshift @dialog, my $table = new CFPlus::UI::Table; 329 unshift @dialog, my $table = new CFPlus::UI::Table;
332 330
333 # left: re-roll 331 # left: re-roll
334 $table->add (0, 0, new CFPlus::UI::Button 332 $table->add_at (0, 0, new CFPlus::UI::Button
335 text => "Roll Again", 333 text => "Roll Again",
336 on_activate => sub { 334 on_activate => sub {
337 $conn->send ("reply y"); 335 $conn->send ("reply y");
338 destroy_query_dialog $conn; 336 destroy_query_dialog $conn;
339 0 337 0
… …
353 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 351 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
354 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 352 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
355 ], 353 ],
356 ), 1 .. 2; 354 ), 1 .. 2;
357 355
358 $table->add (2, 0, new CFPlus::UI::Button 356 $table->add_at (2, 0, new CFPlus::UI::Button
359 text => "Swap Stats", 357 text => "Swap Stats",
360 on_activate => sub { 358 on_activate => sub {
361 $conn->{stat_change_with} = $sw2->{value}; 359 $conn->{stat_change_with} = $sw2->{value};
362 $conn->send ("reply $sw1->{value}"); 360 $conn->send ("reply $sw1->{value}");
363 destroy_query_dialog $conn; 361 destroy_query_dialog $conn;
364 0 362 0
365 }, 363 },
366 ); 364 );
367 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 365 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
368 366
369 # right: accept 367 # right: accept
370 $table->add (4, 0, new CFPlus::UI::Button 368 $table->add_at (4, 0, new CFPlus::UI::Button
371 text => "Accept", 369 text => "Accept",
372 on_activate => sub { 370 on_activate => sub {
373 $conn->send ("reply n"); 371 $conn->send ("reply n");
374 $STATS_PAGE->hide; 372 $STATS_PAGE->hide;
375 destroy_query_dialog $conn; 373 destroy_query_dialog $conn;
… …
456 maph => $mapsize, 454 maph => $mapsize,
457 455
458 client => "cfplus $CFPlus::VERSION $] $^O", 456 client => "cfplus $CFPlus::VERSION $] $^O",
459 457
460 map_widget => $MAPWIDGET, 458 map_widget => $MAPWIDGET,
461 logview => $LOGVIEW,
462 statusbox => $STATUSBOX, 459 statusbox => $STATUSBOX,
463 map => $MAP, 460 map => $MAP,
464 mapmap => $MAPMAP, 461 mapmap => $MAPMAP,
465 query => \&server_query, 462 query => \&server_query,
466 463
… …
495 $LOGIN_BUTTON->set_text ("Login"); 492 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 493 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
497 $SETUP_DIALOG->show; 494 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 495 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 496 $SPELL_LIST->clear_spells;
497 $MESSAGE_WINDOW->clear_channels;
498 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
499
500 &audio_music_set ([]);
500 501
501 return unless $CONN; 502 return unless $CONN;
502 503
503 status "connection closed"; 504 status "connection closed";
504 505
… …
514 515
515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 516 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
516 517
517 my $row = 0; 518 my $row = 0;
518 519
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 520 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 521 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1, 522 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 523 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523 524
525 my $vidmode_tooltip =
526 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
527 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
528
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 529 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 530 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
526 531
532 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
527 $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]); 533 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 534 tooltip => $vidmode_tooltip);
535 $hbox->add (my $mode_label = new CFPlus::UI::Label
536 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
537 can_events => 1, tooltip => $vidmode_tooltip);
529 538
530 $mode_slider->connect (changed => sub { 539 $mode_slider->connect (changed => sub {
531 my ($self, $value) = @_; 540 my ($self, $value) = @_;
532 541
533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 542 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 543 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
535 }); 544 });
536 $mode_slider->emit (changed => $mode_slider->{range}[0]); 545 $mode_slider->emit (changed => $mode_slider->{range}[0]);
537 546
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 547 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 548 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
540 state => $CFG->{fullscreen}, 549 state => $CFG->{fullscreen},
541 tooltip => "Bring the client into fullscreen mode.", 550 tooltip => "Bring the client into fullscreen mode.",
542 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 551 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
543 ); 552 );
544 553
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 554 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
546 $table->add (1, $row++, new CFPlus::UI::CheckBox 555 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
547 state => $CFG->{fast}, 556 state => $CFG->{fast},
548 tooltip => "Lower the visual quality considerably to speed up rendering.", 557 tooltip => "Lower the visual quality considerably to speed up rendering.",
549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 558 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
550 ); 559 );
551 560
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 561 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider 562 $table->add_at (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 563 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 564 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 565 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 ); 566 );
558 567
559 $table->add (1, $row++, new CFPlus::UI::Button 568 $table->add_at (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply", 569 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.", 570 tooltip => "Apply the video settings above.",
562 on_activate => sub { 571 on_activate => sub {
563 video_shutdown (); 572 video_shutdown ();
564 video_init (); 573 video_init ();
565 0 574 0
566 } 575 }
567 ); 576 );
568 577
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 578 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
570 $table->add (1, $row++, new CFPlus::UI::Slider 579 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 580 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 581 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 ); 583 );
575 584
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 585 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox 586 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing}, 587 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 588 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. " 589 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.", 590 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
583 ); 592 );
584 593
585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
586 $table->add (1, $row++, new CFPlus::UI::CheckBox 595 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
587 state => $CFG->{fow_enable}, 596 state => $CFG->{fow_enable},
588 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 597 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
589 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 598 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
590 ); 599 );
591 600
592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
593 $table->add (1, $row++, new CFPlus::UI::Slider 602 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 603 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
595 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 604 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
596 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 605 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
597 ); 606 );
598 607
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
600 $table->add (1, $row++, new CFPlus::UI::CheckBox
601 state => $CFG->{fow_smooth},
602 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
603 on_changed => sub {
604 my ($self, $value) = @_;
605 $CFG->{fow_smooth} = $value;
606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
607 0
608 }
609 );
610
611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 608 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
612 $table->add (1, $row++, new CFPlus::UI::Slider 609 $table->add_at (1, $row++, new CFPlus::UI::Slider
613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 610 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
614 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 611 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 612 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
616 ); 613 );
617 614
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 615 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
619 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add_at (1, $row++, new CFPlus::UI::Slider
620 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
621 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 618 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
622 on_changed => sub { 619 on_changed => sub {
623 $CFG->{gauge_fontsize} = $_[1]; 620 $CFG->{gauge_fontsize} = $_[1];
624 &set_gauge_window_fontsize; 621 &set_gauge_window_fontsize;
625 0 622 0
626 } 623 }
627 ); 624 );
628 625
629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 626 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
630 $table->add (1, $row++, new CFPlus::UI::Slider 627 $table->add_at (1, $row++, new CFPlus::UI::Slider
631 range => [$CFG->{gauge_size}, 0.2, 0.8], 628 range => [$CFG->{gauge_size}, 0.2, 0.8],
632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 629 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
633 on_changed => sub { 630 on_changed => sub {
634 $CFG->{gauge_size} = $_[1]; 631 $CFG->{gauge_size} = $_[1];
635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 632 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
645 642
646 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 643 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
647 644
648 my $row = 0; 645 my $row = 0;
649 646
650 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 647 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
651 $table->add (1, $row++, new CFPlus::UI::CheckBox 648 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
652 state => $CFG->{audio_enable}, 649 state => $CFG->{audio_enable},
653 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.", 650 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.",
654 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 651 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
655 ); 652 );
656# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 653# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
657# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 654# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
658# $CFG->{effects_volume} = $_[1]; 655# $CFG->{effects_volume} = $_[1];
659# }); 656# });
660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 657 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
661 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 658 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
662 $hbox->add (new CFPlus::UI::CheckBox 659 $hbox->add (new CFPlus::UI::CheckBox
663 expand => 1, state => $CFG->{bgm_enable}, 660 expand => 1, state => $CFG->{bgm_enable},
664 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 661 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
665 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 662 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
666 ); 663 );
… …
668 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 665 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
669 tooltip => "The volume of the background music. Changes are instant.", 666 tooltip => "The volume of the background music. Changes are instant.",
670 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 667 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
671 ); 668 );
672 669
673 $table->add (1, $row++, new CFPlus::UI::Button 670 $table->add_at (1, $row++, new CFPlus::UI::Button
674 expand => 1, align => 0, text => "Apply", 671 expand => 1, align => 0, text => "Apply",
675 tooltip => "Apply the audio settings", 672 tooltip => "Apply the audio settings",
676 on_activate => sub { 673 on_activate => sub {
677 audio_shutdown (); 674 audio_shutdown ();
678 audio_init (); 675 audio_init ();
… …
737} 734}
738 735
739sub debug_setup { 736sub debug_setup {
740 my $table = new CFPlus::UI::Table; 737 my $table = new CFPlus::UI::Table;
741 738
742 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 739 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
743 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 740 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
744 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 741 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
745 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 742 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
746 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 743 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
747 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 744 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
748 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 745 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 746 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 747 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
751 748
752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
753
754 for my $x (0..2) {
755 for my $y (0 .. 2) {
756 $table->add ($x + 3, $y,
757 new CFPlus::UI::Entry
758 text => $default_smooth[$x * 3 + $y],
759 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
760 );
761 }
762 }
763
764 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 749 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
750
751 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
752 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
753 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
754 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
755 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
756 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
757
758 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
759
760 $c->add_items ({
761 type => "line_loop",
762 color => [0, 1, 0],
763 width => 9,
764 coord_mode => "abs",
765 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
766 });
767
768 $c->add_items ({
769 type => "lines",
770 color => [1, 1, 0],
771 width => 2,
772 coord_mode => "rel",
773 coord => [[0,0], [1,1], [1,0], [0,1]],
774 });
775
776 $c->add_items ({
777 type => "polygon",
778 color => [0, 0.43, 0],
779 width => 2,
780 coord_mode => "rel",
781 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
782 });
765 783
766 $table 784 $table
767} 785}
768 786
769sub stats_window { 787sub stats_window {
… …
817 [2, 4, st_spd => "Spd", 10.54], 835 [2, 4, st_spd => "Spd", 10.54],
818 [2, 5, st_wspd => "WSp", 10.54], 836 [2, 5, st_wspd => "WSp", 10.54],
819 ) { 837 ) {
820 my ($col, $row, $id, $label, $template) = @$_; 838 my ($col, $row, $id, $label, $template) = @$_;
821 839
822 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 840 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
823 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 841 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
824 align => +1, template => $template, tooltip => "#stat_$label"); 842 align => +1, template => $template, tooltip => "#stat_$label");
825 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 843 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
826 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 844 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
827 align => -1, text => $label, tooltip => "#stat_$label"); 845 align => -1, text => $label, tooltip => "#stat_$label");
828 } 846 }
829 847
830 $vb->add (new CFPlus::UI::FancyFrame 848 $vb->add (new CFPlus::UI::FancyFrame
… …
871 cold => ["Cold", 889 cold => ["Cold",
872 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 890 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
873 ghit => ["Ghost hit", 891 ghit => ["Ghost hit",
874 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 892 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
875 ); 893 );
894
876 for (qw/slow holyw conf fire depl magic 895 for (qw/slow holyw conf fire depl magic
877 drain acid pois para deat phys 896 drain acid pois para deat phys
878 blind fear tund elec cold ghit/) 897 blind fear tund elec cold ghit/)
879 { 898 {
880 $tbl2->add ($col, $row, 899 $tbl2->add_at ($col, $row,
881 $STATWIDS->{"res_$_"} = 900 $STATWIDS->{"res_$_"} =
882 new CFPlus::UI::Label 901 new CFPlus::UI::Label
883 font => $FONT_FIXED, 902 font => $FONT_FIXED,
884 template => "-100%", 903 template => "-100%",
885 align => +1, 904 align => +1,
886 valign => 0, 905 valign => 0,
887 can_events => 1, 906 can_events => 1,
888 can_hover => 1, 907 can_hover => 1,
889 tooltip => $resist_names{$_}->[1], 908 tooltip => $resist_names{$_}->[1],
890 ); 909 );
891 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 910 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
892 font => $FONT_FIXED, 911 font => $FONT_FIXED,
893 can_hover => 1, 912 can_hover => 1,
894 can_events => 1, 913 can_events => 1,
895 path => "ui/resist/resist_$_.png", 914 path => "ui/resist/resist_$_.png",
896 tooltip => $resist_names{$_}->[1], 915 tooltip => $resist_names{$_}->[1],
897 ); 916 );
898 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 917 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
899 text => $resist_names{$_}->[0], 918 text => $resist_names{$_}->[0],
900 font => $FONT_FIXED, 919 font => $FONT_FIXED,
901 can_hover => 1, 920 can_hover => 1,
902 can_events => 1, 921 can_events => 1,
903 tooltip => $resist_names{$_}->[1], 922 tooltip => $resist_names{$_}->[1],
… …
936 return if $METASERVER_ATIME > time; 955 return if $METASERVER_ATIME > time;
937 $METASERVER_ATIME = time + 60; 956 $METASERVER_ATIME = time + 60;
938 957
939 my $table = $METASERVER->{table}; 958 my $table = $METASERVER->{table};
940 $table->clear; 959 $table->clear;
941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 960 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
942 961
943 my $ok = 0; 962 my $ok = 0;
944 963
945 CFPlus::background { 964 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent; 965 my $ua = CFPlus::lwp_useragent;
… …
957 "The time this server has been running without being restarted.", 976 "The time this server has been running without being restarted.",
958 "The server software version - a '+' indicates a Crossfire+ server.", 977 "The server software version - a '+' indicates a Crossfire+ server.",
959 "Short information about this server provided by its admins.", 978 "Short information about this server provided by its admins.",
960 ); 979 );
961 my @col = qw(#Users Host Uptime Version Description); 980 my @col = qw(#Users Host Uptime Version Description);
962 $table->add ($_, 0, new CFPlus::UI::Label 981 $table->add_at ($_, 0, new CFPlus::UI::Label
963 can_hover => 1, can_events => 1, 982 can_hover => 1, can_events => 1,
964 align => 0, fg => [1, 1, 0], 983 align => 0, fg => [1, 1, 0],
965 text => $col[$_], tooltip => $tip[$_]) 984 text => $col[$_], tooltip => $tip[$_])
966 for 0 .. $#col; 985 for 0 .. $#col;
967 986
… …
989 1008
990 $m = [$users, $host, $uptime, $version, $desc]; 1009 $m = [$users, $host, $uptime, $version, $desc];
991 1010
992 $y++; 1011 $y++;
993 1012
994 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1013 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
995 (new CFPlus::UI::Button 1014 (new CFPlus::UI::Button
996 text => "Use", 1015 text => "Use",
997 tooltip => "Put this server into the <b>Host:Port</b> field", 1016 tooltip => "Put this server into the <b>Host:Port</b> field",
998 on_activate => sub { 1017 on_activate => sub {
999 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1018 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1002 }, 1021 },
1003 ), 1022 ),
1004 (new CFPlus::UI::Empty expand => 1), 1023 (new CFPlus::UI::Empty expand => 1),
1005 ]); 1024 ]);
1006 1025
1007 $table->add ($_, $y, new CFPlus::UI::Label 1026 $table->add_at ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4, 1027 max_w => $::WIDTH * 0.4,
1009 ellipsise => 0, 1028 ellipsise => 0,
1010 align => $align[$_], 1029 align => $align[$_],
1011 text => $m->[$_], 1030 text => $m->[$_],
1012 tooltip => $tip[$_], 1031 tooltip => $tip[$_],
… …
1053 1072
1054 $vbox->add (new CFPlus::UI::FancyFrame 1073 $vbox->add (new CFPlus::UI::FancyFrame
1055 label => "Connection Settings", 1074 label => "Connection Settings",
1056 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1075 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1057 ); 1076 );
1058 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1077 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1059 1078
1060 { 1079 {
1061 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1080 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1062 1081
1063 $vbox->add ( 1082 $vbox->add (
1064 $HOST_ENTRY = new CFPlus::UI::Entry 1083 $HOST_ENTRY = new CFPlus::UI::Entry
1065 expand => 1, 1084 expand => 1,
1066 text => $CFG->{profile}{default}{host}, 1085 text => $CFG->{profile}{default}{host},
… …
1080 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1099 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1081 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1100 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1082 ); 1101 );
1083 } 1102 }
1084 1103
1085 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1104 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1086 $table->add (1, 4, new CFPlus::UI::Entry 1105 $table->add_at (1, 4, new CFPlus::UI::Entry
1087 text => $CFG->{profile}{default}{user}, 1106 text => $CFG->{profile}{default}{user},
1088 tooltip => "The name of your character on the server", 1107 tooltip => "The name of your character on the server",
1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1108 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1090 ); 1109 );
1091 1110
1092 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1111 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1093 $table->add (1, 5, new CFPlus::UI::Entry 1112 $table->add_at (1, 5, new CFPlus::UI::Entry
1094 text => $CFG->{profile}{default}{password}, 1113 text => $CFG->{profile}{default}{password},
1095 hidden => 1, 1114 hidden => 1,
1096 tooltip => "The password for your character", 1115 tooltip => "The password for your character",
1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1116 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1098 ); 1117 );
1099 1118
1100 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1119 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1101 $table->add (1, 7, new CFPlus::UI::Slider 1120 $table->add_at (1, 7, new CFPlus::UI::Slider
1102 force_w => 100, 1121 force_w => 100,
1103 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1122 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1104 tooltip => "This is the size of the portion of the map update the server sends you. " 1123 tooltip => "This is the size of the portion of the map update the server sends you. "
1105 . "If you set this to a high value you will be able to see further, " 1124 . "If you set this to a high value you will be able to see further, "
1106 . "but you also increase bandwidth requirements and latency. " 1125 . "but you also increase bandwidth requirements and latency. "
1107 . "This option is only used once at log-in.", 1126 . "This option is only used once at log-in.",
1108 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1127 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1109 ); 1128 );
1110 1129
1111 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1130 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1112 $table->add (1, 8, new CFPlus::UI::CheckBox 1131 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1113 state => $CFG->{face_prefetch}, 1132 state => $CFG->{face_prefetch},
1114 tooltip => "<b>Background Image Prefetch</b>\n\n" 1133 tooltip => "<b>Background Image Prefetch</b>\n\n"
1115 . "If enabled, the client automatically pre-fetches images from the server. " 1134 . "If enabled, the client automatically pre-fetches images from the server. "
1116 . "This might increase or create lag, but increases the chances " 1135 . "This might increase or create lag, but increases the chances "
1117 . "of faces being ready for display when you encounter them. " 1136 . "of faces being ready for display when you encounter them. "
… …
1119 . "so only set it if you really need to prefetch images. " 1138 . "so only set it if you really need to prefetch images. "
1120 . "This option can be set and unset any time.", 1139 . "This option can be set and unset any time.",
1121 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1140 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1122 ); 1141 );
1123 1142
1124 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1143 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1125 $table->add (1, 9, new CFPlus::UI::Entry 1144 $table->add_at (1, 9, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate}, 1145 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1146 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1128 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1147 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.", 1148 . "default will be used, which is usually around 100kb/s.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1149 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1131 ); 1150 );
1132 1151
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1152 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1134 $table->add (1, 10, new CFPlus::UI::Entry 1153 $table->add_at (1, 10, new CFPlus::UI::Entry
1135 text => $CFG->{output_count}, 1154 text => $CFG->{output_count},
1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1155 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1137 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1156 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1138 ); 1157 );
1139 1158
1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1159 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1141 $table->add (1, 11, new CFPlus::UI::Entry 1160 $table->add_at (1, 11, new CFPlus::UI::Entry
1142 text => $CFG->{output_sync}, 1161 text => $CFG->{output_sync},
1143 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.",
1144 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1163 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1145 ); 1164 );
1146 1165
1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1166 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1148 expand => 1, 1167 expand => 1,
1149 align => 0, 1168 align => 0,
1150 text => "Login", 1169 text => "Login",
1151 on_activate => sub { 1170 on_activate => sub {
1152 $CONN ? stop_game 1171 $CONN ? stop_game
… …
1166sub client_setup { 1185sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1186 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168 1187
1169 my $row = 0; 1188 my $row = 0;
1170 1189
1171 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1173 text => $CFG->{say_command},
1174 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. "
1175 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1177 on_changed => sub {
1178 my ($self, $value) = @_;
1179 $CFG->{say_command} = $value;
1180 0
1181 }
1182 );
1183
1184 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1190 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1185 $table->add (1, $row++, new CFPlus::UI::CheckBox 1191 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1186 state => $CFG->{show_tips}, 1192 state => $CFG->{show_tips},
1187 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1193 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1188 on_changed => sub { 1194 on_changed => sub {
1189 my ($self, $value) = @_; 1195 my ($self, $value) = @_;
1190 $CFG->{show_tips} = $value; 1196 $CFG->{show_tips} = $value;
1191 0 1197 0
1192 } 1198 }
1193 ); 1199 );
1194 1200
1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1201 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1202 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1197 text => $CFG->{logview_max_par}, 1203 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1204 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and " 1205 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1206 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub { 1207 on_changed => sub {
1202 my ($self, $value) = @_; 1208 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1209 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1204 0 1210 0
1205 }, 1211 },
1206 ); 1212 );
1207 1213
1208 $table 1214 $table
1209} 1215}
1210 1216
1211sub message_window {
1212 my $window = new CFPlus::UI::Toplevel
1213 name => "message_window",
1214 title => "Messages",
1215 border_bg => [1, 1, 1, 1],
1216 x => "max",
1217 y => 0,
1218 force_w => $::WIDTH * 0.4,
1219 force_h => $::HEIGHT * 0.5,
1220 child => (my $vbox = new CFPlus::UI::VBox),
1221 has_close_button => 1;
1222
1223 $vbox->add ($LOGVIEW);
1224
1225 $vbox->add (my $input = new CFPlus::UI::Entry
1226 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1227 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1228 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1229 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1230 on_focus_in => sub {
1231 my ($input, $prev_focus) = @_;
1232
1233 delete $input->{refocus_map};
1234
1235 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1236 $input->{refocus_map} = 1;
1237 }
1238 delete $input->{auto_activated};
1239
1240 0
1241 },
1242 on_activate => sub {
1243 my ($input, $text) = @_;
1244 $input->set_text ('');
1245
1246 if ($text =~ /^\/(.*)/) {
1247 $::CONN->user_send ($1);
1248 } else {
1249 my $say_cmd = $::CFG->{say_command} || 'say';
1250 $::CONN->user_send ("$say_cmd $text");
1251 }
1252 if ($input->{refocus_map}) {
1253 delete $input->{refocus_map};
1254 $MAPWIDGET->focus_in
1255 }
1256
1257 0
1258 },
1259 on_escape => sub {
1260 $MAPWIDGET->grab_focus;
1261
1262 0
1263 },
1264 );
1265
1266 $CONSOLE = {
1267 window => $window,
1268 input => $input,
1269 };
1270
1271 $window
1272}
1273
1274sub autopickup_setup { 1217sub autopickup_setup {
1218 my $r = new CFPlus::UI::ScrolledWindow (
1219 expand => 1,
1220 scroll_y => 1
1221 );
1275 my $table = new CFPlus::UI::Table; 1222 $r->add (my $table = new CFPlus::UI::Table
1223 row_expand => [0],
1224 col_expand => [0, 1, 0, 1],
1225 );
1276 1226
1277 for ( 1227 for (
1278 ["General", 0, 0, 1228 ["General", 0, 0,
1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1229 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1280 ["Inhibit autopickup" => PICKUP_INHIBIT], 1230 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1315 ], 1265 ],
1316 ["Weight/Value ratio", 2, 17] 1266 ["Weight/Value ratio", 2, 17]
1317 ) 1267 )
1318 { 1268 {
1319 my ($title, $x, $y, @bits) = @$_; 1269 my ($title, $x, $y, @bits) = @$_;
1320 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1270 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1321 1271
1322 for (@bits) { 1272 for (@bits) {
1323 ++$y; 1273 ++$y;
1324 1274
1325 my $mask = $_->[1]; 1275 my $mask = $_->[1];
1326 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1276 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1327 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1277 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1328 state => $::CFG->{pickup} & $mask, 1278 state => $::CFG->{pickup} & $mask,
1329 on_changed => sub { 1279 on_changed => sub {
1330 my ($box, $value) = @_; 1280 my ($box, $value) = @_;
1331 1281
1332 if ($value) { 1282 if ($value) {
… …
1343 1293
1344 ${$_->[2]} = $checkbox if $_->[2]; 1294 ${$_->[2]} = $checkbox if $_->[2];
1345 } 1295 }
1346 } 1296 }
1347 1297
1348 $table->add (2, 18, new CFPlus::UI::ValSlider 1298 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1349 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1299 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1350 template => ">= 99", 1300 template => ">= 99",
1351 to_value => sub { ">= " . 5 * $_[0] }, 1301 to_value => sub { ">= " . 5 * $_[0] },
1352 on_changed => sub { 1302 on_changed => sub {
1353 my ($slider, $value) = @_; 1303 my ($slider, $value) = @_;
… …
1356 $::CFG->{pickup} |= int $value 1306 $::CFG->{pickup} |= int $value
1357 if $value; 1307 if $value;
1358 1; 1308 1;
1359 }); 1309 });
1360 1310
1361 $table->add (3, 18, new CFPlus::UI::Button 1311 $table->add_at (3, 18, new CFPlus::UI::Button
1362 text => "set", 1312 text => "set",
1363 on_activate => sub { 1313 on_activate => sub {
1364 $::CONN->send_command ("pickup $::CFG->{pickup}") 1314 $::CONN->send_command ("pickup $::CFG->{pickup}")
1365 if defined $::CONN; 1315 if defined $::CONN;
1366 0 1316 0
1367 }); 1317 });
1368 1318
1369 $table 1319 $r
1370} 1320}
1371 1321
1372my %SORT_ORDER = ( 1322my %SORT_ORDER = (
1373 type => undef, 1323 type => undef,
1374 mtime => sub { 1324 mtime => sub {
… …
1453 has_close_button => 1 1403 has_close_button => 1
1454 ; 1404 ;
1455 1405
1456 my $ntb = 1406 my $ntb =
1457 $PL_NOTEBOOK = 1407 $PL_NOTEBOOK =
1458 new CFPlus::UI::Notebook expand => 1, debug => 1; 1408 new CFPlus::UI::Notebook expand => 1;
1459 1409
1460 $ntb->add ( 1410 $ntb->add_tab (
1461 "Statistics (F2)" => $STATS_PAGE = stats_window, 1411 "Statistics (F2)" => $STATS_PAGE = stats_window,
1462 "Shows statistics, where all your Stats and Resistances are shown." 1412 "Shows statistics, where all your Stats and Resistances are shown."
1463 ); 1413 );
1464 $ntb->add ( 1414 $ntb->add_tab (
1465 "Skills (F3)" => $SKILL_PAGE = skill_window, 1415 "Skills (F3)" => $SKILL_PAGE = skill_window,
1466 "Shows all your Skills." 1416 "Shows all your Skills."
1467 ); 1417 );
1468 1418
1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1419 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1420 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1471 $ntb->add ( 1421 $ntb->add_tab (
1472 "Spellbook (F4)" => $spellsw, 1422 "Spellbook (F4)" => $spellsw,
1473 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1423 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1474 ); 1424 );
1475 $ntb->add ( 1425 $ntb->add_tab (
1476 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1426 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1477 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1427 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1478 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1428 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1479 ); 1429 );
1480 $ntb->add (Pickup => autopickup_setup, 1430 $ntb->add_tab (Pickup => autopickup_setup,
1481 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1431 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1482 1432
1483 $ntb->set_current_page ($INVENTORY_PAGE); 1433 $ntb->set_current_page ($INVENTORY_PAGE);
1484 1434
1485 $plwin->add ($ntb); 1435 $plwin->add ($ntb);
… …
1683 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1633 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1684 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1634 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1685 1635
1686 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1636 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1687 1637
1688 $table->add (0, 0, new CFPlus::UI::Button 1638 $table->add_at (0, 0, new CFPlus::UI::Button
1689 text => "Close", 1639 text => "Close",
1690 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>.", 1640 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>.",
1691 on_activate => $close, 1641 on_activate => $close,
1692 ); 1642 );
1693 1643
1694 $table->add (2, 0, new CFPlus::UI::Button 1644 $table->add_at (2, 0, new CFPlus::UI::Button
1695 text => "Next", 1645 text => "Next",
1696 tooltip => "Show the next <b>Tip of the day</b>.", 1646 tooltip => "Show the next <b>Tip of the day</b>.",
1697 on_activate => sub { 1647 on_activate => sub {
1698 $close->(); 1648 $close->();
1699 &show_tip_of_the_day; 1649 &show_tip_of_the_day;
… …
1708 CFPlus::SDL_Init 1658 CFPlus::SDL_Init
1709 and die "SDL::Init failed!\n"; 1659 and die "SDL::Init failed!\n";
1710} 1660}
1711 1661
1712sub video_init { 1662sub video_init {
1713 sdl_init;
1714
1715 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1663 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1716 1664
1717 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1665 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1718 1666
1719 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1667 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1720 $FULLSCREEN = $CFG->{fullscreen}; 1668 $FULLSCREEN = $CFG->{fullscreen};
1721 $FAST = $CFG->{fast}; 1669 $FAST = $CFG->{fast};
1722 1670
1723 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1671 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1724 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1672 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1725 1673
1726 $SDL_ACTIVE = 1; 1674 $SDL_ACTIVE = 1;
1727 $LAST_REFRESH = time - 0.01; 1675 $LAST_REFRESH = time - 0.01;
1728 1676
… …
1770 1718
1771 $MAPWIDGET = new CFPlus::MapWidget; 1719 $MAPWIDGET = new CFPlus::MapWidget;
1772 $MAPWIDGET->connect (activate_console => sub { 1720 $MAPWIDGET->connect (activate_console => sub {
1773 my ($mapwidget, $preset) = @_; 1721 my ($mapwidget, $preset) = @_;
1774 1722
1775 if ($CONSOLE) { 1723 $MESSAGE_WINDOW->activate_console ($preset)
1776 $CONSOLE->{input}->{auto_activated} = 1; 1724 if $MESSAGE_WINDOW;
1777 $CONSOLE->{input}->grab_focus;
1778
1779 if ($preset && $CONSOLE->{input}->get_text eq '') {
1780 $CONSOLE->{input}->set_text ($preset);
1781 }
1782 }
1783 }); 1725 });
1784 $MAPWIDGET->show; 1726 $MAPWIDGET->show;
1785 $MAPWIDGET->grab_focus; 1727 $MAPWIDGET->grab_focus;
1786
1787 $LOGVIEW = new CFPlus::UI::TextScroller
1788 expand => 1,
1789 font => $FONT_FIXED,
1790 fontsize => $::CFG->{log_fontsize},
1791 indent => -4,
1792 can_hover => 1,
1793 can_events => 1,
1794 max_par => $CFG->{logview_max_par},
1795 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1796 ;
1797 1728
1798 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1729 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1799 title => "Setup", 1730 title => "Setup",
1800 name => "setup_dialog", 1731 name => "setup_dialog",
1801 x => 'center', 1732 x => 'center',
… …
1805 force_h => $::HEIGHT * 0.6, 1736 force_h => $::HEIGHT * 0.6,
1806 has_close_button => 1, 1737 has_close_button => 1,
1807 ; 1738 ;
1808 1739
1809 $METASERVER = metaserver_dialog; 1740 $METASERVER = metaserver_dialog;
1741 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1810 1742
1811 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1743 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1812 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1744 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1813 1745
1814 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1746 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1815 "Configure the server to play on, your username, password and other server-related options."); 1747 "Configure the server to play on, your username, password and other server-related options.");
1816 $SETUP_NOTEBOOK->add (Client => client_setup, 1748 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1817 "Configure various client-specific settings."); 1749 "Configure various client-specific settings.");
1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1750 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1751 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1752 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1821 "Configure the use of audio, sound effects and background music."); 1753 "Configure the use of audio, sound effects and background music.");
1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1754 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1823 "Lets you define, edit and delete key bindings." 1755 "Lets you define, edit and delete key bindings."
1824 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1756 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1825 . "with nothing set and the recording started. After doing the actions you " 1757 . "with nothing set and the recording started. After doing the actions you "
1826 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1758 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1827 . "After pressing the combo the binding will be saved automatically and the " 1759 . "After pressing the combo the binding will be saved automatically and the "
1828 . "binding editor closes"); 1760 . "binding editor closes");
1829 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1761 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1830 "Some debuggin' options. Do not ask."); 1762 "Some debuggin' options. Do not ask.");
1831 1763
1832 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1764 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1833 1765
1834 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1766 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1835 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1767 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1836 1768
1837 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1769 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1838 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1770 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1839 1771
1840 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1772 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1841 1773
1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1774 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1968 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1900 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1969 1901
1970 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1902 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1971 my $row = 0; 1903 my $row = 0;
1972 if ($info->{has_name}) { 1904 if ($info->{has_name}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1905 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1906 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1975 } 1907 }
1976 if ($info->{has_text}) { 1908 if ($info->{has_text}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1909 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1910 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1979 } 1911 }
1980 if ($info->{has_connection}) { 1912 if ($info->{has_connection}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1913 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1982 $table->add (1, $row++, 1914 $table->add_at (1, $row++,
1983 new CFPlus::UI::Entry 1915 new CFPlus::UI::Entry
1984 expand => 1, 1916 expand => 1,
1985 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1917 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1986 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1918 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1987 ); 1919 );
… …
2000 CFPlus::OpenGL::shutdown; 1932 CFPlus::OpenGL::shutdown;
2001 1933
2002 undef $SDL_ACTIVE; 1934 undef $SDL_ACTIVE;
2003} 1935}
2004 1936
2005my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2006my $bgmusic;#TODO#hack#d#
2007
2008sub audio_channel_finished { 1937sub audio_channel_finished {
2009 my ($channel) = @_; 1938 my ($channel) = @_;
2010 1939
2011 #warn "channel $channel finished\n";#d# 1940 #warn "channel $channel finished\n";#d#
2012} 1941}
2013 1942
1943sub audio_music_set {
1944 my ($songs) = @_;
1945
1946 my @want =
1947 grep $_,
1948 map $CONN->{music_meta}{$_},
1949 @$songs;
1950
1951 if (@want) {
1952 @MUSIC_WANT = @want;
1953 &audio_music_changed ();
1954 }
1955}
1956
1957sub audio_music_start {
1958 my $path = $MUSIC_PLAYING->{path}
1959 or return;
1960
1961 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1962 return unless $SDL_MIXER;
1963
1964 # music might have changed...
1965 $path eq $MUSIC_PLAYING->{path}
1966 or return &audio_music_start ();
1967
1968 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1969
1970 my $NOW = time;
1971
1972 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1973 my $pos = $MUSIC_PLAYING->{stop_pos};
1974 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1975 $MUSIC_START = time - $pos;
1976 } else {
1977 $MUSIC_PLAYER->play (0);
1978 $MUSIC_START = time;
1979 }
1980
1981 delete $MUSIC_PLAYING->{stop_time};
1982 delete $MUSIC_PLAYING->{stop_pos};
1983 }
1984}
1985
1986sub audio_music_changed {
1987 return unless $CFG->{bgm_enable};
1988 return unless $SDL_MIXER;
1989
1990 # default MUSIC_WANT == MUSIC_DEFAULT
1991 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1992
1993 # if the currently playing song is acceptable, let it continue
1994 return if $MUSIC_PLAYING
1995 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1996
1997 my $NOW = time;
1998
1999 if ($MUSIC_PLAYING) {
2000 $MUSIC_PLAYING->{stop_time} = $NOW;
2001 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2002 CFPlus::MixMusic::fade_out 1000;
2003 } else {
2004 # sort by stop time, oldest first
2005 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2006
2007 # if the most recently-played piece played very recently,
2008 # resume it, else choose the oldest piece for rotation.
2009 $MUSIC_PLAYING =
2010 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2011 ? $MUSIC_WANT[-1]
2012 : $MUSIC_WANT[0];
2013
2014 audio_music_start;
2015 }
2016}
2017
2014sub audio_music_finished { 2018sub audio_music_finished {
2015 return unless $CFG->{bgm_enable}; 2019 $MUSIC_PLAYING = undef;
2020 undef $MUSIC_PLAYER;
2016 2021
2017 # TODO: hack, do play loop and mood music 2022 audio_music_changed;
2018 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2019 $bgmusic->play (0);
2020
2021 push @bgmusic, shift @bgmusic;
2022} 2023}
2023 2024
2024sub audio_init { 2025sub audio_init {
2025 if ($CFG->{audio_enable}) { 2026 if ($CFG->{audio_enable}) {
2026 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2027 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2052 }; 2053 };
2053 } 2054 }
2054 } else { 2055 } else {
2055 status "unable to open sound config: $!"; 2056 status "unable to open sound config: $!";
2056 } 2057 }
2058 } else {
2059 undef $SDL_MIXER;
2057 } 2060 }
2058} 2061}
2059 2062
2060sub audio_shutdown { 2063sub audio_shutdown {
2061 CFPlus::Mix_CloseAudio if $SDL_MIXER; 2064 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
2076 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2079 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2077 2080
2078 $CFPlus::UI::ROOT->draw; 2081 $CFPlus::UI::ROOT->draw;
2079 2082
2080 $WANT_REFRESH = 0; 2083 $WANT_REFRESH = 0;
2081 $CAN_REFRESH = 0; 2084 $CAN_REFRESH = 0;
2082 $LAST_REFRESH = $NOW; 2085 $LAST_REFRESH = $NOW;
2083 2086
2084 CFPlus::SDL_GL_SwapBuffers; 2087 CFPlus::SDL_GL_SwapBuffers;
2085} 2088}
2086 2089
2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2090my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2088 $NOW = time; 2091 $NOW = time;
2089 2092
2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2093 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2091 for CFPlus::SDL_PollEvent; 2094 for CFPlus::poll_events;
2092 2095
2093 if (%animate_object) { 2096 if (%animate_object) {
2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2097 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2095 $WANT_REFRESH++; 2098 ++$WANT_REFRESH;
2096 } 2099 }
2097 2100
2098 if ($WANT_REFRESH) { 2101 if ($WANT_REFRESH) {
2099 force_refresh; 2102 force_refresh;
2100 } else { 2103 } else {
… …
2130 CFPlus::SDL_VIDEOEXPOSE => sub { 2133 CFPlus::SDL_VIDEOEXPOSE => sub {
2131 CFPlus::UI::full_refresh; 2134 CFPlus::UI::full_refresh;
2132 }, 2135 },
2133 CFPlus::SDL_ACTIVEEVENT => sub { 2136 CFPlus::SDL_ACTIVEEVENT => sub {
2134# not useful, as APPACTIVE include sonly iconified state, not unmapped 2137# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2138# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2139# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2139 }, 2143 },
2140 CFPlus::SDL_KEYDOWN => sub { 2144 CFPlus::SDL_KEYDOWN => sub {
… …
2176 height => 480, 2180 height => 480,
2177 fullscreen => 0, 2181 fullscreen => 0,
2178 fast => 0, 2182 fast => 0,
2179 map_scale => 1, 2183 map_scale => 1,
2180 fow_enable => 1, 2184 fow_enable => 1,
2181 fow_intensity => 0.45, 2185 fow_intensity => 0,
2182 fow_smooth => 0,
2183 map_smoothing => 1, 2186 map_smoothing => 1,
2184 gui_fontsize => 1, 2187 gui_fontsize => 1,
2185 log_fontsize => 0.7, 2188 log_fontsize => 0.7,
2186 gauge_fontsize => 1, 2189 gauge_fontsize => 1,
2187 gauge_size => 0.35, 2190 gauge_size => 0.35,
2188 stat_fontsize => 0.7, 2191 stat_fontsize => 0.7,
2189 mapsize => 100, 2192 mapsize => 100,
2190 say_command => 'chat',
2191 audio_enable => 1, 2193 audio_enable => 1,
2192 bgm_enable => 1, 2194 bgm_enable => 1,
2193 bgm_volume => 0.25, 2195 bgm_volume => 0.25,
2194 face_prefetch => 0, 2196 face_prefetch => 0,
2195 output_sync => 1, 2197 output_sync => 1,
… …
2221 } 2223 }
2222 } 2224 }
2223 2225
2224 sdl_init; 2226 sdl_init;
2225 2227
2226 @SDL_MODES = reverse 2228 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2227 grep $_->[0] >= 640 && $_->[1] >= 480, 2229 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2228 CFPlus::SDL_ListModes;
2229
2230 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2230 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2231
2232 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2231 2233
2232 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2234 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2233 2235
2234 { 2236 {
2235 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2237 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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