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.150 by root, Mon Apr 16 21:06:37 2007 UTC

… …
21 } 21 }
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26
27use Carp 'verbose';
26 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
… …
56use Compress::LZF; 58use Compress::LZF;
57 59
58use CFPlus; 60use CFPlus;
59use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
60use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
61use CFPlus::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
62use CFPlus::Pod; 67use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
65 70
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 72$SIG{PIPE} = 'IGNORE';
68 73
69$Event::Eval = 0; 74$Event::Eval = 1;
70$Event::DIED = sub { 75$Event::DIED = sub {
71 # TODO: display dialog box or so 76 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 77};
76 78
77my $MAX_FPS = 60; 79my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 80my $MIN_FPS = 5; # unused as of yet
79 81
80our $META_SERVER = "crossfire.real-time.com:13326"; 82our $META_SERVER = "http://metaserver.schmorp.de/current.json";
81 83
82our $LAST_REFRESH; 84our $LAST_REFRESH;
83our $NOW; 85our $NOW;
84 86
85our $CFG; 87our $CFG;
… …
123 125
124our $INVENTORY_PAGE; 126our $INVENTORY_PAGE;
125our $STATS_PAGE; 127our $STATS_PAGE;
126our $SKILL_PAGE; 128our $SKILL_PAGE;
127our $SPELL_PAGE; 129our $SPELL_PAGE;
130our $SPELL_LIST;
128 131
129our $HELP_WINDOW; 132our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 133our $MESSAGE_WINDOW;
131our $FLOORBOX; 134our $FLOORBOX;
132our $GAUGES; 135our $GAUGES;
… …
145 148
146our $INV; 149our $INV;
147our $INVR; 150our $INVR;
148our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
149 152
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
154 157
155sub status { 158sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 160}
158 161
… …
174sub destroy_query_dialog { 177sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
177} 180}
178 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
179# server query dialog 185# server query dialog
180sub server_query { 186sub server_query {
181 my ($conn, $flags, $prompt) = @_; 187 my ($conn, $flags, $prompt) = @_;
188
189 # FIXME: a very ugly hack to wait for stat update #d#
190 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
191 unless ($QUERY_TIMER) {
192 $QUERY_TIMER =
193 Event->timer (
194 after => 1,
195 cb => sub {
196 server_query ($conn, $flags, $prompt, 1);
197 $QUERY_TIMER = undef
198 }
199 );
200 return;
201 }
202 }
182 203
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 205 x => "center",
185 y => "center", 206 y => "center",
186 title => "Server Query", 207 title => "Server Query",
… …
375 status "logging in..."; 396 status "logging in...";
376 397
377 $LOGIN_BUTTON->set_text ("Logout"); 398 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 399 $SETUP_DIALOG->hide;
379 400
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 401 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 402
384 my ($host, $port) = split /:/, $PROFILE->{host}; 403 my ($host, $port) = split /:/, $PROFILE->{host};
385 404
386 $MAP = new CFPlus::Map $mapsize, $mapsize; 405 $MAP = new CFPlus::Map;
387 406
388 $CONN = eval { 407 $CONN = eval {
389 new CFPlus::Protocol 408 new CFPlus::Protocol
390 host => $host, 409 host => $host,
391 port => $port || 13327, 410 port => $port || 13327,
… …
401 statusbox => $STATUSBOX, 420 statusbox => $STATUSBOX,
402 map => $MAP, 421 map => $MAP,
403 mapmap => $MAPMAP, 422 mapmap => $MAPMAP,
404 query => \&server_query, 423 query => \&server_query,
405 424
425 setup_req => {
426 smoothing => $CFG->{map_smoothing}*1,
427 },
428
406 sound_play => sub { 429 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 430 my ($x, $y, $soundnum, $type) = @_;
408 431
409 $SDL_MIXER 432 $SDL_MIXER
410 or return; 433 or return;
… …
429sub stop_game { 452sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 453 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 455 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 456 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 457 $SPELL_LIST->clear_spells;
435 458
436 return unless $CONN; 459 return unless $CONN;
437 460
438 status "connection closed"; 461 status "connection closed";
439 462
… …
447sub graphics_setup { 470sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 471 my $vbox = new CFPlus::UI::VBox;
449 472
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 473 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 474
475 my $row = 0;
476
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
478 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
479 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 482 $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); 483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 484
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]); 485 $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"); 486 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 487
458 $mode_slider->connect (changed => sub { 488 $mode_slider->connect (changed => sub {
… …
460 490
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 493 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 494 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 495
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 496 $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 497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 498 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 499 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 505 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 506 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 508 );
481 509
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511 $table->add (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 );
516
517 $table->add (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.",
520 on_activate => sub {
521 video_shutdown ();
522 video_init ();
523 0
524 }
525 );
526
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 528 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532 );
533
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
535 $table->add (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538 . "This increases load on the graphics subsystem and works only with 2.x servers. "
539 . "Changes take effect at next connection only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 541 );
488 542
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 543 $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 544 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 545 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 564 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 565 0
512 } 566 }
513 ); 567 );
514 568
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"); 569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 571 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.", 572 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 }, 573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 589 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 590 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 591 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 592 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 593 $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 594 0
558 } 595 }
559 ); 596 );
560 597
561 $vbox 598 $vbox
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 703 $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"); 704 $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 }); 705 $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"); 706 $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 }); 707 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
708 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
671 709
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 710 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 711
674 for my $x (0..2) { 712 for my $x (0..2) {
675 for my $y (0 .. 2) { 713 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 717 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 718 );
681 } 719 }
682 } 720 }
683 721
722 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 723
685 $table 724 $table
686} 725}
687 726
688sub stats_window { 727sub stats_window {
… …
857 896
858 my $table = $METASERVER->{table}; 897 my $table = $METASERVER->{table};
859 $table->clear; 898 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 900
862 my $buf; 901 my $ok = 0;
863 902
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 903 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent;
865 905
866 unless ($fh) { 906 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 907 } sub {
868 return; 908 my ($msg) = @_;
869 } 909 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; 910 $table->clear;
884 911
885 my @tip = ( 912 my @tip = (
886 "The current number of users logged in on the server.", 913 "The current number of users logged in on the server.",
887 "The hostname of the server.", 914 "The hostname of the server.",
… …
897 for 0 .. $#col; 924 for 0 .. $#col;
898 925
899 my @align = qw(1 0 1 1 -1); 926 my @align = qw(1 0 1 1 -1);
900 927
901 my $y = 0; 928 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 929 for my $m (@{ $msg->{servers} }) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 930 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
931 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 932
905 for ($desc) { 933 for ($desc) {
906 s/<br>/\n/gi; 934 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 935 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 936 s/<.*?>//sgi;
909 s/&/&amp;/g; 937 s/&amp;/&/g;
910 s/</&lt;/g; 938 s/&lt;/</g;
911 s/>/&gt;/g; 939 s/&gt;/>/g;
912 } 940 }
913 941
914 $uptime = sprintf "%dd %02d:%02d:%02d", 942 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 943 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 944 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 945 (int $uptime / 60) % 60,
918 $m->[8] % 60; 946 $uptime % 60;
919 947
920 $m = [$users, $host, $uptime, $version, $desc]; 948 $m = [$users, $host, $uptime, $version, $desc];
921 949
922 $y++; 950 $y++;
923 951
… …
933 ), 961 ),
934 (new CFPlus::UI::Empty expand => 1), 962 (new CFPlus::UI::Empty expand => 1),
935 ]); 963 ]);
936 964
937 $table->add ($_, $y, new CFPlus::UI::Label 965 $table->add ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 967 ellipsise => 0,
939 align => $align[$_], 968 align => $align[$_],
940 text => $m->[$_], 969 text => $m->[$_],
941 tooltip => $tip[$_], 970 tooltip => $tip[$_],
971 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 972 can_hover => 1,
943 can_events => 1, 973 can_events => 1,
944 fontsize => 0.8) 974 fontsize => 0.8)
945 for 0 .. $#$m; 975 for 0 .. $#$m;
946 } 976 }
977 } else {
978 $ok or $label->set_text ("error while contacting metaserver");
947 } 979 }
948 }); 980 };
981
949} 982}
950 983
951sub metaserver_dialog { 984sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 985 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 986 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 990 title => "Server List",
958 name => 'metaserver_dialog', 991 name => 'metaserver_dialog',
959 x => 'center', 992 x => 'center',
960 y => 'center', 993 y => 'center',
961 z => 3, 994 z => 3,
995 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 996 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 997 child => $vbox,
964 has_close_button => 1, 998 has_close_button => 1,
965 table => $table, 999 table => $table,
966 on_visibility_change => sub { 1000 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 1001 update_metaserver ($_[0]) if $_[1];
… …
1043 . "so only set it if you really need to prefetch images. " 1077 . "so only set it if you really need to prefetch images. "
1044 . "This option can be set and unset any time.", 1078 . "This option can be set and unset any time.",
1045 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1046 ); 1080 );
1047 1081
1048 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1049 $table->add (1, 9, new CFPlus::UI::Entry 1083 $table->add (1, 9, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1086 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1089 );
1090
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092 $table->add (1, 10, new CFPlus::UI::Entry
1050 text => $CFG->{output_count}, 1093 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.", 1094 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 }, 1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1053 ); 1096 );
1054 1097
1055 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1056 $table->add (1, 10, new CFPlus::UI::Entry 1099 $table->add (1, 11, new CFPlus::UI::Entry
1057 text => $CFG->{output_sync}, 1100 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.", 1101 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 }, 1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1060 ); 1103 );
1061 1104
1062 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1063 expand => 1, 1106 expand => 1,
1064 align => 0, 1107 align => 0,
1065 text => "Login", 1108 text => "Login",
1066 on_activate => sub { 1109 on_activate => sub {
1067 $CONN ? stop_game 1110 $CONN ? stop_game
1068 : start_game; 1111 : start_game;
1069 0 1112 0
1070 }, 1113 },
1071 ); 1114 );
1072 1115
1116 $vbox->add (new CFPlus::UI::FancyFrame
1117 label => "Server Info",
1118 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1119 );
1120
1121 $vbox
1122}
1123
1124sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126
1127 my $row = 0;
1128
1073 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1129 $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 1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1075 text => $CFG->{say_command}, 1131 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. " 1132 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. " 1133 . "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.", 1134 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1079 on_changed => sub { 1135 on_changed => sub {
1080 my ($self, $value) = @_; 1136 my ($self, $value) = @_;
1081 $CFG->{say_command} = $value; 1137 $CFG->{say_command} = $value;
1082 0 1138 0
1083 } 1139 }
1084 ); 1140 );
1085 1141
1086 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1142 $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 1143 $table->add (1, $row++, new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips}, 1144 state => $CFG->{show_tips},
1089 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1145 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1090 on_changed => sub { 1146 on_changed => sub {
1091 my ($self, $value) = @_; 1147 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value; 1148 $CFG->{show_tips} = $value;
1093 0 1149 0
1094 } 1150 }
1095 ); 1151 );
1096 1152
1097 $vbox->add (new CFPlus::UI::FancyFrame 1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1098 label => "Server Info", 1154 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1099 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1155 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157 . "sends more messages than this number, older messages get removed to save memory and "
1158 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub {
1160 my ($self, $value) = @_;
1161 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1162 0
1163 },
1100 ); 1164 );
1101 1165
1102 $vbox 1166 $table
1103} 1167}
1104 1168
1105sub message_window { 1169sub message_window {
1106 my $window = new CFPlus::UI::Toplevel 1170 my $window = new CFPlus::UI::Toplevel
1107 name => "message_window", 1171 name => "message_window",
… …
1188 ["Boots" => PICKUP_BOOTS], 1252 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1253 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1254 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1255 ],
1192 1256
1193 ["Readables", 2, 2, 1257 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1258 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1259 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1260 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1261 ],
1198 ["Misc", 2, 7, 1262 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1263 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1264 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1265 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1266 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1267 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1268 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1269 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1270 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1271 ["Jewelery" => PICKUP_JEWELS],
1272 ["Flesh" => PICKUP_FLESH],
1208 ], 1273 ],
1209 ["Weight/Value ratio", 2, 17] 1274 ["Weight/Value ratio", 2, 17]
1210 ) 1275 )
1211 { 1276 {
1212 my ($title, $x, $y, @bits) = @$_; 1277 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1327 $table
1263} 1328}
1264 1329
1265my %SORT_ORDER = ( 1330my %SORT_ORDER = (
1266 type => undef, 1331 type => undef,
1267 mtime => sub { sort { 1332 mtime => sub {
1333 my $NOW = time;
1334 sort {
1335 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1336 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1337
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1338 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1339 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1340 or $a->{type} <=> $b->{type}
1341 } @_
1271 } @_ }, 1342 },
1272 weight => sub { sort { 1343 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1344 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1345 or $a->{type} <=> $b->{type}
1275 } @_ }, 1346 } @_ },
1276); 1347);
… …
1301 #TODO# update to weigh/maxweight 1372 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1373 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1374
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1375 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1376 $sw1->add ($INV = new CFPlus::UI::Inventory);
1377 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1378
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1379 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1380
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1381 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1382
… …
1350 $ntb->add ( 1422 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1423 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1424 "Shows all your Skills."
1353 ); 1425 );
1354 1426
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1427 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1428 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1429 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1430 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1431 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1432 );
1361 $ntb->add ( 1433 $ntb->add (
… …
1368 1440
1369 $plwin->add ($ntb); 1441 $plwin->add ($ntb);
1370 $plwin 1442 $plwin
1371} 1443}
1372 1444
1373sub update_bindings {
1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1375}
1376
1377sub keyboard_setup { 1445sub keyboard_setup {
1378 my $binding_list = new CFPlus::UI::VBox; 1446 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} 1447}
1491 1448
1492sub help_window { 1449sub help_window {
1493 my $win = new CFPlus::UI::Toplevel 1450 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1451 x => 'center',
… …
1651 1608
1652sub show_tip_of_the_day { 1609sub show_tip_of_the_day {
1653 # find all tips 1610 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1611 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655 1612
1656 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1613 CFPlus::DB::get state => "tip_of_the_day", sub {
1614 my ($todindex) = @_;
1657 $todindex = 0 if $todindex >= @tod; 1615 $todindex = 0 if $todindex >= @tod;
1658 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1616 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1659 1617
1660 # create dialog 1618 # create dialog
1661 my $dialog; 1619 my $dialog;
1662 1620
1663 my $close = sub { 1621 my $close = sub {
1664 $dialog->destroy; 1622 $dialog->destroy;
1623 };
1624
1625 $dialog = new CFPlus::UI::Toplevel
1626 x => "center",
1627 y => "center",
1628 z => 3,
1629 name => 'tip_of_the_day',
1630 force_w => int $WIDTH * 4/9,
1631 force_h => int $WIDTH * 2/9,
1632 title => "Tip of the day #" . (1 + $todindex),
1633 child => my $vbox = new CFPlus::UI::VBox,
1634 has_close_button => 1,
1635 on_delete => $close,
1636 ;
1637
1638 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643
1644 $table->add (0, 0, new CFPlus::UI::Button
1645 text => "Close",
1646 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>.",
1647 on_activate => $close,
1648 );
1649
1650 $table->add (2, 0, new CFPlus::UI::Button
1651 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub {
1654 $close->();
1655 &show_tip_of_the_day;
1656 },
1657 );
1658
1659 $dialog->show;
1665 }; 1660 };
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} 1661}
1703 1662
1704sub sdl_init { 1663sub sdl_init {
1705 CFPlus::SDL_Init 1664 CFPlus::SDL_Init
1706 and die "SDL::Init failed!\n"; 1665 and die "SDL::Init failed!\n";
… …
1740 padding => 0, 1699 padding => 0,
1741 z => 100, 1700 z => 100,
1742 force_x => "max", 1701 force_x => "max",
1743 force_y => 0; 1702 force_y => 0;
1744 $DEBUG_STATUS->show; 1703 $DEBUG_STATUS->show;
1745
1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1747 1704
1748 $STATUSBOX = new CFPlus::UI::Statusbox; 1705 $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]); 1706 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1750 1707
1751 (new CFPlus::UI::Frame 1708 (new CFPlus::UI::Frame
… …
1788 font => $FONT_FIXED, 1745 font => $FONT_FIXED,
1789 fontsize => $::CFG->{log_fontsize}, 1746 fontsize => $::CFG->{log_fontsize},
1790 indent => -4, 1747 indent => -4,
1791 can_hover => 1, 1748 can_hover => 1,
1792 can_events => 1, 1749 can_events => 1,
1750 max_par => $CFG->{logview_max_par},
1793 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1751 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1794 ; 1752 ;
1795 1753
1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1754 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1797 title => "Setup", 1755 title => "Setup",
1798 name => "setup_dialog", 1756 name => "setup_dialog",
… …
1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1767 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1768 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1811 1769
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1813 "Configure the server to play on, your username, password and other server-related options."); 1771 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup,
1773 "Configure various client-specific settings.");
1814 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1774 $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."); 1775 "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, 1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1817 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1777 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1818 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1778 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
1852 ); 1812 );
1853 1813
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1814 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1815 tooltip => "View Documentation");
1856 1816
1817
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1818 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1819 text => "Quit",
1859 tooltip => "Terminates the program", 1820 tooltip => "Terminates the program",
1860 on_activate => sub { 1821 on_activate => sub {
1861 if ($CONN) { 1822 if ($CONN) {
… …
1872 } 1833 }
1873 1834
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1835 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1836}
1876 1837
1838sub setup_build_button {
1839 my ($enabled) = @_;
1840 if ($enabled) {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 $BUILD_BUTTON ||= new CFPlus::UI::Button
1843 text => "Build",
1844 tooltip => "Opens the ingame builder",
1845 on_activate => sub {
1846 if ($CONN) {
1847 $CONN->send_ext_req (builder_player_items => sub {
1848 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1849 });
1850 }
1851 0
1852 };
1853 $BUTTONBAR->add ($BUILD_BUTTON);
1854 } else {
1855 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1856 }
1857}
1858
1859sub open_ingame_editor {
1860 my ($msg) = @_;
1861
1862 my $win = new CFPlus::UI::Toplevel
1863 x => 0,
1864 y => 'center',
1865 z => 4,
1866 name => 'builder_window',
1867 force_w => int $WIDTH * 1/4,
1868 force_h => int $HEIGHT * 3/4,
1869 title => "In game builder",
1870 has_close_button => 1;
1871
1872 my $r = new CFPlus::UI::ScrolledWindow (
1873 expand => 1,
1874 scroll_y => 1
1875 );
1876 $r->add (my $vb = new CFPlus::UI::VBox);
1877 $win->add ($r);
1878
1879
1880 $vb->add (
1881 new CFPlus::UI::Button
1882 text => "Disable build mode",
1883 on_activate => sub { $::IN_BUILD_MODE = undef }
1884 );
1885 $vb->add (
1886 new CFPlus::UI::Button
1887 text => "ERASE",
1888 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1889 );
1890
1891 for my $itemarchname (
1892 sort {
1893 $msg->{items}->{$a}->{build_arch_name}
1894 cmp $msg->{items}->{$b}->{build_arch_name}
1895 } keys %{$msg->{items}}
1896 ) {
1897 my $info = $msg->{items}->{$itemarchname};
1898 $vb->add (
1899 new CFPlus::UI::Button text => $info->{build_arch_name},
1900 on_activate => sub {
1901 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1902
1903 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1904 build_mode_query_arch_info ();
1905 }
1906 }
1907 );
1908 }
1909
1910 $win->show;
1911}
1912
1913sub build_mode_query_arch_info {
1914 my ($iteminfo) = $::IN_BUILD_MODE;
1915 my $itemarchname = $iteminfo->{item};
1916 my $info = $iteminfo->{info};
1917
1918 my $dialog = new CFPlus::UI::Toplevel
1919 x => "center",
1920 y => "center",
1921 z => 50,
1922 force_w => int $WIDTH * 1/2,
1923 title => "Enter information for placement of '$itemarchname'",
1924 has_close_button => 1;
1925
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0;
1930 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1932 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 }
1934 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1936 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 }
1938 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++,
1941 new CFPlus::UI::Entry
1942 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945 );
1946 }
1947
1948 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1949 $hb->add (new CFPlus::UI::Button
1950 text => "Close",
1951 expand => 1,
1952 on_activate => sub { $dialog->hide; 0 },
1953 );
1954 $dialog->show;
1955}
1956
1877sub video_shutdown { 1957sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 1958 CFPlus::OpenGL::shutdown;
1879 1959
1880 undef $SDL_ACTIVE; 1960 undef $SDL_ACTIVE;
1881} 1961}
… …
1912 CFPlus::Mix_AllocateChannels 8; 1992 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1993 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 1994
1915 audio_music_finished; 1995 audio_music_finished;
1916 1996
1997 local $_;
1917 while (<$fh>) { 1998 while (<$fh>) {
1918 next if /^\s*#/; 1999 next if /^\s*#/;
1919 next if /^\s*$/; 2000 next if /^\s*$/;
1920 2001
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 2002 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2006 }, 2087 },
2007 CFPlus::SDL_VIDEOEXPOSE => sub { 2088 CFPlus::SDL_VIDEOEXPOSE => sub {
2008 CFPlus::UI::full_refresh; 2089 CFPlus::UI::full_refresh;
2009 }, 2090 },
2010 CFPlus::SDL_ACTIVEEVENT => sub { 2091 CFPlus::SDL_ACTIVEEVENT => sub {
2011# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2092# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2012 }, 2097 },
2013 CFPlus::SDL_KEYDOWN => sub { 2098 CFPlus::SDL_KEYDOWN => sub {
2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2099 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2015 # alt-enter 2100 # alt-enter
2016 $FULLSCREEN_ENABLE->toggle; 2101 $FULLSCREEN_ENABLE->toggle;
… …
2037 2122
2038$SIG{INT} = $SIG{TERM} = sub { exit }; 2123$SIG{INT} = $SIG{TERM} = sub { exit };
2039 2124
2040{ 2125{
2041 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2126 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2127 CFPlus::DB::Server::run;
2128
2042 CFPlus::UI::set_layout ($::CFG->{layout}); 2129 CFPlus::UI::set_layout ($::CFG->{layout});
2043 2130
2044 my %DEF_CFG = ( 2131 my %DEF_CFG = (
2045 sdl_mode => 0, 2132 sdl_mode => 0,
2046 width => 640, 2133 width => 640,
2047 height => 480, 2134 height => 480,
2048 fullscreen => 0, 2135 fullscreen => 0,
2049 fast => 0, 2136 fast => 0,
2050 map_scale => 1, 2137 map_scale => 1,
2051 fow_enable => 1, 2138 fow_enable => 1,
2052 fow_intensity => 0.45, 2139 fow_intensity => 0.45,
2053 fow_smooth => 0, 2140 fow_smooth => 0,
2141 map_smoothing => 1,
2054 gui_fontsize => 1, 2142 gui_fontsize => 1,
2055 log_fontsize => 0.7, 2143 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2144 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2145 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2146 stat_fontsize => 0.7,
2059 mapsize => 100, 2147 mapsize => 100,
2060 say_command => 'say', 2148 say_command => 'chat',
2061 audio_enable => 1, 2149 audio_enable => 1,
2062 bgm_enable => 1, 2150 bgm_enable => 1,
2063 bgm_volume => 0.25, 2151 bgm_volume => 0.25,
2064 face_prefetch => 0, 2152 face_prefetch => 0,
2065 output_sync => 1, 2153 output_sync => 1,
2066 output_count => 1, 2154 output_count => 1,
2155 output_rate => "",
2067 pickup => 0, 2156 pickup => 0,
2068 inv_sort => "mtime", 2157 inv_sort => "mtime",
2069 default => "profile", # default profile 2158 default => "profile", # default profile
2070 show_tips => 1, 2159 show_tips => 1,
2160 logview_max_par => 1000,
2071 ); 2161 );
2072 2162
2073 while (my ($k, $v) = each %DEF_CFG) { 2163 while (my ($k, $v) = each %DEF_CFG) {
2074 $CFG->{$k} = $v unless exists $CFG->{$k}; 2164 $CFG->{$k} = $v unless exists $CFG->{$k};
2075 } 2165 }
2076 2166
2077 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2167 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2168 $PROFILE = $CFG->{profile}{default};
2169
2170 # convert old bindings (only default profile matters)
2171 if (my $bindings = delete $PROFILE->{bindings}) {
2172 while (my ($mod, $syms) = each %$bindings) {
2173 while (my ($sym, $cmds) = each %$syms) {
2174 push @{ $PROFILE->{macro} }, {
2175 accelkey => [$mod*1, $sym*1],
2176 action => $cmds,
2177 };
2178 }
2179 }
2180 }
2078 2181
2079 sdl_init; 2182 sdl_init;
2080 2183
2081 @SDL_MODES = reverse 2184 @SDL_MODES = reverse
2082 grep $_->[0] >= 640 && $_->[1] >= 480, 2185 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2131 2234
2132Event::loop; 2235Event::loop;
2133#CFPlus::SDL_Quit; 2236#CFPlus::SDL_Quit;
2134#CFPlus::_exit 0; 2237#CFPlus::_exit 0;
2135 2238
2239END {
2240 CFPlus::DB::Server::stop;
2136END { CFPlus::SDL_Quit } 2241 CFPlus::SDL_Quit;
2242}
2137 2243
2138=head1 NAME 2244=head1 NAME
2139 2245
2140cfplus - A Crossfire+ and Crossfire game client 2246cfplus - A Crossfire+ and Crossfire game client
2141 2247

Diff Legend

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