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.73 by root, Sat Jun 17 15:07:54 2006 UTC vs.
Revision 1.95 by root, Sun Jul 16 23:30:08 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 $vb = new CFClient::UI::VBox;
662 y => $HEIGHT * (2/8),
663 x => "max",
664 title => "Stats",
665 name => "stats_window";
666 650
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, 651 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 652 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."); 653 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, 654 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 655 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."], 679 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
697 680
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."], 681 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
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."], 682 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
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."], 683 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
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."], 684 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
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."], 685 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
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."], 686 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
704 ) { 687 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 688 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
706 689
… …
708 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 691 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 692 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 693 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
711 } 694 }
712 695
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
714 697
715 my $row = 0; 698 my $row = 0;
716 my $col = 0; 699 my $col = 0;
717 700
718 my %resist_names = ( 701 my %resist_names = (
702 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.)", 703 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
704 holyw => ["Holy Word",
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.)", 705 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
706 conf => ["Confusion",
721 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 707 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
708 fire => ["Fire",
722 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 709 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
710 depl => ["Depletion",
723 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 711 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
712 magic => ["Magic",
724 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 713 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
714 drain => ["Draining",
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 715 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
716 acid => ["Acid",
726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 717 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
718 pois => ["Poison",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 719 "<b>Poison</b> (resistance to getting poisoned)"],
720 para => ["Paralysation",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 721 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
722 deat => ["Death",
729 deat => "<b>Death</b> (resistance against death spells)", 723 "<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)", 724 phys => ["Physical",
725 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
726 blind => ["Blind",
731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
728 fear => ["Fear",
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)", 729 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
730 tund => ["Turn undead",
733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 731 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
732 elec => ["Electricity",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 733 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
734 cold => ["Cold",
735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
736 ghit => ["Ghost hit",
736 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 737 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737 ); 738 );
738 for (qw/slow holyw conf fire depl magic 739 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 740 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 741 blind fear tund elec cold ghit/)
741 { 742 {
… …
746 template => "-100%", 747 template => "-100%",
747 align => +1, 748 align => +1,
748 valign => 0, 749 valign => 0,
749 can_events => 1, 750 can_events => 1,
750 can_hover => 1, 751 can_hover => 1,
751 tooltip => $resist_names{$_}, 752 tooltip => $resist_names{$_}->[1],
752 ); 753 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 755 font => $FONT_FIXED,
755 can_hover => 1, 756 can_hover => 1,
756 can_events => 1, 757 can_events => 1,
757 image => "ui/resist/resist_$_.png", 758 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 759 tooltip => $resist_names{$_}->[1],
760 );
761 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
762 text => $resist_names{$_}->[0],
763 font => $FONT_FIXED,
764 can_hover => 1,
765 can_events => 1,
766 tooltip => $resist_names{$_}->[1],
759 ); 767 );
760 768
761 $row++; 769 $row++;
762 if ($row % 6 == 0) { 770 if ($row % 6 == 0) {
763 $col += 2; 771 $col += 3;
764 $row = 0; 772 $row = 0;
765 } 773 }
766 } 774 }
767 775
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 776 #update_stats_window ({});
770 777
771 $tgw 778 $vb
779}
780
781sub skill_window {
782 $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]
772} 783}
773 784
774sub formsep($) { 785sub formsep($) {
775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776} 787}
777 788
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; 789my $METASERVER_ATIME;
847 790
848sub update_metaserver { 791sub update_metaserver {
792 my ($metaserver_dialog) = @_;
793
794 $METASERVER = $metaserver_dialog
795 if defined $metaserver_dialog;
796
849 return if $METASERVER_ATIME > time; 797 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 798 $METASERVER_ATIME = time + 60;
851 799
852 my $table = $METASERVER->{table}; 800 my $table = $METASERVER->{table};
853 $table->clear; 801 $table->clear;
… …
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 866 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 867 (new CFClient::UI::Button
920 text => "Use", 868 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 869 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 870 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 871 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 872 $METASERVER->hide;
873 0
925 }, 874 },
926 ), 875 ),
927 (new CFClient::UI::Empty expand => 1), 876 (new CFClient::UI::Empty expand => 1),
928 ]); 877 ]);
929 878
… …
940 } 889 }
941 }); 890 });
942} 891}
943 892
944sub metaserver_dialog { 893sub metaserver_dialog {
894 my $vbox = new CFClient::UI::VBox;
895 my $table = new CFClient::UI::Table;
896 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
897
945 my $dialog = new CFClient::UI::FancyFrame 898 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 899 title => "Server List",
947 name => 'metaserver_dialog', 900 name => 'metaserver_dialog',
948 x => 'center', 901 x => 'center',
949 y => 'center', 902 y => 'center',
950 z => 3, 903 z => 3,
951 force_h => $::HEIGHT * 0.4, 904 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 905 child => $vbox,
906 has_close_button => 1,
907 table => $table,
953 on_visibility_change => sub { 908 on_visibility_change => sub {
954 update_metaserver if $_[1]; 909 update_metaserver ($_[0]) if $_[1];
910 0
955 }, 911 },
956 ; 912 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 913
962 $dialog 914 $dialog
963} 915}
964 916
965sub server_setup { 917sub server_setup {
… …
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 924 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 925
974 $vbox->add ( 926 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 927 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 928 expand => 1,
977 text => $CFG->{host}, 929 text => $CFG->{profile}{default}{host},
978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 930 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979 on_changed => sub { 931 on_changed => sub {
980 my ($self, $value) = @_; 932 my ($self, $value) = @_;
981 $CFG->{host} = $value; 933 $CFG->{profile}{default}{host} = $value;
934 0
982 } 935 }
983 ); 936 );
984
985 $METASERVER = metaserver_dialog;
986 937
987 $vbox->add (new CFClient::UI::Button 938 $vbox->add (new CFClient::UI::Button
988 expand => 1, 939 expand => 1,
989 text => "Server List", 940 text => "Server List",
990 other => $METASERVER, 941 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 942 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 943 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 944 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 945 );
995 } 946 }
996 947
997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 948 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
998 $table->add (1, 4, new CFClient::UI::Entry 949 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 950 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 951 tooltip => "The name of your character on the server",
1001 on_changed => sub { 952 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 953 );
1006 954
1007 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 955 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1008 $table->add (1, 5, new CFClient::UI::Entry 956 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 957 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 958 hidden => 1,
1011 tooltip => "The password for your character", 959 tooltip => "The password for your character",
1012 on_changed => sub { 960 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 961 );
1017 962
1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 963 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1019 $table->add (1, 7, new CFClient::UI::Slider 964 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 965 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 966 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 tooltip => "This is the size of the portion of the map update the server sends you. " 967 tooltip => "This is the size of the portion of the map update the server sends you. "
1023 . "If you set this to a high value you will be able to see further, " 968 . "If you set this to a high value you will be able to see further, "
1024 . "but you also increase bandwidth requirements and latency. " 969 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 970 . "This option is only used once at log-in.",
1026 on_changed => sub { 971 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 ); 972 );
1032 973
1033 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 974 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 975 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 976 state => $CFG->{face_prefetch},
… …
1038 . "This might increase or create lag, but increases the chances " 979 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 980 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 981 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 982 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 983 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 984 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 985 );
1045 986
1046 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 987 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1047 $table->add (1, 9, new CFClient::UI::Entry 988 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 989 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.", 990 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] }, 991 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 992 );
1052 993
1053 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 994 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054 $table->add (1, 10, new CFClient::UI::Entry 995 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 996 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.", 997 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] }, 998 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 999 );
1059 1000
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1001 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1002 expand => 1,
1062 align => 0, 1003 align => 0,
1063 text => "Login", 1004 text => "Login",
1064 on_activate => sub { 1005 on_activate => sub {
1065 $CONN ? stop_game 1006 $CONN ? stop_game
1066 : start_game; 1007 : start_game;
1008 0
1067 }, 1009 },
1068 ); 1010 );
1069 1011
1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1012 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1013 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1016 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1017 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub { 1018 on_changed => sub {
1077 my ($self, $value) = @_; 1019 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1020 $CFG->{say_command} = $value;
1021 0
1079 } 1022 }
1080 ); 1023 );
1081 1024
1082 $vbox->add (new CFClient::UI::Label 1025 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1026 text => "Server Info",
… …
1094sub message_window { 1037sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1038 my $window = new CFClient::UI::FancyFrame
1096 name => "message_window", 1039 name => "message_window",
1097 title => "Messages", 1040 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1041 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1042 x => "max",
1101 y => 0, 1043 y => 0,
1102 force_w => $::WIDTH * 0.4, 1044 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1045 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1046 child => (my $vbox = new CFClient::UI::VBox),
1047 has_close_button => 1;
1105 1048
1106 $vbox->add ($LOGVIEW); 1049 $vbox->add ($LOGVIEW);
1107 1050
1108 $vbox->add (my $input = new CFClient::UI::Entry 1051 $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> " 1052 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1117 1060
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1061 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1062 $input->{refocus_map} = 1;
1120 } 1063 }
1121 delete $input->{auto_activated}; 1064 delete $input->{auto_activated};
1065
1066 0
1122 }, 1067 },
1123 on_activate => sub { 1068 on_activate => sub {
1124 my ($input, $text) = @_; 1069 my ($input, $text) = @_;
1125 $input->set_text (''); 1070 $input->set_text ('');
1126 1071
… …
1132 } 1077 }
1133 if ($input->{refocus_map}) { 1078 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1080 $MAPWIDGET->focus_in
1136 } 1081 }
1082
1083 0
1137 }, 1084 },
1138 on_escape => sub { 1085 on_escape => sub {
1139 $MAPWIDGET->focus_in 1086 $MAPWIDGET->grab_focus;
1087
1088 0
1140 }, 1089 },
1141 ); 1090 );
1142 1091
1143 $CONSOLE = { 1092 $CONSOLE = {
1144 window => $window, 1093 window => $window,
… …
1166 ); 1115 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1116 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1117 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1118 text => "Ok",
1170 expand => 1, 1119 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1120 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1121 );
1173 $hb->add (new CFClient::UI::Button 1122 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1123 text => "Quit anyway",
1175 expand => 1, 1124 expand => 1,
1176 on_activate => sub { exit }, 1125 on_activate => sub { exit },
… …
1183sub autopickup_setup { 1132sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1133 my $table = new CFClient::UI::Table;
1185 1134
1186 for ( 1135 for (
1187 ["General", 0, 0, 1136 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1137 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1138 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1139 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1140 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1141 ],
1193 ["Weapons", 0, 6, 1142 ["Weapons", 0, 6,
… …
1230 for (@bits) { 1179 for (@bits) {
1231 ++$y; 1180 ++$y;
1232 1181
1233 my $mask = $_->[1]; 1182 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1183 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1184 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1185 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1186 on_changed => sub {
1238 my ($box, $value) = @_; 1187 my ($box, $value) = @_;
1239 1188
1240 if ($value) { 1189 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1190 $::CFG->{pickup} |= $mask;
… …
1243 $::CFG->{pickup} &= ~$mask; 1192 $::CFG->{pickup} &= ~$mask;
1244 } 1193 }
1245 1194
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1195 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1196 if defined $::CONN;
1197
1198 0
1248 }); 1199 });
1200
1201 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1202 }
1250 } 1203 }
1251 1204
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1205 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1206 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1208 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1209 on_changed => sub {
1256 my ($slider, $value) = @_; 1210 my ($slider, $value) = @_;
1257 1211
1258 $::CFG->{pickup} &= ~0x7; 1212 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1213 $::CFG->{pickup} |= int $value
1260 if $value; 1214 if $value;
1261 1; 1215 1;
1262 }); 1216 });
1217
1263 $table->add (3, 18, new CFClient::UI::Button 1218 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1219 text => "set",
1265 on_activate => sub { 1220 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1221 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1222 if defined $::CONN;
1268 1; 1223 0
1269 }); 1224 });
1270 1225
1271 $table 1226 $table
1272} 1227}
1273 1228
1274sub inventory_window { 1229sub inventory_widget {
1230 my $hb = new CFClient::UI::HBox homogeneous => 1;
1231
1232 $hb->add (my $vb1 = new CFClient::UI::VBox);
1233 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1234 $vb1->add ($INV = new CFClient::UI::Inventory);
1235
1236 $hb->add (my $vb2 = new CFClient::UI::VBox);
1237
1238 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1239
1240 $vb2->add ($INVR = new CFClient::UI::Inventory);
1241
1242 # XXX: Call after $INVR = ... because set_opencont sets the items
1243 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1244
1245 $hb
1246}
1247
1248sub toggle_player_page {
1249 my ($widget) = @_;
1250
1251 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1252 $PL_WINDOW->hide;
1253 } else {
1254 $PL_NOTEBOOK->set_current_page ($widget);
1255 $PL_WINDOW->show;
1256 }
1257}
1258
1259sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1261 x => "center",
1277 y => "center", 1262 y => "center",
1278 force_w => $WIDTH * 9/10, 1263 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1264 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1265 title => "Player",
1266 name => "playerbook",
1267 has_close_button => 1
1281 ; 1268 ;
1282 1269
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1270 my $ntb =
1271 $PL_NOTEBOOK =
1272 new CFClient::UI::Notebook
1273 expand => 1,
1274 debug => 1,
1275 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1276 ;
1284 1277
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1278 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1279 "Statistics (F2)" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1280 "Shows statistics, where all your Stats and Resistances are shown."
1281 );
1282 $ntb->add (
1283 "Skills (F3)" => $SKILL_PAGE = skill_window,
1284 "Shows all your Skills."
1285 );
1286 $ntb->add (
1287 "Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList,
1288 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1289 );
1290 $ntb->add (
1291 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1293 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1294 );
1288 1295
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1296 $ntb->set_current_page ($INVENTORY_PAGE);
1290 1297
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1298 $plwin->add ($ntb);
1292 1299 $plwin
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1294
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299} 1300}
1300 1301
1301sub spell_setup { 1302sub update_bindings {
1302 new CFClient::UI::SpellList 1303 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1304}
1304 1305
1305sub keyboard_setup { 1306sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
1307 1308
1308 my $refresh; 1309 my $refresh;
1309 $refresh = sub { 1310 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1311 $binding_list->clear ();
1311 1312
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1317
1317 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1322 text => "delete",
1322 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
1323 on_activate => sub { 1324 on_activate => sub {
1324 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0
1326 }); 1328 });
1327 1329
1328 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1331 text => "edit",
1330 tooltip => "Edits the binding", 1332 tooltip => "Edits the binding",
1331 on_activate => sub { 1333 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1334 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1336 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1337 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1338 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1339 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1340 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1342 $SETUP_DIALOG->show;
1341 }, 1343 },
1342 sub { 1344 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1345 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1346 $SETUP_DIALOG->show;
1345 }); 1347 });
1346 $::BIND_EDITOR->show; 1348 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1349 $SETUP_DIALOG->hide;
1350 0
1348 }); 1351 });
1349 1352
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1355 }
… …
1361 state => $CFG->{shift_fire_stop}, 1364 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1365 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1366 on_changed => sub {
1364 my ($cbox, $value) = @_; 1367 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1368 $CFG->{shift_fire_stop} = $value;
1369 0
1366 }); 1370 });
1367 1371
1368 $vb->add ($binding_list); 1372 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1373 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1374
… …
1374 tooltip => "This button opens the binding editor with an empty binding.", 1378 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1379 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1380 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1381 sub {
1378 my ($mod, $sym, $cmds) = @_; 1382 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1383 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1384 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1386 $SETUP_DIALOG->show;
1383 }, 1387 },
1384 sub { 1388 sub {
… …
1386 $SETUP_DIALOG->show; 1390 $SETUP_DIALOG->show;
1387 }, 1391 },
1388 ); 1392 );
1389 $SETUP_DIALOG->hide; 1393 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1394 $::BIND_EDITOR->show;
1395 0
1391 }, 1396 },
1392 ); 1397 );
1393 1398
1394 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1395 text => "close", 1400 text => "close",
1396 tooltip => "Closes the binding window", 1401 tooltip => "Closes the binding window",
1397 expand => 1, 1402 expand => 1,
1398 on_activate => sub { 1403 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1404 $SETUP_DIALOG->hide;
1405 0
1400 } 1406 }
1401 ); 1407 );
1402 1408
1403 $refresh->(); 1409 $refresh->();
1404 1410
… …
1411 y => 'center', 1417 y => 'center',
1412 z => 2, 1418 z => 2,
1413 name => 'doc_browser', 1419 name => 'doc_browser',
1414 force_w => int $WIDTH * 7/8, 1420 force_w => int $WIDTH * 7/8,
1415 force_h => int $HEIGHT * 7/8, 1421 force_h => int $HEIGHT * 7/8,
1416 title => "Documentation"; 1422 title => "Help Browser",
1423 has_close_button => 1;
1417 1424
1418 $win->add (my $vbox = new CFClient::UI::VBox); 1425 $win->add (my $vbox = new CFClient::UI::VBox);
1419 1426
1420 $vbox->add (my $buttons = new CFClient::UI::HBox); 1427 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1428 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1431 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1432 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1433 value => undef,
1427 options => [ 1434 options => [
1428 [intro => "Introduction"], 1435 [intro => "Introduction"],
1429 [manual => "Manual"], 1436 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1437 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1438 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1439 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1440 [COPYING => "License Terms"],
1434 ], 1441 ],
1435 on_changed => sub { 1442 on_changed => sub {
1436 my ($self, $pod) = @_; 1443 my ($self, $pod) = @_;
1437 1444
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1445 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1446 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1447
1441 $viewer->clear; 1448 $viewer->clear;
1449
1450# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1451# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1452# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1453# ]);#d#
1442 1454
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1455 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1456 for @$pom;
1445 1457
1446 $viewer->set_offset (0); 1458 $viewer->set_offset (0);
1459
1460 0
1447 }, 1461 },
1448 on_visibility_change => sub { 1462 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1463 my ($self, $visible) = @_;
1450 return unless $visible; 1464 return unless $visible;
1451 return if $self->{value}; 1465 return if $self->{value};
1452 $self->set_value ("intro"); 1466 $self->set_value ("intro");
1467 0
1453 }, 1468 },
1454 ); 1469 );
1455 1470
1456 $win 1471 $win
1457} 1472}
… …
1496 z => 100, 1511 z => 100,
1497 force_x => "max", 1512 force_x => "max",
1498 force_y => 0; 1513 force_y => 0;
1499 $DEBUG_STATUS->show; 1514 $DEBUG_STATUS->show;
1500 1515
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1516 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1517
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1518 $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]); 1519 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505 1520
1506 (new CFClient::UI::Frame 1521 (new CFClient::UI::Frame
… …
1515 name => "mapmap", 1530 name => "mapmap",
1516 x => 0, 1531 x => 0,
1517 y => $FONTSIZE + 8, 1532 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1533 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1534 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1535 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.", 1536 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1537 ),
1524 )->show; 1538 )->show;
1525 1539
… …
1527 $MAPWIDGET->connect (activate_console => sub { 1541 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1542 my ($mapwidget, $preset) = @_;
1529 1543
1530 if ($CONSOLE) { 1544 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1545 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1546 $CONSOLE->{input}->grab_focus;
1533 1547
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1548 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1549 $CONSOLE->{input}->set_text ($preset);
1536 } 1550 }
1537 } 1551 }
1538 }); 1552 });
1539 $MAPWIDGET->show; 1553 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1554 $MAPWIDGET->grab_focus;
1541 1555
1542 $LOGVIEW = new CFClient::UI::TextScroller 1556 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1557 expand => 1,
1544 font => $FONT_FIXED, 1558 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1559 fontsize => $::CFG->{log_fontsize},
… …
1555 x => 'center', 1569 x => 'center',
1556 y => 'center', 1570 y => 'center',
1557 z => 2, 1571 z => 2,
1558 force_w => $::WIDTH * 0.6, 1572 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1573 force_h => $::HEIGHT * 0.6,
1574 has_close_button => 1,
1560 ; 1575 ;
1576
1577 $METASERVER = metaserver_dialog;
1561 1578
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1579 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1580 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1581
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1582 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1586 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1587 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1588 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1589 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1590 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1591 "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 " 1592 . "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 " 1593 . "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. " 1594 . "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 " 1595 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes"); 1596 . "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, 1597 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1598 "Some debuggin' options. Do not ask.");
1584 1599
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1600 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586 1601
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1602 $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."); 1603 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, 1605 $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."); 1606 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592 1607
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 1608 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 1609
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, 1610 $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 :). " 1611 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 1612
1601 $BUTTONBAR->add (new CFClient::UI::Button 1613 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1614 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.", 1615 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 { 1616 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1617 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1618 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1619 status "Configuration Saved";
1620 0
1608 }, 1621 },
1609 ); 1622 );
1610 1623
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1624 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612 tooltip => "View Documentation"); 1625 tooltip => "View Documentation");
1613 1626
1614 $BUTTONBAR->add (new CFClient::UI::Button 1627 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Quit", 1628 text => "Quit",
1616 tooltip => "Terminates the program", 1629 tooltip => "Terminates the program",
… …
1618 if ($CONN) { 1631 if ($CONN) {
1619 open_quit_dialog; 1632 open_quit_dialog;
1620 } else { 1633 } else {
1621 exit; 1634 exit;
1622 } 1635 }
1636 0
1623 }, 1637 },
1624 ); 1638 );
1625 1639
1626 $BUTTONBAR->show; 1640 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1641 $SETUP_DIALOG->show;
… …
1821# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1835# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1822 }, 1836 },
1823 CFClient::SDL_KEYDOWN => sub { 1837 CFClient::SDL_KEYDOWN => sub {
1824 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1838 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1825 # alt-enter 1839 # alt-enter
1840 $FULLSCREEN_ENABLE->toggle;
1826 video_shutdown; 1841 video_shutdown;
1827 $CFG->{fullscreen} = !$CFG->{fullscreen};
1828 video_init; 1842 video_init;
1829 } else { 1843 } else {
1830 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1844 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1831 } 1845 }
1832 }, 1846 },
… …
1848$SIG{INT} = $SIG{TERM} = sub { exit }; 1862$SIG{INT} = $SIG{TERM} = sub { exit };
1849 1863
1850{ 1864{
1851 local $SIG{__DIE__} = sub { 1865 local $SIG{__DIE__} = sub {
1852 return unless defined $^S && !$^S; 1866 return unless defined $^S && !$^S;
1853 Carp::confess $_[1];#d#TODO: remove when stable 1867 Carp::confess $_[0];#d#TODO: remove when stable
1854 CFClient::fatal $_[0]; 1868 CFClient::fatal $_[0];
1855 }; 1869 };
1856 1870
1857 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1871 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1858 CFClient::UI::set_layout ($::CFG->{layout}); 1872 CFClient::UI::set_layout ($::CFG->{layout});
1859 1873
1860 my %DEF_CFG = ( 1874 my %DEF_CFG = (
1861 sdl_mode => 0, 1875 sdl_mode => 0,
1862 width => 640, 1876 width => 640,
1863 height => 480, 1877 height => 480,
1864 fullscreen => 0, 1878 fullscreen => 0,
1865 fast => 0, 1879 fast => 0,
1866 map_scale => 1, 1880 map_scale => 1,
1867 fow_enable => 1, 1881 fow_enable => 1,
1868 fow_intensity => 0.45, 1882 fow_intensity => 0.45,
1869 fow_smooth => 0, 1883 fow_smooth => 0,
1870 gui_fontsize => 1, 1884 gui_fontsize => 1,
1871 log_fontsize => 0.7, 1885 log_fontsize => 0.7,
1872 gauge_fontsize=> 1, 1886 gauge_fontsize => 1,
1873 gauge_size => 0.35, 1887 gauge_size => 0.35,
1874 stat_fontsize => 0.7, 1888 stat_fontsize => 0.7,
1875 mapsize => 100, 1889 mapsize => 100,
1876 host => "crossfire.schmorp.de",
1877 say_command => 'say', 1890 say_command => 'say',
1878 audio_enable => 1, 1891 audio_enable => 1,
1879 bgm_enable => 1, 1892 bgm_enable => 1,
1880 bgm_volume => 0.25, 1893 bgm_volume => 0.25,
1881 face_prefetch => 0, 1894 face_prefetch => 0,
1882 output_sync => 1, 1895 output_sync => 1,
1883 output_count => 1, 1896 output_count => 1,
1884 pickup => 0, 1897 pickup => 0,
1898 default => "profile", # default profile
1899 );
1885 ); 1900
1886
1887 while (my ($k, $v) = each %DEF_CFG) { 1901 while (my ($k, $v) = each %DEF_CFG) {
1888 $CFG->{$k} = $v unless exists $CFG->{$k}; 1902 $CFG->{$k} = $v unless exists $CFG->{$k};
1889 } 1903 }
1904
1905 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1890 1906
1891 sdl_init; 1907 sdl_init;
1892 1908
1893 @SDL_MODES = reverse 1909 @SDL_MODES = reverse
1894 grep $_->[0] >= 640 && $_->[1] >= 480, 1910 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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