ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.182 by elmex, Sat Jul 21 20:30:41 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
63use CFPlus::DB; 85use CFPlus::DB;
64use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 88use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 89use CFPlus::UI::SpellList;
90use CFPlus::UI::MessageWindow;
67use CFPlus::Pod; 91use CFPlus::Pod;
68use CFPlus::MapWidget; 92use CFPlus::MapWidget;
69use CFPlus::Macro; 93use CFPlus::Macro;
70 94
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 95$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
103 127
104our $MAP; 128our $MAP;
105our $MAPMAP; 129our $MAPMAP;
106our $MAPWIDGET; 130our $MAPWIDGET;
107our $BUTTONBAR; 131our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 132our $METASERVER;
111our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 134our $QUIT_DIALOG;
113our $HOST_ENTRY; 135our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
137 159
138our $SDL_ACTIVE; 160our $SDL_ACTIVE;
139our %SDL_CB; 161our %SDL_CB;
140 162
141our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
142our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
144 172
145our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 174our $STATUSBOX;
… …
163 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
164} 192}
165 193
166sub message { 194sub message {
167 my ($para) = @_; 195 my ($para) = @_;
168 196 $MESSAGE_WINDOW->message ($para);
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
175} 197}
176 198
177sub destroy_query_dialog { 199sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
… …
207 title => "Server Query", 229 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
209 ; 231 ;
210 232
211 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 235 ellipsise => 0,
214 text => $prompt; 236 text => $prompt;
215 237
216 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 256 );
235 257
236 $dialog->grab_focus; 258 $dialog->grab_focus;
237 259
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } elsif ($flags & CS_QUERY_SINGLECHAR) {
239 $dialog->{tooltip} = "#charcreation_focus";
240
241 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
243 263
244 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 266 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
248 268
249 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
250 270
251 $table->add (0, 0, new CFPlus::UI::Button 271 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 272 text => "Next Race",
253 on_activate => sub { 273 on_activate => sub {
254 $conn->send ("reply n"); 274 $conn->send ("reply n");
255 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
256 0 276 0
257 }, 277 },
258 ); 278 );
259 $table->add (2, 0, new CFPlus::UI::Button 279 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 280 text => "Accept",
261 on_activate => sub { 281 on_activate => sub {
262 $conn->send ("reply d"); 282 $conn->send ("reply d");
263 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
264 0 284 0
265 }, 285 },
266 ); 286 );
267 287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
310
268 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 313 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 315 ;
… …
276 $conn->send ("reply $stat"); 319 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 320 destroy_query_dialog $conn;
278 return; 321 return;
279 } 322 }
280 323
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 324 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 325 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 326 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 327 markup => "\nOr use your keyboard and the text entry below:\n";
288 328
289 unshift @dialog, my $table = new CFPlus::UI::Table; 329 unshift @dialog, my $table = new CFPlus::UI::Table;
290 330
291 # left: re-roll 331 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 332 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 333 text => "Roll Again",
294 on_activate => sub { 334 on_activate => sub {
295 $conn->send ("reply y"); 335 $conn->send ("reply y");
296 destroy_query_dialog $conn; 336 destroy_query_dialog $conn;
297 0 337 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 351 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 352 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 353 ],
314 ), 1 .. 2; 354 ), 1 .. 2;
315 355
316 $table->add (2, 0, new CFPlus::UI::Button 356 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 357 text => "Swap Stats",
318 on_activate => sub { 358 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 359 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 360 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 361 destroy_query_dialog $conn;
322 0 362 0
323 }, 363 },
324 ); 364 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 365 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 366
327 # right: accept 367 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 368 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 369 text => "Accept",
330 on_activate => sub { 370 on_activate => sub {
331 $conn->send ("reply n"); 371 $conn->send ("reply n");
332 $STATS_PAGE->hide; 372 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 373 destroy_query_dialog $conn;
… …
414 maph => $mapsize, 454 maph => $mapsize,
415 455
416 client => "cfplus $CFPlus::VERSION $] $^O", 456 client => "cfplus $CFPlus::VERSION $] $^O",
417 457
418 map_widget => $MAPWIDGET, 458 map_widget => $MAPWIDGET,
419 logview => $LOGVIEW,
420 statusbox => $STATUSBOX, 459 statusbox => $STATUSBOX,
421 map => $MAP, 460 map => $MAP,
422 mapmap => $MAPMAP, 461 mapmap => $MAPMAP,
423 query => \&server_query, 462 query => \&server_query,
424 463
… …
453 $LOGIN_BUTTON->set_text ("Login"); 492 $LOGIN_BUTTON->set_text ("Login");
454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 493 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455 $SETUP_DIALOG->show; 494 $SETUP_DIALOG->show;
456 $PL_WINDOW->hide; 495 $PL_WINDOW->hide;
457 $SPELL_LIST->clear_spells; 496 $SPELL_LIST->clear_spells;
497 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
498
499 &audio_music_set ([]);
458 500
459 return unless $CONN; 501 return unless $CONN;
460 502
461 status "connection closed"; 503 status "connection closed";
462 504
… …
472 514
473 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
474 516
475 my $row = 0; 517 my $row = 0;
476 518
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 519 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
478 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 520 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
479 can_events => 1, 521 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481 523
524 my $vidmode_tooltip =
525 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
526 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
527
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 528 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 529 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484 530
531 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
485 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 532 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
486 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 533 tooltip => $vidmode_tooltip);
534 $hbox->add (my $mode_label = new CFPlus::UI::Label
535 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
536 can_events => 1, tooltip => $vidmode_tooltip);
487 537
488 $mode_slider->connect (changed => sub { 538 $mode_slider->connect (changed => sub {
489 my ($self, $value) = @_; 539 my ($self, $value) = @_;
490 540
491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 541 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 542 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493 }); 543 });
494 $mode_slider->emit (changed => $mode_slider->{range}[0]); 544 $mode_slider->emit (changed => $mode_slider->{range}[0]);
495 545
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 546 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 547 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498 state => $CFG->{fullscreen}, 548 state => $CFG->{fullscreen},
499 tooltip => "Bring the client into fullscreen mode.", 549 tooltip => "Bring the client into fullscreen mode.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 550 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501 ); 551 );
502 552
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 553 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox 554 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fast}, 555 state => $CFG->{fast},
506 tooltip => "Lower the visual quality considerably to speed up rendering.", 556 tooltip => "Lower the visual quality considerably to speed up rendering.",
507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508 ); 558 );
509 559
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511 $table->add (1, $row++, new CFPlus::UI::Slider 561 $table->add_at (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 562 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 563 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 564 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 ); 565 );
516 566
517 $table->add (1, $row++, new CFPlus::UI::Button 567 $table->add_at (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply", 568 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.", 569 tooltip => "Apply the video settings above.",
520 on_activate => sub { 570 on_activate => sub {
521 video_shutdown (); 571 video_shutdown ();
522 video_init (); 572 video_init ();
523 0 573 0
524 } 574 }
525 ); 575 );
526 576
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 577 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
528 $table->add (1, $row++, new CFPlus::UI::Slider 578 $table->add_at (1, $row++, new CFPlus::UI::Slider
529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 579 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 580 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 581 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532 ); 582 );
533 583
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
535 $table->add (1, $row++, new CFPlus::UI::CheckBox 585 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing}, 586 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 587 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538 . "This increases load on the graphics subsystem and works only with 2.x servers. " 588 . "This increases load on the graphics subsystem and works only with 2.x servers. "
539 . "Changes take effect at next connection only.", 589 . "Changes take effect at next connection only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 590 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541 ); 591 );
542 592
543 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 593 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
544 $table->add (1, $row++, new CFPlus::UI::CheckBox 594 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
545 state => $CFG->{fow_enable}, 595 state => $CFG->{fow_enable},
546 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 596 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548 ); 598 );
549 599
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 600 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
551 $table->add (1, $row++, new CFPlus::UI::Slider 601 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 602 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
553 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 603 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555 ); 605 );
556 606
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{fow_smooth},
560 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
561 on_changed => sub {
562 my ($self, $value) = @_;
563 $CFG->{fow_smooth} = $value;
564 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
565 0
566 }
567 );
568
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 607 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
570 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 609 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
572 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 610 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 611 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574 ); 612 );
575 613
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 614 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
577 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
579 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 617 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
580 on_changed => sub { 618 on_changed => sub {
581 $CFG->{gauge_fontsize} = $_[1]; 619 $CFG->{gauge_fontsize} = $_[1];
582 &set_gauge_window_fontsize; 620 &set_gauge_window_fontsize;
583 0 621 0
584 } 622 }
585 ); 623 );
586 624
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 625 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
588 $table->add (1, $row++, new CFPlus::UI::Slider 626 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [$CFG->{gauge_size}, 0.2, 0.8], 627 range => [$CFG->{gauge_size}, 0.2, 0.8],
590 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 628 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
591 on_changed => sub { 629 on_changed => sub {
592 $CFG->{gauge_size} = $_[1]; 630 $CFG->{gauge_size} = $_[1];
593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 631 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
603 641
604 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 642 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
605 643
606 my $row = 0; 644 my $row = 0;
607 645
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 646 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
609 $table->add (1, $row++, new CFPlus::UI::CheckBox 647 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
610 state => $CFG->{audio_enable}, 648 state => $CFG->{audio_enable},
611 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 649 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
612 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 650 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
613 ); 651 );
614# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 652# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
615# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 653# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
616# $CFG->{effects_volume} = $_[1]; 654# $CFG->{effects_volume} = $_[1];
617# }); 655# });
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 656 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
619 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 657 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
620 $hbox->add (new CFPlus::UI::CheckBox 658 $hbox->add (new CFPlus::UI::CheckBox
621 expand => 1, state => $CFG->{bgm_enable}, 659 expand => 1, state => $CFG->{bgm_enable},
622 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 660 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
623 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 661 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
624 ); 662 );
… …
626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 664 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627 tooltip => "The volume of the background music. Changes are instant.", 665 tooltip => "The volume of the background music. Changes are instant.",
628 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 666 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
629 ); 667 );
630 668
631 $table->add (1, $row++, new CFPlus::UI::Button 669 $table->add_at (1, $row++, new CFPlus::UI::Button
632 expand => 1, align => 0, text => "Apply", 670 expand => 1, align => 0, text => "Apply",
633 tooltip => "Apply the audio settings", 671 tooltip => "Apply the audio settings",
634 on_activate => sub { 672 on_activate => sub {
635 audio_shutdown (); 673 audio_shutdown ();
636 audio_init (); 674 audio_init ();
… …
695} 733}
696 734
697sub debug_setup { 735sub debug_setup {
698 my $table = new CFPlus::UI::Table; 736 my $table = new CFPlus::UI::Table;
699 737
700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 738 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
701 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 739 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
702 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 740 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
703 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 741 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
704 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 742 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
705 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 743 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
706 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 744 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
707 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 745 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
708 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 746 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
709 747
710 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
711
712 for my $x (0..2) {
713 for my $y (0 .. 2) {
714 $table->add ($x + 3, $y,
715 new CFPlus::UI::Entry
716 text => $default_smooth[$x * 3 + $y],
717 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
718 );
719 }
720 }
721
722 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 748 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
749
750 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
751 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
752 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
753 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
754 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
755 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
756
757 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
758
759 $c->add_items ({
760 type => "line_loop",
761 color => [0, 1, 0],
762 width => 9,
763 coord_mode => "abs",
764 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
765 });
766
767 $c->add_items ({
768 type => "lines",
769 color => [1, 1, 0],
770 width => 2,
771 coord_mode => "rel",
772 coord => [[0,0], [1,1], [1,0], [0,1]],
773 });
774
775 $c->add_items ({
776 type => "polygon",
777 color => [0, 0.43, 0],
778 width => 2,
779 coord_mode => "rel",
780 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
781 });
723 782
724 $table 783 $table
725} 784}
726 785
727sub stats_window { 786sub stats_window {
… …
775 [2, 4, st_spd => "Spd", 10.54], 834 [2, 4, st_spd => "Spd", 10.54],
776 [2, 5, st_wspd => "WSp", 10.54], 835 [2, 5, st_wspd => "WSp", 10.54],
777 ) { 836 ) {
778 my ($col, $row, $id, $label, $template) = @$_; 837 my ($col, $row, $id, $label, $template) = @$_;
779 838
780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 839 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 840 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782 align => +1, template => $template, tooltip => "#stat_$label"); 841 align => +1, template => $template, tooltip => "#stat_$label");
783 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 842 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
784 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 843 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785 align => -1, text => $label, tooltip => "#stat_$label"); 844 align => -1, text => $label, tooltip => "#stat_$label");
786 } 845 }
787 846
788 $vb->add (new CFPlus::UI::FancyFrame 847 $vb->add (new CFPlus::UI::FancyFrame
… …
829 cold => ["Cold", 888 cold => ["Cold",
830 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 889 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831 ghit => ["Ghost hit", 890 ghit => ["Ghost hit",
832 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 891 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833 ); 892 );
893
834 for (qw/slow holyw conf fire depl magic 894 for (qw/slow holyw conf fire depl magic
835 drain acid pois para deat phys 895 drain acid pois para deat phys
836 blind fear tund elec cold ghit/) 896 blind fear tund elec cold ghit/)
837 { 897 {
838 $tbl2->add ($col, $row, 898 $tbl2->add_at ($col, $row,
839 $STATWIDS->{"res_$_"} = 899 $STATWIDS->{"res_$_"} =
840 new CFPlus::UI::Label 900 new CFPlus::UI::Label
841 font => $FONT_FIXED, 901 font => $FONT_FIXED,
842 template => "-100%", 902 template => "-100%",
843 align => +1, 903 align => +1,
844 valign => 0, 904 valign => 0,
845 can_events => 1, 905 can_events => 1,
846 can_hover => 1, 906 can_hover => 1,
847 tooltip => $resist_names{$_}->[1], 907 tooltip => $resist_names{$_}->[1],
848 ); 908 );
849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 909 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850 font => $FONT_FIXED, 910 font => $FONT_FIXED,
851 can_hover => 1, 911 can_hover => 1,
852 can_events => 1, 912 can_events => 1,
853 path => "ui/resist/resist_$_.png", 913 path => "ui/resist/resist_$_.png",
854 tooltip => $resist_names{$_}->[1], 914 tooltip => $resist_names{$_}->[1],
855 ); 915 );
856 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 916 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857 text => $resist_names{$_}->[0], 917 text => $resist_names{$_}->[0],
858 font => $FONT_FIXED, 918 font => $FONT_FIXED,
859 can_hover => 1, 919 can_hover => 1,
860 can_events => 1, 920 can_events => 1,
861 tooltip => $resist_names{$_}->[1], 921 tooltip => $resist_names{$_}->[1],
… …
894 return if $METASERVER_ATIME > time; 954 return if $METASERVER_ATIME > time;
895 $METASERVER_ATIME = time + 60; 955 $METASERVER_ATIME = time + 60;
896 956
897 my $table = $METASERVER->{table}; 957 my $table = $METASERVER->{table};
898 $table->clear; 958 $table->clear;
899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 959 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900 960
901 my $ok = 0; 961 my $ok = 0;
902 962
903 CFPlus::background { 963 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent; 964 my $ua = CFPlus::lwp_useragent;
… …
915 "The time this server has been running without being restarted.", 975 "The time this server has been running without being restarted.",
916 "The server software version - a '+' indicates a Crossfire+ server.", 976 "The server software version - a '+' indicates a Crossfire+ server.",
917 "Short information about this server provided by its admins.", 977 "Short information about this server provided by its admins.",
918 ); 978 );
919 my @col = qw(#Users Host Uptime Version Description); 979 my @col = qw(#Users Host Uptime Version Description);
920 $table->add ($_, 0, new CFPlus::UI::Label 980 $table->add_at ($_, 0, new CFPlus::UI::Label
921 can_hover => 1, can_events => 1, 981 can_hover => 1, can_events => 1,
922 align => 0, fg => [1, 1, 0], 982 align => 0, fg => [1, 1, 0],
923 text => $col[$_], tooltip => $tip[$_]) 983 text => $col[$_], tooltip => $tip[$_])
924 for 0 .. $#col; 984 for 0 .. $#col;
925 985
… …
947 1007
948 $m = [$users, $host, $uptime, $version, $desc]; 1008 $m = [$users, $host, $uptime, $version, $desc];
949 1009
950 $y++; 1010 $y++;
951 1011
952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1012 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953 (new CFPlus::UI::Button 1013 (new CFPlus::UI::Button
954 text => "Use", 1014 text => "Use",
955 tooltip => "Put this server into the <b>Host:Port</b> field", 1015 tooltip => "Put this server into the <b>Host:Port</b> field",
956 on_activate => sub { 1016 on_activate => sub {
957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1017 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
960 }, 1020 },
961 ), 1021 ),
962 (new CFPlus::UI::Empty expand => 1), 1022 (new CFPlus::UI::Empty expand => 1),
963 ]); 1023 ]);
964 1024
965 $table->add ($_, $y, new CFPlus::UI::Label 1025 $table->add_at ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4, 1026 max_w => $::WIDTH * 0.4,
967 ellipsise => 0, 1027 ellipsise => 0,
968 align => $align[$_], 1028 align => $align[$_],
969 text => $m->[$_], 1029 text => $m->[$_],
970 tooltip => $tip[$_], 1030 tooltip => $tip[$_],
… …
1011 1071
1012 $vbox->add (new CFPlus::UI::FancyFrame 1072 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings", 1073 label => "Connection Settings",
1014 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1074 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015 ); 1075 );
1016 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1076 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017 1077
1018 { 1078 {
1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1079 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020 1080
1021 $vbox->add ( 1081 $vbox->add (
1022 $HOST_ENTRY = new CFPlus::UI::Entry 1082 $HOST_ENTRY = new CFPlus::UI::Entry
1023 expand => 1, 1083 expand => 1,
1024 text => $CFG->{profile}{default}{host}, 1084 text => $CFG->{profile}{default}{host},
… …
1038 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1098 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1099 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1040 ); 1100 );
1041 } 1101 }
1042 1102
1043 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1103 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044 $table->add (1, 4, new CFPlus::UI::Entry 1104 $table->add_at (1, 4, new CFPlus::UI::Entry
1045 text => $CFG->{profile}{default}{user}, 1105 text => $CFG->{profile}{default}{user},
1046 tooltip => "The name of your character on the server", 1106 tooltip => "The name of your character on the server",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1048 ); 1108 );
1049 1109
1050 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1110 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051 $table->add (1, 5, new CFPlus::UI::Entry 1111 $table->add_at (1, 5, new CFPlus::UI::Entry
1052 text => $CFG->{profile}{default}{password}, 1112 text => $CFG->{profile}{default}{password},
1053 hidden => 1, 1113 hidden => 1,
1054 tooltip => "The password for your character", 1114 tooltip => "The password for your character",
1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1056 ); 1116 );
1057 1117
1058 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1118 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1059 $table->add (1, 7, new CFPlus::UI::Slider 1119 $table->add_at (1, 7, new CFPlus::UI::Slider
1060 force_w => 100, 1120 force_w => 100,
1061 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1121 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062 tooltip => "This is the size of the portion of the map update the server sends you. " 1122 tooltip => "This is the size of the portion of the map update the server sends you. "
1063 . "If you set this to a high value you will be able to see further, " 1123 . "If you set this to a high value you will be able to see further, "
1064 . "but you also increase bandwidth requirements and latency. " 1124 . "but you also increase bandwidth requirements and latency. "
1065 . "This option is only used once at log-in.", 1125 . "This option is only used once at log-in.",
1066 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1126 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1067 ); 1127 );
1068 1128
1069 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1129 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1070 $table->add (1, 8, new CFPlus::UI::CheckBox 1130 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1071 state => $CFG->{face_prefetch}, 1131 state => $CFG->{face_prefetch},
1072 tooltip => "<b>Background Image Prefetch</b>\n\n" 1132 tooltip => "<b>Background Image Prefetch</b>\n\n"
1073 . "If enabled, the client automatically pre-fetches images from the server. " 1133 . "If enabled, the client automatically pre-fetches images from the server. "
1074 . "This might increase or create lag, but increases the chances " 1134 . "This might increase or create lag, but increases the chances "
1075 . "of faces being ready for display when you encounter them. " 1135 . "of faces being ready for display when you encounter them. "
… …
1077 . "so only set it if you really need to prefetch images. " 1137 . "so only set it if you really need to prefetch images. "
1078 . "This option can be set and unset any time.", 1138 . "This option can be set and unset any time.",
1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080 ); 1140 );
1081 1141
1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1142 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1083 $table->add (1, 9, new CFPlus::UI::Entry 1143 $table->add_at (1, 9, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate}, 1144 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1086 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1146 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.", 1147 . "default will be used, which is usually around 100kb/s.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1089 ); 1149 );
1090 1150
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1151 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092 $table->add (1, 10, new CFPlus::UI::Entry 1152 $table->add_at (1, 10, new CFPlus::UI::Entry
1093 text => $CFG->{output_count}, 1153 text => $CFG->{output_count},
1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1154 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1155 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1096 ); 1156 );
1097 1157
1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1158 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099 $table->add (1, 11, new CFPlus::UI::Entry 1159 $table->add_at (1, 11, new CFPlus::UI::Entry
1100 text => $CFG->{output_sync}, 1160 text => $CFG->{output_sync},
1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1161 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1162 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1103 ); 1163 );
1104 1164
1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1165 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1106 expand => 1, 1166 expand => 1,
1107 align => 0, 1167 align => 0,
1108 text => "Login", 1168 text => "Login",
1109 on_activate => sub { 1169 on_activate => sub {
1110 $CONN ? stop_game 1170 $CONN ? stop_game
… …
1124sub client_setup { 1184sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126 1186
1127 my $row = 0; 1187 my $row = 0;
1128 1188
1129 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1189 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1190 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131 text => $CFG->{say_command}, 1191 text => $CFG->{say_command},
1132 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1192 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1133 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1193 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1134 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1194 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135 on_changed => sub { 1195 on_changed => sub {
… …
1137 $CFG->{say_command} = $value; 1197 $CFG->{say_command} = $value;
1138 0 1198 0
1139 } 1199 }
1140 ); 1200 );
1141 1201
1142 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1202 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1143 $table->add (1, $row++, new CFPlus::UI::CheckBox 1203 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144 state => $CFG->{show_tips}, 1204 state => $CFG->{show_tips},
1145 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1205 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146 on_changed => sub { 1206 on_changed => sub {
1147 my ($self, $value) = @_; 1207 my ($self, $value) = @_;
1148 $CFG->{show_tips} = $value; 1208 $CFG->{show_tips} = $value;
1149 0 1209 0
1150 } 1210 }
1151 ); 1211 );
1152 1212
1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1213 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1154 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1214 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155 text => $CFG->{logview_max_par}, 1215 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1216 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157 . "sends more messages than this number, older messages get removed to save memory and " 1217 . "sends more messages than this number, older messages get removed to save memory and "
1158 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1218 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub { 1219 on_changed => sub {
1160 my ($self, $value) = @_; 1220 my ($self, $value) = @_;
1161 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1221 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1162 0 1222 0
1163 }, 1223 },
1164 ); 1224 );
1165 1225
1166 $table 1226 $table
1167} 1227}
1168 1228
1169sub message_window {
1170 my $window = new CFPlus::UI::Toplevel
1171 name => "message_window",
1172 title => "Messages",
1173 border_bg => [1, 1, 1, 1],
1174 x => "max",
1175 y => 0,
1176 force_w => $::WIDTH * 0.4,
1177 force_h => $::HEIGHT * 0.5,
1178 child => (my $vbox = new CFPlus::UI::VBox),
1179 has_close_button => 1;
1180
1181 $vbox->add ($LOGVIEW);
1182
1183 $vbox->add (my $input = new CFPlus::UI::Entry
1184 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1185 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1186 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1187 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1188 on_focus_in => sub {
1189 my ($input, $prev_focus) = @_;
1190
1191 delete $input->{refocus_map};
1192
1193 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1194 $input->{refocus_map} = 1;
1195 }
1196 delete $input->{auto_activated};
1197
1198 0
1199 },
1200 on_activate => sub {
1201 my ($input, $text) = @_;
1202 $input->set_text ('');
1203
1204 if ($text =~ /^\/(.*)/) {
1205 $::CONN->user_send ($1);
1206 } else {
1207 my $say_cmd = $::CFG->{say_command} || 'say';
1208 $::CONN->user_send ("$say_cmd $text");
1209 }
1210 if ($input->{refocus_map}) {
1211 delete $input->{refocus_map};
1212 $MAPWIDGET->focus_in
1213 }
1214
1215 0
1216 },
1217 on_escape => sub {
1218 $MAPWIDGET->grab_focus;
1219
1220 0
1221 },
1222 );
1223
1224 $CONSOLE = {
1225 window => $window,
1226 input => $input,
1227 };
1228
1229 $window
1230}
1231
1232sub autopickup_setup { 1229sub autopickup_setup {
1230 my $r = new CFPlus::UI::ScrolledWindow (
1231 expand => 1,
1232 scroll_y => 1
1233 );
1233 my $table = new CFPlus::UI::Table; 1234 $r->add (my $table = new CFPlus::UI::Table
1235 row_expand => [0],
1236 col_expand => [0, 1, 0, 1],
1237 );
1234 1238
1235 for ( 1239 for (
1236 ["General", 0, 0, 1240 ["General", 0, 0,
1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1241 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238 ["Inhibit autopickup" => PICKUP_INHIBIT], 1242 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 ], 1277 ],
1274 ["Weight/Value ratio", 2, 17] 1278 ["Weight/Value ratio", 2, 17]
1275 ) 1279 )
1276 { 1280 {
1277 my ($title, $x, $y, @bits) = @$_; 1281 my ($title, $x, $y, @bits) = @$_;
1278 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1282 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279 1283
1280 for (@bits) { 1284 for (@bits) {
1281 ++$y; 1285 ++$y;
1282 1286
1283 my $mask = $_->[1]; 1287 my $mask = $_->[1];
1284 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1285 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1289 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286 state => $::CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
1287 on_changed => sub { 1291 on_changed => sub {
1288 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1289 1293
1290 if ($value) { 1294 if ($value) {
… …
1301 1305
1302 ${$_->[2]} = $checkbox if $_->[2]; 1306 ${$_->[2]} = $checkbox if $_->[2];
1303 } 1307 }
1304 } 1308 }
1305 1309
1306 $table->add (2, 18, new CFPlus::UI::ValSlider 1310 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99", 1312 template => ">= 99",
1309 to_value => sub { ">= " . 5 * $_[0] }, 1313 to_value => sub { ">= " . 5 * $_[0] },
1310 on_changed => sub { 1314 on_changed => sub {
1311 my ($slider, $value) = @_; 1315 my ($slider, $value) = @_;
… …
1314 $::CFG->{pickup} |= int $value 1318 $::CFG->{pickup} |= int $value
1315 if $value; 1319 if $value;
1316 1; 1320 1;
1317 }); 1321 });
1318 1322
1319 $table->add (3, 18, new CFPlus::UI::Button 1323 $table->add_at (3, 18, new CFPlus::UI::Button
1320 text => "set", 1324 text => "set",
1321 on_activate => sub { 1325 on_activate => sub {
1322 $::CONN->send_command ("pickup $::CFG->{pickup}") 1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1323 if defined $::CONN; 1327 if defined $::CONN;
1324 0 1328 0
1325 }); 1329 });
1326 1330
1327 $table 1331 $r
1328} 1332}
1329 1333
1330my %SORT_ORDER = ( 1334my %SORT_ORDER = (
1331 type => undef, 1335 type => undef,
1332 mtime => sub { 1336 mtime => sub {
… …
1411 has_close_button => 1 1415 has_close_button => 1
1412 ; 1416 ;
1413 1417
1414 my $ntb = 1418 my $ntb =
1415 $PL_NOTEBOOK = 1419 $PL_NOTEBOOK =
1416 new CFPlus::UI::Notebook expand => 1, debug => 1; 1420 new CFPlus::UI::Notebook expand => 1;
1417 1421
1418 $ntb->add ( 1422 $ntb->add (
1419 "Statistics (F2)" => $STATS_PAGE = stats_window, 1423 "Statistics (F2)" => $STATS_PAGE = stats_window,
1420 "Shows statistics, where all your Stats and Resistances are shown." 1424 "Shows statistics, where all your Stats and Resistances are shown."
1421 ); 1425 );
… …
1433 $ntb->add ( 1437 $ntb->add (
1434 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1438 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1439 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1436 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1440 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437 ); 1441 );
1442 $ntb->add (Pickup => autopickup_setup,
1443 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1438 1444
1439 $ntb->set_current_page ($INVENTORY_PAGE); 1445 $ntb->set_current_page ($INVENTORY_PAGE);
1440 1446
1441 $plwin->add ($ntb); 1447 $plwin->add ($ntb);
1442 $plwin 1448 $plwin
… …
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1645 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1646 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641 1647
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1648 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643 1649
1644 $table->add (0, 0, new CFPlus::UI::Button 1650 $table->add_at (0, 0, new CFPlus::UI::Button
1645 text => "Close", 1651 text => "Close",
1646 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1652 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1647 on_activate => $close, 1653 on_activate => $close,
1648 ); 1654 );
1649 1655
1650 $table->add (2, 0, new CFPlus::UI::Button 1656 $table->add_at (2, 0, new CFPlus::UI::Button
1651 text => "Next", 1657 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.", 1658 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub { 1659 on_activate => sub {
1654 $close->(); 1660 $close->();
1655 &show_tip_of_the_day; 1661 &show_tip_of_the_day;
… …
1664 CFPlus::SDL_Init 1670 CFPlus::SDL_Init
1665 and die "SDL::Init failed!\n"; 1671 and die "SDL::Init failed!\n";
1666} 1672}
1667 1673
1668sub video_init { 1674sub video_init {
1669 sdl_init;
1670
1671 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1675 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672 1676
1673 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1677 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674 1678
1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1679 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676 $FULLSCREEN = $CFG->{fullscreen}; 1680 $FULLSCREEN = $CFG->{fullscreen};
1677 $FAST = $CFG->{fast}; 1681 $FAST = $CFG->{fast};
1678 1682
1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1683 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1684 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681 1685
1682 $SDL_ACTIVE = 1; 1686 $SDL_ACTIVE = 1;
1683 $LAST_REFRESH = time - 0.01; 1687 $LAST_REFRESH = time - 0.01;
1684 1688
… …
1726 1730
1727 $MAPWIDGET = new CFPlus::MapWidget; 1731 $MAPWIDGET = new CFPlus::MapWidget;
1728 $MAPWIDGET->connect (activate_console => sub { 1732 $MAPWIDGET->connect (activate_console => sub {
1729 my ($mapwidget, $preset) = @_; 1733 my ($mapwidget, $preset) = @_;
1730 1734
1731 if ($CONSOLE) { 1735 $MESSAGE_WINDOW->activate_console ($preset)
1732 $CONSOLE->{input}->{auto_activated} = 1; 1736 if $MESSAGE_WINDOW;
1733 $CONSOLE->{input}->grab_focus;
1734
1735 if ($preset && $CONSOLE->{input}->get_text eq '') {
1736 $CONSOLE->{input}->set_text ($preset);
1737 }
1738 }
1739 }); 1737 });
1740 $MAPWIDGET->show; 1738 $MAPWIDGET->show;
1741 $MAPWIDGET->grab_focus; 1739 $MAPWIDGET->grab_focus;
1742
1743 $LOGVIEW = new CFPlus::UI::TextScroller
1744 expand => 1,
1745 font => $FONT_FIXED,
1746 fontsize => $::CFG->{log_fontsize},
1747 indent => -4,
1748 can_hover => 1,
1749 can_events => 1,
1750 max_par => $CFG->{logview_max_par},
1751 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1752 ;
1753 1740
1754 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1741 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1755 title => "Setup", 1742 title => "Setup",
1756 name => "setup_dialog", 1743 name => "setup_dialog",
1757 x => 'center', 1744 x => 'center',
… …
1761 force_h => $::HEIGHT * 0.6, 1748 force_h => $::HEIGHT * 0.6,
1762 has_close_button => 1, 1749 has_close_button => 1,
1763 ; 1750 ;
1764 1751
1765 $METASERVER = metaserver_dialog; 1752 $METASERVER = metaserver_dialog;
1753 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1766 1754
1767 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1755 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1768 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1756 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1769 1757
1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1758 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1771 "Configure the server to play on, your username, password and other server-related options."); 1759 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup, 1760 $SETUP_NOTEBOOK->add (Client => client_setup,
1773 "Configure various client-specific settings."); 1761 "Configure various client-specific settings.");
1774 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1775 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1762 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1777 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1763 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1764 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1779 "Configure the use of audio, sound effects and background music."); 1765 "Configure the use of audio, sound effects and background music.");
1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1766 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1790 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1776 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1791 1777
1792 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1778 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1793 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1779 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1794 1780
1795 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1781 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1796 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1782 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1797 1783
1798 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 1784 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
1799 1785
1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1786 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1912 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927 1913
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1914 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0; 1915 my $row = 0;
1930 if ($info->{has_name}) { 1916 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1917 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1932 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1918 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 } 1919 }
1934 if ($info->{has_text}) { 1920 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1921 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1936 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1922 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 } 1923 }
1938 if ($info->{has_connection}) { 1924 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1925 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++, 1926 $table->add_at (1, $row++,
1941 new CFPlus::UI::Entry 1927 new CFPlus::UI::Entry
1942 expand => 1, 1928 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1929 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1930 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945 ); 1931 );
… …
1958 CFPlus::OpenGL::shutdown; 1944 CFPlus::OpenGL::shutdown;
1959 1945
1960 undef $SDL_ACTIVE; 1946 undef $SDL_ACTIVE;
1961} 1947}
1962 1948
1963my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1964my $bgmusic;#TODO#hack#d#
1965
1966sub audio_channel_finished { 1949sub audio_channel_finished {
1967 my ($channel) = @_; 1950 my ($channel) = @_;
1968 1951
1969 #warn "channel $channel finished\n";#d# 1952 #warn "channel $channel finished\n";#d#
1970} 1953}
1971 1954
1955sub audio_music_set {
1956 my ($songs) = @_;
1957
1958 my @want =
1959 grep $_,
1960 map $CONN->{music_meta}{$_},
1961 @$songs;
1962
1963 if (@want) {
1964 @MUSIC_WANT = @want;
1965 &audio_music_changed ();
1966 }
1967}
1968
1969sub audio_music_start {
1970 my $path = $MUSIC_PLAYING->{path}
1971 or return;
1972
1973 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1974 # music might have changed...
1975 $path eq $MUSIC_PLAYING->{path}
1976 or return &audio_music_start ();
1977
1978 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1979
1980 my $NOW = time;
1981
1982 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1983 my $pos = $MUSIC_PLAYING->{stop_pos};
1984 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1985 $MUSIC_START = time - $pos;
1986 } else {
1987 $MUSIC_PLAYER->play (0);
1988 $MUSIC_START = time;
1989 }
1990
1991 delete $MUSIC_PLAYING->{stop_time};
1992 delete $MUSIC_PLAYING->{stop_pos};
1993 }
1994}
1995
1996sub audio_music_changed {
1997 return unless $CFG->{bgm_enable};
1998
1999 # default MUSIC_WANT == MUSIC_DEFAULT
2000 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2001
2002 # if the currently playing song is acceptable, let it continue
2003 return if $MUSIC_PLAYING
2004 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2005
2006 my $NOW = time;
2007
2008 if ($MUSIC_PLAYING) {
2009 $MUSIC_PLAYING->{stop_time} = $NOW;
2010 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2011 CFPlus::MixMusic::fade_out 1000;
2012 } else {
2013 # sort by stop time, oldest first
2014 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2015
2016 # if the most recently-played piece played very recently,
2017 # resume it, else choose the oldest piece for rotation.
2018 $MUSIC_PLAYING =
2019 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2020 ? $MUSIC_WANT[-1]
2021 : $MUSIC_WANT[0];
2022
2023 audio_music_start;
2024 }
2025}
2026
1972sub audio_music_finished { 2027sub audio_music_finished {
1973 return unless $CFG->{bgm_enable}; 2028 $MUSIC_PLAYING = undef;
2029 undef $MUSIC_PLAYER;
1974 2030
1975 # TODO: hack, do play loop and mood music 2031 audio_music_changed;
1976 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1977 $bgmusic->play (0);
1978
1979 push @bgmusic, shift @bgmusic;
1980} 2032}
1981 2033
1982sub audio_init { 2034sub audio_init {
1983 if ($CFG->{audio_enable}) { 2035 if ($CFG->{audio_enable}) {
1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2036 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2086 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2035 2087
2036 $CFPlus::UI::ROOT->draw; 2088 $CFPlus::UI::ROOT->draw;
2037 2089
2038 $WANT_REFRESH = 0; 2090 $WANT_REFRESH = 0;
2039 $CAN_REFRESH = 0; 2091 $CAN_REFRESH = 0;
2040 $LAST_REFRESH = $NOW; 2092 $LAST_REFRESH = $NOW;
2041 2093
2042 CFPlus::SDL_GL_SwapBuffers; 2094 CFPlus::SDL_GL_SwapBuffers;
2043} 2095}
2044 2096
2045my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2097my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2046 $NOW = time; 2098 $NOW = time;
2047 2099
2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2100 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049 for CFPlus::SDL_PollEvent; 2101 for CFPlus::poll_events;
2050 2102
2051 if (%animate_object) { 2103 if (%animate_object) {
2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2104 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053 $WANT_REFRESH++; 2105 ++$WANT_REFRESH;
2054 } 2106 }
2055 2107
2056 if ($WANT_REFRESH) { 2108 if ($WANT_REFRESH) {
2057 force_refresh; 2109 force_refresh;
2058 } else { 2110 } else {
… …
2088 CFPlus::SDL_VIDEOEXPOSE => sub { 2140 CFPlus::SDL_VIDEOEXPOSE => sub {
2089 CFPlus::UI::full_refresh; 2141 CFPlus::UI::full_refresh;
2090 }, 2142 },
2091 CFPlus::SDL_ACTIVEEVENT => sub { 2143 CFPlus::SDL_ACTIVEEVENT => sub {
2092# not useful, as APPACTIVE include sonly iconified state, not unmapped 2144# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2145# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2146# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2147# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2148# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2149# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097 }, 2150 },
2098 CFPlus::SDL_KEYDOWN => sub { 2151 CFPlus::SDL_KEYDOWN => sub {
… …
2134 height => 480, 2187 height => 480,
2135 fullscreen => 0, 2188 fullscreen => 0,
2136 fast => 0, 2189 fast => 0,
2137 map_scale => 1, 2190 map_scale => 1,
2138 fow_enable => 1, 2191 fow_enable => 1,
2139 fow_intensity => 0.45, 2192 fow_intensity => 0,
2140 fow_smooth => 0,
2141 map_smoothing => 1, 2193 map_smoothing => 1,
2142 gui_fontsize => 1, 2194 gui_fontsize => 1,
2143 log_fontsize => 0.7, 2195 log_fontsize => 0.7,
2144 gauge_fontsize => 1, 2196 gauge_fontsize => 1,
2145 gauge_size => 0.35, 2197 gauge_size => 0.35,
… …
2179 } 2231 }
2180 } 2232 }
2181 2233
2182 sdl_init; 2234 sdl_init;
2183 2235
2184 @SDL_MODES = reverse 2236 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185 grep $_->[0] >= 640 && $_->[1] >= 480, 2237 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2186 CFPlus::SDL_ListModes;
2187
2188 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2238 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2239
2240 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189 2241
2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2242 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191 2243
2192 { 2244 {
2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2245 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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