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.36 by elmex, Tue May 30 14:59:26 2006 UTC vs.
Revision 1.55 by root, Mon Jun 5 03:33:09 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;
116
117our $PICKUP_CFG;
110 118
111sub status { 119sub status {
112 $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]);
113} 121}
114 122
… …
118 126
119sub start_game { 127sub start_game {
120 status "logging in..."; 128 status "logging in...";
121 129
122 $LOGIN_BUTTON->set_text ("Logout"); 130 $LOGIN_BUTTON->set_text ("Logout");
123 $SERVER_SETUP->hide; 131 $SETUP_DIALOG->hide;
124 132
125 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;
126 134
127 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
128 136
… …
166 } 174 }
167} 175}
168 176
169sub stop_game { 177sub stop_game {
170 $LOGIN_BUTTON->set_text ("Login"); 178 $LOGIN_BUTTON->set_text ("Login");
171 $SERVER_SETUP->show; 179 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
180 $SETUP_DIALOG->show;
172 $INV_WINDOW->hide; 181 $INV_WINDOW->hide;
173 $LOGVIEW->hide;
174 182
175 return unless $CONN; 183 return unless $CONN;
176 184
177 status "connection closed"; 185 status "connection closed";
178 186
179 $CONN->destroy; 187 $CONN->destroy;
180 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
181} 189}
182 190
183sub client_setup { 191sub graphics_setup {
184 my $dialog = new CFClient::UI::FancyFrame
185 x => 1,
186 y => $HEIGHT * (1/8),
187 name => "client_setup",
188 title => "Client Setup",
189 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
190 193
191 $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]);
192 195
193 $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");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
318 on_activate => sub { 321 on_activate => sub {
319 video_shutdown (); 322 video_shutdown ();
320 video_init (); 323 video_init ();
321 } 324 }
322 ); 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;
323 336
324 $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");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 339 state => $CFG->{audio_enable},
327 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.",
… …
358 audio_shutdown (); 371 audio_shutdown ();
359 audio_init (); 372 audio_init ();
360 } 373 }
361 ); 374 );
362 375
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376} 377}
377 378
378sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
553 update_stats_window ({}); 554 update_stats_window ({});
554 555
555 $tgw 556 $tgw
556} 557}
557 558
558sub formsep { 559sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 561}
561 562
562sub update_stats_window { 563sub update_stats_window {
563 my ($stats) = @_; 564 my ($stats) = @_;
564 565
… …
626 627
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 629 for keys %tbl;
629} 630}
630 631
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 632my $METASERVER_ATIME;
642 633
643sub update_metaserver { 634sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
648 637
649 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
650 $table->clear; 639 $table->clear;
… …
702 691
703 $y++; 692 $y++;
704 693
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
708 }), 698 }),
709 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
710 ]); 700 ]);
711 701
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 705 }
716 } 706 }
717 }); 707 });
718} 708}
719 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
720sub server_setup { 727sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => "center",
723 y => "center",
724 name => "server_setup",
725 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 728 my $vbox = new CFClient::UI::VBox;
727 ;
728 729
729 $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]);
730 $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");
731 732
732 { 733 {
733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
734 735
735 $vbox->add ( 736 $vbox->add (
736 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
737 expand => 1, 738 expand => 1,
738 text => $CFG->{host}, 739 text => $CFG->{host},
739 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",
740 on_changed => sub { 741 on_changed => sub {
741 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
743 } 744 }
744 ); 745 );
745 746
746 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
747 748
748 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
749 expand => 1, 750 expand => 1,
750 text => "Server List", 751 text => "Server List",
751 other => $METASERVER, 752 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
753 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
754 update_metaserver $HOST;
755 }
756 ); 755 );
757 } 756 }
758 757
759 $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");
760 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
827 $CONN ? stop_game 826 $CONN ? stop_game
828 : start_game; 827 : start_game;
829 }, 828 },
830 ); 829 );
831 830
832 $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
833} 844}
834 845
835sub message_window { 846sub message_window {
836 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
837 name => "message_window", 848 name => "message_window",
… …
863 }, 874 },
864 on_activate => sub { 875 on_activate => sub {
865 my ($input, $text) = @_; 876 my ($input, $text) = @_;
866 $input->set_text (''); 877 $input->set_text ('');
867 878
868 if ($text =~ /^\/bind\s+(.*)$/) {
869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
873 } elsif ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
874 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
875 } else { 881 } else {
876 my $say_cmd = $::CFG->{say_command} || 'say'; 882 my $say_cmd = $::CFG->{say_command} || 'say';
877 $::CONN->user_send ("$say_cmd $text"); 883 $::CONN->user_send ("$say_cmd $text");
878 } 884 }
… …
897sub open_quit_dialog { 903sub open_quit_dialog {
898 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
899 $QUIT_DIALOG = new CFClient::UI::FancyFrame 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center", 906 x => "center",
901 y => "center", 907 y => "center",
908 z => 50,
902 title => "Really Quit?", 909 title => "Really Quit?",
903 ; 910 ;
904 911
905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
906 913
… …
923 } 930 }
924 931
925 $QUIT_DIALOG->show; 932 $QUIT_DIALOG->show;
926} 933}
927 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
928sub make_inventory_window { 1004sub make_inventory_window {
929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
930 x => "center", 1006 x => "center",
931 y => "center", 1007 y => "center",
932 force_w => $WIDTH * 9/10, 1008 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10, 1009 force_h => $HEIGHT * 9/10,
934 title => "Inventory", 1010 title => "Inventory",
935 name => "inventory_window",
936 ; 1011 ;
937 1012
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1014
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1015 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 1027
953 $invwin 1028 $invwin
954} 1029}
955 1030
956sub make_binding_window { 1031sub spell_setup {
1032 new CFClient::UI::SpellList
1033}
1034
1035sub keyboard_setup {
957 my $binding_list = new CFClient::UI::VBox; 1036 my $binding_list = new CFClient::UI::VBox;
958 1037
959 my $refresh; 1038 my $refresh;
960 $refresh = sub { 1039 $refresh = sub {
961 $binding_list->clear (); 1040 $binding_list->clear ();
… …
985 sub { 1064 sub {
986 my ($nmod, $nsym, $ncmds) = @_; 1065 my ($nmod, $nsym, $ncmds) = @_;
987 delete $::CFG->{bindings}->{$mod}->{$sym}; 1066 delete $::CFG->{bindings}->{$mod}->{$sym};
988 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1067 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
989 $refresh->(); 1068 $refresh->();
1069 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
990 $::BIND_WINDOW->show; 1070 $SETUP_DIALOG->show;
991 }, 1071 },
992 sub { 1072 sub {
1073 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
993 $::BIND_WINDOW->show; 1074 $SETUP_DIALOG->show;
994 }); 1075 });
995 $::BIND_EDITOR->show; 1076 $::BIND_EDITOR->show;
996 $::BIND_WINDOW->hide; 1077 $SETUP_DIALOG->hide;
997 }); 1078 });
998 1079
999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1001 } 1082 }
1002 } 1083 }
1003 }; 1084 };
1004 1085
1005 $BIND_WINDOW = new CFClient::UI::FancyFrame
1006 title => "Bindings",
1007 x => "center",
1008 y => "center",
1009 def_w => int $WIDTH * 9/10,
1010 def_h => int $HEIGHT * 9/10,
1011 on_visibility_change => sub {
1012 my ($self, $visible) = @_;
1013 $refresh->() if $visible;
1014 };
1015
1016 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1086 my $vb = new CFClient::UI::VBox;
1017 $vb->add ($binding_list); 1087 $vb->add ($binding_list);
1018 $vb->add (my $hb = new CFClient::UI::HBox); 1088 $vb->add (my $hb = new CFClient::UI::HBox);
1089
1019 $hb->add (new CFClient::UI::Button 1090 $hb->add (new CFClient::UI::Button
1020 text => "record new", 1091 text => "record new",
1021 expand => 1, 1092 expand => 1,
1022 tooltip => "This button opens the binding editor with an empty binding.", 1093 tooltip => "This button opens the binding editor with an empty binding.",
1023 on_activate => sub { 1094 on_activate => sub {
1024 $::BIND_EDITOR->set_binding (undef, undef, [], 1095 $::BIND_EDITOR->set_binding (undef, undef, [],
1025 sub { 1096 sub {
1026 my ($mod, $sym, $cmds) = @_; 1097 my ($mod, $sym, $cmds) = @_;
1027 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1098 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1028 $refresh->(); 1099 $refresh->();
1029 $::BIND_WINDOW->show; 1100 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1101 $SETUP_DIALOG->show;
1030 }, 1102 },
1031 sub { 1103 sub {
1032 $::BIND_WINDOW->show; 1104 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1105 $SETUP_DIALOG->show;
1033 }); 1106 },
1034 $::BIND_WINDOW->hide; 1107 );
1108 $SETUP_DIALOG->hide;
1035 $::BIND_EDITOR->show; 1109 $::BIND_EDITOR->show;
1036 }, 1110 },
1037 ); 1111 );
1112
1038 $hb->add (new CFClient::UI::Button 1113 $hb->add (new CFClient::UI::Button
1039 text => "close", 1114 text => "close",
1040 tooltip => "Closes the binding window", 1115 tooltip => "Closes the binding window",
1041 expand => 1, 1116 expand => 1,
1042 on_activate => sub { 1117 on_activate => sub {
1043 $::BIND_WINDOW->hide; 1118 $SETUP_DIALOG->hide;
1044 } 1119 }
1045 ); 1120 );
1046 1121
1047 $refresh->(); 1122 $refresh->();
1048 $BIND_WINDOW 1123
1124 $vb
1049} 1125}
1050 1126
1051sub make_help_window { 1127sub make_help_window {
1052 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',
1053 def_w => int $WIDTH * 7/8, 1133 force_w => int $WIDTH * 7/8,
1054 def_h => int $HEIGHT * 7/8, 1134 force_h => int $HEIGHT * 7/8,
1055 title => "Documentation"; 1135 title => "Documentation";
1056 1136
1057 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
1058 1138
1059 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
1060 $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);
… …
1131 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
1132 1212
1133 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1134 1214
1135 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
1136 $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]);
1137 1217
1138 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1139 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1140 force_x => 0, 1220 force_x => 0,
1141 force_y => "max", 1221 force_y => "max",
1142 child => $STATUSBOX, 1222 child => $STATUSBOX,
1143 )->show; 1223 )->show;
1144 1224
1145 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1146 x => 0, 1228 x => 0,
1147 y => $FONTSIZE + 8, 1229 y => $FONTSIZE + 8,
1148 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1149 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1150 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1175 can_hover => 1, 1257 can_hover => 1,
1176 can_events => 1, 1258 can_events => 1,
1177 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.",
1178 ; 1260 ;
1179 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
1180 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1293 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1181 1294
1182 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1183 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.");
1184 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1297
1185 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1186 $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,
1187 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.");
1188 1300
1189 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
1190 1302
1191 $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,
1192 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.");
1193 $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,
1194 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 :). "
1195 ."You can also hit the Tab-key to show/hide the Inventory."); 1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1196 1308
1197 $BUTTONBAR->add (new CFClient::UI::Button 1309 $BUTTONBAR->add (new CFClient::UI::Button
1198 text => "Save Config", 1310 text => "Save Config",
1199 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.",
1200 on_activate => sub { 1312 on_activate => sub {
… …
1204 }, 1316 },
1205 ); 1317 );
1206 1318
1207 $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,
1208 tooltip => "View Documentation"); 1320 tooltip => "View Documentation");
1209
1210 $BUTTONBAR->add (new CFClient::UI::Flopper
1211 text => "Bindings",
1212 other => make_binding_window,
1213 tooltip =>
1214 "Lets you define, edit and delete bindings."
1215 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1216 ."with nothing set and the recording started. After doing the actions you "
1217 ."want to record press Insert and you will be asked to press a key-combo."
1218 ."After pressing the combo the binding will be saved automatically and the "
1219 ."binding editor closes"
1220 );
1221 1321
1222 $BUTTONBAR->add (new CFClient::UI::Button 1322 $BUTTONBAR->add (new CFClient::UI::Button
1223 text => "Quit", 1323 text => "Quit",
1224 tooltip => "Terminates the program", 1324 tooltip => "Terminates the program",
1225 on_activate => sub { 1325 on_activate => sub {
… …
1230 } 1330 }
1231 }, 1331 },
1232 ); 1332 );
1233 1333
1234 $BUTTONBAR->show; 1334 $BUTTONBAR->show;
1235 $SERVER_SETUP->show; 1335 $SETUP_DIALOG->show;
1336 }
1236 1337
1237 $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]);
1238 }
1239} 1339}
1240 1340
1241sub video_shutdown { 1341sub video_shutdown {
1242 undef $SDL_ACTIVE; 1342 undef $SDL_ACTIVE;
1243} 1343}
… …
1375}; 1475};
1376 1476
1377 CFClient::SDL_GL_SwapBuffers; 1477 CFClient::SDL_GL_SwapBuffers;
1378} 1478}
1379 1479
1380my $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 {
1381 $NOW = time; 1481 $NOW = time;
1382 1482
1383 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1483 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1384 for CFClient::SDL_PollEvent; 1484 for CFClient::SDL_PollEvent;
1385 1485
… …
1452############################################################################# 1552#############################################################################
1453 1553
1454$SIG{INT} = $SIG{TERM} = sub { exit }; 1554$SIG{INT} = $SIG{TERM} = sub { exit };
1455 1555
1456{ 1556{
1457 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 };
1458 1562
1459 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1563 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1460 CFClient::UI::set_layout ($::CFG->{layout}); 1564 CFClient::UI::set_layout ($::CFG->{layout});
1461 1565
1462 my %DEF_CFG = ( 1566 my %DEF_CFG = (
… …
1553=head1 USAGE 1657=head1 USAGE
1554 1658
1555cfplus 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
1556fullscreen and interactively. 1660fullscreen and interactively.
1557 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
1558=head1 AUTHOR 1672=head1 AUTHOR
1559 1673
1560Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1674Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1561 1675
1562 1676

Diff Legend

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