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.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;
109our $BIND_EDITOR; 116our $BIND_EDITOR;
110 117
111our $SPELL_LIST; 118our $PICKUP_CFG;
112 119
113sub status { 120sub status {
114 $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]);
115} 122}
116 123
… …
120 127
121sub start_game { 128sub start_game {
122 status "logging in..."; 129 status "logging in...";
123 130
124 $LOGIN_BUTTON->set_text ("Logout"); 131 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide; 132 $SETUP_DIALOG->hide;
126 133
127 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;
128 135
129 my ($host, $port) = split /:/, $CFG->{host}; 136 my ($host, $port) = split /:/, $CFG->{host};
130 137
… …
168 } 175 }
169} 176}
170 177
171sub stop_game { 178sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login"); 179 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show; 180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show;
174 $INV_WINDOW->hide; 182 $INV_WINDOW->hide;
175 $LOGVIEW->hide;
176 183
177 return unless $CONN; 184 return unless $CONN;
178 185
179 status "connection closed"; 186 status "connection closed";
180 187
181 $CONN->destroy; 188 $CONN->destroy;
182 $CONN = 0; # false, does not autovivify 189 $CONN = 0; # false, does not autovivify
183} 190}
184 191
185sub client_setup { 192sub 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); 193 my $vbox = new CFClient::UI::VBox;
192 194
193 $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]);
194 196
195 $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");
196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
320 on_activate => sub { 322 on_activate => sub {
321 video_shutdown (); 323 video_shutdown ();
322 video_init (); 324 video_init ();
323 } 325 }
324 ); 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;
325 337
326 $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");
327 $table->add (1, $row++, new CFClient::UI::CheckBox 339 $table->add (1, $row++, new CFClient::UI::CheckBox
328 state => $CFG->{audio_enable}, 340 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.", 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.",
… …
360 audio_shutdown (); 372 audio_shutdown ();
361 audio_init (); 373 audio_init ();
362 } 374 }
363 ); 375 );
364 376
365 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 377 $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} 378}
379 379
380sub set_stats_window_fontsize { 380sub set_stats_window_fontsize {
381 for (values %{$STATWIDS}) { 381 for (values %{$STATWIDS}) {
382 $_->set_fontsize ($::CFG->{stat_fontsize}); 382 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
555 update_stats_window ({}); 555 update_stats_window ({});
556 556
557 $tgw 557 $tgw
558} 558}
559 559
560sub formsep { 560sub formsep($) {
561 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 561 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
562} 562}
563 563
564sub update_stats_window { 564sub update_stats_window {
565 my ($stats) = @_; 565 my ($stats) = @_;
566 566
… …
628 628
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 630 for keys %tbl;
631} 631}
632 632
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; 633my $METASERVER_ATIME;
644 634
645sub update_metaserver { 635sub update_metaserver {
646 my ($HOST) = @_;
647
648 return if $METASERVER_ATIME > time; 636 return if $METASERVER_ATIME > time;
649 $METASERVER_ATIME = time + 60; 637 $METASERVER_ATIME = time + 60;
650 638
651 my $table = $METASERVER->{table}; 639 my $table = $METASERVER->{table};
652 $table->clear; 640 $table->clear;
… …
704 692
705 $y++; 693 $y++;
706 694
707 $table->add (0, $y, new CFClient::UI::VBox children => [ 695 $table->add (0, $y, new CFClient::UI::VBox children => [
708 (new CFClient::UI::Button text => "Use", on_activate => sub { 696 (new CFClient::UI::Button text => "Use", on_activate => sub {
709 $HOST->set_text ($CFG->{host} = $host); 697 $HOST_ENTRY->set_text ($CFG->{host} = $host);
698 $METASERVER->toggle_visibility;
710 }), 699 }),
711 (new CFClient::UI::Empty expand => 1), 700 (new CFClient::UI::Empty expand => 1),
712 ]); 701 ]);
713 702
714 $table->add ($_ + 1, $y, new CFClient::UI::Label 703 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
717 } 706 }
718 } 707 }
719 }); 708 });
720} 709}
721 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
722sub server_setup { 729sub 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), 730 my $vbox = new CFClient::UI::VBox;
729 ;
730 731
731 $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]);
732 $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");
733 734
734 { 735 {
735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
736 737
737 $vbox->add ( 738 $vbox->add (
738 my $HOST = new CFClient::UI::Entry 739 $HOST_ENTRY = new CFClient::UI::Entry
739 expand => 1, 740 expand => 1,
740 text => $CFG->{host}, 741 text => $CFG->{host},
741 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",
742 on_changed => sub { 743 on_changed => sub {
743 my ($self, $value) = @_; 744 my ($self, $value) = @_;
… …
745 } 746 }
746 ); 747 );
747 748
748 $METASERVER = metaserver_dialog; 749 $METASERVER = metaserver_dialog;
749 750
750 $vbox->add (new CFClient::UI::Flopper 751 $vbox->add (new CFClient::UI::Button
751 expand => 1, 752 expand => 1,
752 text => "Server List", 753 text => "Server List",
753 other => $METASERVER, 754 other => $METASERVER,
754 tooltip => "Show a list of available crossfire servers", 755 tooltip => "Show a list of available crossfire servers",
755 on_open => sub { 756 on_activate => sub { $METASERVER->toggle_visibility },
756 update_metaserver $HOST;
757 }
758 ); 757 );
759 } 758 }
760 759
761 $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");
762 $table->add (1, 4, new CFClient::UI::Entry 761 $table->add (1, 4, new CFClient::UI::Entry
… …
829 $CONN ? stop_game 828 $CONN ? stop_game
830 : start_game; 829 : start_game;
831 }, 830 },
832 ); 831 );
833 832
834 $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
835} 846}
836 847
837sub message_window { 848sub message_window {
838 my $window = new CFClient::UI::FancyFrame 849 my $window = new CFClient::UI::FancyFrame
839 name => "message_window", 850 name => "message_window",
… …
865 }, 876 },
866 on_activate => sub { 877 on_activate => sub {
867 my ($input, $text) = @_; 878 my ($input, $text) = @_;
868 $input->set_text (''); 879 $input->set_text ('');
869 880
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 =~ /^\/(.*)/) { 881 if ($text =~ /^\/(.*)/) {
876 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
877 } else { 883 } else {
878 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
879 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
880 } 886 }
… …
899sub open_quit_dialog { 905sub open_quit_dialog {
900 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
901 $QUIT_DIALOG = new CFClient::UI::FancyFrame 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
902 x => "center", 908 x => "center",
903 y => "center", 909 y => "center",
910 z => 50,
904 title => "Really Quit?", 911 title => "Really Quit?",
905 ; 912 ;
906 913
907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 914 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
908 915
… …
925 } 932 }
926 933
927 $QUIT_DIALOG->show; 934 $QUIT_DIALOG->show;
928} 935}
929 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
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 );
1110 $SETUP_DIALOG->hide;
1043 $::BIND_EDITOR->show; 1111 $::BIND_EDITOR->show;
1044 }, 1112 },
1045 ); 1113 );
1114
1046 $hb->add (new CFClient::UI::Button 1115 $hb->add (new CFClient::UI::Button
1047 text => "close", 1116 text => "close",
1048 tooltip => "Closes the binding window", 1117 tooltip => "Closes the binding window",
1049 expand => 1, 1118 expand => 1,
1050 on_activate => sub { 1119 on_activate => sub {
1051 $::BIND_WINDOW->hide; 1120 $SETUP_DIALOG->hide;
1052 } 1121 }
1053 ); 1122 );
1054 1123
1055 $refresh->(); 1124 $refresh->();
1056 $BIND_WINDOW 1125
1126 $vb
1057} 1127}
1058 1128
1059sub make_help_window { 1129sub make_help_window {
1060 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',
1061 def_w => int $WIDTH * 7/8, 1135 force_w => int $WIDTH * 7/8,
1062 def_h => int $HEIGHT * 7/8, 1136 force_h => int $HEIGHT * 7/8,
1063 title => "Documentation"; 1137 title => "Documentation";
1064 1138
1065 $win->add (my $vbox = new CFClient::UI::VBox); 1139 $win->add (my $vbox = new CFClient::UI::VBox);
1066 1140
1067 $vbox->add (my $buttons = new CFClient::UI::HBox); 1141 $vbox->add (my $buttons = new CFClient::UI::HBox);
1068 $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);
… …
1076 my ($pod, $label) = @$_; 1150 my ($pod, $label) = @$_;
1077 1151
1078 $buttons->add (new CFClient::UI::Button 1152 $buttons->add (new CFClient::UI::Button
1079 text => $label, 1153 text => $label,
1080 on_activate => sub { 1154 on_activate => sub {
1081 my $parser = new Pod::POM; 1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1082 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1083 1157
1084 $viewer->clear; 1158 $viewer->clear;
1085 1159
1086 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1087 for @{ CFClient::pod_to_pango_list $pom }; 1161 for @$pom;
1088 1162
1089 $viewer->set_offset (0); 1163 $viewer->set_offset (0);
1090 }, 1164 },
1091 ); 1165 );
1092 } 1166 }
… …
1139 $DEBUG_STATUS->show; 1213 $DEBUG_STATUS->show;
1140 1214
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1142 1216
1143 $STATUSBOX = new CFClient::UI::Statusbox; 1217 $STATUSBOX = new CFClient::UI::Statusbox;
1144 $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]);
1145 1219
1146 (new CFClient::UI::Frame 1220 (new CFClient::UI::Frame
1147 bg => [0, 0, 0, 0.4], 1221 bg => [0, 0, 0, 0.4],
1148 force_x => 0, 1222 force_x => 0,
1149 force_y => "max", 1223 force_y => "max",
1150 child => $STATUSBOX, 1224 child => $STATUSBOX,
1151 )->show; 1225 )->show;
1152 1226
1153 CFClient::UI::FancyFrame->new ( 1227 CFClient::UI::FancyFrame->new (
1228 title => "Map",
1229 name => "mapmap",
1154 x => 0, 1230 x => 0,
1155 y => $FONTSIZE + 8, 1231 y => $FONTSIZE + 8,
1156 border_bg => [1, 1, 1, 192/255], 1232 border_bg => [1, 1, 1, 192/255],
1157 bg => [1, 1, 1, 0], 1233 bg => [1, 1, 1, 0],
1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1234 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1183 can_hover => 1, 1259 can_hover => 1,
1184 can_events => 1, 1260 can_events => 1,
1185 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.",
1186 ; 1262 ;
1187 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
1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1189 1296
1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1297 $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."); 1298 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, 1299
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, 1300 $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."); 1301 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1196 1302
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 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
1198 1304
1199 $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,
1200 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.");
1201 $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,
1202 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 :). "
1203 ."You can also hit the Tab-key to show/hide the Inventory."); 1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1204 1310
1205 $BUTTONBAR->add (new CFClient::UI::Button 1311 $BUTTONBAR->add (new CFClient::UI::Button
1206 text => "Save Config", 1312 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.", 1313 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 { 1314 on_activate => sub {
… …
1212 }, 1318 },
1213 ); 1319 );
1214 1320
1215 $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,
1216 tooltip => "View Documentation"); 1322 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 1323
1234 $BUTTONBAR->add (new CFClient::UI::Button 1324 $BUTTONBAR->add (new CFClient::UI::Button
1235 text => "Quit", 1325 text => "Quit",
1236 tooltip => "Terminates the program", 1326 tooltip => "Terminates the program",
1237 on_activate => sub { 1327 on_activate => sub {
… …
1242 } 1332 }
1243 }, 1333 },
1244 ); 1334 );
1245 1335
1246 $BUTTONBAR->show; 1336 $BUTTONBAR->show;
1247 $SERVER_SETUP->show; 1337 $SETUP_DIALOG->show;
1338 }
1248 1339
1249 $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]);
1250 }
1251} 1341}
1252 1342
1253sub video_shutdown { 1343sub video_shutdown {
1254 undef $SDL_ACTIVE; 1344 undef $SDL_ACTIVE;
1255} 1345}
… …
1387}; 1477};
1388 1478
1389 CFClient::SDL_GL_SwapBuffers; 1479 CFClient::SDL_GL_SwapBuffers;
1390} 1480}
1391 1481
1392my $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 {
1393 $NOW = time; 1483 $NOW = time;
1394 1484
1395 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1485 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1396 for CFClient::SDL_PollEvent; 1486 for CFClient::SDL_PollEvent;
1397 1487
… …
1464############################################################################# 1554#############################################################################
1465 1555
1466$SIG{INT} = $SIG{TERM} = sub { exit }; 1556$SIG{INT} = $SIG{TERM} = sub { exit };
1467 1557
1468{ 1558{
1469 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 };
1470 1564
1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout}); 1566 CFClient::UI::set_layout ($::CFG->{layout});
1473 1567
1474 my %DEF_CFG = ( 1568 my %DEF_CFG = (
… …
1565=head1 USAGE 1659=head1 USAGE
1566 1660
1567cfplus 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
1568fullscreen and interactively. 1662fullscreen and interactively.
1569 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
1570=head1 AUTHOR 1674=head1 AUTHOR
1571 1675
1572Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1676Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1573 1677
1574 1678

Diff Legend

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