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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
93our $SERVER_INFO;
89 94
90our $SETUP_DIALOG; 95our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 97our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 99
100our $PL_NOTEBOOK;
96our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
97our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
98our $FLOORBOX; 110our $FLOORBOX;
99our $GAUGES; 111our $GAUGES;
100our $STATWIDS; 112our $STATWIDS;
101 113
… …
108 120
109our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 122our $STATUSBOX;
111our $DEBUG_STATUS; 123our $DEBUG_STATUS;
112 124
113our $INV_WINDOW;
114our $INV; 125our $INV;
115our $INVR; 126our $INVR;
116our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
117 128
118our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
119 131
120our $PICKUP_CFG; 132our $PICKUP_CFG;
121 133
122sub status { 134sub status {
123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 135 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
154 $hbox->add (new CFClient::UI::Button 166 $hbox->add (new CFClient::UI::Button
155 text => "No", 167 text => "No",
156 on_activate => sub { 168 on_activate => sub {
157 $conn->send ("reply n"); 169 $conn->send ("reply n");
158 $dialog->destroy; 170 $dialog->destroy;
171 0
159 } 172 }
160 ); 173 );
161 $hbox->add (new CFClient::UI::Button 174 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 175 text => "Yes",
163 on_activate => sub { 176 on_activate => sub {
164 $conn->send ("reply y"); 177 $conn->send ("reply y");
165 destroy_query_dialog $conn; 178 destroy_query_dialog $conn;
179 0
166 }, 180 },
167 ); 181 );
168 182
169 $dialog->focus_in; 183 $dialog->grab_focus;
170 184
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 186 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173 187
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 188 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
184 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 199 text => "Next Race",
186 on_activate => sub { 200 on_activate => sub {
187 $conn->send ("reply n"); 201 $conn->send ("reply n");
188 destroy_query_dialog $conn; 202 destroy_query_dialog $conn;
203 0
189 }, 204 },
190 ); 205 );
191 $table->add (2, 0, new CFClient::UI::Button 206 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 207 text => "Accept",
193 on_activate => sub { 208 on_activate => sub {
194 $conn->send ("reply d"); 209 $conn->send ("reply d");
195 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
211 0
196 }, 212 },
197 ); 213 );
198 214
199 unshift @dialog, new CFClient::UI::Label 215 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
… …
214 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
215 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
216 return; 232 return;
217 } 233 }
218 234
219 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
220 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
221 237
222 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
224 ellipsise => 0, 240 ellipsise => 0,
… …
230 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 247 text => "Roll Again",
232 on_activate => sub { 248 on_activate => sub {
233 $conn->send ("reply y"); 249 $conn->send ("reply y");
234 destroy_query_dialog $conn; 250 destroy_query_dialog $conn;
251 0
235 }, 252 },
236 ); 253 );
237 254
238 # center: swap stats 255 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
253 text => "Swap Stats", 270 text => "Swap Stats",
254 on_activate => sub { 271 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 272 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 273 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 274 destroy_query_dialog $conn;
275 0
258 }, 276 },
259 ); 277 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 278 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 279
262 # right: accept 280 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button 281 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept", 282 text => "Accept",
265 on_activate => sub { 283 on_activate => sub {
266 $conn->send ("reply n"); 284 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 285 $STATS_PAGE->hide;
268 destroy_query_dialog $conn; 286 destroy_query_dialog $conn;
287 0
269 }, 288 },
270 ); 289 );
271 290
272 unshift @dialog, new CFClient::UI::Label 291 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 292 max_w => $::WIDTH * 0.4,
… …
283 302
284 push @dialog, my $entry = new CFClient::UI::Entry 303 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 304 on_changed => sub {
286 $conn->send ("reply $_[1]"); 305 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 306 destroy_query_dialog $conn;
307 0
288 }, 308 },
289 ; 309 ;
290 310
291 $entry->focus_in; 311 $entry->grab_focus;
292 312
293 } else { 313 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 314 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295 315
296 push @dialog, my $entry = new CFClient::UI::Entry 316 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 317 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 318 on_activate => sub {
299 $conn->send ("reply $_[1]"); 319 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 320 destroy_query_dialog $conn;
321 0
301 }, 322 },
302 ; 323 ;
303 324
304 $entry->focus_in; 325 $entry->grab_focus;
305 } 326 }
306 327
307 $vbox->add (@dialog); 328 $vbox->add (@dialog);
308 $dialog->show; 329 $dialog->show;
309} 330}
… …
314 $LOGIN_BUTTON->set_text ("Logout"); 335 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 336 $SETUP_DIALOG->hide;
316 337
317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 338 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318 339
319 my ($host, $port) = split /:/, $CFG->{host}; 340 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 341
321 $MAP = new CFClient::Map $mapsize, $mapsize; 342 $MAP = new CFClient::Map $mapsize, $mapsize;
322 343
323 $CONN = eval { 344 $CONN = eval {
324 new CFClient::Protocol 345 new CFClient::Protocol
325 host => $host, 346 host => $host,
326 port => $port || 13327, 347 port => $port || 13327,
327 user => $CFG->{user}, 348 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 349 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 350 mapw => $mapsize,
330 maph => $mapsize, 351 maph => $mapsize,
331 352
332 map_widget => $MAPWIDGET, 353 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 354 logview => $LOGVIEW,
… …
361 382
362sub stop_game { 383sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 386 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 387 $PL_WINDOW->hide;
388 $SPELL_PAGE->clear_spells;
367 389
368 return unless $CONN; 390 return unless $CONN;
369 391
370 status "connection closed"; 392 status "connection closed";
371 393
372 destroy_query_dialog $CONN; 394 destroy_query_dialog $CONN;
373 $CONN->destroy; 395 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 396 $CONN = 0; # false, does not autovivify
397
398 undef $MAP;
375} 399}
376 400
377sub graphics_setup { 401sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 402 my $vbox = new CFClient::UI::VBox;
379 403
… …
394 $mode_slider->emit (changed => $mode_slider->{range}[0]); 418 $mode_slider->emit (changed => $mode_slider->{range}[0]);
395 419
396 my $row = 1; 420 my $row = 1;
397 421
398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 424 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 425 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 427 );
407 428
408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 430 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 431 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 432 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 434 );
417 435
418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 436 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419 $table->add (1, $row++, new CFClient::UI::Slider 437 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 438 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 439 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 441 );
427 442
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 443 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 444 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 445 state => $CFG->{fow_enable},
431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 446 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 448 );
437 449
438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439 $table->add (1, $row++, new CFClient::UI::Slider 451 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 452 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 453 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442 on_changed => sub { 454 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 455 );
447 456
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 457 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 458 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 459 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 460 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub { 461 on_changed => sub {
453 my ($self, $value) = @_; 462 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 463 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 464 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
465 0
456 } 466 }
457 ); 467 );
458 468
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 469 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 472 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 473 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 474 );
465 475
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467 $table->add (1, $row++, new CFClient::UI::Slider 477 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 478 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 479 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 );
472
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 }
482 ); 481 );
483 482
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 483 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 486 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 487 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 488 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 489 &set_gauge_window_fontsize;
490 0
491 } 491 }
492 ); 492 );
493 493
494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498 on_changed => sub { 498 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501 0
501 } 502 }
502 ); 503 );
503 504
504 $table->add (1, $row++, new CFClient::UI::Button 505 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 506 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 507 tooltip => "Apply the video settings",
507 on_activate => sub { 508 on_activate => sub {
508 video_shutdown (); 509 video_shutdown ();
509 video_init (); 510 video_init ();
511 0
510 } 512 }
511 ); 513 );
512 514
513 $vbox 515 $vbox
514} 516}
… …
522 524
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
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.", 528 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.",
527 on_changed => sub { 529 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 530 );
531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
534# }); 534# });
535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540 on_changed => sub { 540 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 541 );
544 $hbox->add (new CFClient::UI::Slider 542 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 543 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 544 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 546 );
552 547
553 $table->add (1, $row++, new CFClient::UI::Button 548 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 549 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 550 tooltip => "Apply the audio settings",
556 on_activate => sub { 551 on_activate => sub {
557 audio_shutdown (); 552 audio_shutdown ();
558 audio_init (); 553 audio_init ();
554 0
559 } 555 }
560 ); 556 );
561 557
562 $vbox 558 $vbox
563}
564
565sub set_stats_window_fontsize {
566 for (values %{$STATWIDS}) {
567 $_->set_fontsize ($::CFG->{stat_fontsize});
568 }
569} 559}
570 560
571sub set_gauge_window_fontsize { 561sub set_gauge_window_fontsize {
572 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 562 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
573 $_->set_fontsize ($::CFG->{gauge_fontsize}); 563 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
629 619
630sub debug_setup { 620sub debug_setup {
631 my $table = new CFClient::UI::Table; 621 my $table = new CFClient::UI::Table;
632 622
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 623 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 624 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 625 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 626 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 627 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 628 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 629 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 630 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
641 631
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 632 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643 633
644 for my $x (0..2) { 634 for my $x (0..2) {
645 for my $y (0 .. 2) { 635 for my $y (0 .. 2) {
… …
654 644
655 $table 645 $table
656} 646}
657 647
658sub stats_window { 648sub stats_window {
659 my $tgw = new CFClient::UI::FancyFrame 649 my $r =
660 y => $HEIGHT * (2/8), 650 new CFClient::UI::ScrolledWindow (
661 x => "max", 651 expand => 1,
662 title => "Stats", 652 scroll_y => 1
663 name => "stats_window"; 653 );
654 $r->add (my $vb = new CFClient::UI::VBox);
664 655
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 656 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 657 can_hover => 1, can_events => 1,
668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 658 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
669 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 659 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 660 can_hover => 1, can_events => 1,
… …
694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 684 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
695 685
696 [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."], 686 [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."],
697 [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."], 687 [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."],
698 [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."], 688 [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."],
699 [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."], 689 [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."],
700 [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."], 690 [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."],
701 [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."], 691 [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."],
702 ) { 692 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 693 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
704 694
… …
706 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 696 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
707 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 697 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
708 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 698 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
709 } 699 }
710 700
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 701 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
712 702
713 my $row = 0; 703 my $row = 0;
714 my $col = 0; 704 my $col = 0;
715 705
716 my %resist_names = ( 706 my %resist_names = (
707 slow => ["Slow",
717 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 708 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
709 holyw => ["Holy Word",
718 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 710 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
711 conf => ["Confusion",
719 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 712 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
713 fire => ["Fire",
720 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 714 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
715 depl => ["Depletion",
721 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 716 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
717 magic => ["Magic",
722 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 718 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
719 drain => ["Draining",
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 720 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
721 acid => ["Acid",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
723 pois => ["Poison",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 724 "<b>Poison</b> (resistance to getting poisoned)"],
725 para => ["Paralysation",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 726 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
727 deat => ["Death",
727 deat => "<b>Death</b> (resistance against death spells)", 728 "<b>Death</b> (resistance against death spells)"],
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 729 phys => ["Physical",
730 "<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.)"],
731 blind => ["Blind",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 732 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
733 fear => ["Fear",
730 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)", 734 "<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)"],
735 tund => ["Turn undead",
731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 736 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
737 elec => ["Electricity",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 738 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
739 cold => ["Cold",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 740 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
741 ghit => ["Ghost hit",
734 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 742 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
735 ); 743 );
736 for (qw/slow holyw conf fire depl magic 744 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 745 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 746 blind fear tund elec cold ghit/)
739 { 747 {
… …
744 template => "-100%", 752 template => "-100%",
745 align => +1, 753 align => +1,
746 valign => 0, 754 valign => 0,
747 can_events => 1, 755 can_events => 1,
748 can_hover => 1, 756 can_hover => 1,
749 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
750 ); 758 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 759 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
752 font => $FONT_FIXED, 760 font => $FONT_FIXED,
753 can_hover => 1, 761 can_hover => 1,
754 can_events => 1, 762 can_events => 1,
755 image => "ui/resist/resist_$_.png", 763 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 764 tooltip => $resist_names{$_}->[1],
765 );
766 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
767 text => $resist_names{$_}->[0],
768 font => $FONT_FIXED,
769 can_hover => 1,
770 can_events => 1,
771 tooltip => $resist_names{$_}->[1],
757 ); 772 );
758 773
759 $row++; 774 $row++;
760 if ($row % 6 == 0) { 775 if ($row % 6 == 0) {
761 $col += 2; 776 $col += 3;
762 $row = 0; 777 $row = 0;
763 } 778 }
764 } 779 }
765 780
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 781 #update_stats_window ({});
768 782
783 $r
784}
785
786sub skill_window {
787 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
788 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
769 $tgw 789 $sw
770} 790}
771 791
772sub formsep($) { 792sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 793 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 794}
775 795
776sub update_stats_window {
777 my ($stats) = @_;
778
779 # I love text protocols...
780
781 my $hp = $stats->{+CS_STAT_HP} * 1;
782 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
783 my $sp = $stats->{+CS_STAT_SP} * 1;
784 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
785 my $fo = $stats->{+CS_STAT_FOOD} * 1;
786 my $fo_m = 999;
787 my $gr = $stats->{+CS_STAT_GRACE} * 1;
788 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
789
790 $GAUGES->{hp} ->set_value ($hp, $hp_m);
791 $GAUGES->{mana} ->set_value ($sp, $sp_m);
792 $GAUGES->{food} ->set_value ($fo, $fo_m);
793 $GAUGES->{grace} ->set_value ($gr, $gr_m);
794 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
795 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
796 my $rng = $stats->{+CS_STAT_RANGE};
797 $rng =~ s/^Range: //; # thank you so much dear server
798 $GAUGES->{range} ->set_text ("Rng: " . $rng);
799 my $title = $stats->{+CS_STAT_TITLE};
800 $title =~ s/^Player: //;
801 $STATWIDS->{title} ->set_text ("Title: " . $title);
802
803 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
804 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
805 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
806 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
807 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818
819 # TODO: replace by CS_STAT_RES_xxx constants
820 my %tbl = (
821 phys => 100,
822 magic => 101,
823 fire => 102,
824 elec => 103,
825 cold => 104,
826 conf => 105,
827 acid => 106,
828 drain => 107,
829 ghit => 108,
830 pois => 109,
831 slow => 110,
832 para => 111,
833 tund => 112,
834 fear => 113,
835 depl => 113,
836 deat => 115,
837 holyw => 116,
838 blind => 117,
839 );
840
841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
842 for keys %tbl;
843}
844
845my $METASERVER_ATIME; 796my $METASERVER_ATIME;
846 797
847sub update_metaserver { 798sub update_metaserver {
799 my ($metaserver_dialog) = @_;
800
801 $METASERVER = $metaserver_dialog
802 if defined $metaserver_dialog;
803
848 return if $METASERVER_ATIME > time; 804 return if $METASERVER_ATIME > time;
849 $METASERVER_ATIME = time + 60; 805 $METASERVER_ATIME = time + 60;
850 806
851 my $table = $METASERVER->{table}; 807 my $table = $METASERVER->{table};
852 $table->clear; 808 $table->clear;
… …
917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 873 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
918 (new CFClient::UI::Button 874 (new CFClient::UI::Button
919 text => "Use", 875 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field", 876 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub { 877 on_activate => sub {
922 $HOST_ENTRY->set_text ($CFG->{host} = $host); 878 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
923 $METASERVER->hide; 879 $METASERVER->hide;
880 0
924 }, 881 },
925 ), 882 ),
926 (new CFClient::UI::Empty expand => 1), 883 (new CFClient::UI::Empty expand => 1),
927 ]); 884 ]);
928 885
… …
939 } 896 }
940 }); 897 });
941} 898}
942 899
943sub metaserver_dialog { 900sub metaserver_dialog {
901 my $vbox = new CFClient::UI::VBox;
902 my $table = new CFClient::UI::Table;
903 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
904
944 my $dialog = new CFClient::UI::FancyFrame 905 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List", 906 title => "Server List",
946 name => 'metaserver_dialog', 907 name => 'metaserver_dialog',
947 x => 'center', 908 x => 'center',
948 y => 'center', 909 y => 'center',
949 z => 3, 910 z => 3,
950 force_h => $::HEIGHT * 0.4, 911 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 912 child => $vbox,
913 has_close_button => 1,
914 table => $table,
952 on_visibility_change => sub { 915 on_visibility_change => sub {
953 update_metaserver if $_[1]; 916 update_metaserver ($_[0]) if $_[1];
917 0
954 }, 918 },
955 ; 919 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 920
961 $dialog 921 $dialog
962} 922}
963 923
964sub server_setup { 924sub server_setup {
… …
971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 931 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
972 932
973 $vbox->add ( 933 $vbox->add (
974 $HOST_ENTRY = new CFClient::UI::Entry 934 $HOST_ENTRY = new CFClient::UI::Entry
975 expand => 1, 935 expand => 1,
976 text => $CFG->{host}, 936 text => $CFG->{profile}{default}{host},
977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 937 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
978 on_changed => sub { 938 on_changed => sub {
979 my ($self, $value) = @_; 939 my ($self, $value) = @_;
980 $CFG->{host} = $value; 940 $CFG->{profile}{default}{host} = $value;
941 0
981 } 942 }
982 ); 943 );
983
984 $METASERVER = metaserver_dialog;
985 944
986 $vbox->add (new CFClient::UI::Button 945 $vbox->add (new CFClient::UI::Button
987 expand => 1, 946 expand => 1,
988 text => "Server List", 947 text => "Server List",
989 other => $METASERVER, 948 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 949 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility }, 950 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 951 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 952 );
994 } 953 }
995 954
996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 955 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
997 $table->add (1, 4, new CFClient::UI::Entry 956 $table->add (1, 4, new CFClient::UI::Entry
998 text => $CFG->{user}, 957 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 958 tooltip => "The name of your character on the server",
1000 on_changed => sub { 959 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 my ($self, $value) = @_;
1002 $CFG->{user} = $value;
1003 }
1004 ); 960 );
1005 961
1006 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 962 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1007 $table->add (1, 5, new CFClient::UI::Entry 963 $table->add (1, 5, new CFClient::UI::Entry
1008 text => $CFG->{password}, 964 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 965 hidden => 1,
1010 tooltip => "The password for your character", 966 tooltip => "The password for your character",
1011 on_changed => sub { 967 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 my ($self, $value) = @_;
1013 $CFG->{password} = $value;
1014 }
1015 ); 968 );
1016 969
1017 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 970 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1018 $table->add (1, 7, new CFClient::UI::Slider 971 $table->add (1, 7, new CFClient::UI::Slider
1019 force_w => 100, 972 force_w => 100,
1020 range => [$CFG->{mapsize}, 10, 100, 0, 1], 973 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1021 tooltip => "This is the size of the portion of the map update the server sends you. " 974 tooltip => "This is the size of the portion of the map update the server sends you. "
1022 . "If you set this to a high value you will be able to see further, " 975 . "If you set this to a high value you will be able to see further, "
1023 . "but you also increase bandwidth requirements and latency. " 976 . "but you also increase bandwidth requirements and latency. "
1024 . "This option is only used once at log-in.", 977 . "This option is only used once at log-in.",
1025 on_changed => sub { 978 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1026 my ($self, $value) = @_;
1027
1028 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1029 },
1030 ); 979 );
1031 980
1032 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 981 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1033 $table->add (1, 8, new CFClient::UI::CheckBox 982 $table->add (1, 8, new CFClient::UI::CheckBox
1034 state => $CFG->{face_prefetch}, 983 state => $CFG->{face_prefetch},
… …
1037 . "This might increase or create lag, but increases the chances " 986 . "This might increase or create lag, but increases the chances "
1038 . "of faces being ready for display when you encounter them. " 987 . "of faces being ready for display when you encounter them. "
1039 . "It also uses up server bandwidth on every connect, " 988 . "It also uses up server bandwidth on every connect, "
1040 . "so only set it if you really need to prefetch images. " 989 . "so only set it if you really need to prefetch images. "
1041 . "This option can be set and unset any time.", 990 . "This option can be set and unset any time.",
1042 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 991 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1043 ); 992 );
1044 993
1045 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 994 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1046 $table->add (1, 9, new CFClient::UI::Entry 995 $table->add (1, 9, new CFClient::UI::Entry
1047 text => $CFG->{output_count}, 996 text => $CFG->{output_count},
1048 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 997 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1049 on_changed => sub { $CFG->{output_count} = $_[1] }, 998 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1050 ); 999 );
1051 1000
1052 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1001 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1053 $table->add (1, 10, new CFClient::UI::Entry 1002 $table->add (1, 10, new CFClient::UI::Entry
1054 text => $CFG->{output_sync}, 1003 text => $CFG->{output_sync},
1055 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1004 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1056 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1005 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1057 ); 1006 );
1058 1007
1059 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1060 expand => 1, 1009 expand => 1,
1061 align => 0, 1010 align => 0,
1062 text => "Login", 1011 text => "Login",
1063 on_activate => sub { 1012 on_activate => sub {
1064 $CONN ? stop_game 1013 $CONN ? stop_game
1065 : start_game; 1014 : start_game;
1015 0
1066 }, 1016 },
1067 ); 1017 );
1068 1018
1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1019 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1020 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1073 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1023 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1074 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1024 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub { 1025 on_changed => sub {
1076 my ($self, $value) = @_; 1026 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1027 $CFG->{say_command} = $value;
1028 0
1078 } 1029 }
1079 ); 1030 );
1031
1032 $vbox->add (new CFClient::UI::Label
1033 text => "Server Info",
1034 fontsize => 1.2,
1035 padding_y => 8,
1036 fg => [1, 1, 0, 1],
1037 );
1038
1039 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1080 1040
1081 $vbox 1041 $vbox
1082} 1042}
1083 1043
1084sub message_window { 1044sub message_window {
1085 my $window = new CFClient::UI::FancyFrame 1045 my $window = new CFClient::UI::FancyFrame
1086 name => "message_window", 1046 name => "message_window",
1087 title => "Messages", 1047 title => "Messages",
1088 border_bg => [1, 1, 1, 1], 1048 border_bg => [1, 1, 1, 1],
1089 bg => [0, 0, 0, 0.75],
1090 x => "max", 1049 x => "max",
1091 y => 0, 1050 y => 0,
1092 force_w => $::WIDTH * 0.4, 1051 force_w => $::WIDTH * 0.4,
1093 force_h => $::HEIGHT * 0.5, 1052 force_h => $::HEIGHT * 0.5,
1094 child => (my $vbox = new CFClient::UI::VBox); 1053 child => (my $vbox = new CFClient::UI::VBox),
1054 has_close_button => 1;
1095 1055
1096 $vbox->add ($LOGVIEW); 1056 $vbox->add ($LOGVIEW);
1097 1057
1098 $vbox->add (my $input = new CFClient::UI::Entry 1058 $vbox->add (my $input = new CFClient::UI::Entry
1099 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1059 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1107 1067
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1068 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1; 1069 $input->{refocus_map} = 1;
1110 } 1070 }
1111 delete $input->{auto_activated}; 1071 delete $input->{auto_activated};
1072
1073 0
1112 }, 1074 },
1113 on_activate => sub { 1075 on_activate => sub {
1114 my ($input, $text) = @_; 1076 my ($input, $text) = @_;
1115 $input->set_text (''); 1077 $input->set_text ('');
1116 1078
… …
1122 } 1084 }
1123 if ($input->{refocus_map}) { 1085 if ($input->{refocus_map}) {
1124 delete $input->{refocus_map}; 1086 delete $input->{refocus_map};
1125 $MAPWIDGET->focus_in 1087 $MAPWIDGET->focus_in
1126 } 1088 }
1089
1090 0
1127 }, 1091 },
1128 on_escape => sub { 1092 on_escape => sub {
1129 $MAPWIDGET->focus_in 1093 $MAPWIDGET->grab_focus;
1094
1095 0
1130 }, 1096 },
1131 ); 1097 );
1132 1098
1133 $CONSOLE = { 1099 $CONSOLE = {
1134 window => $window, 1100 window => $window,
… …
1156 ); 1122 );
1157 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1123 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1158 $hb->add (new CFClient::UI::Button 1124 $hb->add (new CFClient::UI::Button
1159 text => "Ok", 1125 text => "Ok",
1160 expand => 1, 1126 expand => 1,
1161 on_activate => sub { $QUIT_DIALOG->hide }, 1127 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1162 ); 1128 );
1163 $hb->add (new CFClient::UI::Button 1129 $hb->add (new CFClient::UI::Button
1164 text => "Quit anyway", 1130 text => "Quit anyway",
1165 expand => 1, 1131 expand => 1,
1166 on_activate => sub { exit }, 1132 on_activate => sub { exit },
… …
1173sub autopickup_setup { 1139sub autopickup_setup {
1174 my $table = new CFClient::UI::Table; 1140 my $table = new CFClient::UI::Table;
1175 1141
1176 for ( 1142 for (
1177 ["General", 0, 0, 1143 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE], 1144 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT], 1145 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP], 1146 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG], 1147 ["Debug autopickup" => PICKUP_DEBUG],
1182 ], 1148 ],
1183 ["Weapons", 0, 6, 1149 ["Weapons", 0, 6,
… …
1209 ["Potions" => PICKUP_POTION], 1175 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1176 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED], 1177 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS], 1178 ["Jewelery" => PICKUP_JEWELS],
1213 ], 1179 ],
1180 ["Weight/Value ratio", 2, 17]
1214 ) 1181 )
1215 { 1182 {
1216 my ($title, $x, $y, @bits) = @$_; 1183 my ($title, $x, $y, @bits) = @$_;
1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1184 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1218 1185
1219 for (@bits) { 1186 for (@bits) {
1220 ++$y; 1187 ++$y;
1221 1188
1222 my $mask = $_->[1]; 1189 my $mask = $_->[1];
1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1190 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1191 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1225 state => $CFG->{pickup} & $mask, 1192 state => $::CFG->{pickup} & $mask,
1226 on_changed => sub { 1193 on_changed => sub {
1227 my ($box, $value) = @_; 1194 my ($box, $value) = @_;
1228 1195
1229 if ($value) { 1196 if ($value) {
1230 $::CFG->{pickup} |= $mask; 1197 $::CFG->{pickup} |= $mask;
… …
1232 $::CFG->{pickup} &= ~$mask; 1199 $::CFG->{pickup} &= ~$mask;
1233 } 1200 }
1234 1201
1235 $::CONN->send_command ("pickup $::CFG->{pickup}") 1202 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN; 1203 if defined $::CONN;
1204
1205 0
1237 }); 1206 });
1207
1208 ${$_->[2]} = $checkbox if $_->[2];
1238 } 1209 }
1239 } 1210 }
1240 1211
1212 $table->add (2, 18, new CFClient::UI::ValSlider
1213 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1214 template => ">= 99",
1215 to_value => sub { ">= " . 5 * $_[0] },
1216 on_changed => sub {
1217 my ($slider, $value) = @_;
1218
1219 $::CFG->{pickup} &= ~0xF;
1220 $::CFG->{pickup} |= int $value
1221 if $value;
1222 1;
1223 });
1224
1225 $table->add (3, 18, new CFClient::UI::Button
1226 text => "set",
1227 on_activate => sub {
1228 $::CONN->send_command ("pickup $::CFG->{pickup}")
1229 if defined $::CONN;
1230 0
1231 });
1232
1241 $table 1233 $table
1242} 1234}
1243 1235
1244sub inventory_window { 1236sub inventory_widget {
1237 my $hb = new CFClient::UI::HBox homogeneous => 1;
1238
1239 $hb->add (my $vb1 = new CFClient::UI::VBox);
1240 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1241 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1242 $sw1->add ($INV = new CFClient::UI::Inventory);
1243
1244 $hb->add (my $vb2 = new CFClient::UI::VBox);
1245
1246 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1247
1248 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1249 $sw2->add ($INVR = new CFClient::UI::Inventory);
1250
1251 # XXX: Call after $INVR = ... because set_opencont sets the items
1252 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1253
1254 $hb
1255}
1256
1257sub toggle_player_page {
1258 my ($widget) = @_;
1259
1260 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1261 $PL_WINDOW->hide;
1262 } else {
1263 $PL_NOTEBOOK->set_current_page ($widget);
1264 $PL_WINDOW->show;
1265 }
1266}
1267
1268sub player_window {
1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1269 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1246 x => "center", 1270 x => "center",
1247 y => "center", 1271 y => "center",
1248 force_w => $WIDTH * 9/10, 1272 force_w => $WIDTH * 9/10,
1249 force_h => $HEIGHT * 9/10, 1273 force_h => $HEIGHT * 9/10,
1250 title => "Inventory", 1274 title => "Player",
1275 name => "playerbook",
1276 has_close_button => 1
1251 ; 1277 ;
1252 1278
1253 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1279 my $ntb =
1280 $PL_NOTEBOOK =
1281 new CFClient::UI::Notebook expand => 1, debug => 1;
1254 1282
1255 $hb->add (my $vb1 = new CFClient::UI::VBox); 1283 $ntb->add (
1256 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1284 "Statistics (F2)" => $STATS_PAGE = stats_window,
1257 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1285 "Shows statistics, where all your Stats and Resistances are shown."
1286 );
1287 $ntb->add (
1288 "Skills (F3)" => $SKILL_PAGE = skill_window,
1289 "Shows all your Skills."
1290 );
1258 1291
1259 $hb->add (my $vb2 = new CFClient::UI::VBox); 1292 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1293 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1294 $ntb->add (
1295 "Spellbook (F4)" => $spellsw,
1296 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1297 );
1298 $ntb->add (
1299 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1300 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1301 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1302 );
1260 1303
1261 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1304 $ntb->set_current_page ($INVENTORY_PAGE);
1262 1305
1263 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1306 $plwin->add ($ntb);
1264 1307 $plwin
1265 # XXX: Call after $INVR = ... because set_opencont sets the items
1266 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1267
1268 $invwin
1269} 1308}
1270 1309
1271sub spell_setup { 1310sub update_bindings {
1272 new CFClient::UI::SpellList 1311 $BIND_UPD_CB->() if $BIND_UPD_CB;
1273} 1312}
1274 1313
1275sub keyboard_setup { 1314sub keyboard_setup {
1276 my $binding_list = new CFClient::UI::VBox; 1315 my $binding_list = new CFClient::UI::VBox;
1277 1316
1278 my $refresh; 1317 my $refresh;
1279 $refresh = sub { 1318 $refresh = $BIND_UPD_CB = sub {
1280 $binding_list->clear (); 1319 $binding_list->clear ();
1281 1320
1282 for my $mod (keys %{$::CFG->{bindings}}) { 1321 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1283 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1322 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1284 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1323 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1285 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1324 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1286 1325
1287 my $lbl = join "; ", @$cmds; 1326 my $lbl = join "; ", @$cmds;
1288 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1327 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1289 $binding_list->add (my $hb = new CFClient::UI::HBox); 1328 $binding_list->add (my $hb = new CFClient::UI::HBox);
1290 $hb->add (new CFClient::UI::Button 1329 $hb->add (new CFClient::UI::Button
1291 text => "delete", 1330 text => "delete",
1292 tooltip => "Deletes the binding", 1331 tooltip => "Deletes the binding",
1293 on_activate => sub { 1332 on_activate => sub {
1294 $binding_list->remove ($hb); 1333 $binding_list->remove ($hb);
1295 delete $::CFG->{bindings}->{$mod}->{$sym}; 1334 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1335 0
1296 }); 1336 });
1297 1337
1298 $hb->add (new CFClient::UI::Button 1338 $hb->add (new CFClient::UI::Button
1299 text => "edit", 1339 text => "edit",
1300 tooltip => "Edits the binding", 1340 tooltip => "Edits the binding",
1301 on_activate => sub { 1341 on_activate => sub {
1302 $::BIND_EDITOR->set_binding ( 1342 $::BIND_EDITOR->set_binding (
1303 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1343 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1304 sub { 1344 sub {
1305 my ($nmod, $nsym, $ncmds) = @_; 1345 my ($nmod, $nsym, $ncmds) = @_;
1306 delete $::CFG->{bindings}->{$mod}->{$sym}; 1346 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1307 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1347 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1308 $refresh->(); 1348 $refresh->();
1309 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1349 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1310 $SETUP_DIALOG->show; 1350 $SETUP_DIALOG->show;
1311 }, 1351 },
1312 sub { 1352 sub {
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1353 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1354 $SETUP_DIALOG->show;
1315 }); 1355 });
1316 $::BIND_EDITOR->show; 1356 $::BIND_EDITOR->show;
1317 $SETUP_DIALOG->hide; 1357 $SETUP_DIALOG->hide;
1358 0
1318 }); 1359 });
1319 1360
1320 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1361 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1321 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1362 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1322 } 1363 }
1323 } 1364 }
1324 }; 1365 };
1325 1366
1326 my $vb = new CFClient::UI::VBox; 1367 my $vb = new CFClient::UI::VBox;
1368 $vb->add (my $hb = new CFClient::UI::HBox);
1369 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1370 $hb->add (new CFClient::UI::CheckBox
1371 expand => 1,
1372 state => $CFG->{shift_fire_stop},
1373 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1374 on_changed => sub {
1375 my ($cbox, $value) = @_;
1376 $CFG->{shift_fire_stop} = $value;
1377 0
1378 });
1379
1327 $vb->add ($binding_list); 1380 $vb->add ($binding_list);
1328 $vb->add (my $hb = new CFClient::UI::HBox); 1381 $vb->add (my $hb = new CFClient::UI::HBox);
1329 1382
1330 $hb->add (new CFClient::UI::Button 1383 $hb->add (new CFClient::UI::Button
1331 text => "record new", 1384 text => "record new",
… …
1333 tooltip => "This button opens the binding editor with an empty binding.", 1386 tooltip => "This button opens the binding editor with an empty binding.",
1334 on_activate => sub { 1387 on_activate => sub {
1335 $::BIND_EDITOR->set_binding (undef, undef, [], 1388 $::BIND_EDITOR->set_binding (undef, undef, [],
1336 sub { 1389 sub {
1337 my ($mod, $sym, $cmds) = @_; 1390 my ($mod, $sym, $cmds) = @_;
1338 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1391 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1339 $refresh->(); 1392 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1342 }, 1395 },
1343 sub { 1396 sub {
… …
1345 $SETUP_DIALOG->show; 1398 $SETUP_DIALOG->show;
1346 }, 1399 },
1347 ); 1400 );
1348 $SETUP_DIALOG->hide; 1401 $SETUP_DIALOG->hide;
1349 $::BIND_EDITOR->show; 1402 $::BIND_EDITOR->show;
1403 0
1350 }, 1404 },
1351 ); 1405 );
1352 1406
1353 $hb->add (new CFClient::UI::Button 1407 $hb->add (new CFClient::UI::Button
1354 text => "close", 1408 text => "close",
1355 tooltip => "Closes the binding window", 1409 tooltip => "Closes the binding window",
1356 expand => 1, 1410 expand => 1,
1357 on_activate => sub { 1411 on_activate => sub {
1358 $SETUP_DIALOG->hide; 1412 $SETUP_DIALOG->hide;
1413 0
1359 } 1414 }
1360 ); 1415 );
1361 1416
1362 $refresh->(); 1417 $refresh->();
1363 1418
1364 $vb 1419 $vb
1420}
1421
1422# just weirdness, pls. ignore
1423sub load_html_page {
1424 my ($viewer, $base) = @_;
1425
1426 $viewer->clear;
1427
1428 require LWP::Simple;
1429 require HTML::Parser;
1430 require URI;
1431
1432 my $page = LWP::Simple::get ($base)
1433 or return;
1434
1435 my @s = { };
1436 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1437
1438 my $parser = HTML::Parser->new (
1439 text_h => [sub {
1440 my ($text) = @_;
1441 $text =~ s/\s+/ /g;
1442 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1443 }, "dtext"],
1444 start_h => [sub {
1445 my ($tag, $attr) = @_;
1446 if ($passthrough{$tag}) {
1447 $s[-1]{text} .= "<$tag>";
1448 } elsif ($tag eq "h1") {
1449 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1450 } elsif ($tag eq "h2") {
1451 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1452 } elsif ($tag eq "h3") {
1453 push @s, { text => "<span size='large'>" };
1454 } elsif ($tag eq "a") {
1455 push @s, { text => "", url => $attr->{href} };
1456 } elsif ($tag eq "p") {
1457 push @s, { };
1458 } elsif ($tag eq "img") {
1459 eval {
1460 push @{$s[-1]{obj}}, new CFClient::UI::Image
1461 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1462 $s[-1]{text} .= "\x{fffc}";
1463 };
1464 }
1465 }, "tagname, attr"],
1466 end_h => [sub {
1467 my ($tag) = @_;
1468 if ($passthrough{$tag}) {
1469 $s[-1]{text} .= "</$tag>";
1470 } elsif ($tag =~ /^h\d$/) {
1471 $s[-1]{text} .= "</span>";
1472 push @s, { };
1473 } elsif ($tag eq "a") {
1474 my $S = pop @s;
1475 $s[-1]{text} .= "\x{fffc}";
1476 push @{$s[-1]{obj}}, new CFClient::UI::Label
1477 fg => [0.8, 0.8, 1],
1478 markup => "<u>$S->{text}</u>",
1479 fontsize => 0.8,
1480 can_events => 1,
1481 can_focus => 1,
1482 on_button_up => sub {
1483 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1484 },
1485 ;
1486 }
1487 }, "tagname"],
1488 );
1489
1490 $parser->parse ($page);
1491 $parser->eof;
1492
1493 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1494 for @s;
1495
1496 $viewer->set_offset (0);
1365} 1497}
1366 1498
1367sub help_window { 1499sub help_window {
1368 my $win = new CFClient::UI::FancyFrame 1500 my $win = new CFClient::UI::FancyFrame
1369 x => 'center', 1501 x => 'center',
1370 y => 'center', 1502 y => 'center',
1371 z => 2, 1503 z => 2,
1372 name => 'doc_browser', 1504 name => 'doc_browser',
1373 force_w => int $WIDTH * 7/8, 1505 force_w => int $WIDTH * 7/8,
1374 force_h => int $HEIGHT * 7/8, 1506 force_h => int $HEIGHT * 7/8,
1375 title => "Documentation"; 1507 title => "Help Browser",
1508 has_close_button => 1;
1376 1509
1377 $win->add (my $vbox = new CFClient::UI::VBox); 1510 $win->add (my $vbox = new CFClient::UI::VBox);
1378 1511
1379 $vbox->add (my $buttons = new CFClient::UI::HBox); 1512 $vbox->add (my $buttons = new CFClient::UI::HBox);
1380 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1513 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1516 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox 1517 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef, 1518 value => undef,
1386 options => [ 1519 options => [
1387 [intro => "Introduction"], 1520 [intro => "Introduction"],
1388 [manual => "Manual"], 1521 [manual => "Main Manual"],
1389 [skill_help => "Skills"], 1522 [skill_help => "Skill Reference"],
1390 [command_help => "Commands"], 1523 [command_help => "Command Reference"],
1391 [dmcommand_help => "DM Commands"], 1524 [dmcommand_help => "DM Commands"],
1392 [COPYING => "License Terms"], 1525 [COPYING => "License Terms"],
1526 [test => "test (do not select)"], #d#TODO
1393 ], 1527 ],
1394 on_changed => sub { 1528 on_changed => sub {
1395 my ($self, $pod) = @_; 1529 my ($self, $pod) = @_;
1396 1530
1531 if ($pod eq "test") {#d#TODO
1532 eval {
1533 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1534 };
1535 warn "$@" if $@;
1536 return;
1537 }
1538
1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1539 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1540 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1399 1541
1400 $viewer->clear; 1542 $viewer->clear;
1543
1544# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1545# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1546# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1547# ]);#d#
1401 1548
1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1549 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1403 for @$pom; 1550 for @$pom;
1404 1551
1405 $viewer->set_offset (0); 1552 $viewer->set_offset (0);
1553
1554 0
1406 }, 1555 },
1407 on_visibility_change => sub { 1556 on_visibility_change => sub {
1408 my ($self, $visible) = @_; 1557 my ($self, $visible) = @_;
1409 return unless $visible; 1558 return unless $visible;
1410 return if $self->{value}; 1559 return if $self->{value};
1411 $self->set_value ("intro"); 1560 $self->set_value ("intro");
1561 0
1412 }, 1562 },
1413 ); 1563 );
1414 1564
1415 $win 1565 $win
1416} 1566}
… …
1455 z => 100, 1605 z => 100,
1456 force_x => "max", 1606 force_x => "max",
1457 force_y => 0; 1607 force_y => 0;
1458 $DEBUG_STATUS->show; 1608 $DEBUG_STATUS->show;
1459 1609
1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1610 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1461 1611
1462 $STATUSBOX = new CFClient::UI::Statusbox; 1612 $STATUSBOX = new CFClient::UI::Statusbox;
1463 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1613 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1464 1614
1465 (new CFClient::UI::Frame 1615 (new CFClient::UI::Frame
… …
1485 $MAPWIDGET->connect (activate_console => sub { 1635 $MAPWIDGET->connect (activate_console => sub {
1486 my ($mapwidget, $preset) = @_; 1636 my ($mapwidget, $preset) = @_;
1487 1637
1488 if ($CONSOLE) { 1638 if ($CONSOLE) {
1489 $CONSOLE->{input}->{auto_activated} = 1; 1639 $CONSOLE->{input}->{auto_activated} = 1;
1490 $CONSOLE->{input}->focus_in; 1640 $CONSOLE->{input}->grab_focus;
1491 1641
1492 if ($preset && $CONSOLE->{input}->get_text eq '') { 1642 if ($preset && $CONSOLE->{input}->get_text eq '') {
1493 $CONSOLE->{input}->set_text ($preset); 1643 $CONSOLE->{input}->set_text ($preset);
1494 } 1644 }
1495 } 1645 }
1496 }); 1646 });
1497 $MAPWIDGET->show; 1647 $MAPWIDGET->show;
1498 $MAPWIDGET->focus_in; 1648 $MAPWIDGET->grab_focus;
1499 1649
1500 $LOGVIEW = new CFClient::UI::TextScroller 1650 $LOGVIEW = new CFClient::UI::TextScroller
1501 expand => 1, 1651 expand => 1,
1502 font => $FONT_FIXED, 1652 font => $FONT_FIXED,
1503 fontsize => $::CFG->{log_fontsize}, 1653 fontsize => $::CFG->{log_fontsize},
… …
1513 x => 'center', 1663 x => 'center',
1514 y => 'center', 1664 y => 'center',
1515 z => 2, 1665 z => 2,
1516 force_w => $::WIDTH * 0.6, 1666 force_w => $::WIDTH * 0.6,
1517 force_h => $::HEIGHT * 0.6, 1667 force_h => $::HEIGHT * 0.6,
1668 has_close_button => 1,
1518 ; 1669 ;
1670
1671 $METASERVER = metaserver_dialog;
1519 1672
1520 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1673 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1674 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1522 1675
1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1676 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1527 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1680 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1528 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1681 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1529 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1682 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1530 "Configure the use of audio, sound effects and background music."); 1683 "Configure the use of audio, sound effects and background music.");
1531 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1684 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1532 "Lets you define, edit and delete bindings." 1685 "Lets you define, edit and delete key bindings."
1533 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1686 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1534 . "with nothing set and the recording started. After doing the actions you " 1687 . "with nothing set and the recording started. After doing the actions you "
1535 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1688 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1536 . "After pressing the combo the binding will be saved automatically and the " 1689 . "After pressing the combo the binding will be saved automatically and the "
1537 . "binding editor closes"); 1690 . "binding editor closes");
1538 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1539 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1540 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1691 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask."); 1692 "Some debuggin' options. Do not ask.");
1542 1693
1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1694 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1544 1695
1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1546 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1697 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1548 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1699 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1549 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1700 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1550 1701
1551 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 1702 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
1552 1703
1553 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1554 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1555 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1704 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1556 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1705 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1557 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1558 1706
1559 $BUTTONBAR->add (new CFClient::UI::Button 1707 $BUTTONBAR->add (new CFClient::UI::Button
1560 text => "Save Config", 1708 text => "Save Config",
1561 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1709 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1562 on_activate => sub { 1710 on_activate => sub {
1563 $::CFG->{layout} = CFClient::UI::get_layout; 1711 $::CFG->{layout} = CFClient::UI::get_layout;
1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1712 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1565 status "Configuration Saved"; 1713 status "Configuration Saved";
1714 0
1566 }, 1715 },
1567 ); 1716 );
1568 1717
1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1718 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1570 tooltip => "View Documentation"); 1719 tooltip => "View Documentation");
1571 1720
1572 $BUTTONBAR->add (new CFClient::UI::Button 1721 $BUTTONBAR->add (new CFClient::UI::Button
1573 text => "Quit", 1722 text => "Quit",
1574 tooltip => "Terminates the program", 1723 tooltip => "Terminates the program",
… …
1576 if ($CONN) { 1725 if ($CONN) {
1577 open_quit_dialog; 1726 open_quit_dialog;
1578 } else { 1727 } else {
1579 exit; 1728 exit;
1580 } 1729 }
1730 0
1581 }, 1731 },
1582 ); 1732 );
1583 1733
1584 $BUTTONBAR->show; 1734 $BUTTONBAR->show;
1585 $SETUP_DIALOG->show; 1735 $SETUP_DIALOG->show;
… …
1587 1737
1588 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1738 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1589} 1739}
1590 1740
1591sub video_shutdown { 1741sub video_shutdown {
1742 CFClient::OpenGL::shutdown;
1743
1592 undef $SDL_ACTIVE; 1744 undef $SDL_ACTIVE;
1593} 1745}
1594 1746
1595my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1747my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1596my $bgmusic;#TODO#hack#d# 1748my $bgmusic;#TODO#hack#d#
… …
1777# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1929# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1778 }, 1930 },
1779 CFClient::SDL_KEYDOWN => sub { 1931 CFClient::SDL_KEYDOWN => sub {
1780 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1932 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1781 # alt-enter 1933 # alt-enter
1934 $FULLSCREEN_ENABLE->toggle;
1782 video_shutdown; 1935 video_shutdown;
1783 $CFG->{fullscreen} = !$CFG->{fullscreen};
1784 video_init; 1936 video_init;
1785 } else { 1937 } else {
1786 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1938 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1787 } 1939 }
1788 }, 1940 },
… …
1804$SIG{INT} = $SIG{TERM} = sub { exit }; 1956$SIG{INT} = $SIG{TERM} = sub { exit };
1805 1957
1806{ 1958{
1807 local $SIG{__DIE__} = sub { 1959 local $SIG{__DIE__} = sub {
1808 return unless defined $^S && !$^S; 1960 return unless defined $^S && !$^S;
1809 Carp::confess $_[1];#d#TODO: remove when stable 1961 Carp::confess $_[0];#d#TODO: remove when stable
1810 CFClient::fatal $_[0]; 1962 CFClient::fatal $_[0];
1811 }; 1963 };
1812 1964
1813 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1965 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1814 CFClient::UI::set_layout ($::CFG->{layout}); 1966 CFClient::UI::set_layout ($::CFG->{layout});
1815 1967
1816 my %DEF_CFG = ( 1968 my %DEF_CFG = (
1817 sdl_mode => 0, 1969 sdl_mode => 0,
1818 width => 640, 1970 width => 640,
1819 height => 480, 1971 height => 480,
1820 fullscreen => 0, 1972 fullscreen => 0,
1821 fast => 0, 1973 fast => 0,
1822 map_scale => 1, 1974 map_scale => 1,
1823 fow_enable => 1, 1975 fow_enable => 1,
1824 fow_intensity => 0.45, 1976 fow_intensity => 0.45,
1825 fow_smooth => 0, 1977 fow_smooth => 0,
1826 gui_fontsize => 1, 1978 gui_fontsize => 1,
1827 log_fontsize => 0.7, 1979 log_fontsize => 0.7,
1828 gauge_fontsize=> 1, 1980 gauge_fontsize => 1,
1829 gauge_size => 0.35, 1981 gauge_size => 0.35,
1830 stat_fontsize => 0.7, 1982 stat_fontsize => 0.7,
1831 mapsize => 100, 1983 mapsize => 100,
1832 host => "crossfire.schmorp.de",
1833 say_command => 'say', 1984 say_command => 'say',
1834 audio_enable => 1, 1985 audio_enable => 1,
1835 bgm_enable => 1, 1986 bgm_enable => 1,
1836 bgm_volume => 0.25, 1987 bgm_volume => 0.25,
1837 face_prefetch => 0, 1988 face_prefetch => 0,
1838 output_sync => 1, 1989 output_sync => 1,
1839 output_count => 1, 1990 output_count => 1,
1840 pickup => 0, 1991 pickup => 0,
1992 default => "profile", # default profile
1993 );
1841 ); 1994
1842
1843 while (my ($k, $v) = each %DEF_CFG) { 1995 while (my ($k, $v) = each %DEF_CFG) {
1844 $CFG->{$k} = $v unless exists $CFG->{$k}; 1996 $CFG->{$k} = $v unless exists $CFG->{$k};
1845 } 1997 }
1998
1999 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1846 2000
1847 sdl_init; 2001 sdl_init;
1848 2002
1849 @SDL_MODES = reverse 2003 @SDL_MODES = reverse
1850 grep $_->[0] >= 640 && $_->[1] >= 480, 2004 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1892 video_init; 2046 video_init;
1893 audio_init; 2047 audio_init;
1894} 2048}
1895 2049
1896Event::loop; 2050Event::loop;
2051#CFClient::SDL_Quit;
2052#CFClient::_exit 0;
1897 2053
1898END { CFClient::SDL_Quit } 2054END { CFClient::SDL_Quit }
1899 2055
1900=head1 NAME 2056=head1 NAME
1901 2057

Diff Legend

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