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.33 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC

… …
41use CFClient::UI; 41use CFClient::UI;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43 43
44$Event::DIED = sub { 44$Event::DIED = sub {
45 # TODO: display dialog box or so 45 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 47 CFClient::error $_[1];
47}; 48};
48 49
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 51
… …
81our $LOGVIEW; 82our $LOGVIEW;
82our $CONSOLE; 83our $CONSOLE;
83our $METASERVER; 84our $METASERVER;
84our $LOGIN_BUTTON; 85our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 86our $QUIT_DIALOG;
86our $SERVER_SETUP; 87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
87 94
88our $FLOORBOX; 95our $FLOORBOX;
89our $GAUGES; 96our $GAUGES;
90our $STATWIDS; 97our $STATWIDS;
91 98
… …
103our $INV_WINDOW; 110our $INV_WINDOW;
104our $INV; 111our $INV;
105our $INVR; 112our $INVR;
106our $INV_RIGHT_HB; 113our $INV_RIGHT_HB;
107 114
108our $BIND_WINDOW; 115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
109 118
110sub status { 119sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 121}
113 122
… …
117 126
118sub start_game { 127sub start_game {
119 status "logging in..."; 128 status "logging in...";
120 129
121 $LOGIN_BUTTON->set_text ("Logout"); 130 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 131 $SETUP_DIALOG->hide;
123 132
124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125 134
126 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
127 136
… …
165 } 174 }
166} 175}
167 176
168sub stop_game { 177sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 178 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 179 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 180 $INV_WINDOW->hide;
172 $LOGVIEW->hide; 181 $LOGVIEW->hide;
173 182
174 return unless $CONN; 183 return unless $CONN;
175 184
… …
177 186
178 $CONN->destroy; 187 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
180} 189}
181 190
182sub client_setup { 191sub 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); 192 my $vbox = new CFClient::UI::VBox;
189 193
190 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 194 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
191 195
192 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 196 $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); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
317 on_activate => sub { 321 on_activate => sub {
318 video_shutdown (); 322 video_shutdown ();
319 video_init (); 323 video_init ();
320 } 324 }
321 ); 325 );
326
327 $vbox
328}
329
330sub audio_setup {
331 my $vbox = new CFClient::UI::VBox;
332
333 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
334
335 my $row = 0;
322 336
323 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
324 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
325 state => $CFG->{audio_enable}, 339 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.", 340 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 (); 371 audio_shutdown ();
358 audio_init (); 372 audio_init ();
359 } 373 }
360 ); 374 );
361 375
362 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $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} 377}
376 378
377sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
378 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
379 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
552 update_stats_window ({}); 554 update_stats_window ({});
553 555
554 $tgw 556 $tgw
555} 557}
556 558
557sub formsep { 559sub formsep($) {
558 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
559} 561}
560 562
561sub update_stats_window { 563sub update_stats_window {
562 my ($stats) = @_; 564 my ($stats) = @_;
563 565
… …
625 627
626 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
627 for keys %tbl; 629 for keys %tbl;
628} 630}
629 631
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; 632my $METASERVER_ATIME;
641 633
642sub update_metaserver { 634sub update_metaserver {
643 my ($HOST) = @_;
644
645 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
646 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
647 637
648 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
649 $table->clear; 639 $table->clear;
… …
701 691
702 $y++; 692 $y++;
703 693
704 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
705 (new CFClient::UI::Button text => "Use", on_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
706 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
707 }), 698 }),
708 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
709 ]); 700 ]);
710 701
711 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
714 } 705 }
715 } 706 }
716 }); 707 });
717} 708}
718 709
710sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List",
713 name => 'metaserver_dialog',
714 x => 'center',
715 y => 'center',
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 }
… …
919 } 929 }
920 930
921 $QUIT_DIALOG->show; 931 $QUIT_DIALOG->show;
922} 932}
923 933
934sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944
945 for (
946 ["General", $gen_tbl],
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
951 ["Weapons", $ltbl],
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW],
956 ["Armour"],
957 ["Helmets" => CFClient::Pickup::PU_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
963 ["Readables", $rtbl],
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
967 ["Misc"],
968 ["Food" => CFClient::Pickup::PU_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
977 )
978 {
979 if (ref $_->[1]) {
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
983 } elsif (not defined $_->[1]) {
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
985 } else {
986 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask,
990 on_changed => sub {
991 my ($box, $value) = @_;
992 if ($value) {
993 $::CFG->{pickup} |= $mask;
994 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
996 }
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
998 if defined $::CONN;
999 });
1000 }
1001 }
1002
1003 $vb
1004}
1005
924sub make_inventory_window { 1006sub make_inventory_window {
925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
926 x => "center", 1008 x => "center",
927 y => "center", 1009 y => "center",
928 force_w => $WIDTH * 9/10, 1010 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10, 1011 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1012 title => "Inventory",
931 name => "inventory_window",
932 ; 1013 ;
933 1014
934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
935 1016
936 $hb->add (my $vb1 = new CFClient::UI::VBox); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948 1029
949 $invwin 1030 $invwin
950} 1031}
951 1032
952sub make_binding_window { 1033sub spell_setup {
1034 new CFClient::UI::SpellList
1035}
1036
1037sub keyboard_setup {
953 my $binding_list = new CFClient::UI::VBox; 1038 my $binding_list = new CFClient::UI::VBox;
954 1039
1040 my $refresh;
955 my $refresh = sub { 1041 $refresh = sub {
956 $binding_list->clear (); 1042 $binding_list->clear ();
957 1043
958 for my $mod (keys %{$::CFG->{bindings}}) { 1044 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962 1048
963 my $lbl = join "; ", @$cmds; 1049 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox); 1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button 1052 $hb->add (new CFClient::UI::Button
967 text => "delete", 1053 text => "delete",
1054 tooltip => "Deletes the binding",
968 on_activate => sub { 1055 on_activate => sub {
969 $binding_list->remove ($hb); 1056 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym}; 1057 delete $::CFG->{bindings}->{$mod}->{$sym};
971 }); 1058 });
1059
1060 $hb->add (new CFClient::UI::Button
1061 text => "edit",
1062 tooltip => "Edits the binding",
1063 on_activate => sub {
1064 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1066 sub {
1067 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show;
1073 },
1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show;
1077 });
1078 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide;
1080 });
1081
972 $hb->add (new CFClient::UI::Label text => "($nam)"); 1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 } 1084 }
975 } 1085 }
976 }; 1086 };
977 1087
978 $BIND_WINDOW = new CFClient::UI::FancyFrame 1088 my $vb = new CFClient::UI::VBox;
979 title => "Bindings", 1089 $vb->add ($binding_list);
980 x => "center", 1090 $vb->add (my $hb = new CFClient::UI::HBox);
981 y => "center", 1091
982 def_w => int $WIDTH * 9/10, 1092 $hb->add (new CFClient::UI::Button
983 def_h => int $HEIGHT * 9/10, 1093 text => "record new",
984 on_visibility_change => sub { 1094 expand => 1,
985 my ($self, $visible) = @_; 1095 tooltip => "This button opens the binding editor with an empty binding.",
986 $refresh->() if $visible; 1096 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub {
1099 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1101 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
1104 },
1105 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1108 });
1109 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show;
1111 },
1112 );
1113
1114 $hb->add (new CFClient::UI::Button
1115 text => "close",
1116 tooltip => "Closes the binding window",
1117 expand => 1,
1118 on_activate => sub {
1119 $SETUP_DIALOG->hide;
987 }; 1120 }
1121 );
988 1122
989 $BIND_WINDOW->add ($binding_list);
990 $refresh->(); 1123 $refresh->();
991 $BIND_WINDOW 1124
1125 $vb
992} 1126}
993 1127
994sub make_help_window { 1128sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame 1129 my $win = new CFClient::UI::FancyFrame
1130 x => 'center',
1131 y => 'center',
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);
… …
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", 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],
… …
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 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6,
1269 ;
1270
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1272 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1273
1274 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1275 "Configure the server to play on, your username, password and other server-related options.");
1276 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1277 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1278 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1279 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1280 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1281 "Configure the use of audio, sound effects and background music.");
1282 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1283 "Lets you define, edit and delete bindings."
1284 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "
1285 . "with nothing set and the recording started. After doing the actions you "
1286 . "want to record press Insert and you will be asked to press a key-combo."
1287 . "After pressing the combo the binding will be saved automatically and the "
1288 . "binding editor closes");
1289 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1290 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1291
1121 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1292 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1122 1293
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1294 $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."); 1295 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, 1296
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, 1297 $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."); 1298 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1129 1299
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 1300 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 1301
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1302 $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."); 1303 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, 1304 $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 :)."); 1305 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1306 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1136 1307
1137 $BUTTONBAR->add (new CFClient::UI::Button 1308 $BUTTONBAR->add (new CFClient::UI::Button
1138 text => "Save Config", 1309 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.", 1310 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 { 1311 on_activate => sub {
… …
1144 }, 1315 },
1145 ); 1316 );
1146 1317
1147 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1318 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1148 tooltip => "View Documentation"); 1319 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 1320
1158 $BUTTONBAR->add (new CFClient::UI::Button 1321 $BUTTONBAR->add (new CFClient::UI::Button
1159 text => "Quit", 1322 text => "Quit",
1160 tooltip => "Terminates the program", 1323 tooltip => "Terminates the program",
1161 on_activate => sub { 1324 on_activate => sub {
… …
1166 } 1329 }
1167 }, 1330 },
1168 ); 1331 );
1169 1332
1170 $BUTTONBAR->show; 1333 $BUTTONBAR->show;
1171 $SERVER_SETUP->show; 1334 $SETUP_DIALOG->show;
1335 }
1172 1336
1173 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1337 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1174 }
1175} 1338}
1176 1339
1177sub video_shutdown { 1340sub video_shutdown {
1178 undef $SDL_ACTIVE; 1341 undef $SDL_ACTIVE;
1179} 1342}
… …
1311}; 1474};
1312 1475
1313 CFClient::SDL_GL_SwapBuffers; 1476 CFClient::SDL_GL_SwapBuffers;
1314} 1477}
1315 1478
1316my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1479my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1317 $NOW = time; 1480 $NOW = time;
1318 1481
1319 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1482 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1320 for CFClient::SDL_PollEvent; 1483 for CFClient::SDL_PollEvent;
1321 1484
… …
1388############################################################################# 1551#############################################################################
1389 1552
1390$SIG{INT} = $SIG{TERM} = sub { exit }; 1553$SIG{INT} = $SIG{TERM} = sub { exit };
1391 1554
1392{ 1555{
1393 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1556 local $SIG{__DIE__} = sub {
1557 return unless defined $^S && !$^S;
1558 Carp::confess $_[1];#d#TODO: remove when stable
1559 CFClient::fatal $_[0];
1560 };
1394 1561
1395 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1396 CFClient::UI::set_layout ($::CFG->{layout}); 1563 CFClient::UI::set_layout ($::CFG->{layout});
1397 1564
1398 my %DEF_CFG = ( 1565 my %DEF_CFG = (
… …
1489=head1 USAGE 1656=head1 USAGE
1490 1657
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1658cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 1659fullscreen and interactively.
1493 1660
1661=head1 DEBUGGING
1662
1663
1664CFPLUS_DEBUG - environment variable
1665
1666 1 draw borders around widgets
1667 2 add low-level widget info to tooltips
1668 4 show fps
1669 8 suppress tooltips
1670
1494=head1 AUTHOR 1671=head1 AUTHOR
1495 1672
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1673Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 1674
1498 1675

Diff Legend

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