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.47 by root, Fri Jun 2 21:36:12 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 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;
88 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
89our $FLOORBOX; 98our $FLOORBOX;
90our $GAUGES; 99our $GAUGES;
91our $STATWIDS; 100our $STATWIDS;
92 101
93our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
104our $INV_WINDOW; 113our $INV_WINDOW;
105our $INV; 114our $INV;
106our $INVR; 115our $INVR;
107our $INV_RIGHT_HB; 116our $INV_RIGHT_HB;
108 117
109our $BIND_WINDOW;
110our $BIND_EDITOR; 118our $BIND_EDITOR;
111 119
112our $SPELL_LIST;
113our $PICKUP_CFG; 120our $PICKUP_CFG;
114 121
115sub status { 122sub status {
116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
117} 124}
118 125
119sub debug { 126sub debug {
120 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
121} 128}
122 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
309}
310
123sub start_game { 311sub start_game {
124 status "logging in..."; 312 status "logging in...";
125 313
126 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
128 316
129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
130 318
131 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
132 320
… …
144 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW, 333 logview => $LOGVIEW,
146 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
147 map => $MAP, 335 map => $MAP,
148 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
149 338
150 sound_play => sub { 339 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
152 341
153 $SDL_MIXER 342 $SDL_MIXER
… …
170 } 359 }
171} 360}
172 361
173sub stop_game { 362sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178 367
179 return unless $CONN; 368 return unless $CONN;
180 369
181 status "connection closed"; 370 status "connection closed";
182 371
372 destroy_query_dialog $CONN;
183 $CONN->destroy; 373 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
185} 375}
186 376
187sub client_setup { 377sub 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); 378 my $vbox = new CFClient::UI::VBox;
194 379
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 381
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $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); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 507 on_activate => sub {
323 video_shutdown (); 508 video_shutdown ();
324 video_init (); 509 video_init ();
325 } 510 }
326 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
327 522
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 525 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.", 526 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 (); 557 audio_shutdown ();
363 audio_init (); 558 audio_init ();
364 } 559 }
365 ); 560 );
366 561
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $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} 563}
381 564
382sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
443 626
444 $win 627 $win
445} 628}
446 629
447 630
448sub make_stats_window { 631sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
451 x => "max", 634 x => "max",
452 title => "Stats", 635 title => "Stats",
453 name => "stats_window"; 636 name => "stats_window";
… …
557 update_stats_window ({}); 740 update_stats_window ({});
558 741
559 $tgw 742 $tgw
560} 743}
561 744
562sub formsep { 745sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 747}
565 748
566sub update_stats_window { 749sub update_stats_window {
567 my ($stats) = @_; 750 my ($stats) = @_;
568 751
… …
714 my $dialog = new CFClient::UI::FancyFrame 897 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 898 title => "Server List",
716 name => 'metaserver_dialog', 899 name => 'metaserver_dialog',
717 x => 'center', 900 x => 'center',
718 y => 'center', 901 y => 'center',
902 z => 3,
719 child => (my $vbox = new CFClient::UI::VBox), 903 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub { 904 on_visibility_change => sub {
721 update_metaserver if $_[1]; 905 update_metaserver if $_[1];
722 }, 906 },
723 ; 907 ;
… …
726 910
727 $dialog 911 $dialog
728} 912}
729 913
730sub server_setup { 914sub 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), 915 my $vbox = new CFClient::UI::VBox;
737 ;
738 916
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 917 $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"); 918 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 919
742 { 920 {
… …
835 $CONN ? stop_game 1013 $CONN ? stop_game
836 : start_game; 1014 : start_game;
837 }, 1015 },
838 ); 1016 );
839 1017
840 $dialog 1018 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1020 text => $CFG->{say_command},
1021 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. "
1022 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024 on_changed => sub {
1025 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value;
1027 }
1028 );
1029
1030 $vbox
841} 1031}
842 1032
843sub message_window { 1033sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1034 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1035 name => "message_window",
846 title => "Messages", 1036 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1037 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75], 1038 bg => [0, 0, 0, 0.75],
849 x => "max", 1039 x => "max",
850 y => 0, 1040 y => 0,
851 force_w => $::WIDTH / 3, 1041 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1042 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1043 child => (my $vbox = new CFClient::UI::VBox);
854 1044
855 $vbox->add ($LOGVIEW); 1045 $vbox->add ($LOGVIEW);
856 1046
857 $vbox->add (my $input = new CFClient::UI::Entry 1047 $vbox->add (my $input = new CFClient::UI::Entry
… …
900sub open_quit_dialog { 1090sub open_quit_dialog {
901 unless ($QUIT_DIALOG) { 1091 unless ($QUIT_DIALOG) {
902 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center", 1093 x => "center",
904 y => "center", 1094 y => "center",
1095 z => 50,
905 title => "Really Quit?", 1096 title => "Really Quit?",
906 ; 1097 ;
907 1098
908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
909 1100
… …
926 } 1117 }
927 1118
928 $QUIT_DIALOG->show; 1119 $QUIT_DIALOG->show;
929} 1120}
930 1121
931sub make_pickup_cfg_window { 1122sub autopickup_setup {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame 1123 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 1124
949 for ( 1125 for (
950 ["General", $gen_tbl], 1126 ["General", 0, 0,
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1127 ["Enable autopickup" => PICKUP_NEWMODE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1128 ["Inhibit autopickup" => PICKUP_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1129 ["Stop before pickup" => PICKUP_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1130 ["Debug autopickup" => PICKUP_DEBUG],
1131 ],
955 ["Weapons", $ltbl], 1132 ["Weapons", 0, 6,
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1133 ["All weapons" => PICKUP_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1134 ["Missile weapons" => PICKUP_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW], 1135 ["Bows" => PICKUP_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW], 1136 ["Arrows" => PICKUP_ARROW],
1137 ],
960 ["Armour"], 1138 ["Armour", 0, 12,
961 ["Helmets" => CFClient::Pickup::PU_HELMET], 1139 ["Helmets" => PICKUP_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD], 1140 ["Shields" => PICKUP_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1141 ["Body Armour" => PICKUP_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS], 1142 ["Boots" => PICKUP_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1143 ["Gloves" => PICKUP_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1144 ["Cloaks" => PICKUP_CLOAK],
1145 ],
1146
967 ["Readables", $rtbl], 1147 ["Readables", 2, 2,
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1148 ["Spellbooks" => PICKUP_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1149 ["Skillscrolls" => PICKUP_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1150 ["Normal Books/Scrolls" => PICKUP_READABLES],
1151 ],
971 ["Misc"], 1152 ["Misc", 2, 7,
972 ["Food" => CFClient::Pickup::PU_FOOD], 1153 ["Food" => PICKUP_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK], 1154 ["Drinks" => PICKUP_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY], 1156 ["Keys" => PICKUP_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1157 ["Magical Items" => PICKUP_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION], 1158 ["Potions" => PICKUP_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1160 ["Ignore cursed" => PICKUP_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1161 ["Jewelery" => PICKUP_JEWELS],
1162 ],
981 ) 1163 )
982 { 1164 {
983 if (ref $_->[1]) { 1165 my ($title, $x, $y, @bits) = @$_;
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
987 } elsif (not defined $_->[1]) { 1167
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1168 for (@bits) {
989 } else { 1169 ++$y;
1170
990 my $mask = $_->[1]; 1171 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask, 1174 state => $CFG->{pickup} & $mask,
994 on_changed => sub { 1175 on_changed => sub {
995 my ($box, $value) = @_; 1176 my ($box, $value) = @_;
996 if ($value) { 1177 if ($value) {
997 $::CFG->{pickup} |= $mask; 1178 $::CFG->{pickup} |= $mask;
… …
1002 if defined $::CONN; 1183 if defined $::CONN;
1003 }); 1184 });
1004 } 1185 }
1005 } 1186 }
1006 1187
1007 $PICKUP_CFG 1188 $table
1008} 1189}
1009 1190
1010sub make_inventory_window { 1191sub inventory_window {
1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1012 x => "center", 1193 x => "center",
1013 y => "center", 1194 y => "center",
1014 force_w => $WIDTH * 9/10, 1195 force_w => $WIDTH * 9/10,
1015 force_h => $HEIGHT * 9/10, 1196 force_h => $HEIGHT * 9/10,
… …
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033 1214
1034 $invwin 1215 $invwin
1035} 1216}
1036 1217
1037sub make_spell_list { 1218sub spell_setup {
1038 $SPELL_LIST = new CFClient::UI::SpellList 1219 new CFClient::UI::SpellList
1039 force_w => $WIDTH * (9/10),
1040 force_h => $HEIGHT * (9/10);
1041 $SPELL_LIST
1042} 1220}
1043 1221
1044sub make_binding_window { 1222sub keyboard_setup {
1045 my $binding_list = new CFClient::UI::VBox; 1223 my $binding_list = new CFClient::UI::VBox;
1046 1224
1047 my $refresh; 1225 my $refresh;
1048 $refresh = sub { 1226 $refresh = sub {
1049 $binding_list->clear (); 1227 $binding_list->clear ();
… …
1073 sub { 1251 sub {
1074 my ($nmod, $nsym, $ncmds) = @_; 1252 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym}; 1253 delete $::CFG->{bindings}->{$mod}->{$sym};
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1077 $refresh->(); 1255 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1078 $::BIND_WINDOW->show; 1257 $SETUP_DIALOG->show;
1079 }, 1258 },
1080 sub { 1259 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1081 $::BIND_WINDOW->show; 1261 $SETUP_DIALOG->show;
1082 }); 1262 });
1083 $::BIND_EDITOR->show; 1263 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide; 1264 $SETUP_DIALOG->hide;
1085 }); 1265 });
1086 1266
1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1089 } 1269 }
1090 } 1270 }
1091 }; 1271 };
1092 1272
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); 1273 my $vb = new CFClient::UI::VBox;
1105 $vb->add ($binding_list); 1274 $vb->add ($binding_list);
1106 $vb->add (my $hb = new CFClient::UI::HBox); 1275 $vb->add (my $hb = new CFClient::UI::HBox);
1276
1107 $hb->add (new CFClient::UI::Button 1277 $hb->add (new CFClient::UI::Button
1108 text => "record new", 1278 text => "record new",
1109 expand => 1, 1279 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.", 1280 tooltip => "This button opens the binding editor with an empty binding.",
1111 on_activate => sub { 1281 on_activate => sub {
1112 $::BIND_EDITOR->set_binding (undef, undef, [], 1282 $::BIND_EDITOR->set_binding (undef, undef, [],
1113 sub { 1283 sub {
1114 my ($mod, $sym, $cmds) = @_; 1284 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1116 $refresh->(); 1286 $refresh->();
1117 $::BIND_WINDOW->show; 1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show;
1118 }, 1289 },
1119 sub { 1290 sub {
1120 $::BIND_WINDOW->show; 1291 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1292 $SETUP_DIALOG->show;
1121 }); 1293 },
1122 $::BIND_WINDOW->hide; 1294 );
1295 $SETUP_DIALOG->hide;
1123 $::BIND_EDITOR->show; 1296 $::BIND_EDITOR->show;
1124 }, 1297 },
1125 ); 1298 );
1299
1126 $hb->add (new CFClient::UI::Button 1300 $hb->add (new CFClient::UI::Button
1127 text => "close", 1301 text => "close",
1128 tooltip => "Closes the binding window", 1302 tooltip => "Closes the binding window",
1129 expand => 1, 1303 expand => 1,
1130 on_activate => sub { 1304 on_activate => sub {
1131 $::BIND_WINDOW->hide; 1305 $SETUP_DIALOG->hide;
1132 } 1306 }
1133 ); 1307 );
1134 1308
1135 $refresh->(); 1309 $refresh->();
1136 $BIND_WINDOW 1310
1311 $vb
1137} 1312}
1138 1313
1139sub make_help_window { 1314sub make_help_window {
1140 my $win = new CFClient::UI::FancyFrame 1315 my $win = new CFClient::UI::FancyFrame
1141 x => 'center', 1316 x => 'center',
1142 y => 'center', 1317 y => 'center',
1318 z => 2,
1143 name => 'doc_browser', 1319 name => 'doc_browser',
1144 force_w => int $WIDTH * 7/8, 1320 force_w => int $WIDTH * 7/8,
1145 force_h => int $HEIGHT * 7/8, 1321 force_h => int $HEIGHT * 7/8,
1146 title => "Documentation"; 1322 title => "Documentation";
1147 1323
… …
1159 my ($pod, $label) = @$_; 1335 my ($pod, $label) = @$_;
1160 1336
1161 $buttons->add (new CFClient::UI::Button 1337 $buttons->add (new CFClient::UI::Button
1162 text => $label, 1338 text => $label,
1163 on_activate => sub { 1339 on_activate => sub {
1164 my $parser = new Pod::POM; 1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1165 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1166 1342
1167 $viewer->clear; 1343 $viewer->clear;
1168 1344
1169 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1170 for @{ CFClient::pod_to_pango_list $pom }; 1346 for @$pom;
1171 1347
1172 $viewer->set_offset (0); 1348 $viewer->set_offset (0);
1173 }, 1349 },
1174 ); 1350 );
1175 } 1351 }
… …
1222 $DEBUG_STATUS->show; 1398 $DEBUG_STATUS->show;
1223 1399
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1225 1401
1226 $STATUSBOX = new CFClient::UI::Statusbox; 1402 $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]); 1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1228 1404
1229 (new CFClient::UI::Frame 1405 (new CFClient::UI::Frame
1230 bg => [0, 0, 0, 0.4], 1406 bg => [0, 0, 0, 0.4],
1231 force_x => 0, 1407 force_x => 0,
1232 force_y => "max", 1408 force_y => "max",
… …
1268 can_hover => 1, 1444 can_hover => 1,
1269 can_events => 1, 1445 can_events => 1,
1270 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1446 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1271 ; 1447 ;
1272 1448
1449 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1450 title => "Setup",
1451 name => "setup_dialog",
1452 x => 'center',
1453 y => 'center',
1454 z => 2,
1455 force_w => $::WIDTH * 0.6,
1456 force_h => $::HEIGHT * 0.6,
1457 ;
1458
1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461
1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1463 "Configure the server to play on, your username, password and other server-related options.");
1464 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1465 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1469 "Configure the use of audio, sound effects and background music.");
1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471 "Lets you define, edit and delete bindings."
1472 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1473 . "with nothing set and the recording started. After doing the actions you "
1474 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475 . "After pressing the combo the binding will be saved automatically and the "
1476 . "binding editor closes");
1477 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1478 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1479
1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1274 1481
1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1482 $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."); 1483 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, 1484
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, 1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1280 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1281 1487
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 1488 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 1489
1284 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1285 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1491 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, 1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1287 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1493 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."); 1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1289 1495
1290 $BUTTONBAR->add (new CFClient::UI::Button 1496 $BUTTONBAR->add (new CFClient::UI::Button
1291 text => "Save Config", 1497 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.", 1498 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 { 1499 on_activate => sub {
… …
1297 }, 1503 },
1298 ); 1504 );
1299 1505
1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1506 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1301 tooltip => "View Documentation"); 1507 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 1508
1325 $BUTTONBAR->add (new CFClient::UI::Button 1509 $BUTTONBAR->add (new CFClient::UI::Button
1326 text => "Quit", 1510 text => "Quit",
1327 tooltip => "Terminates the program", 1511 tooltip => "Terminates the program",
1328 on_activate => sub { 1512 on_activate => sub {
… …
1333 } 1517 }
1334 }, 1518 },
1335 ); 1519 );
1336 1520
1337 $BUTTONBAR->show; 1521 $BUTTONBAR->show;
1338 $SERVER_SETUP->show; 1522 $SETUP_DIALOG->show;
1339
1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1341 } 1523 }
1524
1525 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1342} 1526}
1343 1527
1344sub video_shutdown { 1528sub video_shutdown {
1345 undef $SDL_ACTIVE; 1529 undef $SDL_ACTIVE;
1346} 1530}
… …
1478}; 1662};
1479 1663
1480 CFClient::SDL_GL_SwapBuffers; 1664 CFClient::SDL_GL_SwapBuffers;
1481} 1665}
1482 1666
1483my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1667my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1484 $NOW = time; 1668 $NOW = time;
1485 1669
1486 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1670 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1487 for CFClient::SDL_PollEvent; 1671 for CFClient::SDL_PollEvent;
1488 1672
… …
1555############################################################################# 1739#############################################################################
1556 1740
1557$SIG{INT} = $SIG{TERM} = sub { exit }; 1741$SIG{INT} = $SIG{TERM} = sub { exit };
1558 1742
1559{ 1743{
1560 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1744 local $SIG{__DIE__} = sub {
1745 return unless defined $^S && !$^S;
1746 Carp::confess $_[1];#d#TODO: remove when stable
1747 CFClient::fatal $_[0];
1748 };
1561 1749
1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1750 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1563 CFClient::UI::set_layout ($::CFG->{layout}); 1751 CFClient::UI::set_layout ($::CFG->{layout});
1564 1752
1565 my %DEF_CFG = ( 1753 my %DEF_CFG = (
… …
1571 map_scale => 1, 1759 map_scale => 1,
1572 fow_enable => 1, 1760 fow_enable => 1,
1573 fow_intensity => 0.45, 1761 fow_intensity => 0.45,
1574 fow_smooth => 0, 1762 fow_smooth => 0,
1575 gui_fontsize => 1, 1763 gui_fontsize => 1,
1576 log_fontsize => 1, 1764 log_fontsize => 0.7,
1577 gauge_fontsize=> 1, 1765 gauge_fontsize=> 1,
1578 gauge_size => 0.35, 1766 gauge_size => 0.35,
1579 stat_fontsize => 1, 1767 stat_fontsize => 0.7,
1580 mapsize => 100, 1768 mapsize => 100,
1581 host => "crossfire.schmorp.de", 1769 host => "crossfire.schmorp.de",
1582 say_command => 'say', 1770 say_command => 'say',
1583 audio_enable => 1, 1771 audio_enable => 1,
1584 bgm_enable => 1, 1772 bgm_enable => 1,

Diff Legend

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