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.124 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.154 by root, Wed May 9 11:46:49 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; 447 $MAP = new CFPlus::Map;
… …
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;
435 500
436 return unless $CONN; 501 return unless $CONN;
437 502
438 status "connection closed"; 503 status "connection closed";
439 504
… …
447sub graphics_setup { 512sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 513 my $vbox = new CFPlus::UI::VBox;
449 514
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 516
517 my $row = 0;
518
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 524 $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); 525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 526
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]); 527 $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"); 528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 529
458 $mode_slider->connect (changed => sub { 530 $mode_slider->connect (changed => sub {
… …
460 532
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 535 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 536 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 537
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 538 $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 539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 540 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 541 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 547 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 548 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 550 );
481 551
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 );
558
559 $table->add (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.",
562 on_activate => sub {
563 video_shutdown ();
564 video_init ();
565 0
566 }
567 );
568
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 );
575
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 583 );
488 584
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 585 $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 586 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 587 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 607 0
512 } 608 }
513 ); 609 );
514 610
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"); 611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 612 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 613 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.", 614 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 }, 615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 631 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 633 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 634 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 635 $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 636 0
558 } 637 }
559 ); 638 );
560 639
561 $vbox 640 $vbox
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 745 $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"); 746 $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 }); 747 $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"); 748 $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 }); 749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
671 751
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 753
674 for my $x (0..2) { 754 for my $x (0..2) {
675 for my $y (0 .. 2) { 755 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 759 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 760 );
681 } 761 }
682 } 762 }
683 763
764 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 765
685 $table 766 $table
686} 767}
687 768
688sub stats_window { 769sub stats_window {
… …
857 938
858 my $table = $METASERVER->{table}; 939 my $table = $METASERVER->{table};
859 $table->clear; 940 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 942
862 my $buf; 943 my $ok = 0;
863 944
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 945 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent;
865 947
866 unless ($fh) { 948 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 949 } sub {
868 return; 950 my ($msg) = @_;
869 } 951 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; 952 $table->clear;
884 953
885 my @tip = ( 954 my @tip = (
886 "The current number of users logged in on the server.", 955 "The current number of users logged in on the server.",
887 "The hostname of the server.", 956 "The hostname of the server.",
… …
897 for 0 .. $#col; 966 for 0 .. $#col;
898 967
899 my @align = qw(1 0 1 1 -1); 968 my @align = qw(1 0 1 1 -1);
900 969
901 my $y = 0; 970 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 971 for my $m (@{ $msg->{servers} }) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 972 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
973 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 974
905 for ($desc) { 975 for ($desc) {
906 s/<br>/\n/gi; 976 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 977 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 978 s/<.*?>//sgi;
909 s/&/&amp;/g; 979 s/&amp;/&/g;
910 s/</&lt;/g; 980 s/&lt;/</g;
911 s/>/&gt;/g; 981 s/&gt;/>/g;
912 } 982 }
913 983
914 $uptime = sprintf "%dd %02d:%02d:%02d", 984 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 985 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 986 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 987 (int $uptime / 60) % 60,
918 $m->[8] % 60; 988 $uptime % 60;
919 989
920 $m = [$users, $host, $uptime, $version, $desc]; 990 $m = [$users, $host, $uptime, $version, $desc];
921 991
922 $y++; 992 $y++;
923 993
… …
933 ), 1003 ),
934 (new CFPlus::UI::Empty expand => 1), 1004 (new CFPlus::UI::Empty expand => 1),
935 ]); 1005 ]);
936 1006
937 $table->add ($_, $y, new CFPlus::UI::Label 1007 $table->add ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 1009 ellipsise => 0,
939 align => $align[$_], 1010 align => $align[$_],
940 text => $m->[$_], 1011 text => $m->[$_],
941 tooltip => $tip[$_], 1012 tooltip => $tip[$_],
1013 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 1014 can_hover => 1,
943 can_events => 1, 1015 can_events => 1,
944 fontsize => 0.8) 1016 fontsize => 0.8)
945 for 0 .. $#$m; 1017 for 0 .. $#$m;
946 } 1018 }
1019 } else {
1020 $ok or $label->set_text ("error while contacting metaserver");
947 } 1021 }
948 }); 1022 };
1023
949} 1024}
950 1025
951sub metaserver_dialog { 1026sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 1027 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 1028 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 1032 title => "Server List",
958 name => 'metaserver_dialog', 1033 name => 'metaserver_dialog',
959 x => 'center', 1034 x => 'center',
960 y => 'center', 1035 y => 'center',
961 z => 3, 1036 z => 3,
1037 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 1038 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 1039 child => $vbox,
964 has_close_button => 1, 1040 has_close_button => 1,
965 table => $table, 1041 table => $table,
966 on_visibility_change => sub { 1042 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 1043 update_metaserver ($_[0]) if $_[1];
… …
1043 . "so only set it if you really need to prefetch images. " 1119 . "so only set it if you really need to prefetch images. "
1044 . "This option can be set and unset any time.", 1120 . "This option can be set and unset any time.",
1045 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1121 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1046 ); 1122 );
1047 1123
1048 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1124 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1049 $table->add (1, 9, new CFPlus::UI::Entry 1125 $table->add (1, 9, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1128 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1131 );
1132
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1134 $table->add (1, 10, new CFPlus::UI::Entry
1050 text => $CFG->{output_count}, 1135 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.", 1136 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 }, 1137 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1053 ); 1138 );
1054 1139
1055 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1056 $table->add (1, 10, new CFPlus::UI::Entry 1141 $table->add (1, 11, new CFPlus::UI::Entry
1057 text => $CFG->{output_sync}, 1142 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.", 1143 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 }, 1144 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1060 ); 1145 );
1061 1146
1062 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1063 expand => 1, 1148 expand => 1,
1064 align => 0, 1149 align => 0,
1065 text => "Login", 1150 text => "Login",
1066 on_activate => sub { 1151 on_activate => sub {
1067 $CONN ? stop_game 1152 $CONN ? stop_game
1068 : start_game; 1153 : start_game;
1069 0 1154 0
1070 }, 1155 },
1071 ); 1156 );
1072 1157
1158 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info",
1160 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1161 );
1162
1163 $vbox
1164}
1165
1166sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168
1169 my $row = 0;
1170
1073 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1171 $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 1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1075 text => $CFG->{say_command}, 1173 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. " 1174 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. " 1175 . "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.", 1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1079 on_changed => sub { 1177 on_changed => sub {
1080 my ($self, $value) = @_; 1178 my ($self, $value) = @_;
1081 $CFG->{say_command} = $value; 1179 $CFG->{say_command} = $value;
1082 0 1180 0
1083 } 1181 }
1084 ); 1182 );
1085 1183
1086 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1184 $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 1185 $table->add (1, $row++, new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips}, 1186 state => $CFG->{show_tips},
1089 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1187 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1090 on_changed => sub { 1188 on_changed => sub {
1091 my ($self, $value) = @_; 1189 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value; 1190 $CFG->{show_tips} = $value;
1093 0 1191 0
1094 } 1192 }
1095 ); 1193 );
1096 1194
1097 $vbox->add (new CFPlus::UI::FancyFrame 1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1098 label => "Server Info", 1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1099 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1197 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub {
1202 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1204 0
1205 },
1100 ); 1206 );
1101 1207
1102 $vbox 1208 $table
1103} 1209}
1104 1210
1105sub message_window { 1211sub message_window {
1106 my $window = new CFPlus::UI::Toplevel 1212 my $window = new CFPlus::UI::Toplevel
1107 name => "message_window", 1213 name => "message_window",
… …
1188 ["Boots" => PICKUP_BOOTS], 1294 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1295 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1296 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1297 ],
1192 1298
1193 ["Readables", 2, 2, 1299 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1300 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1301 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1302 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1303 ],
1198 ["Misc", 2, 7, 1304 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1305 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1306 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1307 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1308 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1309 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1310 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1311 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1312 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1313 ["Jewelery" => PICKUP_JEWELS],
1314 ["Flesh" => PICKUP_FLESH],
1208 ], 1315 ],
1209 ["Weight/Value ratio", 2, 17] 1316 ["Weight/Value ratio", 2, 17]
1210 ) 1317 )
1211 { 1318 {
1212 my ($title, $x, $y, @bits) = @$_; 1319 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1369 $table
1263} 1370}
1264 1371
1265my %SORT_ORDER = ( 1372my %SORT_ORDER = (
1266 type => undef, 1373 type => undef,
1267 mtime => sub { sort { 1374 mtime => sub {
1375 my $NOW = time;
1376 sort {
1377 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1378 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1379
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1380 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1381 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1382 or $a->{type} <=> $b->{type}
1383 } @_
1271 } @_ }, 1384 },
1272 weight => sub { sort { 1385 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1386 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1387 or $a->{type} <=> $b->{type}
1275 } @_ }, 1388 } @_ },
1276); 1389);
… …
1301 #TODO# update to weigh/maxweight 1414 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1415 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1416
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1417 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1418 $sw1->add ($INV = new CFPlus::UI::Inventory);
1419 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1420
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1421 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1422
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1423 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1424
… …
1350 $ntb->add ( 1464 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1465 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1466 "Shows all your Skills."
1353 ); 1467 );
1354 1468
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1471 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1472 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1473 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1474 );
1361 $ntb->add ( 1475 $ntb->add (
… …
1368 1482
1369 $plwin->add ($ntb); 1483 $plwin->add ($ntb);
1370 $plwin 1484 $plwin
1371} 1485}
1372 1486
1373sub update_bindings {
1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1375}
1376
1377sub keyboard_setup { 1487sub keyboard_setup {
1378 my $binding_list = new CFPlus::UI::VBox; 1488 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} 1489}
1491 1490
1492sub help_window { 1491sub help_window {
1493 my $win = new CFPlus::UI::Toplevel 1492 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1493 x => 'center',
… …
1651 1650
1652sub show_tip_of_the_day { 1651sub show_tip_of_the_day {
1653 # find all tips 1652 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1653 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655 1654
1656 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1655 CFPlus::DB::get state => "tip_of_the_day", sub {
1656 my ($todindex) = @_;
1657 $todindex = 0 if $todindex >= @tod; 1657 $todindex = 0 if $todindex >= @tod;
1658 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1658 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1659 1659
1660 # create dialog 1660 # create dialog
1661 my $dialog; 1661 my $dialog;
1662 1662
1663 my $close = sub { 1663 my $close = sub {
1664 $dialog->destroy; 1664 $dialog->destroy;
1665 };
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 col_expand => [0, 1]);
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;
1665 }; 1702 };
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} 1703}
1703 1704
1704sub sdl_init { 1705sub sdl_init {
1705 CFPlus::SDL_Init 1706 CFPlus::SDL_Init
1706 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
… …
1740 padding => 0, 1741 padding => 0,
1741 z => 100, 1742 z => 100,
1742 force_x => "max", 1743 force_x => "max",
1743 force_y => 0; 1744 force_y => 0;
1744 $DEBUG_STATUS->show; 1745 $DEBUG_STATUS->show;
1745
1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1747 1746
1748 $STATUSBOX = new CFPlus::UI::Statusbox; 1747 $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]); 1748 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1750 1749
1751 (new CFPlus::UI::Frame 1750 (new CFPlus::UI::Frame
… …
1788 font => $FONT_FIXED, 1787 font => $FONT_FIXED,
1789 fontsize => $::CFG->{log_fontsize}, 1788 fontsize => $::CFG->{log_fontsize},
1790 indent => -4, 1789 indent => -4,
1791 can_hover => 1, 1790 can_hover => 1,
1792 can_events => 1, 1791 can_events => 1,
1792 max_par => $CFG->{logview_max_par},
1793 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1793 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1794 ; 1794 ;
1795 1795
1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1797 title => "Setup", 1797 title => "Setup",
1798 name => "setup_dialog", 1798 name => "setup_dialog",
… …
1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1811 1811
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1813 "Configure the server to play on, your username, password and other server-related options."); 1813 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup,
1815 "Configure various client-specific settings.");
1814 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1815 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1816 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1817 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1819 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1818 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1820 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
1852 ); 1854 );
1853 1855
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1856 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1857 tooltip => "View Documentation");
1856 1858
1859
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1860 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1861 text => "Quit",
1859 tooltip => "Terminates the program", 1862 tooltip => "Terminates the program",
1860 on_activate => sub { 1863 on_activate => sub {
1861 if ($CONN) { 1864 if ($CONN) {
… …
1872 } 1875 }
1873 1876
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1877 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1878}
1876 1879
1880sub setup_build_button {
1881 my ($enabled) = @_;
1882 if ($enabled) {
1883 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1884 $BUILD_BUTTON ||= new CFPlus::UI::Button
1885 text => "Build",
1886 tooltip => "Opens the ingame builder",
1887 on_activate => sub {
1888 if ($CONN) {
1889 $CONN->send_ext_req (builder_player_items => sub {
1890 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1891 });
1892 }
1893 0
1894 };
1895 $BUTTONBAR->add ($BUILD_BUTTON);
1896 } else {
1897 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1898 }
1899}
1900
1901sub open_ingame_editor {
1902 my ($msg) = @_;
1903
1904 my $win = new CFPlus::UI::Toplevel
1905 x => 0,
1906 y => 'center',
1907 z => 4,
1908 name => 'builder_window',
1909 force_w => int $WIDTH * 1/4,
1910 force_h => int $HEIGHT * 3/4,
1911 title => "In game builder",
1912 has_close_button => 1;
1913
1914 my $r = new CFPlus::UI::ScrolledWindow (
1915 expand => 1,
1916 scroll_y => 1
1917 );
1918 $r->add (my $vb = new CFPlus::UI::VBox);
1919 $win->add ($r);
1920
1921
1922 $vb->add (
1923 new CFPlus::UI::Button
1924 text => "Disable build mode",
1925 on_activate => sub { $::IN_BUILD_MODE = undef }
1926 );
1927 $vb->add (
1928 new CFPlus::UI::Button
1929 text => "ERASE",
1930 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1931 );
1932
1933 for my $itemarchname (
1934 sort {
1935 $msg->{items}->{$a}->{build_arch_name}
1936 cmp $msg->{items}->{$b}->{build_arch_name}
1937 } keys %{$msg->{items}}
1938 ) {
1939 my $info = $msg->{items}->{$itemarchname};
1940 $vb->add (
1941 new CFPlus::UI::Button text => $info->{build_arch_name},
1942 on_activate => sub {
1943 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1944
1945 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1946 build_mode_query_arch_info ();
1947 }
1948 }
1949 );
1950 }
1951
1952 $win->show;
1953}
1954
1955sub build_mode_query_arch_info {
1956 my ($iteminfo) = $::IN_BUILD_MODE;
1957 my $itemarchname = $iteminfo->{item};
1958 my $info = $iteminfo->{info};
1959
1960 my $dialog = new CFPlus::UI::Toplevel
1961 x => "center",
1962 y => "center",
1963 z => 50,
1964 force_w => int $WIDTH * 1/2,
1965 title => "Enter information for placement of '$itemarchname'",
1966 has_close_button => 1;
1967
1968 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1969
1970 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1971 my $row = 0;
1972 if ($info->{has_name}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1975 }
1976 if ($info->{has_text}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1979 }
1980 if ($info->{has_connection}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1982 $table->add (1, $row++,
1983 new CFPlus::UI::Entry
1984 expand => 1,
1985 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1986 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1987 );
1988 }
1989
1990 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1991 $hb->add (new CFPlus::UI::Button
1992 text => "Close",
1993 expand => 1,
1994 on_activate => sub { $dialog->hide; 0 },
1995 );
1996 $dialog->show;
1997}
1998
1877sub video_shutdown { 1999sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 2000 CFPlus::OpenGL::shutdown;
1879 2001
1880 undef $SDL_ACTIVE; 2002 undef $SDL_ACTIVE;
1881} 2003}
… …
1912 CFPlus::Mix_AllocateChannels 8; 2034 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2035 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 2036
1915 audio_music_finished; 2037 audio_music_finished;
1916 2038
2039 local $_;
1917 while (<$fh>) { 2040 while (<$fh>) {
1918 next if /^\s*#/; 2041 next if /^\s*#/;
1919 next if /^\s*$/; 2042 next if /^\s*$/;
1920 2043
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 2044 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1998 if $CONN; 2121 if $CONN;
1999}); 2122});
2000 2123
2001%SDL_CB = ( 2124%SDL_CB = (
2002 CFPlus::SDL_QUIT => sub { 2125 CFPlus::SDL_QUIT => sub {
2003 Event::unloop -1; 2126 exit;
2004 }, 2127 },
2005 CFPlus::SDL_VIDEORESIZE => sub { 2128 CFPlus::SDL_VIDEORESIZE => sub {
2006 }, 2129 },
2007 CFPlus::SDL_VIDEOEXPOSE => sub { 2130 CFPlus::SDL_VIDEOEXPOSE => sub {
2008 CFPlus::UI::full_refresh; 2131 CFPlus::UI::full_refresh;
2009 }, 2132 },
2010 CFPlus::SDL_ACTIVEEVENT => sub { 2133 CFPlus::SDL_ACTIVEEVENT => sub {
2011# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2134# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2012 }, 2139 },
2013 CFPlus::SDL_KEYDOWN => sub { 2140 CFPlus::SDL_KEYDOWN => sub {
2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2141 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2015 # alt-enter 2142 # alt-enter
2016 $FULLSCREEN_ENABLE->toggle; 2143 $FULLSCREEN_ENABLE->toggle;
… …
2037 2164
2038$SIG{INT} = $SIG{TERM} = sub { exit }; 2165$SIG{INT} = $SIG{TERM} = sub { exit };
2039 2166
2040{ 2167{
2041 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2168 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2169 CFPlus::DB::Server::run;
2170
2042 CFPlus::UI::set_layout ($::CFG->{layout}); 2171 CFPlus::UI::set_layout ($::CFG->{layout});
2043 2172
2044 my %DEF_CFG = ( 2173 my %DEF_CFG = (
2045 sdl_mode => 0, 2174 sdl_mode => 0,
2046 width => 640, 2175 width => 640,
2047 height => 480, 2176 height => 480,
2048 fullscreen => 0, 2177 fullscreen => 0,
2049 fast => 0, 2178 fast => 0,
2050 map_scale => 1, 2179 map_scale => 1,
2051 fow_enable => 1, 2180 fow_enable => 1,
2052 fow_intensity => 0.45, 2181 fow_intensity => 0.45,
2053 fow_smooth => 0, 2182 fow_smooth => 0,
2183 map_smoothing => 1,
2054 gui_fontsize => 1, 2184 gui_fontsize => 1,
2055 log_fontsize => 0.7, 2185 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2186 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2187 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2188 stat_fontsize => 0.7,
2059 mapsize => 100, 2189 mapsize => 100,
2060 say_command => 'say', 2190 say_command => 'chat',
2061 audio_enable => 1, 2191 audio_enable => 1,
2062 bgm_enable => 1, 2192 bgm_enable => 1,
2063 bgm_volume => 0.25, 2193 bgm_volume => 0.25,
2064 face_prefetch => 0, 2194 face_prefetch => 0,
2065 output_sync => 1, 2195 output_sync => 1,
2066 output_count => 1, 2196 output_count => 1,
2197 output_rate => "",
2067 pickup => 0, 2198 pickup => 0,
2068 inv_sort => "mtime", 2199 inv_sort => "mtime",
2069 default => "profile", # default profile 2200 default => "profile", # default profile
2070 show_tips => 1, 2201 show_tips => 1,
2202 logview_max_par => 1000,
2071 ); 2203 );
2072 2204
2073 while (my ($k, $v) = each %DEF_CFG) { 2205 while (my ($k, $v) = each %DEF_CFG) {
2074 $CFG->{$k} = $v unless exists $CFG->{$k}; 2206 $CFG->{$k} = $v unless exists $CFG->{$k};
2075 } 2207 }
2076 2208
2077 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2209 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2210 $PROFILE = $CFG->{profile}{default};
2211
2212 # convert old bindings (only default profile matters)
2213 if (my $bindings = delete $PROFILE->{bindings}) {
2214 while (my ($mod, $syms) = each %$bindings) {
2215 while (my ($sym, $cmds) = each %$syms) {
2216 push @{ $PROFILE->{macro} }, {
2217 accelkey => [$mod*1, $sym*1],
2218 action => $cmds,
2219 };
2220 }
2221 }
2222 }
2078 2223
2079 sdl_init; 2224 sdl_init;
2080 2225
2081 @SDL_MODES = reverse 2226 @SDL_MODES = reverse
2082 grep $_->[0] >= 640 && $_->[1] >= 480, 2227 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2131 2276
2132Event::loop; 2277Event::loop;
2133#CFPlus::SDL_Quit; 2278#CFPlus::SDL_Quit;
2134#CFPlus::_exit 0; 2279#CFPlus::_exit 0;
2135 2280
2281END {
2136END { CFPlus::SDL_Quit } 2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop;
2284}
2137 2285
2138=head1 NAME 2286=head1 NAME
2139 2287
2140cfplus - A Crossfire+ and Crossfire game client 2288cfplus - A Crossfire+ and Crossfire game client
2141 2289

Diff Legend

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