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.72 by elmex, Tue Jun 13 18:14:03 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;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
99our $FLOORBOX; 110our $FLOORBOX;
100our $GAUGES; 111our $GAUGES;
101our $STATWIDS; 112our $STATWIDS;
102 113
… …
109 120
110our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 122our $STATUSBOX;
112our $DEBUG_STATUS; 123our $DEBUG_STATUS;
113 124
114our $INV_WINDOW;
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118 128
119our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
120 131
121our $PICKUP_CFG; 132our $PICKUP_CFG;
122 133
123sub status { 134sub status {
124 $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]);
… …
155 $hbox->add (new CFClient::UI::Button 166 $hbox->add (new CFClient::UI::Button
156 text => "No", 167 text => "No",
157 on_activate => sub { 168 on_activate => sub {
158 $conn->send ("reply n"); 169 $conn->send ("reply n");
159 $dialog->destroy; 170 $dialog->destroy;
171 0
160 } 172 }
161 ); 173 );
162 $hbox->add (new CFClient::UI::Button 174 $hbox->add (new CFClient::UI::Button
163 text => "Yes", 175 text => "Yes",
164 on_activate => sub { 176 on_activate => sub {
165 $conn->send ("reply y"); 177 $conn->send ("reply y");
166 destroy_query_dialog $conn; 178 destroy_query_dialog $conn;
179 0
167 }, 180 },
168 ); 181 );
169 182
170 $dialog->focus_in; 183 $dialog->grab_focus;
171 184
172 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $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)";
174 187
175 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) {
… …
185 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race", 199 text => "Next Race",
187 on_activate => sub { 200 on_activate => sub {
188 $conn->send ("reply n"); 201 $conn->send ("reply n");
189 destroy_query_dialog $conn; 202 destroy_query_dialog $conn;
203 0
190 }, 204 },
191 ); 205 );
192 $table->add (2, 0, new CFClient::UI::Button 206 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept", 207 text => "Accept",
194 on_activate => sub { 208 on_activate => sub {
195 $conn->send ("reply d"); 209 $conn->send ("reply d");
196 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
211 0
197 }, 212 },
198 ); 213 );
199 214
200 unshift @dialog, new CFClient::UI::Label 215 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
… …
215 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
216 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
217 return; 232 return;
218 } 233 }
219 234
220 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
221 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
222 237
223 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
225 ellipsise => 0, 240 ellipsise => 0,
… …
231 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again", 247 text => "Roll Again",
233 on_activate => sub { 248 on_activate => sub {
234 $conn->send ("reply y"); 249 $conn->send ("reply y");
235 destroy_query_dialog $conn; 250 destroy_query_dialog $conn;
251 0
236 }, 252 },
237 ); 253 );
238 254
239 # center: swap stats 255 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
254 text => "Swap Stats", 270 text => "Swap Stats",
255 on_activate => sub { 271 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value}; 272 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}"); 273 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn; 274 destroy_query_dialog $conn;
275 0
259 }, 276 },
260 ); 277 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 278 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262 279
263 # right: accept 280 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button 281 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept", 282 text => "Accept",
266 on_activate => sub { 283 on_activate => sub {
267 $conn->send ("reply n"); 284 $conn->send ("reply n");
268 $STATS_WINDOW->hide; 285 $STATS_PAGE->hide;
269 destroy_query_dialog $conn; 286 destroy_query_dialog $conn;
287 0
270 }, 288 },
271 ); 289 );
272 290
273 unshift @dialog, new CFClient::UI::Label 291 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4, 292 max_w => $::WIDTH * 0.4,
… …
284 302
285 push @dialog, my $entry = new CFClient::UI::Entry 303 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub { 304 on_changed => sub {
287 $conn->send ("reply $_[1]"); 305 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn; 306 destroy_query_dialog $conn;
307 0
289 }, 308 },
290 ; 309 ;
291 310
292 $entry->focus_in; 311 $entry->grab_focus;
293 312
294 } else { 313 } else {
295 $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)";
296 315
297 push @dialog, my $entry = new CFClient::UI::Entry 316 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 317 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub { 318 on_activate => sub {
300 $conn->send ("reply $_[1]"); 319 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn; 320 destroy_query_dialog $conn;
321 0
302 }, 322 },
303 ; 323 ;
304 324
305 $entry->focus_in; 325 $entry->grab_focus;
306 } 326 }
307 327
308 $vbox->add (@dialog); 328 $vbox->add (@dialog);
309 $dialog->show; 329 $dialog->show;
310} 330}
… …
315 $LOGIN_BUTTON->set_text ("Logout"); 335 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide; 336 $SETUP_DIALOG->hide;
317 337
318 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;
319 339
320 my ($host, $port) = split /:/, $CFG->{host}; 340 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321 341
322 $MAP = new CFClient::Map $mapsize, $mapsize; 342 $MAP = new CFClient::Map $mapsize, $mapsize;
323 343
324 $CONN = eval { 344 $CONN = eval {
325 new CFClient::Protocol 345 new CFClient::Protocol
326 host => $host, 346 host => $host,
327 port => $port || 13327, 347 port => $port || 13327,
328 user => $CFG->{user}, 348 user => $CFG->{profile}{default}{user},
329 pass => $CFG->{password}, 349 pass => $CFG->{profile}{default}{password},
330 mapw => $mapsize, 350 mapw => $mapsize,
331 maph => $mapsize, 351 maph => $mapsize,
332 352
333 map_widget => $MAPWIDGET, 353 map_widget => $MAPWIDGET,
334 logview => $LOGVIEW, 354 logview => $LOGVIEW,
… …
362 382
363sub stop_game { 383sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show; 386 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide; 387 $PL_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells; 388 $SPELL_PAGE->clear_spells;
369 389
370 return unless $CONN; 390 return unless $CONN;
371 391
372 status "connection closed"; 392 status "connection closed";
373 393
374 destroy_query_dialog $CONN; 394 destroy_query_dialog $CONN;
375 $CONN->destroy; 395 $CONN->destroy;
376 $CONN = 0; # false, does not autovivify 396 $CONN = 0; # false, does not autovivify
397
398 undef $MAP;
377} 399}
378 400
379sub graphics_setup { 401sub graphics_setup {
380 my $vbox = new CFClient::UI::VBox; 402 my $vbox = new CFClient::UI::VBox;
381 403
… …
396 $mode_slider->emit (changed => $mode_slider->{range}[0]); 418 $mode_slider->emit (changed => $mode_slider->{range}[0]);
397 419
398 my $row = 1; 420 my $row = 1;
399 421
400 $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");
401 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
402 state => $CFG->{fullscreen}, 424 state => $CFG->{fullscreen},
403 tooltip => "Bring the client into fullscreen mode.", 425 tooltip => "Bring the client into fullscreen mode.",
404 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405 my ($self, $value) = @_;
406 $CFG->{fullscreen} = $value;
407 }
408 ); 427 );
409 428
410 $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");
411 $table->add (1, $row++, new CFClient::UI::CheckBox 430 $table->add (1, $row++, new CFClient::UI::CheckBox
412 state => $CFG->{fast}, 431 state => $CFG->{fast},
413 tooltip => "Lower the visual quality considerably to speed up rendering.", 432 tooltip => "Lower the visual quality considerably to speed up rendering.",
414 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415 my ($self, $value) = @_;
416 $CFG->{fast} = $value;
417 }
418 ); 434 );
419 435
420 $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");
421 $table->add (1, $row++, new CFClient::UI::Slider 437 $table->add (1, $row++, new CFClient::UI::Slider
422 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 438 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 439 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425 my ($self, $value) = @_;
426 $CFG->{map_scale} = 2 ** $value;
427 }
428 ); 441 );
429 442
430 $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");
431 $table->add (1, $row++, new CFClient::UI::CheckBox 444 $table->add (1, $row++, new CFClient::UI::CheckBox
432 state => $CFG->{fow_enable}, 445 state => $CFG->{fow_enable},
433 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.",
434 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 my ($self, $value) = @_;
436 $CFG->{fow_enable} = $value;
437 }
438 ); 448 );
439 449
440 $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");
441 $table->add (1, $row++, new CFClient::UI::Slider 451 $table->add (1, $row++, new CFClient::UI::Slider
442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 452 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
443 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.",
444 on_changed => sub { 454 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445 my ($self, $value) = @_;
446 $CFG->{fow_intensity} = $value;
447 }
448 ); 455 );
449 456
450 $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");
451 $table->add (1, $row++, new CFClient::UI::CheckBox 458 $table->add (1, $row++, new CFClient::UI::CheckBox
452 state => $CFG->{fow_smooth}, 459 state => $CFG->{fow_smooth},
453 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.",
454 on_changed => sub { 461 on_changed => sub {
455 my ($self, $value) = @_; 462 my ($self, $value) = @_;
456 $CFG->{fow_smooth} = $value; 463 $CFG->{fow_smooth} = $value;
457 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
458 } 466 }
459 ); 467 );
460 468
461 $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");
462 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
463 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
464 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.",
465 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 473 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466 ); 474 );
467 475
468 $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");
469 $table->add (1, $row++, new CFClient::UI::Slider 477 $table->add (1, $row++, new CFClient::UI::Slider
470 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 478 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
471 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.",
472 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473 );
474
475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476
477 $table->add (1, $row++, new CFClient::UI::Slider
478 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
479 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480 on_changed => sub {
481 $CFG->{stat_fontsize} = $_[1];
482 &set_stats_window_fontsize;
483 }
484 ); 481 );
485 482
486 $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");
487 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489 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.",
490 on_changed => sub { 487 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 488 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 489 &set_gauge_window_fontsize;
490 0
493 } 491 }
494 ); 492 );
495 493
496 $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");
497 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
498 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
499 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.",
500 on_changed => sub { 498 on_changed => sub {
501 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501 0
503 } 502 }
504 ); 503 );
505 504
506 $table->add (1, $row++, new CFClient::UI::Button 505 $table->add (1, $row++, new CFClient::UI::Button
507 expand => 1, align => 0, text => "Apply", 506 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 507 tooltip => "Apply the video settings",
509 on_activate => sub { 508 on_activate => sub {
510 video_shutdown (); 509 video_shutdown ();
511 video_init (); 510 video_init ();
511 0
512 } 512 }
513 ); 513 );
514 514
515 $vbox 515 $vbox
516} 516}
… …
524 524
525 $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");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
527 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
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.", 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.",
529 on_changed => sub { 529 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 $CFG->{audio_enable} = $_[1];
531 }
532 ); 530 );
533# $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");
534# $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 {
535# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
536# }); 534# });
537 $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");
538 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
540 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
541 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.",
542 on_changed => sub { 540 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543 $CFG->{bgm_enable} = $_[1];
544 }
545 ); 541 );
546 $hbox->add (new CFClient::UI::Slider 542 $hbox->add (new CFClient::UI::Slider
547 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 543 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548 tooltip => "The volume of the background music. Changes are instant.", 544 tooltip => "The volume of the background music. Changes are instant.",
549 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
550 $CFG->{bgm_volume} = $_[1];
551 CFClient::MixMusic::volume $_[1] * 128;
552 }
553 ); 546 );
554 547
555 $table->add (1, $row++, new CFClient::UI::Button 548 $table->add (1, $row++, new CFClient::UI::Button
556 expand => 1, align => 0, text => "Apply", 549 expand => 1, align => 0, text => "Apply",
557 tooltip => "Apply the audio settings", 550 tooltip => "Apply the audio settings",
558 on_activate => sub { 551 on_activate => sub {
559 audio_shutdown (); 552 audio_shutdown ();
560 audio_init (); 553 audio_init ();
554 0
561 } 555 }
562 ); 556 );
563 557
564 $vbox 558 $vbox
565}
566
567sub set_stats_window_fontsize {
568 for (values %{$STATWIDS}) {
569 $_->set_fontsize ($::CFG->{stat_fontsize});
570 }
571} 559}
572 560
573sub set_gauge_window_fontsize { 561sub set_gauge_window_fontsize {
574 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 562 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
575 $_->set_fontsize ($::CFG->{gauge_fontsize}); 563 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
631 619
632sub debug_setup { 620sub debug_setup {
633 my $table = new CFClient::UI::Table; 621 my $table = new CFClient::UI::Table;
634 622
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 623 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $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 });
637 $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");
638 $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 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 627 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $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 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 629 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $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 });
643 631
644 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);
645 633
646 for my $x (0..2) { 634 for my $x (0..2) {
647 for my $y (0 .. 2) { 635 for my $y (0 .. 2) {
… …
656 644
657 $table 645 $table
658} 646}
659 647
660sub stats_window { 648sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 649 my $r =
662 y => $HEIGHT * (2/8), 650 new CFClient::UI::ScrolledWindow (
663 x => "max", 651 expand => 1,
664 title => "Stats", 652 scroll_y => 1
665 name => "stats_window"; 653 );
654 $r->add (my $vb = new CFClient::UI::VBox);
666 655
667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
668 $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,
669 can_hover => 1, can_events => 1, 657 can_hover => 1, can_events => 1,
670 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.");
671 $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,
672 can_hover => 1, can_events => 1, 660 can_hover => 1, can_events => 1,
… …
696 [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."],
697 685
698 [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."],
699 [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."],
700 [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."],
701 [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."],
702 [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."],
703 [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."],
704 ) { 692 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 693 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
706 694
… …
708 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);
709 $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
710 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);
711 } 699 }
712 700
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 701 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
714 702
715 my $row = 0; 703 my $row = 0;
716 my $col = 0; 704 my $col = 0;
717 705
718 my %resist_names = ( 706 my %resist_names = (
707 slow => ["Slow",
719 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",
720 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",
721 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",
722 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",
723 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",
724 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",
725 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",
726 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",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 724 "<b>Poison</b> (resistance to getting poisoned)"],
725 para => ["Paralysation",
728 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",
729 deat => "<b>Death</b> (resistance against death spells)", 728 "<b>Death</b> (resistance against death spells)"],
730 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",
731 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",
732 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",
733 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",
734 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",
735 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",
736 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)"],
737 ); 743 );
738 for (qw/slow holyw conf fire depl magic 744 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 745 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 746 blind fear tund elec cold ghit/)
741 { 747 {
… …
746 template => "-100%", 752 template => "-100%",
747 align => +1, 753 align => +1,
748 valign => 0, 754 valign => 0,
749 can_events => 1, 755 can_events => 1,
750 can_hover => 1, 756 can_hover => 1,
751 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
752 ); 758 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 759 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 760 font => $FONT_FIXED,
755 can_hover => 1, 761 can_hover => 1,
756 can_events => 1, 762 can_events => 1,
757 image => "ui/resist/resist_$_.png", 763 path => "ui/resist/resist_$_.png",
758 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],
759 ); 772 );
760 773
761 $row++; 774 $row++;
762 if ($row % 6 == 0) { 775 if ($row % 6 == 0) {
763 $col += 2; 776 $col += 3;
764 $row = 0; 777 $row = 0;
765 } 778 }
766 } 779 }
767 780
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 781 #update_stats_window ({});
770 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]);
771 $tgw 789 $sw
772} 790}
773 791
774sub formsep($) { 792sub formsep($) {
775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 793 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776} 794}
777 795
778sub update_stats_window {
779 my ($stats) = @_;
780
781 # I love text protocols...
782
783 my $hp = $stats->{+CS_STAT_HP} * 1;
784 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
785 my $sp = $stats->{+CS_STAT_SP} * 1;
786 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
787 my $fo = $stats->{+CS_STAT_FOOD} * 1;
788 my $fo_m = 999;
789 my $gr = $stats->{+CS_STAT_GRACE} * 1;
790 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
791
792 $GAUGES->{hp} ->set_value ($hp, $hp_m);
793 $GAUGES->{mana} ->set_value ($sp, $sp_m);
794 $GAUGES->{food} ->set_value ($fo, $fo_m);
795 $GAUGES->{grace} ->set_value ($gr, $gr_m);
796 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
797 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
798 my $rng = $stats->{+CS_STAT_RANGE};
799 $rng =~ s/^Range: //; # thank you so much dear server
800 $GAUGES->{range} ->set_text ("Rng: " . $rng);
801 my $title = $stats->{+CS_STAT_TITLE};
802 $title =~ s/^Player: //;
803 $STATWIDS->{title} ->set_text ("Title: " . $title);
804
805 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
806 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
807 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
808 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
809 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818
819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820
821 my %tbl = (
822 phys => CS_STAT_RES_PHYS,
823 magic => CS_STAT_RES_MAG,
824 fire => CS_STAT_RES_FIRE,
825 elec => CS_STAT_RES_ELEC,
826 cold => CS_STAT_RES_COLD,
827 conf => CS_STAT_RES_CONF,
828 acid => CS_STAT_RES_ACID,
829 drain => CS_STAT_RES_DRAIN,
830 ghit => CS_STAT_RES_GHOSTHIT,
831 pois => CS_STAT_RES_POISON,
832 slow => CS_STAT_RES_SLOW,
833 para => CS_STAT_RES_PARA,
834 tund => CS_STAT_TURN_UNDEAD,
835 fear => CS_STAT_RES_FEAR,
836 depl => CS_STAT_RES_DEPLETE,
837 deat => CS_STAT_RES_DEATH,
838 holyw => CS_STAT_RES_HOLYWORD,
839 blind => CS_STAT_RES_BLIND,
840 );
841
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl;
844}
845
846my $METASERVER_ATIME; 796my $METASERVER_ATIME;
847 797
848sub update_metaserver { 798sub update_metaserver {
799 my ($metaserver_dialog) = @_;
800
801 $METASERVER = $metaserver_dialog
802 if defined $metaserver_dialog;
803
849 return if $METASERVER_ATIME > time; 804 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 805 $METASERVER_ATIME = time + 60;
851 806
852 my $table = $METASERVER->{table}; 807 my $table = $METASERVER->{table};
853 $table->clear; 808 $table->clear;
… …
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 873 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 874 (new CFClient::UI::Button
920 text => "Use", 875 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 876 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 877 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 878 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 879 $METASERVER->hide;
880 0
925 }, 881 },
926 ), 882 ),
927 (new CFClient::UI::Empty expand => 1), 883 (new CFClient::UI::Empty expand => 1),
928 ]); 884 ]);
929 885
… …
940 } 896 }
941 }); 897 });
942} 898}
943 899
944sub 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
945 my $dialog = new CFClient::UI::FancyFrame 905 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 906 title => "Server List",
947 name => 'metaserver_dialog', 907 name => 'metaserver_dialog',
948 x => 'center', 908 x => 'center',
949 y => 'center', 909 y => 'center',
950 z => 3, 910 z => 3,
951 force_h => $::HEIGHT * 0.4, 911 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 912 child => $vbox,
913 has_close_button => 1,
914 table => $table,
953 on_visibility_change => sub { 915 on_visibility_change => sub {
954 update_metaserver if $_[1]; 916 update_metaserver ($_[0]) if $_[1];
917 0
955 }, 918 },
956 ; 919 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 920
962 $dialog 921 $dialog
963} 922}
964 923
965sub server_setup { 924sub server_setup {
… …
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 931 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 932
974 $vbox->add ( 933 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 934 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 935 expand => 1,
977 text => $CFG->{host}, 936 text => $CFG->{profile}{default}{host},
978 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",
979 on_changed => sub { 938 on_changed => sub {
980 my ($self, $value) = @_; 939 my ($self, $value) = @_;
981 $CFG->{host} = $value; 940 $CFG->{profile}{default}{host} = $value;
941 0
982 } 942 }
983 ); 943 );
984
985 $METASERVER = metaserver_dialog;
986 944
987 $vbox->add (new CFClient::UI::Button 945 $vbox->add (new CFClient::UI::Button
988 expand => 1, 946 expand => 1,
989 text => "Server List", 947 text => "Server List",
990 other => $METASERVER, 948 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 949 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 950 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 951 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 952 );
995 } 953 }
996 954
997 $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");
998 $table->add (1, 4, new CFClient::UI::Entry 956 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 957 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 958 tooltip => "The name of your character on the server",
1001 on_changed => sub { 959 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 960 );
1006 961
1007 $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");
1008 $table->add (1, 5, new CFClient::UI::Entry 963 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 964 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 965 hidden => 1,
1011 tooltip => "The password for your character", 966 tooltip => "The password for your character",
1012 on_changed => sub { 967 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 968 );
1017 969
1018 $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");
1019 $table->add (1, 7, new CFClient::UI::Slider 971 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 972 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 973 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 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. "
1023 . "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, "
1024 . "but you also increase bandwidth requirements and latency. " 976 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 977 . "This option is only used once at log-in.",
1026 on_changed => sub { 978 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027 my ($self, $value) = @_;
1028
1029 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030 },
1031 ); 979 );
1032 980
1033 $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");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 982 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 983 state => $CFG->{face_prefetch},
… …
1038 . "This might increase or create lag, but increases the chances " 986 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 987 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 988 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 989 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 990 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 991 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 992 );
1045 993
1046 $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");
1047 $table->add (1, 9, new CFClient::UI::Entry 995 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 996 text => $CFG->{output_count},
1049 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.",
1050 on_changed => sub { $CFG->{output_count} = $_[1] }, 998 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 999 );
1052 1000
1053 $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");
1054 $table->add (1, 10, new CFClient::UI::Entry 1002 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1003 text => $CFG->{output_sync},
1056 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.",
1057 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1005 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1006 );
1059 1007
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1009 expand => 1,
1062 align => 0, 1010 align => 0,
1063 text => "Login", 1011 text => "Login",
1064 on_activate => sub { 1012 on_activate => sub {
1065 $CONN ? stop_game 1013 $CONN ? stop_game
1066 : start_game; 1014 : start_game;
1015 0
1067 }, 1016 },
1068 ); 1017 );
1069 1018
1070 $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");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1020 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1074 . "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. "
1075 . "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.",
1076 on_changed => sub { 1025 on_changed => sub {
1077 my ($self, $value) = @_; 1026 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1027 $CFG->{say_command} = $value;
1028 0
1079 } 1029 }
1080 ); 1030 );
1081 1031
1082 $vbox->add (new CFClient::UI::Label 1032 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1033 text => "Server Info",
… …
1094sub message_window { 1044sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1045 my $window = new CFClient::UI::FancyFrame
1096 name => "message_window", 1046 name => "message_window",
1097 title => "Messages", 1047 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1048 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1049 x => "max",
1101 y => 0, 1050 y => 0,
1102 force_w => $::WIDTH * 0.4, 1051 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1052 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1053 child => (my $vbox = new CFClient::UI::VBox),
1054 has_close_button => 1;
1105 1055
1106 $vbox->add ($LOGVIEW); 1056 $vbox->add ($LOGVIEW);
1107 1057
1108 $vbox->add (my $input = new CFClient::UI::Entry 1058 $vbox->add (my $input = new CFClient::UI::Entry
1109 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> "
… …
1117 1067
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1068 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1069 $input->{refocus_map} = 1;
1120 } 1070 }
1121 delete $input->{auto_activated}; 1071 delete $input->{auto_activated};
1072
1073 0
1122 }, 1074 },
1123 on_activate => sub { 1075 on_activate => sub {
1124 my ($input, $text) = @_; 1076 my ($input, $text) = @_;
1125 $input->set_text (''); 1077 $input->set_text ('');
1126 1078
… …
1132 } 1084 }
1133 if ($input->{refocus_map}) { 1085 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1086 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1087 $MAPWIDGET->focus_in
1136 } 1088 }
1089
1090 0
1137 }, 1091 },
1138 on_escape => sub { 1092 on_escape => sub {
1139 $MAPWIDGET->focus_in 1093 $MAPWIDGET->grab_focus;
1094
1095 0
1140 }, 1096 },
1141 ); 1097 );
1142 1098
1143 $CONSOLE = { 1099 $CONSOLE = {
1144 window => $window, 1100 window => $window,
… …
1166 ); 1122 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1123 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1124 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1125 text => "Ok",
1170 expand => 1, 1126 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1127 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1128 );
1173 $hb->add (new CFClient::UI::Button 1129 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1130 text => "Quit anyway",
1175 expand => 1, 1131 expand => 1,
1176 on_activate => sub { exit }, 1132 on_activate => sub { exit },
… …
1183sub autopickup_setup { 1139sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1140 my $table = new CFClient::UI::Table;
1185 1141
1186 for ( 1142 for (
1187 ["General", 0, 0, 1143 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1144 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1145 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1146 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1147 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1148 ],
1193 ["Weapons", 0, 6, 1149 ["Weapons", 0, 6,
… …
1230 for (@bits) { 1186 for (@bits) {
1231 ++$y; 1187 ++$y;
1232 1188
1233 my $mask = $_->[1]; 1189 my $mask = $_->[1];
1234 $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);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1191 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1192 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1193 on_changed => sub {
1238 my ($box, $value) = @_; 1194 my ($box, $value) = @_;
1239 1195
1240 if ($value) { 1196 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1197 $::CFG->{pickup} |= $mask;
… …
1243 $::CFG->{pickup} &= ~$mask; 1199 $::CFG->{pickup} &= ~$mask;
1244 } 1200 }
1245 1201
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1202 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1203 if defined $::CONN;
1204
1205 0
1248 }); 1206 });
1207
1208 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1209 }
1250 } 1210 }
1251 1211
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1212 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1213 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1214 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1215 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1216 on_changed => sub {
1256 my ($slider, $value) = @_; 1217 my ($slider, $value) = @_;
1257 1218
1258 $::CFG->{pickup} &= ~0x7; 1219 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1220 $::CFG->{pickup} |= int $value
1260 if $value; 1221 if $value;
1261 1; 1222 1;
1262 }); 1223 });
1224
1263 $table->add (3, 18, new CFClient::UI::Button 1225 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1226 text => "set",
1265 on_activate => sub { 1227 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1228 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1229 if defined $::CONN;
1268 1; 1230 0
1269 }); 1231 });
1270 1232
1271 $table 1233 $table
1272} 1234}
1273 1235
1274sub 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 {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1269 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1270 x => "center",
1277 y => "center", 1271 y => "center",
1278 force_w => $WIDTH * 9/10, 1272 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1273 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1274 title => "Player",
1275 name => "playerbook",
1276 has_close_button => 1
1281 ; 1277 ;
1282 1278
1283 $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;
1284 1282
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1283 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1284 "Statistics (F2)" => $STATS_PAGE = stats_window,
1287 $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 );
1288 1291
1289 $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 );
1290 1303
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1304 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1305
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1306 $plwin->add ($ntb);
1294 1307 $plwin
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299} 1308}
1300 1309
1301sub spell_setup { 1310sub update_bindings {
1302 new CFClient::UI::SpellList 1311 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1312}
1304 1313
1305sub keyboard_setup { 1314sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1315 my $binding_list = new CFClient::UI::VBox;
1307 1316
1308 my $refresh; 1317 my $refresh;
1309 $refresh = sub { 1318 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1319 $binding_list->clear ();
1311 1320
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1321 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1322 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1323 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1324 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1325
1317 my $lbl = join "; ", @$cmds; 1326 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1327 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1328 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1329 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1330 text => "delete",
1322 tooltip => "Deletes the binding", 1331 tooltip => "Deletes the binding",
1323 on_activate => sub { 1332 on_activate => sub {
1324 $binding_list->remove ($hb); 1333 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1334 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1335 0
1326 }); 1336 });
1327 1337
1328 $hb->add (new CFClient::UI::Button 1338 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1339 text => "edit",
1330 tooltip => "Edits the binding", 1340 tooltip => "Edits the binding",
1331 on_activate => sub { 1341 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1342 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1343 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1344 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1345 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1346 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1347 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1348 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1349 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1350 $SETUP_DIALOG->show;
1341 }, 1351 },
1342 sub { 1352 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1353 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1354 $SETUP_DIALOG->show;
1345 }); 1355 });
1346 $::BIND_EDITOR->show; 1356 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1357 $SETUP_DIALOG->hide;
1358 0
1348 }); 1359 });
1349 1360
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1361 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1362 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1363 }
… …
1361 state => $CFG->{shift_fire_stop}, 1372 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1373 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1374 on_changed => sub {
1364 my ($cbox, $value) = @_; 1375 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1376 $CFG->{shift_fire_stop} = $value;
1377 0
1366 }); 1378 });
1367 1379
1368 $vb->add ($binding_list); 1380 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1381 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1382
… …
1374 tooltip => "This button opens the binding editor with an empty binding.", 1386 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1387 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1388 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1389 sub {
1378 my ($mod, $sym, $cmds) = @_; 1390 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1391 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1392 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1383 }, 1395 },
1384 sub { 1396 sub {
… …
1386 $SETUP_DIALOG->show; 1398 $SETUP_DIALOG->show;
1387 }, 1399 },
1388 ); 1400 );
1389 $SETUP_DIALOG->hide; 1401 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1402 $::BIND_EDITOR->show;
1403 0
1391 }, 1404 },
1392 ); 1405 );
1393 1406
1394 $hb->add (new CFClient::UI::Button 1407 $hb->add (new CFClient::UI::Button
1395 text => "close", 1408 text => "close",
1396 tooltip => "Closes the binding window", 1409 tooltip => "Closes the binding window",
1397 expand => 1, 1410 expand => 1,
1398 on_activate => sub { 1411 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1412 $SETUP_DIALOG->hide;
1413 0
1400 } 1414 }
1401 ); 1415 );
1402 1416
1403 $refresh->(); 1417 $refresh->();
1404 1418
1405 $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);
1406} 1497}
1407 1498
1408sub help_window { 1499sub help_window {
1409 my $win = new CFClient::UI::FancyFrame 1500 my $win = new CFClient::UI::FancyFrame
1410 x => 'center', 1501 x => 'center',
1411 y => 'center', 1502 y => 'center',
1412 z => 2, 1503 z => 2,
1413 name => 'doc_browser', 1504 name => 'doc_browser',
1414 force_w => int $WIDTH * 7/8, 1505 force_w => int $WIDTH * 7/8,
1415 force_h => int $HEIGHT * 7/8, 1506 force_h => int $HEIGHT * 7/8,
1416 title => "Documentation"; 1507 title => "Help Browser",
1508 has_close_button => 1;
1417 1509
1418 $win->add (my $vbox = new CFClient::UI::VBox); 1510 $win->add (my $vbox = new CFClient::UI::VBox);
1419 1511
1420 $vbox->add (my $buttons = new CFClient::UI::HBox); 1512 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1513 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1424 $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: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1517 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1518 value => undef,
1427 options => [ 1519 options => [
1428 [intro => "Introduction"], 1520 [intro => "Introduction"],
1429 [manual => "Manual"], 1521 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1522 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1523 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1524 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1525 [COPYING => "License Terms"],
1526 [test => "test (do not select)"], #d#TODO
1434 ], 1527 ],
1435 on_changed => sub { 1528 on_changed => sub {
1436 my ($self, $pod) = @_; 1529 my ($self, $pod) = @_;
1437 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
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1539 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1540 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1541
1441 $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#
1442 1548
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1549 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1550 for @$pom;
1445 1551
1446 $viewer->set_offset (0); 1552 $viewer->set_offset (0);
1553
1554 0
1447 }, 1555 },
1448 on_visibility_change => sub { 1556 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1557 my ($self, $visible) = @_;
1450 return unless $visible; 1558 return unless $visible;
1451 return if $self->{value}; 1559 return if $self->{value};
1452 $self->set_value ("intro"); 1560 $self->set_value ("intro");
1561 0
1453 }, 1562 },
1454 ); 1563 );
1455 1564
1456 $win 1565 $win
1457} 1566}
… …
1496 z => 100, 1605 z => 100,
1497 force_x => "max", 1606 force_x => "max",
1498 force_y => 0; 1607 force_y => 0;
1499 $DEBUG_STATUS->show; 1608 $DEBUG_STATUS->show;
1500 1609
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1610 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1611
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1612 $STATUSBOX = new CFClient::UI::Statusbox;
1504 $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]);
1505 1614
1506 (new CFClient::UI::Frame 1615 (new CFClient::UI::Frame
… …
1515 name => "mapmap", 1624 name => "mapmap",
1516 x => 0, 1625 x => 0,
1517 y => $FONTSIZE + 8, 1626 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1627 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1628 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1629 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1630 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1631 ),
1524 )->show; 1632 )->show;
1525 1633
… …
1527 $MAPWIDGET->connect (activate_console => sub { 1635 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1636 my ($mapwidget, $preset) = @_;
1529 1637
1530 if ($CONSOLE) { 1638 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1639 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1640 $CONSOLE->{input}->grab_focus;
1533 1641
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1642 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1643 $CONSOLE->{input}->set_text ($preset);
1536 } 1644 }
1537 } 1645 }
1538 }); 1646 });
1539 $MAPWIDGET->show; 1647 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1648 $MAPWIDGET->grab_focus;
1541 1649
1542 $LOGVIEW = new CFClient::UI::TextScroller 1650 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1651 expand => 1,
1544 font => $FONT_FIXED, 1652 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1653 fontsize => $::CFG->{log_fontsize},
… …
1555 x => 'center', 1663 x => 'center',
1556 y => 'center', 1664 y => 'center',
1557 z => 2, 1665 z => 2,
1558 force_w => $::WIDTH * 0.6, 1666 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1667 force_h => $::HEIGHT * 0.6,
1668 has_close_button => 1,
1560 ; 1669 ;
1670
1671 $METASERVER = metaserver_dialog;
1561 1672
1562 $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,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1674 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1675
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1676 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1680 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "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.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1682 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1683 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1684 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1685 "Lets you define, edit and delete key bindings."
1575 . "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 "
1576 . "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 "
1577 . "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. "
1578 . "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 "
1579 . "binding editor closes"); 1690 . "binding editor closes");
1580 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1691 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1692 "Some debuggin' options. Do not ask.");
1584 1693
1585 $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
1586 1695
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1588 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.");
… …
1590 $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,
1591 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.");
1592 1701
1593 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
1594 1703
1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1596 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1597 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1704 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1598 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.");
1599 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1600 1706
1601 $BUTTONBAR->add (new CFClient::UI::Button 1707 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1708 text => "Save Config",
1603 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.",
1604 on_activate => sub { 1710 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1711 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1712 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1713 status "Configuration Saved";
1714 0
1608 }, 1715 },
1609 ); 1716 );
1610 1717
1611 $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,
1612 tooltip => "View Documentation"); 1719 tooltip => "View Documentation");
1613 1720
1614 $BUTTONBAR->add (new CFClient::UI::Button 1721 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Quit", 1722 text => "Quit",
1616 tooltip => "Terminates the program", 1723 tooltip => "Terminates the program",
… …
1618 if ($CONN) { 1725 if ($CONN) {
1619 open_quit_dialog; 1726 open_quit_dialog;
1620 } else { 1727 } else {
1621 exit; 1728 exit;
1622 } 1729 }
1730 0
1623 }, 1731 },
1624 ); 1732 );
1625 1733
1626 $BUTTONBAR->show; 1734 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1735 $SETUP_DIALOG->show;
… …
1629 1737
1630 $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]);
1631} 1739}
1632 1740
1633sub video_shutdown { 1741sub video_shutdown {
1742 CFClient::OpenGL::shutdown;
1743
1634 undef $SDL_ACTIVE; 1744 undef $SDL_ACTIVE;
1635} 1745}
1636 1746
1637my @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#
1638my $bgmusic;#TODO#hack#d# 1748my $bgmusic;#TODO#hack#d#
… …
1819# 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#
1820 }, 1930 },
1821 CFClient::SDL_KEYDOWN => sub { 1931 CFClient::SDL_KEYDOWN => sub {
1822 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1932 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1823 # alt-enter 1933 # alt-enter
1934 $FULLSCREEN_ENABLE->toggle;
1824 video_shutdown; 1935 video_shutdown;
1825 $CFG->{fullscreen} = !$CFG->{fullscreen};
1826 video_init; 1936 video_init;
1827 } else { 1937 } else {
1828 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1938 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1829 } 1939 }
1830 }, 1940 },
… …
1846$SIG{INT} = $SIG{TERM} = sub { exit }; 1956$SIG{INT} = $SIG{TERM} = sub { exit };
1847 1957
1848{ 1958{
1849 local $SIG{__DIE__} = sub { 1959 local $SIG{__DIE__} = sub {
1850 return unless defined $^S && !$^S; 1960 return unless defined $^S && !$^S;
1851 Carp::confess $_[1];#d#TODO: remove when stable 1961 Carp::confess $_[0];#d#TODO: remove when stable
1852 CFClient::fatal $_[0]; 1962 CFClient::fatal $_[0];
1853 }; 1963 };
1854 1964
1855 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1965 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1856 CFClient::UI::set_layout ($::CFG->{layout}); 1966 CFClient::UI::set_layout ($::CFG->{layout});
1857 1967
1858 my %DEF_CFG = ( 1968 my %DEF_CFG = (
1859 sdl_mode => 0, 1969 sdl_mode => 0,
1860 width => 640, 1970 width => 640,
1861 height => 480, 1971 height => 480,
1862 fullscreen => 0, 1972 fullscreen => 0,
1863 fast => 0, 1973 fast => 0,
1864 map_scale => 1, 1974 map_scale => 1,
1865 fow_enable => 1, 1975 fow_enable => 1,
1866 fow_intensity => 0.45, 1976 fow_intensity => 0.45,
1867 fow_smooth => 0, 1977 fow_smooth => 0,
1868 gui_fontsize => 1, 1978 gui_fontsize => 1,
1869 log_fontsize => 0.7, 1979 log_fontsize => 0.7,
1870 gauge_fontsize=> 1, 1980 gauge_fontsize => 1,
1871 gauge_size => 0.35, 1981 gauge_size => 0.35,
1872 stat_fontsize => 0.7, 1982 stat_fontsize => 0.7,
1873 mapsize => 100, 1983 mapsize => 100,
1874 host => "crossfire.schmorp.de",
1875 say_command => 'say', 1984 say_command => 'say',
1876 audio_enable => 1, 1985 audio_enable => 1,
1877 bgm_enable => 1, 1986 bgm_enable => 1,
1878 bgm_volume => 0.25, 1987 bgm_volume => 0.25,
1879 face_prefetch => 0, 1988 face_prefetch => 0,
1880 output_sync => 1, 1989 output_sync => 1,
1881 output_count => 1, 1990 output_count => 1,
1882 pickup => 0, 1991 pickup => 0,
1992 default => "profile", # default profile
1993 );
1883 ); 1994
1884
1885 while (my ($k, $v) = each %DEF_CFG) { 1995 while (my ($k, $v) = each %DEF_CFG) {
1886 $CFG->{$k} = $v unless exists $CFG->{$k}; 1996 $CFG->{$k} = $v unless exists $CFG->{$k};
1887 } 1997 }
1998
1999 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1888 2000
1889 sdl_init; 2001 sdl_init;
1890 2002
1891 @SDL_MODES = reverse 2003 @SDL_MODES = reverse
1892 grep $_->[0] >= 640 && $_->[1] >= 480, 2004 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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