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.31 by root, Tue May 30 02:22:03 2006 UTC vs.
Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
44$Event::DIED = sub { 43$Event::DIED = sub {
45 # TODO: display dialog box or so 44 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 46 CFClient::error $_[1];
47}; 47};
48 48
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 50
… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $SERVER_SETUP; 86our $HOST_ENTRY;
87
88our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK;
90our $SETUP_SERVER;
91our $SETUP_KEYBOARD;
92our $SETUP_SPELLS;
87 93
88our $FLOORBOX; 94our $FLOORBOX;
89our $GAUGES; 95our $GAUGES;
90our $STATWIDS; 96our $STATWIDS;
91 97
… …
103our $INV_WINDOW; 109our $INV_WINDOW;
104our $INV; 110our $INV;
105our $INVR; 111our $INVR;
106our $INV_RIGHT_HB; 112our $INV_RIGHT_HB;
107 113
108our $BIND_WINDOW; 114our $BIND_EDITOR;
115
116our $PICKUP_CFG;
109 117
110sub status { 118sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 120}
113 121
… …
117 125
118sub start_game { 126sub start_game {
119 status "logging in..."; 127 status "logging in...";
120 128
121 $LOGIN_BUTTON->set_text ("Logout"); 129 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 130 $SETUP_DIALOG->hide;
123 131
124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 132 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125 133
126 my ($host, $port) = split /:/, $CFG->{host}; 134 my ($host, $port) = split /:/, $CFG->{host};
127 135
… …
165 } 173 }
166} 174}
167 175
168sub stop_game { 176sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 177 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 180 $INV_WINDOW->hide;
172 $LOGVIEW->hide;
173 181
174 return unless $CONN; 182 return unless $CONN;
175 183
176 status "connection closed"; 184 status "connection closed";
177 185
178 $CONN->destroy; 186 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 187 $CONN = 0; # false, does not autovivify
180} 188}
181 189
182sub client_setup { 190sub graphics_setup {
183 my $dialog = new CFClient::UI::FancyFrame
184 x => 1,
185 y => $HEIGHT * (1/8),
186 name => "client_setup",
187 title => "Client Setup",
188 child => (my $vbox = new CFClient::UI::VBox); 191 my $vbox = new CFClient::UI::VBox;
189 192
190 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
191 194
192 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 195 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
193 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
317 on_activate => sub { 320 on_activate => sub {
318 video_shutdown (); 321 video_shutdown ();
319 video_init (); 322 video_init ();
320 } 323 }
321 ); 324 );
325
326 $vbox
327}
328
329sub audio_setup {
330 my $vbox = new CFClient::UI::VBox;
331
332 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
333
334 my $row = 0;
322 335
323 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
324 $table->add (1, $row++, new CFClient::UI::CheckBox 337 $table->add (1, $row++, new CFClient::UI::CheckBox
325 state => $CFG->{audio_enable}, 338 state => $CFG->{audio_enable},
326 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 339 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
… …
357 audio_shutdown (); 370 audio_shutdown ();
358 audio_init (); 371 audio_init ();
359 } 372 }
360 ); 373 );
361 374
362 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 375 $vbox
363 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
364 text => $CFG->{say_command},
365 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. "
366 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
367 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
368 on_changed => sub {
369 my ($self, $value) = @_;
370 $CFG->{say_command} = $value;
371 }
372 );
373
374 $dialog
375} 376}
376 377
377sub set_stats_window_fontsize { 378sub set_stats_window_fontsize {
378 for (values %{$STATWIDS}) { 379 for (values %{$STATWIDS}) {
379 $_->set_fontsize ($::CFG->{stat_fontsize}); 380 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
552 update_stats_window ({}); 553 update_stats_window ({});
553 554
554 $tgw 555 $tgw
555} 556}
556 557
557sub formsep { 558sub formsep($) {
558 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 559 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
559} 560}
560 561
561sub update_stats_window { 562sub update_stats_window {
562 my ($stats) = @_; 563 my ($stats) = @_;
563 564
… …
625 626
626 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
627 for keys %tbl; 628 for keys %tbl;
628} 629}
629 630
630sub metaserver_dialog {
631 my $dialog = new CFClient::UI::FancyFrame
632 title => "Server List",
633 child => (my $vbox = new CFClient::UI::VBox);
634
635 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
636
637 $dialog
638}
639
640my $METASERVER_ATIME; 631my $METASERVER_ATIME;
641 632
642sub update_metaserver { 633sub update_metaserver {
643 my ($HOST) = @_;
644
645 return if $METASERVER_ATIME > time; 634 return if $METASERVER_ATIME > time;
646 $METASERVER_ATIME = time + 60; 635 $METASERVER_ATIME = time + 60;
647 636
648 my $table = $METASERVER->{table}; 637 my $table = $METASERVER->{table};
649 $table->clear; 638 $table->clear;
… …
701 690
702 $y++; 691 $y++;
703 692
704 $table->add (0, $y, new CFClient::UI::VBox children => [ 693 $table->add (0, $y, new CFClient::UI::VBox children => [
705 (new CFClient::UI::Button text => "Use", on_activate => sub { 694 (new CFClient::UI::Button text => "Use", on_activate => sub {
706 $HOST->set_text ($CFG->{host} = $host); 695 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility;
707 }), 697 }),
708 (new CFClient::UI::Empty expand => 1), 698 (new CFClient::UI::Empty expand => 1),
709 ]); 699 ]);
710 700
711 $table->add ($_ + 1, $y, new CFClient::UI::Label 701 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
714 } 704 }
715 } 705 }
716 }); 706 });
717} 707}
718 708
709sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List",
712 name => 'metaserver_dialog',
713 x => 'center',
714 y => 'center',
715 z => 3,
716 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub {
718 update_metaserver if $_[1];
719 },
720 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
719sub server_setup { 727sub server_setup {
720 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
721 x => "center",
722 y => "center",
723 name => "server_setup",
724 title => "Server Setup",
725 child => (my $vbox = new CFClient::UI::VBox), 728 my $vbox = new CFClient::UI::VBox;
726 ;
727 729
728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730 732
731 { 733 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733 735
734 $vbox->add ( 736 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
736 expand => 1, 738 expand => 1,
737 text => $CFG->{host}, 739 text => $CFG->{host},
738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739 on_changed => sub { 741 on_changed => sub {
740 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
742 } 744 }
743 ); 745 );
744 746
745 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
746 748
747 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
748 expand => 1, 750 expand => 1,
749 text => "Server List", 751 text => "Server List",
750 other => $METASERVER, 752 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
753 update_metaserver $HOST;
754 }
755 ); 755 );
756 } 756 }
757 757
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
826 $CONN ? stop_game 826 $CONN ? stop_game
827 : start_game; 827 : start_game;
828 }, 828 },
829 ); 829 );
830 830
831 $dialog 831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
833 text => $CFG->{say_command},
834 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub {
838 my ($self, $value) = @_;
839 $CFG->{say_command} = $value;
840 }
841 );
842
843 $vbox
832} 844}
833 845
834sub message_window { 846sub message_window {
835 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
836 name => "message_window", 848 name => "message_window",
… …
862 }, 874 },
863 on_activate => sub { 875 on_activate => sub {
864 my ($input, $text) = @_; 876 my ($input, $text) = @_;
865 $input->set_text (''); 877 $input->set_text ('');
866 878
867 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]);
869 } elsif ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
871 } else { 881 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say'; 882 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text"); 883 $::CONN->user_send ("$say_cmd $text");
874 } 884 }
… …
893sub open_quit_dialog { 903sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
896 x => "center", 906 x => "center",
897 y => "center", 907 y => "center",
908 z => 50,
898 title => "Really Quit?", 909 title => "Really Quit?",
899 ; 910 ;
900 911
901 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
902 913
… …
919 } 930 }
920 931
921 $QUIT_DIALOG->show; 932 $QUIT_DIALOG->show;
922} 933}
923 934
935sub autopickup_setup {
936 my $table = new CFClient::UI::Table;
937
938 for (
939 ["General", 0, 0,
940 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
941 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
942 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
943 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
944 ],
945 ["Weapons", 0, 6,
946 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
947 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
948 ["Bows" => CFClient::Pickup::PU_BOW],
949 ["Arrows" => CFClient::Pickup::PU_ARROW],
950 ],
951 ["Armour", 0, 12,
952 ["Helmets" => CFClient::Pickup::PU_HELMET],
953 ["Shields" => CFClient::Pickup::PU_SHIELD],
954 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
955 ["Boots" => CFClient::Pickup::PU_BOOTS],
956 ["Gloves" => CFClient::Pickup::PU_GLOVES],
957 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
958 ],
959
960 ["Readables", 2, 2,
961 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
962 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
963 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
964 ],
965 ["Misc", 2, 7,
966 ["Food" => CFClient::Pickup::PU_FOOD],
967 ["Drinks" => CFClient::Pickup::PU_DRINK],
968 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
969 ["Keys" => CFClient::Pickup::PU_KEY],
970 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
971 ["Potions" => CFClient::Pickup::PU_POTION],
972 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
973 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
974 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
975 ],
976 )
977 {
978 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
980
981 for (@bits) {
982 ++$y;
983
984 my $mask = $_->[1];
985 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask,
988 on_changed => sub {
989 my ($box, $value) = @_;
990 if ($value) {
991 $::CFG->{pickup} |= $mask;
992 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
994 }
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
996 if defined $::CONN;
997 });
998 }
999 }
1000
1001 $table
1002}
1003
924sub make_inventory_window { 1004sub make_inventory_window {
925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
926 x => "center", 1006 x => "center",
927 y => "center", 1007 y => "center",
928 def_w => $WIDTH * 9/10, 1008 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 9/10, 1009 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1010 title => "Inventory",
931 name => "inventory_window",
932 ; 1011 ;
933 1012
934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
935 1014
936 $hb->add (my $vb1 = new CFClient::UI::VBox); 1015 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948 1027
949 $invwin 1028 $invwin
950} 1029}
951 1030
952sub make_binding_window { 1031sub spell_setup {
1032 new CFClient::UI::SpellList
1033}
1034
1035sub keyboard_setup {
953 my $binding_list = new CFClient::UI::VBox; 1036 my $binding_list = new CFClient::UI::VBox;
954 1037
1038 my $refresh;
955 my $refresh = sub { 1039 $refresh = sub {
956 $binding_list->clear (); 1040 $binding_list->clear ();
957 1041
958 for my $mod (keys %{$::CFG->{bindings}}) { 1042 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1043 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1044 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1045 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962 1046
963 my $lbl = join "; ", @$cmds; 1047 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1048 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox); 1049 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button 1050 $hb->add (new CFClient::UI::Button
967 text => "delete", 1051 text => "delete",
1052 tooltip => "Deletes the binding",
968 on_activate => sub { 1053 on_activate => sub {
969 $binding_list->remove ($hb); 1054 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym}; 1055 delete $::CFG->{bindings}->{$mod}->{$sym};
971 }); 1056 });
1057
1058 $hb->add (new CFClient::UI::Button
1059 text => "edit",
1060 tooltip => "Edits the binding",
1061 on_activate => sub {
1062 $::BIND_EDITOR->set_binding (
1063 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1064 sub {
1065 my ($nmod, $nsym, $ncmds) = @_;
1066 delete $::CFG->{bindings}->{$mod}->{$sym};
1067 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1068 $refresh->();
1069 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1070 $SETUP_DIALOG->show;
1071 },
1072 sub {
1073 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $SETUP_DIALOG->show;
1075 });
1076 $::BIND_EDITOR->show;
1077 $SETUP_DIALOG->hide;
1078 });
1079
972 $hb->add (new CFClient::UI::Label text => "($nam)"); 1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 } 1082 }
975 } 1083 }
976 }; 1084 };
977 1085
978 $BIND_WINDOW = new CFClient::UI::FancyFrame 1086 my $vb = new CFClient::UI::VBox;
979 title => "Bindings", 1087 $vb->add ($binding_list);
980 x => "center", 1088 $vb->add (my $hb = new CFClient::UI::HBox);
981 y => "center", 1089
982 def_w => int $WIDTH * 9/10, 1090 $hb->add (new CFClient::UI::Button
983 def_h => int $HEIGHT * 9/10, 1091 text => "record new",
984 on_visibility_change => sub { 1092 expand => 1,
985 my ($self, $visible) = @_; 1093 tooltip => "This button opens the binding editor with an empty binding.",
986 $refresh->() if $visible; 1094 on_activate => sub {
1095 $::BIND_EDITOR->set_binding (undef, undef, [],
1096 sub {
1097 my ($mod, $sym, $cmds) = @_;
1098 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1099 $refresh->();
1100 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1101 $SETUP_DIALOG->show;
1102 },
1103 sub {
1104 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1105 $SETUP_DIALOG->show;
1106 },
1107 );
1108 $SETUP_DIALOG->hide;
1109 $::BIND_EDITOR->show;
1110 },
1111 );
1112
1113 $hb->add (new CFClient::UI::Button
1114 text => "close",
1115 tooltip => "Closes the binding window",
1116 expand => 1,
1117 on_activate => sub {
1118 $SETUP_DIALOG->hide;
987 }; 1119 }
1120 );
988 1121
989 $BIND_WINDOW->add ($binding_list);
990 $refresh->(); 1122 $refresh->();
991 $BIND_WINDOW 1123
1124 $vb
992} 1125}
993 1126
994sub make_help_window { 1127sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame 1128 my $win = new CFClient::UI::FancyFrame
1129 x => 'center',
1130 y => 'center',
1131 z => 2,
1132 name => 'doc_browser',
996 def_w => int $WIDTH * 7/8, 1133 force_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8, 1134 force_h => int $HEIGHT * 7/8,
998 title => "Documentation"; 1135 title => "Documentation";
999 1136
1000 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
1001 1138
1002 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1011 my ($pod, $label) = @$_; 1148 my ($pod, $label) = @$_;
1012 1149
1013 $buttons->add (new CFClient::UI::Button 1150 $buttons->add (new CFClient::UI::Button
1014 text => $label, 1151 text => $label,
1015 on_activate => sub { 1152 on_activate => sub {
1016 my $parser = new Pod::POM; 1153 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1017 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1154 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1018 1155
1019 $viewer->clear; 1156 $viewer->clear;
1020 1157
1021 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1022 for @{ CFClient::pod_to_pango_list $pom }; 1159 for @$pom;
1023 1160
1024 $viewer->set_offset (0); 1161 $viewer->set_offset (0);
1025 }, 1162 },
1026 ); 1163 );
1027 } 1164 }
… …
1070 padding => 0, 1207 padding => 0,
1071 z => 100, 1208 z => 100,
1072 force_x => "max", 1209 force_x => "max",
1073 force_y => 0; 1210 force_y => 0;
1074 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
1075 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
1076 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
1077 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1078 1217
1079 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1080 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1081 force_x => 0, 1220 force_x => 0,
1082 force_y => "max", 1221 force_y => "max",
1083 child => $STATUSBOX, 1222 child => $STATUSBOX,
1084 )->show; 1223 )->show;
1085 1224
1086 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1087 x => 0, 1228 x => 0,
1088 y => $FONTSIZE + 8, 1229 y => $FONTSIZE + 8,
1089 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1090 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1116 can_hover => 1, 1257 can_hover => 1,
1117 can_events => 1, 1258 can_events => 1,
1118 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1119 ; 1260 ;
1120 1261
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup",
1264 name => "setup_dialog",
1265 x => 'center',
1266 y => 'center',
1267 z => 2,
1268 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6,
1270 ;
1271
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1274
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1282 "Configure the use of audio, sound effects and background music.");
1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1284 "Lets you define, edit and delete bindings."
1285 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1286 . "with nothing set and the recording started. After doing the actions you "
1287 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288 . "After pressing the combo the binding will be saved automatically and the "
1289 . "binding editor closes");
1290 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1291 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1292
1121 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1122 1294
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1124 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1296 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1125 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1297
1126 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1128 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1129 1300
1130 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1301 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1131 1302
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1133 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1134 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1135 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1136 1308
1137 $BUTTONBAR->add (new CFClient::UI::Button 1309 $BUTTONBAR->add (new CFClient::UI::Button
1138 text => "Save Config", 1310 text => "Save Config",
1139 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1311 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1140 on_activate => sub { 1312 on_activate => sub {
… …
1144 }, 1316 },
1145 ); 1317 );
1146 1318
1147 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1319 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1148 tooltip => "View Documentation"); 1320 tooltip => "View Documentation");
1149
1150 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings",
1152 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder"
1154 );
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1156 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1157 1321
1158 $BUTTONBAR->add (new CFClient::UI::Button 1322 $BUTTONBAR->add (new CFClient::UI::Button
1159 text => "Quit", 1323 text => "Quit",
1160 tooltip => "Terminates the program", 1324 tooltip => "Terminates the program",
1161 on_activate => sub { 1325 on_activate => sub {
… …
1166 } 1330 }
1167 }, 1331 },
1168 ); 1332 );
1169 1333
1170 $BUTTONBAR->show; 1334 $BUTTONBAR->show;
1171 $SERVER_SETUP->show; 1335 $SETUP_DIALOG->show;
1336 }
1172 1337
1173 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1338 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1174 }
1175} 1339}
1176 1340
1177sub video_shutdown { 1341sub video_shutdown {
1178 undef $SDL_ACTIVE; 1342 undef $SDL_ACTIVE;
1179} 1343}
… …
1246 1410
1247my %demo;#d# 1411my %demo;#d#
1248 1412
1249sub force_refresh { 1413sub force_refresh {
1250 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1414 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1251 debug sprintf "%3.2f", $fps; 1415 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1252 1416
1253 $CFClient::UI::ROOT->draw; 1417 $CFClient::UI::ROOT->draw;
1254 1418
1255 $WANT_REFRESH = 0; 1419 $WANT_REFRESH = 0;
1256 $CAN_REFRESH = 0; 1420 $CAN_REFRESH = 0;
… …
1311}; 1475};
1312 1476
1313 CFClient::SDL_GL_SwapBuffers; 1477 CFClient::SDL_GL_SwapBuffers;
1314} 1478}
1315 1479
1316my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1480my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1317 $NOW = time; 1481 $NOW = time;
1318 1482
1319 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1483 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1320 for CFClient::SDL_PollEvent; 1484 for CFClient::SDL_PollEvent;
1321 1485
… …
1388############################################################################# 1552#############################################################################
1389 1553
1390$SIG{INT} = $SIG{TERM} = sub { exit }; 1554$SIG{INT} = $SIG{TERM} = sub { exit };
1391 1555
1392{ 1556{
1393 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1557 local $SIG{__DIE__} = sub {
1558 return unless defined $^S && !$^S;
1559 Carp::confess $_[1];#d#TODO: remove when stable
1560 CFClient::fatal $_[0];
1561 };
1394 1562
1395 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1563 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1396 CFClient::UI::set_layout ($::CFG->{layout}); 1564 CFClient::UI::set_layout ($::CFG->{layout});
1397 1565
1398 my %DEF_CFG = ( 1566 my %DEF_CFG = (
… …
1489=head1 USAGE 1657=head1 USAGE
1490 1658
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1659cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 1660fullscreen and interactively.
1493 1661
1662=head1 DEBUGGING
1663
1664
1665CFPLUS_DEBUG - environment variable
1666
1667 1 draw borders around widgets
1668 2 add low-level widget info to tooltips
1669 4 show fps
1670 8 suppress tooltips
1671
1494=head1 AUTHOR 1672=head1 AUTHOR
1495 1673
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1674Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 1675
1498 1676

Diff Legend

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