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.96 by root, Mon Jul 17 01:41:54 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 $vb = new CFClient::UI::VBox;
660 y => $HEIGHT * (2/8),
661 x => "max",
662 title => "Stats",
663 name => "stats_window";
664 650
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, 651 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 652 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."); 653 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, 654 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 655 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."], 679 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
695 680
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."], 681 [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."], 682 [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."], 683 [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."], 684 [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."], 685 [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."], 686 [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 ) { 687 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 688 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
704 689
… …
706 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 691 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 692 $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); 693 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
709 } 694 }
710 695
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
712 697
713 my $row = 0; 698 my $row = 0;
714 my $col = 0; 699 my $col = 0;
715 700
716 my %resist_names = ( 701 my %resist_names = (
702 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.)", 703 "<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.)"],
704 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.)", 705 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
706 conf => ["Confusion",
719 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 707 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
708 fire => ["Fire",
720 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 709 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
710 depl => ["Depletion",
721 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 711 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
712 magic => ["Magic",
722 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 713 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
714 drain => ["Draining",
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 715 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
716 acid => ["Acid",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 717 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
718 pois => ["Poison",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 719 "<b>Poison</b> (resistance to getting poisoned)"],
720 para => ["Paralysation",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 721 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
722 deat => ["Death",
727 deat => "<b>Death</b> (resistance against death spells)", 723 "<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)", 724 phys => ["Physical",
725 "<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.)"],
726 blind => ["Blind",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
728 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)", 729 "<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)"],
730 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...", 731 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
732 elec => ["Electricity",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 733 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
734 cold => ["Cold",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
736 ghit => ["Ghost hit",
734 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 737 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
735 ); 738 );
736 for (qw/slow holyw conf fire depl magic 739 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 740 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 741 blind fear tund elec cold ghit/)
739 { 742 {
… …
744 template => "-100%", 747 template => "-100%",
745 align => +1, 748 align => +1,
746 valign => 0, 749 valign => 0,
747 can_events => 1, 750 can_events => 1,
748 can_hover => 1, 751 can_hover => 1,
749 tooltip => $resist_names{$_}, 752 tooltip => $resist_names{$_}->[1],
750 ); 753 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
752 font => $FONT_FIXED, 755 font => $FONT_FIXED,
753 can_hover => 1, 756 can_hover => 1,
754 can_events => 1, 757 can_events => 1,
755 image => "ui/resist/resist_$_.png", 758 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 759 tooltip => $resist_names{$_}->[1],
760 );
761 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
762 text => $resist_names{$_}->[0],
763 font => $FONT_FIXED,
764 can_hover => 1,
765 can_events => 1,
766 tooltip => $resist_names{$_}->[1],
757 ); 767 );
758 768
759 $row++; 769 $row++;
760 if ($row % 6 == 0) { 770 if ($row % 6 == 0) {
761 $col += 2; 771 $col += 3;
762 $row = 0; 772 $row = 0;
763 } 773 }
764 } 774 }
765 775
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 776 #update_stats_window ({});
768 777
769 $tgw 778 $vb
779}
780
781sub skill_window {
782 $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]
770} 783}
771 784
772sub formsep($) { 785sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 787}
775 788
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; 789my $METASERVER_ATIME;
846 790
847sub update_metaserver { 791sub update_metaserver {
792 my ($metaserver_dialog) = @_;
793
794 $METASERVER = $metaserver_dialog
795 if defined $metaserver_dialog;
796
848 return if $METASERVER_ATIME > time; 797 return if $METASERVER_ATIME > time;
849 $METASERVER_ATIME = time + 60; 798 $METASERVER_ATIME = time + 60;
850 799
851 my $table = $METASERVER->{table}; 800 my $table = $METASERVER->{table};
852 $table->clear; 801 $table->clear;
… …
917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 866 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
918 (new CFClient::UI::Button 867 (new CFClient::UI::Button
919 text => "Use", 868 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field", 869 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub { 870 on_activate => sub {
922 $HOST_ENTRY->set_text ($CFG->{host} = $host); 871 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
923 $METASERVER->hide; 872 $METASERVER->hide;
873 0
924 }, 874 },
925 ), 875 ),
926 (new CFClient::UI::Empty expand => 1), 876 (new CFClient::UI::Empty expand => 1),
927 ]); 877 ]);
928 878
… …
939 } 889 }
940 }); 890 });
941} 891}
942 892
943sub metaserver_dialog { 893sub metaserver_dialog {
894 my $vbox = new CFClient::UI::VBox;
895 my $table = new CFClient::UI::Table;
896 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
897
944 my $dialog = new CFClient::UI::FancyFrame 898 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List", 899 title => "Server List",
946 name => 'metaserver_dialog', 900 name => 'metaserver_dialog',
947 x => 'center', 901 x => 'center',
948 y => 'center', 902 y => 'center',
949 z => 3, 903 z => 3,
950 force_h => $::HEIGHT * 0.4, 904 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 905 child => $vbox,
906 has_close_button => 1,
907 table => $table,
952 on_visibility_change => sub { 908 on_visibility_change => sub {
953 update_metaserver if $_[1]; 909 update_metaserver ($_[0]) if $_[1];
910 0
954 }, 911 },
955 ; 912 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 913
961 $dialog 914 $dialog
962} 915}
963 916
964sub server_setup { 917sub server_setup {
… …
971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 924 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
972 925
973 $vbox->add ( 926 $vbox->add (
974 $HOST_ENTRY = new CFClient::UI::Entry 927 $HOST_ENTRY = new CFClient::UI::Entry
975 expand => 1, 928 expand => 1,
976 text => $CFG->{host}, 929 text => $CFG->{profile}{default}{host},
977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 930 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
978 on_changed => sub { 931 on_changed => sub {
979 my ($self, $value) = @_; 932 my ($self, $value) = @_;
980 $CFG->{host} = $value; 933 $CFG->{profile}{default}{host} = $value;
934 0
981 } 935 }
982 ); 936 );
983
984 $METASERVER = metaserver_dialog;
985 937
986 $vbox->add (new CFClient::UI::Button 938 $vbox->add (new CFClient::UI::Button
987 expand => 1, 939 expand => 1,
988 text => "Server List", 940 text => "Server List",
989 other => $METASERVER, 941 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 942 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility }, 943 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 944 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 945 );
994 } 946 }
995 947
996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 948 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
997 $table->add (1, 4, new CFClient::UI::Entry 949 $table->add (1, 4, new CFClient::UI::Entry
998 text => $CFG->{user}, 950 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 951 tooltip => "The name of your character on the server",
1000 on_changed => sub { 952 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 my ($self, $value) = @_;
1002 $CFG->{user} = $value;
1003 }
1004 ); 953 );
1005 954
1006 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 955 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1007 $table->add (1, 5, new CFClient::UI::Entry 956 $table->add (1, 5, new CFClient::UI::Entry
1008 text => $CFG->{password}, 957 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 958 hidden => 1,
1010 tooltip => "The password for your character", 959 tooltip => "The password for your character",
1011 on_changed => sub { 960 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 my ($self, $value) = @_;
1013 $CFG->{password} = $value;
1014 }
1015 ); 961 );
1016 962
1017 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 963 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1018 $table->add (1, 7, new CFClient::UI::Slider 964 $table->add (1, 7, new CFClient::UI::Slider
1019 force_w => 100, 965 force_w => 100,
1020 range => [$CFG->{mapsize}, 10, 100, 0, 1], 966 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1021 tooltip => "This is the size of the portion of the map update the server sends you. " 967 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, " 968 . "If you set this to a high value you will be able to see further, "
1023 . "but you also increase bandwidth requirements and latency. " 969 . "but you also increase bandwidth requirements and latency. "
1024 . "This option is only used once at log-in.", 970 . "This option is only used once at log-in.",
1025 on_changed => sub { 971 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 ); 972 );
1031 973
1032 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 974 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1033 $table->add (1, 8, new CFClient::UI::CheckBox 975 $table->add (1, 8, new CFClient::UI::CheckBox
1034 state => $CFG->{face_prefetch}, 976 state => $CFG->{face_prefetch},
… …
1037 . "This might increase or create lag, but increases the chances " 979 . "This might increase or create lag, but increases the chances "
1038 . "of faces being ready for display when you encounter them. " 980 . "of faces being ready for display when you encounter them. "
1039 . "It also uses up server bandwidth on every connect, " 981 . "It also uses up server bandwidth on every connect, "
1040 . "so only set it if you really need to prefetch images. " 982 . "so only set it if you really need to prefetch images. "
1041 . "This option can be set and unset any time.", 983 . "This option can be set and unset any time.",
1042 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 984 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1043 ); 985 );
1044 986
1045 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 987 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1046 $table->add (1, 9, new CFClient::UI::Entry 988 $table->add (1, 9, new CFClient::UI::Entry
1047 text => $CFG->{output_count}, 989 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.", 990 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] }, 991 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1050 ); 992 );
1051 993
1052 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 994 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1053 $table->add (1, 10, new CFClient::UI::Entry 995 $table->add (1, 10, new CFClient::UI::Entry
1054 text => $CFG->{output_sync}, 996 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.", 997 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] }, 998 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1057 ); 999 );
1058 1000
1059 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1001 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1060 expand => 1, 1002 expand => 1,
1061 align => 0, 1003 align => 0,
1062 text => "Login", 1004 text => "Login",
1063 on_activate => sub { 1005 on_activate => sub {
1064 $CONN ? stop_game 1006 $CONN ? stop_game
1065 : start_game; 1007 : start_game;
1008 0
1066 }, 1009 },
1067 ); 1010 );
1068 1011
1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1012 $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 1013 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1073 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1016 . "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.", 1017 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub { 1018 on_changed => sub {
1076 my ($self, $value) = @_; 1019 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1020 $CFG->{say_command} = $value;
1021 0
1078 } 1022 }
1079 ); 1023 );
1024
1025 $vbox->add (new CFClient::UI::Label
1026 text => "Server Info",
1027 fontsize => 1.2,
1028 padding_y => 8,
1029 fg => [1, 1, 0, 1],
1030 );
1031
1032 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1080 1033
1081 $vbox 1034 $vbox
1082} 1035}
1083 1036
1084sub message_window { 1037sub message_window {
1085 my $window = new CFClient::UI::FancyFrame 1038 my $window = new CFClient::UI::FancyFrame
1086 name => "message_window", 1039 name => "message_window",
1087 title => "Messages", 1040 title => "Messages",
1088 border_bg => [1, 1, 1, 1], 1041 border_bg => [1, 1, 1, 1],
1089 bg => [0, 0, 0, 0.75],
1090 x => "max", 1042 x => "max",
1091 y => 0, 1043 y => 0,
1092 force_w => $::WIDTH * 0.4, 1044 force_w => $::WIDTH * 0.4,
1093 force_h => $::HEIGHT * 0.5, 1045 force_h => $::HEIGHT * 0.5,
1094 child => (my $vbox = new CFClient::UI::VBox); 1046 child => (my $vbox = new CFClient::UI::VBox),
1047 has_close_button => 1;
1095 1048
1096 $vbox->add ($LOGVIEW); 1049 $vbox->add ($LOGVIEW);
1097 1050
1098 $vbox->add (my $input = new CFClient::UI::Entry 1051 $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> " 1052 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1107 1060
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1061 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1; 1062 $input->{refocus_map} = 1;
1110 } 1063 }
1111 delete $input->{auto_activated}; 1064 delete $input->{auto_activated};
1065
1066 0
1112 }, 1067 },
1113 on_activate => sub { 1068 on_activate => sub {
1114 my ($input, $text) = @_; 1069 my ($input, $text) = @_;
1115 $input->set_text (''); 1070 $input->set_text ('');
1116 1071
… …
1122 } 1077 }
1123 if ($input->{refocus_map}) { 1078 if ($input->{refocus_map}) {
1124 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
1125 $MAPWIDGET->focus_in 1080 $MAPWIDGET->focus_in
1126 } 1081 }
1082
1083 0
1127 }, 1084 },
1128 on_escape => sub { 1085 on_escape => sub {
1129 $MAPWIDGET->focus_in 1086 $MAPWIDGET->grab_focus;
1087
1088 0
1130 }, 1089 },
1131 ); 1090 );
1132 1091
1133 $CONSOLE = { 1092 $CONSOLE = {
1134 window => $window, 1093 window => $window,
… …
1156 ); 1115 );
1157 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1116 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1158 $hb->add (new CFClient::UI::Button 1117 $hb->add (new CFClient::UI::Button
1159 text => "Ok", 1118 text => "Ok",
1160 expand => 1, 1119 expand => 1,
1161 on_activate => sub { $QUIT_DIALOG->hide }, 1120 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1162 ); 1121 );
1163 $hb->add (new CFClient::UI::Button 1122 $hb->add (new CFClient::UI::Button
1164 text => "Quit anyway", 1123 text => "Quit anyway",
1165 expand => 1, 1124 expand => 1,
1166 on_activate => sub { exit }, 1125 on_activate => sub { exit },
… …
1173sub autopickup_setup { 1132sub autopickup_setup {
1174 my $table = new CFClient::UI::Table; 1133 my $table = new CFClient::UI::Table;
1175 1134
1176 for ( 1135 for (
1177 ["General", 0, 0, 1136 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE], 1137 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT], 1138 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP], 1139 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG], 1140 ["Debug autopickup" => PICKUP_DEBUG],
1182 ], 1141 ],
1183 ["Weapons", 0, 6, 1142 ["Weapons", 0, 6,
… …
1209 ["Potions" => PICKUP_POTION], 1168 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1169 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED], 1170 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS], 1171 ["Jewelery" => PICKUP_JEWELS],
1213 ], 1172 ],
1173 ["Weight/Value ratio", 2, 17]
1214 ) 1174 )
1215 { 1175 {
1216 my ($title, $x, $y, @bits) = @$_; 1176 my ($title, $x, $y, @bits) = @$_;
1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1177 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1218 1178
1219 for (@bits) { 1179 for (@bits) {
1220 ++$y; 1180 ++$y;
1221 1181
1222 my $mask = $_->[1]; 1182 my $mask = $_->[1];
1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1183 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1184 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1225 state => $CFG->{pickup} & $mask, 1185 state => $::CFG->{pickup} & $mask,
1226 on_changed => sub { 1186 on_changed => sub {
1227 my ($box, $value) = @_; 1187 my ($box, $value) = @_;
1228 1188
1229 if ($value) { 1189 if ($value) {
1230 $::CFG->{pickup} |= $mask; 1190 $::CFG->{pickup} |= $mask;
… …
1232 $::CFG->{pickup} &= ~$mask; 1192 $::CFG->{pickup} &= ~$mask;
1233 } 1193 }
1234 1194
1235 $::CONN->send_command ("pickup $::CFG->{pickup}") 1195 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN; 1196 if defined $::CONN;
1197
1198 0
1237 }); 1199 });
1200
1201 ${$_->[2]} = $checkbox if $_->[2];
1238 } 1202 }
1239 } 1203 }
1240 1204
1205 $table->add (2, 18, new CFClient::UI::ValSlider
1206 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207 template => ">= 99",
1208 to_value => sub { ">= " . 5 * $_[0] },
1209 on_changed => sub {
1210 my ($slider, $value) = @_;
1211
1212 $::CFG->{pickup} &= ~0xF;
1213 $::CFG->{pickup} |= int $value
1214 if $value;
1215 1;
1216 });
1217
1218 $table->add (3, 18, new CFClient::UI::Button
1219 text => "set",
1220 on_activate => sub {
1221 $::CONN->send_command ("pickup $::CFG->{pickup}")
1222 if defined $::CONN;
1223 0
1224 });
1225
1241 $table 1226 $table
1242} 1227}
1243 1228
1244sub inventory_window { 1229sub inventory_widget {
1230 my $hb = new CFClient::UI::HBox homogeneous => 1;
1231
1232 $hb->add (my $vb1 = new CFClient::UI::VBox);
1233 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1234 $vb1->add ($INV = new CFClient::UI::Inventory);
1235
1236 $hb->add (my $vb2 = new CFClient::UI::VBox);
1237
1238 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1239
1240 $vb2->add ($INVR = new CFClient::UI::Inventory);
1241
1242 # XXX: Call after $INVR = ... because set_opencont sets the items
1243 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1244
1245 $hb
1246}
1247
1248sub toggle_player_page {
1249 my ($widget) = @_;
1250
1251 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1252 $PL_WINDOW->hide;
1253 } else {
1254 $PL_NOTEBOOK->set_current_page ($widget);
1255 $PL_WINDOW->show;
1256 }
1257}
1258
1259sub player_window {
1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1246 x => "center", 1261 x => "center",
1247 y => "center", 1262 y => "center",
1248 force_w => $WIDTH * 9/10, 1263 force_w => $WIDTH * 9/10,
1249 force_h => $HEIGHT * 9/10, 1264 force_h => $HEIGHT * 9/10,
1250 title => "Inventory", 1265 title => "Player",
1266 name => "playerbook",
1267 has_close_button => 1
1251 ; 1268 ;
1252 1269
1253 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1270 my $ntb =
1271 $PL_NOTEBOOK =
1272 new CFClient::UI::Notebook
1273 expand => 1,
1274 debug => 1,
1275 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1276 ;
1254 1277
1255 $hb->add (my $vb1 = new CFClient::UI::VBox); 1278 $ntb->add (
1256 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1279 "Statistics (F2)" => $STATS_PAGE = stats_window,
1257 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1280 "Shows statistics, where all your Stats and Resistances are shown."
1281 );
1282 $ntb->add (
1283 "Skills (F3)" => $SKILL_PAGE = skill_window,
1284 "Shows all your Skills."
1285 );
1286 $ntb->add (
1287 "Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList,
1288 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1289 );
1290 $ntb->add (
1291 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1293 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1294 );
1258 1295
1259 $hb->add (my $vb2 = new CFClient::UI::VBox); 1296 $ntb->set_current_page ($INVENTORY_PAGE);
1260 1297
1261 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1298 $plwin->add ($ntb);
1262 1299 $plwin
1263 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1264
1265 # XXX: Call after $INVR = ... because set_opencont sets the items
1266 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1267
1268 $invwin
1269} 1300}
1270 1301
1271sub spell_setup { 1302sub update_bindings {
1272 new CFClient::UI::SpellList 1303 $BIND_UPD_CB->() if $BIND_UPD_CB;
1273} 1304}
1274 1305
1275sub keyboard_setup { 1306sub keyboard_setup {
1276 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
1277 1308
1278 my $refresh; 1309 my $refresh;
1279 $refresh = sub { 1310 $refresh = $BIND_UPD_CB = sub {
1280 $binding_list->clear (); 1311 $binding_list->clear ();
1281 1312
1282 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1283 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1284 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1285 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1286 1317
1287 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
1288 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1289 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
1290 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
1291 text => "delete", 1322 text => "delete",
1292 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
1293 on_activate => sub { 1324 on_activate => sub {
1294 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
1295 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0
1296 }); 1328 });
1297 1329
1298 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
1299 text => "edit", 1331 text => "edit",
1300 tooltip => "Edits the binding", 1332 tooltip => "Edits the binding",
1301 on_activate => sub { 1333 on_activate => sub {
1302 $::BIND_EDITOR->set_binding ( 1334 $::BIND_EDITOR->set_binding (
1303 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1304 sub { 1336 sub {
1305 my ($nmod, $nsym, $ncmds) = @_; 1337 my ($nmod, $nsym, $ncmds) = @_;
1306 delete $::CFG->{bindings}->{$mod}->{$sym}; 1338 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1307 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1339 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1308 $refresh->(); 1340 $refresh->();
1309 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1310 $SETUP_DIALOG->show; 1342 $SETUP_DIALOG->show;
1311 }, 1343 },
1312 sub { 1344 sub {
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1345 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1346 $SETUP_DIALOG->show;
1315 }); 1347 });
1316 $::BIND_EDITOR->show; 1348 $::BIND_EDITOR->show;
1317 $SETUP_DIALOG->hide; 1349 $SETUP_DIALOG->hide;
1350 0
1318 }); 1351 });
1319 1352
1320 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1321 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1322 } 1355 }
1323 } 1356 }
1324 }; 1357 };
1325 1358
1326 my $vb = new CFClient::UI::VBox; 1359 my $vb = new CFClient::UI::VBox;
1360 $vb->add (my $hb = new CFClient::UI::HBox);
1361 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1362 $hb->add (new CFClient::UI::CheckBox
1363 expand => 1,
1364 state => $CFG->{shift_fire_stop},
1365 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1366 on_changed => sub {
1367 my ($cbox, $value) = @_;
1368 $CFG->{shift_fire_stop} = $value;
1369 0
1370 });
1371
1327 $vb->add ($binding_list); 1372 $vb->add ($binding_list);
1328 $vb->add (my $hb = new CFClient::UI::HBox); 1373 $vb->add (my $hb = new CFClient::UI::HBox);
1329 1374
1330 $hb->add (new CFClient::UI::Button 1375 $hb->add (new CFClient::UI::Button
1331 text => "record new", 1376 text => "record new",
… …
1333 tooltip => "This button opens the binding editor with an empty binding.", 1378 tooltip => "This button opens the binding editor with an empty binding.",
1334 on_activate => sub { 1379 on_activate => sub {
1335 $::BIND_EDITOR->set_binding (undef, undef, [], 1380 $::BIND_EDITOR->set_binding (undef, undef, [],
1336 sub { 1381 sub {
1337 my ($mod, $sym, $cmds) = @_; 1382 my ($mod, $sym, $cmds) = @_;
1338 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1383 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1339 $refresh->(); 1384 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show; 1386 $SETUP_DIALOG->show;
1342 }, 1387 },
1343 sub { 1388 sub {
… …
1345 $SETUP_DIALOG->show; 1390 $SETUP_DIALOG->show;
1346 }, 1391 },
1347 ); 1392 );
1348 $SETUP_DIALOG->hide; 1393 $SETUP_DIALOG->hide;
1349 $::BIND_EDITOR->show; 1394 $::BIND_EDITOR->show;
1395 0
1350 }, 1396 },
1351 ); 1397 );
1352 1398
1353 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1354 text => "close", 1400 text => "close",
1355 tooltip => "Closes the binding window", 1401 tooltip => "Closes the binding window",
1356 expand => 1, 1402 expand => 1,
1357 on_activate => sub { 1403 on_activate => sub {
1358 $SETUP_DIALOG->hide; 1404 $SETUP_DIALOG->hide;
1405 0
1359 } 1406 }
1360 ); 1407 );
1361 1408
1362 $refresh->(); 1409 $refresh->();
1363 1410
1364 $vb 1411 $vb
1412}
1413
1414# just weirdness, pls. ignore
1415sub load_html_page {
1416 my ($viewer, $base) = @_;
1417
1418 $viewer->clear;
1419
1420 require LWP::Simple;
1421 require HTML::Parser;
1422 require URI;
1423
1424 my $page = LWP::Simple::get ($base)
1425 or return;
1426
1427 my @s = { };
1428 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1429
1430 my $parser = HTML::Parser->new (
1431 text_h => [sub {
1432 my ($text) = @_;
1433 $text =~ s/\s+/ /g;
1434 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1435 }, "dtext"],
1436 start_h => [sub {
1437 my ($tag, $attr) = @_;
1438 if ($passthrough{$tag}) {
1439 $s[-1]{text} .= "<$tag>";
1440 } elsif ($tag eq "h1") {
1441 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1442 } elsif ($tag eq "h2") {
1443 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1444 } elsif ($tag eq "h3") {
1445 push @s, { text => "<span size='large'>" };
1446 } elsif ($tag eq "a") {
1447 push @s, { text => "", url => $attr->{href} };
1448 } elsif ($tag eq "p") {
1449 push @s, { };
1450 } elsif ($tag eq "img") {
1451 eval {
1452 push @{$s[-1]{obj}}, new CFClient::UI::Image
1453 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1454 $s[-1]{text} .= "\x{fffc}";
1455 };
1456 }
1457 }, "tagname, attr"],
1458 end_h => [sub {
1459 my ($tag) = @_;
1460 if ($passthrough{$tag}) {
1461 $s[-1]{text} .= "</$tag>";
1462 } elsif ($tag =~ /^h\d$/) {
1463 $s[-1]{text} .= "</span>";
1464 push @s, { };
1465 } elsif ($tag eq "a") {
1466 my $S = pop @s;
1467 $s[-1]{text} .= "\x{fffc}";
1468 push @{$s[-1]{obj}}, new CFClient::UI::Label
1469 fg => [0.8, 0.8, 1],
1470 markup => "<u>$S->{text}</u>",
1471 fontsize => 0.8,
1472 can_events => 1,
1473 can_focus => 1,
1474 on_button_up => sub {
1475 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1476 },
1477 ;
1478 }
1479 }, "tagname"],
1480 );
1481
1482 $parser->parse ($page);
1483 $parser->eof;
1484
1485 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1486 for @s;
1487
1488 $viewer->set_offset (0);
1365} 1489}
1366 1490
1367sub help_window { 1491sub help_window {
1368 my $win = new CFClient::UI::FancyFrame 1492 my $win = new CFClient::UI::FancyFrame
1369 x => 'center', 1493 x => 'center',
1370 y => 'center', 1494 y => 'center',
1371 z => 2, 1495 z => 2,
1372 name => 'doc_browser', 1496 name => 'doc_browser',
1373 force_w => int $WIDTH * 7/8, 1497 force_w => int $WIDTH * 7/8,
1374 force_h => int $HEIGHT * 7/8, 1498 force_h => int $HEIGHT * 7/8,
1375 title => "Documentation"; 1499 title => "Help Browser",
1500 has_close_button => 1;
1376 1501
1377 $win->add (my $vbox = new CFClient::UI::VBox); 1502 $win->add (my $vbox = new CFClient::UI::VBox);
1378 1503
1379 $vbox->add (my $buttons = new CFClient::UI::HBox); 1504 $vbox->add (my $buttons = new CFClient::UI::HBox);
1380 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1505 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1508 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox 1509 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef, 1510 value => undef,
1386 options => [ 1511 options => [
1387 [intro => "Introduction"], 1512 [intro => "Introduction"],
1388 [manual => "Manual"], 1513 [manual => "Main Manual"],
1389 [skill_help => "Skills"], 1514 [skill_help => "Skill Reference"],
1390 [command_help => "Commands"], 1515 [command_help => "Command Reference"],
1391 [dmcommand_help => "DM Commands"], 1516 [dmcommand_help => "DM Commands"],
1392 [COPYING => "License Terms"], 1517 [COPYING => "License Terms"],
1518 [test => "test (do not select)"], #d#TODO
1393 ], 1519 ],
1394 on_changed => sub { 1520 on_changed => sub {
1395 my ($self, $pod) = @_; 1521 my ($self, $pod) = @_;
1396 1522
1523 if ($pod eq "test") {#d#TODO
1524 eval {
1525 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1526 };
1527 warn "$@" if $@;
1528 return;
1529 }
1530
1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1531 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1532 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1399 1533
1400 $viewer->clear; 1534 $viewer->clear;
1535
1536# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1537# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1538# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1539# ]);#d#
1401 1540
1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1541 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1403 for @$pom; 1542 for @$pom;
1404 1543
1405 $viewer->set_offset (0); 1544 $viewer->set_offset (0);
1545
1546 0
1406 }, 1547 },
1407 on_visibility_change => sub { 1548 on_visibility_change => sub {
1408 my ($self, $visible) = @_; 1549 my ($self, $visible) = @_;
1409 return unless $visible; 1550 return unless $visible;
1410 return if $self->{value}; 1551 return if $self->{value};
1411 $self->set_value ("intro"); 1552 $self->set_value ("intro");
1553 0
1412 }, 1554 },
1413 ); 1555 );
1414 1556
1415 $win 1557 $win
1416} 1558}
… …
1455 z => 100, 1597 z => 100,
1456 force_x => "max", 1598 force_x => "max",
1457 force_y => 0; 1599 force_y => 0;
1458 $DEBUG_STATUS->show; 1600 $DEBUG_STATUS->show;
1459 1601
1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1602 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1461 1603
1462 $STATUSBOX = new CFClient::UI::Statusbox; 1604 $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]); 1605 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1464 1606
1465 (new CFClient::UI::Frame 1607 (new CFClient::UI::Frame
… …
1485 $MAPWIDGET->connect (activate_console => sub { 1627 $MAPWIDGET->connect (activate_console => sub {
1486 my ($mapwidget, $preset) = @_; 1628 my ($mapwidget, $preset) = @_;
1487 1629
1488 if ($CONSOLE) { 1630 if ($CONSOLE) {
1489 $CONSOLE->{input}->{auto_activated} = 1; 1631 $CONSOLE->{input}->{auto_activated} = 1;
1490 $CONSOLE->{input}->focus_in; 1632 $CONSOLE->{input}->grab_focus;
1491 1633
1492 if ($preset && $CONSOLE->{input}->get_text eq '') { 1634 if ($preset && $CONSOLE->{input}->get_text eq '') {
1493 $CONSOLE->{input}->set_text ($preset); 1635 $CONSOLE->{input}->set_text ($preset);
1494 } 1636 }
1495 } 1637 }
1496 }); 1638 });
1497 $MAPWIDGET->show; 1639 $MAPWIDGET->show;
1498 $MAPWIDGET->focus_in; 1640 $MAPWIDGET->grab_focus;
1499 1641
1500 $LOGVIEW = new CFClient::UI::TextScroller 1642 $LOGVIEW = new CFClient::UI::TextScroller
1501 expand => 1, 1643 expand => 1,
1502 font => $FONT_FIXED, 1644 font => $FONT_FIXED,
1503 fontsize => $::CFG->{log_fontsize}, 1645 fontsize => $::CFG->{log_fontsize},
… …
1513 x => 'center', 1655 x => 'center',
1514 y => 'center', 1656 y => 'center',
1515 z => 2, 1657 z => 2,
1516 force_w => $::WIDTH * 0.6, 1658 force_w => $::WIDTH * 0.6,
1517 force_h => $::HEIGHT * 0.6, 1659 force_h => $::HEIGHT * 0.6,
1660 has_close_button => 1,
1518 ; 1661 ;
1662
1663 $METASERVER = metaserver_dialog;
1519 1664
1520 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1666 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1522 1667
1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1527 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1672 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1528 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1673 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1529 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1674 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1530 "Configure the use of audio, sound effects and background music."); 1675 "Configure the use of audio, sound effects and background music.");
1531 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1676 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1532 "Lets you define, edit and delete bindings." 1677 "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 " 1678 . "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 " 1679 . "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. " 1680 . "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 " 1681 . "After pressing the combo the binding will be saved automatically and the "
1537 . "binding editor closes"); 1682 . "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, 1683 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask."); 1684 "Some debuggin' options. Do not ask.");
1542 1685
1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1686 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1544 1687
1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1688 $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."); 1689 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, 1691 $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."); 1692 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1550 1693
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 1694 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 1695
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, 1696 $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 :). " 1697 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 1698
1559 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFClient::UI::Button
1560 text => "Save Config", 1700 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.", 1701 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 { 1702 on_activate => sub {
1563 $::CFG->{layout} = CFClient::UI::get_layout; 1703 $::CFG->{layout} = CFClient::UI::get_layout;
1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1704 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1565 status "Configuration Saved"; 1705 status "Configuration Saved";
1706 0
1566 }, 1707 },
1567 ); 1708 );
1568 1709
1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1570 tooltip => "View Documentation"); 1711 tooltip => "View Documentation");
1571 1712
1572 $BUTTONBAR->add (new CFClient::UI::Button 1713 $BUTTONBAR->add (new CFClient::UI::Button
1573 text => "Quit", 1714 text => "Quit",
1574 tooltip => "Terminates the program", 1715 tooltip => "Terminates the program",
… …
1576 if ($CONN) { 1717 if ($CONN) {
1577 open_quit_dialog; 1718 open_quit_dialog;
1578 } else { 1719 } else {
1579 exit; 1720 exit;
1580 } 1721 }
1722 0
1581 }, 1723 },
1582 ); 1724 );
1583 1725
1584 $BUTTONBAR->show; 1726 $BUTTONBAR->show;
1585 $SETUP_DIALOG->show; 1727 $SETUP_DIALOG->show;
… …
1587 1729
1588 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1589} 1731}
1590 1732
1591sub video_shutdown { 1733sub video_shutdown {
1734 CFClient::OpenGL::shutdown;
1735
1592 undef $SDL_ACTIVE; 1736 undef $SDL_ACTIVE;
1593} 1737}
1594 1738
1595my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1739my @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# 1740my $bgmusic;#TODO#hack#d#
… …
1777# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1921# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1778 }, 1922 },
1779 CFClient::SDL_KEYDOWN => sub { 1923 CFClient::SDL_KEYDOWN => sub {
1780 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1924 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1781 # alt-enter 1925 # alt-enter
1926 $FULLSCREEN_ENABLE->toggle;
1782 video_shutdown; 1927 video_shutdown;
1783 $CFG->{fullscreen} = !$CFG->{fullscreen};
1784 video_init; 1928 video_init;
1785 } else { 1929 } else {
1786 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1930 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1787 } 1931 }
1788 }, 1932 },
… …
1804$SIG{INT} = $SIG{TERM} = sub { exit }; 1948$SIG{INT} = $SIG{TERM} = sub { exit };
1805 1949
1806{ 1950{
1807 local $SIG{__DIE__} = sub { 1951 local $SIG{__DIE__} = sub {
1808 return unless defined $^S && !$^S; 1952 return unless defined $^S && !$^S;
1809 Carp::confess $_[1];#d#TODO: remove when stable 1953 Carp::confess $_[0];#d#TODO: remove when stable
1810 CFClient::fatal $_[0]; 1954 CFClient::fatal $_[0];
1811 }; 1955 };
1812 1956
1813 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1957 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1814 CFClient::UI::set_layout ($::CFG->{layout}); 1958 CFClient::UI::set_layout ($::CFG->{layout});
1815 1959
1816 my %DEF_CFG = ( 1960 my %DEF_CFG = (
1817 sdl_mode => 0, 1961 sdl_mode => 0,
1818 width => 640, 1962 width => 640,
1819 height => 480, 1963 height => 480,
1820 fullscreen => 0, 1964 fullscreen => 0,
1821 fast => 0, 1965 fast => 0,
1822 map_scale => 1, 1966 map_scale => 1,
1823 fow_enable => 1, 1967 fow_enable => 1,
1824 fow_intensity => 0.45, 1968 fow_intensity => 0.45,
1825 fow_smooth => 0, 1969 fow_smooth => 0,
1826 gui_fontsize => 1, 1970 gui_fontsize => 1,
1827 log_fontsize => 0.7, 1971 log_fontsize => 0.7,
1828 gauge_fontsize=> 1, 1972 gauge_fontsize => 1,
1829 gauge_size => 0.35, 1973 gauge_size => 0.35,
1830 stat_fontsize => 0.7, 1974 stat_fontsize => 0.7,
1831 mapsize => 100, 1975 mapsize => 100,
1832 host => "crossfire.schmorp.de",
1833 say_command => 'say', 1976 say_command => 'say',
1834 audio_enable => 1, 1977 audio_enable => 1,
1835 bgm_enable => 1, 1978 bgm_enable => 1,
1836 bgm_volume => 0.25, 1979 bgm_volume => 0.25,
1837 face_prefetch => 0, 1980 face_prefetch => 0,
1838 output_sync => 1, 1981 output_sync => 1,
1839 output_count => 1, 1982 output_count => 1,
1840 pickup => 0, 1983 pickup => 0,
1984 default => "profile", # default profile
1985 );
1841 ); 1986
1842
1843 while (my ($k, $v) = each %DEF_CFG) { 1987 while (my ($k, $v) = each %DEF_CFG) {
1844 $CFG->{$k} = $v unless exists $CFG->{$k}; 1988 $CFG->{$k} = $v unless exists $CFG->{$k};
1845 } 1989 }
1990
1991 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1846 1992
1847 sdl_init; 1993 sdl_init;
1848 1994
1849 @SDL_MODES = reverse 1995 @SDL_MODES = reverse
1850 grep $_->[0] >= 640 && $_->[1] >= 480, 1996 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1892 video_init; 2038 video_init;
1893 audio_init; 2039 audio_init;
1894} 2040}
1895 2041
1896Event::loop; 2042Event::loop;
2043#CFClient::SDL_Quit;
2044#CFClient::_exit 0;
1897 2045
1898END { CFClient::SDL_Quit } 2046END { CFClient::SDL_Quit }
1899 2047
1900=head1 NAME 2048=head1 NAME
1901 2049

Diff Legend

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