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.43 by elmex, Fri Jun 2 16:27:28 2006 UTC vs.
Revision 1.56 by root, Mon Jun 5 05:23:21 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
… …
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY; 86our $HOST_ENTRY;
87our $SERVER_SETUP; 87
88our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK;
90our $SETUP_SERVER;
91our $SETUP_KEYBOARD;
92our $SETUP_SPELLS;
88 93
89our $FLOORBOX; 94our $FLOORBOX;
90our $GAUGES; 95our $GAUGES;
91our $STATWIDS; 96our $STATWIDS;
92 97
… …
104our $INV_WINDOW; 109our $INV_WINDOW;
105our $INV; 110our $INV;
106our $INVR; 111our $INVR;
107our $INV_RIGHT_HB; 112our $INV_RIGHT_HB;
108 113
109our $BIND_WINDOW;
110our $BIND_EDITOR; 114our $BIND_EDITOR;
111 115
112our $SPELL_LIST;
113our $PICKUP_CFG; 116our $PICKUP_CFG;
114 117
115sub status { 118sub status {
116 $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]);
117} 120}
… …
122 125
123sub start_game { 126sub start_game {
124 status "logging in..."; 127 status "logging in...";
125 128
126 $LOGIN_BUTTON->set_text ("Logout"); 129 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 130 $SETUP_DIALOG->hide;
128 131
129 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;
130 133
131 my ($host, $port) = split /:/, $CFG->{host}; 134 my ($host, $port) = split /:/, $CFG->{host};
132 135
… …
170 } 173 }
171} 174}
172 175
173sub stop_game { 176sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 177 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 180 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178 181
179 return unless $CONN; 182 return unless $CONN;
180 183
181 status "connection closed"; 184 status "connection closed";
182 185
183 $CONN->destroy; 186 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 187 $CONN = 0; # false, does not autovivify
185} 188}
186 189
187sub client_setup { 190sub graphics_setup {
188 my $dialog = new CFClient::UI::FancyFrame
189 x => 1,
190 y => $HEIGHT * (1/8),
191 name => "client_setup",
192 title => "Client Setup",
193 child => (my $vbox = new CFClient::UI::VBox); 191 my $vbox = new CFClient::UI::VBox;
194 192
195 $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]);
196 194
197 $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");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 320 on_activate => sub {
323 video_shutdown (); 321 video_shutdown ();
324 video_init (); 322 video_init ();
325 } 323 }
326 ); 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;
327 335
328 $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");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 337 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 338 state => $CFG->{audio_enable},
331 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.",
… …
362 audio_shutdown (); 370 audio_shutdown ();
363 audio_init (); 371 audio_init ();
364 } 372 }
365 ); 373 );
366 374
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 375 $vbox
368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
369 text => $CFG->{say_command},
370 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. "
371 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
373 on_changed => sub {
374 my ($self, $value) = @_;
375 $CFG->{say_command} = $value;
376 }
377 );
378
379 $dialog
380} 376}
381 377
382sub set_stats_window_fontsize { 378sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 379 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 380 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
557 update_stats_window ({}); 553 update_stats_window ({});
558 554
559 $tgw 555 $tgw
560} 556}
561 557
562sub formsep { 558sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 559 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 560}
565 561
566sub update_stats_window { 562sub update_stats_window {
567 my ($stats) = @_; 563 my ($stats) = @_;
568 564
… …
726 722
727 $dialog 723 $dialog
728} 724}
729 725
730sub server_setup { 726sub server_setup {
731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
735 title => "Server Setup",
736 child => (my $vbox = new CFClient::UI::VBox), 727 my $vbox = new CFClient::UI::VBox;
737 ;
738 728
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 729 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 731
742 { 732 {
… …
835 $CONN ? stop_game 825 $CONN ? stop_game
836 : start_game; 826 : start_game;
837 }, 827 },
838 ); 828 );
839 829
840 $dialog 830 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
831 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
832 text => $CFG->{say_command},
833 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. "
834 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
835 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
836 on_changed => sub {
837 my ($self, $value) = @_;
838 $CFG->{say_command} = $value;
839 }
840 );
841
842 $vbox
841} 843}
842 844
843sub message_window { 845sub message_window {
844 my $window = new CFClient::UI::FancyFrame 846 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 847 name => "message_window",
… …
871 }, 873 },
872 on_activate => sub { 874 on_activate => sub {
873 my ($input, $text) = @_; 875 my ($input, $text) = @_;
874 $input->set_text (''); 876 $input->set_text ('');
875 877
876 if ($text =~ /^\/bind\s+(.*)$/) {
877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
881 } elsif ($text =~ /^\/(.*)/) { 878 if ($text =~ /^\/(.*)/) {
882 $::CONN->user_send ($1); 879 $::CONN->user_send ($1);
883 } else { 880 } else {
884 my $say_cmd = $::CFG->{say_command} || 'say'; 881 my $say_cmd = $::CFG->{say_command} || 'say';
885 $::CONN->user_send ("$say_cmd $text"); 882 $::CONN->user_send ("$say_cmd $text");
886 } 883 }
… …
905sub open_quit_dialog { 902sub open_quit_dialog {
906 unless ($QUIT_DIALOG) { 903 unless ($QUIT_DIALOG) {
907 $QUIT_DIALOG = new CFClient::UI::FancyFrame 904 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center", 905 x => "center",
909 y => "center", 906 y => "center",
907 z => 50,
910 title => "Really Quit?", 908 title => "Really Quit?",
911 ; 909 ;
912 910
913 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
914 912
… …
931 } 929 }
932 930
933 $QUIT_DIALOG->show; 931 $QUIT_DIALOG->show;
934} 932}
935 933
936sub make_pickup_cfg_window { 934sub autopickup_setup {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 x => "center",
939 y => "center",
940 force_w => $WIDTH * 3/10,
941 force_h => $HEIGHT * 9/10;
942
943 my $tbl = new CFClient::UI::Table; 935 my $table = new CFClient::UI::Table;
944 my $tblrow = 0;
945 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl);
946 936
947 for ( 937 for (
948 ["General"], 938 ["General", 0, 0,
949 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE], 939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
950 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
951 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 941 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
952 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
943 ],
953 ["Weapons"], 944 ["Weapons", 0, 6,
954 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
955 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
956 ["Bows" => CFClient::Pickup::PU_BOW], 947 ["Bows" => CFClient::Pickup::PU_BOW],
957 ["Arrows" => CFClient::Pickup::PU_ARROW], 948 ["Arrows" => CFClient::Pickup::PU_ARROW],
949 ],
958 ["Armour"], 950 ["Armour", 0, 12,
959 ["Helmets" => CFClient::Pickup::PU_HELMET], 951 ["Helmets" => CFClient::Pickup::PU_HELMET],
960 ["Shields" => CFClient::Pickup::PU_SHIELD], 952 ["Shields" => CFClient::Pickup::PU_SHIELD],
961 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
962 ["Boots" => CFClient::Pickup::PU_BOOTS], 954 ["Boots" => CFClient::Pickup::PU_BOOTS],
963 ["Gloves" => CFClient::Pickup::PU_GLOVES], 955 ["Gloves" => CFClient::Pickup::PU_GLOVES],
964 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 956 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
957 ],
958
965 ["Readables"], 959 ["Readables", 2, 2,
966 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
967 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
968 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
963 ],
969 ["Misc"], 964 ["Misc", 2, 7,
970 ["Food" => CFClient::Pickup::PU_FOOD], 965 ["Food" => CFClient::Pickup::PU_FOOD],
971 ["Drinks" => CFClient::Pickup::PU_DRINK], 966 ["Drinks" => CFClient::Pickup::PU_DRINK],
972 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
973 ["Keys" => CFClient::Pickup::PU_KEY], 968 ["Keys" => CFClient::Pickup::PU_KEY],
974 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
975 ["Potions" => CFClient::Pickup::PU_POTION], 970 ["Potions" => CFClient::Pickup::PU_POTION],
976 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
977 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
978 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 973 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
974 ],
979 ) 975 )
980 { 976 {
981 unless (defined $_->[1]) { 977 my ($title, $x, $y, @bits) = @$_;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0); 978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983 } else { 979
980 for (@bits) {
981 ++$y;
982
984 my $mask = $_->[1]; 983 my $mask = $_->[1];
985 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1); 984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 985 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 986 state => $CFG->{pickup} & $mask,
988 on_changed => sub { 987 on_changed => sub {
989 my ($box, $value) = @_; 988 my ($box, $value) = @_;
990 if ($value) { 989 if ($value) {
991 $CFG->{pickup} |= $mask; 990 $::CFG->{pickup} |= $mask;
992 } else { 991 } else {
993 $CFG->{pickup} = $CFG->{pickup} & ~$mask; 992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
994 } 993 }
995 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup}); 994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
995 if defined $::CONN;
996 }); 996 });
997 } 997 }
998 } 998 }
999 999
1000 $PICKUP_CFG 1000 $table
1001} 1001}
1002 1002
1003sub make_inventory_window { 1003sub make_inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1005 x => "center",
… …
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026 1026
1027 $invwin 1027 $invwin
1028} 1028}
1029 1029
1030sub make_spell_list { 1030sub spell_setup {
1031 $SPELL_LIST = new CFClient::UI::SpellList 1031 new CFClient::UI::SpellList
1032 force_w => $WIDTH * (9/10),
1033 force_h => $HEIGHT * (9/10);
1034 $SPELL_LIST
1035} 1032}
1036 1033
1037sub make_binding_window { 1034sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1035 my $binding_list = new CFClient::UI::VBox;
1039 1036
1040 my $refresh; 1037 my $refresh;
1041 $refresh = sub { 1038 $refresh = sub {
1042 $binding_list->clear (); 1039 $binding_list->clear ();
… …
1066 sub { 1063 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1064 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1065 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->(); 1067 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1071 $::BIND_WINDOW->show; 1069 $SETUP_DIALOG->show;
1072 }, 1070 },
1073 sub { 1071 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $::BIND_WINDOW->show; 1073 $SETUP_DIALOG->show;
1075 }); 1074 });
1076 $::BIND_EDITOR->show; 1075 $::BIND_EDITOR->show;
1077 $::BIND_WINDOW->hide; 1076 $SETUP_DIALOG->hide;
1078 }); 1077 });
1079 1078
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 } 1081 }
1083 } 1082 }
1084 }; 1083 };
1085 1084
1086 $BIND_WINDOW = new CFClient::UI::FancyFrame
1087 title => "Bindings",
1088 x => "center",
1089 y => "center",
1090 def_w => int $WIDTH * 9/10,
1091 def_h => int $HEIGHT * 9/10,
1092 on_visibility_change => sub {
1093 my ($self, $visible) = @_;
1094 $refresh->() if $visible;
1095 };
1096
1097 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1085 my $vb = new CFClient::UI::VBox;
1098 $vb->add ($binding_list); 1086 $vb->add ($binding_list);
1099 $vb->add (my $hb = new CFClient::UI::HBox); 1087 $vb->add (my $hb = new CFClient::UI::HBox);
1088
1100 $hb->add (new CFClient::UI::Button 1089 $hb->add (new CFClient::UI::Button
1101 text => "record new", 1090 text => "record new",
1102 expand => 1, 1091 expand => 1,
1103 tooltip => "This button opens the binding editor with an empty binding.", 1092 tooltip => "This button opens the binding editor with an empty binding.",
1104 on_activate => sub { 1093 on_activate => sub {
1105 $::BIND_EDITOR->set_binding (undef, undef, [], 1094 $::BIND_EDITOR->set_binding (undef, undef, [],
1106 sub { 1095 sub {
1107 my ($mod, $sym, $cmds) = @_; 1096 my ($mod, $sym, $cmds) = @_;
1108 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1109 $refresh->(); 1098 $refresh->();
1110 $::BIND_WINDOW->show; 1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show;
1111 }, 1101 },
1112 sub { 1102 sub {
1113 $::BIND_WINDOW->show; 1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show;
1114 }); 1105 },
1115 $::BIND_WINDOW->hide; 1106 );
1107 $SETUP_DIALOG->hide;
1116 $::BIND_EDITOR->show; 1108 $::BIND_EDITOR->show;
1117 }, 1109 },
1118 ); 1110 );
1111
1119 $hb->add (new CFClient::UI::Button 1112 $hb->add (new CFClient::UI::Button
1120 text => "close", 1113 text => "close",
1121 tooltip => "Closes the binding window", 1114 tooltip => "Closes the binding window",
1122 expand => 1, 1115 expand => 1,
1123 on_activate => sub { 1116 on_activate => sub {
1124 $::BIND_WINDOW->hide; 1117 $SETUP_DIALOG->hide;
1125 } 1118 }
1126 ); 1119 );
1127 1120
1128 $refresh->(); 1121 $refresh->();
1129 $BIND_WINDOW 1122
1123 $vb
1130} 1124}
1131 1125
1132sub make_help_window { 1126sub make_help_window {
1133 my $win = new CFClient::UI::FancyFrame 1127 my $win = new CFClient::UI::FancyFrame
1134 x => 'center', 1128 x => 'center',
1135 y => 'center', 1129 y => 'center',
1130 z => 2,
1136 name => 'doc_browser', 1131 name => 'doc_browser',
1137 force_w => int $WIDTH * 7/8, 1132 force_w => int $WIDTH * 7/8,
1138 force_h => int $HEIGHT * 7/8, 1133 force_h => int $HEIGHT * 7/8,
1139 title => "Documentation"; 1134 title => "Documentation";
1140 1135
… …
1152 my ($pod, $label) = @$_; 1147 my ($pod, $label) = @$_;
1153 1148
1154 $buttons->add (new CFClient::UI::Button 1149 $buttons->add (new CFClient::UI::Button
1155 text => $label, 1150 text => $label,
1156 on_activate => sub { 1151 on_activate => sub {
1157 my $parser = new Pod::POM;
1158 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1152 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";
1159 1153
1160 $viewer->clear; 1154 $viewer->clear;
1161 1155
1162 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1156 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1163 for @{ CFClient::pod_to_pango_list $pom }; 1157 for @{ CFClient::pod_to_pango_list $pom };
… …
1215 $DEBUG_STATUS->show; 1209 $DEBUG_STATUS->show;
1216 1210
1217 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1211 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1218 1212
1219 $STATUSBOX = new CFClient::UI::Statusbox; 1213 $STATUSBOX = new CFClient::UI::Statusbox;
1220 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1214 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1221 1215
1222 (new CFClient::UI::Frame 1216 (new CFClient::UI::Frame
1223 bg => [0, 0, 0, 0.4], 1217 bg => [0, 0, 0, 0.4],
1224 force_x => 0, 1218 force_x => 0,
1225 force_y => "max", 1219 force_y => "max",
1226 child => $STATUSBOX, 1220 child => $STATUSBOX,
1227 )->show; 1221 )->show;
1228 1222
1229 CFClient::UI::FancyFrame->new ( 1223 CFClient::UI::FancyFrame->new (
1230 title => "Mini Map", 1224 title => "Map",
1231 name => "mapmap", 1225 name => "mapmap",
1232 x => 0, 1226 x => 0,
1233 y => $FONTSIZE + 8, 1227 y => $FONTSIZE + 8,
1234 border_bg => [1, 1, 1, 192/255], 1228 border_bg => [1, 1, 1, 192/255],
1235 bg => [1, 1, 1, 0], 1229 bg => [1, 1, 1, 0],
… …
1261 can_hover => 1, 1255 can_hover => 1,
1262 can_events => 1, 1256 can_events => 1,
1263 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1257 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1264 ; 1258 ;
1265 1259
1260 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1261 title => "Setup",
1262 name => "setup_dialog",
1263 x => 'center',
1264 y => 'center',
1265 z => 2,
1266 force_w => $::WIDTH * 0.6,
1267 force_h => $::HEIGHT * 0.6,
1268 ;
1269
1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1272
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings."
1283 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1290
1266 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1267 1292
1268 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1269 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1294 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1270 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1295
1271 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1272 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1273 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1274 1298
1275 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 1299 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
1276 1300
1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1278 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1279 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1280 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1281 ."You can also hit the Tab-key to show/hide the Inventory."); 1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1282 1306
1283 $BUTTONBAR->add (new CFClient::UI::Button 1307 $BUTTONBAR->add (new CFClient::UI::Button
1284 text => "Save Config", 1308 text => "Save Config",
1285 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1286 on_activate => sub { 1310 on_activate => sub {
… …
1290 }, 1314 },
1291 ); 1315 );
1292 1316
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1294 tooltip => "View Documentation"); 1318 tooltip => "View Documentation");
1295
1296 $BUTTONBAR->add (new CFClient::UI::Flopper
1297 text => "Bindings",
1298 other => make_binding_window,
1299 tooltip =>
1300 "Lets you define, edit and delete bindings."
1301 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1302 ."with nothing set and the recording started. After doing the actions you "
1303 ."want to record press Insert and you will be asked to press a key-combo."
1304 ."After pressing the combo the binding will be saved automatically and the "
1305 ."binding editor closes");
1306
1307 $BUTTONBAR->add (new CFClient::UI::Flopper
1308 text => "Spells",
1309 other => make_spell_list,
1310 tooltip => "The spell list");
1311
1312 $BUTTONBAR->add (new CFClient::UI::Flopper
1313 text => "Pickup",
1314 other => make_pickup_cfg_window,
1315 tooltip => "The pickup dialog");
1316
1317 1319
1318 $BUTTONBAR->add (new CFClient::UI::Button 1320 $BUTTONBAR->add (new CFClient::UI::Button
1319 text => "Quit", 1321 text => "Quit",
1320 tooltip => "Terminates the program", 1322 tooltip => "Terminates the program",
1321 on_activate => sub { 1323 on_activate => sub {
… …
1326 } 1328 }
1327 }, 1329 },
1328 ); 1330 );
1329 1331
1330 $BUTTONBAR->show; 1332 $BUTTONBAR->show;
1331 $SERVER_SETUP->show; 1333 $SETUP_DIALOG->show;
1334 }
1332 1335
1333 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1336 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1334 }
1335} 1337}
1336 1338
1337sub video_shutdown { 1339sub video_shutdown {
1338 undef $SDL_ACTIVE; 1340 undef $SDL_ACTIVE;
1339} 1341}
… …
1471}; 1473};
1472 1474
1473 CFClient::SDL_GL_SwapBuffers; 1475 CFClient::SDL_GL_SwapBuffers;
1474} 1476}
1475 1477
1476my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1478my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1477 $NOW = time; 1479 $NOW = time;
1478 1480
1479 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1481 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1480 for CFClient::SDL_PollEvent; 1482 for CFClient::SDL_PollEvent;
1481 1483
… …
1548############################################################################# 1550#############################################################################
1549 1551
1550$SIG{INT} = $SIG{TERM} = sub { exit }; 1552$SIG{INT} = $SIG{TERM} = sub { exit };
1551 1553
1552{ 1554{
1553 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1555 local $SIG{__DIE__} = sub {
1556 return unless defined $^S && !$^S;
1557 Carp::confess $_[1];#d#TODO: remove when stable
1558 CFClient::fatal $_[0];
1559 };
1554 1560
1555 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1556 CFClient::UI::set_layout ($::CFG->{layout}); 1562 CFClient::UI::set_layout ($::CFG->{layout});
1557 1563
1558 my %DEF_CFG = ( 1564 my %DEF_CFG = (

Diff Legend

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