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.123 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.161 by root, Thu Jul 5 06:57:03 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) {
… …
22} 23}
23 24
24use strict; 25use strict;
25use utf8; 26use utf8;
26 27
28use Carp 'verbose';
29
27# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
28BEGIN { 31BEGIN {
29 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
30 @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
31 34
35 my $tmp = $ENV{PAR_TEMP};
36
32 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
33 for ($zip->memberNames) { 38 for ($zip->memberNames) {
34 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
36 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
37 } 42 }
38 } 43 }
39 44
40 # 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
41 54
42 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;
43 } 67 }
44} 68}
45 69
46# 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
47unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
56use Compress::LZF; 80use Compress::LZF;
57 81
58use CFPlus; 82use CFPlus;
59use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
60use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
61use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
62use CFPlus::Pod; 89use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
65 92
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
68 95
69$Event::Eval = 0; 96$Event::Eval = 1;
70$Event::DIED = sub { 97$Event::DIED = sub {
71 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 99};
76 100
77my $MAX_FPS = 60; 101my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
79 103
80our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
81 105
82our $LAST_REFRESH; 106our $LAST_REFRESH;
83our $NOW; 107our $NOW;
84 108
85our $CFG; 109our $CFG;
… …
123 147
124our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
125our $STATS_PAGE; 149our $STATS_PAGE;
126our $SKILL_PAGE; 150our $SKILL_PAGE;
127our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
128 153
129our $HELP_WINDOW; 154our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
131our $FLOORBOX; 156our $FLOORBOX;
132our $GAUGES; 157our $GAUGES;
… …
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;
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
154 179
155sub status { 180sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 181 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 182}
158 183
… …
174sub destroy_query_dialog { 199sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
177} 202}
178 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
179# server query dialog 207# server query dialog
180sub server_query { 208sub server_query {
181 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 }
182 225
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 227 x => "center",
185 y => "center", 228 y => "center",
186 title => "Server Query", 229 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
188 ; 231 ;
189 232
190 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 235 ellipsise => 0,
193 text => $prompt; 236 text => $prompt;
194 237
195 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
213 ); 256 );
214 257
215 $dialog->grab_focus; 258 $dialog->grab_focus;
216 259
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } elsif ($flags & CS_QUERY_SINGLECHAR) {
218 $dialog->{tooltip} = "#charcreation_focus";
219
220 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) {
221 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
222 263
223 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 266 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
227 268
228 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
229 270
… …
241 $conn->send ("reply d"); 282 $conn->send ("reply d");
242 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
243 0 284 0
244 }, 285 },
245 ); 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 }
246 310
247 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 313 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
375 status "logging in..."; 439 status "logging in...";
376 440
377 $LOGIN_BUTTON->set_text ("Logout"); 441 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 442 $SETUP_DIALOG->hide;
379 443
380 $PROFILE = $CFG->{profile}{default};
381
382 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;
383 445
384 my ($host, $port) = split /:/, $PROFILE->{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
385 447
386 $MAP = new CFPlus::Map $mapsize, $mapsize; 448 $MAP = new CFPlus::Map;
387 449
450 warn "connecting...\n";#d#
388 $CONN = eval { 451 $CONN = eval {
389 new CFPlus::Protocol 452 new CFPlus::Protocol
390 host => $host, 453 host => $host,
391 port => $port || 13327, 454 port => $port || 13327,
392 user => $PROFILE->{user}, 455 user => $PROFILE->{user},
… …
401 statusbox => $STATUSBOX, 464 statusbox => $STATUSBOX,
402 map => $MAP, 465 map => $MAP,
403 mapmap => $MAPMAP, 466 mapmap => $MAPMAP,
404 query => \&server_query, 467 query => \&server_query,
405 468
469 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1,
471 },
472
406 sound_play => sub { 473 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 474 my ($x, $y, $soundnum, $type) = @_;
408 475
409 $SDL_MIXER 476 $SDL_MIXER
410 or return; 477 or return;
… …
413 or return; 480 or return;
414 481
415 $chunk->play; 482 $chunk->play;
416 }, 483 },
417 }; 484 };
485 warn "connected<$CONN,$@>\n";#d#
418 486
419 if ($CONN) { 487 if ($CONN) {
420 CFPlus::lowdelay fileno $CONN->{fh}; 488 CFPlus::lowdelay fileno $CONN->{fh};
421 489
422 status "login successful"; 490 status "login successful";
… …
429sub stop_game { 497sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 498 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 499 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 500 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 501 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 502 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
435 504
436 return unless $CONN; 505 return unless $CONN;
437 506
438 status "connection closed"; 507 status "connection closed";
439 508
… …
447sub graphics_setup { 516sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 517 my $vbox = new CFPlus::UI::VBox;
449 518
450 $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]);
451 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
452 $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");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 530
455 $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]);
456 $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");
457 533
458 $mode_slider->connect (changed => sub { 534 $mode_slider->connect (changed => sub {
… …
460 536
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 539 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 540 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 541
468 $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");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 544 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 545 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 551 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 552 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 554 );
481 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
482 $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");
483 $table->add (1, $row++, new CFPlus::UI::Slider 574 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 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 }
487 ); 587 );
488 588
489 $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");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 590 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 591 state => $CFG->{fow_enable},
… …
510 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;
511 0 611 0
512 } 612 }
513 ); 613 );
514 614
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $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");
523 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 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.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 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.",
544 on_changed => sub { 637 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0
548 }
549 );
550
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0 640 0
558 } 641 }
559 ); 642 );
560 643
561 $vbox 644 $vbox
… …
666 $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 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 750 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $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 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 752 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $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 });
754 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
671 755
672 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);
673 757
674 for my $x (0..2) { 758 for my $x (0..2) {
675 for my $y (0 .. 2) { 759 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 763 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 764 );
681 } 765 }
682 } 766 }
683 767
768 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 769
685 $table 770 $table
686} 771}
687 772
688sub stats_window { 773sub stats_window {
… …
857 942
858 my $table = $METASERVER->{table}; 943 my $table = $METASERVER->{table};
859 $table->clear; 944 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 945 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 946
862 my $buf; 947 my $ok = 0;
863 948
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 949 CFPlus::background {
950 my $ua = CFPlus::lwp_useragent;
865 951
866 unless ($fh) { 952 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 953 } sub {
868 return; 954 my ($msg) = @_;
869 } 955 if ($msg) {
870
871 Event->io (fd => $fh, poll => 'r', cb => sub {
872 my $res = sysread $fh, $buf, 8192, length $buf;
873
874 if (!defined $res) {
875 $_[0]->w->cancel;
876 $label->set_text ("error while retrieving server list: $!");
877 } elsif ($res == 0) {
878 $_[0]->w->cancel;
879 status "server list retrieved";
880
881 utf8::decode $buf if utf8::valid $buf;
882
883 $table->clear; 956 $table->clear;
884 957
885 my @tip = ( 958 my @tip = (
886 "The current number of users logged in on the server.", 959 "The current number of users logged in on the server.",
887 "The hostname of the server.", 960 "The hostname of the server.",
… …
897 for 0 .. $#col; 970 for 0 .. $#col;
898 971
899 my @align = qw(1 0 1 1 -1); 972 my @align = qw(1 0 1 1 -1);
900 973
901 my $y = 0; 974 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 975 for my $m (@{ $msg->{servers} }) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 976 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
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;
909 s/&/&amp;/g; 983 s/&amp;/&/g;
910 s/</&lt;/g; 984 s/&lt;/</g;
911 s/>/&gt;/g; 985 s/&gt;/>/g;
912 } 986 }
913 987
914 $uptime = sprintf "%dd %02d:%02d:%02d", 988 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 989 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 990 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 991 (int $uptime / 60) % 60,
918 $m->[8] % 60; 992 $uptime % 60;
919 993
920 $m = [$users, $host, $uptime, $version, $desc]; 994 $m = [$users, $host, $uptime, $version, $desc];
921 995
922 $y++; 996 $y++;
923 997
… …
933 ), 1007 ),
934 (new CFPlus::UI::Empty expand => 1), 1008 (new CFPlus::UI::Empty expand => 1),
935 ]); 1009 ]);
936 1010
937 $table->add ($_, $y, new CFPlus::UI::Label 1011 $table->add ($_, $y, new CFPlus::UI::Label
1012 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 1013 ellipsise => 0,
939 align => $align[$_], 1014 align => $align[$_],
940 text => $m->[$_], 1015 text => $m->[$_],
941 tooltip => $tip[$_], 1016 tooltip => $tip[$_],
1017 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 1018 can_hover => 1,
943 can_events => 1, 1019 can_events => 1,
944 fontsize => 0.8) 1020 fontsize => 0.8)
945 for 0 .. $#$m; 1021 for 0 .. $#$m;
946 } 1022 }
1023 } else {
1024 $ok or $label->set_text ("error while contacting metaserver");
947 } 1025 }
948 }); 1026 };
1027
949} 1028}
950 1029
951sub metaserver_dialog { 1030sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 1031 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 1032 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 1036 title => "Server List",
958 name => 'metaserver_dialog', 1037 name => 'metaserver_dialog',
959 x => 'center', 1038 x => 'center',
960 y => 'center', 1039 y => 'center',
961 z => 3, 1040 z => 3,
1041 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 1042 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 1043 child => $vbox,
964 has_close_button => 1, 1044 has_close_button => 1,
965 table => $table, 1045 table => $table,
966 on_visibility_change => sub { 1046 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 1047 update_metaserver ($_[0]) if $_[1];
… …
1043 . "so only set it if you really need to prefetch images. " 1123 . "so only set it if you really need to prefetch images. "
1044 . "This option can be set and unset any time.", 1124 . "This option can be set and unset any time.",
1045 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1046 ); 1126 );
1047 1127
1048 $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");
1049 $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
1050 text => $CFG->{output_count}, 1139 text => $CFG->{output_count},
1051 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.",
1052 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1053 ); 1142 );
1054 1143
1055 $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");
1056 $table->add (1, 10, new CFPlus::UI::Entry 1145 $table->add (1, 11, new CFPlus::UI::Entry
1057 text => $CFG->{output_sync}, 1146 text => $CFG->{output_sync},
1058 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.",
1059 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1060 ); 1149 );
1061 1150
1062 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1063 expand => 1, 1152 expand => 1,
1064 align => 0, 1153 align => 0,
1065 text => "Login", 1154 text => "Login",
1066 on_activate => sub { 1155 on_activate => sub {
1067 $CONN ? stop_game 1156 $CONN ? stop_game
1068 : start_game; 1157 : start_game;
1069 0 1158 0
1070 }, 1159 },
1071 ); 1160 );
1072 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
1073 $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");
1074 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1075 text => $CFG->{say_command}, 1177 text => $CFG->{say_command},
1076 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. "
1077 . "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. "
1078 . "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.",
1079 on_changed => sub { 1181 on_changed => sub {
1080 my ($self, $value) = @_; 1182 my ($self, $value) = @_;
1081 $CFG->{say_command} = $value; 1183 $CFG->{say_command} = $value;
1082 0 1184 0
1083 } 1185 }
1084 ); 1186 );
1085 1187
1086 $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");
1087 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1189 $table->add (1, $row++, new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips}, 1190 state => $CFG->{show_tips},
1089 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?",
1090 on_changed => sub { 1192 on_changed => sub {
1091 my ($self, $value) = @_; 1193 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value; 1194 $CFG->{show_tips} = $value;
1093 0 1195 0
1094 } 1196 }
1095 ); 1197 );
1096 1198
1097 $vbox->add (new CFPlus::UI::FancyFrame 1199 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1098 label => "Server Info", 1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1099 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 },
1100 ); 1210 );
1101 1211
1102 $vbox 1212 $table
1103} 1213}
1104 1214
1105sub message_window { 1215sub message_window {
1106 my $window = new CFPlus::UI::Toplevel 1216 my $window = new CFPlus::UI::Toplevel
1107 name => "message_window", 1217 name => "message_window",
… …
1188 ["Boots" => PICKUP_BOOTS], 1298 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1299 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1300 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1301 ],
1192 1302
1193 ["Readables", 2, 2, 1303 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1304 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1305 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1306 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1307 ],
1198 ["Misc", 2, 7, 1308 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1309 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1310 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1311 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1312 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1313 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1314 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1315 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1316 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1317 ["Jewelery" => PICKUP_JEWELS],
1318 ["Flesh" => PICKUP_FLESH],
1208 ], 1319 ],
1209 ["Weight/Value ratio", 2, 17] 1320 ["Weight/Value ratio", 2, 17]
1210 ) 1321 )
1211 { 1322 {
1212 my ($title, $x, $y, @bits) = @$_; 1323 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1373 $table
1263} 1374}
1264 1375
1265my %SORT_ORDER = ( 1376my %SORT_ORDER = (
1266 type => undef, 1377 type => undef,
1267 mtime => sub { sort { 1378 mtime => sub {
1379 my $NOW = time;
1380 sort {
1381 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1382 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1383
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1384 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1385 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1386 or $a->{type} <=> $b->{type}
1387 } @_
1271 } @_ }, 1388 },
1272 weight => sub { sort { 1389 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1390 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1391 or $a->{type} <=> $b->{type}
1275 } @_ }, 1392 } @_ },
1276); 1393);
… …
1301 #TODO# update to weigh/maxweight 1418 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1419 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1420
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1421 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1422 $sw1->add ($INV = new CFPlus::UI::Inventory);
1423 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1424
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1425 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1426
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1427 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1428
… …
1339 has_close_button => 1 1457 has_close_button => 1
1340 ; 1458 ;
1341 1459
1342 my $ntb = 1460 my $ntb =
1343 $PL_NOTEBOOK = 1461 $PL_NOTEBOOK =
1344 new CFPlus::UI::Notebook expand => 1, debug => 1; 1462 new CFPlus::UI::Notebook expand => 1;
1345 1463
1346 $ntb->add ( 1464 $ntb->add (
1347 "Statistics (F2)" => $STATS_PAGE = stats_window, 1465 "Statistics (F2)" => $STATS_PAGE = stats_window,
1348 "Shows statistics, where all your Stats and Resistances are shown." 1466 "Shows statistics, where all your Stats and Resistances are shown."
1349 ); 1467 );
1350 $ntb->add ( 1468 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1469 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1470 "Shows all your Skills."
1353 ); 1471 );
1354 1472
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1473 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1474 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1475 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1476 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1477 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1478 );
1361 $ntb->add ( 1479 $ntb->add (
1362 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1363 "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 :). "
1364 . "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."
1365 ); 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.");
1366 1486
1367 $ntb->set_current_page ($INVENTORY_PAGE); 1487 $ntb->set_current_page ($INVENTORY_PAGE);
1368 1488
1369 $plwin->add ($ntb); 1489 $plwin->add ($ntb);
1370 $plwin 1490 $plwin
1371} 1491}
1372 1492
1373sub update_bindings {
1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1375}
1376
1377sub keyboard_setup { 1493sub keyboard_setup {
1378 my $binding_list = new CFPlus::UI::VBox; 1494 CFPlus::Macro::keyboard_setup
1379
1380 my $refresh;
1381 $refresh = $BIND_UPD_CB = sub {
1382 $binding_list->clear ();
1383
1384 return unless $PROFILE;
1385
1386 for my $mod (keys %{$PROFILE->{bindings}}) {
1387 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1388 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1389 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1390
1391 my $lbl = join "; ", @$cmds;
1392 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1393 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1394 $hb->add (new CFPlus::UI::Button
1395 text => "delete",
1396 tooltip => "Deletes the binding",
1397 on_activate => sub {
1398 $binding_list->remove ($hb);
1399 delete $PROFILE->{bindings}{$mod}{$sym};
1400 0
1401 });
1402
1403 $hb->add (new CFPlus::UI::Button
1404 text => "edit",
1405 tooltip => "Edits the binding",
1406 on_activate => sub {
1407 $::BIND_EDITOR->set_binding (
1408 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1409 sub {
1410 my ($nmod, $nsym, $ncmds) = @_;
1411 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1412 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1413 $refresh->();
1414 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1415 $SETUP_DIALOG->show;
1416 },
1417 sub {
1418 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1419 $SETUP_DIALOG->show;
1420 });
1421 $::BIND_EDITOR->show;
1422 $SETUP_DIALOG->hide;
1423 0
1424 });
1425
1426 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1427 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1428 }
1429 }
1430 };
1431
1432 my $vb = new CFPlus::UI::VBox;
1433 $vb->add (new CFPlus::UI::FancyFrame
1434 label => "Options",
1435 child => (my $hb = new CFPlus::UI::HBox),
1436 );
1437 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1438 $hb->add (new CFPlus::UI::CheckBox
1439 expand => 1,
1440 state => $CFG->{shift_fire_stop},
1441 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1442 on_changed => sub {
1443 my ($cbox, $value) = @_;
1444 $CFG->{shift_fire_stop} = $value;
1445 0
1446 });
1447
1448 $vb->add (new CFPlus::UI::FancyFrame
1449 label => "Bindings",
1450 child => $binding_list);
1451 $vb->add (my $hb = new CFPlus::UI::HBox);
1452
1453 $hb->add (new CFPlus::UI::Button
1454 text => "record new",
1455 expand => 1,
1456 tooltip => "This button opens the binding editor with an empty binding.",
1457 on_activate => sub {
1458 $::BIND_EDITOR->set_binding (undef, undef, [],
1459 sub {
1460 my ($mod, $sym, $cmds) = @_;
1461 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1462 $refresh->();
1463 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1464 $SETUP_DIALOG->show;
1465 },
1466 sub {
1467 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1468 $SETUP_DIALOG->show;
1469 },
1470 );
1471 $SETUP_DIALOG->hide;
1472 $::BIND_EDITOR->show;
1473 0
1474 },
1475 );
1476
1477 $hb->add (new CFPlus::UI::Button
1478 text => "close",
1479 tooltip => "Closes the binding window",
1480 expand => 1,
1481 on_activate => sub {
1482 $SETUP_DIALOG->hide;
1483 0
1484 }
1485 );
1486
1487 $refresh->();
1488
1489 $vb
1490} 1495}
1491 1496
1492sub help_window { 1497sub help_window {
1493 my $win = new CFPlus::UI::Toplevel 1498 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1499 x => 'center',
… …
1651 1656
1652sub show_tip_of_the_day { 1657sub show_tip_of_the_day {
1653 # find all tips 1658 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1659 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655 1660
1656 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1661 CFPlus::DB::get state => "tip_of_the_day", sub {
1662 my ($todindex) = @_;
1657 $todindex = 0 if $todindex >= @tod; 1663 $todindex = 0 if $todindex >= @tod;
1658 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1664 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1659 1665
1660 # create dialog 1666 # create dialog
1661 my $dialog; 1667 my $dialog;
1662 1668
1663 my $close = sub { 1669 my $close = sub {
1664 $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;
1665 }; 1708 };
1666
1667 $dialog = new CFPlus::UI::Toplevel
1668 x => "center",
1669 y => "center",
1670 z => 3,
1671 name => 'tip_of_the_day',
1672 force_w => int $WIDTH * 4/9,
1673 force_h => int $WIDTH * 2/9,
1674 title => "Tip of the day #" . (1 + $todindex),
1675 child => my $vbox = new CFPlus::UI::VBox,
1676 has_close_button => 1,
1677 on_delete => $close,
1678 ;
1679
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683
1684 $vbox->add (my $table = new CFPlus::UI::Table);
1685
1686 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close",
1688 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>.",
1689 on_activate => $close,
1690 );
1691
1692 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub {
1696 $close->();
1697 &show_tip_of_the_day;
1698 },
1699 );
1700
1701 $dialog->show;
1702} 1709}
1703 1710
1704sub sdl_init { 1711sub sdl_init {
1705 CFPlus::SDL_Init 1712 CFPlus::SDL_Init
1706 and die "SDL::Init failed!\n"; 1713 and die "SDL::Init failed!\n";
… …
1740 padding => 0, 1747 padding => 0,
1741 z => 100, 1748 z => 100,
1742 force_x => "max", 1749 force_x => "max",
1743 force_y => 0; 1750 force_y => 0;
1744 $DEBUG_STATUS->show; 1751 $DEBUG_STATUS->show;
1745
1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1747 1752
1748 $STATUSBOX = new CFPlus::UI::Statusbox; 1753 $STATUSBOX = new CFPlus::UI::Statusbox;
1749 $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]);
1750 1755
1751 (new CFPlus::UI::Frame 1756 (new CFPlus::UI::Frame
… …
1788 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1789 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1790 indent => -4, 1795 indent => -4,
1791 can_hover => 1, 1796 can_hover => 1,
1792 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1793 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.",
1794 ; 1800 ;
1795 1801
1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1797 title => "Setup", 1803 title => "Setup",
1798 name => "setup_dialog", 1804 name => "setup_dialog",
… …
1809 $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,
1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1811 1817
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1813 "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.");
1814 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1820 $SETUP_NOTEBOOK->add (Client => client_setup,
1815 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1821 "Configure various client-specific settings.");
1816 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1817 "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.");
1818 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1819 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1820 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1852 ); 1858 );
1853 1859
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1860 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1861 tooltip => "View Documentation");
1856 1862
1863
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1864 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1865 text => "Quit",
1859 tooltip => "Terminates the program", 1866 tooltip => "Terminates the program",
1860 on_activate => sub { 1867 on_activate => sub {
1861 if ($CONN) { 1868 if ($CONN) {
… …
1872 } 1879 }
1873 1880
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1881 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1882}
1876 1883
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001}
2002
1877sub video_shutdown { 2003sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 2004 CFPlus::OpenGL::shutdown;
1879 2005
1880 undef $SDL_ACTIVE; 2006 undef $SDL_ACTIVE;
1881} 2007}
… …
1912 CFPlus::Mix_AllocateChannels 8; 2038 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2039 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 2040
1915 audio_music_finished; 2041 audio_music_finished;
1916 2042
2043 local $_;
1917 while (<$fh>) { 2044 while (<$fh>) {
1918 next if /^\s*#/; 2045 next if /^\s*#/;
1919 next if /^\s*$/; 2046 next if /^\s*$/;
1920 2047
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 2048 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1998 if $CONN; 2125 if $CONN;
1999}); 2126});
2000 2127
2001%SDL_CB = ( 2128%SDL_CB = (
2002 CFPlus::SDL_QUIT => sub { 2129 CFPlus::SDL_QUIT => sub {
2003 Event::unloop -1; 2130 exit;
2004 }, 2131 },
2005 CFPlus::SDL_VIDEORESIZE => sub { 2132 CFPlus::SDL_VIDEORESIZE => sub {
2006 }, 2133 },
2007 CFPlus::SDL_VIDEOEXPOSE => sub { 2134 CFPlus::SDL_VIDEOEXPOSE => sub {
2008 CFPlus::UI::full_refresh; 2135 CFPlus::UI::full_refresh;
2009 }, 2136 },
2010 CFPlus::SDL_ACTIVEEVENT => sub { 2137 CFPlus::SDL_ACTIVEEVENT => sub {
2011# 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;
2012 }, 2143 },
2013 CFPlus::SDL_KEYDOWN => sub { 2144 CFPlus::SDL_KEYDOWN => sub {
2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2145 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2015 # alt-enter 2146 # alt-enter
2016 $FULLSCREEN_ENABLE->toggle; 2147 $FULLSCREEN_ENABLE->toggle;
… …
2037 2168
2038$SIG{INT} = $SIG{TERM} = sub { exit }; 2169$SIG{INT} = $SIG{TERM} = sub { exit };
2039 2170
2040{ 2171{
2041 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2172 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2173 CFPlus::DB::Server::run;
2174
2042 CFPlus::UI::set_layout ($::CFG->{layout}); 2175 CFPlus::UI::set_layout ($::CFG->{layout});
2043 2176
2044 my %DEF_CFG = ( 2177 my %DEF_CFG = (
2045 sdl_mode => 0, 2178 sdl_mode => 0,
2046 width => 640, 2179 width => 640,
2047 height => 480, 2180 height => 480,
2048 fullscreen => 0, 2181 fullscreen => 0,
2049 fast => 0, 2182 fast => 0,
2050 map_scale => 1, 2183 map_scale => 1,
2051 fow_enable => 1, 2184 fow_enable => 1,
2052 fow_intensity => 0.45, 2185 fow_intensity => 0.45,
2053 fow_smooth => 0, 2186 fow_smooth => 0,
2187 map_smoothing => 1,
2054 gui_fontsize => 1, 2188 gui_fontsize => 1,
2055 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2191 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
2059 mapsize => 100, 2193 mapsize => 100,
2060 say_command => 'say', 2194 say_command => 'chat',
2061 audio_enable => 1, 2195 audio_enable => 1,
2062 bgm_enable => 1, 2196 bgm_enable => 1,
2063 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
2064 face_prefetch => 0, 2198 face_prefetch => 0,
2065 output_sync => 1, 2199 output_sync => 1,
2066 output_count => 1, 2200 output_count => 1,
2201 output_rate => "",
2067 pickup => 0, 2202 pickup => 0,
2068 inv_sort => "mtime", 2203 inv_sort => "mtime",
2069 default => "profile", # default profile 2204 default => "profile", # default profile
2070 show_tips => 1, 2205 show_tips => 1,
2206 logview_max_par => 1000,
2071 ); 2207 );
2072 2208
2073 while (my ($k, $v) = each %DEF_CFG) { 2209 while (my ($k, $v) = each %DEF_CFG) {
2074 $CFG->{$k} = $v unless exists $CFG->{$k}; 2210 $CFG->{$k} = $v unless exists $CFG->{$k};
2075 } 2211 }
2076 2212
2077 $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 }
2078 2227
2079 sdl_init; 2228 sdl_init;
2080 2229
2081 @SDL_MODES = reverse 2230 @SDL_MODES = reverse
2082 grep $_->[0] >= 640 && $_->[1] >= 480, 2231 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2131 2280
2132Event::loop; 2281Event::loop;
2133#CFPlus::SDL_Quit; 2282#CFPlus::SDL_Quit;
2134#CFPlus::_exit 0; 2283#CFPlus::_exit 0;
2135 2284
2285END {
2136END { CFPlus::SDL_Quit } 2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop;
2288}
2137 2289
2138=head1 NAME 2290=head1 NAME
2139 2291
2140cfplus - A Crossfire+ and Crossfire game client 2292cfplus - A Crossfire+ and Crossfire game client
2141 2293

Diff Legend

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