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.113 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.143 by root, Fri Mar 16 02:33:50 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @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
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
36 59
37use CFPlus; 60use CFPlus;
38use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
39use CFPlus::Protocol; 62use CFPlus::Protocol;
40use CFPlus::UI; 63use CFPlus::UI;
64use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList;
41use CFPlus::Pod; 66use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 67use CFPlus::MapWidget;
68use CFPlus::Macro;
44 69
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 70$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 71$SIG{PIPE} = 'IGNORE';
47 72
48$Event::Eval = 0; 73$Event::Eval = 1;
49$Event::DIED = sub { 74$Event::DIED = sub {
50 # TODO: display dialog box or so 75 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 76};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 77
66my $MAX_FPS = 60; 78my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
68 80
69our $META_SERVER = "crossfire.real-time.com:13326"; 81our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 82
71our $LAST_REFRESH; 83our $LAST_REFRESH;
72our $NOW; 84our $NOW;
73 85
74our $CFG; 86our $CFG;
75our $CONN; 87our $CONN;
88our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 89our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 90
78our $WANT_REFRESH; 91our $WANT_REFRESH;
79our $CAN_REFRESH; 92our $CAN_REFRESH;
80 93
… …
111 124
112our $INVENTORY_PAGE; 125our $INVENTORY_PAGE;
113our $STATS_PAGE; 126our $STATS_PAGE;
114our $SKILL_PAGE; 127our $SKILL_PAGE;
115our $SPELL_PAGE; 128our $SPELL_PAGE;
129our $SPELL_LIST;
116 130
117our $HELP_WINDOW; 131our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 132our $MESSAGE_WINDOW;
119our $FLOORBOX; 133our $FLOORBOX;
120our $GAUGES; 134our $GAUGES;
… …
133 147
134our $INV; 148our $INV;
135our $INVR; 149our $INVR;
136our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
137 151
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
142 156
143sub status { 157sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 158 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 159}
146 160
147sub debug { 161sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 162 $DEBUG_STATUS->set_text ($_[0]);
163}
164
165sub message {
166 my ($para) = @_;
167
168 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
169
170 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
171
172 $LOGVIEW->add_paragraph ($para);
173 $LOGVIEW->scroll_to_bottom;
149} 174}
150 175
151sub destroy_query_dialog { 176sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
154} 179}
155 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
156# server query dialog 184# server query dialog
157sub server_query { 185sub server_query {
158 my ($conn, $flags, $prompt) = @_; 186 my ($conn, $flags, $prompt) = @_;
159 187
188 # FIXME: a very ugly hack to wait for stat update #d#
189 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
190 unless ($QUERY_TIMER) {
191 $QUERY_TIMER =
192 Event->timer (
193 after => 1,
194 cb => sub {
195 server_query ($conn, $flags, $prompt, 1);
196 $QUERY_TIMER = undef
197 }
198 );
199 return;
200 }
201 }
202
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 204 x => "center",
162 y => "center", 205 y => "center",
163 title => "Server Query", 206 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 207 child => my $vbox = new CFPlus::UI::VBox,
165 ; 208 ;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
356 399
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 400 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 401
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
360 403
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 404 $MAP = new CFPlus::Map;
362 405
363 $CONN = eval { 406 $CONN = eval {
364 new CFPlus::Protocol 407 new CFPlus::Protocol
365 host => $host, 408 host => $host,
366 port => $port || 13327, 409 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 410 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 411 pass => $PROFILE->{password},
369 mapw => $mapsize, 412 mapw => $mapsize,
370 maph => $mapsize, 413 maph => $mapsize,
414
415 client => "cfplus $CFPlus::VERSION $] $^O",
371 416
372 map_widget => $MAPWIDGET, 417 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 418 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 419 statusbox => $STATUSBOX,
375 map => $MAP, 420 map => $MAP,
… …
402sub stop_game { 447sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
408 453
409 return unless $CONN; 454 return unless $CONN;
410 455
411 status "connection closed"; 456 status "connection closed";
412 457
… …
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 685 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 686 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 687 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 688 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
689 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
644 690
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 692
647 for my $x (0..2) { 693 for my $x (0..2) {
648 for my $y (0 .. 2) { 694 for my $y (0 .. 2) {
… …
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 698 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 ); 699 );
654 } 700 }
655 } 701 }
656 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 704
658 $table 705 $table
659} 706}
660 707
661sub stats_window { 708sub stats_window {
… …
663 expand => 1, 710 expand => 1,
664 scroll_y => 1 711 scroll_y => 1
665 ); 712 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 713 $r->add (my $vb = new CFPlus::UI::VBox);
667 714
715 $vb->add (new CFPlus::UI::FancyFrame
716 label => "Player",
717 child => (my $pi = new CFPlus::UI::VBox),
718 );
719
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 720 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 721 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 722 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 723 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 724 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 725 tooltip => "The map you are currently on (if supported by the server).");
674 726
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 727 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 728 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 729 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 730 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 731 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 732 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 733 tooltip => "The weight limit: you cannot carry more than this.");
682 734
735 $vb->add (new CFPlus::UI::FancyFrame
736 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 737 child => (my $hb = new CFPlus::UI::HBox expand => 1),
738 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 739 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 740
686 my $color2 = [1, 1, 0]; 741 my $color2 = [1, 1, 0];
687 742
688 for ( 743 for (
… …
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 764 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 765 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 766 align => -1, text => $label, tooltip => "#stat_$label");
712 } 767 }
713 768
769 $vb->add (new CFPlus::UI::FancyFrame
770 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 771 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
772 );
715 773
716 my $row = 0; 774 my $row = 0;
717 my $col = 0; 775 my $col = 0;
718 776
719 my %resist_names = ( 777 my %resist_names = (
… …
819 877
820 my $table = $METASERVER->{table}; 878 my $table = $METASERVER->{table};
821 $table->clear; 879 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 880 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 881
824 my $buf; 882 my $ok = 0;
825 883
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 884 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent;
827 886
828 unless ($fh) { 887 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 888 } sub {
830 return; 889 my ($msg) = @_;
831 } 890 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 891 $table->clear;
846 892
847 my @tip = ( 893 my @tip = (
848 "The current number of users logged in on the server.", 894 "The current number of users logged in on the server.",
849 "The hostname of the server.", 895 "The hostname of the server.",
… …
859 for 0 .. $#col; 905 for 0 .. $#col;
860 906
861 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
862 908
863 my $y = 0; 909 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 910 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 911 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
912 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 913
867 for ($desc) { 914 for ($desc) {
868 s/<br>/\n/gi; 915 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 916 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 917 s/<.*?>//sgi;
871 s/&/&amp;/g; 918 s/&amp;/&/g;
872 s/</&lt;/g; 919 s/&lt;/</g;
873 s/>/&gt;/g; 920 s/&gt;/>/g;
874 } 921 }
875 922
876 $uptime = sprintf "%dd %02d:%02d:%02d", 923 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 924 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 925 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 926 (int $uptime / 60) % 60,
880 $m->[8] % 60; 927 $uptime % 60;
881 928
882 $m = [$users, $host, $uptime, $version, $desc]; 929 $m = [$users, $host, $uptime, $version, $desc];
883 930
884 $y++; 931 $y++;
885 932
… …
895 ), 942 ),
896 (new CFPlus::UI::Empty expand => 1), 943 (new CFPlus::UI::Empty expand => 1),
897 ]); 944 ]);
898 945
899 $table->add ($_, $y, new CFPlus::UI::Label 946 $table->add ($_, $y, new CFPlus::UI::Label
947 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 948 ellipsise => 0,
901 align => $align[$_], 949 align => $align[$_],
902 text => $m->[$_], 950 text => $m->[$_],
903 tooltip => $tip[$_], 951 tooltip => $tip[$_],
952 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 953 can_hover => 1,
905 can_events => 1, 954 can_events => 1,
906 fontsize => 0.8) 955 fontsize => 0.8)
907 for 0 .. $#$m; 956 for 0 .. $#$m;
908 } 957 }
958 } else {
959 $ok or $label->set_text ("error while contacting metaserver");
909 } 960 }
910 }); 961 };
962
911} 963}
912 964
913sub metaserver_dialog { 965sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 966 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 967 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 968 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 969
918 my $dialog = new CFPlus::UI::FancyFrame 970 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 971 title => "Server List",
920 name => 'metaserver_dialog', 972 name => 'metaserver_dialog',
921 x => 'center', 973 x => 'center',
922 y => 'center', 974 y => 'center',
923 z => 3, 975 z => 3,
976 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 977 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 978 child => $vbox,
926 has_close_button => 1, 979 has_close_button => 1,
927 table => $table, 980 table => $table,
928 on_visibility_change => sub { 981 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 982 update_metaserver ($_[0]) if $_[1];
… …
935} 988}
936 989
937sub server_setup { 990sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 991 my $vbox = new CFPlus::UI::VBox;
939 992
993 $vbox->add (new CFPlus::UI::FancyFrame
994 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 995 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
996 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 997 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 998
943 { 999 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1000 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1001
… …
1002 . "so only set it if you really need to prefetch images. " 1058 . "so only set it if you really need to prefetch images. "
1003 . "This option can be set and unset any time.", 1059 . "This option can be set and unset any time.",
1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1005 ); 1061 );
1006 1062
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1063 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1008 $table->add (1, 9, new CFPlus::UI::Entry 1064 $table->add (1, 9, new CFPlus::UI::Entry
1065 text => $CFG->{output_rate},
1066 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1067 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1068 . "default will be used, which is usually around 100kb/s.",
1069 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1070 );
1071
1072 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1073 $table->add (1, 10, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1074 text => $CFG->{output_count},
1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1075 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1076 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1012 ); 1077 );
1013 1078
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1079 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1015 $table->add (1, 10, new CFPlus::UI::Entry 1080 $table->add (1, 11, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1081 text => $CFG->{output_sync},
1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1082 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1083 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1019 ); 1084 );
1020 1085
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1086 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1087 expand => 1,
1023 align => 0, 1088 align => 0,
1024 text => "Login", 1089 text => "Login",
1025 on_activate => sub { 1090 on_activate => sub {
1026 $CONN ? stop_game 1091 $CONN ? stop_game
1027 : start_game; 1092 : start_game;
1028 0 1093 0
1029 }, 1094 },
1030 ); 1095 );
1031 1096
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1097 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1098 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1099 text => $CFG->{say_command},
1035 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. " 1100 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. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1101 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1102 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1103 on_changed => sub {
1039 my ($self, $value) = @_; 1104 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1105 $CFG->{say_command} = $value;
1041 0 1106 0
1042 } 1107 }
1043 ); 1108 );
1044 1109
1110 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1111 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1112 state => $CFG->{show_tips},
1113 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1114 on_changed => sub {
1115 my ($self, $value) = @_;
1116 $CFG->{show_tips} = $value;
1117 0
1118 }
1119 );
1120
1045 $vbox->add (new CFPlus::UI::Label 1121 $vbox->add (new CFPlus::UI::FancyFrame
1046 text => "Server Info", 1122 label => "Server Info",
1047 fontsize => 1.2,
1048 padding_y => 8,
1049 fg => [1, 1, 0, 1],
1050 );
1051
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1123 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1124 );
1053 1125
1054 $vbox 1126 $vbox
1055} 1127}
1056 1128
1057sub message_window { 1129sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1130 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1131 name => "message_window",
1060 title => "Messages", 1132 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1133 border_bg => [1, 1, 1, 1],
1062 x => "max", 1134 x => "max",
1063 y => 0, 1135 y => 0,
… …
1113 window => $window, 1185 window => $window,
1114 input => $input, 1186 input => $input,
1115 }; 1187 };
1116 1188
1117 $window 1189 $window
1118}
1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174} 1190}
1175 1191
1176sub autopickup_setup { 1192sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table; 1193 my $table = new CFPlus::UI::Table;
1178 1194
… …
1196 ["Boots" => PICKUP_BOOTS], 1212 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1213 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1214 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1215 ],
1200 1216
1201 ["Readables", 2, 2, 1217 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1218 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1219 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1220 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1221 ],
1206 ["Misc", 2, 7, 1222 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1223 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1224 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1225 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1226 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1227 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1228 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1229 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1230 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1231 ["Jewelery" => PICKUP_JEWELS],
1232 ["Flesh" => PICKUP_FLESH],
1216 ], 1233 ],
1217 ["Weight/Value ratio", 2, 17] 1234 ["Weight/Value ratio", 2, 17]
1218 ) 1235 )
1219 { 1236 {
1220 my ($title, $x, $y, @bits) = @$_; 1237 my ($title, $x, $y, @bits) = @$_;
… …
1270 $table 1287 $table
1271} 1288}
1272 1289
1273my %SORT_ORDER = ( 1290my %SORT_ORDER = (
1274 type => undef, 1291 type => undef,
1275 mtime => sub { sort { 1292 mtime => sub {
1293 my $NOW = time;
1294 sort {
1295 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1296 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1297
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1298 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1299 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1300 or $a->{type} <=> $b->{type}
1301 } @_
1279 } @_ }, 1302 },
1280 weight => sub { sort { 1303 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1304 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1305 or $a->{type} <=> $b->{type}
1283 } @_ }, 1306 } @_ },
1284); 1307);
… …
1309 #TODO# update to weigh/maxweight 1332 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1333 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1334
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1335 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1336 $sw1->add ($INV = new CFPlus::UI::Inventory);
1337 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1338
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1339 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1340
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1341 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1342
… …
1335 $PL_WINDOW->show; 1359 $PL_WINDOW->show;
1336 } 1360 }
1337} 1361}
1338 1362
1339sub player_window { 1363sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1364 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1365 x => "center",
1342 y => "center", 1366 y => "center",
1343 force_w => $WIDTH * 9/10, 1367 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1368 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1369 title => "Player",
… …
1358 $ntb->add ( 1382 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1383 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1384 "Shows all your Skills."
1361 ); 1385 );
1362 1386
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1387 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1388 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1389 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1390 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1391 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1392 );
1369 $ntb->add ( 1393 $ntb->add (
… …
1376 1400
1377 $plwin->add ($ntb); 1401 $plwin->add ($ntb);
1378 $plwin 1402 $plwin
1379} 1403}
1380 1404
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1405sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1406 CFPlus::Macro::keyboard_setup
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1407}
1492 1408
1493sub help_window { 1409sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1410 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1411 x => 'center',
1496 y => 'center', 1412 y => 'center',
1497 z => 2, 1413 z => 4,
1498 name => 'doc_browser', 1414 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1415 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1416 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1417 title => "Help Browser",
1502 has_close_button => 1; 1418 has_close_button => 1;
1503 1419
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1420 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1421
1422 $vbox->add (new CFPlus::UI::FancyFrame
1423 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1424 child => (my $buttons = new CFPlus::UI::HBox),
1425 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1426 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1427 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1428
1510 my @history; 1429 my @history;
1511 my @future; 1430 my @future;
1512 my $curnode; 1431 my $curnode;
1513 1432
1514 my $load_node; $load_node = sub { 1433 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1434 my ($node, $para) = @_;
1516 1435
1517 $buttons->clear; 1436 $buttons->clear;
1437
1438 $buttons->add (new CFPlus::UI::Button
1439 text => "⇤",
1440 tooltip => "back to the starting page",
1441 on_activate => sub {
1442 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1443 unshift @future, @history;
1444 @history = ();
1445 $load_node->(@{shift @future});
1446 },
1447 );
1518 1448
1519 if (@history) { 1449 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1450 $buttons->add (new CFPlus::UI::Button
1521 text => "⋘", 1451 text => "⋘",
1522 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1452 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1453 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1454 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1455 $load_node->(@{pop @history});
1526 }, 1456 },
1527 ); 1457 );
1528 } 1458 }
1529 1459
1530 if (@future) { 1460 if (@future) {
1531 $buttons->add (new CFPlus::UI::Button 1461 $buttons->add (new CFPlus::UI::Button
1532 text => "⋙", 1462 text => "⋙",
1533 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1463 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1534 on_activate => sub { 1464 on_activate => sub {
1535 push @history, $curnode; 1465 push @history, [$curnode, $viewer->current_paragraph];
1536 $load_node->(shift @future); 1466 $load_node->(@{shift @future});
1537 }, 1467 },
1538 ); 1468 );
1539 } 1469 }
1540 1470
1541 $buttons->add (new CFPlus::UI::Label text => " "); 1471 $buttons->add (new CFPlus::UI::Label text => " ");
… …
1546 for my $node (@path) { 1476 for my $node (@path) {
1547 $buttons->add (new CFPlus::UI::Button 1477 $buttons->add (new CFPlus::UI::Button
1548 text => $node->{kw}[0], 1478 text => $node->{kw}[0],
1549 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1479 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1550 on_activate => sub { 1480 on_activate => sub {
1551 push @history, $curnode if $curnode; @future = (); 1481 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 $load_node->($node); 1482 $load_node->($node);
1553 }, 1483 },
1554 ); 1484 );
1555 $buttons->add (new CFPlus::UI::Label text => "/"); 1485 $buttons->add (new CFPlus::UI::Label text => "/");
1556 } 1486 }
1557 1487
1558 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0]); 1488 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1559 1489
1560 $curnode = $node; 1490 $curnode = $node;
1561 1491
1562 $viewer->clear; 1492 $viewer->clear;
1563 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1493 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1564 $viewer->set_offset (0); 1494 $viewer->scroll_to ($para);
1565 }; 1495 };
1566 1496
1567 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1497 $load_node->(CFPlus::Pod::find pod => "mainpage");
1568 1498
1569 $CFPlus::Pod::goto_document = sub { 1499 $CFPlus::Pod::goto_document = sub {
1570 my (@path) = @_; 1500 my (@path) = @_;
1571 1501
1572 push @history, $curnode if $curnode; @future = (); 1502 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1573 1503
1574 $load_node->(CFPlus::Pod::find @path); 1504 $load_node->((CFPlus::Pod::find @path)[0]);
1575 $win->show; 1505 $win->show;
1576 }; 1506 };
1577 1507
1578 $win 1508 $win
1509}
1510
1511sub open_string_query {
1512 my ($title, $cb, $txt, $tooltip) = @_;
1513 my $dialog = new CFPlus::UI::Toplevel
1514 x => "center",
1515 y => "center",
1516 z => 50,
1517 force_w => $WIDTH * 4/5,
1518 title => $title;
1519
1520 $dialog->add (
1521 my $e = new CFPlus::UI::Entry
1522 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1523 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1524 tooltip => $tooltip
1525 );
1526
1527 $e->grab_focus;
1528 $e->set_text ($txt) if $txt;
1529 $dialog->show;
1530}
1531
1532sub open_quit_dialog {
1533 unless ($QUIT_DIALOG) {
1534 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1535 x => "center",
1536 y => "center",
1537 z => 50,
1538 title => "Really Quit?",
1539 on_key_down => sub {
1540 my ($dialog, $ev) = @_;
1541 $ev->{sym} == 27 and $dialog->hide;
1542 }
1543 ;
1544
1545 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1546
1547 $vb->add (new CFPlus::UI::Label
1548 text => "You should find a savebed and apply it first!",
1549 max_w => $WIDTH * 0.25,
1550 ellipsize => 0,
1551 );
1552 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1553 $hb->add (new CFPlus::UI::Button
1554 text => "Ok",
1555 expand => 1,
1556 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1557 );
1558 $hb->add (new CFPlus::UI::Button
1559 text => "Quit anyway",
1560 expand => 1,
1561 on_activate => sub { exit },
1562 );
1563 }
1564
1565 $QUIT_DIALOG->show;
1566 $QUIT_DIALOG->grab_focus;
1567}
1568
1569sub show_tip_of_the_day {
1570 # find all tips
1571 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1572
1573 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1574 $todindex = 0 if $todindex >= @tod;
1575 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1576
1577 # create dialog
1578 my $dialog;
1579
1580 my $close = sub {
1581 $dialog->destroy;
1582 };
1583
1584 $dialog = new CFPlus::UI::Toplevel
1585 x => "center",
1586 y => "center",
1587 z => 3,
1588 name => 'tip_of_the_day',
1589 force_w => int $WIDTH * 4/9,
1590 force_h => int $WIDTH * 2/9,
1591 title => "Tip of the day #" . (1 + $todindex),
1592 child => my $vbox = new CFPlus::UI::VBox,
1593 has_close_button => 1,
1594 on_delete => $close,
1595 ;
1596
1597 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1598 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1599 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1600
1601 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1602
1603 $table->add (0, 0, new CFPlus::UI::Button
1604 text => "Close",
1605 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>.",
1606 on_activate => $close,
1607 );
1608
1609 $table->add (2, 0, new CFPlus::UI::Button
1610 text => "Next",
1611 tooltip => "Show the next <b>Tip of the day</b>.",
1612 on_activate => sub {
1613 $close->();
1614 &show_tip_of_the_day;
1615 },
1616 );
1617
1618 $dialog->show;
1579} 1619}
1580 1620
1581sub sdl_init { 1621sub sdl_init {
1582 CFPlus::SDL_Init 1622 CFPlus::SDL_Init
1583 and die "SDL::Init failed!\n"; 1623 and die "SDL::Init failed!\n";
… …
1618 z => 100, 1658 z => 100,
1619 force_x => "max", 1659 force_x => "max",
1620 force_y => 0; 1660 force_y => 0;
1621 $DEBUG_STATUS->show; 1661 $DEBUG_STATUS->show;
1622 1662
1623 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1624
1625 $STATUSBOX = new CFPlus::UI::Statusbox; 1663 $STATUSBOX = new CFPlus::UI::Statusbox;
1626 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1664 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1627 1665
1628 (new CFPlus::UI::Frame 1666 (new CFPlus::UI::Frame
1629 bg => [0, 0, 0, 0.4], 1667 bg => [0, 0, 0, 0.4],
1630 force_x => 0, 1668 force_x => 0,
1631 force_y => "max", 1669 force_y => "max",
1632 child => $STATUSBOX, 1670 child => $STATUSBOX,
1633 )->show; 1671 )->show;
1634 1672
1635 CFPlus::UI::FancyFrame->new ( 1673 CFPlus::UI::Toplevel->new (
1636 title => "Map", 1674 title => "Map",
1637 name => "mapmap", 1675 name => "mapmap",
1638 x => 0, 1676 x => 0,
1639 y => $FONTSIZE + 8, 1677 y => $FONTSIZE + 8,
1640 border_bg => [1, 1, 1, 192/255], 1678 border_bg => [1, 1, 1, 192/255],
… …
1668 can_hover => 1, 1706 can_hover => 1,
1669 can_events => 1, 1707 can_events => 1,
1670 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1708 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1671 ; 1709 ;
1672 1710
1673 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1711 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1674 title => "Setup", 1712 title => "Setup",
1675 name => "setup_dialog", 1713 name => "setup_dialog",
1676 x => 'center', 1714 x => 'center',
1677 y => 'center', 1715 y => 'center',
1678 z => 2, 1716 z => 2,
… …
1729 ); 1767 );
1730 1768
1731 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1769 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1732 tooltip => "View Documentation"); 1770 tooltip => "View Documentation");
1733 1771
1772
1734 $BUTTONBAR->add (new CFPlus::UI::Button 1773 $BUTTONBAR->add (new CFPlus::UI::Button
1735 text => "Quit", 1774 text => "Quit",
1736 tooltip => "Terminates the program", 1775 tooltip => "Terminates the program",
1737 on_activate => sub { 1776 on_activate => sub {
1738 if ($CONN) { 1777 if ($CONN) {
… …
1749 } 1788 }
1750 1789
1751 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1790 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1752} 1791}
1753 1792
1793sub setup_build_button {
1794 my ($enabled) = @_;
1795 if ($enabled) {
1796 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1797 $BUILD_BUTTON ||= new CFPlus::UI::Button
1798 text => "Build",
1799 tooltip => "Opens the ingame builder",
1800 on_activate => sub {
1801 if ($CONN) {
1802 $CONN->send_ext_req (builder_player_items => sub {
1803 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1804 });
1805 }
1806 0
1807 };
1808 $BUTTONBAR->add ($BUILD_BUTTON);
1809 } else {
1810 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1811 }
1812}
1813
1814sub open_ingame_editor {
1815 my ($msg) = @_;
1816
1817 my $win = new CFPlus::UI::Toplevel
1818 x => 0,
1819 y => 'center',
1820 z => 4,
1821 name => 'builder_window',
1822 force_w => int $WIDTH * 1/4,
1823 force_h => int $HEIGHT * 3/4,
1824 title => "In game builder",
1825 has_close_button => 1;
1826
1827 my $r = new CFPlus::UI::ScrolledWindow (
1828 expand => 1,
1829 scroll_y => 1
1830 );
1831 $r->add (my $vb = new CFPlus::UI::VBox);
1832 $win->add ($r);
1833
1834
1835 $vb->add (
1836 new CFPlus::UI::Button
1837 text => "Disable build mode",
1838 on_activate => sub { $::IN_BUILD_MODE = undef }
1839 );
1840 $vb->add (
1841 new CFPlus::UI::Button
1842 text => "ERASE",
1843 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1844 );
1845
1846 for my $itemarchname (
1847 sort {
1848 $msg->{items}->{$a}->{build_arch_name}
1849 cmp $msg->{items}->{$b}->{build_arch_name}
1850 } keys %{$msg->{items}}
1851 ) {
1852 my $info = $msg->{items}->{$itemarchname};
1853 $vb->add (
1854 new CFPlus::UI::Button text => $info->{build_arch_name},
1855 on_activate => sub {
1856 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1857
1858 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1859 build_mode_query_arch_info ();
1860 }
1861 }
1862 );
1863 }
1864
1865 $win->show;
1866}
1867
1868sub build_mode_query_arch_info {
1869 my ($iteminfo) = $::IN_BUILD_MODE;
1870 my $itemarchname = $iteminfo->{item};
1871 my $info = $iteminfo->{info};
1872
1873 my $dialog = new CFPlus::UI::Toplevel
1874 x => "center",
1875 y => "center",
1876 z => 50,
1877 force_w => int $WIDTH * 1/2,
1878 title => "Enter information for placement of '$itemarchname'",
1879 has_close_button => 1;
1880
1881 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1882
1883 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1884 my $row = 0;
1885 if ($info->{has_name}) {
1886 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1887 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1888 }
1889 if ($info->{has_text}) {
1890 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1891 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1892 }
1893 if ($info->{has_connection}) {
1894 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1895 $table->add (1, $row++,
1896 new CFPlus::UI::Entry
1897 expand => 1,
1898 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1899 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1900 );
1901 }
1902
1903 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1904 $hb->add (new CFPlus::UI::Button
1905 text => "Close",
1906 expand => 1,
1907 on_activate => sub { $dialog->hide; 0 },
1908 );
1909 $dialog->show;
1910}
1911
1754sub video_shutdown { 1912sub video_shutdown {
1755 CFPlus::OpenGL::shutdown; 1913 CFPlus::OpenGL::shutdown;
1756 1914
1757 undef $SDL_ACTIVE; 1915 undef $SDL_ACTIVE;
1758} 1916}
… …
1789 CFPlus::Mix_AllocateChannels 8; 1947 CFPlus::Mix_AllocateChannels 8;
1790 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1948 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1791 1949
1792 audio_music_finished; 1950 audio_music_finished;
1793 1951
1952 local $_;
1794 while (<$fh>) { 1953 while (<$fh>) {
1795 next if /^\s*#/; 1954 next if /^\s*#/;
1796 next if /^\s*$/; 1955 next if /^\s*$/;
1797 1956
1798 my ($file, $volume, $event) = split /\s+/, $_, 3; 1957 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1883 }, 2042 },
1884 CFPlus::SDL_VIDEOEXPOSE => sub { 2043 CFPlus::SDL_VIDEOEXPOSE => sub {
1885 CFPlus::UI::full_refresh; 2044 CFPlus::UI::full_refresh;
1886 }, 2045 },
1887 CFPlus::SDL_ACTIVEEVENT => sub { 2046 CFPlus::SDL_ACTIVEEVENT => sub {
1888# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2047# not useful, as APPACTIVE include sonly iconified state, not unmapped
2048# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2049# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2050# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2051# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1889 }, 2052 },
1890 CFPlus::SDL_KEYDOWN => sub { 2053 CFPlus::SDL_KEYDOWN => sub {
1891 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2054 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1892 # alt-enter 2055 # alt-enter
1893 $FULLSCREEN_ENABLE->toggle; 2056 $FULLSCREEN_ENABLE->toggle;
… …
1932 log_fontsize => 0.7, 2095 log_fontsize => 0.7,
1933 gauge_fontsize => 1, 2096 gauge_fontsize => 1,
1934 gauge_size => 0.35, 2097 gauge_size => 0.35,
1935 stat_fontsize => 0.7, 2098 stat_fontsize => 0.7,
1936 mapsize => 100, 2099 mapsize => 100,
1937 say_command => 'say', 2100 say_command => 'chat',
1938 audio_enable => 1, 2101 audio_enable => 1,
1939 bgm_enable => 1, 2102 bgm_enable => 1,
1940 bgm_volume => 0.25, 2103 bgm_volume => 0.25,
1941 face_prefetch => 0, 2104 face_prefetch => 0,
1942 output_sync => 1, 2105 output_sync => 1,
1943 output_count => 1, 2106 output_count => 1,
2107 output_rate => "",
1944 pickup => 0, 2108 pickup => 0,
1945 inv_sort => "mtime", 2109 inv_sort => "mtime",
1946 default => "profile", # default profile 2110 default => "profile", # default profile
2111 show_tips => 1,
1947 ); 2112 );
1948 2113
1949 while (my ($k, $v) = each %DEF_CFG) { 2114 while (my ($k, $v) = each %DEF_CFG) {
1950 $CFG->{$k} = $v unless exists $CFG->{$k}; 2115 $CFG->{$k} = $v unless exists $CFG->{$k};
1951 } 2116 }
1952 2117
1953 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2118 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2119 $PROFILE = $CFG->{profile}{default};
2120
2121 # convert old bindings (only default profile matters)
2122 if (my $bindings = delete $PROFILE->{bindings}) {
2123 while (my ($mod, $syms) = each %$bindings) {
2124 while (my ($sym, $cmds) = each %$syms) {
2125 push @{ $PROFILE->{macro} }, {
2126 accelkey => [$mod*1, $sym*1],
2127 action => $cmds,
2128 };
2129 }
2130 }
2131 }
1954 2132
1955 sdl_init; 2133 sdl_init;
1956 2134
1957 @SDL_MODES = reverse 2135 @SDL_MODES = reverse
1958 grep $_->[0] >= 640 && $_->[1] >= 480, 2136 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1995# } 2173# }
1996# my $t2 = Time::HiRes::time; 2174# my $t2 = Time::HiRes::time;
1997# warn $t2-$t1; 2175# warn $t2-$t1;
1998# } 2176# }
1999 2177
2178 $startup_done->();
2179
2000 video_init; 2180 video_init;
2001 audio_init; 2181 audio_init;
2002} 2182}
2183
2184show_tip_of_the_day if $CFG->{show_tips};
2003 2185
2004Event::loop; 2186Event::loop;
2005#CFPlus::SDL_Quit; 2187#CFPlus::SDL_Quit;
2006#CFPlus::_exit 0; 2188#CFPlus::_exit 0;
2007 2189

Diff Legend

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