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.158 by root, Sun Jul 1 03:12:35 2007 UTC

… …
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26 26
27use Carp 'verbose';
28
27# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
28BEGIN { 30BEGIN {
29 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
30 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
31 33
34 my $tmp = $ENV{PAR_TEMP};
35
32 while (my ($filename, $zip) = each %PAR::LibCache) { 36 while (my ($filename, $zip) = each %PAR::LibCache) {
33 for ($zip->memberNames) { 37 for ($zip->memberNames) {
34 next unless /^root\/(.*)/; 38 next unless /^root\/(.*)/;
35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 39 $zip->extractMember ($_, "$tmp/$1")
36 unless -e "$ENV{PAR_TEMP}/$1"; 40 unless -e "$tmp/$1";
37 } 41 }
38 } 42 }
39 43
40 # TODO: pango-rc file, anybody? 44 if ($^O eq "MSWin32") {
45 # relocatable
46 } else {
47 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
50 local $/;
51 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
41 53
42 unshift @INC, $ENV{PAR_TEMP}; 54 mkdir "$tmp/pango-modules";
55 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
56 or die "$tmp/pango-modules/pango.modules: $!";
57 print $fh $rc;
58
59 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
60 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
61 or die "$ENV{PANGO_RC_FILE}: $!";
62 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
63 }
64
65 unshift @INC, $tmp;
43 } 66 }
44} 67}
45 68
46# need to do it again because that pile of garbage called PAR nukes it before main 69# need to do it again because that pile of garbage called PAR nukes it before main
47unshift @INC, $ENV{PAR_TEMP} 70unshift @INC, $ENV{PAR_TEMP}
… …
56use Compress::LZF; 79use Compress::LZF;
57 80
58use CFPlus; 81use CFPlus;
59use CFPlus::OpenGL (); 82use CFPlus::OpenGL ();
60use CFPlus::Protocol; 83use CFPlus::Protocol;
84use CFPlus::DB;
61use CFPlus::UI; 85use CFPlus::UI;
86use CFPlus::UI::Inventory;
87use CFPlus::UI::SpellList;
62use CFPlus::Pod; 88use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 89use CFPlus::MapWidget;
90use CFPlus::Macro;
65 91
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 92$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 93$SIG{PIPE} = 'IGNORE';
68 94
69$Event::Eval = 0; 95$Event::Eval = 1;
70$Event::DIED = sub { 96$Event::DIED = sub {
71 # TODO: display dialog box or so 97 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 98};
76 99
77my $MAX_FPS = 60; 100my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 101my $MIN_FPS = 5; # unused as of yet
79 102
80our $META_SERVER = "crossfire.real-time.com:13326"; 103our $META_SERVER = "http://metaserver.schmorp.de/current.json";
81 104
82our $LAST_REFRESH; 105our $LAST_REFRESH;
83our $NOW; 106our $NOW;
84 107
85our $CFG; 108our $CFG;
… …
123 146
124our $INVENTORY_PAGE; 147our $INVENTORY_PAGE;
125our $STATS_PAGE; 148our $STATS_PAGE;
126our $SKILL_PAGE; 149our $SKILL_PAGE;
127our $SPELL_PAGE; 150our $SPELL_PAGE;
151our $SPELL_LIST;
128 152
129our $HELP_WINDOW; 153our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 154our $MESSAGE_WINDOW;
131our $FLOORBOX; 155our $FLOORBOX;
132our $GAUGES; 156our $GAUGES;
… …
145 169
146our $INV; 170our $INV;
147our $INVR; 171our $INVR;
148our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
149 173
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 174our $PICKUP_CFG;
175
176our $IN_BUILD_MODE;
177our $BUILD_BUTTON;
154 178
155sub status { 179sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 181}
158 182
… …
174sub destroy_query_dialog { 198sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 199 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 200 if $_[0]{query_dialog};
177} 201}
178 202
203# FIXME: a very ugly hack to wait for stat update look below! #d#
204our $QUERY_TIMER; #d#
205
179# server query dialog 206# server query dialog
180sub server_query { 207sub server_query {
181 my ($conn, $flags, $prompt) = @_; 208 my ($conn, $flags, $prompt) = @_;
209
210 # FIXME: a very ugly hack to wait for stat update #d#
211 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
212 unless ($QUERY_TIMER) {
213 $QUERY_TIMER =
214 Event->timer (
215 after => 1,
216 cb => sub {
217 server_query ($conn, $flags, $prompt, 1);
218 $QUERY_TIMER = undef
219 }
220 );
221 return;
222 }
223 }
182 224
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 225 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 226 x => "center",
185 y => "center", 227 y => "center",
186 title => "Server Query", 228 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 229 child => my $vbox = new CFPlus::UI::VBox,
188 ; 230 ;
189 231
190 my @dialog = my $label = new CFPlus::UI::Label 232 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 234 ellipsise => 0,
193 text => $prompt; 235 text => $prompt;
194 236
195 if ($flags & CS_QUERY_YESNO) { 237 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 238 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
213 ); 255 );
214 256
215 $dialog->grab_focus; 257 $dialog->grab_focus;
216 258
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 259 } 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) { 260 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
221 $MESSAGE_WINDOW->show; 261 $dialog->{tooltip} = "#charcreation_focus";
222 262
223 unshift @dialog, new CFPlus::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 265 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
227 267
228 unshift @dialog, my $table = new CFPlus::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
229 269
… …
241 $conn->send ("reply d"); 281 $conn->send ("reply d");
242 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
243 0 283 0
244 }, 284 },
245 ); 285 );
286
287 if ($conn->{chargen_race_description}) {
288 unshift @dialog, new CFPlus::UI::Label
289 max_w => $::WIDTH * 0.8,
290 ellipsise => 0,
291 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
292 ;
293 }
294
295 unshift @dialog, new CFPlus::UI::Face
296 face => $conn->{player}{face},
297 bg => [.2, .2, .2, 1],
298 min_w => 64,
299 min_h => 64,
300 ;
301
302 if ($conn->{chargen_race_title}) {
303 unshift @dialog, new CFPlus::UI::Label
304 allign => 1,
305 ellipsise => 0,
306 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
307 ;
308 }
246 309
247 unshift @dialog, new CFPlus::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 311 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 312 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 313 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
375 status "logging in..."; 438 status "logging in...";
376 439
377 $LOGIN_BUTTON->set_text ("Logout"); 440 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 441 $SETUP_DIALOG->hide;
379 442
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 443 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 444
384 my ($host, $port) = split /:/, $PROFILE->{host}; 445 my ($host, $port) = split /:/, $PROFILE->{host};
385 446
386 $MAP = new CFPlus::Map $mapsize, $mapsize; 447 $MAP = new CFPlus::Map;
387 448
388 $CONN = eval { 449 $CONN = eval {
389 new CFPlus::Protocol 450 new CFPlus::Protocol
390 host => $host, 451 host => $host,
391 port => $port || 13327, 452 port => $port || 13327,
… …
401 statusbox => $STATUSBOX, 462 statusbox => $STATUSBOX,
402 map => $MAP, 463 map => $MAP,
403 mapmap => $MAPMAP, 464 mapmap => $MAPMAP,
404 query => \&server_query, 465 query => \&server_query,
405 466
467 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1,
469 },
470
406 sound_play => sub { 471 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 472 my ($x, $y, $soundnum, $type) = @_;
408 473
409 $SDL_MIXER 474 $SDL_MIXER
410 or return; 475 or return;
… …
429sub stop_game { 494sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 495 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 497 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 498 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 499 $SPELL_LIST->clear_spells;
500 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
435 501
436 return unless $CONN; 502 return unless $CONN;
437 503
438 status "connection closed"; 504 status "connection closed";
439 505
… …
447sub graphics_setup { 513sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 514 my $vbox = new CFPlus::UI::VBox;
449 515
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 516 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 517
518 my $row = 0;
519
520 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
521 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
522 can_events => 1,
523 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
524
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 525 $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); 526 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 527
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]); 528 $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"); 529 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 530
458 $mode_slider->connect (changed => sub { 531 $mode_slider->connect (changed => sub {
… …
460 533
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 534 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 535 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 536 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 537 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 538
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 539 $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 540 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 541 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 542 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 548 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 549 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 550 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 551 );
481 552
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
554 $table->add (1, $row++, new CFPlus::UI::Slider
555 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
556 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
557 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
558 );
559
560 $table->add (1, $row++, new CFPlus::UI::Button
561 expand => 1, align => 0, text => "Apply",
562 tooltip => "Apply the video settings above.",
563 on_activate => sub {
564 video_shutdown ();
565 video_init ();
566 0
567 }
568 );
569
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 571 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 572 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 573 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 574 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
575 );
576
577 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
578 $table->add (1, $row++, new CFPlus::UI::CheckBox
579 state => $CFG->{map_smoothing},
580 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
581 . "This increases load on the graphics subsystem and works only with 2.x servers. "
582 . "Changes take effect at next connection only.",
583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 584 );
488 585
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 586 $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 587 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 588 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 607 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 608 0
512 } 609 }
513 ); 610 );
514 611
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"); 612 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 613 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 614 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.", 615 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 }, 616 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 632 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 633 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 634 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 635 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 636 $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 637 0
558 } 638 }
559 ); 639 );
560 640
561 $vbox 641 $vbox
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 746 $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"); 747 $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 }); 748 $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"); 749 $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 }); 750 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
751 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
671 752
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 753 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 754
674 for my $x (0..2) { 755 for my $x (0..2) {
675 for my $y (0 .. 2) { 756 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 760 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 761 );
681 } 762 }
682 } 763 }
683 764
765 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 766
685 $table 767 $table
686} 768}
687 769
688sub stats_window { 770sub stats_window {
… …
857 939
858 my $table = $METASERVER->{table}; 940 my $table = $METASERVER->{table};
859 $table->clear; 941 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 942 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 943
862 my $buf; 944 my $ok = 0;
863 945
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 946 CFPlus::background {
947 my $ua = CFPlus::lwp_useragent;
865 948
866 unless ($fh) { 949 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 950 } sub {
868 return; 951 my ($msg) = @_;
869 } 952 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; 953 $table->clear;
884 954
885 my @tip = ( 955 my @tip = (
886 "The current number of users logged in on the server.", 956 "The current number of users logged in on the server.",
887 "The hostname of the server.", 957 "The hostname of the server.",
… …
897 for 0 .. $#col; 967 for 0 .. $#col;
898 968
899 my @align = qw(1 0 1 1 -1); 969 my @align = qw(1 0 1 1 -1);
900 970
901 my $y = 0; 971 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 972 for my $m (@{ $msg->{servers} }) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 973 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
974 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 975
905 for ($desc) { 976 for ($desc) {
906 s/<br>/\n/gi; 977 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 978 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 979 s/<.*?>//sgi;
909 s/&/&amp;/g; 980 s/&amp;/&/g;
910 s/</&lt;/g; 981 s/&lt;/</g;
911 s/>/&gt;/g; 982 s/&gt;/>/g;
912 } 983 }
913 984
914 $uptime = sprintf "%dd %02d:%02d:%02d", 985 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 986 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 987 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 988 (int $uptime / 60) % 60,
918 $m->[8] % 60; 989 $uptime % 60;
919 990
920 $m = [$users, $host, $uptime, $version, $desc]; 991 $m = [$users, $host, $uptime, $version, $desc];
921 992
922 $y++; 993 $y++;
923 994
… …
933 ), 1004 ),
934 (new CFPlus::UI::Empty expand => 1), 1005 (new CFPlus::UI::Empty expand => 1),
935 ]); 1006 ]);
936 1007
937 $table->add ($_, $y, new CFPlus::UI::Label 1008 $table->add ($_, $y, new CFPlus::UI::Label
1009 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 1010 ellipsise => 0,
939 align => $align[$_], 1011 align => $align[$_],
940 text => $m->[$_], 1012 text => $m->[$_],
941 tooltip => $tip[$_], 1013 tooltip => $tip[$_],
1014 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 1015 can_hover => 1,
943 can_events => 1, 1016 can_events => 1,
944 fontsize => 0.8) 1017 fontsize => 0.8)
945 for 0 .. $#$m; 1018 for 0 .. $#$m;
946 } 1019 }
1020 } else {
1021 $ok or $label->set_text ("error while contacting metaserver");
947 } 1022 }
948 }); 1023 };
1024
949} 1025}
950 1026
951sub metaserver_dialog { 1027sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 1028 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 1029 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 1033 title => "Server List",
958 name => 'metaserver_dialog', 1034 name => 'metaserver_dialog',
959 x => 'center', 1035 x => 'center',
960 y => 'center', 1036 y => 'center',
961 z => 3, 1037 z => 3,
1038 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 1039 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 1040 child => $vbox,
964 has_close_button => 1, 1041 has_close_button => 1,
965 table => $table, 1042 table => $table,
966 on_visibility_change => sub { 1043 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 1044 update_metaserver ($_[0]) if $_[1];
… …
1043 . "so only set it if you really need to prefetch images. " 1120 . "so only set it if you really need to prefetch images. "
1044 . "This option can be set and unset any time.", 1121 . "This option can be set and unset any time.",
1045 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1122 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1046 ); 1123 );
1047 1124
1048 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1049 $table->add (1, 9, new CFPlus::UI::Entry 1126 $table->add (1, 9, new CFPlus::UI::Entry
1127 text => $CFG->{output_rate},
1128 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1129 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1130 . "default will be used, which is usually around 100kb/s.",
1131 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1132 );
1133
1134 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1135 $table->add (1, 10, new CFPlus::UI::Entry
1050 text => $CFG->{output_count}, 1136 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.", 1137 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 }, 1138 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1053 ); 1139 );
1054 1140
1055 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1141 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1056 $table->add (1, 10, new CFPlus::UI::Entry 1142 $table->add (1, 11, new CFPlus::UI::Entry
1057 text => $CFG->{output_sync}, 1143 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.", 1144 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 }, 1145 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1060 ); 1146 );
1061 1147
1062 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1148 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1063 expand => 1, 1149 expand => 1,
1064 align => 0, 1150 align => 0,
1065 text => "Login", 1151 text => "Login",
1066 on_activate => sub { 1152 on_activate => sub {
1067 $CONN ? stop_game 1153 $CONN ? stop_game
1068 : start_game; 1154 : start_game;
1069 0 1155 0
1070 }, 1156 },
1071 ); 1157 );
1072 1158
1159 $vbox->add (new CFPlus::UI::FancyFrame
1160 label => "Server Info",
1161 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1162 );
1163
1164 $vbox
1165}
1166
1167sub client_setup {
1168 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1169
1170 my $row = 0;
1171
1073 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1172 $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 1173 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1075 text => $CFG->{say_command}, 1174 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. " 1175 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. " 1176 . "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.", 1177 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1079 on_changed => sub { 1178 on_changed => sub {
1080 my ($self, $value) = @_; 1179 my ($self, $value) = @_;
1081 $CFG->{say_command} = $value; 1180 $CFG->{say_command} = $value;
1082 0 1181 0
1083 } 1182 }
1084 ); 1183 );
1085 1184
1086 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1185 $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 1186 $table->add (1, $row++, new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips}, 1187 state => $CFG->{show_tips},
1089 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1188 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1090 on_changed => sub { 1189 on_changed => sub {
1091 my ($self, $value) = @_; 1190 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value; 1191 $CFG->{show_tips} = $value;
1093 0 1192 0
1094 } 1193 }
1095 ); 1194 );
1096 1195
1097 $vbox->add (new CFPlus::UI::FancyFrame 1196 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1098 label => "Server Info", 1197 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1099 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1198 text => $CFG->{logview_max_par},
1199 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1200 . "sends more messages than this number, older messages get removed to save memory and "
1201 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1202 on_changed => sub {
1203 my ($self, $value) = @_;
1204 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1205 0
1206 },
1100 ); 1207 );
1101 1208
1102 $vbox 1209 $table
1103} 1210}
1104 1211
1105sub message_window { 1212sub message_window {
1106 my $window = new CFPlus::UI::Toplevel 1213 my $window = new CFPlus::UI::Toplevel
1107 name => "message_window", 1214 name => "message_window",
… …
1188 ["Boots" => PICKUP_BOOTS], 1295 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1296 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1297 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1298 ],
1192 1299
1193 ["Readables", 2, 2, 1300 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1301 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1302 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1303 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1304 ],
1198 ["Misc", 2, 7, 1305 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1306 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1307 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1308 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1309 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1310 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1311 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1312 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1313 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1314 ["Jewelery" => PICKUP_JEWELS],
1315 ["Flesh" => PICKUP_FLESH],
1208 ], 1316 ],
1209 ["Weight/Value ratio", 2, 17] 1317 ["Weight/Value ratio", 2, 17]
1210 ) 1318 )
1211 { 1319 {
1212 my ($title, $x, $y, @bits) = @$_; 1320 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1370 $table
1263} 1371}
1264 1372
1265my %SORT_ORDER = ( 1373my %SORT_ORDER = (
1266 type => undef, 1374 type => undef,
1267 mtime => sub { sort { 1375 mtime => sub {
1376 my $NOW = time;
1377 sort {
1378 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1379 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1380
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1381 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1382 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1383 or $a->{type} <=> $b->{type}
1384 } @_
1271 } @_ }, 1385 },
1272 weight => sub { sort { 1386 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1387 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1388 or $a->{type} <=> $b->{type}
1275 } @_ }, 1389 } @_ },
1276); 1390);
… …
1301 #TODO# update to weigh/maxweight 1415 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1416 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1417
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1418 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1419 $sw1->add ($INV = new CFPlus::UI::Inventory);
1420 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1421
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1422 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1423
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1424 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1425
… …
1339 has_close_button => 1 1454 has_close_button => 1
1340 ; 1455 ;
1341 1456
1342 my $ntb = 1457 my $ntb =
1343 $PL_NOTEBOOK = 1458 $PL_NOTEBOOK =
1344 new CFPlus::UI::Notebook expand => 1, debug => 1; 1459 new CFPlus::UI::Notebook expand => 1;
1345 1460
1346 $ntb->add ( 1461 $ntb->add (
1347 "Statistics (F2)" => $STATS_PAGE = stats_window, 1462 "Statistics (F2)" => $STATS_PAGE = stats_window,
1348 "Shows statistics, where all your Stats and Resistances are shown." 1463 "Shows statistics, where all your Stats and Resistances are shown."
1349 ); 1464 );
1350 $ntb->add ( 1465 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1466 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1467 "Shows all your Skills."
1353 ); 1468 );
1354 1469
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1470 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1471 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1472 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1473 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1474 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1475 );
1361 $ntb->add ( 1476 $ntb->add (
1362 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1477 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1363 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1478 "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." 1479 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1365 ); 1480 );
1481 $ntb->add (Pickup => autopickup_setup,
1482 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1366 1483
1367 $ntb->set_current_page ($INVENTORY_PAGE); 1484 $ntb->set_current_page ($INVENTORY_PAGE);
1368 1485
1369 $plwin->add ($ntb); 1486 $plwin->add ($ntb);
1370 $plwin 1487 $plwin
1371} 1488}
1372 1489
1373sub update_bindings {
1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1375}
1376
1377sub keyboard_setup { 1490sub keyboard_setup {
1378 my $binding_list = new CFPlus::UI::VBox; 1491 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} 1492}
1491 1493
1492sub help_window { 1494sub help_window {
1493 my $win = new CFPlus::UI::Toplevel 1495 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1496 x => 'center',
… …
1651 1653
1652sub show_tip_of_the_day { 1654sub show_tip_of_the_day {
1653 # find all tips 1655 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1656 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655 1657
1656 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1658 CFPlus::DB::get state => "tip_of_the_day", sub {
1659 my ($todindex) = @_;
1657 $todindex = 0 if $todindex >= @tod; 1660 $todindex = 0 if $todindex >= @tod;
1658 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1661 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1659 1662
1660 # create dialog 1663 # create dialog
1661 my $dialog; 1664 my $dialog;
1662 1665
1663 my $close = sub { 1666 my $close = sub {
1664 $dialog->destroy; 1667 $dialog->destroy;
1668 };
1669
1670 $dialog = new CFPlus::UI::Toplevel
1671 x => "center",
1672 y => "center",
1673 z => 3,
1674 name => 'tip_of_the_day',
1675 force_w => int $WIDTH * 4/9,
1676 force_h => int $WIDTH * 2/9,
1677 title => "Tip of the day #" . (1 + $todindex),
1678 child => my $vbox = new CFPlus::UI::VBox,
1679 has_close_button => 1,
1680 on_delete => $close,
1681 ;
1682
1683 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1684 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1685 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1686
1687 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1688
1689 $table->add (0, 0, new CFPlus::UI::Button
1690 text => "Close",
1691 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>.",
1692 on_activate => $close,
1693 );
1694
1695 $table->add (2, 0, new CFPlus::UI::Button
1696 text => "Next",
1697 tooltip => "Show the next <b>Tip of the day</b>.",
1698 on_activate => sub {
1699 $close->();
1700 &show_tip_of_the_day;
1701 },
1702 );
1703
1704 $dialog->show;
1665 }; 1705 };
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} 1706}
1703 1707
1704sub sdl_init { 1708sub sdl_init {
1705 CFPlus::SDL_Init 1709 CFPlus::SDL_Init
1706 and die "SDL::Init failed!\n"; 1710 and die "SDL::Init failed!\n";
… …
1740 padding => 0, 1744 padding => 0,
1741 z => 100, 1745 z => 100,
1742 force_x => "max", 1746 force_x => "max",
1743 force_y => 0; 1747 force_y => 0;
1744 $DEBUG_STATUS->show; 1748 $DEBUG_STATUS->show;
1745
1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1747 1749
1748 $STATUSBOX = new CFPlus::UI::Statusbox; 1750 $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]); 1751 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1750 1752
1751 (new CFPlus::UI::Frame 1753 (new CFPlus::UI::Frame
… …
1788 font => $FONT_FIXED, 1790 font => $FONT_FIXED,
1789 fontsize => $::CFG->{log_fontsize}, 1791 fontsize => $::CFG->{log_fontsize},
1790 indent => -4, 1792 indent => -4,
1791 can_hover => 1, 1793 can_hover => 1,
1792 can_events => 1, 1794 can_events => 1,
1795 max_par => $CFG->{logview_max_par},
1793 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1796 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1794 ; 1797 ;
1795 1798
1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1799 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1797 title => "Setup", 1800 title => "Setup",
1798 name => "setup_dialog", 1801 name => "setup_dialog",
… …
1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1812 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1813 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1811 1814
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1815 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1813 "Configure the server to play on, your username, password and other server-related options."); 1816 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1817 $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."); 1818 "Configure various client-specific settings.");
1816 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1819 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1817 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1820 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1818 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1821 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1819 "Configure the use of audio, sound effects and background music."); 1822 "Configure the use of audio, sound effects and background music.");
1820 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1823 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1852 ); 1855 );
1853 1856
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1857 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1858 tooltip => "View Documentation");
1856 1859
1860
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1861 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1862 text => "Quit",
1859 tooltip => "Terminates the program", 1863 tooltip => "Terminates the program",
1860 on_activate => sub { 1864 on_activate => sub {
1861 if ($CONN) { 1865 if ($CONN) {
… …
1872 } 1876 }
1873 1877
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1878 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1879}
1876 1880
1881sub setup_build_button {
1882 my ($enabled) = @_;
1883 if ($enabled) {
1884 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1885 $BUILD_BUTTON ||= new CFPlus::UI::Button
1886 text => "Build",
1887 tooltip => "Opens the ingame builder",
1888 on_activate => sub {
1889 if ($CONN) {
1890 $CONN->send_ext_req (builder_player_items => sub {
1891 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1892 });
1893 }
1894 0
1895 };
1896 $BUTTONBAR->add ($BUILD_BUTTON);
1897 } else {
1898 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1899 }
1900}
1901
1902sub open_ingame_editor {
1903 my ($msg) = @_;
1904
1905 my $win = new CFPlus::UI::Toplevel
1906 x => 0,
1907 y => 'center',
1908 z => 4,
1909 name => 'builder_window',
1910 force_w => int $WIDTH * 1/4,
1911 force_h => int $HEIGHT * 3/4,
1912 title => "In game builder",
1913 has_close_button => 1;
1914
1915 my $r = new CFPlus::UI::ScrolledWindow (
1916 expand => 1,
1917 scroll_y => 1
1918 );
1919 $r->add (my $vb = new CFPlus::UI::VBox);
1920 $win->add ($r);
1921
1922
1923 $vb->add (
1924 new CFPlus::UI::Button
1925 text => "Disable build mode",
1926 on_activate => sub { $::IN_BUILD_MODE = undef }
1927 );
1928 $vb->add (
1929 new CFPlus::UI::Button
1930 text => "ERASE",
1931 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1932 );
1933
1934 for my $itemarchname (
1935 sort {
1936 $msg->{items}->{$a}->{build_arch_name}
1937 cmp $msg->{items}->{$b}->{build_arch_name}
1938 } keys %{$msg->{items}}
1939 ) {
1940 my $info = $msg->{items}->{$itemarchname};
1941 $vb->add (
1942 new CFPlus::UI::Button text => $info->{build_arch_name},
1943 on_activate => sub {
1944 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1945
1946 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1947 build_mode_query_arch_info ();
1948 }
1949 }
1950 );
1951 }
1952
1953 $win->show;
1954}
1955
1956sub build_mode_query_arch_info {
1957 my ($iteminfo) = $::IN_BUILD_MODE;
1958 my $itemarchname = $iteminfo->{item};
1959 my $info = $iteminfo->{info};
1960
1961 my $dialog = new CFPlus::UI::Toplevel
1962 x => "center",
1963 y => "center",
1964 z => 50,
1965 force_w => int $WIDTH * 1/2,
1966 title => "Enter information for placement of '$itemarchname'",
1967 has_close_button => 1;
1968
1969 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1970
1971 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1972 my $row = 0;
1973 if ($info->{has_name}) {
1974 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1975 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1976 }
1977 if ($info->{has_text}) {
1978 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1979 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1980 }
1981 if ($info->{has_connection}) {
1982 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1983 $table->add (1, $row++,
1984 new CFPlus::UI::Entry
1985 expand => 1,
1986 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1987 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1988 );
1989 }
1990
1991 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1992 $hb->add (new CFPlus::UI::Button
1993 text => "Close",
1994 expand => 1,
1995 on_activate => sub { $dialog->hide; 0 },
1996 );
1997 $dialog->show;
1998}
1999
1877sub video_shutdown { 2000sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 2001 CFPlus::OpenGL::shutdown;
1879 2002
1880 undef $SDL_ACTIVE; 2003 undef $SDL_ACTIVE;
1881} 2004}
… …
1912 CFPlus::Mix_AllocateChannels 8; 2035 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2036 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 2037
1915 audio_music_finished; 2038 audio_music_finished;
1916 2039
2040 local $_;
1917 while (<$fh>) { 2041 while (<$fh>) {
1918 next if /^\s*#/; 2042 next if /^\s*#/;
1919 next if /^\s*$/; 2043 next if /^\s*$/;
1920 2044
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 2045 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1998 if $CONN; 2122 if $CONN;
1999}); 2123});
2000 2124
2001%SDL_CB = ( 2125%SDL_CB = (
2002 CFPlus::SDL_QUIT => sub { 2126 CFPlus::SDL_QUIT => sub {
2003 Event::unloop -1; 2127 exit;
2004 }, 2128 },
2005 CFPlus::SDL_VIDEORESIZE => sub { 2129 CFPlus::SDL_VIDEORESIZE => sub {
2006 }, 2130 },
2007 CFPlus::SDL_VIDEOEXPOSE => sub { 2131 CFPlus::SDL_VIDEOEXPOSE => sub {
2008 CFPlus::UI::full_refresh; 2132 CFPlus::UI::full_refresh;
2009 }, 2133 },
2010 CFPlus::SDL_ACTIVEEVENT => sub { 2134 CFPlus::SDL_ACTIVEEVENT => sub {
2011# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2135# not useful, as APPACTIVE include sonly iconified state, not unmapped
2136# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2137# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2138# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2139# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2012 }, 2140 },
2013 CFPlus::SDL_KEYDOWN => sub { 2141 CFPlus::SDL_KEYDOWN => sub {
2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2142 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2015 # alt-enter 2143 # alt-enter
2016 $FULLSCREEN_ENABLE->toggle; 2144 $FULLSCREEN_ENABLE->toggle;
… …
2037 2165
2038$SIG{INT} = $SIG{TERM} = sub { exit }; 2166$SIG{INT} = $SIG{TERM} = sub { exit };
2039 2167
2040{ 2168{
2041 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2169 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2170 CFPlus::DB::Server::run;
2171
2042 CFPlus::UI::set_layout ($::CFG->{layout}); 2172 CFPlus::UI::set_layout ($::CFG->{layout});
2043 2173
2044 my %DEF_CFG = ( 2174 my %DEF_CFG = (
2045 sdl_mode => 0, 2175 sdl_mode => 0,
2046 width => 640, 2176 width => 640,
2047 height => 480, 2177 height => 480,
2048 fullscreen => 0, 2178 fullscreen => 0,
2049 fast => 0, 2179 fast => 0,
2050 map_scale => 1, 2180 map_scale => 1,
2051 fow_enable => 1, 2181 fow_enable => 1,
2052 fow_intensity => 0.45, 2182 fow_intensity => 0.45,
2053 fow_smooth => 0, 2183 fow_smooth => 0,
2184 map_smoothing => 1,
2054 gui_fontsize => 1, 2185 gui_fontsize => 1,
2055 log_fontsize => 0.7, 2186 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2187 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2188 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2189 stat_fontsize => 0.7,
2059 mapsize => 100, 2190 mapsize => 100,
2060 say_command => 'say', 2191 say_command => 'chat',
2061 audio_enable => 1, 2192 audio_enable => 1,
2062 bgm_enable => 1, 2193 bgm_enable => 1,
2063 bgm_volume => 0.25, 2194 bgm_volume => 0.25,
2064 face_prefetch => 0, 2195 face_prefetch => 0,
2065 output_sync => 1, 2196 output_sync => 1,
2066 output_count => 1, 2197 output_count => 1,
2198 output_rate => "",
2067 pickup => 0, 2199 pickup => 0,
2068 inv_sort => "mtime", 2200 inv_sort => "mtime",
2069 default => "profile", # default profile 2201 default => "profile", # default profile
2070 show_tips => 1, 2202 show_tips => 1,
2203 logview_max_par => 1000,
2071 ); 2204 );
2072 2205
2073 while (my ($k, $v) = each %DEF_CFG) { 2206 while (my ($k, $v) = each %DEF_CFG) {
2074 $CFG->{$k} = $v unless exists $CFG->{$k}; 2207 $CFG->{$k} = $v unless exists $CFG->{$k};
2075 } 2208 }
2076 2209
2077 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2210 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2211 $PROFILE = $CFG->{profile}{default};
2212
2213 # convert old bindings (only default profile matters)
2214 if (my $bindings = delete $PROFILE->{bindings}) {
2215 while (my ($mod, $syms) = each %$bindings) {
2216 while (my ($sym, $cmds) = each %$syms) {
2217 push @{ $PROFILE->{macro} }, {
2218 accelkey => [$mod*1, $sym*1],
2219 action => $cmds,
2220 };
2221 }
2222 }
2223 }
2078 2224
2079 sdl_init; 2225 sdl_init;
2080 2226
2081 @SDL_MODES = reverse 2227 @SDL_MODES = reverse
2082 grep $_->[0] >= 640 && $_->[1] >= 480, 2228 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2131 2277
2132Event::loop; 2278Event::loop;
2133#CFPlus::SDL_Quit; 2279#CFPlus::SDL_Quit;
2134#CFPlus::_exit 0; 2280#CFPlus::_exit 0;
2135 2281
2282END {
2136END { CFPlus::SDL_Quit } 2283 CFPlus::SDL_Quit;
2284 CFPlus::DB::Server::stop;
2285}
2137 2286
2138=head1 NAME 2287=head1 NAME
2139 2288
2140cfplus - A Crossfire+ and Crossfire game client 2289cfplus - A Crossfire+ and Crossfire game client
2141 2290

Diff Legend

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