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.160 by root, Thu Jul 5 06:51:04 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;
… …
145 170
146our $INV; 171our $INV;
147our $INVR; 172our $INVR;
148our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
149 174
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 175our $PICKUP_CFG;
154 176
155our $IN_BUILD_MODE; 177our $IN_BUILD_MODE;
156our $BUILD_BUTTON; 178our $BUILD_BUTTON;
157 179
… …
177sub destroy_query_dialog { 199sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
180} 202}
181 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
182# server query dialog 207# server query dialog
183sub server_query { 208sub server_query {
184 my ($conn, $flags, $prompt) = @_; 209 my ($conn, $flags, $prompt) = @_;
210
211 # FIXME: a very ugly hack to wait for stat update #d#
212 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
213 unless ($QUERY_TIMER) {
214 $QUERY_TIMER =
215 Event->timer (
216 after => 1,
217 cb => sub {
218 server_query ($conn, $flags, $prompt, 1);
219 $QUERY_TIMER = undef
220 }
221 );
222 return;
223 }
224 }
185 225
186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
187 x => "center", 227 x => "center",
188 y => "center", 228 y => "center",
189 title => "Server Query", 229 title => "Server Query",
190 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
191 ; 231 ;
192 232
193 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
194 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
195 ellipsise => 0, 235 ellipsise => 0,
196 text => $prompt; 236 text => $prompt;
197 237
198 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
199 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
216 ); 256 );
217 257
218 $dialog->grab_focus; 258 $dialog->grab_focus;
219 259
220 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } 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) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
224 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
225 263
226 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
227 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
228 ellipsise => 0, 266 ellipsise => 0,
229 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
230 268
231 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
232 270
… …
244 $conn->send ("reply d"); 282 $conn->send ("reply d");
245 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
246 0 284 0
247 }, 285 },
248 ); 286 );
287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
249 310
250 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
251 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
252 ellipsise => 0, 313 ellipsise => 0,
253 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
378 status "logging in..."; 439 status "logging in...";
379 440
380 $LOGIN_BUTTON->set_text ("Logout"); 441 $LOGIN_BUTTON->set_text ("Logout");
381 $SETUP_DIALOG->hide; 442 $SETUP_DIALOG->hide;
382 443
383 $PROFILE = $CFG->{profile}{default};
384
385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 444 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
386 445
387 my ($host, $port) = split /:/, $PROFILE->{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
388 447
389 $MAP = new CFPlus::Map; 448 $MAP = new CFPlus::Map;
390 449
450 warn "connecting...\n";#d#
391 $CONN = eval { 451 $CONN = eval {
392 new CFPlus::Protocol 452 new CFPlus::Protocol
393 host => $host, 453 host => $host,
394 port => $port || 13327, 454 port => $port || 13327,
395 user => $PROFILE->{user}, 455 user => $PROFILE->{user},
… …
404 statusbox => $STATUSBOX, 464 statusbox => $STATUSBOX,
405 map => $MAP, 465 map => $MAP,
406 mapmap => $MAPMAP, 466 mapmap => $MAPMAP,
407 query => \&server_query, 467 query => \&server_query,
408 468
469 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1,
471 },
472
409 sound_play => sub { 473 sound_play => sub {
410 my ($x, $y, $soundnum, $type) = @_; 474 my ($x, $y, $soundnum, $type) = @_;
411 475
412 $SDL_MIXER 476 $SDL_MIXER
413 or return; 477 or return;
… …
416 or return; 480 or return;
417 481
418 $chunk->play; 482 $chunk->play;
419 }, 483 },
420 }; 484 };
485 warn "connected<$CONN>\n";#d#
421 486
422 if ($CONN) { 487 if ($CONN) {
423 CFPlus::lowdelay fileno $CONN->{fh}; 488 CFPlus::lowdelay fileno $CONN->{fh};
424 489
425 status "login successful"; 490 status "login successful";
… …
433 $LOGIN_BUTTON->set_text ("Login"); 498 $LOGIN_BUTTON->set_text ("Login");
434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 499 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
435 $SETUP_DIALOG->show; 500 $SETUP_DIALOG->show;
436 $PL_WINDOW->hide; 501 $PL_WINDOW->hide;
437 $SPELL_LIST->clear_spells; 502 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
438 504
439 return unless $CONN; 505 return unless $CONN;
440 506
441 status "connection closed"; 507 status "connection closed";
442 508
… …
450sub graphics_setup { 516sub graphics_setup {
451 my $vbox = new CFPlus::UI::VBox; 517 my $vbox = new CFPlus::UI::VBox;
452 518
453 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 519 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
454 520
521 my $row = 0;
522
523 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
524 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
525 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527
455 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 528 $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); 529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
457 530
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]); 531 $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]);
459 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 532 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
460 533
461 $mode_slider->connect (changed => sub { 534 $mode_slider->connect (changed => sub {
… …
463 536
464 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
465 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
466 }); 539 });
467 $mode_slider->emit (changed => $mode_slider->{range}[0]); 540 $mode_slider->emit (changed => $mode_slider->{range}[0]);
468
469 my $row = 1;
470 541
471 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 542 $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 543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
473 state => $CFG->{fullscreen}, 544 state => $CFG->{fullscreen},
474 tooltip => "Bring the client into fullscreen mode.", 545 tooltip => "Bring the client into fullscreen mode.",
… …
480 state => $CFG->{fast}, 551 state => $CFG->{fast},
481 tooltip => "Lower the visual quality considerably to speed up rendering.", 552 tooltip => "Lower the visual quality considerably to speed up rendering.",
482 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
483 ); 554 );
484 555
556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
557 $table->add (1, $row++, new CFPlus::UI::Slider
558 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
559 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
560 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
561 );
562
563 $table->add (1, $row++, new CFPlus::UI::Button
564 expand => 1, align => 0, text => "Apply",
565 tooltip => "Apply the video settings above.",
566 on_activate => sub {
567 video_shutdown ();
568 video_init ();
569 0
570 }
571 );
572
485 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 573 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
486 $table->add (1, $row++, new CFPlus::UI::Slider 574 $table->add (1, $row++, new CFPlus::UI::Slider
487 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
488 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
489 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
578 );
579
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing},
583 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
584 . "This increases load on the graphics subsystem and works only with 2.x servers. "
585 . "Changes take effect at next connection only.",
586 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
490 ); 587 );
491 588
492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 589 $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 590 $table->add (1, $row++, new CFPlus::UI::CheckBox
494 state => $CFG->{fow_enable}, 591 state => $CFG->{fow_enable},
… …
513 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
514 0 611 0
515 } 612 }
516 ); 613 );
517 614
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 );
524
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 615 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
526 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add (1, $row++, new CFPlus::UI::Slider
527 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
528 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 618 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
529 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
545 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
546 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 636 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
547 on_changed => sub { 637 on_changed => sub {
548 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
549 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $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 640 0
561 } 641 }
562 ); 642 );
563 643
564 $vbox 644 $vbox
… …
669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 749 $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"); 750 $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 }); 751 $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"); 752 $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 }); 753 $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" } ); 754 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
675 755
676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
677 757
678 for my $x (0..2) { 758 for my $x (0..2) {
679 for my $y (0 .. 2) { 759 for my $y (0 .. 2) {
… …
890 for 0 .. $#col; 970 for 0 .. $#col;
891 971
892 my @align = qw(1 0 1 1 -1); 972 my @align = qw(1 0 1 1 -1);
893 973
894 my $y = 0; 974 my $y = 0;
895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} } 975 for my $m (@{ $msg->{servers} }) {
901 ) {
902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 976 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 977 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 978
905 for ($desc) { 979 for ($desc) {
906 s/<br>/\n/gi; 980 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 981 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 982 s/<.*?>//sgi;
… …
938 max_w => $::WIDTH * 0.4, 1012 max_w => $::WIDTH * 0.4,
939 ellipsise => 0, 1013 ellipsise => 0,
940 align => $align[$_], 1014 align => $align[$_],
941 text => $m->[$_], 1015 text => $m->[$_],
942 tooltip => $tip[$_], 1016 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1017 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
944 can_hover => 1, 1018 can_hover => 1,
945 can_events => 1, 1019 can_events => 1,
946 fontsize => 0.8) 1020 fontsize => 0.8)
947 for 0 .. $#$m; 1021 for 0 .. $#$m;
948 } 1022 }
… …
1049 . "so only set it if you really need to prefetch images. " 1123 . "so only set it if you really need to prefetch images. "
1050 . "This option can be set and unset any time.", 1124 . "This option can be set and unset any time.",
1051 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1052 ); 1126 );
1053 1127
1054 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1128 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1055 $table->add (1, 9, new CFPlus::UI::Entry 1129 $table->add (1, 9, new CFPlus::UI::Entry
1130 text => $CFG->{output_rate},
1131 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1132 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1133 . "default will be used, which is usually around 100kb/s.",
1134 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1135 );
1136
1137 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1138 $table->add (1, 10, new CFPlus::UI::Entry
1056 text => $CFG->{output_count}, 1139 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.", 1140 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 }, 1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1059 ); 1142 );
1060 1143
1061 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1144 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1062 $table->add (1, 10, new CFPlus::UI::Entry 1145 $table->add (1, 11, new CFPlus::UI::Entry
1063 text => $CFG->{output_sync}, 1146 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.", 1147 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 }, 1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1066 ); 1149 );
1067 1150
1068 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1069 expand => 1, 1152 expand => 1,
1070 align => 0, 1153 align => 0,
1071 text => "Login", 1154 text => "Login",
1072 on_activate => sub { 1155 on_activate => sub {
1073 $CONN ? stop_game 1156 $CONN ? stop_game
1074 : start_game; 1157 : start_game;
1075 0 1158 0
1076 }, 1159 },
1077 ); 1160 );
1078 1161
1162 $vbox->add (new CFPlus::UI::FancyFrame
1163 label => "Server Info",
1164 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1165 );
1166
1167 $vbox
1168}
1169
1170sub client_setup {
1171 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1172
1173 my $row = 0;
1174
1079 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1175 $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 1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1081 text => $CFG->{say_command}, 1177 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. " 1178 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. " 1179 . "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.", 1180 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1085 on_changed => sub { 1181 on_changed => sub {
1086 my ($self, $value) = @_; 1182 my ($self, $value) = @_;
1087 $CFG->{say_command} = $value; 1183 $CFG->{say_command} = $value;
1088 0 1184 0
1089 } 1185 }
1090 ); 1186 );
1091 1187
1092 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1188 $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 1189 $table->add (1, $row++, new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips}, 1190 state => $CFG->{show_tips},
1095 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1191 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1096 on_changed => sub { 1192 on_changed => sub {
1097 my ($self, $value) = @_; 1193 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value; 1194 $CFG->{show_tips} = $value;
1099 0 1195 0
1100 } 1196 }
1101 ); 1197 );
1102 1198
1103 $vbox->add (new CFPlus::UI::FancyFrame 1199 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1104 label => "Server Info", 1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1105 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1201 text => $CFG->{logview_max_par},
1202 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1203 . "sends more messages than this number, older messages get removed to save memory and "
1204 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1205 on_changed => sub {
1206 my ($self, $value) = @_;
1207 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1208 0
1209 },
1106 ); 1210 );
1107 1211
1108 $vbox 1212 $table
1109} 1213}
1110 1214
1111sub message_window { 1215sub message_window {
1112 my $window = new CFPlus::UI::Toplevel 1216 my $window = new CFPlus::UI::Toplevel
1113 name => "message_window", 1217 name => "message_window",
… …
1353 has_close_button => 1 1457 has_close_button => 1
1354 ; 1458 ;
1355 1459
1356 my $ntb = 1460 my $ntb =
1357 $PL_NOTEBOOK = 1461 $PL_NOTEBOOK =
1358 new CFPlus::UI::Notebook expand => 1, debug => 1; 1462 new CFPlus::UI::Notebook expand => 1;
1359 1463
1360 $ntb->add ( 1464 $ntb->add (
1361 "Statistics (F2)" => $STATS_PAGE = stats_window, 1465 "Statistics (F2)" => $STATS_PAGE = stats_window,
1362 "Shows statistics, where all your Stats and Resistances are shown." 1466 "Shows statistics, where all your Stats and Resistances are shown."
1363 ); 1467 );
… …
1375 $ntb->add ( 1479 $ntb->add (
1376 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1377 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1481 "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." 1482 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1379 ); 1483 );
1484 $ntb->add (Pickup => autopickup_setup,
1485 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1380 1486
1381 $ntb->set_current_page ($INVENTORY_PAGE); 1487 $ntb->set_current_page ($INVENTORY_PAGE);
1382 1488
1383 $plwin->add ($ntb); 1489 $plwin->add ($ntb);
1384 $plwin 1490 $plwin
1385} 1491}
1386 1492
1387sub update_bindings {
1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1389}
1390
1391sub keyboard_setup { 1493sub keyboard_setup {
1392 my $binding_list = new CFPlus::UI::VBox; 1494 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} 1495}
1505 1496
1506sub help_window { 1497sub help_window {
1507 my $win = new CFPlus::UI::Toplevel 1498 my $win = new CFPlus::UI::Toplevel
1508 x => 'center', 1499 x => 'center',
… …
1665 1656
1666sub show_tip_of_the_day { 1657sub show_tip_of_the_day {
1667 # find all tips 1658 # find all tips
1668 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1659 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1669 1660
1670 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1661 CFPlus::DB::get state => "tip_of_the_day", sub {
1662 my ($todindex) = @_;
1671 $todindex = 0 if $todindex >= @tod; 1663 $todindex = 0 if $todindex >= @tod;
1672 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1664 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1673 1665
1674 # create dialog 1666 # create dialog
1675 my $dialog; 1667 my $dialog;
1676 1668
1677 my $close = sub { 1669 my $close = sub {
1678 $dialog->destroy; 1670 $dialog->destroy;
1671 };
1672
1673 $dialog = new CFPlus::UI::Toplevel
1674 x => "center",
1675 y => "center",
1676 z => 3,
1677 name => 'tip_of_the_day',
1678 force_w => int $WIDTH * 4/9,
1679 force_h => int $WIDTH * 2/9,
1680 title => "Tip of the day #" . (1 + $todindex),
1681 child => my $vbox = new CFPlus::UI::VBox,
1682 has_close_button => 1,
1683 on_delete => $close,
1684 ;
1685
1686 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1688 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1689
1690 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1691
1692 $table->add (0, 0, new CFPlus::UI::Button
1693 text => "Close",
1694 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>.",
1695 on_activate => $close,
1696 );
1697
1698 $table->add (2, 0, new CFPlus::UI::Button
1699 text => "Next",
1700 tooltip => "Show the next <b>Tip of the day</b>.",
1701 on_activate => sub {
1702 $close->();
1703 &show_tip_of_the_day;
1704 },
1705 );
1706
1707 $dialog->show;
1679 }; 1708 };
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} 1709}
1717 1710
1718sub sdl_init { 1711sub sdl_init {
1719 CFPlus::SDL_Init 1712 CFPlus::SDL_Init
1720 and die "SDL::Init failed!\n"; 1713 and die "SDL::Init failed!\n";
… …
1754 padding => 0, 1747 padding => 0,
1755 z => 100, 1748 z => 100,
1756 force_x => "max", 1749 force_x => "max",
1757 force_y => 0; 1750 force_y => 0;
1758 $DEBUG_STATUS->show; 1751 $DEBUG_STATUS->show;
1759
1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1761 1752
1762 $STATUSBOX = new CFPlus::UI::Statusbox; 1753 $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]); 1754 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1764 1755
1765 (new CFPlus::UI::Frame 1756 (new CFPlus::UI::Frame
… …
1802 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1803 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1804 indent => -4, 1795 indent => -4,
1805 can_hover => 1, 1796 can_hover => 1,
1806 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1807 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1808 ; 1800 ;
1809 1801
1810 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1811 title => "Setup", 1803 title => "Setup",
1812 name => "setup_dialog", 1804 name => "setup_dialog",
… …
1823 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1824 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1825 1817
1826 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1827 "Configure the server to play on, your username, password and other server-related options."); 1819 "Configure the server to play on, your username, password and other server-related options.");
1828 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1820 $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."); 1821 "Configure various client-specific settings.");
1830 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1831 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1823 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1832 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1833 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1834 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1890} 1882}
1891 1883
1892sub setup_build_button { 1884sub setup_build_button {
1893 my ($enabled) = @_; 1885 my ($enabled) = @_;
1894 if ($enabled) { 1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button 1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build", 1889 text => "Build",
1897 tooltip => "Opens the ingame builder", 1890 tooltip => "Opens the ingame builder",
1898 on_activate => sub { 1891 on_activate => sub {
1899 if ($CONN) { 1892 if ($CONN) {
… …
2132 if $CONN; 2125 if $CONN;
2133}); 2126});
2134 2127
2135%SDL_CB = ( 2128%SDL_CB = (
2136 CFPlus::SDL_QUIT => sub { 2129 CFPlus::SDL_QUIT => sub {
2137 Event::unloop -1; 2130 exit;
2138 }, 2131 },
2139 CFPlus::SDL_VIDEORESIZE => sub { 2132 CFPlus::SDL_VIDEORESIZE => sub {
2140 }, 2133 },
2141 CFPlus::SDL_VIDEOEXPOSE => sub { 2134 CFPlus::SDL_VIDEOEXPOSE => sub {
2142 CFPlus::UI::full_refresh; 2135 CFPlus::UI::full_refresh;
2143 }, 2136 },
2144 CFPlus::SDL_ACTIVEEVENT => sub { 2137 CFPlus::SDL_ACTIVEEVENT => sub {
2145# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2138# not useful, as APPACTIVE include sonly iconified state, not unmapped
2139# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2146 }, 2143 },
2147 CFPlus::SDL_KEYDOWN => sub { 2144 CFPlus::SDL_KEYDOWN => sub {
2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2145 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2149 # alt-enter 2146 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle; 2147 $FULLSCREEN_ENABLE->toggle;
… …
2171 2168
2172$SIG{INT} = $SIG{TERM} = sub { exit }; 2169$SIG{INT} = $SIG{TERM} = sub { exit };
2173 2170
2174{ 2171{
2175 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2172 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2173 CFPlus::DB::Server::run;
2174
2176 CFPlus::UI::set_layout ($::CFG->{layout}); 2175 CFPlus::UI::set_layout ($::CFG->{layout});
2177 2176
2178 my %DEF_CFG = ( 2177 my %DEF_CFG = (
2179 sdl_mode => 0, 2178 sdl_mode => 0,
2180 width => 640, 2179 width => 640,
2181 height => 480, 2180 height => 480,
2182 fullscreen => 0, 2181 fullscreen => 0,
2183 fast => 0, 2182 fast => 0,
2184 map_scale => 1, 2183 map_scale => 1,
2185 fow_enable => 1, 2184 fow_enable => 1,
2186 fow_intensity => 0.45, 2185 fow_intensity => 0.45,
2187 fow_smooth => 0, 2186 fow_smooth => 0,
2187 map_smoothing => 1,
2188 gui_fontsize => 1, 2188 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2191 gauge_size => 0.35,
2192 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
2193 mapsize => 100, 2193 mapsize => 100,
2194 say_command => 'chat', 2194 say_command => 'chat',
2195 audio_enable => 1, 2195 audio_enable => 1,
2196 bgm_enable => 1, 2196 bgm_enable => 1,
2197 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
2198 face_prefetch => 0, 2198 face_prefetch => 0,
2199 output_sync => 1, 2199 output_sync => 1,
2200 output_count => 1, 2200 output_count => 1,
2201 output_rate => "",
2201 pickup => 0, 2202 pickup => 0,
2202 inv_sort => "mtime", 2203 inv_sort => "mtime",
2203 default => "profile", # default profile 2204 default => "profile", # default profile
2204 show_tips => 1, 2205 show_tips => 1,
2206 logview_max_par => 1000,
2205 ); 2207 );
2206 2208
2207 while (my ($k, $v) = each %DEF_CFG) { 2209 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2210 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2211 }
2210 2212
2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2213 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2214 $PROFILE = $CFG->{profile}{default};
2215
2216 # convert old bindings (only default profile matters)
2217 if (my $bindings = delete $PROFILE->{bindings}) {
2218 while (my ($mod, $syms) = each %$bindings) {
2219 while (my ($sym, $cmds) = each %$syms) {
2220 push @{ $PROFILE->{macro} }, {
2221 accelkey => [$mod*1, $sym*1],
2222 action => $cmds,
2223 };
2224 }
2225 }
2226 }
2212 2227
2213 sdl_init; 2228 sdl_init;
2214 2229
2215 @SDL_MODES = reverse 2230 @SDL_MODES = reverse
2216 grep $_->[0] >= 640 && $_->[1] >= 480, 2231 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2265 2280
2266Event::loop; 2281Event::loop;
2267#CFPlus::SDL_Quit; 2282#CFPlus::SDL_Quit;
2268#CFPlus::_exit 0; 2283#CFPlus::_exit 0;
2269 2284
2285END {
2270END { CFPlus::SDL_Quit } 2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop;
2288}
2271 2289
2272=head1 NAME 2290=head1 NAME
2273 2291
2274cfplus - A Crossfire+ and Crossfire game client 2292cfplus - A Crossfire+ and Crossfire game client
2275 2293

Diff Legend

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