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.59 by root, Mon Jun 5 22:30:35 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
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $SERVER_SETUP; 88our $HOST_ENTRY;
89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
87 95
88our $FLOORBOX; 96our $FLOORBOX;
89our $GAUGES; 97our $GAUGES;
90our $STATWIDS; 98our $STATWIDS;
91 99
… …
103our $INV_WINDOW; 111our $INV_WINDOW;
104our $INV; 112our $INV;
105our $INVR; 113our $INVR;
106our $INV_RIGHT_HB; 114our $INV_RIGHT_HB;
107 115
108our $BIND_WINDOW; 116our $BIND_EDITOR;
117
118our $PICKUP_CFG;
109 119
110sub status { 120sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 121 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 122}
113 123
… …
117 127
118sub start_game { 128sub start_game {
119 status "logging in..."; 129 status "logging in...";
120 130
121 $LOGIN_BUTTON->set_text ("Logout"); 131 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 132 $SETUP_DIALOG->hide;
123 133
124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 134 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125 135
126 my ($host, $port) = split /:/, $CFG->{host}; 136 my ($host, $port) = split /:/, $CFG->{host};
127 137
… …
165 } 175 }
166} 176}
167 177
168sub stop_game { 178sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 179 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 182 $INV_WINDOW->hide;
172 $LOGVIEW->hide;
173 183
174 return unless $CONN; 184 return unless $CONN;
175 185
176 status "connection closed"; 186 status "connection closed";
177 187
178 $CONN->destroy; 188 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 189 $CONN = 0; # false, does not autovivify
180} 190}
181 191
182sub client_setup { 192sub 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); 193 my $vbox = new CFClient::UI::VBox;
189 194
190 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
191 196
192 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 197 $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); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
317 on_activate => sub { 322 on_activate => sub {
318 video_shutdown (); 323 video_shutdown ();
319 video_init (); 324 video_init ();
320 } 325 }
321 ); 326 );
327
328 $vbox
329}
330
331sub audio_setup {
332 my $vbox = new CFClient::UI::VBox;
333
334 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
335
336 my $row = 0;
322 337
323 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
324 $table->add (1, $row++, new CFClient::UI::CheckBox 339 $table->add (1, $row++, new CFClient::UI::CheckBox
325 state => $CFG->{audio_enable}, 340 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.", 341 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 (); 372 audio_shutdown ();
358 audio_init (); 373 audio_init ();
359 } 374 }
360 ); 375 );
361 376
362 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 377 $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} 378}
376 379
377sub set_stats_window_fontsize { 380sub set_stats_window_fontsize {
378 for (values %{$STATWIDS}) { 381 for (values %{$STATWIDS}) {
379 $_->set_fontsize ($::CFG->{stat_fontsize}); 382 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
552 update_stats_window ({}); 555 update_stats_window ({});
553 556
554 $tgw 557 $tgw
555} 558}
556 559
557sub formsep { 560sub formsep($) {
558 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 561 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
559} 562}
560 563
561sub update_stats_window { 564sub update_stats_window {
562 my ($stats) = @_; 565 my ($stats) = @_;
563 566
… …
625 628
626 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
627 for keys %tbl; 630 for keys %tbl;
628} 631}
629 632
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; 633my $METASERVER_ATIME;
641 634
642sub update_metaserver { 635sub update_metaserver {
643 my ($HOST) = @_;
644
645 return if $METASERVER_ATIME > time; 636 return if $METASERVER_ATIME > time;
646 $METASERVER_ATIME = time + 60; 637 $METASERVER_ATIME = time + 60;
647 638
648 my $table = $METASERVER->{table}; 639 my $table = $METASERVER->{table};
649 $table->clear; 640 $table->clear;
… …
701 692
702 $y++; 693 $y++;
703 694
704 $table->add (0, $y, new CFClient::UI::VBox children => [ 695 $table->add (0, $y, new CFClient::UI::VBox children => [
705 (new CFClient::UI::Button text => "Use", on_activate => sub { 696 (new CFClient::UI::Button text => "Use", on_activate => sub {
706 $HOST->set_text ($CFG->{host} = $host); 697 $HOST_ENTRY->set_text ($CFG->{host} = $host);
698 $METASERVER->toggle_visibility;
707 }), 699 }),
708 (new CFClient::UI::Empty expand => 1), 700 (new CFClient::UI::Empty expand => 1),
709 ]); 701 ]);
710 702
711 $table->add ($_ + 1, $y, new CFClient::UI::Label 703 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
714 } 706 }
715 } 707 }
716 }); 708 });
717} 709}
718 710
711sub metaserver_dialog {
712 my $dialog = new CFClient::UI::FancyFrame
713 title => "Server List",
714 name => 'metaserver_dialog',
715 x => 'center',
716 y => 'center',
717 z => 3,
718 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub {
720 update_metaserver if $_[1];
721 },
722 ;
723
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog
727}
728
719sub server_setup { 729sub 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), 730 my $vbox = new CFClient::UI::VBox;
726 ;
727 731
728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 732 $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"); 733 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730 734
731 { 735 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733 737
734 $vbox->add ( 738 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 739 $HOST_ENTRY = new CFClient::UI::Entry
736 expand => 1, 740 expand => 1,
737 text => $CFG->{host}, 741 text => $CFG->{host},
738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 742 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739 on_changed => sub { 743 on_changed => sub {
740 my ($self, $value) = @_; 744 my ($self, $value) = @_;
… …
742 } 746 }
743 ); 747 );
744 748
745 $METASERVER = metaserver_dialog; 749 $METASERVER = metaserver_dialog;
746 750
747 $vbox->add (new CFClient::UI::Flopper 751 $vbox->add (new CFClient::UI::Button
748 expand => 1, 752 expand => 1,
749 text => "Server List", 753 text => "Server List",
750 other => $METASERVER, 754 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 755 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 756 on_activate => sub { $METASERVER->toggle_visibility },
753 update_metaserver $HOST;
754 }
755 ); 757 );
756 } 758 }
757 759
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 761 $table->add (1, 4, new CFClient::UI::Entry
… …
826 $CONN ? stop_game 828 $CONN ? stop_game
827 : start_game; 829 : start_game;
828 }, 830 },
829 ); 831 );
830 832
831 $dialog 833 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
834 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
835 text => $CFG->{say_command},
836 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. "
837 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
838 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
839 on_changed => sub {
840 my ($self, $value) = @_;
841 $CFG->{say_command} = $value;
842 }
843 );
844
845 $vbox
832} 846}
833 847
834sub message_window { 848sub message_window {
835 my $window = new CFClient::UI::FancyFrame 849 my $window = new CFClient::UI::FancyFrame
836 name => "message_window", 850 name => "message_window",
… …
862 }, 876 },
863 on_activate => sub { 877 on_activate => sub {
864 my ($input, $text) = @_; 878 my ($input, $text) = @_;
865 $input->set_text (''); 879 $input->set_text ('');
866 880
867 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]);
869 } elsif ($text =~ /^\/(.*)/) { 881 if ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
871 } else { 883 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
874 } 886 }
… …
893sub open_quit_dialog { 905sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
896 x => "center", 908 x => "center",
897 y => "center", 909 y => "center",
910 z => 50,
898 title => "Really Quit?", 911 title => "Really Quit?",
899 ; 912 ;
900 913
901 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 914 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
902 915
… …
919 } 932 }
920 933
921 $QUIT_DIALOG->show; 934 $QUIT_DIALOG->show;
922} 935}
923 936
937sub autopickup_setup {
938 my $table = new CFClient::UI::Table;
939
940 for (
941 ["General", 0, 0,
942 ["Enable autopickup" => PICKUP_NEWMODE],
943 ["Inhibit autopickup" => PICKUP_INHIBIT],
944 ["Stop before pickup" => PICKUP_STOP],
945 ["Debug autopickup" => PICKUP_DEBUG],
946 ],
947 ["Weapons", 0, 6,
948 ["All weapons" => PICKUP_ALLWEAPON],
949 ["Missile weapons" => PICKUP_MISSILEWEAPON],
950 ["Bows" => PICKUP_BOW],
951 ["Arrows" => PICKUP_ARROW],
952 ],
953 ["Armour", 0, 12,
954 ["Helmets" => PICKUP_HELMET],
955 ["Shields" => PICKUP_SHIELD],
956 ["Body Armour" => PICKUP_ARMOUR],
957 ["Boots" => PICKUP_BOOTS],
958 ["Gloves" => PICKUP_GLOVES],
959 ["Cloaks" => PICKUP_CLOAK],
960 ],
961
962 ["Readables", 2, 2,
963 ["Spellbooks" => PICKUP_SPELLBOOK],
964 ["Skillscrolls" => PICKUP_SKILLSCROLL],
965 ["Normal Books/Scrolls" => PICKUP_READABLES],
966 ],
967 ["Misc", 2, 7,
968 ["Food" => PICKUP_FOOD],
969 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS],
977 ],
978 )
979 {
980 my ($title, $x, $y, @bits) = @$_;
981 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
982
983 for (@bits) {
984 ++$y;
985
986 my $mask = $_->[1];
987 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $table->add ($x+1, $y, 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 $table
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 );
1110 $SETUP_DIALOG->hide;
1111 $::BIND_EDITOR->show;
1112 },
1113 );
1114
1115 $hb->add (new CFClient::UI::Button
1116 text => "close",
1117 tooltip => "Closes the binding window",
1118 expand => 1,
1119 on_activate => sub {
1120 $SETUP_DIALOG->hide;
987 }; 1121 }
1122 );
988 1123
989 $BIND_WINDOW->add ($binding_list);
990 $refresh->(); 1124 $refresh->();
991 $BIND_WINDOW 1125
1126 $vb
992} 1127}
993 1128
994sub make_help_window { 1129sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame 1130 my $win = new CFClient::UI::FancyFrame
1131 x => 'center',
1132 y => 'center',
1133 z => 2,
1134 name => 'doc_browser',
996 def_w => int $WIDTH * 7/8, 1135 force_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8, 1136 force_h => int $HEIGHT * 7/8,
998 title => "Documentation"; 1137 title => "Documentation";
999 1138
1000 $win->add (my $vbox = new CFClient::UI::VBox); 1139 $win->add (my $vbox = new CFClient::UI::VBox);
1001 1140
1002 $vbox->add (my $buttons = new CFClient::UI::HBox); 1141 $vbox->add (my $buttons = new CFClient::UI::HBox);
1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1142 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1011 my ($pod, $label) = @$_; 1150 my ($pod, $label) = @$_;
1012 1151
1013 $buttons->add (new CFClient::UI::Button 1152 $buttons->add (new CFClient::UI::Button
1014 text => $label, 1153 text => $label,
1015 on_activate => sub { 1154 on_activate => sub {
1016 my $parser = new Pod::POM; 1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1017 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1018 1157
1019 $viewer->clear; 1158 $viewer->clear;
1020 1159
1021 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1022 for @{ CFClient::pod_to_pango_list $pom }; 1161 for @$pom;
1023 1162
1024 $viewer->set_offset (0); 1163 $viewer->set_offset (0);
1025 }, 1164 },
1026 ); 1165 );
1027 } 1166 }
… …
1070 padding => 0, 1209 padding => 0,
1071 z => 100, 1210 z => 100,
1072 force_x => "max", 1211 force_x => "max",
1073 force_y => 0; 1212 force_y => 0;
1074 $DEBUG_STATUS->show; 1213 $DEBUG_STATUS->show;
1075 1214
1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1216
1076 $STATUSBOX = new CFClient::UI::Statusbox; 1217 $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]); 1218 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1078 1219
1079 (new CFClient::UI::Frame 1220 (new CFClient::UI::Frame
1080 bg => [0, 0, 0, 0.4], 1221 bg => [0, 0, 0, 0.4],
1081 force_x => 0, 1222 force_x => 0,
1082 force_y => "max", 1223 force_y => "max",
1083 child => $STATUSBOX, 1224 child => $STATUSBOX,
1084 )->show; 1225 )->show;
1085 1226
1086 CFClient::UI::FancyFrame->new ( 1227 CFClient::UI::FancyFrame->new (
1228 title => "Map",
1229 name => "mapmap",
1087 x => 0, 1230 x => 0,
1088 y => $FONTSIZE + 8, 1231 y => $FONTSIZE + 8,
1089 border_bg => [1, 1, 1, 192/255], 1232 border_bg => [1, 1, 1, 192/255],
1090 bg => [1, 1, 1, 0], 1233 bg => [1, 1, 1, 0],
1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1234 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1116 can_hover => 1, 1259 can_hover => 1,
1117 can_events => 1, 1260 can_events => 1,
1118 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1261 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1119 ; 1262 ;
1120 1263
1264 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1265 title => "Setup",
1266 name => "setup_dialog",
1267 x => 'center',
1268 y => 'center',
1269 z => 2,
1270 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6,
1272 ;
1273
1274 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1276
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "Configure the server to play on, your username, password and other server-related options.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1281 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1282 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1283 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1284 "Configure the use of audio, sound effects and background music.");
1285 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1286 "Lets you define, edit and delete bindings."
1287 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1288 . "with nothing set and the recording started. After doing the actions you "
1289 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1290 . "After pressing the combo the binding will be saved automatically and the "
1291 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1294
1121 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1122 1296
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1297 $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."); 1298 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, 1299
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, 1300 $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."); 1301 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1129 1302
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 1303 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 1304
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1305 $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."); 1306 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, 1307 $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 :)."); 1308 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1136 1310
1137 $BUTTONBAR->add (new CFClient::UI::Button 1311 $BUTTONBAR->add (new CFClient::UI::Button
1138 text => "Save Config", 1312 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.", 1313 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 { 1314 on_activate => sub {
… …
1144 }, 1318 },
1145 ); 1319 );
1146 1320
1147 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1148 tooltip => "View Documentation"); 1322 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 1323
1158 $BUTTONBAR->add (new CFClient::UI::Button 1324 $BUTTONBAR->add (new CFClient::UI::Button
1159 text => "Quit", 1325 text => "Quit",
1160 tooltip => "Terminates the program", 1326 tooltip => "Terminates the program",
1161 on_activate => sub { 1327 on_activate => sub {
… …
1166 } 1332 }
1167 }, 1333 },
1168 ); 1334 );
1169 1335
1170 $BUTTONBAR->show; 1336 $BUTTONBAR->show;
1171 $SERVER_SETUP->show; 1337 $SETUP_DIALOG->show;
1338 }
1172 1339
1173 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1174 }
1175} 1341}
1176 1342
1177sub video_shutdown { 1343sub video_shutdown {
1178 undef $SDL_ACTIVE; 1344 undef $SDL_ACTIVE;
1179} 1345}
… …
1311}; 1477};
1312 1478
1313 CFClient::SDL_GL_SwapBuffers; 1479 CFClient::SDL_GL_SwapBuffers;
1314} 1480}
1315 1481
1316my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1482my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1317 $NOW = time; 1483 $NOW = time;
1318 1484
1319 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1485 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1320 for CFClient::SDL_PollEvent; 1486 for CFClient::SDL_PollEvent;
1321 1487
… …
1388############################################################################# 1554#############################################################################
1389 1555
1390$SIG{INT} = $SIG{TERM} = sub { exit }; 1556$SIG{INT} = $SIG{TERM} = sub { exit };
1391 1557
1392{ 1558{
1393 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1559 local $SIG{__DIE__} = sub {
1560 return unless defined $^S && !$^S;
1561 Carp::confess $_[1];#d#TODO: remove when stable
1562 CFClient::fatal $_[0];
1563 };
1394 1564
1395 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1396 CFClient::UI::set_layout ($::CFG->{layout}); 1566 CFClient::UI::set_layout ($::CFG->{layout});
1397 1567
1398 my %DEF_CFG = ( 1568 my %DEF_CFG = (
… …
1489=head1 USAGE 1659=head1 USAGE
1490 1660
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1661cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 1662fullscreen and interactively.
1493 1663
1664=head1 DEBUGGING
1665
1666
1667CFPLUS_DEBUG - environment variable
1668
1669 1 draw borders around widgets
1670 2 add low-level widget info to tooltips
1671 4 show fps
1672 8 suppress tooltips
1673
1494=head1 AUTHOR 1674=head1 AUTHOR
1495 1675
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1676Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 1677
1498 1678

Diff Legend

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