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.64 by root, Wed Jun 7 06:28:30 2006 UTC vs.
Revision 1.79 by root, Fri Jun 23 23:54:31 2006 UTC

… …
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
89 90
90our $SETUP_DIALOG; 91our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 93our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
… …
114our $INV; 115our $INV;
115our $INVR; 116our $INVR;
116our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
117 118
118our $BIND_EDITOR; 119our $BIND_EDITOR;
120our $BIND_UPD_CB;
119 121
120our $PICKUP_CFG; 122our $PICKUP_CFG;
121 123
122sub status { 124sub status {
123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 125 $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 156 $hbox->add (new CFClient::UI::Button
155 text => "No", 157 text => "No",
156 on_activate => sub { 158 on_activate => sub {
157 $conn->send ("reply n"); 159 $conn->send ("reply n");
158 $dialog->destroy; 160 $dialog->destroy;
161 0
159 } 162 }
160 ); 163 );
161 $hbox->add (new CFClient::UI::Button 164 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 165 text => "Yes",
163 on_activate => sub { 166 on_activate => sub {
164 $conn->send ("reply y"); 167 $conn->send ("reply y");
165 destroy_query_dialog $conn; 168 destroy_query_dialog $conn;
169 0
166 }, 170 },
167 ); 171 );
168 172
169 $dialog->focus_in; 173 $dialog->grab_focus;
170 174
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 175 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 176 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173 177
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 178 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
184 $table->add (0, 0, new CFClient::UI::Button 188 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 189 text => "Next Race",
186 on_activate => sub { 190 on_activate => sub {
187 $conn->send ("reply n"); 191 $conn->send ("reply n");
188 destroy_query_dialog $conn; 192 destroy_query_dialog $conn;
193 0
189 }, 194 },
190 ); 195 );
191 $table->add (2, 0, new CFClient::UI::Button 196 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 197 text => "Accept",
193 on_activate => sub { 198 on_activate => sub {
194 $conn->send ("reply d"); 199 $conn->send ("reply d");
195 destroy_query_dialog $conn; 200 destroy_query_dialog $conn;
201 0
196 }, 202 },
197 ); 203 );
198 204
199 unshift @dialog, new CFClient::UI::Label 205 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 206 max_w => $::WIDTH * 0.4,
… …
230 $table->add (0, 0, new CFClient::UI::Button 236 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 237 text => "Roll Again",
232 on_activate => sub { 238 on_activate => sub {
233 $conn->send ("reply y"); 239 $conn->send ("reply y");
234 destroy_query_dialog $conn; 240 destroy_query_dialog $conn;
241 0
235 }, 242 },
236 ); 243 );
237 244
238 # center: swap stats 245 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 246 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
253 text => "Swap Stats", 260 text => "Swap Stats",
254 on_activate => sub { 261 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 262 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 263 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 264 destroy_query_dialog $conn;
265 0
258 }, 266 },
259 ); 267 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 268 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 269
262 # right: accept 270 # right: accept
… …
264 text => "Accept", 272 text => "Accept",
265 on_activate => sub { 273 on_activate => sub {
266 $conn->send ("reply n"); 274 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 275 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn; 276 destroy_query_dialog $conn;
277 0
269 }, 278 },
270 ); 279 );
271 280
272 unshift @dialog, new CFClient::UI::Label 281 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 282 max_w => $::WIDTH * 0.4,
… …
283 292
284 push @dialog, my $entry = new CFClient::UI::Entry 293 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 294 on_changed => sub {
286 $conn->send ("reply $_[1]"); 295 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 296 destroy_query_dialog $conn;
297 0
288 }, 298 },
289 ; 299 ;
290 300
291 $entry->focus_in; 301 $entry->grab_focus;
292 302
293 } else { 303 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 304 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295 305
296 push @dialog, my $entry = new CFClient::UI::Entry 306 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 307 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 308 on_activate => sub {
299 $conn->send ("reply $_[1]"); 309 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 310 destroy_query_dialog $conn;
311 0
301 }, 312 },
302 ; 313 ;
303 314
304 $entry->focus_in; 315 $entry->grab_focus;
305 } 316 }
306 317
307 $vbox->add (@dialog); 318 $vbox->add (@dialog);
308 $dialog->show; 319 $dialog->show;
309} 320}
… …
314 $LOGIN_BUTTON->set_text ("Logout"); 325 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 326 $SETUP_DIALOG->hide;
316 327
317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 328 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318 329
319 my ($host, $port) = split /:/, $CFG->{host}; 330 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 331
321 $MAP = new CFClient::Map $mapsize, $mapsize; 332 $MAP = new CFClient::Map $mapsize, $mapsize;
322 333
323 $CONN = eval { 334 $CONN = eval {
324 new CFClient::Protocol 335 new CFClient::Protocol
325 host => $host, 336 host => $host,
326 port => $port || 13327, 337 port => $port || 13327,
327 user => $CFG->{user}, 338 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 339 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 340 mapw => $mapsize,
330 maph => $mapsize, 341 maph => $mapsize,
331 342
332 map_widget => $MAPWIDGET, 343 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 344 logview => $LOGVIEW,
… …
362sub stop_game { 373sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 374 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 376 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 377 $INV_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells;
367 379
368 return unless $CONN; 380 return unless $CONN;
369 381
370 status "connection closed"; 382 status "connection closed";
371 383
372 destroy_query_dialog $CONN; 384 destroy_query_dialog $CONN;
373 $CONN->destroy; 385 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 386 $CONN = 0; # false, does not autovivify
387
388 undef $MAP;
375} 389}
376 390
377sub graphics_setup { 391sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 392 my $vbox = new CFClient::UI::VBox;
379 393
… …
397 411
398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 412 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 413 $table->add (1, $row++, new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 414 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 415 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 416 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 417 );
407 418
408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 420 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 421 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 422 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 423 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 424 );
417 425
418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 426 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419 $table->add (1, $row++, new CFClient::UI::Slider 427 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 428 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 429 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 430 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 431 );
427 432
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 433 $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 434 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 435 state => $CFG->{fow_enable},
431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 436 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432 on_changed => sub { 437 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 438 );
437 439
438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439 $table->add (1, $row++, new CFClient::UI::Slider 441 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 442 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.", 443 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 { 444 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 445 );
447 446
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 447 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 448 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 449 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 450 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub { 451 on_changed => sub {
453 my ($self, $value) = @_; 452 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 453 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 454 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
455 0
456 } 456 }
457 ); 457 );
458 458
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 461 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.", 462 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] }, 463 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 464 );
465 465
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 468 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.", 469 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]) }, 470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 471 );
472 472
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474 474
475 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 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.", 477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub { 478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1]; 479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize; 480 &set_stats_window_fontsize;
481 0
481 } 482 }
482 ); 483 );
483 484
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 485 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 486 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 487 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.", 488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 489 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 490 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 491 &set_gauge_window_fontsize;
492 0
491 } 493 }
492 ); 494 );
493 495
494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 496 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495 $table->add (1, $row++, new CFClient::UI::Slider 497 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 498 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 499 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498 on_changed => sub { 500 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 501 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
503 0
501 } 504 }
502 ); 505 );
503 506
504 $table->add (1, $row++, new CFClient::UI::Button 507 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 508 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 509 tooltip => "Apply the video settings",
507 on_activate => sub { 510 on_activate => sub {
508 video_shutdown (); 511 video_shutdown ();
509 video_init (); 512 video_init ();
513 0
510 } 514 }
511 ); 515 );
512 516
513 $vbox 517 $vbox
514} 518}
… …
522 526
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 527 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 528 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 529 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.", 530 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 { 531 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 532 );
531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 533# $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 { 534# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533# $CFG->{effects_volume} = $_[1]; 535# $CFG->{effects_volume} = $_[1];
534# }); 536# });
535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 537 $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); 538 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 539 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 540 expand => 1, state => $CFG->{bgm_enable},
539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 541 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540 on_changed => sub { 542 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 543 );
544 $hbox->add (new CFClient::UI::Slider 544 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 546 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 547 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 ); 548 );
552 549
553 $table->add (1, $row++, new CFClient::UI::Button 550 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 551 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 552 tooltip => "Apply the audio settings",
556 on_activate => sub { 553 on_activate => sub {
557 audio_shutdown (); 554 audio_shutdown ();
558 audio_init (); 555 audio_init ();
556 0
559 } 557 }
560 ); 558 );
561 559
562 $vbox 560 $vbox
563} 561}
… …
625 &set_gauge_window_fontsize; 623 &set_gauge_window_fontsize;
626 624
627 $win 625 $win
628} 626}
629 627
628sub debug_setup {
629 my $table = new CFClient::UI::Table;
630
631 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
632 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
633 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
634 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
635 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
636 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
637 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
638 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
639
640 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
641
642 for my $x (0..2) {
643 for my $y (0 .. 2) {
644 $table->add ($x + 3, $y,
645 new CFClient::UI::Entry
646 text => $default_smooth[$x * 3 + $y],
647 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
648 );
649 }
650 }
651
652
653 $table
654}
630 655
631sub stats_window { 656sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 657 my $tgw = new CFClient::UI::FancyFrame
633 y => $HEIGHT * (2/8), 658 y => $HEIGHT * (2/8),
634 x => "max", 659 x => "max",
635 title => "Stats", 660 title => "Stats",
636 name => "stats_window"; 661 name => "stats_window",
662 has_close_button => 1;
637 663
638 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 664 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
639 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 665 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640 can_hover => 1, can_events => 1, 666 can_hover => 1, can_events => 1,
641 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 667 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
723 ); 749 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 750 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
725 font => $FONT_FIXED, 751 font => $FONT_FIXED,
726 can_hover => 1, 752 can_hover => 1,
727 can_events => 1, 753 can_events => 1,
728 image => "ui/resist/resist_$_.png", 754 path => "ui/resist/resist_$_.png",
729 tooltip => $resist_names{$_}, 755 tooltip => $resist_names{$_},
730 ); 756 );
731 757
732 $row++; 758 $row++;
733 if ($row % 6 == 0) { 759 if ($row % 6 == 0) {
… …
787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 814 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789 815
790 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 816 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791 817
792 # TODO: replace by CS_STAT_RES_xxx constants
793 my %tbl = ( 818 my %tbl = (
794 phys => 100, 819 phys => CS_STAT_RES_PHYS,
795 magic => 101, 820 magic => CS_STAT_RES_MAG,
796 fire => 102, 821 fire => CS_STAT_RES_FIRE,
797 elec => 103, 822 elec => CS_STAT_RES_ELEC,
798 cold => 104, 823 cold => CS_STAT_RES_COLD,
799 conf => 105, 824 conf => CS_STAT_RES_CONF,
800 acid => 106, 825 acid => CS_STAT_RES_ACID,
801 drain => 107, 826 drain => CS_STAT_RES_DRAIN,
802 ghit => 108, 827 ghit => CS_STAT_RES_GHOSTHIT,
803 pois => 109, 828 pois => CS_STAT_RES_POISON,
804 slow => 110, 829 slow => CS_STAT_RES_SLOW,
805 para => 111, 830 para => CS_STAT_RES_PARA,
806 tund => 112, 831 tund => CS_STAT_TURN_UNDEAD,
807 fear => 113, 832 fear => CS_STAT_RES_FEAR,
808 depl => 113, 833 depl => CS_STAT_RES_DEPLETE,
809 deat => 115, 834 deat => CS_STAT_RES_DEATH,
810 holyw => 116, 835 holyw => CS_STAT_RES_HOLYWORD,
811 blind => 117, 836 blind => CS_STAT_RES_BLIND,
812 ); 837 );
813 838
814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815 for keys %tbl; 840 for keys %tbl;
816} 841}
… …
890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 915 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
891 (new CFClient::UI::Button 916 (new CFClient::UI::Button
892 text => "Use", 917 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field", 918 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub { 919 on_activate => sub {
895 $HOST_ENTRY->set_text ($CFG->{host} = $host); 920 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
896 $METASERVER->hide; 921 $METASERVER->hide;
922 0
897 }, 923 },
898 ), 924 ),
899 (new CFClient::UI::Empty expand => 1), 925 (new CFClient::UI::Empty expand => 1),
900 ]); 926 ]);
901 927
… …
922 z => 3, 948 z => 3,
923 force_h => $::HEIGHT * 0.4, 949 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox), 950 child => (my $vbox = new CFClient::UI::VBox),
925 on_visibility_change => sub { 951 on_visibility_change => sub {
926 update_metaserver if $_[1]; 952 update_metaserver if $_[1];
953 0
927 }, 954 },
928 ; 955 ;
929 956
930 $dialog->{table} = new CFClient::UI::Table; 957 $dialog->{table} = new CFClient::UI::Table;
931 958
… …
944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
945 972
946 $vbox->add ( 973 $vbox->add (
947 $HOST_ENTRY = new CFClient::UI::Entry 974 $HOST_ENTRY = new CFClient::UI::Entry
948 expand => 1, 975 expand => 1,
949 text => $CFG->{host}, 976 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 978 on_changed => sub {
952 my ($self, $value) = @_; 979 my ($self, $value) = @_;
953 $CFG->{host} = $value; 980 $CFG->{profile}{default}{host} = $value;
981 0
954 } 982 }
955 ); 983 );
956 984
957 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
958 986
959 $vbox->add (new CFClient::UI::Button 987 $vbox->add (new CFClient::UI::Button
960 expand => 1, 988 expand => 1,
961 text => "Server List", 989 text => "Server List",
962 other => $METASERVER, 990 other => $METASERVER,
963 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
964 on_activate => sub { $METASERVER->toggle_visibility }, 992 on_activate => sub { $METASERVER->toggle_visibility; 0 },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 993 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
966 ); 994 );
967 } 995 }
968 996
969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
970 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
971 text => $CFG->{user}, 999 text => $CFG->{profile}{default}{user},
972 tooltip => "The name of your character on the server", 1000 tooltip => "The name of your character on the server",
973 on_changed => sub { 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
974 my ($self, $value) = @_;
975 $CFG->{user} = $value;
976 }
977 ); 1002 );
978 1003
979 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1004 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
980 $table->add (1, 5, new CFClient::UI::Entry 1005 $table->add (1, 5, new CFClient::UI::Entry
981 text => $CFG->{password}, 1006 text => $CFG->{profile}{default}{password},
982 hidden => 1, 1007 hidden => 1,
983 tooltip => "The password for your character", 1008 tooltip => "The password for your character",
984 on_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
985 my ($self, $value) = @_;
986 $CFG->{password} = $value;
987 }
988 ); 1010 );
989 1011
990 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1012 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
991 $table->add (1, 7, new CFClient::UI::Slider 1013 $table->add (1, 7, new CFClient::UI::Slider
992 force_w => 100, 1014 force_w => 100,
993 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1015 range => [$CFG->{mapsize}, 10, 100, 0, 1],
994 tooltip => "This is the size of the portion of the map update the server sends you. " 1016 tooltip => "This is the size of the portion of the map update the server sends you. "
995 . "If you set this to a high value you will be able to see further, " 1017 . "If you set this to a high value you will be able to see further, "
996 . "but you also increase bandwidth requirements and latency. " 1018 . "but you also increase bandwidth requirements and latency. "
997 . "This option is only used once at log-in.", 1019 . "This option is only used once at log-in.",
998 on_changed => sub { 1020 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
999 my ($self, $value) = @_;
1000
1001 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1002 },
1003 ); 1021 );
1004 1022
1005 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1023 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1024 $table->add (1, 8, new CFClient::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1025 state => $CFG->{face_prefetch},
… …
1010 . "This might increase or create lag, but increases the chances " 1028 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1029 . "of faces being ready for display when you encounter them. "
1012 . "It also uses up server bandwidth on every connect, " 1030 . "It also uses up server bandwidth on every connect, "
1013 . "so only set it if you really need to prefetch images. " 1031 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1032 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1033 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1034 );
1017 1035
1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1036 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1019 $table->add (1, 9, new CFClient::UI::Entry 1037 $table->add (1, 9, new CFClient::UI::Entry
1020 text => $CFG->{output_count}, 1038 text => $CFG->{output_count},
1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1039 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022 on_changed => sub { $CFG->{output_count} = $_[1] }, 1040 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1041 );
1024 1042
1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1043 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026 $table->add (1, 10, new CFClient::UI::Entry 1044 $table->add (1, 10, new CFClient::UI::Entry
1027 text => $CFG->{output_sync}, 1045 text => $CFG->{output_sync},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1046 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1047 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1048 );
1031 1049
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1050 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1033 expand => 1, 1051 expand => 1,
1034 align => 0, 1052 align => 0,
1035 text => "Login", 1053 text => "Login",
1036 on_activate => sub { 1054 on_activate => sub {
1037 $CONN ? stop_game 1055 $CONN ? stop_game
1038 : start_game; 1056 : start_game;
1057 0
1039 }, 1058 },
1040 ); 1059 );
1041 1060
1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1061 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1062 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1065 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1066 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub { 1067 on_changed => sub {
1049 my ($self, $value) = @_; 1068 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value; 1069 $CFG->{say_command} = $value;
1070 0
1051 } 1071 }
1052 ); 1072 );
1073
1074 $vbox->add (new CFClient::UI::Label
1075 text => "Server Info",
1076 fontsize => 1.2,
1077 padding_y => 8,
1078 fg => [1, 1, 0, 1],
1079 );
1080
1081 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1053 1082
1054 $vbox 1083 $vbox
1055} 1084}
1056 1085
1057sub message_window { 1086sub message_window {
… …
1062 bg => [0, 0, 0, 0.75], 1091 bg => [0, 0, 0, 0.75],
1063 x => "max", 1092 x => "max",
1064 y => 0, 1093 y => 0,
1065 force_w => $::WIDTH * 0.4, 1094 force_w => $::WIDTH * 0.4,
1066 force_h => $::HEIGHT * 0.5, 1095 force_h => $::HEIGHT * 0.5,
1067 child => (my $vbox = new CFClient::UI::VBox); 1096 child => (my $vbox = new CFClient::UI::VBox),
1097 has_close_button => 1;
1068 1098
1069 $vbox->add ($LOGVIEW); 1099 $vbox->add ($LOGVIEW);
1070 1100
1071 $vbox->add (my $input = new CFClient::UI::Entry 1101 $vbox->add (my $input = new CFClient::UI::Entry
1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1102 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1080 1110
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1111 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1; 1112 $input->{refocus_map} = 1;
1083 } 1113 }
1084 delete $input->{auto_activated}; 1114 delete $input->{auto_activated};
1115
1116 0
1085 }, 1117 },
1086 on_activate => sub { 1118 on_activate => sub {
1087 my ($input, $text) = @_; 1119 my ($input, $text) = @_;
1088 $input->set_text (''); 1120 $input->set_text ('');
1089 1121
… …
1095 } 1127 }
1096 if ($input->{refocus_map}) { 1128 if ($input->{refocus_map}) {
1097 delete $input->{refocus_map}; 1129 delete $input->{refocus_map};
1098 $MAPWIDGET->focus_in 1130 $MAPWIDGET->focus_in
1099 } 1131 }
1132
1133 0
1100 }, 1134 },
1101 on_escape => sub { 1135 on_escape => sub {
1102 $MAPWIDGET->focus_in 1136 $MAPWIDGET->grab_focus;
1137
1138 0
1103 }, 1139 },
1104 ); 1140 );
1105 1141
1106 $CONSOLE = { 1142 $CONSOLE = {
1107 window => $window, 1143 window => $window,
… …
1129 ); 1165 );
1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1166 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1131 $hb->add (new CFClient::UI::Button 1167 $hb->add (new CFClient::UI::Button
1132 text => "Ok", 1168 text => "Ok",
1133 expand => 1, 1169 expand => 1,
1134 on_activate => sub { $QUIT_DIALOG->hide }, 1170 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1135 ); 1171 );
1136 $hb->add (new CFClient::UI::Button 1172 $hb->add (new CFClient::UI::Button
1137 text => "Quit anyway", 1173 text => "Quit anyway",
1138 expand => 1, 1174 expand => 1,
1139 on_activate => sub { exit }, 1175 on_activate => sub { exit },
… …
1182 ["Potions" => PICKUP_POTION], 1218 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1219 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED], 1220 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS], 1221 ["Jewelery" => PICKUP_JEWELS],
1186 ], 1222 ],
1223 ["Weight/Value ratio", 2, 17]
1187 ) 1224 )
1188 { 1225 {
1189 my ($title, $x, $y, @bits) = @$_; 1226 my ($title, $x, $y, @bits) = @$_;
1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1227 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1191 1228
… …
1205 $::CFG->{pickup} &= ~$mask; 1242 $::CFG->{pickup} &= ~$mask;
1206 } 1243 }
1207 1244
1208 $::CONN->send_command ("pickup $::CFG->{pickup}") 1245 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN; 1246 if defined $::CONN;
1247
1248 0
1210 }); 1249 });
1211 } 1250 }
1212 } 1251 }
1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 0
1270 });
1213 1271
1214 $table 1272 $table
1215} 1273}
1216 1274
1217sub inventory_window { 1275sub inventory_window {
… …
1219 x => "center", 1277 x => "center",
1220 y => "center", 1278 y => "center",
1221 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
1222 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
1223 title => "Inventory", 1281 title => "Inventory",
1282 has_close_button => 1,
1224 ; 1283 ;
1225 1284
1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1227 1286
1228 $hb->add (my $vb1 = new CFClient::UI::VBox); 1287 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
1243 1302
1244sub spell_setup { 1303sub spell_setup {
1245 new CFClient::UI::SpellList 1304 new CFClient::UI::SpellList
1246} 1305}
1247 1306
1307sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309}
1310
1248sub keyboard_setup { 1311sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox; 1312 my $binding_list = new CFClient::UI::VBox;
1250 1313
1251 my $refresh; 1314 my $refresh;
1252 $refresh = sub { 1315 $refresh = $BIND_UPD_CB = sub {
1253 $binding_list->clear (); 1316 $binding_list->clear ();
1254 1317
1255 for my $mod (keys %{$::CFG->{bindings}}) { 1318 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259 1322
1260 my $lbl = join "; ", @$cmds; 1323 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox); 1325 $binding_list->add (my $hb = new CFClient::UI::HBox);
1263 $hb->add (new CFClient::UI::Button 1326 $hb->add (new CFClient::UI::Button
1264 text => "delete", 1327 text => "delete",
1265 tooltip => "Deletes the binding", 1328 tooltip => "Deletes the binding",
1266 on_activate => sub { 1329 on_activate => sub {
1267 $binding_list->remove ($hb); 1330 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym}; 1331 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1332 0
1269 }); 1333 });
1270 1334
1271 $hb->add (new CFClient::UI::Button 1335 $hb->add (new CFClient::UI::Button
1272 text => "edit", 1336 text => "edit",
1273 tooltip => "Edits the binding", 1337 tooltip => "Edits the binding",
1274 on_activate => sub { 1338 on_activate => sub {
1275 $::BIND_EDITOR->set_binding ( 1339 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1340 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1277 sub { 1341 sub {
1278 my ($nmod, $nsym, $ncmds) = @_; 1342 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym}; 1343 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1344 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1281 $refresh->(); 1345 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1346 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show; 1347 $SETUP_DIALOG->show;
1284 }, 1348 },
1285 sub { 1349 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1350 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show; 1351 $SETUP_DIALOG->show;
1288 }); 1352 });
1289 $::BIND_EDITOR->show; 1353 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide; 1354 $SETUP_DIALOG->hide;
1355 0
1291 }); 1356 });
1292 1357
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1358 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1359 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1295 } 1360 }
1296 } 1361 }
1297 }; 1362 };
1298 1363
1299 my $vb = new CFClient::UI::VBox; 1364 my $vb = new CFClient::UI::VBox;
1365 $vb->add (my $hb = new CFClient::UI::HBox);
1366 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1367 $hb->add (new CFClient::UI::CheckBox
1368 expand => 1,
1369 state => $CFG->{shift_fire_stop},
1370 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1371 on_changed => sub {
1372 my ($cbox, $value) = @_;
1373 $CFG->{shift_fire_stop} = $value;
1374 0
1375 });
1376
1300 $vb->add ($binding_list); 1377 $vb->add ($binding_list);
1301 $vb->add (my $hb = new CFClient::UI::HBox); 1378 $vb->add (my $hb = new CFClient::UI::HBox);
1302 1379
1303 $hb->add (new CFClient::UI::Button 1380 $hb->add (new CFClient::UI::Button
1304 text => "record new", 1381 text => "record new",
… …
1306 tooltip => "This button opens the binding editor with an empty binding.", 1383 tooltip => "This button opens the binding editor with an empty binding.",
1307 on_activate => sub { 1384 on_activate => sub {
1308 $::BIND_EDITOR->set_binding (undef, undef, [], 1385 $::BIND_EDITOR->set_binding (undef, undef, [],
1309 sub { 1386 sub {
1310 my ($mod, $sym, $cmds) = @_; 1387 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1388 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1312 $refresh->(); 1389 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1390 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1391 $SETUP_DIALOG->show;
1315 }, 1392 },
1316 sub { 1393 sub {
… …
1318 $SETUP_DIALOG->show; 1395 $SETUP_DIALOG->show;
1319 }, 1396 },
1320 ); 1397 );
1321 $SETUP_DIALOG->hide; 1398 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show; 1399 $::BIND_EDITOR->show;
1400 0
1323 }, 1401 },
1324 ); 1402 );
1325 1403
1326 $hb->add (new CFClient::UI::Button 1404 $hb->add (new CFClient::UI::Button
1327 text => "close", 1405 text => "close",
1328 tooltip => "Closes the binding window", 1406 tooltip => "Closes the binding window",
1329 expand => 1, 1407 expand => 1,
1330 on_activate => sub { 1408 on_activate => sub {
1331 $SETUP_DIALOG->hide; 1409 $SETUP_DIALOG->hide;
1410 0
1332 } 1411 }
1333 ); 1412 );
1334 1413
1335 $refresh->(); 1414 $refresh->();
1336 1415
… …
1356 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1435 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1357 $buttons->add (my $combo = new CFClient::UI::Combobox 1436 $buttons->add (my $combo = new CFClient::UI::Combobox
1358 value => undef, 1437 value => undef,
1359 options => [ 1438 options => [
1360 [intro => "Introduction"], 1439 [intro => "Introduction"],
1361 [manual => "Manual"], 1440 [manual => "Main Manual"],
1362 [skill_help => "Skills"], 1441 [skill_help => "Skill Reference"],
1363 [command_help => "Commands"], 1442 [command_help => "Command Reference"],
1364 [dmcommand_help => "DM Commands"], 1443 [dmcommand_help => "DM Commands"],
1365 [COPYING => "License Terms"], 1444 [COPYING => "License Terms"],
1366 ], 1445 ],
1367 on_changed => sub { 1446 on_changed => sub {
1368 my ($self, $pod) = @_; 1447 my ($self, $pod) = @_;
1369 1448
1370 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1371 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1372 1451
1373 $viewer->clear; 1452 $viewer->clear;
1453
1454# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1455# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1456# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1457# ]);#d#
1374 1458
1375 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1459 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1376 for @$pom; 1460 for @$pom;
1377 1461
1378 $viewer->set_offset (0); 1462 $viewer->set_offset (0);
1463
1464 0
1379 }, 1465 },
1380 on_visibility_change => sub { 1466 on_visibility_change => sub {
1381 my ($self, $visible) = @_; 1467 my ($self, $visible) = @_;
1382 return unless $visible; 1468 return unless $visible;
1383 return if $self->{value}; 1469 return if $self->{value};
1384 $self->set_value ("intro"); 1470 $self->set_value ("intro");
1471 0
1385 }, 1472 },
1386 ); 1473 );
1387 1474
1388 $win 1475 $win
1389} 1476}
… …
1458 $MAPWIDGET->connect (activate_console => sub { 1545 $MAPWIDGET->connect (activate_console => sub {
1459 my ($mapwidget, $preset) = @_; 1546 my ($mapwidget, $preset) = @_;
1460 1547
1461 if ($CONSOLE) { 1548 if ($CONSOLE) {
1462 $CONSOLE->{input}->{auto_activated} = 1; 1549 $CONSOLE->{input}->{auto_activated} = 1;
1463 $CONSOLE->{input}->focus_in; 1550 $CONSOLE->{input}->grab_focus;
1464 1551
1465 if ($preset && $CONSOLE->{input}->get_text eq '') { 1552 if ($preset && $CONSOLE->{input}->get_text eq '') {
1466 $CONSOLE->{input}->set_text ($preset); 1553 $CONSOLE->{input}->set_text ($preset);
1467 } 1554 }
1468 } 1555 }
1469 }); 1556 });
1470 $MAPWIDGET->show; 1557 $MAPWIDGET->show;
1471 $MAPWIDGET->focus_in; 1558 $MAPWIDGET->grab_focus;
1472 1559
1473 $LOGVIEW = new CFClient::UI::TextScroller 1560 $LOGVIEW = new CFClient::UI::TextScroller
1474 expand => 1, 1561 expand => 1,
1475 font => $FONT_FIXED, 1562 font => $FONT_FIXED,
1476 fontsize => $::CFG->{log_fontsize}, 1563 fontsize => $::CFG->{log_fontsize},
… …
1486 x => 'center', 1573 x => 'center',
1487 y => 'center', 1574 y => 'center',
1488 z => 2, 1575 z => 2,
1489 force_w => $::WIDTH * 0.6, 1576 force_w => $::WIDTH * 0.6,
1490 force_h => $::HEIGHT * 0.6, 1577 force_h => $::HEIGHT * 0.6,
1578 has_close_button => 1,
1491 ; 1579 ;
1492 1580
1493 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1581 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1494 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1582 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1495 1583
… …
1500 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1588 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1501 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1589 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1502 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1590 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1503 "Configure the use of audio, sound effects and background music."); 1591 "Configure the use of audio, sound effects and background music.");
1504 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1592 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1505 "Lets you define, edit and delete bindings." 1593 "Lets you define, edit and delete key bindings."
1506 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1594 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1507 . "with nothing set and the recording started. After doing the actions you " 1595 . "with nothing set and the recording started. After doing the actions you "
1508 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1596 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1509 . "After pressing the combo the binding will be saved automatically and the " 1597 . "After pressing the combo the binding will be saved automatically and the "
1510 . "binding editor closes"); 1598 . "binding editor closes");
1511 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1599 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1512 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1600 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1601 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1602 "Some debuggin' options. Do not ask.");
1513 1603
1514 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1604 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1515 1605
1516 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1606 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1517 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1607 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1532 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1622 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1533 on_activate => sub { 1623 on_activate => sub {
1534 $::CFG->{layout} = CFClient::UI::get_layout; 1624 $::CFG->{layout} = CFClient::UI::get_layout;
1535 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1625 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1536 status "Configuration Saved"; 1626 status "Configuration Saved";
1627 0
1537 }, 1628 },
1538 ); 1629 );
1539 1630
1540 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1631 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1541 tooltip => "View Documentation"); 1632 tooltip => "View Documentation");
… …
1547 if ($CONN) { 1638 if ($CONN) {
1548 open_quit_dialog; 1639 open_quit_dialog;
1549 } else { 1640 } else {
1550 exit; 1641 exit;
1551 } 1642 }
1643 0
1552 }, 1644 },
1553 ); 1645 );
1554 1646
1555 $BUTTONBAR->show; 1647 $BUTTONBAR->show;
1556 $SETUP_DIALOG->show; 1648 $SETUP_DIALOG->show;
… …
1558 1650
1559 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1651 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1560} 1652}
1561 1653
1562sub video_shutdown { 1654sub video_shutdown {
1655 CFClient::OpenGL::shutdown;
1656
1563 undef $SDL_ACTIVE; 1657 undef $SDL_ACTIVE;
1564} 1658}
1565 1659
1566my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1660my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1567my $bgmusic;#TODO#hack#d# 1661my $bgmusic;#TODO#hack#d#
… …
1783 1877
1784 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1785 CFClient::UI::set_layout ($::CFG->{layout}); 1879 CFClient::UI::set_layout ($::CFG->{layout});
1786 1880
1787 my %DEF_CFG = ( 1881 my %DEF_CFG = (
1788 sdl_mode => 0, 1882 sdl_mode => 0,
1789 width => 640, 1883 width => 640,
1790 height => 480, 1884 height => 480,
1791 fullscreen => 0, 1885 fullscreen => 0,
1792 fast => 0, 1886 fast => 0,
1793 map_scale => 1, 1887 map_scale => 1,
1794 fow_enable => 1, 1888 fow_enable => 1,
1795 fow_intensity => 0.45, 1889 fow_intensity => 0.45,
1796 fow_smooth => 0, 1890 fow_smooth => 0,
1797 gui_fontsize => 1, 1891 gui_fontsize => 1,
1798 log_fontsize => 0.7, 1892 log_fontsize => 0.7,
1799 gauge_fontsize=> 1, 1893 gauge_fontsize => 1,
1800 gauge_size => 0.35, 1894 gauge_size => 0.35,
1801 stat_fontsize => 0.7, 1895 stat_fontsize => 0.7,
1802 mapsize => 100, 1896 mapsize => 100,
1803 host => "crossfire.schmorp.de",
1804 say_command => 'say', 1897 say_command => 'say',
1805 audio_enable => 1, 1898 audio_enable => 1,
1806 bgm_enable => 1, 1899 bgm_enable => 1,
1807 bgm_volume => 0.25, 1900 bgm_volume => 0.25,
1808 face_prefetch => 0, 1901 face_prefetch => 0,
1809 output_sync => 1, 1902 output_sync => 1,
1810 output_count => 1, 1903 output_count => 1,
1811 pickup => 0, 1904 pickup => 0,
1905 default => "profile", # default profile
1906 );
1812 ); 1907
1813
1814 while (my ($k, $v) = each %DEF_CFG) { 1908 while (my ($k, $v) = each %DEF_CFG) {
1815 $CFG->{$k} = $v unless exists $CFG->{$k}; 1909 $CFG->{$k} = $v unless exists $CFG->{$k};
1816 } 1910 }
1911
1912 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1817 1913
1818 sdl_init; 1914 sdl_init;
1819 1915
1820 @SDL_MODES = reverse 1916 @SDL_MODES = reverse
1821 grep $_->[0] >= 640 && $_->[1] >= 480, 1917 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1863 video_init; 1959 video_init;
1864 audio_init; 1960 audio_init;
1865} 1961}
1866 1962
1867Event::loop; 1963Event::loop;
1964#CFClient::SDL_Quit;
1965#CFClient::_exit 0;
1868 1966
1869END { CFClient::SDL_Quit } 1967END { CFClient::SDL_Quit }
1870 1968
1871=head1 NAME 1969=head1 NAME
1872 1970

Diff Legend

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