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.38 by elmex, Wed May 31 13:44:26 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;
109our $BIND_EDITOR; 115our $BIND_EDITOR;
110 116
111our $SPELL_LIST; 117our $PICKUP_CFG;
112 118
113sub status { 119sub status {
114 $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]);
115} 121}
116 122
… …
120 126
121sub start_game { 127sub start_game {
122 status "logging in..."; 128 status "logging in...";
123 129
124 $LOGIN_BUTTON->set_text ("Logout"); 130 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide; 131 $SETUP_DIALOG->hide;
126 132
127 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;
128 134
129 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
130 136
… …
168 } 174 }
169} 175}
170 176
171sub stop_game { 177sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login"); 178 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show; 179 $SETUP_DIALOG->show;
174 $INV_WINDOW->hide; 180 $INV_WINDOW->hide;
175 $LOGVIEW->hide; 181 $LOGVIEW->hide;
176 182
177 return unless $CONN; 183 return unless $CONN;
178 184
… …
180 186
181 $CONN->destroy; 187 $CONN->destroy;
182 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
183} 189}
184 190
185sub client_setup { 191sub graphics_setup {
186 my $dialog = new CFClient::UI::FancyFrame
187 x => 1,
188 y => $HEIGHT * (1/8),
189 name => "client_setup",
190 title => "Client Setup",
191 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
192 193
193 $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]);
194 195
195 $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");
196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
320 on_activate => sub { 321 on_activate => sub {
321 video_shutdown (); 322 video_shutdown ();
322 video_init (); 323 video_init ();
323 } 324 }
324 ); 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;
325 336
326 $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");
327 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
328 state => $CFG->{audio_enable}, 339 state => $CFG->{audio_enable},
329 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.",
… …
360 audio_shutdown (); 371 audio_shutdown ();
361 audio_init (); 372 audio_init ();
362 } 373 }
363 ); 374 );
364 375
365 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
366 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
367 text => $CFG->{say_command},
368 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. "
369 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
370 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
371 on_changed => sub {
372 my ($self, $value) = @_;
373 $CFG->{say_command} = $value;
374 }
375 );
376
377 $dialog
378} 377}
379 378
380sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
381 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
382 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
555 update_stats_window ({}); 554 update_stats_window ({});
556 555
557 $tgw 556 $tgw
558} 557}
559 558
560sub formsep { 559sub formsep($) {
561 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
562} 561}
563 562
564sub update_stats_window { 563sub update_stats_window {
565 my ($stats) = @_; 564 my ($stats) = @_;
566 565
… …
628 627
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 629 for keys %tbl;
631} 630}
632 631
633sub metaserver_dialog {
634 my $dialog = new CFClient::UI::FancyFrame
635 title => "Server List",
636 child => (my $vbox = new CFClient::UI::VBox);
637
638 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
639
640 $dialog
641}
642
643my $METASERVER_ATIME; 632my $METASERVER_ATIME;
644 633
645sub update_metaserver { 634sub update_metaserver {
646 my ($HOST) = @_;
647
648 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
649 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
650 637
651 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
652 $table->clear; 639 $table->clear;
… …
704 691
705 $y++; 692 $y++;
706 693
707 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
708 (new CFClient::UI::Button text => "Use", on_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
709 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
710 }), 698 }),
711 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
712 ]); 700 ]);
713 701
714 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
717 } 705 }
718 } 706 }
719 }); 707 });
720} 708}
721 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
722sub server_setup { 727sub server_setup {
723 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
724 x => "center",
725 y => "center",
726 name => "server_setup",
727 title => "Server Setup",
728 child => (my $vbox = new CFClient::UI::VBox), 728 my $vbox = new CFClient::UI::VBox;
729 ;
730 729
731 $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]);
732 $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");
733 732
734 { 733 {
735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
736 735
737 $vbox->add ( 736 $vbox->add (
738 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
739 expand => 1, 738 expand => 1,
740 text => $CFG->{host}, 739 text => $CFG->{host},
741 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",
742 on_changed => sub { 741 on_changed => sub {
743 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
745 } 744 }
746 ); 745 );
747 746
748 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
749 748
750 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
751 expand => 1, 750 expand => 1,
752 text => "Server List", 751 text => "Server List",
753 other => $METASERVER, 752 other => $METASERVER,
754 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
755 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
756 update_metaserver $HOST;
757 }
758 ); 755 );
759 } 756 }
760 757
761 $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");
762 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
829 $CONN ? stop_game 826 $CONN ? stop_game
830 : start_game; 827 : start_game;
831 }, 828 },
832 ); 829 );
833 830
834 $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
835} 844}
836 845
837sub message_window { 846sub message_window {
838 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
839 name => "message_window", 848 name => "message_window",
… …
865 }, 874 },
866 on_activate => sub { 875 on_activate => sub {
867 my ($input, $text) = @_; 876 my ($input, $text) = @_;
868 $input->set_text (''); 877 $input->set_text ('');
869 878
870 if ($text =~ /^\/bind\s+(.*)$/) {
871 CFClient::Binder::open_binding_dialog (sub {
872 my ($mod, $sym) = @_;
873 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
874 });
875 } elsif ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
876 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
877 } else { 881 } else {
878 my $say_cmd = $::CFG->{say_command} || 'say'; 882 my $say_cmd = $::CFG->{say_command} || 'say';
879 $::CONN->user_send ("$say_cmd $text"); 883 $::CONN->user_send ("$say_cmd $text");
880 } 884 }
… …
925 } 929 }
926 930
927 $QUIT_DIALOG->show; 931 $QUIT_DIALOG->show;
928} 932}
929 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
930sub make_inventory_window { 1006sub make_inventory_window {
931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
932 x => "center", 1008 x => "center",
933 y => "center", 1009 y => "center",
934 force_w => $WIDTH * 9/10, 1010 force_w => $WIDTH * 9/10,
… …
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953 1029
954 $invwin 1030 $invwin
955} 1031}
956 1032
957sub make_spell_list { 1033sub spell_setup {
958 $SPELL_LIST = new CFClient::UI::SpellList 1034 new CFClient::UI::SpellList
959 force_w => $WIDTH * (9/10),
960 force_h => $HEIGHT * (9/10);
961 $SPELL_LIST
962} 1035}
963 1036
964sub make_binding_window { 1037sub keyboard_setup {
965 my $binding_list = new CFClient::UI::VBox; 1038 my $binding_list = new CFClient::UI::VBox;
966 1039
967 my $refresh; 1040 my $refresh;
968 $refresh = sub { 1041 $refresh = sub {
969 $binding_list->clear (); 1042 $binding_list->clear ();
… …
993 sub { 1066 sub {
994 my ($nmod, $nsym, $ncmds) = @_; 1067 my ($nmod, $nsym, $ncmds) = @_;
995 delete $::CFG->{bindings}->{$mod}->{$sym}; 1068 delete $::CFG->{bindings}->{$mod}->{$sym};
996 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
997 $refresh->(); 1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
998 $::BIND_WINDOW->show; 1072 $SETUP_DIALOG->show;
999 }, 1073 },
1000 sub { 1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1001 $::BIND_WINDOW->show; 1076 $SETUP_DIALOG->show;
1002 }); 1077 });
1003 $::BIND_EDITOR->show; 1078 $::BIND_EDITOR->show;
1004 $::BIND_WINDOW->hide; 1079 $SETUP_DIALOG->hide;
1005 }); 1080 });
1006 1081
1007 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1008 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1009 } 1084 }
1010 } 1085 }
1011 }; 1086 };
1012 1087
1013 $BIND_WINDOW = new CFClient::UI::FancyFrame
1014 title => "Bindings",
1015 x => "center",
1016 y => "center",
1017 def_w => int $WIDTH * 9/10,
1018 def_h => int $HEIGHT * 9/10,
1019 on_visibility_change => sub {
1020 my ($self, $visible) = @_;
1021 $refresh->() if $visible;
1022 };
1023
1024 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1088 my $vb = new CFClient::UI::VBox;
1025 $vb->add ($binding_list); 1089 $vb->add ($binding_list);
1026 $vb->add (my $hb = new CFClient::UI::HBox); 1090 $vb->add (my $hb = new CFClient::UI::HBox);
1091
1027 $hb->add (new CFClient::UI::Button 1092 $hb->add (new CFClient::UI::Button
1028 text => "record new", 1093 text => "record new",
1029 expand => 1, 1094 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.", 1095 tooltip => "This button opens the binding editor with an empty binding.",
1031 on_activate => sub { 1096 on_activate => sub {
1032 $::BIND_EDITOR->set_binding (undef, undef, [], 1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1033 sub { 1098 sub {
1034 my ($mod, $sym, $cmds) = @_; 1099 my ($mod, $sym, $cmds) = @_;
1035 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1036 $refresh->(); 1101 $refresh->();
1037 $::BIND_WINDOW->show; 1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
1038 }, 1104 },
1039 sub { 1105 sub {
1040 $::BIND_WINDOW->show; 1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1041 }); 1108 });
1042 $::BIND_WINDOW->hide; 1109 $SETUP_DIALOG->hide;
1043 $::BIND_EDITOR->show; 1110 $::BIND_EDITOR->show;
1044 }, 1111 },
1045 ); 1112 );
1113
1046 $hb->add (new CFClient::UI::Button 1114 $hb->add (new CFClient::UI::Button
1047 text => "close", 1115 text => "close",
1048 tooltip => "Closes the binding window", 1116 tooltip => "Closes the binding window",
1049 expand => 1, 1117 expand => 1,
1050 on_activate => sub { 1118 on_activate => sub {
1051 $::BIND_WINDOW->hide; 1119 $SETUP_DIALOG->hide;
1052 } 1120 }
1053 ); 1121 );
1054 1122
1055 $refresh->(); 1123 $refresh->();
1056 $BIND_WINDOW 1124
1125 $vb
1057} 1126}
1058 1127
1059sub make_help_window { 1128sub make_help_window {
1060 my $win = new CFClient::UI::FancyFrame 1129 my $win = new CFClient::UI::FancyFrame
1130 x => 'center',
1131 y => 'center',
1132 name => 'doc_browser',
1061 def_w => int $WIDTH * 7/8, 1133 force_w => int $WIDTH * 7/8,
1062 def_h => int $HEIGHT * 7/8, 1134 force_h => int $HEIGHT * 7/8,
1063 title => "Documentation"; 1135 title => "Documentation";
1064 1136
1065 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
1066 1138
1067 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
1068 $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);
… …
1149 force_y => "max", 1221 force_y => "max",
1150 child => $STATUSBOX, 1222 child => $STATUSBOX,
1151 )->show; 1223 )->show;
1152 1224
1153 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1154 x => 0, 1228 x => 0,
1155 y => $FONTSIZE + 8, 1229 y => $FONTSIZE + 8,
1156 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1157 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1183 can_hover => 1, 1257 can_hover => 1,
1184 can_events => 1, 1258 can_events => 1,
1185 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.",
1186 ; 1260 ;
1187 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
1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1292 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1189 1293
1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1191 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.");
1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1296
1193 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1194 $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,
1195 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.");
1196 1299
1197 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
1198 1301
1199 $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,
1200 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.");
1201 $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,
1202 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 :)."
1203 ."You can also hit the Tab-key to show/hide the Inventory."); 1306 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1204 1307
1205 $BUTTONBAR->add (new CFClient::UI::Button 1308 $BUTTONBAR->add (new CFClient::UI::Button
1206 text => "Save Config", 1309 text => "Save Config",
1207 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.",
1208 on_activate => sub { 1311 on_activate => sub {
… …
1212 }, 1315 },
1213 ); 1316 );
1214 1317
1215 $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,
1216 tooltip => "View Documentation"); 1319 tooltip => "View Documentation");
1217
1218 $BUTTONBAR->add (new CFClient::UI::Flopper
1219 text => "Bindings",
1220 other => make_binding_window,
1221 tooltip =>
1222 "Lets you define, edit and delete bindings."
1223 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1224 ."with nothing set and the recording started. After doing the actions you "
1225 ."want to record press Insert and you will be asked to press a key-combo."
1226 ."After pressing the combo the binding will be saved automatically and the "
1227 ."binding editor closes");
1228
1229 $BUTTONBAR->add (new CFClient::UI::Flopper
1230 text => "Spells",
1231 other => make_spell_list,
1232 tooltip => "The spell list");
1233 1320
1234 $BUTTONBAR->add (new CFClient::UI::Button 1321 $BUTTONBAR->add (new CFClient::UI::Button
1235 text => "Quit", 1322 text => "Quit",
1236 tooltip => "Terminates the program", 1323 tooltip => "Terminates the program",
1237 on_activate => sub { 1324 on_activate => sub {
… …
1242 } 1329 }
1243 }, 1330 },
1244 ); 1331 );
1245 1332
1246 $BUTTONBAR->show; 1333 $BUTTONBAR->show;
1247 $SERVER_SETUP->show; 1334 $SETUP_DIALOG->show;
1335 }
1248 1336
1249 $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]);
1250 }
1251} 1338}
1252 1339
1253sub video_shutdown { 1340sub video_shutdown {
1254 undef $SDL_ACTIVE; 1341 undef $SDL_ACTIVE;
1255} 1342}
… …
1387}; 1474};
1388 1475
1389 CFClient::SDL_GL_SwapBuffers; 1476 CFClient::SDL_GL_SwapBuffers;
1390} 1477}
1391 1478
1392my $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 {
1393 $NOW = time; 1480 $NOW = time;
1394 1481
1395 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1482 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1396 for CFClient::SDL_PollEvent; 1483 for CFClient::SDL_PollEvent;
1397 1484
… …
1464############################################################################# 1551#############################################################################
1465 1552
1466$SIG{INT} = $SIG{TERM} = sub { exit }; 1553$SIG{INT} = $SIG{TERM} = sub { exit };
1467 1554
1468{ 1555{
1469 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 };
1470 1561
1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout}); 1563 CFClient::UI::set_layout ($::CFG->{layout});
1473 1564
1474 my %DEF_CFG = ( 1565 my %DEF_CFG = (
… …
1565=head1 USAGE 1656=head1 USAGE
1566 1657
1567cfplus 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
1568fullscreen and interactively. 1659fullscreen and interactively.
1569 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
1570=head1 AUTHOR 1671=head1 AUTHOR
1571 1672
1572Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1673Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1573 1674
1574 1675

Diff Legend

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