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.109 by root, Sun Aug 13 14:30:07 2006 UTC vs.
Revision 1.138 by root, Sat Dec 9 21:26:46 2006 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 = 0;
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};
… …
155 180
156# server query dialog 181# server query dialog
157sub server_query { 182sub server_query {
158 my ($conn, $flags, $prompt) = @_; 183 my ($conn, $flags, $prompt) = @_;
159 184
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 185 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 186 x => "center",
162 y => "center", 187 y => "center",
163 title => "Server Query", 188 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 189 child => my $vbox = new CFPlus::UI::VBox,
165 ; 190 ;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 379 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 380 $SETUP_DIALOG->hide;
356 381
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 383
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
360 385
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
362 387
363 $CONN = eval { 388 $CONN = eval {
364 new CFPlus::Protocol 389 new CFPlus::Protocol
365 host => $host, 390 host => $host,
366 port => $port || 13327, 391 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 392 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 393 pass => $PROFILE->{password},
369 mapw => $mapsize, 394 mapw => $mapsize,
370 maph => $mapsize, 395 maph => $mapsize,
396
397 client => "cfplus $CFPlus::VERSION $] $^O",
371 398
372 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 400 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
375 map => $MAP, 402 map => $MAP,
… …
402sub stop_game { 429sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
408 435
409 return unless $CONN; 436 return unless $CONN;
410 437
411 status "connection closed"; 438 status "connection closed";
412 439
… …
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 666 $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"); 667 $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 }); 668 $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"); 669 $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 }); 670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
644 672
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 674
647 for my $x (0..2) { 675 for my $x (0..2) {
648 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 ); 681 );
654 } 682 }
655 } 683 }
656 684
685 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 686
658 $table 687 $table
659} 688}
660 689
661sub stats_window { 690sub stats_window {
… …
663 expand => 1, 692 expand => 1,
664 scroll_y => 1 693 scroll_y => 1
665 ); 694 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 695 $r->add (my $vb = new CFPlus::UI::VBox);
667 696
697 $vb->add (new CFPlus::UI::FancyFrame
698 label => "Player",
699 child => (my $pi = new CFPlus::UI::VBox),
700 );
701
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 702 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 703 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."); 704 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, 705 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 706 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 707 tooltip => "The map you are currently on (if supported by the server).");
674 708
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 709 $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, 710 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 711 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 712 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, 713 $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, 714 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 715 tooltip => "The weight limit: you cannot carry more than this.");
682 716
717 $vb->add (new CFPlus::UI::FancyFrame
718 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 719 child => (my $hb = new CFPlus::UI::HBox expand => 1),
720 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 721 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 722
686 my $color2 = [1, 1, 0]; 723 my $color2 = [1, 1, 0];
687 724
688 for ( 725 for (
… …
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 746 $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, 747 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 748 align => -1, text => $label, tooltip => "#stat_$label");
712 } 749 }
713 750
751 $vb->add (new CFPlus::UI::FancyFrame
752 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 753 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
754 );
715 755
716 my $row = 0; 756 my $row = 0;
717 my $col = 0; 757 my $col = 0;
718 758
719 my %resist_names = ( 759 my %resist_names = (
… …
819 859
820 my $table = $METASERVER->{table}; 860 my $table = $METASERVER->{table};
821 $table->clear; 861 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 862 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 863
824 my $buf; 864 my $ok = 0;
825 865
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 866 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent;
827 868
828 unless ($fh) { 869 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 870 } sub {
830 return; 871 my ($msg) = @_;
831 } 872 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; 873 $table->clear;
846 874
847 my @tip = ( 875 my @tip = (
848 "The current number of users logged in on the server.", 876 "The current number of users logged in on the server.",
849 "The hostname of the server.", 877 "The hostname of the server.",
… …
859 for 0 .. $#col; 887 for 0 .. $#col;
860 888
861 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
862 890
863 my $y = 0; 891 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} }
898 ) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
866 901
867 for ($desc) { 902 for ($desc) {
868 s/<br>/\n/gi; 903 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 904 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 905 s/<.*?>//sgi;
871 s/&/&amp;/g; 906 s/&amp;/&/g;
872 s/</&lt;/g; 907 s/&lt;/</g;
873 s/>/&gt;/g; 908 s/&gt;/>/g;
874 } 909 }
875 910
876 $uptime = sprintf "%dd %02d:%02d:%02d", 911 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 912 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 913 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 914 (int $uptime / 60) % 60,
880 $m->[8] % 60; 915 $uptime % 60;
881 916
882 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
883 918
884 $y++; 919 $y++;
885 920
… …
895 ), 930 ),
896 (new CFPlus::UI::Empty expand => 1), 931 (new CFPlus::UI::Empty expand => 1),
897 ]); 932 ]);
898 933
899 $table->add ($_, $y, new CFPlus::UI::Label 934 $table->add ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 936 ellipsise => 0,
901 align => $align[$_], 937 align => $align[$_],
902 text => $m->[$_], 938 text => $m->[$_],
903 tooltip => $tip[$_], 939 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 941 can_hover => 1,
905 can_events => 1, 942 can_events => 1,
906 fontsize => 0.8) 943 fontsize => 0.8)
907 for 0 .. $#$m; 944 for 0 .. $#$m;
908 } 945 }
946 } else {
947 $ok or $label->set_text ("error while contacting metaserver");
909 } 948 }
910 }); 949 };
950
911} 951}
912 952
913sub metaserver_dialog { 953sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 954 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 955 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 956 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 957
918 my $dialog = new CFPlus::UI::FancyFrame 958 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 959 title => "Server List",
920 name => 'metaserver_dialog', 960 name => 'metaserver_dialog',
921 x => 'center', 961 x => 'center',
922 y => 'center', 962 y => 'center',
923 z => 3, 963 z => 3,
964 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 965 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 966 child => $vbox,
926 has_close_button => 1, 967 has_close_button => 1,
927 table => $table, 968 table => $table,
928 on_visibility_change => sub { 969 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 970 update_metaserver ($_[0]) if $_[1];
… …
935} 976}
936 977
937sub server_setup { 978sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 979 my $vbox = new CFPlus::UI::VBox;
939 980
981 $vbox->add (new CFPlus::UI::FancyFrame
982 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 983 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
984 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 985 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 986
943 { 987 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 988 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 989
… …
1029 }, 1073 },
1030 ); 1074 );
1031 1075
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1076 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1078 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. " 1079 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. " 1080 . "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.", 1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1082 on_changed => sub {
1039 my ($self, $value) = @_; 1083 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1084 $CFG->{say_command} = $value;
1041 0 1085 0
1042 } 1086 }
1043 ); 1087 );
1044 1088
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub {
1094 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value;
1096 0
1097 }
1098 );
1099
1045 $vbox->add (new CFPlus::UI::Label 1100 $vbox->add (new CFPlus::UI::FancyFrame
1046 text => "Server Info", 1101 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); 1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1103 );
1053 1104
1054 $vbox 1105 $vbox
1055} 1106}
1056 1107
1057sub message_window { 1108sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1109 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1110 name => "message_window",
1060 title => "Messages", 1111 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1112 border_bg => [1, 1, 1, 1],
1062 x => "max", 1113 x => "max",
1063 y => 0, 1114 y => 0,
… …
1113 window => $window, 1164 window => $window,
1114 input => $input, 1165 input => $input,
1115 }; 1166 };
1116 1167
1117 $window 1168 $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} 1169}
1175 1170
1176sub autopickup_setup { 1171sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table; 1172 my $table = new CFPlus::UI::Table;
1178 1173
… …
1196 ["Boots" => PICKUP_BOOTS], 1191 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1192 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1193 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1194 ],
1200 1195
1201 ["Readables", 2, 2, 1196 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1197 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1198 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1199 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1200 ],
1206 ["Misc", 2, 7, 1201 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1202 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1203 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1204 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1205 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1206 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1207 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1208 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1209 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1210 ["Jewelery" => PICKUP_JEWELS],
1211 ["Flesh" => PICKUP_FLESH],
1216 ], 1212 ],
1217 ["Weight/Value ratio", 2, 17] 1213 ["Weight/Value ratio", 2, 17]
1218 ) 1214 )
1219 { 1215 {
1220 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
… …
1270 $table 1266 $table
1271} 1267}
1272 1268
1273my %SORT_ORDER = ( 1269my %SORT_ORDER = (
1274 type => undef, 1270 type => undef,
1275 mtime => sub { sort { 1271 mtime => sub {
1272 my $NOW = time;
1273 sort {
1274 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1275 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1276
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1277 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1278 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1279 or $a->{type} <=> $b->{type}
1280 } @_
1279 } @_ }, 1281 },
1280 weight => sub { sort { 1282 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1283 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1284 or $a->{type} <=> $b->{type}
1283 } @_ }, 1285 } @_ },
1284); 1286);
… …
1309 #TODO# update to weigh/maxweight 1311 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1312 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1313
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1314 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1315 $sw1->add ($INV = new CFPlus::UI::Inventory);
1316 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1317
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1318 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1319
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1320 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1321
… …
1335 $PL_WINDOW->show; 1338 $PL_WINDOW->show;
1336 } 1339 }
1337} 1340}
1338 1341
1339sub player_window { 1342sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1343 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1344 x => "center",
1342 y => "center", 1345 y => "center",
1343 force_w => $WIDTH * 9/10, 1346 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1347 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1348 title => "Player",
… …
1358 $ntb->add ( 1361 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1362 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1363 "Shows all your Skills."
1361 ); 1364 );
1362 1365
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1366 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1368 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1369 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1370 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1371 );
1369 $ntb->add ( 1372 $ntb->add (
… …
1376 1379
1377 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1378 $plwin 1381 $plwin
1379} 1382}
1380 1383
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1384sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1385 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} 1386}
1492 1387
1493sub help_window { 1388sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1389 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1390 x => 'center',
1496 y => 'center', 1391 y => 'center',
1497 z => 2, 1392 z => 4,
1498 name => 'doc_browser', 1393 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1394 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1395 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1396 title => "Help Browser",
1502 has_close_button => 1; 1397 has_close_button => 1;
1503 1398
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1399 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1400
1401 $vbox->add (new CFPlus::UI::FancyFrame
1402 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1403 child => (my $buttons = new CFPlus::UI::HBox),
1404 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1405 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1406 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1407
1510 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1408 my @history;
1511 $buttons->add (my $combo = new CFPlus::UI::Selector 1409 my @future;
1512 value => undef, 1410 my $curnode;
1513 options => [ 1411
1514 [intro => "Introduction"], 1412 my $load_node; $load_node = sub {
1515 [manual => "Main Manual"], 1413 my ($node, $para) = @_;
1516 [skill_help => "Skill Reference"], 1414
1517 [command_help => "Command Reference"], 1415 $buttons->clear;
1518 [dmcommand_help => "DM Commands"], 1416
1519 [COPYING => "License Terms"], 1417 $buttons->add (new CFPlus::UI::Button
1418 text => "⇤",
1419 tooltip => "back to the starting page",
1420 on_activate => sub {
1421 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1422 unshift @future, @history;
1423 @history = ();
1424 $load_node->(@{shift @future});
1425 },
1426 );
1427
1428 if (@history) {
1429 $buttons->add (new CFPlus::UI::Button
1430 text => "⋘",
1431 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1432 on_activate => sub {
1433 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1434 $load_node->(@{pop @history});
1435 },
1436 );
1520 ], 1437 }
1521 on_changed => sub {
1522 my ($self, $pod) = @_;
1523 1438
1439 if (@future) {
1440 $buttons->add (new CFPlus::UI::Button
1441 text => "⋙",
1442 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1443 on_activate => sub {
1444 push @history, [$curnode, $viewer->current_paragraph];
1445 $load_node->(@{shift @future});
1446 },
1447 );
1448 }
1449
1450 $buttons->add (new CFPlus::UI::Label text => " ");
1451
1452 my @path = CFPlus::Pod::full_path_of $node;
1453 pop @path; # drop current node
1454
1455 for my $node (@path) {
1456 $buttons->add (new CFPlus::UI::Button
1457 text => $node->{kw}[0],
1458 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1459 on_activate => sub {
1460 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1461 $load_node->($node);
1462 },
1463 );
1464 $buttons->add (new CFPlus::UI::Label text => "/");
1465 }
1466
1467 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1468
1469 $curnode = $node;
1470
1524 $viewer->clear; 1471 $viewer->clear;
1525 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1472 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1526 $viewer->set_offset (0); 1473 $viewer->scroll_to ($para);
1474 };
1527 1475
1476 $load_node->(CFPlus::Pod::find pod => "mainpage");
1477
1478 $CFPlus::Pod::goto_document = sub {
1479 my (@path) = @_;
1480
1481 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1482
1483 $load_node->((CFPlus::Pod::find @path)[0]);
1484 $win->show;
1485 };
1486
1487 $win
1488}
1489
1490sub open_string_query {
1491 my ($title, $cb, $txt, $tooltip) = @_;
1492 my $dialog = new CFPlus::UI::Toplevel
1493 x => "center",
1494 y => "center",
1495 z => 50,
1496 force_w => $WIDTH * 4/5,
1497 title => $title;
1498
1499 $dialog->add (
1500 my $e = new CFPlus::UI::Entry
1501 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1502 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1503 tooltip => $tooltip
1504 );
1505
1506 $e->grab_focus;
1507 $e->set_text ($txt) if $txt;
1508 $dialog->show;
1509}
1510
1511sub open_quit_dialog {
1512 unless ($QUIT_DIALOG) {
1513 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1514 x => "center",
1515 y => "center",
1516 z => 50,
1517 title => "Really Quit?",
1518 on_key_down => sub {
1519 my ($dialog, $ev) = @_;
1520 $ev->{sym} == 27 and $dialog->hide;
1528 0 1521 }
1522 ;
1523
1524 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1525
1526 $vb->add (new CFPlus::UI::Label
1527 text => "You should find a savebed and apply it first!",
1528 max_w => $WIDTH * 0.25,
1529 ellipsize => 0,
1530 );
1531 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1532 $hb->add (new CFPlus::UI::Button
1533 text => "Ok",
1534 expand => 1,
1535 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1536 );
1537 $hb->add (new CFPlus::UI::Button
1538 text => "Quit anyway",
1539 expand => 1,
1540 on_activate => sub { exit },
1541 );
1542 }
1543
1544 $QUIT_DIALOG->show;
1545 $QUIT_DIALOG->grab_focus;
1546}
1547
1548sub show_tip_of_the_day {
1549 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1553 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1555
1556 # create dialog
1557 my $dialog;
1558
1559 my $close = sub {
1560 $dialog->destroy;
1561 };
1562
1563 $dialog = new CFPlus::UI::Toplevel
1564 x => "center",
1565 y => "center",
1566 z => 3,
1567 name => 'tip_of_the_day',
1568 force_w => int $WIDTH * 4/9,
1569 force_h => int $WIDTH * 2/9,
1570 title => "Tip of the day #" . (1 + $todindex),
1571 child => my $vbox = new CFPlus::UI::VBox,
1572 has_close_button => 1,
1573 on_delete => $close,
1574 ;
1575
1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1579
1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1581
1582 $table->add (0, 0, new CFPlus::UI::Button
1583 text => "Close",
1584 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>.",
1585 on_activate => $close,
1586 );
1587
1588 $table->add (2, 0, new CFPlus::UI::Button
1589 text => "Next",
1590 tooltip => "Show the next <b>Tip of the day</b>.",
1591 on_activate => sub {
1592 $close->();
1593 &show_tip_of_the_day;
1529 }, 1594 },
1530 on_visibility_change => sub {
1531 my ($self, $visible) = @_;
1532 return unless $visible;
1533 return if $self->{value};
1534 $self->set_value ("intro");
1535 0
1536 },
1537 ); 1595 );
1538 1596
1539 $win 1597 $dialog->show;
1540} 1598}
1541 1599
1542sub sdl_init { 1600sub sdl_init {
1543 CFPlus::SDL_Init 1601 CFPlus::SDL_Init
1544 and die "SDL::Init failed!\n"; 1602 and die "SDL::Init failed!\n";
… …
1579 z => 100, 1637 z => 100,
1580 force_x => "max", 1638 force_x => "max",
1581 force_y => 0; 1639 force_y => 0;
1582 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1583 1641
1584 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1585
1586 $STATUSBOX = new CFPlus::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1587 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1643 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1588 1644
1589 (new CFPlus::UI::Frame 1645 (new CFPlus::UI::Frame
1590 bg => [0, 0, 0, 0.4], 1646 bg => [0, 0, 0, 0.4],
1591 force_x => 0, 1647 force_x => 0,
1592 force_y => "max", 1648 force_y => "max",
1593 child => $STATUSBOX, 1649 child => $STATUSBOX,
1594 )->show; 1650 )->show;
1595 1651
1596 CFPlus::UI::FancyFrame->new ( 1652 CFPlus::UI::Toplevel->new (
1597 title => "Map", 1653 title => "Map",
1598 name => "mapmap", 1654 name => "mapmap",
1599 x => 0, 1655 x => 0,
1600 y => $FONTSIZE + 8, 1656 y => $FONTSIZE + 8,
1601 border_bg => [1, 1, 1, 192/255], 1657 border_bg => [1, 1, 1, 192/255],
… …
1629 can_hover => 1, 1685 can_hover => 1,
1630 can_events => 1, 1686 can_events => 1,
1631 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1687 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1632 ; 1688 ;
1633 1689
1634 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1635 title => "Setup", 1691 title => "Setup",
1636 name => "setup_dialog", 1692 name => "setup_dialog",
1637 x => 'center', 1693 x => 'center',
1638 y => 'center', 1694 y => 'center',
1639 z => 2, 1695 z => 2,
… …
1690 ); 1746 );
1691 1747
1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1693 tooltip => "View Documentation"); 1749 tooltip => "View Documentation");
1694 1750
1751
1695 $BUTTONBAR->add (new CFPlus::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1696 text => "Quit", 1753 text => "Quit",
1697 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1698 on_activate => sub { 1755 on_activate => sub {
1699 if ($CONN) { 1756 if ($CONN) {
… …
1710 } 1767 }
1711 1768
1712 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1769 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1713} 1770}
1714 1771
1772sub setup_build_button {
1773 my ($enabled) = @_;
1774 if ($enabled) {
1775 $BUILD_BUTTON ||= new CFPlus::UI::Button
1776 text => "Build",
1777 tooltip => "Opens the ingame builder",
1778 on_activate => sub {
1779 if ($CONN) {
1780 $CONN->send_ext_req (builder_player_items => sub {
1781 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1782 });
1783 }
1784 0
1785 };
1786 $BUTTONBAR->add ($BUILD_BUTTON);
1787 } else {
1788 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1789 }
1790}
1791
1792sub open_ingame_editor {
1793 my ($msg) = @_;
1794
1795 my $win = new CFPlus::UI::Toplevel
1796 x => 0,
1797 y => 'center',
1798 z => 4,
1799 name => 'builder_window',
1800 force_w => int $WIDTH * 1/4,
1801 force_h => int $HEIGHT * 3/4,
1802 title => "In game builder",
1803 has_close_button => 1;
1804
1805 my $r = new CFPlus::UI::ScrolledWindow (
1806 expand => 1,
1807 scroll_y => 1
1808 );
1809 $r->add (my $vb = new CFPlus::UI::VBox);
1810 $win->add ($r);
1811
1812
1813 $vb->add (
1814 new CFPlus::UI::Button
1815 text => "Disable build mode",
1816 on_activate => sub { $::IN_BUILD_MODE = undef }
1817 );
1818 $vb->add (
1819 new CFPlus::UI::Button
1820 text => "ERASE",
1821 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1822 );
1823
1824 for my $itemarchname (
1825 sort {
1826 $msg->{items}->{$a}->{build_arch_name}
1827 cmp $msg->{items}->{$b}->{build_arch_name}
1828 } keys %{$msg->{items}}
1829 ) {
1830 my $info = $msg->{items}->{$itemarchname};
1831 $vb->add (
1832 new CFPlus::UI::Button text => $info->{build_arch_name},
1833 on_activate => sub {
1834 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1835
1836 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1837 build_mode_query_arch_info ();
1838 }
1839 }
1840 );
1841 }
1842
1843 $win->show;
1844}
1845
1846sub build_mode_query_arch_info {
1847 my ($iteminfo) = $::IN_BUILD_MODE;
1848 my $itemarchname = $iteminfo->{item};
1849 my $info = $iteminfo->{info};
1850
1851 my $dialog = new CFPlus::UI::Toplevel
1852 x => "center",
1853 y => "center",
1854 z => 50,
1855 force_w => int $WIDTH * 1/2,
1856 title => "Enter information for placement of '$itemarchname'",
1857 has_close_button => 1;
1858
1859 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1860
1861 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1862 my $row = 0;
1863 if ($info->{has_name}) {
1864 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1865 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1866 }
1867 if ($info->{has_text}) {
1868 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1869 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1870 }
1871 if ($info->{has_connection}) {
1872 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1873 $table->add (1, $row++,
1874 new CFPlus::UI::Entry
1875 expand => 1,
1876 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1877 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1878 );
1879 }
1880
1881 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1882 $hb->add (new CFPlus::UI::Button
1883 text => "Close",
1884 expand => 1,
1885 on_activate => sub { $dialog->hide; 0 },
1886 );
1887 $dialog->show;
1888}
1889
1715sub video_shutdown { 1890sub video_shutdown {
1716 CFPlus::OpenGL::shutdown; 1891 CFPlus::OpenGL::shutdown;
1717 1892
1718 undef $SDL_ACTIVE; 1893 undef $SDL_ACTIVE;
1719} 1894}
… …
1750 CFPlus::Mix_AllocateChannels 8; 1925 CFPlus::Mix_AllocateChannels 8;
1751 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1926 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1752 1927
1753 audio_music_finished; 1928 audio_music_finished;
1754 1929
1930 local $_;
1755 while (<$fh>) { 1931 while (<$fh>) {
1756 next if /^\s*#/; 1932 next if /^\s*#/;
1757 next if /^\s*$/; 1933 next if /^\s*$/;
1758 1934
1759 my ($file, $volume, $event) = split /\s+/, $_, 3; 1935 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1844 }, 2020 },
1845 CFPlus::SDL_VIDEOEXPOSE => sub { 2021 CFPlus::SDL_VIDEOEXPOSE => sub {
1846 CFPlus::UI::full_refresh; 2022 CFPlus::UI::full_refresh;
1847 }, 2023 },
1848 CFPlus::SDL_ACTIVEEVENT => sub { 2024 CFPlus::SDL_ACTIVEEVENT => sub {
1849# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2025# not useful, as APPACTIVE include sonly iconified state, not unmapped
2026# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2027# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2028# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2029# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1850 }, 2030 },
1851 CFPlus::SDL_KEYDOWN => sub { 2031 CFPlus::SDL_KEYDOWN => sub {
1852 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2032 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1853 # alt-enter 2033 # alt-enter
1854 $FULLSCREEN_ENABLE->toggle; 2034 $FULLSCREEN_ENABLE->toggle;
… …
1893 log_fontsize => 0.7, 2073 log_fontsize => 0.7,
1894 gauge_fontsize => 1, 2074 gauge_fontsize => 1,
1895 gauge_size => 0.35, 2075 gauge_size => 0.35,
1896 stat_fontsize => 0.7, 2076 stat_fontsize => 0.7,
1897 mapsize => 100, 2077 mapsize => 100,
1898 say_command => 'say', 2078 say_command => 'chat',
1899 audio_enable => 1, 2079 audio_enable => 1,
1900 bgm_enable => 1, 2080 bgm_enable => 1,
1901 bgm_volume => 0.25, 2081 bgm_volume => 0.25,
1902 face_prefetch => 0, 2082 face_prefetch => 0,
1903 output_sync => 1, 2083 output_sync => 1,
1904 output_count => 1, 2084 output_count => 1,
1905 pickup => 0, 2085 pickup => 0,
1906 inv_sort => "mtime", 2086 inv_sort => "mtime",
1907 default => "profile", # default profile 2087 default => "profile", # default profile
2088 show_tips => 1,
1908 ); 2089 );
1909 2090
1910 while (my ($k, $v) = each %DEF_CFG) { 2091 while (my ($k, $v) = each %DEF_CFG) {
1911 $CFG->{$k} = $v unless exists $CFG->{$k}; 2092 $CFG->{$k} = $v unless exists $CFG->{$k};
1912 } 2093 }
1913 2094
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2095 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2096 $PROFILE = $CFG->{profile}{default};
2097
2098 # convert old bindings (only default profile matters)
2099 if (my $bindings = delete $PROFILE->{bindings}) {
2100 while (my ($mod, $syms) = each %$bindings) {
2101 while (my ($sym, $cmds) = each %$syms) {
2102 push @{ $PROFILE->{macro} }, {
2103 accelkey => [$mod*1, $sym*1],
2104 action => $cmds,
2105 };
2106 }
2107 }
2108 }
1915 2109
1916 sdl_init; 2110 sdl_init;
1917 2111
1918 @SDL_MODES = reverse 2112 @SDL_MODES = reverse
1919 grep $_->[0] >= 640 && $_->[1] >= 480, 2113 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1956# } 2150# }
1957# my $t2 = Time::HiRes::time; 2151# my $t2 = Time::HiRes::time;
1958# warn $t2-$t1; 2152# warn $t2-$t1;
1959# } 2153# }
1960 2154
2155 $startup_done->();
2156
1961 video_init; 2157 video_init;
1962 audio_init; 2158 audio_init;
1963} 2159}
2160
2161show_tip_of_the_day if $CFG->{show_tips};
1964 2162
1965Event::loop; 2163Event::loop;
1966#CFPlus::SDL_Quit; 2164#CFPlus::SDL_Quit;
1967#CFPlus::_exit 0; 2165#CFPlus::_exit 0;
1968 2166

Diff Legend

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