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.134 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.159 by root, Thu Jul 5 06:49:10 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;
… …
404 statusbox => $STATUSBOX, 463 statusbox => $STATUSBOX,
405 map => $MAP, 464 map => $MAP,
406 mapmap => $MAPMAP, 465 mapmap => $MAPMAP,
407 query => \&server_query, 466 query => \&server_query,
408 467
468 setup_req => {
469 smoothing => $CFG->{map_smoothing}*1,
470 },
471
409 sound_play => sub { 472 sound_play => sub {
410 my ($x, $y, $soundnum, $type) = @_; 473 my ($x, $y, $soundnum, $type) = @_;
411 474
412 $SDL_MIXER 475 $SDL_MIXER
413 or return; 476 or return;
… …
433 $LOGIN_BUTTON->set_text ("Login"); 496 $LOGIN_BUTTON->set_text ("Login");
434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 497 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
435 $SETUP_DIALOG->show; 498 $SETUP_DIALOG->show;
436 $PL_WINDOW->hide; 499 $PL_WINDOW->hide;
437 $SPELL_LIST->clear_spells; 500 $SPELL_LIST->clear_spells;
501 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
438 502
439 return unless $CONN; 503 return unless $CONN;
440 504
441 status "connection closed"; 505 status "connection closed";
442 506
… …
450sub graphics_setup { 514sub graphics_setup {
451 my $vbox = new CFPlus::UI::VBox; 515 my $vbox = new CFPlus::UI::VBox;
452 516
453 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 517 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
454 518
519 my $row = 0;
520
521 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
522 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
523 can_events => 1,
524 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
525
455 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 526 $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); 527 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
457 528
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]); 529 $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"); 530 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
460 531
461 $mode_slider->connect (changed => sub { 532 $mode_slider->connect (changed => sub {
… …
463 534
464 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 535 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
465 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 536 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
466 }); 537 });
467 $mode_slider->emit (changed => $mode_slider->{range}[0]); 538 $mode_slider->emit (changed => $mode_slider->{range}[0]);
468
469 my $row = 1;
470 539
471 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 540 $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 541 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
473 state => $CFG->{fullscreen}, 542 state => $CFG->{fullscreen},
474 tooltip => "Bring the client into fullscreen mode.", 543 tooltip => "Bring the client into fullscreen mode.",
… …
480 state => $CFG->{fast}, 549 state => $CFG->{fast},
481 tooltip => "Lower the visual quality considerably to speed up rendering.", 550 tooltip => "Lower the visual quality considerably to speed up rendering.",
482 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 551 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
483 ); 552 );
484 553
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
555 $table->add (1, $row++, new CFPlus::UI::Slider
556 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
557 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
558 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
559 );
560
561 $table->add (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the video settings above.",
564 on_activate => sub {
565 video_shutdown ();
566 video_init ();
567 0
568 }
569 );
570
485 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
486 $table->add (1, $row++, new CFPlus::UI::Slider 572 $table->add (1, $row++, new CFPlus::UI::Slider
487 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 573 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
488 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 574 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
489 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 575 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
576 );
577
578 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{map_smoothing},
581 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
582 . "This increases load on the graphics subsystem and works only with 2.x servers. "
583 . "Changes take effect at next connection only.",
584 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
490 ); 585 );
491 586
492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 587 $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 588 $table->add (1, $row++, new CFPlus::UI::CheckBox
494 state => $CFG->{fow_enable}, 589 state => $CFG->{fow_enable},
… …
513 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 608 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
514 0 609 0
515 } 610 }
516 ); 611 );
517 612
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"); 613 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
526 $table->add (1, $row++, new CFPlus::UI::Slider 614 $table->add (1, $row++, new CFPlus::UI::Slider
527 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 615 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.", 616 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 }, 617 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
545 range => [$CFG->{gauge_size}, 0.2, 0.8], 633 range => [$CFG->{gauge_size}, 0.2, 0.8],
546 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 634 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
547 on_changed => sub { 635 on_changed => sub {
548 $CFG->{gauge_size} = $_[1]; 636 $CFG->{gauge_size} = $_[1];
549 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 637 $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 638 0
561 } 639 }
562 ); 640 );
563 641
564 $vbox 642 $vbox
… …
669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 747 $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"); 748 $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 }); 749 $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"); 750 $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 }); 751 $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" } ); 752 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
675 753
676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 754 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
677 755
678 for my $x (0..2) { 756 for my $x (0..2) {
679 for my $y (0 .. 2) { 757 for my $y (0 .. 2) {
… …
683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 761 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
684 ); 762 );
685 } 763 }
686 } 764 }
687 765
766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
688 767
689 $table 768 $table
690} 769}
691 770
692sub stats_window { 771sub stats_window {
… …
889 for 0 .. $#col; 968 for 0 .. $#col;
890 969
891 my @align = qw(1 0 1 1 -1); 970 my @align = qw(1 0 1 1 -1);
892 971
893 my $y = 0; 972 my $y = 0;
894 for my $m (
895 sort {
896 $b->{version} <=> $a->{version}
897 or $b->{users} <=> $a->{users}
898 }
899 @{ $msg->{servers} } 973 for my $m (@{ $msg->{servers} }) {
900 ) {
901 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 974 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
902 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 975 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
903 976
904 for ($desc) { 977 for ($desc) {
905 s/<br>/\n/gi; 978 s/<br>/\n/gi;
906 s/<li>/\n· /gi; 979 s/<li>/\n· /gi;
907 s/<.*?>//sgi; 980 s/<.*?>//sgi;
… …
937 max_w => $::WIDTH * 0.4, 1010 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 1011 ellipsise => 0,
939 align => $align[$_], 1012 align => $align[$_],
940 text => $m->[$_], 1013 text => $m->[$_],
941 tooltip => $tip[$_], 1014 tooltip => $tip[$_],
942 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1015 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
943 can_hover => 1, 1016 can_hover => 1,
944 can_events => 1, 1017 can_events => 1,
945 fontsize => 0.8) 1018 fontsize => 0.8)
946 for 0 .. $#$m; 1019 for 0 .. $#$m;
947 } 1020 }
… …
1048 . "so only set it if you really need to prefetch images. " 1121 . "so only set it if you really need to prefetch images. "
1049 . "This option can be set and unset any time.", 1122 . "This option can be set and unset any time.",
1050 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1051 ); 1124 );
1052 1125
1053 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1126 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1054 $table->add (1, 9, new CFPlus::UI::Entry 1127 $table->add (1, 9, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate},
1129 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1131 . "default will be used, which is usually around 100kb/s.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1133 );
1134
1135 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1136 $table->add (1, 10, new CFPlus::UI::Entry
1055 text => $CFG->{output_count}, 1137 text => $CFG->{output_count},
1056 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1138 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1058 ); 1140 );
1059 1141
1060 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1142 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1061 $table->add (1, 10, new CFPlus::UI::Entry 1143 $table->add (1, 11, new CFPlus::UI::Entry
1062 text => $CFG->{output_sync}, 1144 text => $CFG->{output_sync},
1063 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1145 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1064 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1065 ); 1147 );
1066 1148
1067 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1068 expand => 1, 1150 expand => 1,
1069 align => 0, 1151 align => 0,
1070 text => "Login", 1152 text => "Login",
1071 on_activate => sub { 1153 on_activate => sub {
1072 $CONN ? stop_game 1154 $CONN ? stop_game
1073 : start_game; 1155 : start_game;
1074 0 1156 0
1075 }, 1157 },
1076 ); 1158 );
1077 1159
1160 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info",
1162 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1163 );
1164
1165 $vbox
1166}
1167
1168sub client_setup {
1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170
1171 my $row = 0;
1172
1078 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1173 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1079 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1080 text => $CFG->{say_command}, 1175 text => $CFG->{say_command},
1081 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. " 1176 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. "
1082 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1177 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1083 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1084 on_changed => sub { 1179 on_changed => sub {
1085 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1086 $CFG->{say_command} = $value; 1181 $CFG->{say_command} = $value;
1087 0 1182 0
1088 } 1183 }
1089 ); 1184 );
1090 1185
1091 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1092 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1187 $table->add (1, $row++, new CFPlus::UI::CheckBox
1093 state => $CFG->{show_tips}, 1188 state => $CFG->{show_tips},
1094 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1095 on_changed => sub { 1190 on_changed => sub {
1096 my ($self, $value) = @_; 1191 my ($self, $value) = @_;
1097 $CFG->{show_tips} = $value; 1192 $CFG->{show_tips} = $value;
1098 0 1193 0
1099 } 1194 }
1100 ); 1195 );
1101 1196
1102 $vbox->add (new CFPlus::UI::FancyFrame 1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1103 label => "Server Info", 1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1104 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1199 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201 . "sends more messages than this number, older messages get removed to save memory and "
1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub {
1204 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1206 0
1207 },
1105 ); 1208 );
1106 1209
1107 $vbox 1210 $table
1108} 1211}
1109 1212
1110sub message_window { 1213sub message_window {
1111 my $window = new CFPlus::UI::Toplevel 1214 my $window = new CFPlus::UI::Toplevel
1112 name => "message_window", 1215 name => "message_window",
… …
1352 has_close_button => 1 1455 has_close_button => 1
1353 ; 1456 ;
1354 1457
1355 my $ntb = 1458 my $ntb =
1356 $PL_NOTEBOOK = 1459 $PL_NOTEBOOK =
1357 new CFPlus::UI::Notebook expand => 1, debug => 1; 1460 new CFPlus::UI::Notebook expand => 1;
1358 1461
1359 $ntb->add ( 1462 $ntb->add (
1360 "Statistics (F2)" => $STATS_PAGE = stats_window, 1463 "Statistics (F2)" => $STATS_PAGE = stats_window,
1361 "Shows statistics, where all your Stats and Resistances are shown." 1464 "Shows statistics, where all your Stats and Resistances are shown."
1362 ); 1465 );
… …
1374 $ntb->add ( 1477 $ntb->add (
1375 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1478 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1376 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1479 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1377 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1480 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1378 ); 1481 );
1482 $ntb->add (Pickup => autopickup_setup,
1483 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1379 1484
1380 $ntb->set_current_page ($INVENTORY_PAGE); 1485 $ntb->set_current_page ($INVENTORY_PAGE);
1381 1486
1382 $plwin->add ($ntb); 1487 $plwin->add ($ntb);
1383 $plwin 1488 $plwin
1384} 1489}
1385 1490
1386sub update_bindings {
1387 $BIND_UPD_CB->() if $BIND_UPD_CB;
1388}
1389
1390sub keyboard_setup { 1491sub keyboard_setup {
1391 my $binding_list = new CFPlus::UI::VBox; 1492 CFPlus::Macro::keyboard_setup
1392
1393 my $refresh;
1394 $refresh = $BIND_UPD_CB = sub {
1395 $binding_list->clear ();
1396
1397 return unless $PROFILE;
1398
1399 for my $mod (keys %{$PROFILE->{bindings}}) {
1400 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1401 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1402 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1403
1404 my $lbl = join "; ", @$cmds;
1405 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1406 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1407 $hb->add (new CFPlus::UI::Button
1408 text => "delete",
1409 tooltip => "Deletes the binding",
1410 on_activate => sub {
1411 $binding_list->remove ($hb);
1412 delete $PROFILE->{bindings}{$mod}{$sym};
1413 0
1414 });
1415
1416 $hb->add (new CFPlus::UI::Button
1417 text => "edit",
1418 tooltip => "Edits the binding",
1419 on_activate => sub {
1420 $::BIND_EDITOR->set_binding (
1421 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1422 sub {
1423 my ($nmod, $nsym, $ncmds) = @_;
1424 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1425 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1426 $refresh->();
1427 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1428 $SETUP_DIALOG->show;
1429 },
1430 sub {
1431 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1432 $SETUP_DIALOG->show;
1433 });
1434 $::BIND_EDITOR->show;
1435 $SETUP_DIALOG->hide;
1436 0
1437 });
1438
1439 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1440 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1441 }
1442 }
1443 };
1444
1445 my $vb = new CFPlus::UI::VBox;
1446 $vb->add (new CFPlus::UI::FancyFrame
1447 label => "Options",
1448 child => (my $hb = new CFPlus::UI::HBox),
1449 );
1450 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1451 $hb->add (new CFPlus::UI::CheckBox
1452 expand => 1,
1453 state => $CFG->{shift_fire_stop},
1454 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1455 on_changed => sub {
1456 my ($cbox, $value) = @_;
1457 $CFG->{shift_fire_stop} = $value;
1458 0
1459 });
1460
1461 $vb->add (new CFPlus::UI::FancyFrame
1462 label => "Bindings",
1463 child => $binding_list);
1464 $vb->add (my $hb = new CFPlus::UI::HBox);
1465
1466 $hb->add (new CFPlus::UI::Button
1467 text => "record new",
1468 expand => 1,
1469 tooltip => "This button opens the binding editor with an empty binding.",
1470 on_activate => sub {
1471 $::BIND_EDITOR->set_binding (undef, undef, [],
1472 sub {
1473 my ($mod, $sym, $cmds) = @_;
1474 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1475 $refresh->();
1476 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1477 $SETUP_DIALOG->show;
1478 },
1479 sub {
1480 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1481 $SETUP_DIALOG->show;
1482 },
1483 );
1484 $SETUP_DIALOG->hide;
1485 $::BIND_EDITOR->show;
1486 0
1487 },
1488 );
1489
1490 $hb->add (new CFPlus::UI::Button
1491 text => "close",
1492 tooltip => "Closes the binding window",
1493 expand => 1,
1494 on_activate => sub {
1495 $SETUP_DIALOG->hide;
1496 0
1497 }
1498 );
1499
1500 $refresh->();
1501
1502 $vb
1503} 1493}
1504 1494
1505sub help_window { 1495sub help_window {
1506 my $win = new CFPlus::UI::Toplevel 1496 my $win = new CFPlus::UI::Toplevel
1507 x => 'center', 1497 x => 'center',
… …
1664 1654
1665sub show_tip_of_the_day { 1655sub show_tip_of_the_day {
1666 # find all tips 1656 # find all tips
1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1657 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668 1658
1669 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1659 CFPlus::DB::get state => "tip_of_the_day", sub {
1660 my ($todindex) = @_;
1670 $todindex = 0 if $todindex >= @tod; 1661 $todindex = 0 if $todindex >= @tod;
1671 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1662 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1672 1663
1673 # create dialog 1664 # create dialog
1674 my $dialog; 1665 my $dialog;
1675 1666
1676 my $close = sub { 1667 my $close = sub {
1677 $dialog->destroy; 1668 $dialog->destroy;
1669 };
1670
1671 $dialog = new CFPlus::UI::Toplevel
1672 x => "center",
1673 y => "center",
1674 z => 3,
1675 name => 'tip_of_the_day',
1676 force_w => int $WIDTH * 4/9,
1677 force_h => int $WIDTH * 2/9,
1678 title => "Tip of the day #" . (1 + $todindex),
1679 child => my $vbox = new CFPlus::UI::VBox,
1680 has_close_button => 1,
1681 on_delete => $close,
1682 ;
1683
1684 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1685 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1686 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1687
1688 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1689
1690 $table->add (0, 0, new CFPlus::UI::Button
1691 text => "Close",
1692 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>.",
1693 on_activate => $close,
1694 );
1695
1696 $table->add (2, 0, new CFPlus::UI::Button
1697 text => "Next",
1698 tooltip => "Show the next <b>Tip of the day</b>.",
1699 on_activate => sub {
1700 $close->();
1701 &show_tip_of_the_day;
1702 },
1703 );
1704
1705 $dialog->show;
1678 }; 1706 };
1679
1680 $dialog = new CFPlus::UI::Toplevel
1681 x => "center",
1682 y => "center",
1683 z => 3,
1684 name => 'tip_of_the_day',
1685 force_w => int $WIDTH * 4/9,
1686 force_h => int $WIDTH * 2/9,
1687 title => "Tip of the day #" . (1 + $todindex),
1688 child => my $vbox = new CFPlus::UI::VBox,
1689 has_close_button => 1,
1690 on_delete => $close,
1691 ;
1692
1693 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1694 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1695 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1696
1697 $vbox->add (my $table = new CFPlus::UI::Table);
1698
1699 $table->add (0, 0, new CFPlus::UI::Button
1700 text => "Close",
1701 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>.",
1702 on_activate => $close,
1703 );
1704
1705 $table->add (2, 0, new CFPlus::UI::Button
1706 text => "Next",
1707 tooltip => "Show the next <b>Tip of the day</b>.",
1708 on_activate => sub {
1709 $close->();
1710 &show_tip_of_the_day;
1711 },
1712 );
1713
1714 $dialog->show;
1715} 1707}
1716 1708
1717sub sdl_init { 1709sub sdl_init {
1718 CFPlus::SDL_Init 1710 CFPlus::SDL_Init
1719 and die "SDL::Init failed!\n"; 1711 and die "SDL::Init failed!\n";
… …
1753 padding => 0, 1745 padding => 0,
1754 z => 100, 1746 z => 100,
1755 force_x => "max", 1747 force_x => "max",
1756 force_y => 0; 1748 force_y => 0;
1757 $DEBUG_STATUS->show; 1749 $DEBUG_STATUS->show;
1758
1759 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1760 1750
1761 $STATUSBOX = new CFPlus::UI::Statusbox; 1751 $STATUSBOX = new CFPlus::UI::Statusbox;
1762 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1752 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1763 1753
1764 (new CFPlus::UI::Frame 1754 (new CFPlus::UI::Frame
… …
1801 font => $FONT_FIXED, 1791 font => $FONT_FIXED,
1802 fontsize => $::CFG->{log_fontsize}, 1792 fontsize => $::CFG->{log_fontsize},
1803 indent => -4, 1793 indent => -4,
1804 can_hover => 1, 1794 can_hover => 1,
1805 can_events => 1, 1795 can_events => 1,
1796 max_par => $CFG->{logview_max_par},
1806 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1797 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1807 ; 1798 ;
1808 1799
1809 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1800 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1810 title => "Setup", 1801 title => "Setup",
1811 name => "setup_dialog", 1802 name => "setup_dialog",
… …
1822 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1813 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1823 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1814 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1824 1815
1825 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1816 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1826 "Configure the server to play on, your username, password and other server-related options."); 1817 "Configure the server to play on, your username, password and other server-related options.");
1827 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1818 $SETUP_NOTEBOOK->add (Client => client_setup,
1828 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1819 "Configure various client-specific settings.");
1829 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1820 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1830 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1821 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1831 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1822 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1832 "Configure the use of audio, sound effects and background music."); 1823 "Configure the use of audio, sound effects and background music.");
1833 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1824 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1889} 1880}
1890 1881
1891sub setup_build_button { 1882sub setup_build_button {
1892 my ($enabled) = @_; 1883 my ($enabled) = @_;
1893 if ($enabled) { 1884 if ($enabled) {
1885 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button 1886 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build", 1887 text => "Build",
1896 tooltip => "Opens the ingame builder", 1888 tooltip => "Opens the ingame builder",
1897 on_activate => sub { 1889 on_activate => sub {
1898 if ($CONN) { 1890 if ($CONN) {
… …
1927 ); 1919 );
1928 $r->add (my $vb = new CFPlus::UI::VBox); 1920 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r); 1921 $win->add ($r);
1930 1922
1931 1923
1932 $vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef }); 1924 $vb->add (
1933 $vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }); 1925 new CFPlus::UI::Button
1926 text => "Disable build mode",
1927 on_activate => sub { $::IN_BUILD_MODE = undef }
1928 );
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "ERASE",
1932 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1933 );
1934 1934
1935 for my $itemarchname (keys %{$msg->{items}}) { 1935 for my $itemarchname (
1936 sort {
1937 $msg->{items}->{$a}->{build_arch_name}
1938 cmp $msg->{items}->{$b}->{build_arch_name}
1939 } keys %{$msg->{items}}
1940 ) {
1941 my $info = $msg->{items}->{$itemarchname};
1936 $vb->add ( 1942 $vb->add (
1937 new CFPlus::UI::Button text => "$itemarchname", 1943 new CFPlus::UI::Button text => $info->{build_arch_name},
1938 on_activate => sub { 1944 on_activate => sub {
1939 $::IN_BUILD_MODE = $itemarchname; 1945 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1946
1947 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1948 build_mode_query_arch_info ();
1949 }
1940 } 1950 }
1941 ); 1951 );
1942 } 1952 }
1943 1953
1944 $win->show; 1954 $win->show;
1955}
1956
1957sub build_mode_query_arch_info {
1958 my ($iteminfo) = $::IN_BUILD_MODE;
1959 my $itemarchname = $iteminfo->{item};
1960 my $info = $iteminfo->{info};
1961
1962 my $dialog = new CFPlus::UI::Toplevel
1963 x => "center",
1964 y => "center",
1965 z => 50,
1966 force_w => int $WIDTH * 1/2,
1967 title => "Enter information for placement of '$itemarchname'",
1968 has_close_button => 1;
1969
1970 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1971
1972 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1973 my $row = 0;
1974 if ($info->{has_name}) {
1975 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1976 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1977 }
1978 if ($info->{has_text}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1981 }
1982 if ($info->{has_connection}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1984 $table->add (1, $row++,
1985 new CFPlus::UI::Entry
1986 expand => 1,
1987 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1988 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1989 );
1990 }
1991
1992 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1993 $hb->add (new CFPlus::UI::Button
1994 text => "Close",
1995 expand => 1,
1996 on_activate => sub { $dialog->hide; 0 },
1997 );
1998 $dialog->show;
1945} 1999}
1946 2000
1947sub video_shutdown { 2001sub video_shutdown {
1948 CFPlus::OpenGL::shutdown; 2002 CFPlus::OpenGL::shutdown;
1949 2003
… …
2069 if $CONN; 2123 if $CONN;
2070}); 2124});
2071 2125
2072%SDL_CB = ( 2126%SDL_CB = (
2073 CFPlus::SDL_QUIT => sub { 2127 CFPlus::SDL_QUIT => sub {
2074 Event::unloop -1; 2128 exit;
2075 }, 2129 },
2076 CFPlus::SDL_VIDEORESIZE => sub { 2130 CFPlus::SDL_VIDEORESIZE => sub {
2077 }, 2131 },
2078 CFPlus::SDL_VIDEOEXPOSE => sub { 2132 CFPlus::SDL_VIDEOEXPOSE => sub {
2079 CFPlus::UI::full_refresh; 2133 CFPlus::UI::full_refresh;
2080 }, 2134 },
2081 CFPlus::SDL_ACTIVEEVENT => sub { 2135 CFPlus::SDL_ACTIVEEVENT => sub {
2082# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2136# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2138# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2139# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2140# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2083 }, 2141 },
2084 CFPlus::SDL_KEYDOWN => sub { 2142 CFPlus::SDL_KEYDOWN => sub {
2085 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2143 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2086 # alt-enter 2144 # alt-enter
2087 $FULLSCREEN_ENABLE->toggle; 2145 $FULLSCREEN_ENABLE->toggle;
… …
2108 2166
2109$SIG{INT} = $SIG{TERM} = sub { exit }; 2167$SIG{INT} = $SIG{TERM} = sub { exit };
2110 2168
2111{ 2169{
2112 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2170 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2171 CFPlus::DB::Server::run;
2172
2113 CFPlus::UI::set_layout ($::CFG->{layout}); 2173 CFPlus::UI::set_layout ($::CFG->{layout});
2114 2174
2115 my %DEF_CFG = ( 2175 my %DEF_CFG = (
2116 sdl_mode => 0, 2176 sdl_mode => 0,
2117 width => 640, 2177 width => 640,
2118 height => 480, 2178 height => 480,
2119 fullscreen => 0, 2179 fullscreen => 0,
2120 fast => 0, 2180 fast => 0,
2121 map_scale => 1, 2181 map_scale => 1,
2122 fow_enable => 1, 2182 fow_enable => 1,
2123 fow_intensity => 0.45, 2183 fow_intensity => 0.45,
2124 fow_smooth => 0, 2184 fow_smooth => 0,
2185 map_smoothing => 1,
2125 gui_fontsize => 1, 2186 gui_fontsize => 1,
2126 log_fontsize => 0.7, 2187 log_fontsize => 0.7,
2127 gauge_fontsize => 1, 2188 gauge_fontsize => 1,
2128 gauge_size => 0.35, 2189 gauge_size => 0.35,
2129 stat_fontsize => 0.7, 2190 stat_fontsize => 0.7,
2130 mapsize => 100, 2191 mapsize => 100,
2131 say_command => 'chat', 2192 say_command => 'chat',
2132 audio_enable => 1, 2193 audio_enable => 1,
2133 bgm_enable => 1, 2194 bgm_enable => 1,
2134 bgm_volume => 0.25, 2195 bgm_volume => 0.25,
2135 face_prefetch => 0, 2196 face_prefetch => 0,
2136 output_sync => 1, 2197 output_sync => 1,
2137 output_count => 1, 2198 output_count => 1,
2199 output_rate => "",
2138 pickup => 0, 2200 pickup => 0,
2139 inv_sort => "mtime", 2201 inv_sort => "mtime",
2140 default => "profile", # default profile 2202 default => "profile", # default profile
2141 show_tips => 1, 2203 show_tips => 1,
2204 logview_max_par => 1000,
2142 ); 2205 );
2143 2206
2144 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
2145 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
2146 } 2209 }
2147 2210
2148 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2212 $PROFILE = $CFG->{profile}{default};
2213
2214 # convert old bindings (only default profile matters)
2215 if (my $bindings = delete $PROFILE->{bindings}) {
2216 while (my ($mod, $syms) = each %$bindings) {
2217 while (my ($sym, $cmds) = each %$syms) {
2218 push @{ $PROFILE->{macro} }, {
2219 accelkey => [$mod*1, $sym*1],
2220 action => $cmds,
2221 };
2222 }
2223 }
2224 }
2149 2225
2150 sdl_init; 2226 sdl_init;
2151 2227
2152 @SDL_MODES = reverse 2228 @SDL_MODES = reverse
2153 grep $_->[0] >= 640 && $_->[1] >= 480, 2229 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2202 2278
2203Event::loop; 2279Event::loop;
2204#CFPlus::SDL_Quit; 2280#CFPlus::SDL_Quit;
2205#CFPlus::_exit 0; 2281#CFPlus::_exit 0;
2206 2282
2283END {
2207END { CFPlus::SDL_Quit } 2284 CFPlus::SDL_Quit;
2285 CFPlus::DB::Server::stop;
2286}
2208 2287
2209=head1 NAME 2288=head1 NAME
2210 2289
2211cfplus - A Crossfire+ and Crossfire game client 2290cfplus - A Crossfire+ and Crossfire game client
2212 2291

Diff Legend

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