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.165 by root, Thu Jul 12 18:57:45 2007 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
82use CFPlus; 83use CFPlus;
83use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
84use CFPlus::Protocol; 85use CFPlus::Protocol;
85use CFPlus::DB; 86use CFPlus::DB;
86use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
89use CFPlus::Pod; 92use CFPlus::Pod;
90use CFPlus::MapWidget; 93use CFPlus::MapWidget;
91use CFPlus::Macro; 94use CFPlus::Macro;
92 95
93$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
125 128
126our $MAP; 129our $MAP;
127our $MAPMAP; 130our $MAPMAP;
128our $MAPWIDGET; 131our $MAPWIDGET;
129our $BUTTONBAR; 132our $BUTTONBAR;
130our $LOGVIEW;
131our $CONSOLE;
132our $METASERVER; 133our $METASERVER;
133our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 135our $QUIT_DIALOG;
135our $HOST_ENTRY; 136our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
161our %SDL_CB; 162our %SDL_CB;
162 163
163our $SDL_MIXER; 164our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 166our @MUSIC_WANT;
167our $MUSIC_START;
166our $MUSIC_PLAYING; 168our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META;
167our $MUSIC_PLAYER; 170our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
168our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
169our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNKS; # audio files
170 174
171our $ALT_ENTER_MESSAGE; 175our $ALT_ENTER_MESSAGE;
172our $STATUSBOX; 176our $STATUSBOX;
… …
176our $INVR; 180our $INVR;
177our $INV_RIGHT_HB; 181our $INV_RIGHT_HB;
178 182
179our $PICKUP_CFG; 183our $PICKUP_CFG;
180 184
181our $IN_BUILD_MODE;
182our $BUILD_BUTTON;
183
184sub status { 185sub status {
185 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 186 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
186} 187}
187 188
188sub debug { 189sub debug {
189 $DEBUG_STATUS->set_text ($_[0]); 190 $DEBUG_STATUS->set_text ($_[0]);
190} 191}
191 192
192sub message { 193sub message {
193 my ($para) = @_; 194 my ($para) = @_;
194 195 $MESSAGE_WINDOW->message ($para);
195 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
196
197 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
198
199 $LOGVIEW->add_paragraph ($para);
200 $LOGVIEW->scroll_to_bottom;
201} 196}
202 197
203sub destroy_query_dialog { 198sub destroy_query_dialog {
204 (delete $_[0]{query_dialog})->destroy 199 (delete $_[0]{query_dialog})->destroy
205 if $_[0]{query_dialog}; 200 if $_[0]{query_dialog};
… …
270 ellipsise => 0, 265 ellipsise => 0,
271 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
272 267
273 unshift @dialog, my $table = new CFPlus::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
274 269
275 $table->add (0, 0, new CFPlus::UI::Button 270 $table->add_at (0, 0, new CFPlus::UI::Button
276 text => "Next Race", 271 text => "Next Race",
277 on_activate => sub { 272 on_activate => sub {
278 $conn->send ("reply n"); 273 $conn->send ("reply n");
279 destroy_query_dialog $conn; 274 destroy_query_dialog $conn;
280 0 275 0
281 }, 276 },
282 ); 277 );
283 $table->add (2, 0, new CFPlus::UI::Button 278 $table->add_at (2, 0, new CFPlus::UI::Button
284 text => "Accept", 279 text => "Accept",
285 on_activate => sub { 280 on_activate => sub {
286 $conn->send ("reply d"); 281 $conn->send ("reply d");
287 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
288 0 283 0
… …
323 $conn->send ("reply $stat"); 318 $conn->send ("reply $stat");
324 destroy_query_dialog $conn; 319 destroy_query_dialog $conn;
325 return; 320 return;
326 } 321 }
327 322
328 $STATS_PAGE->show;
329 $MESSAGE_WINDOW->hide;
330
331 unshift @dialog, new CFPlus::UI::Label 323 unshift @dialog, new CFPlus::UI::Label
332 max_w => $::WIDTH * 0.4, 324 max_w => $::WIDTH * 0.4,
333 ellipsise => 0, 325 ellipsise => 0,
334 markup => "\nOr use your keyboard and the text entry below:\n"; 326 markup => "\nOr use your keyboard and the text entry below:\n";
335 327
336 unshift @dialog, my $table = new CFPlus::UI::Table; 328 unshift @dialog, my $table = new CFPlus::UI::Table;
337 329
338 # left: re-roll 330 # left: re-roll
339 $table->add (0, 0, new CFPlus::UI::Button 331 $table->add_at (0, 0, new CFPlus::UI::Button
340 text => "Roll Again", 332 text => "Roll Again",
341 on_activate => sub { 333 on_activate => sub {
342 $conn->send ("reply y"); 334 $conn->send ("reply y");
343 destroy_query_dialog $conn; 335 destroy_query_dialog $conn;
344 0 336 0
… …
358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 350 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 351 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
360 ], 352 ],
361 ), 1 .. 2; 353 ), 1 .. 2;
362 354
363 $table->add (2, 0, new CFPlus::UI::Button 355 $table->add_at (2, 0, new CFPlus::UI::Button
364 text => "Swap Stats", 356 text => "Swap Stats",
365 on_activate => sub { 357 on_activate => sub {
366 $conn->{stat_change_with} = $sw2->{value}; 358 $conn->{stat_change_with} = $sw2->{value};
367 $conn->send ("reply $sw1->{value}"); 359 $conn->send ("reply $sw1->{value}");
368 destroy_query_dialog $conn; 360 destroy_query_dialog $conn;
369 0 361 0
370 }, 362 },
371 ); 363 );
372 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 364 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
373 365
374 # right: accept 366 # right: accept
375 $table->add (4, 0, new CFPlus::UI::Button 367 $table->add_at (4, 0, new CFPlus::UI::Button
376 text => "Accept", 368 text => "Accept",
377 on_activate => sub { 369 on_activate => sub {
378 $conn->send ("reply n"); 370 $conn->send ("reply n");
379 $STATS_PAGE->hide; 371 $STATS_PAGE->hide;
380 destroy_query_dialog $conn; 372 destroy_query_dialog $conn;
… …
461 maph => $mapsize, 453 maph => $mapsize,
462 454
463 client => "cfplus $CFPlus::VERSION $] $^O", 455 client => "cfplus $CFPlus::VERSION $] $^O",
464 456
465 map_widget => $MAPWIDGET, 457 map_widget => $MAPWIDGET,
466 logview => $LOGVIEW,
467 statusbox => $STATUSBOX, 458 statusbox => $STATUSBOX,
468 map => $MAP, 459 map => $MAP,
469 mapmap => $MAPMAP, 460 mapmap => $MAPMAP,
470 query => \&server_query, 461 query => \&server_query,
471 462
472 setup_req => { 463 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1, 464 smoothing => $CFG->{map_smoothing}*1,
474 },
475
476 sound_play => sub {
477 my ($x, $y, $soundnum, $type) = @_;
478
479 $SDL_MIXER
480 or return;
481
482 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
483 or return;
484
485 $chunk->play;
486 }, 465 },
487 }; 466 };
488 467
489 if ($CONN) { 468 if ($CONN) {
490 CFPlus::lowdelay fileno $CONN->{fh}; 469 CFPlus::lowdelay fileno $CONN->{fh};
… …
502 $SETUP_DIALOG->show; 481 $SETUP_DIALOG->show;
503 $PL_WINDOW->hide; 482 $PL_WINDOW->hide;
504 $SPELL_LIST->clear_spells; 483 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506 485
486 &audio_music_set ([]);
487
507 return unless $CONN; 488 return unless $CONN;
508 489
509 status "connection closed"; 490 status "connection closed";
510 491
511 destroy_query_dialog $CONN; 492 destroy_query_dialog $CONN;
… …
520 501
521 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 502 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
522 503
523 my $row = 0; 504 my $row = 0;
524 505
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 506 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
526 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 507 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
527 can_events => 1, 508 can_events => 1,
528 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 509 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
529 510
511 my $vidmode_tooltip =
512 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
513 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
514
530 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 515 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 516 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
532 517
518 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
533 $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]); 519 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
534 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 520 tooltip => $vidmode_tooltip);
521 $hbox->add (my $mode_label = new CFPlus::UI::Label
522 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
523 can_events => 1, tooltip => $vidmode_tooltip);
535 524
536 $mode_slider->connect (changed => sub { 525 $mode_slider->connect (changed => sub {
537 my ($self, $value) = @_; 526 my ($self, $value) = @_;
538 527
539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 528 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 529 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
541 }); 530 });
542 $mode_slider->emit (changed => $mode_slider->{range}[0]); 531 $mode_slider->emit (changed => $mode_slider->{range}[0]);
543 532
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 533 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 534 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
546 state => $CFG->{fullscreen}, 535 state => $CFG->{fullscreen},
547 tooltip => "Bring the client into fullscreen mode.", 536 tooltip => "Bring the client into fullscreen mode.",
548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
549 ); 538 );
550 539
551 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 540 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
552 $table->add (1, $row++, new CFPlus::UI::CheckBox 541 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
553 state => $CFG->{fast}, 542 state => $CFG->{fast},
554 tooltip => "Lower the visual quality considerably to speed up rendering.", 543 tooltip => "Lower the visual quality considerably to speed up rendering.",
555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 544 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
556 ); 545 );
557 546
558 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 547 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
559 $table->add (1, $row++, new CFPlus::UI::Slider 548 $table->add_at (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 549 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
561 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 550 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
562 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 551 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
563 ); 552 );
564 553
565 $table->add (1, $row++, new CFPlus::UI::Button 554 $table->add_at (1, $row++, new CFPlus::UI::Button
566 expand => 1, align => 0, text => "Apply", 555 expand => 1, align => 0, text => "Apply",
567 tooltip => "Apply the video settings above.", 556 tooltip => "Apply the video settings above.",
568 on_activate => sub { 557 on_activate => sub {
569 video_shutdown (); 558 video_shutdown ();
570 video_init (); 559 video_init ();
571 0 560 0
572 } 561 }
573 ); 562 );
574 563
575 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 564 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
576 $table->add (1, $row++, new CFPlus::UI::Slider 565 $table->add_at (1, $row++, new CFPlus::UI::Slider
577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 566 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 567 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
579 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 568 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
580 ); 569 );
581 570
582 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
583 $table->add (1, $row++, new CFPlus::UI::CheckBox 572 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing}, 573 state => $CFG->{map_smoothing},
585 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 574 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
586 . "This increases load on the graphics subsystem and works only with 2.x servers. " 575 . "This increases load on the graphics subsystem and works only with 2.x servers. "
587 . "Changes take effect at next connection only.", 576 . "Changes take effect at next connection only.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
589 ); 578 );
590 579
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 580 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox 581 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{fow_enable}, 582 state => $CFG->{fow_enable},
594 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 583 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
595 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 584 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
596 ); 585 );
597 586
598 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 587 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
599 $table->add (1, $row++, new CFPlus::UI::Slider 588 $table->add_at (1, $row++, new CFPlus::UI::Slider
600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 589 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
601 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 590 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
603 ); 592 );
604 593
605 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
606 $table->add (1, $row++, new CFPlus::UI::CheckBox
607 state => $CFG->{fow_smooth},
608 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
609 on_changed => sub {
610 my ($self, $value) = @_;
611 $CFG->{fow_smooth} = $value;
612 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
613 0
614 }
615 );
616
617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
618 $table->add (1, $row++, new CFPlus::UI::Slider 595 $table->add_at (1, $row++, new CFPlus::UI::Slider
619 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
620 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 597 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
621 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 598 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
622 ); 599 );
623 600
624 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
625 $table->add (1, $row++, new CFPlus::UI::Slider 602 $table->add_at (1, $row++, new CFPlus::UI::Slider
626 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 603 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
627 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 604 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
628 on_changed => sub { 605 on_changed => sub {
629 $CFG->{gauge_fontsize} = $_[1]; 606 $CFG->{gauge_fontsize} = $_[1];
630 &set_gauge_window_fontsize; 607 &set_gauge_window_fontsize;
631 0 608 0
632 } 609 }
633 ); 610 );
634 611
635 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 612 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
636 $table->add (1, $row++, new CFPlus::UI::Slider 613 $table->add_at (1, $row++, new CFPlus::UI::Slider
637 range => [$CFG->{gauge_size}, 0.2, 0.8], 614 range => [$CFG->{gauge_size}, 0.2, 0.8],
638 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 615 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
639 on_changed => sub { 616 on_changed => sub {
640 $CFG->{gauge_size} = $_[1]; 617 $CFG->{gauge_size} = $_[1];
641 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 618 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
651 628
652 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 629 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
653 630
654 my $row = 0; 631 my $row = 0;
655 632
656 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
657 $table->add (1, $row++, new CFPlus::UI::CheckBox 634 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
658 state => $CFG->{audio_enable}, 635 state => $CFG->{audio_enable},
659 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.", 636 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.",
660 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 637 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
661 ); 638 );
662# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 639# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
663# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 640# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
664# $CFG->{effects_volume} = $_[1]; 641# $CFG->{effects_volume} = $_[1];
665# }); 642# });
666 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
667 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 644 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
668 $hbox->add (new CFPlus::UI::CheckBox 645 $hbox->add (new CFPlus::UI::CheckBox
669 expand => 1, state => $CFG->{bgm_enable}, 646 expand => 1, state => $CFG->{bgm_enable},
670 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 647 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
671 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 648 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
672 ); 649 );
… …
674 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
675 tooltip => "The volume of the background music. Changes are instant.", 652 tooltip => "The volume of the background music. Changes are instant.",
676 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
677 ); 654 );
678 655
679 $table->add (1, $row++, new CFPlus::UI::Button 656 $table->add_at (1, $row++, new CFPlus::UI::Button
680 expand => 1, align => 0, text => "Apply", 657 expand => 1, align => 0, text => "Apply",
681 tooltip => "Apply the audio settings", 658 tooltip => "Apply the audio settings",
682 on_activate => sub { 659 on_activate => sub {
683 audio_shutdown (); 660 audio_shutdown ();
684 audio_init (); 661 audio_init ();
… …
743} 720}
744 721
745sub debug_setup { 722sub debug_setup {
746 my $table = new CFPlus::UI::Table; 723 my $table = new CFPlus::UI::Table;
747 724
748 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 725 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
749 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 726 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
750 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 727 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
751 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 728 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
752 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 729 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
753 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 730 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
754 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 731 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
755 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 732 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
756 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 733 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
757 734
758 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
759
760 for my $x (0..2) {
761 for my $y (0 .. 2) {
762 $table->add ($x + 3, $y,
763 new CFPlus::UI::Entry
764 text => $default_smooth[$x * 3 + $y],
765 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
766 );
767 }
768 }
769
770 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 735 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736
737 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
739 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
740 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
741 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
742 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745
746 $c->add_items ({
747 type => "line_loop",
748 color => [0, 1, 0],
749 width => 9,
750 coord_mode => "abs",
751 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
752 });
753
754 $c->add_items ({
755 type => "lines",
756 color => [1, 1, 0],
757 width => 2,
758 coord_mode => "rel",
759 coord => [[0,0], [1,1], [1,0], [0,1]],
760 });
761
762 $c->add_items ({
763 type => "polygon",
764 color => [0, 0.43, 0],
765 width => 2,
766 coord_mode => "rel",
767 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
768 });
771 769
772 $table 770 $table
773} 771}
774 772
775sub stats_window { 773sub stats_window {
… …
823 [2, 4, st_spd => "Spd", 10.54], 821 [2, 4, st_spd => "Spd", 10.54],
824 [2, 5, st_wspd => "WSp", 10.54], 822 [2, 5, st_wspd => "WSp", 10.54],
825 ) { 823 ) {
826 my ($col, $row, $id, $label, $template) = @$_; 824 my ($col, $row, $id, $label, $template) = @$_;
827 825
828 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 826 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
829 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 827 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
830 align => +1, template => $template, tooltip => "#stat_$label"); 828 align => +1, template => $template, tooltip => "#stat_$label");
831 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 829 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
832 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 830 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
833 align => -1, text => $label, tooltip => "#stat_$label"); 831 align => -1, text => $label, tooltip => "#stat_$label");
834 } 832 }
835 833
836 $vb->add (new CFPlus::UI::FancyFrame 834 $vb->add (new CFPlus::UI::FancyFrame
… …
877 cold => ["Cold", 875 cold => ["Cold",
878 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 876 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
879 ghit => ["Ghost hit", 877 ghit => ["Ghost hit",
880 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 878 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
881 ); 879 );
880
882 for (qw/slow holyw conf fire depl magic 881 for (qw/slow holyw conf fire depl magic
883 drain acid pois para deat phys 882 drain acid pois para deat phys
884 blind fear tund elec cold ghit/) 883 blind fear tund elec cold ghit/)
885 { 884 {
886 $tbl2->add ($col, $row, 885 $tbl2->add_at ($col, $row,
887 $STATWIDS->{"res_$_"} = 886 $STATWIDS->{"res_$_"} =
888 new CFPlus::UI::Label 887 new CFPlus::UI::Label
889 font => $FONT_FIXED, 888 font => $FONT_FIXED,
890 template => "-100%", 889 template => "-100%",
891 align => +1, 890 align => +1,
892 valign => 0, 891 valign => 0,
893 can_events => 1, 892 can_events => 1,
894 can_hover => 1, 893 can_hover => 1,
895 tooltip => $resist_names{$_}->[1], 894 tooltip => $resist_names{$_}->[1],
896 ); 895 );
897 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 896 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
898 font => $FONT_FIXED, 897 font => $FONT_FIXED,
899 can_hover => 1, 898 can_hover => 1,
900 can_events => 1, 899 can_events => 1,
901 path => "ui/resist/resist_$_.png", 900 path => "ui/resist/resist_$_.png",
902 tooltip => $resist_names{$_}->[1], 901 tooltip => $resist_names{$_}->[1],
903 ); 902 );
904 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 903 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
905 text => $resist_names{$_}->[0], 904 text => $resist_names{$_}->[0],
906 font => $FONT_FIXED, 905 font => $FONT_FIXED,
907 can_hover => 1, 906 can_hover => 1,
908 can_events => 1, 907 can_events => 1,
909 tooltip => $resist_names{$_}->[1], 908 tooltip => $resist_names{$_}->[1],
… …
942 return if $METASERVER_ATIME > time; 941 return if $METASERVER_ATIME > time;
943 $METASERVER_ATIME = time + 60; 942 $METASERVER_ATIME = time + 60;
944 943
945 my $table = $METASERVER->{table}; 944 my $table = $METASERVER->{table};
946 $table->clear; 945 $table->clear;
947 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 946 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
948 947
949 my $ok = 0; 948 my $ok = 0;
950 949
951 CFPlus::background { 950 CFPlus::background {
952 my $ua = CFPlus::lwp_useragent; 951 my $ua = CFPlus::lwp_useragent;
… …
963 "The time this server has been running without being restarted.", 962 "The time this server has been running without being restarted.",
964 "The server software version - a '+' indicates a Crossfire+ server.", 963 "The server software version - a '+' indicates a Crossfire+ server.",
965 "Short information about this server provided by its admins.", 964 "Short information about this server provided by its admins.",
966 ); 965 );
967 my @col = qw(#Users Host Uptime Version Description); 966 my @col = qw(#Users Host Uptime Version Description);
968 $table->add ($_, 0, new CFPlus::UI::Label 967 $table->add_at ($_, 0, new CFPlus::UI::Label
969 can_hover => 1, can_events => 1, 968 can_hover => 1, can_events => 1,
970 align => 0, fg => [1, 1, 0], 969 align => 0, fg => [1, 1, 0],
971 text => $col[$_], tooltip => $tip[$_]) 970 text => $col[$_], tooltip => $tip[$_])
972 for 0 .. $#col; 971 for 0 .. $#col;
973 972
… …
995 994
996 $m = [$users, $host, $uptime, $version, $desc]; 995 $m = [$users, $host, $uptime, $version, $desc];
997 996
998 $y++; 997 $y++;
999 998
1000 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 999 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1001 (new CFPlus::UI::Button 1000 (new CFPlus::UI::Button
1002 text => "Use", 1001 text => "Use",
1003 tooltip => "Put this server into the <b>Host:Port</b> field", 1002 tooltip => "Put this server into the <b>Host:Port</b> field",
1004 on_activate => sub { 1003 on_activate => sub {
1005 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1004 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1008 }, 1007 },
1009 ), 1008 ),
1010 (new CFPlus::UI::Empty expand => 1), 1009 (new CFPlus::UI::Empty expand => 1),
1011 ]); 1010 ]);
1012 1011
1013 $table->add ($_, $y, new CFPlus::UI::Label 1012 $table->add_at ($_, $y, new CFPlus::UI::Label
1014 max_w => $::WIDTH * 0.4, 1013 max_w => $::WIDTH * 0.4,
1015 ellipsise => 0, 1014 ellipsise => 0,
1016 align => $align[$_], 1015 align => $align[$_],
1017 text => $m->[$_], 1016 text => $m->[$_],
1018 tooltip => $tip[$_], 1017 tooltip => $tip[$_],
… …
1059 1058
1060 $vbox->add (new CFPlus::UI::FancyFrame 1059 $vbox->add (new CFPlus::UI::FancyFrame
1061 label => "Connection Settings", 1060 label => "Connection Settings",
1062 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1063 ); 1062 );
1064 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1063 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1065 1064
1066 { 1065 {
1067 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1066 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1068 1067
1069 $vbox->add ( 1068 $vbox->add (
1070 $HOST_ENTRY = new CFPlus::UI::Entry 1069 $HOST_ENTRY = new CFPlus::UI::Entry
1071 expand => 1, 1070 expand => 1,
1072 text => $CFG->{profile}{default}{host}, 1071 text => $CFG->{profile}{default}{host},
1073 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1074 on_changed => sub { 1073 on_changed => sub {
1075 my ($self, $value) = @_; 1074 my ($self, $value) = @_;
1076 $CFG->{profile}{default}{host} = $value; 1075 $CFG->{profile}{default}{host} = $value;
1077 0 1076 1
1078 } 1077 }
1079 ); 1078 );
1080 1079
1081 $vbox->add (new CFPlus::UI::Button 1080 $vbox->add (new CFPlus::UI::Button
1082 expand => 1, 1081 expand => 1,
1083 text => "Server List", 1082 text => "Server List",
1084 other => $METASERVER, 1083 other => $METASERVER,
1085 tooltip => "Show a list of available crossfire servers", 1084 tooltip => "Show a list of available crossfire servers",
1086 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1085 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1087 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1088 ); 1087 );
1089 } 1088 }
1090 1089
1091 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1092 $table->add (1, 4, new CFPlus::UI::Entry 1091 $table->add_at (1, 4, new CFPlus::UI::Entry
1093 text => $CFG->{profile}{default}{user}, 1092 text => $CFG->{profile}{default}{user},
1094 tooltip => "The name of your character on the server", 1093 tooltip => "The name of your character on the server",
1095 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1096 ); 1095 );
1097 1096
1098 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1099 $table->add (1, 5, new CFPlus::UI::Entry 1098 $table->add_at (1, 5, new CFPlus::UI::Entry
1100 text => $CFG->{profile}{default}{password}, 1099 text => $CFG->{profile}{default}{password},
1101 hidden => 1, 1100 hidden => 1,
1102 tooltip => "The password for your character", 1101 tooltip => "The password for your character",
1103 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1104 ); 1103 );
1105 1104
1106 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1107 $table->add (1, 7, new CFPlus::UI::Slider 1106 $table->add_at (1, 7, new CFPlus::UI::Slider
1108 force_w => 100, 1107 force_w => 100,
1109 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1108 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1110 tooltip => "This is the size of the portion of the map update the server sends you. " 1109 tooltip => "This is the size of the portion of the map update the server sends you. "
1111 . "If you set this to a high value you will be able to see further, " 1110 . "If you set this to a high value you will be able to see further, "
1112 . "but you also increase bandwidth requirements and latency. " 1111 . "but you also increase bandwidth requirements and latency. "
1113 . "This option is only used once at log-in.", 1112 . "This option is only used once at log-in.",
1114 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1115 ); 1114 );
1116 1115
1117 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1118 $table->add (1, 8, new CFPlus::UI::CheckBox
1119 state => $CFG->{face_prefetch},
1120 tooltip => "<b>Background Image Prefetch</b>\n\n"
1121 . "If enabled, the client automatically pre-fetches images from the server. "
1122 . "This might increase or create lag, but increases the chances "
1123 . "of faces being ready for display when you encounter them. "
1124 . "It also uses up server bandwidth on every connect, "
1125 . "so only set it if you really need to prefetch images. "
1126 . "This option can be set and unset any time.",
1127 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1128 );
1129
1130 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1116 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1131 $table->add (1, 9, new CFPlus::UI::Entry 1117 $table->add_at (1, 8, new CFPlus::UI::Entry
1132 text => $CFG->{output_rate}, 1118 text => $CFG->{output_rate},
1133 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1119 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1134 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1120 . "when sending data. When 0 or unset, the server "
1135 . "default will be used, which is usually around 100kb/s.", 1121 . "default will be used, which is usually around 100kb/s. Most servers will "
1122 . "dynamically find an optimal rate, so adjust this only when necessary.",
1136 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1123 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1137 ); 1124 );
1138 1125
1139 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1126 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1140 $table->add (1, 10, new CFPlus::UI::Entry 1127 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_count}, 1128 text => $CFG->{output_count},
1142 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1129 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1143 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1130 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1144 ); 1131 );
1145 1132
1146 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1133 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1147 $table->add (1, 11, new CFPlus::UI::Entry 1134 $table->add_at (1, 10, new CFPlus::UI::Entry
1148 text => $CFG->{output_sync}, 1135 text => $CFG->{output_sync},
1149 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1150 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1137 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1151 ); 1138 );
1152 1139
1153 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1140 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1154 expand => 1, 1141 expand => 1,
1155 align => 0, 1142 align => 0,
1156 text => "Login", 1143 text => "Login",
1157 on_activate => sub { 1144 on_activate => sub {
1158 $CONN ? stop_game 1145 $CONN ? stop_game
1159 : start_game; 1146 : start_game;
1160 0 1147 1
1161 }, 1148 },
1162 ); 1149 );
1163 1150
1164 $vbox->add (new CFPlus::UI::FancyFrame 1151 $vbox->add (new CFPlus::UI::FancyFrame
1165 label => "Server Info", 1152 label => "Server Info",
… …
1172sub client_setup { 1159sub client_setup {
1173 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1160 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1174 1161
1175 my $row = 0; 1162 my $row = 0;
1176 1163
1177 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1178 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1179 text => $CFG->{say_command},
1180 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. "
1181 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1182 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1183 on_changed => sub {
1184 my ($self, $value) = @_;
1185 $CFG->{say_command} = $value;
1186 0
1187 }
1188 );
1189
1190 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1164 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1191 $table->add (1, $row++, new CFPlus::UI::CheckBox 1165 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1192 state => $CFG->{show_tips}, 1166 state => $CFG->{show_tips},
1193 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1167 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1194 on_changed => sub { 1168 on_changed => sub {
1195 my ($self, $value) = @_; 1169 my ($self, $value) = @_;
1196 $CFG->{show_tips} = $value; 1170 $CFG->{show_tips} = $value;
1197 0 1171 0
1198 } 1172 }
1199 ); 1173 );
1200 1174
1201 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1175 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1202 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1176 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1203 text => $CFG->{logview_max_par}, 1177 text => $CFG->{logview_max_par},
1204 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1178 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1205 . "sends more messages than this number, older messages get removed to save memory and " 1179 . "sends more messages than this number, older messages get removed to save memory and "
1206 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1180 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1207 on_changed => sub { 1181 on_changed => sub {
1208 my ($self, $value) = @_; 1182 my ($self, $value) = @_;
1209 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1183 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1210 0 1184 0
1211 }, 1185 },
1212 ); 1186 );
1213 1187
1214 $table 1188 $table
1215} 1189}
1216 1190
1217sub message_window {
1218 my $window = new CFPlus::UI::Toplevel
1219 name => "message_window",
1220 title => "Messages",
1221 border_bg => [1, 1, 1, 1],
1222 x => "max",
1223 y => 0,
1224 force_w => $::WIDTH * 0.4,
1225 force_h => $::HEIGHT * 0.5,
1226 child => (my $vbox = new CFPlus::UI::VBox),
1227 has_close_button => 1;
1228
1229 $vbox->add ($LOGVIEW);
1230
1231 $vbox->add (my $input = new CFPlus::UI::Entry
1232 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1233 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1234 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1235 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1236 on_focus_in => sub {
1237 my ($input, $prev_focus) = @_;
1238
1239 delete $input->{refocus_map};
1240
1241 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1242 $input->{refocus_map} = 1;
1243 }
1244 delete $input->{auto_activated};
1245
1246 0
1247 },
1248 on_activate => sub {
1249 my ($input, $text) = @_;
1250 $input->set_text ('');
1251
1252 if ($text =~ /^\/(.*)/) {
1253 $::CONN->user_send ($1);
1254 } else {
1255 my $say_cmd = $::CFG->{say_command} || 'say';
1256 $::CONN->user_send ("$say_cmd $text");
1257 }
1258 if ($input->{refocus_map}) {
1259 delete $input->{refocus_map};
1260 $MAPWIDGET->focus_in
1261 }
1262
1263 0
1264 },
1265 on_escape => sub {
1266 $MAPWIDGET->grab_focus;
1267
1268 0
1269 },
1270 );
1271
1272 $CONSOLE = {
1273 window => $window,
1274 input => $input,
1275 };
1276
1277 $window
1278}
1279
1280sub autopickup_setup { 1191sub autopickup_setup {
1192 my $r = new CFPlus::UI::ScrolledWindow (
1193 expand => 1,
1194 scroll_y => 1
1195 );
1281 my $table = new CFPlus::UI::Table; 1196 $r->add (my $table = new CFPlus::UI::Table
1197 row_expand => [0],
1198 col_expand => [0, 1, 0, 1],
1199 );
1282 1200
1283 for ( 1201 for (
1284 ["General", 0, 0, 1202 ["General", 0, 0,
1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1203 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1286 ["Inhibit autopickup" => PICKUP_INHIBIT], 1204 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1321 ], 1239 ],
1322 ["Weight/Value ratio", 2, 17] 1240 ["Weight/Value ratio", 2, 17]
1323 ) 1241 )
1324 { 1242 {
1325 my ($title, $x, $y, @bits) = @$_; 1243 my ($title, $x, $y, @bits) = @$_;
1326 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1244 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1327 1245
1328 for (@bits) { 1246 for (@bits) {
1329 ++$y; 1247 ++$y;
1330 1248
1331 my $mask = $_->[1]; 1249 my $mask = $_->[1];
1332 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1250 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1333 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1251 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1334 state => $::CFG->{pickup} & $mask, 1252 state => $::CFG->{pickup} & $mask,
1335 on_changed => sub { 1253 on_changed => sub {
1336 my ($box, $value) = @_; 1254 my ($box, $value) = @_;
1337 1255
1338 if ($value) { 1256 if ($value) {
… …
1349 1267
1350 ${$_->[2]} = $checkbox if $_->[2]; 1268 ${$_->[2]} = $checkbox if $_->[2];
1351 } 1269 }
1352 } 1270 }
1353 1271
1354 $table->add (2, 18, new CFPlus::UI::ValSlider 1272 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1273 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1356 template => ">= 99", 1274 template => ">= 99",
1357 to_value => sub { ">= " . 5 * $_[0] }, 1275 to_value => sub { ">= " . 5 * $_[0] },
1358 on_changed => sub { 1276 on_changed => sub {
1359 my ($slider, $value) = @_; 1277 my ($slider, $value) = @_;
… …
1362 $::CFG->{pickup} |= int $value 1280 $::CFG->{pickup} |= int $value
1363 if $value; 1281 if $value;
1364 1; 1282 1;
1365 }); 1283 });
1366 1284
1367 $table->add (3, 18, new CFPlus::UI::Button 1285 $table->add_at (3, 18, new CFPlus::UI::Button
1368 text => "set", 1286 text => "set",
1369 on_activate => sub { 1287 on_activate => sub {
1370 $::CONN->send_command ("pickup $::CFG->{pickup}") 1288 $::CONN->send_command ("pickup $::CFG->{pickup}")
1371 if defined $::CONN; 1289 if defined $::CONN;
1372 0 1290 0
1373 }); 1291 });
1374 1292
1375 $table 1293 $r
1376} 1294}
1377 1295
1378my %SORT_ORDER = ( 1296my %SORT_ORDER = (
1379 type => undef, 1297 type => undef,
1380 mtime => sub { 1298 mtime => sub {
… …
1461 1379
1462 my $ntb = 1380 my $ntb =
1463 $PL_NOTEBOOK = 1381 $PL_NOTEBOOK =
1464 new CFPlus::UI::Notebook expand => 1; 1382 new CFPlus::UI::Notebook expand => 1;
1465 1383
1466 $ntb->add ( 1384 $ntb->add_tab (
1467 "Statistics (F2)" => $STATS_PAGE = stats_window, 1385 "Statistics (F2)" => $STATS_PAGE = stats_window,
1468 "Shows statistics, where all your Stats and Resistances are shown." 1386 "Shows statistics, where all your Stats and Resistances are shown."
1469 ); 1387 );
1470 $ntb->add ( 1388 $ntb->add_tab (
1471 "Skills (F3)" => $SKILL_PAGE = skill_window, 1389 "Skills (F3)" => $SKILL_PAGE = skill_window,
1472 "Shows all your Skills." 1390 "Shows all your Skills."
1473 ); 1391 );
1474 1392
1475 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1393 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1394 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1477 $ntb->add ( 1395 $ntb->add_tab (
1478 "Spellbook (F4)" => $spellsw, 1396 "Spellbook (F4)" => $spellsw,
1479 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1397 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1480 ); 1398 );
1481 $ntb->add ( 1399 $ntb->add_tab (
1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1400 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1483 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1401 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1402 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1485 ); 1403 );
1486 $ntb->add (Pickup => autopickup_setup, 1404 $ntb->add_tab (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1405 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1488 1406
1489 $ntb->set_current_page ($INVENTORY_PAGE); 1407 $ntb->set_current_page ($INVENTORY_PAGE);
1490 1408
1491 $plwin->add ($ntb); 1409 $plwin->add ($ntb);
… …
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1607 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1608 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1691 1609
1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1610 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1693 1611
1694 $table->add (0, 0, new CFPlus::UI::Button 1612 $table->add_at (0, 0, new CFPlus::UI::Button
1695 text => "Close", 1613 text => "Close",
1696 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1614 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>.",
1697 on_activate => $close, 1615 on_activate => $close,
1698 ); 1616 );
1699 1617
1700 $table->add (2, 0, new CFPlus::UI::Button 1618 $table->add_at (2, 0, new CFPlus::UI::Button
1701 text => "Next", 1619 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.", 1620 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub { 1621 on_activate => sub {
1704 $close->(); 1622 $close->();
1705 &show_tip_of_the_day; 1623 &show_tip_of_the_day;
… …
1714 CFPlus::SDL_Init 1632 CFPlus::SDL_Init
1715 and die "SDL::Init failed!\n"; 1633 and die "SDL::Init failed!\n";
1716} 1634}
1717 1635
1718sub video_init { 1636sub video_init {
1719 sdl_init;
1720
1721 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1637 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1722 1638
1723 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1639 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1724 1640
1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1641 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1726 $FULLSCREEN = $CFG->{fullscreen}; 1642 $FULLSCREEN = $CFG->{fullscreen};
1727 $FAST = $CFG->{fast}; 1643 $FAST = $CFG->{fast};
1728 1644
1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1645 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1646 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1731 1647
1732 $SDL_ACTIVE = 1; 1648 $SDL_ACTIVE = 1;
1733 $LAST_REFRESH = time - 0.01; 1649 $LAST_REFRESH = time - 0.01;
1734 1650
… …
1776 1692
1777 $MAPWIDGET = new CFPlus::MapWidget; 1693 $MAPWIDGET = new CFPlus::MapWidget;
1778 $MAPWIDGET->connect (activate_console => sub { 1694 $MAPWIDGET->connect (activate_console => sub {
1779 my ($mapwidget, $preset) = @_; 1695 my ($mapwidget, $preset) = @_;
1780 1696
1781 if ($CONSOLE) { 1697 $MESSAGE_WINDOW->activate_console ($preset)
1782 $CONSOLE->{input}->{auto_activated} = 1; 1698 if $MESSAGE_WINDOW;
1783 $CONSOLE->{input}->grab_focus;
1784
1785 if ($preset && $CONSOLE->{input}->get_text eq '') {
1786 $CONSOLE->{input}->set_text ($preset);
1787 }
1788 }
1789 }); 1699 });
1790 $MAPWIDGET->show; 1700 $MAPWIDGET->show;
1791 $MAPWIDGET->grab_focus; 1701 $MAPWIDGET->grab_focus;
1792
1793 $LOGVIEW = new CFPlus::UI::TextScroller
1794 expand => 1,
1795 font => $FONT_FIXED,
1796 fontsize => $::CFG->{log_fontsize},
1797 indent => -4,
1798 can_hover => 1,
1799 can_events => 1,
1800 max_par => $CFG->{logview_max_par},
1801 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1802 ;
1803 1702
1804 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1703 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1805 title => "Setup", 1704 title => "Setup",
1806 name => "setup_dialog", 1705 name => "setup_dialog",
1807 x => 'center', 1706 x => 'center',
… …
1811 force_h => $::HEIGHT * 0.6, 1710 force_h => $::HEIGHT * 0.6,
1812 has_close_button => 1, 1711 has_close_button => 1,
1813 ; 1712 ;
1814 1713
1815 $METASERVER = metaserver_dialog; 1714 $METASERVER = metaserver_dialog;
1715 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1816 1716
1817 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1717 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1818 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1718 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1819 1719
1820 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1720 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1821 "Configure the server to play on, your username, password and other server-related options."); 1721 "Configure the server to play on, your username, password and other server-related options.");
1822 $SETUP_NOTEBOOK->add (Client => client_setup, 1722 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1823 "Configure various client-specific settings."); 1723 "Configure various client-specific settings.");
1824 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1724 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1825 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1725 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1826 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1726 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1827 "Configure the use of audio, sound effects and background music."); 1727 "Configure the use of audio, sound effects and background music.");
1828 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1728 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1829 "Lets you define, edit and delete key bindings." 1729 "Lets you define, edit and delete key bindings."
1830 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1730 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1831 . "with nothing set and the recording started. After doing the actions you " 1731 . "with nothing set and the recording started. After doing the actions you "
1832 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1732 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1833 . "After pressing the combo the binding will be saved automatically and the " 1733 . "After pressing the combo the binding will be saved automatically and the "
1834 . "binding editor closes"); 1734 . "binding editor closes");
1835 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1735 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1836 "Some debuggin' options. Do not ask."); 1736 "Some debuggin' options. Do not ask.");
1837 1737
1838 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1738 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1839 1739
1840 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1740 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1841 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1741 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1842 1742
1843 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1743 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1844 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1744 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1845 1745
1846 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 1746 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
1847 1747
1848 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1881 } 1781 }
1882 1782
1883 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1783 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1884} 1784}
1885 1785
1886sub setup_build_button {
1887 my ($enabled) = @_;
1888 if ($enabled) {
1889 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1890 $BUILD_BUTTON ||= new CFPlus::UI::Button
1891 text => "Build",
1892 tooltip => "Opens the ingame builder",
1893 on_activate => sub {
1894 if ($CONN) {
1895 $CONN->send_ext_req (builder_player_items => sub {
1896 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1897 });
1898 }
1899 0
1900 };
1901 $BUTTONBAR->add ($BUILD_BUTTON);
1902 } else {
1903 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1904 }
1905}
1906
1907sub open_ingame_editor {
1908 my ($msg) = @_;
1909
1910 my $win = new CFPlus::UI::Toplevel
1911 x => 0,
1912 y => 'center',
1913 z => 4,
1914 name => 'builder_window',
1915 force_w => int $WIDTH * 1/4,
1916 force_h => int $HEIGHT * 3/4,
1917 title => "In game builder",
1918 has_close_button => 1;
1919
1920 my $r = new CFPlus::UI::ScrolledWindow (
1921 expand => 1,
1922 scroll_y => 1
1923 );
1924 $r->add (my $vb = new CFPlus::UI::VBox);
1925 $win->add ($r);
1926
1927
1928 $vb->add (
1929 new CFPlus::UI::Button
1930 text => "Disable build mode",
1931 on_activate => sub { $::IN_BUILD_MODE = undef }
1932 );
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "ERASE",
1936 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1937 );
1938
1939 for my $itemarchname (
1940 sort {
1941 $msg->{items}->{$a}->{build_arch_name}
1942 cmp $msg->{items}->{$b}->{build_arch_name}
1943 } keys %{$msg->{items}}
1944 ) {
1945 my $info = $msg->{items}->{$itemarchname};
1946 $vb->add (
1947 new CFPlus::UI::Button text => $info->{build_arch_name},
1948 on_activate => sub {
1949 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1950
1951 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1952 build_mode_query_arch_info ();
1953 }
1954 }
1955 );
1956 }
1957
1958 $win->show;
1959}
1960
1961sub build_mode_query_arch_info {
1962 my ($iteminfo) = $::IN_BUILD_MODE;
1963 my $itemarchname = $iteminfo->{item};
1964 my $info = $iteminfo->{info};
1965
1966 my $dialog = new CFPlus::UI::Toplevel
1967 x => "center",
1968 y => "center",
1969 z => 50,
1970 force_w => int $WIDTH * 1/2,
1971 title => "Enter information for placement of '$itemarchname'",
1972 has_close_button => 1;
1973
1974 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1975
1976 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1977 my $row = 0;
1978 if ($info->{has_name}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1981 }
1982 if ($info->{has_text}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1985 }
1986 if ($info->{has_connection}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1988 $table->add (1, $row++,
1989 new CFPlus::UI::Entry
1990 expand => 1,
1991 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1992 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1993 );
1994 }
1995
1996 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1997 $hb->add (new CFPlus::UI::Button
1998 text => "Close",
1999 expand => 1,
2000 on_activate => sub { $dialog->hide; 0 },
2001 );
2002 $dialog->show;
2003}
2004
2005sub video_shutdown { 1786sub video_shutdown {
2006 CFPlus::OpenGL::shutdown; 1787 CFPlus::OpenGL::shutdown;
2007 1788
2008 undef $SDL_ACTIVE; 1789 undef $SDL_ACTIVE;
2009} 1790}
2010 1791
2011sub audio_channel_finished { 1792sub audio_channel_finished {
2012 my ($channel) = @_; 1793 my ($channel) = @_;
2013 1794
2014 #warn "channel $channel finished\n";#d# 1795# warn "channel $channel finished\n";#d#
1796}
1797
1798our %AUDIO_PLAY;
1799our %AUDIO_CHUNK;
1800
1801sub audio_sound_push($) {
1802 my ($face) = @_;
1803
1804 if (my $chunk = $AUDIO_CHUNK{$face}) {
1805 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1806 my (undef, $dx, $dy, $vol) = @$_;
1807
1808 my $channel = $chunk->play
1809 or return;
1810
1811 $channel->volume (128 + $vol);
1812 $dx = $dx / 10 * 255;
1813 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1814# my $angle = $dx ? : $dx < 0 ?
1815# my $distance = -$vol;
1816# $channel->set_position ($angle, $distance);
1817 }
1818 } else {
1819 # sound_meta not set means data is in flight either way
1820 my $meta = $CONN->{sound_meta}{$face}
1821 or return;
1822
1823 # fetch from database
1824 CFPlus::DB::get res_data => $meta->{name}, sub {
1825 my $vol = $meta->{meta}{volume} || 100;
1826 my $rwops = new CFPlus::RW $_[0];
1827 my $chunk = new CFPlus::MixChunk $rwops;
1828 $chunk->volume ($vol * 128 / 100);
1829 $AUDIO_CHUNK{$face} = $chunk;
1830
1831 audio_sound_push ($face);
1832 };
1833 }
1834}
1835
1836sub audio_sound_play {
1837 my ($face, $dx, $dy, $vol) = @_;
1838
1839 $SDL_MIXER
1840 or return;
1841
1842 my $queue = $AUDIO_PLAY{$face} ||= [];
1843 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1844 audio_sound_push $face
1845 unless @$queue > 1;
2015} 1846}
2016 1847
2017sub audio_music_set { 1848sub audio_music_set {
2018 my ($songs) = @_; 1849 my ($songs) = @_;
2019 1850
2020 my $count = @$songs; 1851 my @want =
2021 my @meta; 1852 grep $_,
1853 map $CONN->{music_meta}{$_},
1854 @$songs;
2022 1855
2023 for my $name (@$songs) { 1856 if (@want) {
2024 CFPlus::DB::get resmap => $name, sub {
2025 my ($data) = @_;
2026
2027 if ($data) {
2028 $data = JSON::XS->new->utf8->decode ($data);
2029 $data->{path} = CFPlus::DB::path_of $name;
2030 push @meta, $data;
2031 }
2032
2033 unless (--$count) {
2034 if (@meta) {
2035 @MUSIC_WANT = @meta; 1857 @MUSIC_WANT = @want;
2036 &audio_music_changed (); 1858 &audio_music_changed ();
2037 } 1859 }
2038 } 1860}
1861
1862sub audio_music_start {
1863 my $meta = $MUSIC_PLAYING_META;
1864
1865 CFPlus::DB::get res_data => $meta->{name}, sub {
1866 return unless $SDL_MIXER;
1867
1868 # music might have changed...
1869 $meta eq $MUSIC_PLAYING_META
1870 or return &audio_music_start ();
1871
1872 $MUSIC_PLAYING_DATA = \$_[0];
1873
1874 my $rwops = $meta->{path}
1875 ? new_from_file CFPlus::RW $meta->{path}
1876 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1877
1878 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1879 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1880
1881 my $NOW = time;
1882
1883 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1884 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1885 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1886 $MUSIC_START = time - $pos;
1887 } else {
1888 $MUSIC_PLAYER->play (0);
1889 $MUSIC_START = time;
2039 }; 1890 }
1891
1892 delete $MUSIC_PLAYING_META->{stop_time};
1893 delete $MUSIC_PLAYING_META->{stop_pos};
2040 } 1894 }
2041} 1895}
2042 1896
2043sub audio_music_changed { 1897sub audio_music_changed {
2044 return unless $CFG->{bgm_enable}; 1898 return unless $CFG->{bgm_enable};
1899 return unless $SDL_MIXER;
2045 1900
2046 # default MUSIC_WANT == MUSIC_DEFAULT 1901 # default MUSIC_WANT == MUSIC_DEFAULT
2047 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT; 1902 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2048 1903
2049 # if the currently playing song is acceptable, let it continue 1904 # if the currently playing song is acceptable, let it continue
2050 return if $MUSIC_PLAYING 1905 return if $MUSIC_PLAYING_META
2051 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT; 1906 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
2052 1907
1908 my $NOW = time;
1909
2053 if ($MUSIC_PLAYING) { 1910 if ($MUSIC_PLAYING_META) {
1911 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1912 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
2054 CFPlus::MixMusic::fade_out 1000; 1913 CFPlus::MixMusic::fade_out 1000;
2055 } else { 1914 } else {
2056 my $music = $MUSIC_WANT [rand @MUSIC_WANT]; 1915 # sort by stop time, oldest first
1916 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2057 1917
1918 # if the most recently-played piece played very recently,
1919 # resume it, else choose the oldest piece for rotation.
2058 $MUSIC_PLAYING = $music; 1920 $MUSIC_PLAYING_META =
1921 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1922 ? $MUSIC_WANT[-1]
1923 : $MUSIC_WANT[0];
2059 1924
2060 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path}; 1925 audio_music_start;
2061 $MUSIC_PLAYER->play (0);
2062 } 1926 }
2063} 1927}
2064 1928
2065sub audio_music_finished { 1929sub audio_music_finished {
2066 $MUSIC_PLAYING = undef;
2067 undef $MUSIC_PLAYER; 1930 undef $MUSIC_PLAYER;
1931 undef $MUSIC_PLAYING_META;
1932 undef $MUSIC_PLAYING_DATA;
2068 1933
2069 audio_music_changed; 1934 audio_music_changed;
2070} 1935}
2071 1936
2072sub audio_init { 1937sub audio_init {
2073 if ($CFG->{audio_enable}) { 1938 if ($CFG->{audio_enable}) {
2074 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1939 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2075 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1940 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2076 1941
2077 unless ($SDL_MIXER) { 1942 unless ($SDL_MIXER) {
2078 status "Unable to open sound device: there will be no sound"; 1943 status "Unable to open sound device: there will be no sound";
2079 return; 1944 return;
2080 }
2081
2082 CFPlus::Mix_AllocateChannels 8;
2083 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2084
2085 audio_music_finished;
2086
2087 local $_;
2088 while (<$fh>) {
2089 next if /^\s*#/;
2090 next if /^\s*$/;
2091
2092 my ($file, $volume, $event) = split /\s+/, $_, 3;
2093
2094 push @SOUNDS, "$volume,$file";
2095
2096 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2097 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2098 $chunk->volume ($volume * 128 / 100);
2099 $chunk
2100 };
2101 }
2102 } else {
2103 status "unable to open sound config: $!";
2104 } 1945 }
1946
1947 CFPlus::Mix_AllocateChannels 16;
1948 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1949
1950 audio_music_finished;
1951 } else {
1952 undef $SDL_MIXER;
2105 } 1953 }
2106} 1954}
2107 1955
2108sub audio_shutdown { 1956sub audio_shutdown {
2109 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1957 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
2124 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1972 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2125 1973
2126 $CFPlus::UI::ROOT->draw; 1974 $CFPlus::UI::ROOT->draw;
2127 1975
2128 $WANT_REFRESH = 0; 1976 $WANT_REFRESH = 0;
2129 $CAN_REFRESH = 0; 1977 $CAN_REFRESH = 0;
2130 $LAST_REFRESH = $NOW; 1978 $LAST_REFRESH = $NOW;
2131 1979
2132 CFPlus::SDL_GL_SwapBuffers; 1980 CFPlus::SDL_GL_SwapBuffers;
2133} 1981}
2134 1982
2135my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1983my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2136 $NOW = time; 1984 $NOW = time;
2137 1985
2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1986 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2139 for CFPlus::SDL_PollEvent; 1987 for CFPlus::poll_events;
2140 1988
2141 if (%animate_object) { 1989 if (%animate_object) {
2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1990 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2143 $WANT_REFRESH++; 1991 ++$WANT_REFRESH;
2144 } 1992 }
2145 1993
2146 if ($WANT_REFRESH) { 1994 if ($WANT_REFRESH) {
2147 force_refresh; 1995 force_refresh;
2148 } else { 1996 } else {
… …
2157 2005
2158sub animation_stop { 2006sub animation_stop {
2159 my ($widget) = @_; 2007 my ($widget) = @_;
2160 delete $animate_object{$widget}; 2008 delete $animate_object{$widget};
2161} 2009}
2162
2163# check once/second for faces that need to be prefetched
2164# this should, of course, only run on demand, but
2165# SDL forces worse things on us....
2166
2167Event->timer (after => 1, interval => 0.25, cb => sub {
2168 $CONN->face_prefetch
2169 if $CONN;
2170});
2171 2010
2172%SDL_CB = ( 2011%SDL_CB = (
2173 CFPlus::SDL_QUIT => sub { 2012 CFPlus::SDL_QUIT => sub {
2174 exit; 2013 exit;
2175 }, 2014 },
… …
2178 CFPlus::SDL_VIDEOEXPOSE => sub { 2017 CFPlus::SDL_VIDEOEXPOSE => sub {
2179 CFPlus::UI::full_refresh; 2018 CFPlus::UI::full_refresh;
2180 }, 2019 },
2181 CFPlus::SDL_ACTIVEEVENT => sub { 2020 CFPlus::SDL_ACTIVEEVENT => sub {
2182# not useful, as APPACTIVE include sonly iconified state, not unmapped 2021# not useful, as APPACTIVE include sonly iconified state, not unmapped
2183# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2022# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2023# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2184# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2024# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2185# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2025# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2186# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2026# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2187 }, 2027 },
2188 CFPlus::SDL_KEYDOWN => sub { 2028 CFPlus::SDL_KEYDOWN => sub {
… …
2224 height => 480, 2064 height => 480,
2225 fullscreen => 0, 2065 fullscreen => 0,
2226 fast => 0, 2066 fast => 0,
2227 map_scale => 1, 2067 map_scale => 1,
2228 fow_enable => 1, 2068 fow_enable => 1,
2229 fow_intensity => 0.45, 2069 fow_intensity => 0,
2230 fow_smooth => 0,
2231 map_smoothing => 1, 2070 map_smoothing => 1,
2232 gui_fontsize => 1, 2071 gui_fontsize => 1,
2233 log_fontsize => 0.7, 2072 log_fontsize => 0.7,
2234 gauge_fontsize => 1, 2073 gauge_fontsize => 1,
2235 gauge_size => 0.35, 2074 gauge_size => 0.35,
2236 stat_fontsize => 0.7, 2075 stat_fontsize => 0.7,
2237 mapsize => 100, 2076 mapsize => 100,
2238 say_command => 'chat',
2239 audio_enable => 1, 2077 audio_enable => 1,
2240 bgm_enable => 1, 2078 bgm_enable => 1,
2241 bgm_volume => 0.25, 2079 bgm_volume => 0.25,
2242 face_prefetch => 0,
2243 output_sync => 1, 2080 output_sync => 1,
2244 output_count => 1, 2081 output_count => 1,
2245 output_rate => "", 2082 output_rate => "",
2246 pickup => 0, 2083 pickup => 0,
2247 inv_sort => "mtime", 2084 inv_sort => "mtime",
… …
2269 } 2106 }
2270 } 2107 }
2271 2108
2272 sdl_init; 2109 sdl_init;
2273 2110
2274 @SDL_MODES = reverse 2111 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2275 grep $_->[0] >= 640 && $_->[1] >= 480, 2112 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2276 CFPlus::SDL_ListModes;
2277
2278 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2113 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2114
2115 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2279 2116
2280 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2117 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2281 2118
2282 { 2119 {
2283 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2120 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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