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.152 by root, Tue Apr 24 01:13:15 2007 UTC vs.
Revision 1.188 by root, Sun Jul 29 03:58:26 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;
… …
150our $INVR; 178our $INVR;
151our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
152 180
153our $PICKUP_CFG; 181our $PICKUP_CFG;
154 182
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
158sub status { 183sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 184 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 185}
161 186
162sub debug { 187sub debug {
163 $DEBUG_STATUS->set_text ($_[0]); 188 $DEBUG_STATUS->set_text ($_[0]);
164} 189}
165 190
166sub message { 191sub message {
167 my ($para) = @_; 192 my ($para) = @_;
168 193 $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} 194}
176 195
177sub destroy_query_dialog { 196sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 197 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 198 if $_[0]{query_dialog};
… …
244 ellipsise => 0, 263 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 264 markup => "\nOr use your keyboard and the text entry below:\n";
246 265
247 unshift @dialog, my $table = new CFPlus::UI::Table; 266 unshift @dialog, my $table = new CFPlus::UI::Table;
248 267
249 $table->add (0, 0, new CFPlus::UI::Button 268 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 269 text => "Next Race",
251 on_activate => sub { 270 on_activate => sub {
252 $conn->send ("reply n"); 271 $conn->send ("reply n");
253 destroy_query_dialog $conn; 272 destroy_query_dialog $conn;
254 0 273 0
255 }, 274 },
256 ); 275 );
257 $table->add (2, 0, new CFPlus::UI::Button 276 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 277 text => "Accept",
259 on_activate => sub { 278 on_activate => sub {
260 $conn->send ("reply d"); 279 $conn->send ("reply d");
261 destroy_query_dialog $conn; 280 destroy_query_dialog $conn;
262 0 281 0
… …
269 ellipsise => 0, 288 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 289 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ; 290 ;
272 } 291 }
273 292
274 if ($conn->{chargen_race_title}) {
275 unshift @dialog, new CFPlus::UI::Face 293 unshift @dialog, new CFPlus::UI::Face
276 face => $conn->{player}{face}, 294 face => $conn->{player}{face},
277 bg => [.2, .2, .2, 1], 295 bg => [.2, .2, .2, 1],
278 min_w => 64, 296 min_w => 64,
279 min_h => 64, 297 min_h => 64,
280 ;
281 } 298 ;
282 299
283 if ($conn->{chargen_race_title}) { 300 if ($conn->{chargen_race_title}) {
284 unshift @dialog, new CFPlus::UI::Label 301 unshift @dialog, new CFPlus::UI::Label
285 allign => 1, 302 allign => 1,
286 ellipsise => 0, 303 ellipsise => 0,
… …
299 $conn->send ("reply $stat"); 316 $conn->send ("reply $stat");
300 destroy_query_dialog $conn; 317 destroy_query_dialog $conn;
301 return; 318 return;
302 } 319 }
303 320
304 $STATS_PAGE->show;
305 $MESSAGE_WINDOW->hide;
306
307 unshift @dialog, new CFPlus::UI::Label 321 unshift @dialog, new CFPlus::UI::Label
308 max_w => $::WIDTH * 0.4, 322 max_w => $::WIDTH * 0.4,
309 ellipsise => 0, 323 ellipsise => 0,
310 markup => "\nOr use your keyboard and the text entry below:\n"; 324 markup => "\nOr use your keyboard and the text entry below:\n";
311 325
312 unshift @dialog, my $table = new CFPlus::UI::Table; 326 unshift @dialog, my $table = new CFPlus::UI::Table;
313 327
314 # left: re-roll 328 # left: re-roll
315 $table->add (0, 0, new CFPlus::UI::Button 329 $table->add_at (0, 0, new CFPlus::UI::Button
316 text => "Roll Again", 330 text => "Roll Again",
317 on_activate => sub { 331 on_activate => sub {
318 $conn->send ("reply y"); 332 $conn->send ("reply y");
319 destroy_query_dialog $conn; 333 destroy_query_dialog $conn;
320 0 334 0
… …
334 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 348 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
335 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 349 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
336 ], 350 ],
337 ), 1 .. 2; 351 ), 1 .. 2;
338 352
339 $table->add (2, 0, new CFPlus::UI::Button 353 $table->add_at (2, 0, new CFPlus::UI::Button
340 text => "Swap Stats", 354 text => "Swap Stats",
341 on_activate => sub { 355 on_activate => sub {
342 $conn->{stat_change_with} = $sw2->{value}; 356 $conn->{stat_change_with} = $sw2->{value};
343 $conn->send ("reply $sw1->{value}"); 357 $conn->send ("reply $sw1->{value}");
344 destroy_query_dialog $conn; 358 destroy_query_dialog $conn;
345 0 359 0
346 }, 360 },
347 ); 361 );
348 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 362 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
349 363
350 # right: accept 364 # right: accept
351 $table->add (4, 0, new CFPlus::UI::Button 365 $table->add_at (4, 0, new CFPlus::UI::Button
352 text => "Accept", 366 text => "Accept",
353 on_activate => sub { 367 on_activate => sub {
354 $conn->send ("reply n"); 368 $conn->send ("reply n");
355 $STATS_PAGE->hide; 369 $STATS_PAGE->hide;
356 destroy_query_dialog $conn; 370 destroy_query_dialog $conn;
… …
437 maph => $mapsize, 451 maph => $mapsize,
438 452
439 client => "cfplus $CFPlus::VERSION $] $^O", 453 client => "cfplus $CFPlus::VERSION $] $^O",
440 454
441 map_widget => $MAPWIDGET, 455 map_widget => $MAPWIDGET,
442 logview => $LOGVIEW,
443 statusbox => $STATUSBOX, 456 statusbox => $STATUSBOX,
444 map => $MAP, 457 map => $MAP,
445 mapmap => $MAPMAP, 458 mapmap => $MAPMAP,
446 query => \&server_query, 459 query => \&server_query,
447 460
… …
476 $LOGIN_BUTTON->set_text ("Login"); 489 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 490 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show; 491 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide; 492 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells; 493 $SPELL_LIST->clear_spells;
494 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
495
496 &audio_music_set ([]);
481 497
482 return unless $CONN; 498 return unless $CONN;
483 499
484 status "connection closed"; 500 status "connection closed";
485 501
… …
495 511
496 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 512 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
497 513
498 my $row = 0; 514 my $row = 0;
499 515
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 516 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
501 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 517 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
502 can_events => 1, 518 can_events => 1,
503 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 519 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
504 520
521 my $vidmode_tooltip =
522 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
523 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
524
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 525 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
506 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 526 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
507 527
528 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
508 $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]); 529 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
509 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 530 tooltip => $vidmode_tooltip);
531 $hbox->add (my $mode_label = new CFPlus::UI::Label
532 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
533 can_events => 1, tooltip => $vidmode_tooltip);
510 534
511 $mode_slider->connect (changed => sub { 535 $mode_slider->connect (changed => sub {
512 my ($self, $value) = @_; 536 my ($self, $value) = @_;
513 537
514 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 538 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
515 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 539 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
516 }); 540 });
517 $mode_slider->emit (changed => $mode_slider->{range}[0]); 541 $mode_slider->emit (changed => $mode_slider->{range}[0]);
518 542
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 543 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
520 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 544 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
521 state => $CFG->{fullscreen}, 545 state => $CFG->{fullscreen},
522 tooltip => "Bring the client into fullscreen mode.", 546 tooltip => "Bring the client into fullscreen mode.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 547 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
524 ); 548 );
525 549
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 550 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox 551 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fast}, 552 state => $CFG->{fast},
529 tooltip => "Lower the visual quality considerably to speed up rendering.", 553 tooltip => "Lower the visual quality considerably to speed up rendering.",
530 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 554 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
531 ); 555 );
532 556
533 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 557 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
534 $table->add (1, $row++, new CFPlus::UI::Slider 558 $table->add_at (1, $row++, new CFPlus::UI::Slider
535 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 559 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
536 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 560 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
537 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 561 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 ); 562 );
539 563
540 $table->add (1, $row++, new CFPlus::UI::Button 564 $table->add_at (1, $row++, new CFPlus::UI::Button
541 expand => 1, align => 0, text => "Apply", 565 expand => 1, align => 0, text => "Apply",
542 tooltip => "Apply the video settings above.", 566 tooltip => "Apply the video settings above.",
543 on_activate => sub { 567 on_activate => sub {
544 video_shutdown (); 568 video_shutdown ();
545 video_init (); 569 video_init ();
546 0 570 0
547 } 571 }
548 ); 572 );
549 573
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 574 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
551 $table->add (1, $row++, new CFPlus::UI::Slider 575 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 576 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
553 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 577 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 578 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
555 ); 579 );
556 580
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox 582 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{map_smoothing}, 583 state => $CFG->{map_smoothing},
560 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 584 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
561 . "This increases load on the graphics subsystem and works only with 2.x servers. " 585 . "This increases load on the graphics subsystem and works only with 2.x servers. "
562 . "Changes take effect at next connection only.", 586 . "Changes take effect at next connection only.",
563 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 587 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
564 ); 588 );
565 589
566 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 590 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
567 $table->add (1, $row++, new CFPlus::UI::CheckBox 591 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
568 state => $CFG->{fow_enable}, 592 state => $CFG->{fow_enable},
569 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 593 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
570 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 594 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
571 ); 595 );
572 596
573 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 597 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
574 $table->add (1, $row++, new CFPlus::UI::Slider 598 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 599 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
576 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 600 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 601 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
578 ); 602 );
579 603
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{fow_smooth},
583 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
584 on_changed => sub {
585 my ($self, $value) = @_;
586 $CFG->{fow_smooth} = $value;
587 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
588 0
589 }
590 );
591
592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 604 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
593 $table->add (1, $row++, new CFPlus::UI::Slider 605 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 606 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
595 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 607 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
596 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 608 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
597 ); 609 );
598 610
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 611 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
600 $table->add (1, $row++, new CFPlus::UI::Slider 612 $table->add_at (1, $row++, new CFPlus::UI::Slider
601 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 613 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
602 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 614 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
603 on_changed => sub { 615 on_changed => sub {
604 $CFG->{gauge_fontsize} = $_[1]; 616 $CFG->{gauge_fontsize} = $_[1];
605 &set_gauge_window_fontsize; 617 &set_gauge_window_fontsize;
606 0 618 0
607 } 619 }
608 ); 620 );
609 621
610 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 622 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
611 $table->add (1, $row++, new CFPlus::UI::Slider 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
612 range => [$CFG->{gauge_size}, 0.2, 0.8], 624 range => [$CFG->{gauge_size}, 0.2, 0.8],
613 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 625 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
614 on_changed => sub { 626 on_changed => sub {
615 $CFG->{gauge_size} = $_[1]; 627 $CFG->{gauge_size} = $_[1];
616 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 628 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
626 638
627 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 639 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
628 640
629 my $row = 0; 641 my $row = 0;
630 642
631 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
632 $table->add (1, $row++, new CFPlus::UI::CheckBox 644 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
633 state => $CFG->{audio_enable}, 645 state => $CFG->{audio_enable},
634 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.", 646 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.",
635 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 647 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
636 ); 648 );
637# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 649# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
638# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 650# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
639# $CFG->{effects_volume} = $_[1]; 651# $CFG->{effects_volume} = $_[1];
640# }); 652# });
641 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
642 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 654 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
643 $hbox->add (new CFPlus::UI::CheckBox 655 $hbox->add (new CFPlus::UI::CheckBox
644 expand => 1, state => $CFG->{bgm_enable}, 656 expand => 1, state => $CFG->{bgm_enable},
645 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 657 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
646 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 658 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
647 ); 659 );
… …
649 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 661 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
650 tooltip => "The volume of the background music. Changes are instant.", 662 tooltip => "The volume of the background music. Changes are instant.",
651 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 663 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
652 ); 664 );
653 665
654 $table->add (1, $row++, new CFPlus::UI::Button 666 $table->add_at (1, $row++, new CFPlus::UI::Button
655 expand => 1, align => 0, text => "Apply", 667 expand => 1, align => 0, text => "Apply",
656 tooltip => "Apply the audio settings", 668 tooltip => "Apply the audio settings",
657 on_activate => sub { 669 on_activate => sub {
658 audio_shutdown (); 670 audio_shutdown ();
659 audio_init (); 671 audio_init ();
… …
718} 730}
719 731
720sub debug_setup { 732sub debug_setup {
721 my $table = new CFPlus::UI::Table; 733 my $table = new CFPlus::UI::Table;
722 734
723 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 735 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
724 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 736 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
725 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 737 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
726 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 738 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
727 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 739 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
728 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 740 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
729 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 741 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
730 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 742 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
731 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 743 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
732 744
733 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
734
735 for my $x (0..2) {
736 for my $y (0 .. 2) {
737 $table->add ($x + 3, $y,
738 new CFPlus::UI::Entry
739 text => $default_smooth[$x * 3 + $y],
740 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
741 );
742 }
743 }
744
745 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 745 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
746
747 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
748 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
749 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
750 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
751 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
752 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
753
754 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
755
756 $c->add_items ({
757 type => "line_loop",
758 color => [0, 1, 0],
759 width => 9,
760 coord_mode => "abs",
761 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
762 });
763
764 $c->add_items ({
765 type => "lines",
766 color => [1, 1, 0],
767 width => 2,
768 coord_mode => "rel",
769 coord => [[0,0], [1,1], [1,0], [0,1]],
770 });
771
772 $c->add_items ({
773 type => "polygon",
774 color => [0, 0.43, 0],
775 width => 2,
776 coord_mode => "rel",
777 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
778 });
746 779
747 $table 780 $table
748} 781}
749 782
750sub stats_window { 783sub stats_window {
… …
798 [2, 4, st_spd => "Spd", 10.54], 831 [2, 4, st_spd => "Spd", 10.54],
799 [2, 5, st_wspd => "WSp", 10.54], 832 [2, 5, st_wspd => "WSp", 10.54],
800 ) { 833 ) {
801 my ($col, $row, $id, $label, $template) = @$_; 834 my ($col, $row, $id, $label, $template) = @$_;
802 835
803 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 836 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
804 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 837 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
805 align => +1, template => $template, tooltip => "#stat_$label"); 838 align => +1, template => $template, tooltip => "#stat_$label");
806 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 839 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
807 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 840 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
808 align => -1, text => $label, tooltip => "#stat_$label"); 841 align => -1, text => $label, tooltip => "#stat_$label");
809 } 842 }
810 843
811 $vb->add (new CFPlus::UI::FancyFrame 844 $vb->add (new CFPlus::UI::FancyFrame
… …
852 cold => ["Cold", 885 cold => ["Cold",
853 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 886 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
854 ghit => ["Ghost hit", 887 ghit => ["Ghost hit",
855 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 888 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
856 ); 889 );
890
857 for (qw/slow holyw conf fire depl magic 891 for (qw/slow holyw conf fire depl magic
858 drain acid pois para deat phys 892 drain acid pois para deat phys
859 blind fear tund elec cold ghit/) 893 blind fear tund elec cold ghit/)
860 { 894 {
861 $tbl2->add ($col, $row, 895 $tbl2->add_at ($col, $row,
862 $STATWIDS->{"res_$_"} = 896 $STATWIDS->{"res_$_"} =
863 new CFPlus::UI::Label 897 new CFPlus::UI::Label
864 font => $FONT_FIXED, 898 font => $FONT_FIXED,
865 template => "-100%", 899 template => "-100%",
866 align => +1, 900 align => +1,
867 valign => 0, 901 valign => 0,
868 can_events => 1, 902 can_events => 1,
869 can_hover => 1, 903 can_hover => 1,
870 tooltip => $resist_names{$_}->[1], 904 tooltip => $resist_names{$_}->[1],
871 ); 905 );
872 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 906 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
873 font => $FONT_FIXED, 907 font => $FONT_FIXED,
874 can_hover => 1, 908 can_hover => 1,
875 can_events => 1, 909 can_events => 1,
876 path => "ui/resist/resist_$_.png", 910 path => "ui/resist/resist_$_.png",
877 tooltip => $resist_names{$_}->[1], 911 tooltip => $resist_names{$_}->[1],
878 ); 912 );
879 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 913 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
880 text => $resist_names{$_}->[0], 914 text => $resist_names{$_}->[0],
881 font => $FONT_FIXED, 915 font => $FONT_FIXED,
882 can_hover => 1, 916 can_hover => 1,
883 can_events => 1, 917 can_events => 1,
884 tooltip => $resist_names{$_}->[1], 918 tooltip => $resist_names{$_}->[1],
… …
917 return if $METASERVER_ATIME > time; 951 return if $METASERVER_ATIME > time;
918 $METASERVER_ATIME = time + 60; 952 $METASERVER_ATIME = time + 60;
919 953
920 my $table = $METASERVER->{table}; 954 my $table = $METASERVER->{table};
921 $table->clear; 955 $table->clear;
922 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 956 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
923 957
924 my $ok = 0; 958 my $ok = 0;
925 959
926 CFPlus::background { 960 CFPlus::background {
927 my $ua = CFPlus::lwp_useragent; 961 my $ua = CFPlus::lwp_useragent;
… …
938 "The time this server has been running without being restarted.", 972 "The time this server has been running without being restarted.",
939 "The server software version - a '+' indicates a Crossfire+ server.", 973 "The server software version - a '+' indicates a Crossfire+ server.",
940 "Short information about this server provided by its admins.", 974 "Short information about this server provided by its admins.",
941 ); 975 );
942 my @col = qw(#Users Host Uptime Version Description); 976 my @col = qw(#Users Host Uptime Version Description);
943 $table->add ($_, 0, new CFPlus::UI::Label 977 $table->add_at ($_, 0, new CFPlus::UI::Label
944 can_hover => 1, can_events => 1, 978 can_hover => 1, can_events => 1,
945 align => 0, fg => [1, 1, 0], 979 align => 0, fg => [1, 1, 0],
946 text => $col[$_], tooltip => $tip[$_]) 980 text => $col[$_], tooltip => $tip[$_])
947 for 0 .. $#col; 981 for 0 .. $#col;
948 982
… …
970 1004
971 $m = [$users, $host, $uptime, $version, $desc]; 1005 $m = [$users, $host, $uptime, $version, $desc];
972 1006
973 $y++; 1007 $y++;
974 1008
975 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1009 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
976 (new CFPlus::UI::Button 1010 (new CFPlus::UI::Button
977 text => "Use", 1011 text => "Use",
978 tooltip => "Put this server into the <b>Host:Port</b> field", 1012 tooltip => "Put this server into the <b>Host:Port</b> field",
979 on_activate => sub { 1013 on_activate => sub {
980 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1014 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
983 }, 1017 },
984 ), 1018 ),
985 (new CFPlus::UI::Empty expand => 1), 1019 (new CFPlus::UI::Empty expand => 1),
986 ]); 1020 ]);
987 1021
988 $table->add ($_, $y, new CFPlus::UI::Label 1022 $table->add_at ($_, $y, new CFPlus::UI::Label
989 max_w => $::WIDTH * 0.4, 1023 max_w => $::WIDTH * 0.4,
990 ellipsise => 0, 1024 ellipsise => 0,
991 align => $align[$_], 1025 align => $align[$_],
992 text => $m->[$_], 1026 text => $m->[$_],
993 tooltip => $tip[$_], 1027 tooltip => $tip[$_],
… …
1034 1068
1035 $vbox->add (new CFPlus::UI::FancyFrame 1069 $vbox->add (new CFPlus::UI::FancyFrame
1036 label => "Connection Settings", 1070 label => "Connection Settings",
1037 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1071 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1038 ); 1072 );
1039 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1073 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1040 1074
1041 { 1075 {
1042 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1076 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1043 1077
1044 $vbox->add ( 1078 $vbox->add (
1045 $HOST_ENTRY = new CFPlus::UI::Entry 1079 $HOST_ENTRY = new CFPlus::UI::Entry
1046 expand => 1, 1080 expand => 1,
1047 text => $CFG->{profile}{default}{host}, 1081 text => $CFG->{profile}{default}{host},
… …
1061 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1095 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1062 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1063 ); 1097 );
1064 } 1098 }
1065 1099
1066 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1100 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1067 $table->add (1, 4, new CFPlus::UI::Entry 1101 $table->add_at (1, 4, new CFPlus::UI::Entry
1068 text => $CFG->{profile}{default}{user}, 1102 text => $CFG->{profile}{default}{user},
1069 tooltip => "The name of your character on the server", 1103 tooltip => "The name of your character on the server",
1070 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1071 ); 1105 );
1072 1106
1073 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1107 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1074 $table->add (1, 5, new CFPlus::UI::Entry 1108 $table->add_at (1, 5, new CFPlus::UI::Entry
1075 text => $CFG->{profile}{default}{password}, 1109 text => $CFG->{profile}{default}{password},
1076 hidden => 1, 1110 hidden => 1,
1077 tooltip => "The password for your character", 1111 tooltip => "The password for your character",
1078 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1079 ); 1113 );
1080 1114
1081 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1115 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1082 $table->add (1, 7, new CFPlus::UI::Slider 1116 $table->add_at (1, 7, new CFPlus::UI::Slider
1083 force_w => 100, 1117 force_w => 100,
1084 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1118 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1085 tooltip => "This is the size of the portion of the map update the server sends you. " 1119 tooltip => "This is the size of the portion of the map update the server sends you. "
1086 . "If you set this to a high value you will be able to see further, " 1120 . "If you set this to a high value you will be able to see further, "
1087 . "but you also increase bandwidth requirements and latency. " 1121 . "but you also increase bandwidth requirements and latency. "
1088 . "This option is only used once at log-in.", 1122 . "This option is only used once at log-in.",
1089 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1090 ); 1124 );
1091 1125
1092 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1093 $table->add (1, 8, new CFPlus::UI::CheckBox 1127 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1094 state => $CFG->{face_prefetch}, 1128 state => $CFG->{face_prefetch},
1095 tooltip => "<b>Background Image Prefetch</b>\n\n" 1129 tooltip => "<b>Background Image Prefetch</b>\n\n"
1096 . "If enabled, the client automatically pre-fetches images from the server. " 1130 . "If enabled, the client automatically pre-fetches images from the server. "
1097 . "This might increase or create lag, but increases the chances " 1131 . "This might increase or create lag, but increases the chances "
1098 . "of faces being ready for display when you encounter them. " 1132 . "of faces being ready for display when you encounter them. "
… …
1100 . "so only set it if you really need to prefetch images. " 1134 . "so only set it if you really need to prefetch images. "
1101 . "This option can be set and unset any time.", 1135 . "This option can be set and unset any time.",
1102 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1103 ); 1137 );
1104 1138
1105 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1139 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1106 $table->add (1, 9, new CFPlus::UI::Entry 1140 $table->add_at (1, 9, new CFPlus::UI::Entry
1107 text => $CFG->{output_rate}, 1141 text => $CFG->{output_rate},
1108 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1142 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1109 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1143 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1110 . "default will be used, which is usually around 100kb/s.", 1144 . "default will be used, which is usually around 100kb/s.",
1111 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1145 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1112 ); 1146 );
1113 1147
1114 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1148 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1115 $table->add (1, 10, new CFPlus::UI::Entry 1149 $table->add_at (1, 10, new CFPlus::UI::Entry
1116 text => $CFG->{output_count}, 1150 text => $CFG->{output_count},
1117 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1151 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1118 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1152 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1119 ); 1153 );
1120 1154
1121 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1155 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1122 $table->add (1, 11, new CFPlus::UI::Entry 1156 $table->add_at (1, 11, new CFPlus::UI::Entry
1123 text => $CFG->{output_sync}, 1157 text => $CFG->{output_sync},
1124 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1158 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1125 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1159 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1126 ); 1160 );
1127 1161
1128 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1162 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1129 expand => 1, 1163 expand => 1,
1130 align => 0, 1164 align => 0,
1131 text => "Login", 1165 text => "Login",
1132 on_activate => sub { 1166 on_activate => sub {
1133 $CONN ? stop_game 1167 $CONN ? stop_game
… …
1147sub client_setup { 1181sub client_setup {
1148 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1182 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1149 1183
1150 my $row = 0; 1184 my $row = 0;
1151 1185
1152 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1153 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1154 text => $CFG->{say_command},
1155 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. "
1156 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1157 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1158 on_changed => sub {
1159 my ($self, $value) = @_;
1160 $CFG->{say_command} = $value;
1161 0
1162 }
1163 );
1164
1165 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1186 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1166 $table->add (1, $row++, new CFPlus::UI::CheckBox 1187 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1167 state => $CFG->{show_tips}, 1188 state => $CFG->{show_tips},
1168 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1169 on_changed => sub { 1190 on_changed => sub {
1170 my ($self, $value) = @_; 1191 my ($self, $value) = @_;
1171 $CFG->{show_tips} = $value; 1192 $CFG->{show_tips} = $value;
1172 0 1193 0
1173 } 1194 }
1174 ); 1195 );
1175 1196
1176 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1197 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1178 text => $CFG->{logview_max_par}, 1199 text => $CFG->{logview_max_par},
1179 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1180 . "sends more messages than this number, older messages get removed to save memory and " 1201 . "sends more messages than this number, older messages get removed to save memory and "
1181 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1182 on_changed => sub { 1203 on_changed => sub {
1183 my ($self, $value) = @_; 1204 my ($self, $value) = @_;
1184 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1205 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1185 0 1206 0
1186 }, 1207 },
1187 ); 1208 );
1188 1209
1189 $table 1210 $table
1190} 1211}
1191 1212
1192sub message_window {
1193 my $window = new CFPlus::UI::Toplevel
1194 name => "message_window",
1195 title => "Messages",
1196 border_bg => [1, 1, 1, 1],
1197 x => "max",
1198 y => 0,
1199 force_w => $::WIDTH * 0.4,
1200 force_h => $::HEIGHT * 0.5,
1201 child => (my $vbox = new CFPlus::UI::VBox),
1202 has_close_button => 1;
1203
1204 $vbox->add ($LOGVIEW);
1205
1206 $vbox->add (my $input = new CFPlus::UI::Entry
1207 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1208 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1209 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1210 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1211 on_focus_in => sub {
1212 my ($input, $prev_focus) = @_;
1213
1214 delete $input->{refocus_map};
1215
1216 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1217 $input->{refocus_map} = 1;
1218 }
1219 delete $input->{auto_activated};
1220
1221 0
1222 },
1223 on_activate => sub {
1224 my ($input, $text) = @_;
1225 $input->set_text ('');
1226
1227 if ($text =~ /^\/(.*)/) {
1228 $::CONN->user_send ($1);
1229 } else {
1230 my $say_cmd = $::CFG->{say_command} || 'say';
1231 $::CONN->user_send ("$say_cmd $text");
1232 }
1233 if ($input->{refocus_map}) {
1234 delete $input->{refocus_map};
1235 $MAPWIDGET->focus_in
1236 }
1237
1238 0
1239 },
1240 on_escape => sub {
1241 $MAPWIDGET->grab_focus;
1242
1243 0
1244 },
1245 );
1246
1247 $CONSOLE = {
1248 window => $window,
1249 input => $input,
1250 };
1251
1252 $window
1253}
1254
1255sub autopickup_setup { 1213sub autopickup_setup {
1214 my $r = new CFPlus::UI::ScrolledWindow (
1215 expand => 1,
1216 scroll_y => 1
1217 );
1256 my $table = new CFPlus::UI::Table; 1218 $r->add (my $table = new CFPlus::UI::Table
1219 row_expand => [0],
1220 col_expand => [0, 1, 0, 1],
1221 );
1257 1222
1258 for ( 1223 for (
1259 ["General", 0, 0, 1224 ["General", 0, 0,
1260 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1225 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1261 ["Inhibit autopickup" => PICKUP_INHIBIT], 1226 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1296 ], 1261 ],
1297 ["Weight/Value ratio", 2, 17] 1262 ["Weight/Value ratio", 2, 17]
1298 ) 1263 )
1299 { 1264 {
1300 my ($title, $x, $y, @bits) = @$_; 1265 my ($title, $x, $y, @bits) = @$_;
1301 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1266 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1302 1267
1303 for (@bits) { 1268 for (@bits) {
1304 ++$y; 1269 ++$y;
1305 1270
1306 my $mask = $_->[1]; 1271 my $mask = $_->[1];
1307 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1272 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1308 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1273 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1309 state => $::CFG->{pickup} & $mask, 1274 state => $::CFG->{pickup} & $mask,
1310 on_changed => sub { 1275 on_changed => sub {
1311 my ($box, $value) = @_; 1276 my ($box, $value) = @_;
1312 1277
1313 if ($value) { 1278 if ($value) {
… …
1324 1289
1325 ${$_->[2]} = $checkbox if $_->[2]; 1290 ${$_->[2]} = $checkbox if $_->[2];
1326 } 1291 }
1327 } 1292 }
1328 1293
1329 $table->add (2, 18, new CFPlus::UI::ValSlider 1294 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1330 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1295 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1331 template => ">= 99", 1296 template => ">= 99",
1332 to_value => sub { ">= " . 5 * $_[0] }, 1297 to_value => sub { ">= " . 5 * $_[0] },
1333 on_changed => sub { 1298 on_changed => sub {
1334 my ($slider, $value) = @_; 1299 my ($slider, $value) = @_;
… …
1337 $::CFG->{pickup} |= int $value 1302 $::CFG->{pickup} |= int $value
1338 if $value; 1303 if $value;
1339 1; 1304 1;
1340 }); 1305 });
1341 1306
1342 $table->add (3, 18, new CFPlus::UI::Button 1307 $table->add_at (3, 18, new CFPlus::UI::Button
1343 text => "set", 1308 text => "set",
1344 on_activate => sub { 1309 on_activate => sub {
1345 $::CONN->send_command ("pickup $::CFG->{pickup}") 1310 $::CONN->send_command ("pickup $::CFG->{pickup}")
1346 if defined $::CONN; 1311 if defined $::CONN;
1347 0 1312 0
1348 }); 1313 });
1349 1314
1350 $table 1315 $r
1351} 1316}
1352 1317
1353my %SORT_ORDER = ( 1318my %SORT_ORDER = (
1354 type => undef, 1319 type => undef,
1355 mtime => sub { 1320 mtime => sub {
… …
1434 has_close_button => 1 1399 has_close_button => 1
1435 ; 1400 ;
1436 1401
1437 my $ntb = 1402 my $ntb =
1438 $PL_NOTEBOOK = 1403 $PL_NOTEBOOK =
1439 new CFPlus::UI::Notebook expand => 1, debug => 1; 1404 new CFPlus::UI::Notebook expand => 1;
1440 1405
1441 $ntb->add ( 1406 $ntb->add_tab (
1442 "Statistics (F2)" => $STATS_PAGE = stats_window, 1407 "Statistics (F2)" => $STATS_PAGE = stats_window,
1443 "Shows statistics, where all your Stats and Resistances are shown." 1408 "Shows statistics, where all your Stats and Resistances are shown."
1444 ); 1409 );
1445 $ntb->add ( 1410 $ntb->add_tab (
1446 "Skills (F3)" => $SKILL_PAGE = skill_window, 1411 "Skills (F3)" => $SKILL_PAGE = skill_window,
1447 "Shows all your Skills." 1412 "Shows all your Skills."
1448 ); 1413 );
1449 1414
1450 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1415 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1451 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1416 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1452 $ntb->add ( 1417 $ntb->add_tab (
1453 "Spellbook (F4)" => $spellsw, 1418 "Spellbook (F4)" => $spellsw,
1454 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1419 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1455 ); 1420 );
1456 $ntb->add ( 1421 $ntb->add_tab (
1457 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1422 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1458 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1423 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1459 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1424 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1460 ); 1425 );
1426 $ntb->add_tab (Pickup => autopickup_setup,
1427 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1461 1428
1462 $ntb->set_current_page ($INVENTORY_PAGE); 1429 $ntb->set_current_page ($INVENTORY_PAGE);
1463 1430
1464 $plwin->add ($ntb); 1431 $plwin->add ($ntb);
1465 $plwin 1432 $plwin
… …
1662 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1629 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1663 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1630 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1664 1631
1665 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1632 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1666 1633
1667 $table->add (0, 0, new CFPlus::UI::Button 1634 $table->add_at (0, 0, new CFPlus::UI::Button
1668 text => "Close", 1635 text => "Close",
1669 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>.", 1636 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>.",
1670 on_activate => $close, 1637 on_activate => $close,
1671 ); 1638 );
1672 1639
1673 $table->add (2, 0, new CFPlus::UI::Button 1640 $table->add_at (2, 0, new CFPlus::UI::Button
1674 text => "Next", 1641 text => "Next",
1675 tooltip => "Show the next <b>Tip of the day</b>.", 1642 tooltip => "Show the next <b>Tip of the day</b>.",
1676 on_activate => sub { 1643 on_activate => sub {
1677 $close->(); 1644 $close->();
1678 &show_tip_of_the_day; 1645 &show_tip_of_the_day;
… …
1687 CFPlus::SDL_Init 1654 CFPlus::SDL_Init
1688 and die "SDL::Init failed!\n"; 1655 and die "SDL::Init failed!\n";
1689} 1656}
1690 1657
1691sub video_init { 1658sub video_init {
1692 sdl_init;
1693
1694 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1659 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1695 1660
1696 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1661 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1697 1662
1698 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1663 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1699 $FULLSCREEN = $CFG->{fullscreen}; 1664 $FULLSCREEN = $CFG->{fullscreen};
1700 $FAST = $CFG->{fast}; 1665 $FAST = $CFG->{fast};
1701 1666
1702 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1667 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1703 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1668 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1704 1669
1705 $SDL_ACTIVE = 1; 1670 $SDL_ACTIVE = 1;
1706 $LAST_REFRESH = time - 0.01; 1671 $LAST_REFRESH = time - 0.01;
1707 1672
… …
1749 1714
1750 $MAPWIDGET = new CFPlus::MapWidget; 1715 $MAPWIDGET = new CFPlus::MapWidget;
1751 $MAPWIDGET->connect (activate_console => sub { 1716 $MAPWIDGET->connect (activate_console => sub {
1752 my ($mapwidget, $preset) = @_; 1717 my ($mapwidget, $preset) = @_;
1753 1718
1754 if ($CONSOLE) { 1719 $MESSAGE_WINDOW->activate_console ($preset)
1755 $CONSOLE->{input}->{auto_activated} = 1; 1720 if $MESSAGE_WINDOW;
1756 $CONSOLE->{input}->grab_focus;
1757
1758 if ($preset && $CONSOLE->{input}->get_text eq '') {
1759 $CONSOLE->{input}->set_text ($preset);
1760 }
1761 }
1762 }); 1721 });
1763 $MAPWIDGET->show; 1722 $MAPWIDGET->show;
1764 $MAPWIDGET->grab_focus; 1723 $MAPWIDGET->grab_focus;
1765
1766 $LOGVIEW = new CFPlus::UI::TextScroller
1767 expand => 1,
1768 font => $FONT_FIXED,
1769 fontsize => $::CFG->{log_fontsize},
1770 indent => -4,
1771 can_hover => 1,
1772 can_events => 1,
1773 max_par => $CFG->{logview_max_par},
1774 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1775 ;
1776 1724
1777 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1725 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1778 title => "Setup", 1726 title => "Setup",
1779 name => "setup_dialog", 1727 name => "setup_dialog",
1780 x => 'center', 1728 x => 'center',
… …
1784 force_h => $::HEIGHT * 0.6, 1732 force_h => $::HEIGHT * 0.6,
1785 has_close_button => 1, 1733 has_close_button => 1,
1786 ; 1734 ;
1787 1735
1788 $METASERVER = metaserver_dialog; 1736 $METASERVER = metaserver_dialog;
1737 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1789 1738
1790 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1739 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1791 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1740 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 1741
1793 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1742 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1794 "Configure the server to play on, your username, password and other server-related options."); 1743 "Configure the server to play on, your username, password and other server-related options.");
1795 $SETUP_NOTEBOOK->add (Client => client_setup, 1744 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1796 "Configure various client-specific settings."); 1745 "Configure various client-specific settings.");
1797 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1798 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1799 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1746 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1800 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1747 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1801 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1748 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1802 "Configure the use of audio, sound effects and background music."); 1749 "Configure the use of audio, sound effects and background music.");
1803 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1750 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1804 "Lets you define, edit and delete key bindings." 1751 "Lets you define, edit and delete key bindings."
1805 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1752 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1806 . "with nothing set and the recording started. After doing the actions you " 1753 . "with nothing set and the recording started. After doing the actions you "
1807 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1754 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1808 . "After pressing the combo the binding will be saved automatically and the " 1755 . "After pressing the combo the binding will be saved automatically and the "
1809 . "binding editor closes"); 1756 . "binding editor closes");
1810 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1757 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1811 "Some debuggin' options. Do not ask."); 1758 "Some debuggin' options. Do not ask.");
1812 1759
1813 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1760 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1814 1761
1815 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1762 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1816 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1763 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1817 1764
1818 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1765 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1819 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1766 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1820 1767
1821 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 1768 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
1822 1769
1823 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1770 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1856 } 1803 }
1857 1804
1858 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1805 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1859} 1806}
1860 1807
1861sub setup_build_button {
1862 my ($enabled) = @_;
1863 if ($enabled) {
1864 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1865 $BUILD_BUTTON ||= new CFPlus::UI::Button
1866 text => "Build",
1867 tooltip => "Opens the ingame builder",
1868 on_activate => sub {
1869 if ($CONN) {
1870 $CONN->send_ext_req (builder_player_items => sub {
1871 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1872 });
1873 }
1874 0
1875 };
1876 $BUTTONBAR->add ($BUILD_BUTTON);
1877 } else {
1878 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1879 }
1880}
1881
1882sub open_ingame_editor {
1883 my ($msg) = @_;
1884
1885 my $win = new CFPlus::UI::Toplevel
1886 x => 0,
1887 y => 'center',
1888 z => 4,
1889 name => 'builder_window',
1890 force_w => int $WIDTH * 1/4,
1891 force_h => int $HEIGHT * 3/4,
1892 title => "In game builder",
1893 has_close_button => 1;
1894
1895 my $r = new CFPlus::UI::ScrolledWindow (
1896 expand => 1,
1897 scroll_y => 1
1898 );
1899 $r->add (my $vb = new CFPlus::UI::VBox);
1900 $win->add ($r);
1901
1902
1903 $vb->add (
1904 new CFPlus::UI::Button
1905 text => "Disable build mode",
1906 on_activate => sub { $::IN_BUILD_MODE = undef }
1907 );
1908 $vb->add (
1909 new CFPlus::UI::Button
1910 text => "ERASE",
1911 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1912 );
1913
1914 for my $itemarchname (
1915 sort {
1916 $msg->{items}->{$a}->{build_arch_name}
1917 cmp $msg->{items}->{$b}->{build_arch_name}
1918 } keys %{$msg->{items}}
1919 ) {
1920 my $info = $msg->{items}->{$itemarchname};
1921 $vb->add (
1922 new CFPlus::UI::Button text => $info->{build_arch_name},
1923 on_activate => sub {
1924 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1925
1926 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1927 build_mode_query_arch_info ();
1928 }
1929 }
1930 );
1931 }
1932
1933 $win->show;
1934}
1935
1936sub build_mode_query_arch_info {
1937 my ($iteminfo) = $::IN_BUILD_MODE;
1938 my $itemarchname = $iteminfo->{item};
1939 my $info = $iteminfo->{info};
1940
1941 my $dialog = new CFPlus::UI::Toplevel
1942 x => "center",
1943 y => "center",
1944 z => 50,
1945 force_w => int $WIDTH * 1/2,
1946 title => "Enter information for placement of '$itemarchname'",
1947 has_close_button => 1;
1948
1949 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1950
1951 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1952 my $row = 0;
1953 if ($info->{has_name}) {
1954 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1955 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1956 }
1957 if ($info->{has_text}) {
1958 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1959 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1960 }
1961 if ($info->{has_connection}) {
1962 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1963 $table->add (1, $row++,
1964 new CFPlus::UI::Entry
1965 expand => 1,
1966 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1967 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1968 );
1969 }
1970
1971 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1972 $hb->add (new CFPlus::UI::Button
1973 text => "Close",
1974 expand => 1,
1975 on_activate => sub { $dialog->hide; 0 },
1976 );
1977 $dialog->show;
1978}
1979
1980sub video_shutdown { 1808sub video_shutdown {
1981 CFPlus::OpenGL::shutdown; 1809 CFPlus::OpenGL::shutdown;
1982 1810
1983 undef $SDL_ACTIVE; 1811 undef $SDL_ACTIVE;
1984} 1812}
1985 1813
1986my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1987my $bgmusic;#TODO#hack#d#
1988
1989sub audio_channel_finished { 1814sub audio_channel_finished {
1990 my ($channel) = @_; 1815 my ($channel) = @_;
1991 1816
1992 #warn "channel $channel finished\n";#d# 1817 #warn "channel $channel finished\n";#d#
1993} 1818}
1994 1819
1820sub audio_music_set {
1821 my ($songs) = @_;
1822
1823 my @want =
1824 grep $_,
1825 map $CONN->{music_meta}{$_},
1826 @$songs;
1827
1828 if (@want) {
1829 @MUSIC_WANT = @want;
1830 &audio_music_changed ();
1831 }
1832}
1833
1834sub audio_music_start {
1835 my $path = $MUSIC_PLAYING->{path}
1836 or return;
1837
1838 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1839 return unless $SDL_MIXER;
1840
1841 # music might have changed...
1842 $path eq $MUSIC_PLAYING->{path}
1843 or return &audio_music_start ();
1844
1845 my $rwops = new_from_file CFPlus::RW $path;
1846 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops;
1847
1848 my $NOW = time;
1849
1850 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1851 my $pos = $MUSIC_PLAYING->{stop_pos};
1852 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1853 $MUSIC_START = time - $pos;
1854 } else {
1855 $MUSIC_PLAYER->play (0);
1856 $MUSIC_START = time;
1857 }
1858
1859 delete $MUSIC_PLAYING->{stop_time};
1860 delete $MUSIC_PLAYING->{stop_pos};
1861 }
1862}
1863
1864sub audio_music_changed {
1865 return unless $CFG->{bgm_enable};
1866 return unless $SDL_MIXER;
1867
1868 # default MUSIC_WANT == MUSIC_DEFAULT
1869 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1870
1871 # if the currently playing song is acceptable, let it continue
1872 return if $MUSIC_PLAYING
1873 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1874
1875 my $NOW = time;
1876
1877 if ($MUSIC_PLAYING) {
1878 $MUSIC_PLAYING->{stop_time} = $NOW;
1879 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
1880 CFPlus::MixMusic::fade_out 1000;
1881 } else {
1882 # sort by stop time, oldest first
1883 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1884
1885 # if the most recently-played piece played very recently,
1886 # resume it, else choose the oldest piece for rotation.
1887 $MUSIC_PLAYING =
1888 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1889 ? $MUSIC_WANT[-1]
1890 : $MUSIC_WANT[0];
1891
1892 audio_music_start;
1893 }
1894}
1895
1995sub audio_music_finished { 1896sub audio_music_finished {
1996 return unless $CFG->{bgm_enable}; 1897 $MUSIC_PLAYING = undef;
1898 undef $MUSIC_PLAYER;
1997 1899
1998 # TODO: hack, do play loop and mood music 1900 audio_music_changed;
1999 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2000 $bgmusic->play (0);
2001
2002 push @bgmusic, shift @bgmusic;
2003} 1901}
2004 1902
2005sub audio_init { 1903sub audio_init {
2006 if ($CFG->{audio_enable}) { 1904 if ($CFG->{audio_enable}) {
2007 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1905 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1906 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2008 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1907 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2009 1908
2010 unless ($SDL_MIXER) { 1909 unless ($SDL_MIXER) {
2011 status "Unable to open sound device: there will be no sound"; 1910 status "Unable to open sound device: there will be no sound";
2012 return; 1911 return;
… …
2025 my ($file, $volume, $event) = split /\s+/, $_, 3; 1924 my ($file, $volume, $event) = split /\s+/, $_, 3;
2026 1925
2027 push @SOUNDS, "$volume,$file"; 1926 push @SOUNDS, "$volume,$file";
2028 1927
2029 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1928 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2030 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file"; 1929 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1930 my $chunk = new CFPlus::MixChunk $rwops;
2031 $chunk->volume ($volume * 128 / 100); 1931 $chunk->volume ($volume * 128 / 100);
2032 $chunk 1932 $chunk
2033 }; 1933 };
2034 } 1934 }
2035 } else { 1935 } else {
2036 status "unable to open sound config: $!"; 1936 status "unable to open sound config: $!";
2037 } 1937 }
1938 } else {
1939 undef $SDL_MIXER;
2038 } 1940 }
2039} 1941}
2040 1942
2041sub audio_shutdown { 1943sub audio_shutdown {
2042 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1944 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
2057 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1959 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2058 1960
2059 $CFPlus::UI::ROOT->draw; 1961 $CFPlus::UI::ROOT->draw;
2060 1962
2061 $WANT_REFRESH = 0; 1963 $WANT_REFRESH = 0;
2062 $CAN_REFRESH = 0; 1964 $CAN_REFRESH = 0;
2063 $LAST_REFRESH = $NOW; 1965 $LAST_REFRESH = $NOW;
2064 1966
2065 CFPlus::SDL_GL_SwapBuffers; 1967 CFPlus::SDL_GL_SwapBuffers;
2066} 1968}
2067 1969
2068my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1970my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2069 $NOW = time; 1971 $NOW = time;
2070 1972
2071 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1973 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2072 for CFPlus::SDL_PollEvent; 1974 for CFPlus::poll_events;
2073 1975
2074 if (%animate_object) { 1976 if (%animate_object) {
2075 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1977 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2076 $WANT_REFRESH++; 1978 ++$WANT_REFRESH;
2077 } 1979 }
2078 1980
2079 if ($WANT_REFRESH) { 1981 if ($WANT_REFRESH) {
2080 force_refresh; 1982 force_refresh;
2081 } else { 1983 } else {
… …
2111 CFPlus::SDL_VIDEOEXPOSE => sub { 2013 CFPlus::SDL_VIDEOEXPOSE => sub {
2112 CFPlus::UI::full_refresh; 2014 CFPlus::UI::full_refresh;
2113 }, 2015 },
2114 CFPlus::SDL_ACTIVEEVENT => sub { 2016 CFPlus::SDL_ACTIVEEVENT => sub {
2115# not useful, as APPACTIVE include sonly iconified state, not unmapped 2017# not useful, as APPACTIVE include sonly iconified state, not unmapped
2116# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2018# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2019# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2117# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2020# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2118# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2021# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2119# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2022# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2120 }, 2023 },
2121 CFPlus::SDL_KEYDOWN => sub { 2024 CFPlus::SDL_KEYDOWN => sub {
… …
2157 height => 480, 2060 height => 480,
2158 fullscreen => 0, 2061 fullscreen => 0,
2159 fast => 0, 2062 fast => 0,
2160 map_scale => 1, 2063 map_scale => 1,
2161 fow_enable => 1, 2064 fow_enable => 1,
2162 fow_intensity => 0.45, 2065 fow_intensity => 0,
2163 fow_smooth => 0,
2164 map_smoothing => 1, 2066 map_smoothing => 1,
2165 gui_fontsize => 1, 2067 gui_fontsize => 1,
2166 log_fontsize => 0.7, 2068 log_fontsize => 0.7,
2167 gauge_fontsize => 1, 2069 gauge_fontsize => 1,
2168 gauge_size => 0.35, 2070 gauge_size => 0.35,
2169 stat_fontsize => 0.7, 2071 stat_fontsize => 0.7,
2170 mapsize => 100, 2072 mapsize => 100,
2171 say_command => 'chat',
2172 audio_enable => 1, 2073 audio_enable => 1,
2173 bgm_enable => 1, 2074 bgm_enable => 1,
2174 bgm_volume => 0.25, 2075 bgm_volume => 0.25,
2175 face_prefetch => 0, 2076 face_prefetch => 0,
2176 output_sync => 1, 2077 output_sync => 1,
… …
2202 } 2103 }
2203 } 2104 }
2204 2105
2205 sdl_init; 2106 sdl_init;
2206 2107
2207 @SDL_MODES = reverse 2108 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2208 grep $_->[0] >= 640 && $_->[1] >= 480, 2109 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2209 CFPlus::SDL_ListModes;
2210
2211 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2110 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2111
2112 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2212 2113
2213 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2114 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2214 2115
2215 { 2116 {
2216 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2117 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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