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.39 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 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
… …
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 45
44$Event::DIED = sub { 46$Event::DIED = sub {
45 # TODO: display dialog box or so 47 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 49 CFClient::error $_[1];
47}; 50};
48 51
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 53
… …
81our $LOGVIEW; 84our $LOGVIEW;
82our $CONSOLE; 85our $CONSOLE;
83our $METASERVER; 86our $METASERVER;
84our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 88our $QUIT_DIALOG;
86our $SERVER_SETUP; 89our $HOST_ENTRY;
90our $SERVER_INFO;
87 91
92our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK;
94our $SETUP_SERVER;
95our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
88our $FLOORBOX; 100our $FLOORBOX;
89our $GAUGES; 101our $GAUGES;
90our $STATWIDS; 102our $STATWIDS;
91 103
92our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
98 110
99our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
100our $STATUSBOX; 112our $STATUSBOX;
101our $DEBUG_STATUS; 113our $DEBUG_STATUS;
102 114
103our $INV_WINDOW;
104our $INV; 115our $INV;
105our $INVR; 116our $INVR;
106our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
107 118
119our $PL_NOTEBOOK;
108our $BIND_WINDOW; 120our $PL_WINDOW;
121
109our $BIND_EDITOR; 122our $BIND_EDITOR;
123our $BIND_UPD_CB;
110 124
111our $SPELL_LIST; 125our $PICKUP_CFG;
112 126
113sub status { 127sub status {
114 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 128 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
115} 129}
116 130
117sub debug { 131sub debug {
118 $DEBUG_STATUS->set_text ($_[0]); 132 $DEBUG_STATUS->set_text ($_[0]);
119} 133}
120 134
135sub destroy_query_dialog {
136 (delete $_[0]{query_dialog})->destroy
137 if $_[0]{query_dialog};
138}
139
140# server query dialog
141sub server_query {
142 my ($conn, $flags, $prompt) = @_;
143
144 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
145 x => "center",
146 y => "center",
147 title => "Server Query",
148 child => my $vbox = new CFClient::UI::VBox,
149 ;
150
151 my @dialog = my $label = new CFClient::UI::Label
152 max_w => $::WIDTH * 0.4,
153 ellipsise => 0,
154 text => $prompt;
155
156 if ($flags & CS_QUERY_YESNO) {
157 push @dialog, my $hbox = new CFClient::UI::HBox;
158
159 $hbox->add (new CFClient::UI::Button
160 text => "No",
161 on_activate => sub {
162 $conn->send ("reply n");
163 $dialog->destroy;
164 0
165 }
166 );
167 $hbox->add (new CFClient::UI::Button
168 text => "Yes",
169 on_activate => sub {
170 $conn->send ("reply y");
171 destroy_query_dialog $conn;
172 0
173 },
174 );
175
176 $dialog->grab_focus;
177
178 } elsif ($flags & CS_QUERY_SINGLECHAR) {
179 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
180
181 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
182 $MESSAGE_WINDOW->show;
183
184 unshift @dialog, new CFClient::UI::Label
185 max_w => $::WIDTH * 0.4,
186 ellipsise => 0,
187 markup => "\nOr use your keyboard:\n";
188
189 unshift @dialog, my $table = new CFClient::UI::Table;
190
191 $table->add (0, 0, new CFClient::UI::Button
192 text => "Next Race",
193 on_activate => sub {
194 $conn->send ("reply n");
195 destroy_query_dialog $conn;
196 0
197 },
198 );
199 $table->add (2, 0, new CFClient::UI::Button
200 text => "Accept",
201 on_activate => sub {
202 $conn->send ("reply d");
203 destroy_query_dialog $conn;
204 0
205 },
206 );
207
208 unshift @dialog, new CFClient::UI::Label
209 max_w => $::WIDTH * 0.4,
210 ellipsise => 0,
211 markup =>
212 "<big><b>Character Creation: Race</b></big>\n\n"
213 . "Look at the <b>Messages</b> window to see a description of this race "
214 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
215 . "and the center of the screen to see how this race looks like "
216 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
217 . "You can look at another race, or accept this race (you will come back to this race eventually, "
218 . "so you can take your time making this important choice."
219 ;
220
221 } elsif ($prompt =~ /roll new stats/) {
222 if (my $stat = delete $conn->{stat_change_with}) {
223 $conn->send ("reply $stat");
224 destroy_query_dialog $conn;
225 return;
226 }
227
228 $STATS_WINDOW->show;
229 $MESSAGE_WINDOW->hide;
230
231 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4,
233 ellipsise => 0,
234 markup => "\nOr use your keyboard:\n";
235
236 unshift @dialog, my $table = new CFClient::UI::Table;
237
238 # left: re-roll
239 $table->add (0, 0, new CFClient::UI::Button
240 text => "Roll Again",
241 on_activate => sub {
242 $conn->send ("reply y");
243 destroy_query_dialog $conn;
244 0
245 },
246 );
247
248 # center: swap stats
249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
250 value => $_,
251 options => [
252 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
253 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
254 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
255 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
256 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
257 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
258 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
259 ],
260 ), 1 .. 2;
261
262 $table->add (2, 0, new CFClient::UI::Button
263 text => "Swap Stats",
264 on_activate => sub {
265 $conn->{stat_change_with} = $sw2->{value};
266 $conn->send ("reply $sw1->{value}");
267 destroy_query_dialog $conn;
268 0
269 },
270 );
271 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
272
273 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept",
276 on_activate => sub {
277 $conn->send ("reply n");
278 $STATS_WINDOW->hide;
279 destroy_query_dialog $conn;
280 0
281 },
282 );
283
284 unshift @dialog, new CFClient::UI::Label
285 max_w => $::WIDTH * 0.4,
286 ellipsise => 0,
287 markup =>
288 "<big><b>Character Creation: Stats</b></big>\n\n"
289 . "Look at the <b>Stats</b> window to see your basic stats "
290 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
291 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
292 . "Race selection will influence those values later on."
293 ;
294 }
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 on_changed => sub {
298 $conn->send ("reply $_[1]");
299 destroy_query_dialog $conn;
300 0
301 },
302 ;
303
304 $entry->grab_focus;
305
306 } else {
307 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
308
309 push @dialog, my $entry = new CFClient::UI::Entry
310 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
311 on_activate => sub {
312 $conn->send ("reply $_[1]");
313 destroy_query_dialog $conn;
314 0
315 },
316 ;
317
318 $entry->grab_focus;
319 }
320
321 $vbox->add (@dialog);
322 $dialog->show;
323}
324
121sub start_game { 325sub start_game {
122 status "logging in..."; 326 status "logging in...";
123 327
124 $LOGIN_BUTTON->set_text ("Logout"); 328 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide; 329 $SETUP_DIALOG->hide;
126 330
127 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 331 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
128 332
129 my ($host, $port) = split /:/, $CFG->{host}; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
130 334
131 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
132 336
133 $CONN = eval { 337 $CONN = eval {
134 new CFClient::Protocol 338 new CFClient::Protocol
135 host => $host, 339 host => $host,
136 port => $port || 13327, 340 port => $port || 13327,
137 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
138 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
139 mapw => $mapsize, 343 mapw => $mapsize,
140 maph => $mapsize, 344 maph => $mapsize,
141 345
142 map_widget => $MAPWIDGET, 346 map_widget => $MAPWIDGET,
143 logview => $LOGVIEW, 347 logview => $LOGVIEW,
144 statusbox => $STATUSBOX, 348 statusbox => $STATUSBOX,
145 map => $MAP, 349 map => $MAP,
146 mapmap => $MAPMAP, 350 mapmap => $MAPMAP,
351 query => \&server_query,
147 352
148 sound_play => sub { 353 sound_play => sub {
149 my ($x, $y, $soundnum, $type) = @_; 354 my ($x, $y, $soundnum, $type) = @_;
150 355
151 $SDL_MIXER 356 $SDL_MIXER
… …
168 } 373 }
169} 374}
170 375
171sub stop_game { 376sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login"); 377 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show; 378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
379 $SETUP_DIALOG->show;
174 $INV_WINDOW->hide; 380 $PL_WINDOW->hide;
175 $LOGVIEW->hide; 381 $SETUP_SPELLS->clear_spells;
176 382
177 return unless $CONN; 383 return unless $CONN;
178 384
179 status "connection closed"; 385 status "connection closed";
180 386
387 destroy_query_dialog $CONN;
181 $CONN->destroy; 388 $CONN->destroy;
182 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
183}
184 390
185sub client_setup { 391 undef $MAP;
186 my $dialog = new CFClient::UI::FancyFrame 392}
187 x => 1, 393
188 y => $HEIGHT * (1/8), 394sub graphics_setup {
189 name => "client_setup",
190 title => "Client Setup",
191 child => (my $vbox = new CFClient::UI::VBox); 395 my $vbox = new CFClient::UI::VBox;
192 396
193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 397 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
194 398
195 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 399 $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); 400 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
210 414
211 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 415 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
212 $table->add (1, $row++, new CFClient::UI::CheckBox 416 $table->add (1, $row++, new CFClient::UI::CheckBox
213 state => $CFG->{fullscreen}, 417 state => $CFG->{fullscreen},
214 tooltip => "Bring the client into fullscreen mode.", 418 tooltip => "Bring the client into fullscreen mode.",
215 on_changed => sub { 419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
216 my ($self, $value) = @_;
217 $CFG->{fullscreen} = $value;
218 }
219 ); 420 );
220 421
221 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
222 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, new CFClient::UI::CheckBox
223 state => $CFG->{fast}, 424 state => $CFG->{fast},
224 tooltip => "Lower the visual quality considerably to speed up rendering.", 425 tooltip => "Lower the visual quality considerably to speed up rendering.",
225 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
226 my ($self, $value) = @_;
227 $CFG->{fast} = $value;
228 }
229 ); 427 );
230 428
231 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
232 $table->add (1, $row++, new CFClient::UI::Slider 430 $table->add (1, $row++, new CFClient::UI::Slider
233 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 431 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
234 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 432 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
235 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
236 my ($self, $value) = @_;
237 $CFG->{map_scale} = 2 ** $value;
238 }
239 ); 434 );
240 435
241 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 436 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
242 $table->add (1, $row++, new CFClient::UI::CheckBox 437 $table->add (1, $row++, new CFClient::UI::CheckBox
243 state => $CFG->{fow_enable}, 438 state => $CFG->{fow_enable},
244 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 439 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
245 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
246 my ($self, $value) = @_;
247 $CFG->{fow_enable} = $value;
248 }
249 ); 441 );
250 442
251 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 443 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
252 $table->add (1, $row++, new CFClient::UI::Slider 444 $table->add (1, $row++, new CFClient::UI::Slider
253 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 445 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
254 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 446 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
255 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
256 my ($self, $value) = @_;
257 $CFG->{fow_intensity} = $value;
258 }
259 ); 448 );
260 449
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
262 $table->add (1, $row++, new CFClient::UI::CheckBox 451 $table->add (1, $row++, new CFClient::UI::CheckBox
263 state => $CFG->{fow_smooth}, 452 state => $CFG->{fow_smooth},
264 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
265 on_changed => sub { 454 on_changed => sub {
266 my ($self, $value) = @_; 455 my ($self, $value) = @_;
267 $CFG->{fow_smooth} = $value; 456 $CFG->{fow_smooth} = $value;
268 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
458 0
269 } 459 }
270 ); 460 );
271 461
272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 462 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
273 $table->add (1, $row++, new CFClient::UI::Slider 463 $table->add (1, $row++, new CFClient::UI::Slider
274 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 464 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
275 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 465 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
276 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 466 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
277 ); 467 );
278 468
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 469 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 472 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
283 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
284 ); 474 );
285 475
286 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
287 477
288 $table->add (1, $row++, new CFClient::UI::Slider 478 $table->add (1, $row++, new CFClient::UI::Slider
289 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
290 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
291 on_changed => sub { 481 on_changed => sub {
292 $CFG->{stat_fontsize} = $_[1]; 482 $CFG->{stat_fontsize} = $_[1];
293 &set_stats_window_fontsize; 483 &set_stats_window_fontsize;
484 0
294 } 485 }
295 ); 486 );
296 487
297 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
298 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFClient::UI::Slider
299 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
300 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
301 on_changed => sub { 492 on_changed => sub {
302 $CFG->{gauge_fontsize} = $_[1]; 493 $CFG->{gauge_fontsize} = $_[1];
303 &set_gauge_window_fontsize; 494 &set_gauge_window_fontsize;
495 0
304 } 496 }
305 ); 497 );
306 498
307 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
308 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
309 range => [$CFG->{gauge_size}, 0.2, 0.8], 501 range => [$CFG->{gauge_size}, 0.2, 0.8],
310 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 502 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
311 on_changed => sub { 503 on_changed => sub {
312 $CFG->{gauge_size} = $_[1]; 504 $CFG->{gauge_size} = $_[1];
313 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 505 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
506 0
314 } 507 }
315 ); 508 );
316 509
317 $table->add (1, $row++, new CFClient::UI::Button 510 $table->add (1, $row++, new CFClient::UI::Button
318 expand => 1, align => 0, text => "Apply", 511 expand => 1, align => 0, text => "Apply",
319 tooltip => "Apply the video settings", 512 tooltip => "Apply the video settings",
320 on_activate => sub { 513 on_activate => sub {
321 video_shutdown (); 514 video_shutdown ();
322 video_init (); 515 video_init ();
516 0
323 } 517 }
324 ); 518 );
519
520 $vbox
521}
522
523sub audio_setup {
524 my $vbox = new CFClient::UI::VBox;
525
526 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
527
528 my $row = 0;
325 529
326 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 530 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
327 $table->add (1, $row++, new CFClient::UI::CheckBox 531 $table->add (1, $row++, new CFClient::UI::CheckBox
328 state => $CFG->{audio_enable}, 532 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.", 533 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.",
330 on_changed => sub { 534 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
331 $CFG->{audio_enable} = $_[1];
332 }
333 ); 535 );
334# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 536# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
335# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 537# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
336# $CFG->{effects_volume} = $_[1]; 538# $CFG->{effects_volume} = $_[1];
337# }); 539# });
338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 540 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
339 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 541 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
340 $hbox->add (new CFClient::UI::CheckBox 542 $hbox->add (new CFClient::UI::CheckBox
341 expand => 1, state => $CFG->{bgm_enable}, 543 expand => 1, state => $CFG->{bgm_enable},
342 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 544 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
343 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
344 $CFG->{bgm_enable} = $_[1];
345 }
346 ); 546 );
347 $hbox->add (new CFClient::UI::Slider 547 $hbox->add (new CFClient::UI::Slider
348 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 548 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
349 tooltip => "The volume of the background music. Changes are instant.", 549 tooltip => "The volume of the background music. Changes are instant.",
350 on_changed => sub { 550 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
351 $CFG->{bgm_volume} = $_[1];
352 CFClient::MixMusic::volume $_[1] * 128;
353 }
354 ); 551 );
355 552
356 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
357 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
358 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
359 on_activate => sub { 556 on_activate => sub {
360 audio_shutdown (); 557 audio_shutdown ();
361 audio_init (); 558 audio_init ();
559 0
362 } 560 }
363 ); 561 );
364 562
365 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $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} 564}
379 565
380sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
381 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
382 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
440 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
441 627
442 $win 628 $win
443} 629}
444 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
445 633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
446sub make_stats_window { 659sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw =
448 y => $HEIGHT * (2/8), 661 new CFClient::UI::Window
449 x => "max", 662 child => my $vb = new CFClient::UI::VBox;
450 title => "Stats",
451 name => "stats_window";
452 663
453 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
454 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
455 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
456 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
457 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
458 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
… …
482 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
483 693
484 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 694 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
485 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 695 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
486 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 696 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
487 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 697 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
488 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 698 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
489 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 699 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
490 ) { 700 ) {
491 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
492 702
… …
511 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
512 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
513 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
514 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
515 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
516 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
517 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
518 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 728 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
519 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
520 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
521 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
538 ); 748 );
539 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
540 font => $FONT_FIXED, 750 font => $FONT_FIXED,
541 can_hover => 1, 751 can_hover => 1,
542 can_events => 1, 752 can_events => 1,
543 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
544 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
545 ); 755 );
546 756
547 $row++; 757 $row++;
548 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
… …
555 update_stats_window ({}); 765 update_stats_window ({});
556 766
557 $tgw 767 $tgw
558} 768}
559 769
560sub formsep { 770sub formsep($) {
561 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
562} 772}
563 773
564sub update_stats_window { 774sub update_stats_window {
565 my ($stats) = @_; 775 my ($stats) = @_;
566 776
… …
596 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
597 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
598 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
599 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
600 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
601 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
602 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
603 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
604 814
605 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
606 816
607 # TODO: replace by CS_STAT_RES_xxx constants
608 my %tbl = ( 817 my %tbl = (
609 phys => 100, 818 phys => CS_STAT_RES_PHYS,
610 magic => 101, 819 magic => CS_STAT_RES_MAG,
611 fire => 102, 820 fire => CS_STAT_RES_FIRE,
612 elec => 103, 821 elec => CS_STAT_RES_ELEC,
613 cold => 104, 822 cold => CS_STAT_RES_COLD,
614 conf => 105, 823 conf => CS_STAT_RES_CONF,
615 acid => 106, 824 acid => CS_STAT_RES_ACID,
616 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
617 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
618 pois => 109, 827 pois => CS_STAT_RES_POISON,
619 slow => 110, 828 slow => CS_STAT_RES_SLOW,
620 para => 111, 829 para => CS_STAT_RES_PARA,
621 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
622 fear => 113, 831 fear => CS_STAT_RES_FEAR,
623 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
624 deat => 115, 833 deat => CS_STAT_RES_DEATH,
625 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
626 blind => 117, 835 blind => CS_STAT_RES_BLIND,
627 ); 836 );
628 837
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 839 for keys %tbl;
631} 840}
632 841
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; 842my $METASERVER_ATIME;
644 843
645sub update_metaserver { 844sub update_metaserver {
646 my ($HOST) = @_; 845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
647 849
648 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
649 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
650 852
651 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
… …
673 875
674 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
675 877
676 $table->clear; 878 $table->clear;
677 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
678 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
679 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
680 for 0 .. $#col; 892 for 0 .. $#col;
681 893
682 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
683 895
684 my $y = 0; 896 my $y = 0;
685 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
702 914
703 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
704 916
705 $y++; 917 $y++;
706 918
707 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
708 (new CFClient::UI::Button text => "Use", on_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
709 $HOST->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925 $METASERVER->hide;
926 0
927 },
710 }), 928 ),
711 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
712 ]); 930 ]);
713 931
714 $table->add ($_ + 1, $y, new CFClient::UI::Label 932 $table->add ($_, $y, new CFClient::UI::Label
715 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 933 ellipsise => 0,
934 align => $align[$_],
935 text => $m->[$_],
936 tooltip => $tip[$_],
937 can_hover => 1,
938 can_events => 1,
939 fontsize => 0.8)
716 for 0 .. $#$m; 940 for 0 .. $#$m;
717 } 941 }
718 } 942 }
719 }); 943 });
720} 944}
721 945
946sub metaserver_dialog {
947 my $vbox = new CFClient::UI::VBox;
948 my $table = new CFClient::UI::Table;
949 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
950
951 my $dialog = new CFClient::UI::FancyFrame
952 title => "Server List",
953 name => 'metaserver_dialog',
954 x => 'center',
955 y => 'center',
956 z => 3,
957 force_h => $::HEIGHT * 0.4,
958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
961 on_visibility_change => sub {
962 update_metaserver ($_[0]) if $_[1];
963 0
964 },
965 ;
966
967 $dialog
968}
969
722sub server_setup { 970sub 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), 971 my $vbox = new CFClient::UI::VBox;
729 ;
730 972
731 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 973 $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"); 974 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
733 975
734 { 976 {
735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
736 978
737 $vbox->add ( 979 $vbox->add (
738 my $HOST = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
739 expand => 1, 981 expand => 1,
740 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
741 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 983 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
742 on_changed => sub { 984 on_changed => sub {
743 my ($self, $value) = @_; 985 my ($self, $value) = @_;
744 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
987 0
745 } 988 }
746 ); 989 );
747 990
748 $METASERVER = metaserver_dialog;
749
750 $vbox->add (new CFClient::UI::Flopper 991 $vbox->add (new CFClient::UI::Button
751 expand => 1, 992 expand => 1,
752 text => "Server List", 993 text => "Server List",
753 other => $METASERVER, 994 other => $METASERVER,
754 tooltip => "Show a list of available crossfire servers", 995 tooltip => "Show a list of available crossfire servers",
755 on_open => sub { 996 on_activate => sub { $METASERVER->toggle_visibility; 0 },
756 update_metaserver $HOST; 997 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
757 }
758 ); 998 );
759 } 999 }
760 1000
761 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1001 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
762 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
763 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
764 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
765 on_changed => sub { 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
766 my ($self, $value) = @_;
767 $CFG->{user} = $value;
768 }
769 ); 1006 );
770 1007
771 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
772 $table->add (1, 5, new CFClient::UI::Entry 1009 $table->add (1, 5, new CFClient::UI::Entry
773 text => $CFG->{password}, 1010 text => $CFG->{profile}{default}{password},
774 hidden => 1, 1011 hidden => 1,
775 tooltip => "The password for your character", 1012 tooltip => "The password for your character",
776 on_changed => sub { 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
777 my ($self, $value) = @_;
778 $CFG->{password} = $value;
779 }
780 ); 1014 );
781 1015
782 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1016 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
783 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
784 force_w => 100, 1018 force_w => 100,
785 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1019 range => [$CFG->{mapsize}, 10, 100, 0, 1],
786 tooltip => "This is the size of the portion of the map update the server sends you. " 1020 tooltip => "This is the size of the portion of the map update the server sends you. "
787 . "If you set this to a high value you will be able to see further, " 1021 . "If you set this to a high value you will be able to see further, "
788 . "but you also increase bandwidth requirements and latency. " 1022 . "but you also increase bandwidth requirements and latency. "
789 . "This option is only used once at log-in.", 1023 . "This option is only used once at log-in.",
790 on_changed => sub { 1024 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
791 my ($self, $value) = @_;
792
793 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
794 },
795 ); 1025 );
796 1026
797 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1027 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
798 $table->add (1, 8, new CFClient::UI::CheckBox 1028 $table->add (1, 8, new CFClient::UI::CheckBox
799 state => $CFG->{face_prefetch}, 1029 state => $CFG->{face_prefetch},
… …
802 . "This might increase or create lag, but increases the chances " 1032 . "This might increase or create lag, but increases the chances "
803 . "of faces being ready for display when you encounter them. " 1033 . "of faces being ready for display when you encounter them. "
804 . "It also uses up server bandwidth on every connect, " 1034 . "It also uses up server bandwidth on every connect, "
805 . "so only set it if you really need to prefetch images. " 1035 . "so only set it if you really need to prefetch images. "
806 . "This option can be set and unset any time.", 1036 . "This option can be set and unset any time.",
807 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1037 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
808 ); 1038 );
809 1039
810 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1040 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
811 $table->add (1, 9, new CFClient::UI::Entry 1041 $table->add (1, 9, new CFClient::UI::Entry
812 text => $CFG->{output_count}, 1042 text => $CFG->{output_count},
813 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1043 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
814 on_changed => sub { $CFG->{output_count} = $_[1] }, 1044 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
815 ); 1045 );
816 1046
817 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1047 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
818 $table->add (1, 10, new CFClient::UI::Entry 1048 $table->add (1, 10, new CFClient::UI::Entry
819 text => $CFG->{output_sync}, 1049 text => $CFG->{output_sync},
820 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1050 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
821 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1051 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
822 ); 1052 );
823 1053
824 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1054 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
825 expand => 1, 1055 expand => 1,
826 align => 0, 1056 align => 0,
827 text => "Login", 1057 text => "Login",
828 on_activate => sub { 1058 on_activate => sub {
829 $CONN ? stop_game 1059 $CONN ? stop_game
830 : start_game; 1060 : start_game;
1061 0
831 }, 1062 },
832 ); 1063 );
833 1064
834 $dialog 1065 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1066 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1067 text => $CFG->{say_command},
1068 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. "
1069 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1070 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1071 on_changed => sub {
1072 my ($self, $value) = @_;
1073 $CFG->{say_command} = $value;
1074 0
1075 }
1076 );
1077
1078 $vbox->add (new CFClient::UI::Label
1079 text => "Server Info",
1080 fontsize => 1.2,
1081 padding_y => 8,
1082 fg => [1, 1, 0, 1],
1083 );
1084
1085 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1086
1087 $vbox
835} 1088}
836 1089
837sub message_window { 1090sub message_window {
838 my $window = new CFClient::UI::FancyFrame 1091 my $window = new CFClient::UI::FancyFrame
839 name => "message_window", 1092 name => "message_window",
840 title => "Messages", 1093 title => "Messages",
841 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
842 bg => [0, 0, 0, 0.75], 1095 bg => [0, 0, 0, 0.75],
843 x => "max", 1096 x => "max",
844 y => 0, 1097 y => 0,
845 force_w => $::WIDTH / 3, 1098 force_w => $::WIDTH * 0.4,
846 force_h => $::HEIGHT / 5, 1099 force_h => $::HEIGHT * 0.5,
847 child => (my $vbox = new CFClient::UI::VBox); 1100 child => (my $vbox = new CFClient::UI::VBox),
1101 has_close_button => 1;
848 1102
849 $vbox->add ($LOGVIEW); 1103 $vbox->add ($LOGVIEW);
850 1104
851 $vbox->add (my $input = new CFClient::UI::Entry 1105 $vbox->add (my $input = new CFClient::UI::Entry
852 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1106 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
860 1114
861 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1115 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
862 $input->{refocus_map} = 1; 1116 $input->{refocus_map} = 1;
863 } 1117 }
864 delete $input->{auto_activated}; 1118 delete $input->{auto_activated};
1119
1120 0
865 }, 1121 },
866 on_activate => sub { 1122 on_activate => sub {
867 my ($input, $text) = @_; 1123 my ($input, $text) = @_;
868 $input->set_text (''); 1124 $input->set_text ('');
869 1125
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 =~ /^\/(.*)/) { 1126 if ($text =~ /^\/(.*)/) {
876 $::CONN->user_send ($1); 1127 $::CONN->user_send ($1);
877 } else { 1128 } else {
878 my $say_cmd = $::CFG->{say_command} || 'say'; 1129 my $say_cmd = $::CFG->{say_command} || 'say';
879 $::CONN->user_send ("$say_cmd $text"); 1130 $::CONN->user_send ("$say_cmd $text");
880 } 1131 }
881 if ($input->{refocus_map}) { 1132 if ($input->{refocus_map}) {
882 delete $input->{refocus_map}; 1133 delete $input->{refocus_map};
883 $MAPWIDGET->focus_in 1134 $MAPWIDGET->focus_in
884 } 1135 }
1136
1137 0
885 }, 1138 },
886 on_escape => sub { 1139 on_escape => sub {
887 $MAPWIDGET->focus_in 1140 $MAPWIDGET->grab_focus;
1141
1142 0
888 }, 1143 },
889 ); 1144 );
890 1145
891 $CONSOLE = { 1146 $CONSOLE = {
892 window => $window, 1147 window => $window,
… …
899sub open_quit_dialog { 1154sub open_quit_dialog {
900 unless ($QUIT_DIALOG) { 1155 unless ($QUIT_DIALOG) {
901 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1156 $QUIT_DIALOG = new CFClient::UI::FancyFrame
902 x => "center", 1157 x => "center",
903 y => "center", 1158 y => "center",
1159 z => 50,
904 title => "Really Quit?", 1160 title => "Really Quit?",
905 ; 1161 ;
906 1162
907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1163 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
908 1164
… …
913 ); 1169 );
914 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1170 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
915 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
916 text => "Ok", 1172 text => "Ok",
917 expand => 1, 1173 expand => 1,
918 on_activate => sub { $QUIT_DIALOG->hide }, 1174 on_activate => sub { $QUIT_DIALOG->hide; 0 },
919 ); 1175 );
920 $hb->add (new CFClient::UI::Button 1176 $hb->add (new CFClient::UI::Button
921 text => "Quit anyway", 1177 text => "Quit anyway",
922 expand => 1, 1178 expand => 1,
923 on_activate => sub { exit }, 1179 on_activate => sub { exit },
… …
925 } 1181 }
926 1182
927 $QUIT_DIALOG->show; 1183 $QUIT_DIALOG->show;
928} 1184}
929 1185
1186sub autopickup_setup {
1187 my $table = new CFClient::UI::Table;
1188
1189 for (
1190 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
1193 ["Stop before pickup" => PICKUP_STOP],
1194 ["Debug autopickup" => PICKUP_DEBUG],
1195 ],
1196 ["Weapons", 0, 6,
1197 ["All weapons" => PICKUP_ALLWEAPON],
1198 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1199 ["Bows" => PICKUP_BOW],
1200 ["Arrows" => PICKUP_ARROW],
1201 ],
1202 ["Armour", 0, 12,
1203 ["Helmets" => PICKUP_HELMET],
1204 ["Shields" => PICKUP_SHIELD],
1205 ["Body Armour" => PICKUP_ARMOUR],
1206 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK],
1209 ],
1210
1211 ["Readables", 2, 2,
1212 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ],
1216 ["Misc", 2, 7,
1217 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS],
1226 ],
1227 ["Weight/Value ratio", 2, 17]
1228 )
1229 {
1230 my ($title, $x, $y, @bits) = @$_;
1231 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1232
1233 for (@bits) {
1234 ++$y;
1235
1236 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub {
1241 my ($box, $value) = @_;
1242
1243 if ($value) {
1244 $::CFG->{pickup} |= $mask;
1245 } else {
1246 $::CFG->{pickup} &= ~$mask;
1247 }
1248
1249 $::CONN->send_command ("pickup $::CFG->{pickup}")
1250 if defined $::CONN;
1251
1252 0
1253 });
1254 }
1255 }
1256
1257 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub {
1262 my ($slider, $value) = @_;
1263
1264 $::CFG->{pickup} &= ~0xF;
1265 $::CFG->{pickup} |= int $value
1266 if $value;
1267 1;
1268 });
1269
1270 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set",
1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275 0
1276 });
1277
1278 $table
1279}
1280
930sub make_inventory_window { 1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $hb
1298}
1299
1300sub player_window {
931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
932 x => "center", 1302 x => "center",
933 y => "center", 1303 y => "center",
934 force_w => $WIDTH * 9/10, 1304 force_w => $WIDTH * 9/10,
935 force_h => $HEIGHT * 9/10, 1305 force_h => $HEIGHT * 9/10,
936 title => "Inventory", 1306 title => "Player",
1307 has_close_button => 1
937 ; 1308 ;
938 1309
939 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 );
940 1322
941 $hb->add (my $vb1 = new CFClient::UI::VBox); 1323 $ntb->add (
942 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1324 Stats => $STATS_WINDOW = stats_window,
943 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
944 1326 );
945 $hb->add (my $vb2 = new CFClient::UI::VBox); 1327 $ntb->add (
946
947 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
948
949 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
950
951 # XXX: Call after $INVR = ... because set_opencont sets the items
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953
954 $invwin
955}
956
957sub make_spell_list {
958 $SPELL_LIST = new CFClient::UI::SpellList 1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
959 force_w => $WIDTH * (9/10), 1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
960 force_h => $HEIGHT * (9/10); 1330 );
961 $SPELL_LIST
962}
963 1331
964sub make_binding_window { 1332 $plwin->add ($ntb);
1333 $plwin
1334}
1335
1336sub update_bindings {
1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1338}
1339
1340sub keyboard_setup {
965 my $binding_list = new CFClient::UI::VBox; 1341 my $binding_list = new CFClient::UI::VBox;
966 1342
967 my $refresh; 1343 my $refresh;
968 $refresh = sub { 1344 $refresh = $BIND_UPD_CB = sub {
969 $binding_list->clear (); 1345 $binding_list->clear ();
970 1346
971 for my $mod (keys %{$::CFG->{bindings}}) { 1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
972 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
973 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
974 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
975 1351
976 my $lbl = join "; ", @$cmds; 1352 my $lbl = join "; ", @$cmds;
977 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
978 $binding_list->add (my $hb = new CFClient::UI::HBox); 1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
979 $hb->add (new CFClient::UI::Button 1355 $hb->add (new CFClient::UI::Button
980 text => "delete", 1356 text => "delete",
981 tooltip => "Deletes the binding", 1357 tooltip => "Deletes the binding",
982 on_activate => sub { 1358 on_activate => sub {
983 $binding_list->remove ($hb); 1359 $binding_list->remove ($hb);
984 delete $::CFG->{bindings}->{$mod}->{$sym}; 1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1361 0
985 }); 1362 });
986 1363
987 $hb->add (new CFClient::UI::Button 1364 $hb->add (new CFClient::UI::Button
988 text => "edit", 1365 text => "edit",
989 tooltip => "Edits the binding", 1366 tooltip => "Edits the binding",
990 on_activate => sub { 1367 on_activate => sub {
991 $::BIND_EDITOR->set_binding ( 1368 $::BIND_EDITOR->set_binding (
992 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
993 sub { 1370 sub {
994 my ($nmod, $nsym, $ncmds) = @_; 1371 my ($nmod, $nsym, $ncmds) = @_;
995 delete $::CFG->{bindings}->{$mod}->{$sym}; 1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
996 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
997 $refresh->(); 1374 $refresh->();
1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
998 $::BIND_WINDOW->show; 1376 $SETUP_DIALOG->show;
999 }, 1377 },
1000 sub { 1378 sub {
1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1001 $::BIND_WINDOW->show; 1380 $SETUP_DIALOG->show;
1002 }); 1381 });
1003 $::BIND_EDITOR->show; 1382 $::BIND_EDITOR->show;
1004 $::BIND_WINDOW->hide; 1383 $SETUP_DIALOG->hide;
1384 0
1005 }); 1385 });
1006 1386
1007 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1387 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1008 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1388 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1009 } 1389 }
1010 } 1390 }
1011 }; 1391 };
1012 1392
1013 $BIND_WINDOW = new CFClient::UI::FancyFrame 1393 my $vb = new CFClient::UI::VBox;
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); 1394 $vb->add (my $hb = new CFClient::UI::HBox);
1395 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1396 $hb->add (new CFClient::UI::CheckBox
1397 expand => 1,
1398 state => $CFG->{shift_fire_stop},
1399 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1400 on_changed => sub {
1401 my ($cbox, $value) = @_;
1402 $CFG->{shift_fire_stop} = $value;
1403 0
1404 });
1405
1025 $vb->add ($binding_list); 1406 $vb->add ($binding_list);
1026 $vb->add (my $hb = new CFClient::UI::HBox); 1407 $vb->add (my $hb = new CFClient::UI::HBox);
1408
1027 $hb->add (new CFClient::UI::Button 1409 $hb->add (new CFClient::UI::Button
1028 text => "record new", 1410 text => "record new",
1029 expand => 1, 1411 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.", 1412 tooltip => "This button opens the binding editor with an empty binding.",
1031 on_activate => sub { 1413 on_activate => sub {
1032 $::BIND_EDITOR->set_binding (undef, undef, [], 1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1033 sub { 1415 sub {
1034 my ($mod, $sym, $cmds) = @_; 1416 my ($mod, $sym, $cmds) = @_;
1035 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1036 $refresh->(); 1418 $refresh->();
1037 $::BIND_WINDOW->show; 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1038 }, 1421 },
1039 sub { 1422 sub {
1040 $::BIND_WINDOW->show; 1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1041 }); 1425 },
1042 $::BIND_WINDOW->hide; 1426 );
1427 $SETUP_DIALOG->hide;
1043 $::BIND_EDITOR->show; 1428 $::BIND_EDITOR->show;
1429 0
1044 }, 1430 },
1045 ); 1431 );
1432
1046 $hb->add (new CFClient::UI::Button 1433 $hb->add (new CFClient::UI::Button
1047 text => "close", 1434 text => "close",
1048 tooltip => "Closes the binding window", 1435 tooltip => "Closes the binding window",
1049 expand => 1, 1436 expand => 1,
1050 on_activate => sub { 1437 on_activate => sub {
1051 $::BIND_WINDOW->hide; 1438 $SETUP_DIALOG->hide;
1439 0
1052 } 1440 }
1053 ); 1441 );
1054 1442
1055 $refresh->(); 1443 $refresh->();
1056 $BIND_WINDOW
1057}
1058 1444
1445 $vb
1446}
1447
1059sub make_help_window { 1448sub help_window {
1060 my $win = new CFClient::UI::FancyFrame 1449 my $win = new CFClient::UI::FancyFrame
1450 x => 'center',
1451 y => 'center',
1452 z => 2,
1453 name => 'doc_browser',
1061 def_w => int $WIDTH * 7/8, 1454 force_w => int $WIDTH * 7/8,
1062 def_h => int $HEIGHT * 7/8, 1455 force_h => int $HEIGHT * 7/8,
1063 title => "Documentation"; 1456 title => "Documentation";
1064 1457
1065 $win->add (my $vbox = new CFClient::UI::VBox); 1458 $win->add (my $vbox = new CFClient::UI::VBox);
1066 1459
1067 $vbox->add (my $buttons = new CFClient::UI::HBox); 1460 $vbox->add (my $buttons = new CFClient::UI::HBox);
1068 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1462 expand => 1, fontsize => 0.8, padding_x => 4);
1069 1463
1070 for ( 1464 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1466 value => undef,
1467 options => [
1071 [intro => "Introduction"], 1468 [intro => "Introduction"],
1072 [manual => "Manual"], 1469 [manual => "Main Manual"],
1470 [skill_help => "Skill Reference"],
1471 [command_help => "Command Reference"],
1073 [command_help => "Commands"], 1472 [dmcommand_help => "DM Commands"],
1074 [skill_help => "Skills"], 1473 [COPYING => "License Terms"],
1075 ) { 1474 ],
1076 my ($pod, $label) = @$_; 1475 on_changed => sub {
1476 my ($self, $pod) = @_;
1077 1477
1078 $buttons->add (new CFClient::UI::Button 1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1079 text => $label, 1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1080 on_activate => sub {
1081 my $parser = new Pod::POM;
1082 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1083 1480
1084 $viewer->clear; 1481 $viewer->clear;
1482
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d#
1085 1487
1086 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1087 for @{ CFClient::pod_to_pango_list $pom }; 1489 for @$pom;
1088 1490
1089 $viewer->set_offset (0); 1491 $viewer->set_offset (0);
1492
1090 }, 1493 0
1494 },
1495 on_visibility_change => sub {
1496 my ($self, $visible) = @_;
1497 return unless $visible;
1498 return if $self->{value};
1499 $self->set_value ("intro");
1500 0
1501 },
1091 ); 1502 );
1092 }
1093
1094 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1095 1503
1096 $win 1504 $win
1097} 1505}
1098 1506
1099sub sdl_init { 1507sub sdl_init {
… …
1136 z => 100, 1544 z => 100,
1137 force_x => "max", 1545 force_x => "max",
1138 force_y => 0; 1546 force_y => 0;
1139 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
1140 1548
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1142 1550
1143 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $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]); 1552 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1145 1553
1146 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
1147 bg => [0, 0, 0, 0.4], 1555 bg => [0, 0, 0, 0.4],
1148 force_x => 0, 1556 force_x => 0,
1149 force_y => "max", 1557 force_y => "max",
1150 child => $STATUSBOX, 1558 child => $STATUSBOX,
1151 )->show; 1559 )->show;
1152 1560
1153 CFClient::UI::FancyFrame->new ( 1561 CFClient::UI::FancyFrame->new (
1562 title => "Map",
1563 name => "mapmap",
1154 x => 0, 1564 x => 0,
1155 y => $FONTSIZE + 8, 1565 y => $FONTSIZE + 8,
1156 border_bg => [1, 1, 1, 192/255], 1566 border_bg => [1, 1, 1, 192/255],
1157 bg => [1, 1, 1, 0], 1567 bg => [1, 1, 1, 0],
1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1568 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1164 $MAPWIDGET->connect (activate_console => sub { 1574 $MAPWIDGET->connect (activate_console => sub {
1165 my ($mapwidget, $preset) = @_; 1575 my ($mapwidget, $preset) = @_;
1166 1576
1167 if ($CONSOLE) { 1577 if ($CONSOLE) {
1168 $CONSOLE->{input}->{auto_activated} = 1; 1578 $CONSOLE->{input}->{auto_activated} = 1;
1169 $CONSOLE->{input}->focus_in; 1579 $CONSOLE->{input}->grab_focus;
1170 1580
1171 if ($preset && $CONSOLE->{input}->get_text eq '') { 1581 if ($preset && $CONSOLE->{input}->get_text eq '') {
1172 $CONSOLE->{input}->set_text ($preset); 1582 $CONSOLE->{input}->set_text ($preset);
1173 } 1583 }
1174 } 1584 }
1175 }); 1585 });
1176 $MAPWIDGET->show; 1586 $MAPWIDGET->show;
1177 $MAPWIDGET->focus_in; 1587 $MAPWIDGET->grab_focus;
1178 1588
1179 $LOGVIEW = new CFClient::UI::TextView 1589 $LOGVIEW = new CFClient::UI::TextScroller
1180 expand => 1, 1590 expand => 1,
1181 font => $FONT_FIXED, 1591 font => $FONT_FIXED,
1182 fontsize => $::CFG->{log_fontsize}, 1592 fontsize => $::CFG->{log_fontsize},
1593 indent => -4,
1183 can_hover => 1, 1594 can_hover => 1,
1184 can_events => 1, 1595 can_events => 1,
1185 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1596 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1186 ; 1597 ;
1187 1598
1599 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1600 title => "Setup",
1601 name => "setup_dialog",
1602 x => 'center',
1603 y => 'center',
1604 z => 2,
1605 force_w => $::WIDTH * 0.6,
1606 force_h => $::HEIGHT * 0.6,
1607 has_close_button => 1,
1608 ;
1609
1610 $METASERVER = metaserver_dialog;
1611
1612 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1614
1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1616 "Configure the server to play on, your username, password and other server-related options.");
1617 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1618 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1620 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1622 "Configure the use of audio, sound effects and background music.");
1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1624 "Lets you define, edit and delete key bindings."
1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1626 . "with nothing set and the recording started. After doing the actions you "
1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1628 . "After pressing the combo the binding will be saved automatically and the "
1629 . "binding editor closes");
1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1631 "Some debuggin' options. Do not ask.");
1632
1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1189 1634
1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1635 $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."); 1636 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, 1637
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, 1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1195 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1196 1640
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 1641 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 1642
1199 $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.");
1201 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1202 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1203 ."You can also hit the Tab-key to show/hide the Inventory.");
1204 1645
1205 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1206 text => "Save Config", 1647 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.", 1648 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 { 1649 on_activate => sub {
1209 $::CFG->{layout} = CFClient::UI::get_layout; 1650 $::CFG->{layout} = CFClient::UI::get_layout;
1210 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1651 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1211 status "Configuration Saved"; 1652 status "Configuration Saved";
1653 0
1212 }, 1654 },
1213 ); 1655 );
1214 1656
1215 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1216 tooltip => "View Documentation"); 1658 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 1659
1234 $BUTTONBAR->add (new CFClient::UI::Button 1660 $BUTTONBAR->add (new CFClient::UI::Button
1235 text => "Quit", 1661 text => "Quit",
1236 tooltip => "Terminates the program", 1662 tooltip => "Terminates the program",
1237 on_activate => sub { 1663 on_activate => sub {
1238 if ($CONN) { 1664 if ($CONN) {
1239 open_quit_dialog; 1665 open_quit_dialog;
1240 } else { 1666 } else {
1241 exit; 1667 exit;
1242 } 1668 }
1669 0
1243 }, 1670 },
1244 ); 1671 );
1245 1672
1246 $BUTTONBAR->show; 1673 $BUTTONBAR->show;
1247 $SERVER_SETUP->show; 1674 $SETUP_DIALOG->show;
1248
1249 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1250 } 1675 }
1676
1677 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1251} 1678}
1252 1679
1253sub video_shutdown { 1680sub video_shutdown {
1681 CFClient::OpenGL::shutdown;
1682
1254 undef $SDL_ACTIVE; 1683 undef $SDL_ACTIVE;
1255} 1684}
1256 1685
1257my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1686my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1258my $bgmusic;#TODO#hack#d# 1687my $bgmusic;#TODO#hack#d#
… …
1387}; 1816};
1388 1817
1389 CFClient::SDL_GL_SwapBuffers; 1818 CFClient::SDL_GL_SwapBuffers;
1390} 1819}
1391 1820
1392my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1393 $NOW = time; 1822 $NOW = time;
1394 1823
1395 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1396 for CFClient::SDL_PollEvent; 1825 for CFClient::SDL_PollEvent;
1397 1826
… …
1464############################################################################# 1893#############################################################################
1465 1894
1466$SIG{INT} = $SIG{TERM} = sub { exit }; 1895$SIG{INT} = $SIG{TERM} = sub { exit };
1467 1896
1468{ 1897{
1469 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1898 local $SIG{__DIE__} = sub {
1899 return unless defined $^S && !$^S;
1900 Carp::confess $_[1];#d#TODO: remove when stable
1901 CFClient::fatal $_[0];
1902 };
1470 1903
1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout}); 1905 CFClient::UI::set_layout ($::CFG->{layout});
1473 1906
1474 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1475 sdl_mode => 0, 1908 sdl_mode => 0,
1476 width => 640, 1909 width => 640,
1477 height => 480, 1910 height => 480,
1478 fullscreen => 0, 1911 fullscreen => 0,
1479 fast => 0, 1912 fast => 0,
1480 map_scale => 1, 1913 map_scale => 1,
1481 fow_enable => 1, 1914 fow_enable => 1,
1482 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1483 fow_smooth => 0, 1916 fow_smooth => 0,
1484 gui_fontsize => 1, 1917 gui_fontsize => 1,
1485 log_fontsize => 1, 1918 log_fontsize => 0.7,
1486 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1487 gauge_size => 0.35, 1920 gauge_size => 0.35,
1488 stat_fontsize => 1, 1921 stat_fontsize => 0.7,
1489 mapsize => 100, 1922 mapsize => 100,
1490 host => "crossfire.schmorp.de",
1491 say_command => 'say', 1923 say_command => 'say',
1492 audio_enable => 1, 1924 audio_enable => 1,
1493 bgm_enable => 1, 1925 bgm_enable => 1,
1494 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1495 face_prefetch => 0, 1927 face_prefetch => 0,
1496 output_sync => 1, 1928 output_sync => 1,
1497 output_count => 1, 1929 output_count => 1,
1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1498 ); 1933
1499
1500 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1501 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1502 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1503 1939
1504 sdl_init; 1940 sdl_init;
1505 1941
1506 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1507 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1549 video_init; 1985 video_init;
1550 audio_init; 1986 audio_init;
1551} 1987}
1552 1988
1553Event::loop; 1989Event::loop;
1990#CFClient::SDL_Quit;
1991#CFClient::_exit 0;
1554 1992
1555END { CFClient::SDL_Quit } 1993END { CFClient::SDL_Quit }
1556 1994
1557=head1 NAME 1995=head1 NAME
1558 1996

Diff Legend

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