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.46 by elmex, Fri Jun 2 18:46:16 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
… …
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $HOST_ENTRY; 88our $HOST_ENTRY;
87our $SERVER_SETUP; 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
88 95
89our $FLOORBOX; 96our $FLOORBOX;
90our $GAUGES; 97our $GAUGES;
91our $STATWIDS; 98our $STATWIDS;
92 99
… …
104our $INV_WINDOW; 111our $INV_WINDOW;
105our $INV; 112our $INV;
106our $INVR; 113our $INVR;
107our $INV_RIGHT_HB; 114our $INV_RIGHT_HB;
108 115
109our $BIND_WINDOW;
110our $BIND_EDITOR; 116our $BIND_EDITOR;
111 117
112our $SPELL_LIST;
113our $PICKUP_CFG; 118our $PICKUP_CFG;
114 119
115sub status { 120sub status {
116 $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]);
117} 122}
… …
122 127
123sub start_game { 128sub start_game {
124 status "logging in..."; 129 status "logging in...";
125 130
126 $LOGIN_BUTTON->set_text ("Logout"); 131 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 132 $SETUP_DIALOG->hide;
128 133
129 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;
130 135
131 my ($host, $port) = split /:/, $CFG->{host}; 136 my ($host, $port) = split /:/, $CFG->{host};
132 137
… …
170 } 175 }
171} 176}
172 177
173sub stop_game { 178sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 179 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 182 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178 183
179 return unless $CONN; 184 return unless $CONN;
180 185
181 status "connection closed"; 186 status "connection closed";
182 187
183 $CONN->destroy; 188 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 189 $CONN = 0; # false, does not autovivify
185} 190}
186 191
187sub client_setup { 192sub graphics_setup {
188 my $dialog = new CFClient::UI::FancyFrame
189 x => 1,
190 y => $HEIGHT * (1/8),
191 name => "client_setup",
192 title => "Client Setup",
193 child => (my $vbox = new CFClient::UI::VBox); 193 my $vbox = new CFClient::UI::VBox;
194 194
195 $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]);
196 196
197 $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");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 322 on_activate => sub {
323 video_shutdown (); 323 video_shutdown ();
324 video_init (); 324 video_init ();
325 } 325 }
326 ); 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;
327 337
328 $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");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 339 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 340 state => $CFG->{audio_enable},
331 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.",
… …
362 audio_shutdown (); 372 audio_shutdown ();
363 audio_init (); 373 audio_init ();
364 } 374 }
365 ); 375 );
366 376
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 377 $vbox
368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
369 text => $CFG->{say_command},
370 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. "
371 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
373 on_changed => sub {
374 my ($self, $value) = @_;
375 $CFG->{say_command} = $value;
376 }
377 );
378
379 $dialog
380} 378}
381 379
382sub set_stats_window_fontsize { 380sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 381 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 382 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
557 update_stats_window ({}); 555 update_stats_window ({});
558 556
559 $tgw 557 $tgw
560} 558}
561 559
562sub formsep { 560sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 561 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 562}
565 563
566sub update_stats_window { 564sub update_stats_window {
567 my ($stats) = @_; 565 my ($stats) = @_;
568 566
… …
714 my $dialog = new CFClient::UI::FancyFrame 712 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 713 title => "Server List",
716 name => 'metaserver_dialog', 714 name => 'metaserver_dialog',
717 x => 'center', 715 x => 'center',
718 y => 'center', 716 y => 'center',
717 z => 3,
719 child => (my $vbox = new CFClient::UI::VBox), 718 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub { 719 on_visibility_change => sub {
721 update_metaserver if $_[1]; 720 update_metaserver if $_[1];
722 }, 721 },
723 ; 722 ;
… …
726 725
727 $dialog 726 $dialog
728} 727}
729 728
730sub server_setup { 729sub server_setup {
731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
735 title => "Server Setup",
736 child => (my $vbox = new CFClient::UI::VBox), 730 my $vbox = new CFClient::UI::VBox;
737 ;
738 731
739 $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]);
740 $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");
741 734
742 { 735 {
… …
835 $CONN ? stop_game 828 $CONN ? stop_game
836 : start_game; 829 : start_game;
837 }, 830 },
838 ); 831 );
839 832
840 $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
841} 846}
842 847
843sub message_window { 848sub message_window {
844 my $window = new CFClient::UI::FancyFrame 849 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 850 name => "message_window",
… …
900sub open_quit_dialog { 905sub open_quit_dialog {
901 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
902 $QUIT_DIALOG = new CFClient::UI::FancyFrame 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center", 908 x => "center",
904 y => "center", 909 y => "center",
910 z => 50,
905 title => "Really Quit?", 911 title => "Really Quit?",
906 ; 912 ;
907 913
908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 914 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
909 915
… …
926 } 932 }
927 933
928 $QUIT_DIALOG->show; 934 $QUIT_DIALOG->show;
929} 935}
930 936
931sub make_pickup_cfg_window { 937sub autopickup_setup {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame 938 my $table = new CFClient::UI::Table;
933 title => "Autopickup configuration",
934 x => "center",
935 y => "center",
936 force_w => $WIDTH * 6/10,
937 force_h => $HEIGHT * 9/10;
938
939
940 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
941 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
942 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
943 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
944 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
945
946 my $tbl = 0;
947 my $tblrow = 0;
948 939
949 for ( 940 for (
950 ["General", $gen_tbl], 941 ["General", 0, 0,
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 942 ["Enable autopickup" => PICKUP_NEWMODE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 943 ["Inhibit autopickup" => PICKUP_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 944 ["Stop before pickup" => PICKUP_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 945 ["Debug autopickup" => PICKUP_DEBUG],
946 ],
955 ["Weapons", $ltbl], 947 ["Weapons", 0, 6,
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 948 ["All weapons" => PICKUP_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 949 ["Missile weapons" => PICKUP_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW], 950 ["Bows" => PICKUP_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW], 951 ["Arrows" => PICKUP_ARROW],
952 ],
960 ["Armour"], 953 ["Armour", 0, 12,
961 ["Helmets" => CFClient::Pickup::PU_HELMET], 954 ["Helmets" => PICKUP_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD], 955 ["Shields" => PICKUP_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 956 ["Body Armour" => PICKUP_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS], 957 ["Boots" => PICKUP_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES], 958 ["Gloves" => PICKUP_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 959 ["Cloaks" => PICKUP_CLOAK],
960 ],
961
967 ["Readables", $rtbl], 962 ["Readables", 2, 2,
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 963 ["Spellbooks" => PICKUP_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 964 ["Skillscrolls" => PICKUP_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 965 ["Normal Books/Scrolls" => PICKUP_READABLES],
966 ],
971 ["Misc"], 967 ["Misc", 2, 7,
972 ["Food" => CFClient::Pickup::PU_FOOD], 968 ["Food" => PICKUP_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK], 969 ["Drinks" => PICKUP_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 970 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY], 971 ["Keys" => PICKUP_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 972 ["Magical Items" => PICKUP_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION], 973 ["Potions" => PICKUP_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 974 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 975 ["Ignore cursed" => PICKUP_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 976 ["Jewelery" => PICKUP_JEWELS],
977 ],
981 ) 978 )
982 { 979 {
983 if (ref $_->[1]) { 980 my ($title, $x, $y, @bits) = @$_;
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 981 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
987 } elsif (not defined $_->[1]) { 982
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 983 for (@bits) {
989 } else { 984 ++$y;
985
990 my $mask = $_->[1]; 986 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 987 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 988 $table->add ($x+1, $y, new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask, 989 state => $CFG->{pickup} & $mask,
994 on_changed => sub { 990 on_changed => sub {
995 my ($box, $value) = @_; 991 my ($box, $value) = @_;
996 if ($value) { 992 if ($value) {
997 $::CFG->{pickup} |= $mask; 993 $::CFG->{pickup} |= $mask;
… …
1002 if defined $::CONN; 998 if defined $::CONN;
1003 }); 999 });
1004 } 1000 }
1005 } 1001 }
1006 1002
1007 $PICKUP_CFG 1003 $table
1008} 1004}
1009 1005
1010sub make_inventory_window { 1006sub make_inventory_window {
1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1012 x => "center", 1008 x => "center",
… …
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033 1029
1034 $invwin 1030 $invwin
1035} 1031}
1036 1032
1037sub make_spell_list { 1033sub spell_setup {
1038 $SPELL_LIST = new CFClient::UI::SpellList 1034 new CFClient::UI::SpellList
1039 force_w => $WIDTH * (9/10),
1040 force_h => $HEIGHT * (9/10);
1041 $SPELL_LIST
1042} 1035}
1043 1036
1044sub make_binding_window { 1037sub keyboard_setup {
1045 my $binding_list = new CFClient::UI::VBox; 1038 my $binding_list = new CFClient::UI::VBox;
1046 1039
1047 my $refresh; 1040 my $refresh;
1048 $refresh = sub { 1041 $refresh = sub {
1049 $binding_list->clear (); 1042 $binding_list->clear ();
… …
1073 sub { 1066 sub {
1074 my ($nmod, $nsym, $ncmds) = @_; 1067 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym}; 1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1077 $refresh->(); 1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1078 $::BIND_WINDOW->show; 1072 $SETUP_DIALOG->show;
1079 }, 1073 },
1080 sub { 1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1081 $::BIND_WINDOW->show; 1076 $SETUP_DIALOG->show;
1082 }); 1077 });
1083 $::BIND_EDITOR->show; 1078 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide; 1079 $SETUP_DIALOG->hide;
1085 }); 1080 });
1086 1081
1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1089 } 1084 }
1090 } 1085 }
1091 }; 1086 };
1092 1087
1093 $BIND_WINDOW = new CFClient::UI::FancyFrame
1094 title => "Bindings",
1095 x => "center",
1096 y => "center",
1097 def_w => int $WIDTH * 9/10,
1098 def_h => int $HEIGHT * 9/10,
1099 on_visibility_change => sub {
1100 my ($self, $visible) = @_;
1101 $refresh->() if $visible;
1102 };
1103
1104 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1088 my $vb = new CFClient::UI::VBox;
1105 $vb->add ($binding_list); 1089 $vb->add ($binding_list);
1106 $vb->add (my $hb = new CFClient::UI::HBox); 1090 $vb->add (my $hb = new CFClient::UI::HBox);
1091
1107 $hb->add (new CFClient::UI::Button 1092 $hb->add (new CFClient::UI::Button
1108 text => "record new", 1093 text => "record new",
1109 expand => 1, 1094 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.", 1095 tooltip => "This button opens the binding editor with an empty binding.",
1111 on_activate => sub { 1096 on_activate => sub {
1112 $::BIND_EDITOR->set_binding (undef, undef, [], 1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1113 sub { 1098 sub {
1114 my ($mod, $sym, $cmds) = @_; 1099 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1116 $refresh->(); 1101 $refresh->();
1117 $::BIND_WINDOW->show; 1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
1118 }, 1104 },
1119 sub { 1105 sub {
1120 $::BIND_WINDOW->show; 1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1121 }); 1108 },
1122 $::BIND_WINDOW->hide; 1109 );
1110 $SETUP_DIALOG->hide;
1123 $::BIND_EDITOR->show; 1111 $::BIND_EDITOR->show;
1124 }, 1112 },
1125 ); 1113 );
1114
1126 $hb->add (new CFClient::UI::Button 1115 $hb->add (new CFClient::UI::Button
1127 text => "close", 1116 text => "close",
1128 tooltip => "Closes the binding window", 1117 tooltip => "Closes the binding window",
1129 expand => 1, 1118 expand => 1,
1130 on_activate => sub { 1119 on_activate => sub {
1131 $::BIND_WINDOW->hide; 1120 $SETUP_DIALOG->hide;
1132 } 1121 }
1133 ); 1122 );
1134 1123
1135 $refresh->(); 1124 $refresh->();
1136 $BIND_WINDOW 1125
1126 $vb
1137} 1127}
1138 1128
1139sub make_help_window { 1129sub make_help_window {
1140 my $win = new CFClient::UI::FancyFrame 1130 my $win = new CFClient::UI::FancyFrame
1141 x => 'center', 1131 x => 'center',
1142 y => 'center', 1132 y => 'center',
1133 z => 2,
1143 name => 'doc_browser', 1134 name => 'doc_browser',
1144 force_w => int $WIDTH * 7/8, 1135 force_w => int $WIDTH * 7/8,
1145 force_h => int $HEIGHT * 7/8, 1136 force_h => int $HEIGHT * 7/8,
1146 title => "Documentation"; 1137 title => "Documentation";
1147 1138
… …
1159 my ($pod, $label) = @$_; 1150 my ($pod, $label) = @$_;
1160 1151
1161 $buttons->add (new CFClient::UI::Button 1152 $buttons->add (new CFClient::UI::Button
1162 text => $label, 1153 text => $label,
1163 on_activate => sub { 1154 on_activate => sub {
1164 my $parser = new Pod::POM; 1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1165 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1166 1157
1167 $viewer->clear; 1158 $viewer->clear;
1168 1159
1169 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1170 for @{ CFClient::pod_to_pango_list $pom }; 1161 for @$pom;
1171 1162
1172 $viewer->set_offset (0); 1163 $viewer->set_offset (0);
1173 }, 1164 },
1174 ); 1165 );
1175 } 1166 }
… …
1222 $DEBUG_STATUS->show; 1213 $DEBUG_STATUS->show;
1223 1214
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1225 1216
1226 $STATUSBOX = new CFClient::UI::Statusbox; 1217 $STATUSBOX = new CFClient::UI::Statusbox;
1227 $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]);
1228 1219
1229 (new CFClient::UI::Frame 1220 (new CFClient::UI::Frame
1230 bg => [0, 0, 0, 0.4], 1221 bg => [0, 0, 0, 0.4],
1231 force_x => 0, 1222 force_x => 0,
1232 force_y => "max", 1223 force_y => "max",
1233 child => $STATUSBOX, 1224 child => $STATUSBOX,
1234 )->show; 1225 )->show;
1235 1226
1236 CFClient::UI::FancyFrame->new ( 1227 CFClient::UI::FancyFrame->new (
1237 title => "Mini Map", 1228 title => "Map",
1238 name => "mapmap", 1229 name => "mapmap",
1239 x => 0, 1230 x => 0,
1240 y => $FONTSIZE + 8, 1231 y => $FONTSIZE + 8,
1241 border_bg => [1, 1, 1, 192/255], 1232 border_bg => [1, 1, 1, 192/255],
1242 bg => [1, 1, 1, 0], 1233 bg => [1, 1, 1, 0],
… …
1268 can_hover => 1, 1259 can_hover => 1,
1269 can_events => 1, 1260 can_events => 1,
1270 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.",
1271 ; 1262 ;
1272 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
1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1274 1296
1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1276 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.");
1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1299
1278 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1279 $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,
1280 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.");
1281 1302
1282 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
1283 1304
1284 $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,
1285 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.");
1286 $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,
1287 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 :). "
1288 ."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.");
1289 1310
1290 $BUTTONBAR->add (new CFClient::UI::Button 1311 $BUTTONBAR->add (new CFClient::UI::Button
1291 text => "Save Config", 1312 text => "Save Config",
1292 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.",
1293 on_activate => sub { 1314 on_activate => sub {
… …
1297 }, 1318 },
1298 ); 1319 );
1299 1320
1300 $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,
1301 tooltip => "View Documentation"); 1322 tooltip => "View Documentation");
1302
1303 $BUTTONBAR->add (new CFClient::UI::Flopper
1304 text => "Bindings",
1305 other => make_binding_window,
1306 tooltip =>
1307 "Lets you define, edit and delete bindings."
1308 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1309 ."with nothing set and the recording started. After doing the actions you "
1310 ."want to record press Insert and you will be asked to press a key-combo."
1311 ."After pressing the combo the binding will be saved automatically and the "
1312 ."binding editor closes");
1313
1314 $BUTTONBAR->add (new CFClient::UI::Flopper
1315 text => "Spells",
1316 other => make_spell_list,
1317 tooltip => "The spell list");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Pickup",
1321 other => make_pickup_cfg_window,
1322 tooltip => "The pickup dialog");
1323
1324 1323
1325 $BUTTONBAR->add (new CFClient::UI::Button 1324 $BUTTONBAR->add (new CFClient::UI::Button
1326 text => "Quit", 1325 text => "Quit",
1327 tooltip => "Terminates the program", 1326 tooltip => "Terminates the program",
1328 on_activate => sub { 1327 on_activate => sub {
… …
1333 } 1332 }
1334 }, 1333 },
1335 ); 1334 );
1336 1335
1337 $BUTTONBAR->show; 1336 $BUTTONBAR->show;
1338 $SERVER_SETUP->show; 1337 $SETUP_DIALOG->show;
1338 }
1339 1339
1340 $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]);
1341 }
1342} 1341}
1343 1342
1344sub video_shutdown { 1343sub video_shutdown {
1345 undef $SDL_ACTIVE; 1344 undef $SDL_ACTIVE;
1346} 1345}
… …
1478}; 1477};
1479 1478
1480 CFClient::SDL_GL_SwapBuffers; 1479 CFClient::SDL_GL_SwapBuffers;
1481} 1480}
1482 1481
1483my $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 {
1484 $NOW = time; 1483 $NOW = time;
1485 1484
1486 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1485 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1487 for CFClient::SDL_PollEvent; 1486 for CFClient::SDL_PollEvent;
1488 1487
… …
1555############################################################################# 1554#############################################################################
1556 1555
1557$SIG{INT} = $SIG{TERM} = sub { exit }; 1556$SIG{INT} = $SIG{TERM} = sub { exit };
1558 1557
1559{ 1558{
1560 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 };
1561 1564
1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1563 CFClient::UI::set_layout ($::CFG->{layout}); 1566 CFClient::UI::set_layout ($::CFG->{layout});
1564 1567
1565 my %DEF_CFG = ( 1568 my %DEF_CFG = (

Diff Legend

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