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.136 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 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}
… …
58use Compress::LZF; 80use Compress::LZF;
59 81
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
63use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
64use CFPlus::Pod; 89use CFPlus::Pod;
65use CFPlus::BindingEditor;
66use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
67 92
68$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
70 95
71$Event::Eval = 0; 96$Event::Eval = 1;
72$Event::DIED = sub { 97$Event::DIED = sub {
73 CFPlus::fatal Carp::longmess $_[1] 98 CFPlus::fatal Carp::longmess $_[1]
74}; 99};
75 100
76my $MAX_FPS = 60; 101my $MAX_FPS = 60;
… …
134 159
135our $SDL_ACTIVE; 160our $SDL_ACTIVE;
136our %SDL_CB; 161our %SDL_CB;
137 162
138our $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
139our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
141 172
142our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 174our $STATUSBOX;
… …
145 176
146our $INV; 177our $INV;
147our $INVR; 178our $INVR;
148our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
149 180
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 181our $PICKUP_CFG;
154 182
155our $IN_BUILD_MODE; 183our $IN_BUILD_MODE;
156our $BUILD_BUTTON; 184our $BUILD_BUTTON;
157 185
… …
177sub destroy_query_dialog { 205sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
180} 208}
181 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
182# server query dialog 213# server query dialog
183sub server_query { 214sub server_query {
184 my ($conn, $flags, $prompt) = @_; 215 my ($conn, $flags, $prompt) = @_;
216
217 # FIXME: a very ugly hack to wait for stat update #d#
218 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
219 unless ($QUERY_TIMER) {
220 $QUERY_TIMER =
221 Event->timer (
222 after => 1,
223 cb => sub {
224 server_query ($conn, $flags, $prompt, 1);
225 $QUERY_TIMER = undef
226 }
227 );
228 return;
229 }
230 }
185 231
186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
187 x => "center", 233 x => "center",
188 y => "center", 234 y => "center",
189 title => "Server Query", 235 title => "Server Query",
190 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
191 ; 237 ;
192 238
193 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
194 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
195 ellipsise => 0, 241 ellipsise => 0,
196 text => $prompt; 242 text => $prompt;
197 243
198 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
199 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
216 ); 262 );
217 263
218 $dialog->grab_focus; 264 $dialog->grab_focus;
219 265
220 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
221 $dialog->{tooltip} = "#charcreation_focus";
222
223 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
224 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
225 269
226 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
227 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
228 ellipsise => 0, 272 ellipsise => 0,
229 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
230 274
231 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
232 276
… …
244 $conn->send ("reply d"); 288 $conn->send ("reply d");
245 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
246 0 290 0
247 }, 291 },
248 ); 292 );
293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
249 316
250 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
251 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
252 ellipsise => 0, 319 ellipsise => 0,
253 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
378 status "logging in..."; 445 status "logging in...";
379 446
380 $LOGIN_BUTTON->set_text ("Logout"); 447 $LOGIN_BUTTON->set_text ("Logout");
381 $SETUP_DIALOG->hide; 448 $SETUP_DIALOG->hide;
382 449
383 $PROFILE = $CFG->{profile}{default};
384
385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 450 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
386 451
387 my ($host, $port) = split /:/, $PROFILE->{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
388 453
389 $MAP = new CFPlus::Map; 454 $MAP = new CFPlus::Map;
… …
404 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
405 map => $MAP, 470 map => $MAP,
406 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
407 query => \&server_query, 472 query => \&server_query,
408 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
409 sound_play => sub { 478 sound_play => sub {
410 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
411 480
412 $SDL_MIXER 481 $SDL_MIXER
413 or return; 482 or return;
… …
433 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
435 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
436 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
437 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
438 510
439 return unless $CONN; 511 return unless $CONN;
440 512
441 status "connection closed"; 513 status "connection closed";
442 514
… …
450sub graphics_setup { 522sub graphics_setup {
451 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
452 524
453 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
454 526
527 my $row = 0;
528
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533
534 my $vidmode_tooltip =
535 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
536 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
537
455 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
456 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
457 540
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
458 $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]); 542 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
459 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 543 tooltip => $vidmode_tooltip);
544 $hbox->add (my $mode_label = new CFPlus::UI::Label
545 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
546 can_events => 1, tooltip => $vidmode_tooltip);
460 547
461 $mode_slider->connect (changed => sub { 548 $mode_slider->connect (changed => sub {
462 my ($self, $value) = @_; 549 my ($self, $value) = @_;
463 550
464 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
465 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
466 }); 553 });
467 $mode_slider->emit (changed => $mode_slider->{range}[0]); 554 $mode_slider->emit (changed => $mode_slider->{range}[0]);
468
469 my $row = 1;
470 555
471 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
472 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
473 state => $CFG->{fullscreen}, 558 state => $CFG->{fullscreen},
474 tooltip => "Bring the client into fullscreen mode.", 559 tooltip => "Bring the client into fullscreen mode.",
… …
480 state => $CFG->{fast}, 565 state => $CFG->{fast},
481 tooltip => "Lower the visual quality considerably to speed up rendering.", 566 tooltip => "Lower the visual quality considerably to speed up rendering.",
482 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 567 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
483 ); 568 );
484 569
570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
571 $table->add (1, $row++, new CFPlus::UI::Slider
572 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
573 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
574 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
575 );
576
577 $table->add (1, $row++, new CFPlus::UI::Button
578 expand => 1, align => 0, text => "Apply",
579 tooltip => "Apply the video settings above.",
580 on_activate => sub {
581 video_shutdown ();
582 video_init ();
583 0
584 }
585 );
586
485 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
486 $table->add (1, $row++, new CFPlus::UI::Slider 588 $table->add (1, $row++, new CFPlus::UI::Slider
487 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
488 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
489 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
490 ); 592 );
491 593
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
595 $table->add (1, $row++, new CFPlus::UI::CheckBox
596 state => $CFG->{map_smoothing},
597 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
598 . "This increases load on the graphics subsystem and works only with 2.x servers. "
599 . "Changes take effect at next connection only.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
601 );
602
492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
493 $table->add (1, $row++, new CFPlus::UI::CheckBox 604 $table->add (1, $row++, new CFPlus::UI::CheckBox
494 state => $CFG->{fow_enable}, 605 state => $CFG->{fow_enable},
495 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 606 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
496 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 607 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
… …
501 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 612 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
502 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 613 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
503 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 614 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
504 ); 615 );
505 616
506 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
507 $table->add (1, $row++, new CFPlus::UI::CheckBox 618 $table->add (1, $row++, new CFPlus::UI::CheckBox
508 state => $CFG->{fow_smooth}, 619 state => $CFG->{fow_smooth},
509 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 620 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
510 on_changed => sub { 621 on_changed => sub {
511 my ($self, $value) = @_; 622 my ($self, $value) = @_;
512 $CFG->{fow_smooth} = $value; 623 $CFG->{fow_smooth} = $value;
513 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
514 0 624 0
515 } 625 }
516 );
517
518 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
519 $table->add (1, $row++, new CFPlus::UI::Slider
520 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
521 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
522 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
523 ); 626 );
524 627
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
526 $table->add (1, $row++, new CFPlus::UI::Slider 629 $table->add (1, $row++, new CFPlus::UI::Slider
527 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 630 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
… …
545 range => [$CFG->{gauge_size}, 0.2, 0.8], 648 range => [$CFG->{gauge_size}, 0.2, 0.8],
546 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 649 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
547 on_changed => sub { 650 on_changed => sub {
548 $CFG->{gauge_size} = $_[1]; 651 $CFG->{gauge_size} = $_[1];
549 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 652 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
550 0
551 }
552 );
553
554 $table->add (1, $row++, new CFPlus::UI::Button
555 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the video settings",
557 on_activate => sub {
558 video_shutdown ();
559 video_init ();
560 0 653 0
561 } 654 }
562 ); 655 );
563 656
564 $vbox 657 $vbox
… …
669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 762 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
670 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 763 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
671 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 764 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
672 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 765 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
673 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 766 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 767 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
675
676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
677
678 for my $x (0..2) {
679 for my $y (0 .. 2) {
680 $table->add ($x + 3, $y,
681 new CFPlus::UI::Entry
682 text => $default_smooth[$x * 3 + $y],
683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
684 );
685 }
686 }
687 768
688 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 769 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
689 770
690 $table 771 $table
691} 772}
… …
890 for 0 .. $#col; 971 for 0 .. $#col;
891 972
892 my @align = qw(1 0 1 1 -1); 973 my @align = qw(1 0 1 1 -1);
893 974
894 my $y = 0; 975 my $y = 0;
895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} } 976 for my $m (@{ $msg->{servers} }) {
901 ) {
902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 977 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 978 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 979
905 for ($desc) { 980 for ($desc) {
906 s/<br>/\n/gi; 981 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 982 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 983 s/<.*?>//sgi;
… …
938 max_w => $::WIDTH * 0.4, 1013 max_w => $::WIDTH * 0.4,
939 ellipsise => 0, 1014 ellipsise => 0,
940 align => $align[$_], 1015 align => $align[$_],
941 text => $m->[$_], 1016 text => $m->[$_],
942 tooltip => $tip[$_], 1017 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1018 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
944 can_hover => 1, 1019 can_hover => 1,
945 can_events => 1, 1020 can_events => 1,
946 fontsize => 0.8) 1021 fontsize => 0.8)
947 for 0 .. $#$m; 1022 for 0 .. $#$m;
948 } 1023 }
… …
1049 . "so only set it if you really need to prefetch images. " 1124 . "so only set it if you really need to prefetch images. "
1050 . "This option can be set and unset any time.", 1125 . "This option can be set and unset any time.",
1051 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1126 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1052 ); 1127 );
1053 1128
1054 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1129 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1055 $table->add (1, 9, new CFPlus::UI::Entry 1130 $table->add (1, 9, new CFPlus::UI::Entry
1131 text => $CFG->{output_rate},
1132 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1133 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1134 . "default will be used, which is usually around 100kb/s.",
1135 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1136 );
1137
1138 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1139 $table->add (1, 10, new CFPlus::UI::Entry
1056 text => $CFG->{output_count}, 1140 text => $CFG->{output_count},
1057 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1141 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1058 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1142 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1059 ); 1143 );
1060 1144
1061 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1145 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1062 $table->add (1, 10, new CFPlus::UI::Entry 1146 $table->add (1, 11, new CFPlus::UI::Entry
1063 text => $CFG->{output_sync}, 1147 text => $CFG->{output_sync},
1064 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1148 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1065 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1149 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1066 ); 1150 );
1067 1151
1068 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1152 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1069 expand => 1, 1153 expand => 1,
1070 align => 0, 1154 align => 0,
1071 text => "Login", 1155 text => "Login",
1072 on_activate => sub { 1156 on_activate => sub {
1073 $CONN ? stop_game 1157 $CONN ? stop_game
1074 : start_game; 1158 : start_game;
1075 0 1159 0
1076 }, 1160 },
1077 ); 1161 );
1078 1162
1163 $vbox->add (new CFPlus::UI::FancyFrame
1164 label => "Server Info",
1165 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1166 );
1167
1168 $vbox
1169}
1170
1171sub client_setup {
1172 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1173
1174 my $row = 0;
1175
1079 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1176 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1081 text => $CFG->{say_command}, 1178 text => $CFG->{say_command},
1082 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. " 1179 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. "
1083 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1180 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1084 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1181 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1085 on_changed => sub { 1182 on_changed => sub {
1086 my ($self, $value) = @_; 1183 my ($self, $value) = @_;
1087 $CFG->{say_command} = $value; 1184 $CFG->{say_command} = $value;
1088 0 1185 0
1089 } 1186 }
1090 ); 1187 );
1091 1188
1092 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1189 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1093 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1190 $table->add (1, $row++, new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips}, 1191 state => $CFG->{show_tips},
1095 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1192 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1096 on_changed => sub { 1193 on_changed => sub {
1097 my ($self, $value) = @_; 1194 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value; 1195 $CFG->{show_tips} = $value;
1099 0 1196 0
1100 } 1197 }
1101 ); 1198 );
1102 1199
1103 $vbox->add (new CFPlus::UI::FancyFrame 1200 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1104 label => "Server Info", 1201 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1105 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1202 text => $CFG->{logview_max_par},
1203 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1204 . "sends more messages than this number, older messages get removed to save memory and "
1205 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1206 on_changed => sub {
1207 my ($self, $value) = @_;
1208 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1209 0
1210 },
1106 ); 1211 );
1107 1212
1108 $vbox 1213 $table
1109} 1214}
1110 1215
1111sub message_window { 1216sub message_window {
1112 my $window = new CFPlus::UI::Toplevel 1217 my $window = new CFPlus::UI::Toplevel
1113 name => "message_window", 1218 name => "message_window",
… …
1170 1275
1171 $window 1276 $window
1172} 1277}
1173 1278
1174sub autopickup_setup { 1279sub autopickup_setup {
1280 my $r = new CFPlus::UI::ScrolledWindow (
1281 expand => 1,
1282 scroll_y => 1
1283 );
1175 my $table = new CFPlus::UI::Table; 1284 $r->add (my $table = new CFPlus::UI::Table
1285 row_expand => [0],
1286 col_expand => [0, 1, 0, 1],
1287 );
1176 1288
1177 for ( 1289 for (
1178 ["General", 0, 0, 1290 ["General", 0, 0,
1179 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1291 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1180 ["Inhibit autopickup" => PICKUP_INHIBIT], 1292 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1376 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1377 if defined $::CONN;
1266 0 1378 0
1267 }); 1379 });
1268 1380
1269 $table 1381 $r
1270} 1382}
1271 1383
1272my %SORT_ORDER = ( 1384my %SORT_ORDER = (
1273 type => undef, 1385 type => undef,
1274 mtime => sub { 1386 mtime => sub {
… …
1353 has_close_button => 1 1465 has_close_button => 1
1354 ; 1466 ;
1355 1467
1356 my $ntb = 1468 my $ntb =
1357 $PL_NOTEBOOK = 1469 $PL_NOTEBOOK =
1358 new CFPlus::UI::Notebook expand => 1, debug => 1; 1470 new CFPlus::UI::Notebook expand => 1;
1359 1471
1360 $ntb->add ( 1472 $ntb->add (
1361 "Statistics (F2)" => $STATS_PAGE = stats_window, 1473 "Statistics (F2)" => $STATS_PAGE = stats_window,
1362 "Shows statistics, where all your Stats and Resistances are shown." 1474 "Shows statistics, where all your Stats and Resistances are shown."
1363 ); 1475 );
… …
1375 $ntb->add ( 1487 $ntb->add (
1376 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1488 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1377 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1489 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1378 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1490 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1379 ); 1491 );
1492 $ntb->add (Pickup => autopickup_setup,
1493 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1380 1494
1381 $ntb->set_current_page ($INVENTORY_PAGE); 1495 $ntb->set_current_page ($INVENTORY_PAGE);
1382 1496
1383 $plwin->add ($ntb); 1497 $plwin->add ($ntb);
1384 $plwin 1498 $plwin
1385} 1499}
1386 1500
1387sub update_bindings {
1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1389}
1390
1391sub keyboard_setup { 1501sub keyboard_setup {
1392 my $binding_list = new CFPlus::UI::VBox; 1502 CFPlus::Macro::keyboard_setup
1393
1394 my $refresh;
1395 $refresh = $BIND_UPD_CB = sub {
1396 $binding_list->clear ();
1397
1398 return unless $PROFILE;
1399
1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1404
1405 my $lbl = join "; ", @$cmds;
1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1408 $hb->add (new CFPlus::UI::Button
1409 text => "delete",
1410 tooltip => "Deletes the binding",
1411 on_activate => sub {
1412 $binding_list->remove ($hb);
1413 delete $PROFILE->{bindings}{$mod}{$sym};
1414 0
1415 });
1416
1417 $hb->add (new CFPlus::UI::Button
1418 text => "edit",
1419 tooltip => "Edits the binding",
1420 on_activate => sub {
1421 $::BIND_EDITOR->set_binding (
1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1423 sub {
1424 my ($nmod, $nsym, $ncmds) = @_;
1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1427 $refresh->();
1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1429 $SETUP_DIALOG->show;
1430 },
1431 sub {
1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1433 $SETUP_DIALOG->show;
1434 });
1435 $::BIND_EDITOR->show;
1436 $SETUP_DIALOG->hide;
1437 0
1438 });
1439
1440 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1441 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1442 }
1443 }
1444 };
1445
1446 my $vb = new CFPlus::UI::VBox;
1447 $vb->add (new CFPlus::UI::FancyFrame
1448 label => "Options",
1449 child => (my $hb = new CFPlus::UI::HBox),
1450 );
1451 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1452 $hb->add (new CFPlus::UI::CheckBox
1453 expand => 1,
1454 state => $CFG->{shift_fire_stop},
1455 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1456 on_changed => sub {
1457 my ($cbox, $value) = @_;
1458 $CFG->{shift_fire_stop} = $value;
1459 0
1460 });
1461
1462 $vb->add (new CFPlus::UI::FancyFrame
1463 label => "Bindings",
1464 child => $binding_list);
1465 $vb->add (my $hb = new CFPlus::UI::HBox);
1466
1467 $hb->add (new CFPlus::UI::Button
1468 text => "record new",
1469 expand => 1,
1470 tooltip => "This button opens the binding editor with an empty binding.",
1471 on_activate => sub {
1472 $::BIND_EDITOR->set_binding (undef, undef, [],
1473 sub {
1474 my ($mod, $sym, $cmds) = @_;
1475 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1476 $refresh->();
1477 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1478 $SETUP_DIALOG->show;
1479 },
1480 sub {
1481 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1482 $SETUP_DIALOG->show;
1483 },
1484 );
1485 $SETUP_DIALOG->hide;
1486 $::BIND_EDITOR->show;
1487 0
1488 },
1489 );
1490
1491 $hb->add (new CFPlus::UI::Button
1492 text => "close",
1493 tooltip => "Closes the binding window",
1494 expand => 1,
1495 on_activate => sub {
1496 $SETUP_DIALOG->hide;
1497 0
1498 }
1499 );
1500
1501 $refresh->();
1502
1503 $vb
1504} 1503}
1505 1504
1506sub help_window { 1505sub help_window {
1507 my $win = new CFPlus::UI::Toplevel 1506 my $win = new CFPlus::UI::Toplevel
1508 x => 'center', 1507 x => 'center',
… …
1665 1664
1666sub show_tip_of_the_day { 1665sub show_tip_of_the_day {
1667 # find all tips 1666 # find all tips
1668 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1669 1668
1670 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1669 CFPlus::DB::get state => "tip_of_the_day", sub {
1670 my ($todindex) = @_;
1671 $todindex = 0 if $todindex >= @tod; 1671 $todindex = 0 if $todindex >= @tod;
1672 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1672 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1673 1673
1674 # create dialog 1674 # create dialog
1675 my $dialog; 1675 my $dialog;
1676 1676
1677 my $close = sub { 1677 my $close = sub {
1678 $dialog->destroy; 1678 $dialog->destroy;
1679 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1679 }; 1716 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1716} 1717}
1717 1718
1718sub sdl_init { 1719sub sdl_init {
1719 CFPlus::SDL_Init 1720 CFPlus::SDL_Init
1720 and die "SDL::Init failed!\n"; 1721 and die "SDL::Init failed!\n";
1721} 1722}
1722 1723
1723sub video_init { 1724sub video_init {
1724 sdl_init;
1725
1726 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1727 1726
1728 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1729 1728
1730 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1729 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1731 $FULLSCREEN = $CFG->{fullscreen}; 1730 $FULLSCREEN = $CFG->{fullscreen};
1732 $FAST = $CFG->{fast}; 1731 $FAST = $CFG->{fast};
1733 1732
1734 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1735 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1736 1735
1737 $SDL_ACTIVE = 1; 1736 $SDL_ACTIVE = 1;
1738 $LAST_REFRESH = time - 0.01; 1737 $LAST_REFRESH = time - 0.01;
1739 1738
… …
1754 padding => 0, 1753 padding => 0,
1755 z => 100, 1754 z => 100,
1756 force_x => "max", 1755 force_x => "max",
1757 force_y => 0; 1756 force_y => 0;
1758 $DEBUG_STATUS->show; 1757 $DEBUG_STATUS->show;
1759
1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1761 1758
1762 $STATUSBOX = new CFPlus::UI::Statusbox; 1759 $STATUSBOX = new CFPlus::UI::Statusbox;
1763 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1760 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1764 1761
1765 (new CFPlus::UI::Frame 1762 (new CFPlus::UI::Frame
… …
1802 font => $FONT_FIXED, 1799 font => $FONT_FIXED,
1803 fontsize => $::CFG->{log_fontsize}, 1800 fontsize => $::CFG->{log_fontsize},
1804 indent => -4, 1801 indent => -4,
1805 can_hover => 1, 1802 can_hover => 1,
1806 can_events => 1, 1803 can_events => 1,
1804 max_par => $CFG->{logview_max_par},
1807 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1805 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1808 ; 1806 ;
1809 1807
1810 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1808 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1811 title => "Setup", 1809 title => "Setup",
1812 name => "setup_dialog", 1810 name => "setup_dialog",
… …
1823 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1821 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1824 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1822 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1825 1823
1826 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1824 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1827 "Configure the server to play on, your username, password and other server-related options."); 1825 "Configure the server to play on, your username, password and other server-related options.");
1828 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1826 $SETUP_NOTEBOOK->add (Client => client_setup,
1829 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1827 "Configure various client-specific settings.");
1830 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1828 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1831 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1829 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1832 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1830 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1833 "Configure the use of audio, sound effects and background music."); 1831 "Configure the use of audio, sound effects and background music.");
1834 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1832 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1890} 1888}
1891 1889
1892sub setup_build_button { 1890sub setup_build_button {
1893 my ($enabled) = @_; 1891 my ($enabled) = @_;
1894 if ($enabled) { 1892 if ($enabled) {
1893 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button 1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build", 1895 text => "Build",
1897 tooltip => "Opens the ingame builder", 1896 tooltip => "Opens the ingame builder",
1898 on_activate => sub { 1897 on_activate => sub {
1899 if ($CONN) { 1898 if ($CONN) {
… …
2011 CFPlus::OpenGL::shutdown; 2010 CFPlus::OpenGL::shutdown;
2012 2011
2013 undef $SDL_ACTIVE; 2012 undef $SDL_ACTIVE;
2014} 2013}
2015 2014
2016my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2017my $bgmusic;#TODO#hack#d#
2018
2019sub audio_channel_finished { 2015sub audio_channel_finished {
2020 my ($channel) = @_; 2016 my ($channel) = @_;
2021 2017
2022 #warn "channel $channel finished\n";#d# 2018 #warn "channel $channel finished\n";#d#
2023} 2019}
2024 2020
2021sub audio_music_set {
2022 my ($songs) = @_;
2023
2024 my @want =
2025 grep $_,
2026 map $CONN->{music_meta}{$_},
2027 @$songs;
2028
2029 if (@want) {
2030 @MUSIC_WANT = @want;
2031 &audio_music_changed ();
2032 }
2033}
2034
2035sub audio_music_start {
2036 my $path = $MUSIC_PLAYING->{path}
2037 or return;
2038
2039 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2040 # music might have changed...
2041 $path eq $MUSIC_PLAYING->{path}
2042 or return &audio_music_start ();
2043
2044 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2045
2046 my $NOW = time;
2047
2048 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2049 my $pos = $MUSIC_PLAYING->{stop_pos};
2050 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2051 $MUSIC_START = time - $pos;
2052 } else {
2053 $MUSIC_PLAYER->play (0);
2054 $MUSIC_START = time;
2055 }
2056
2057 delete $MUSIC_PLAYING->{stop_time};
2058 delete $MUSIC_PLAYING->{stop_pos};
2059 }
2060}
2061
2062sub audio_music_changed {
2063 return unless $CFG->{bgm_enable};
2064
2065 # default MUSIC_WANT == MUSIC_DEFAULT
2066 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2067
2068 # if the currently playing song is acceptable, let it continue
2069 return if $MUSIC_PLAYING
2070 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2071
2072 my $NOW = time;
2073
2074 if ($MUSIC_PLAYING) {
2075 $MUSIC_PLAYING->{stop_time} = $NOW;
2076 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2077 CFPlus::MixMusic::fade_out 1000;
2078 } else {
2079 # sort by stop time, oldest first
2080 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2081
2082 # if the most recently-played piece played very recently,
2083 # resume it, else choose the oldest piece for rotation.
2084 $MUSIC_PLAYING =
2085 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2086 ? $MUSIC_WANT[-1]
2087 : $MUSIC_WANT[0];
2088
2089 audio_music_start;
2090 }
2091}
2092
2025sub audio_music_finished { 2093sub audio_music_finished {
2026 return unless $CFG->{bgm_enable}; 2094 $MUSIC_PLAYING = undef;
2095 undef $MUSIC_PLAYER;
2027 2096
2028 # TODO: hack, do play loop and mood music 2097 audio_music_changed;
2029 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2030 $bgmusic->play (0);
2031
2032 push @bgmusic, shift @bgmusic;
2033} 2098}
2034 2099
2035sub audio_init { 2100sub audio_init {
2036 if ($CFG->{audio_enable}) { 2101 if ($CFG->{audio_enable}) {
2037 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2102 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2087 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2152 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2088 2153
2089 $CFPlus::UI::ROOT->draw; 2154 $CFPlus::UI::ROOT->draw;
2090 2155
2091 $WANT_REFRESH = 0; 2156 $WANT_REFRESH = 0;
2092 $CAN_REFRESH = 0; 2157 $CAN_REFRESH = 0;
2093 $LAST_REFRESH = $NOW; 2158 $LAST_REFRESH = $NOW;
2094 2159
2095 CFPlus::SDL_GL_SwapBuffers; 2160 CFPlus::SDL_GL_SwapBuffers;
2096} 2161}
2097 2162
2098my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2163my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2099 $NOW = time; 2164 $NOW = time;
2100 2165
2101 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2102 for CFPlus::SDL_PollEvent; 2167 for CFPlus::poll_events;
2103 2168
2104 if (%animate_object) { 2169 if (%animate_object) {
2105 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2106 $WANT_REFRESH++; 2171 ++$WANT_REFRESH;
2107 } 2172 }
2108 2173
2109 if ($WANT_REFRESH) { 2174 if ($WANT_REFRESH) {
2110 force_refresh; 2175 force_refresh;
2111 } else { 2176 } else {
… …
2132 if $CONN; 2197 if $CONN;
2133}); 2198});
2134 2199
2135%SDL_CB = ( 2200%SDL_CB = (
2136 CFPlus::SDL_QUIT => sub { 2201 CFPlus::SDL_QUIT => sub {
2137 Event::unloop -1; 2202 exit;
2138 }, 2203 },
2139 CFPlus::SDL_VIDEORESIZE => sub { 2204 CFPlus::SDL_VIDEORESIZE => sub {
2140 }, 2205 },
2141 CFPlus::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
2142 CFPlus::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
2143 }, 2208 },
2144 CFPlus::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
2145# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2210# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2212# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2213# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2214# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2215# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2146 }, 2216 },
2147 CFPlus::SDL_KEYDOWN => sub { 2217 CFPlus::SDL_KEYDOWN => sub {
2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2218 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2149 # alt-enter 2219 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle; 2220 $FULLSCREEN_ENABLE->toggle;
… …
2171 2241
2172$SIG{INT} = $SIG{TERM} = sub { exit }; 2242$SIG{INT} = $SIG{TERM} = sub { exit };
2173 2243
2174{ 2244{
2175 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2245 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2246 CFPlus::DB::Server::run;
2247
2176 CFPlus::UI::set_layout ($::CFG->{layout}); 2248 CFPlus::UI::set_layout ($::CFG->{layout});
2177 2249
2178 my %DEF_CFG = ( 2250 my %DEF_CFG = (
2179 sdl_mode => 0, 2251 sdl_mode => 0,
2180 width => 640, 2252 width => 640,
2181 height => 480, 2253 height => 480,
2182 fullscreen => 0, 2254 fullscreen => 0,
2183 fast => 0, 2255 fast => 0,
2184 map_scale => 1, 2256 map_scale => 1,
2185 fow_enable => 1, 2257 fow_enable => 1,
2186 fow_intensity => 0.45, 2258 fow_intensity => 0,
2187 fow_smooth => 0, 2259 fow_smooth => 1,
2260 map_smoothing => 1,
2188 gui_fontsize => 1, 2261 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2262 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2263 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2264 gauge_size => 0.35,
2192 stat_fontsize => 0.7, 2265 stat_fontsize => 0.7,
2193 mapsize => 100, 2266 mapsize => 100,
2194 say_command => 'chat', 2267 say_command => 'chat',
2195 audio_enable => 1, 2268 audio_enable => 1,
2196 bgm_enable => 1, 2269 bgm_enable => 1,
2197 bgm_volume => 0.25, 2270 bgm_volume => 0.25,
2198 face_prefetch => 0, 2271 face_prefetch => 0,
2199 output_sync => 1, 2272 output_sync => 1,
2200 output_count => 1, 2273 output_count => 1,
2274 output_rate => "",
2201 pickup => 0, 2275 pickup => 0,
2202 inv_sort => "mtime", 2276 inv_sort => "mtime",
2203 default => "profile", # default profile 2277 default => "profile", # default profile
2204 show_tips => 1, 2278 show_tips => 1,
2279 logview_max_par => 1000,
2205 ); 2280 );
2206 2281
2207 while (my ($k, $v) = each %DEF_CFG) { 2282 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2283 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2284 }
2210 2285
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2286 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2287 $PROFILE = $CFG->{profile}{default};
2288
2289 # convert old bindings (only default profile matters)
2290 if (my $bindings = delete $PROFILE->{bindings}) {
2291 while (my ($mod, $syms) = each %$bindings) {
2292 while (my ($sym, $cmds) = each %$syms) {
2293 push @{ $PROFILE->{macro} }, {
2294 accelkey => [$mod*1, $sym*1],
2295 action => $cmds,
2296 };
2297 }
2298 }
2299 }
2212 2300
2213 sdl_init; 2301 sdl_init;
2214 2302
2215 @SDL_MODES = reverse 2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2216 grep $_->[0] >= 640 && $_->[1] >= 480, 2304 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2217 CFPlus::SDL_ListModes;
2218
2219 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2305 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2220 2306
2221 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2222 2308
2223 { 2309 {
… …
2265 2351
2266Event::loop; 2352Event::loop;
2267#CFPlus::SDL_Quit; 2353#CFPlus::SDL_Quit;
2268#CFPlus::_exit 0; 2354#CFPlus::_exit 0;
2269 2355
2356END {
2270END { CFPlus::SDL_Quit } 2357 CFPlus::SDL_Quit;
2358 CFPlus::DB::Server::stop;
2359}
2271 2360
2272=head1 NAME 2361=head1 NAME
2273 2362
2274cfplus - A Crossfire+ and Crossfire game client 2363cfplus - A Crossfire+ and Crossfire game client
2275 2364

Diff Legend

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