ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.72 by elmex, Tue Jun 13 18:14:03 2006 UTC vs.
Revision 1.94 by root, Sun Jul 16 20:04: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 $SPELL_PAGE;
106
107our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 108our $MESSAGE_WINDOW;
99our $FLOORBOX; 109our $FLOORBOX;
100our $GAUGES; 110our $GAUGES;
101our $STATWIDS; 111our $STATWIDS;
102 112
… …
109 119
110our $ALT_ENTER_MESSAGE; 120our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 121our $STATUSBOX;
112our $DEBUG_STATUS; 122our $DEBUG_STATUS;
113 123
114our $INV_WINDOW;
115our $INV; 124our $INV;
116our $INVR; 125our $INVR;
117our $INV_RIGHT_HB; 126our $INV_RIGHT_HB;
118 127
119our $BIND_EDITOR; 128our $BIND_EDITOR;
129our $BIND_UPD_CB;
120 130
121our $PICKUP_CFG; 131our $PICKUP_CFG;
122 132
123sub status { 133sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 134 $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 165 $hbox->add (new CFClient::UI::Button
156 text => "No", 166 text => "No",
157 on_activate => sub { 167 on_activate => sub {
158 $conn->send ("reply n"); 168 $conn->send ("reply n");
159 $dialog->destroy; 169 $dialog->destroy;
170 0
160 } 171 }
161 ); 172 );
162 $hbox->add (new CFClient::UI::Button 173 $hbox->add (new CFClient::UI::Button
163 text => "Yes", 174 text => "Yes",
164 on_activate => sub { 175 on_activate => sub {
165 $conn->send ("reply y"); 176 $conn->send ("reply y");
166 destroy_query_dialog $conn; 177 destroy_query_dialog $conn;
178 0
167 }, 179 },
168 ); 180 );
169 181
170 $dialog->focus_in; 182 $dialog->grab_focus;
171 183
172 } elsif ($flags & CS_QUERY_SINGLECHAR) { 184 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 185 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174 186
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 187 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
185 $table->add (0, 0, new CFClient::UI::Button 197 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race", 198 text => "Next Race",
187 on_activate => sub { 199 on_activate => sub {
188 $conn->send ("reply n"); 200 $conn->send ("reply n");
189 destroy_query_dialog $conn; 201 destroy_query_dialog $conn;
202 0
190 }, 203 },
191 ); 204 );
192 $table->add (2, 0, new CFClient::UI::Button 205 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept", 206 text => "Accept",
194 on_activate => sub { 207 on_activate => sub {
195 $conn->send ("reply d"); 208 $conn->send ("reply d");
196 destroy_query_dialog $conn; 209 destroy_query_dialog $conn;
210 0
197 }, 211 },
198 ); 212 );
199 213
200 unshift @dialog, new CFClient::UI::Label 214 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4, 215 max_w => $::WIDTH * 0.4,
… …
215 $conn->send ("reply $stat"); 229 $conn->send ("reply $stat");
216 destroy_query_dialog $conn; 230 destroy_query_dialog $conn;
217 return; 231 return;
218 } 232 }
219 233
220 $STATS_WINDOW->show; 234 $STATS_PAGE->show;
221 $MESSAGE_WINDOW->hide; 235 $MESSAGE_WINDOW->hide;
222 236
223 unshift @dialog, new CFClient::UI::Label 237 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4, 238 max_w => $::WIDTH * 0.4,
225 ellipsise => 0, 239 ellipsise => 0,
… …
231 $table->add (0, 0, new CFClient::UI::Button 245 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again", 246 text => "Roll Again",
233 on_activate => sub { 247 on_activate => sub {
234 $conn->send ("reply y"); 248 $conn->send ("reply y");
235 destroy_query_dialog $conn; 249 destroy_query_dialog $conn;
250 0
236 }, 251 },
237 ); 252 );
238 253
239 # center: swap stats 254 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 255 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
254 text => "Swap Stats", 269 text => "Swap Stats",
255 on_activate => sub { 270 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value}; 271 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}"); 272 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn; 273 destroy_query_dialog $conn;
274 0
259 }, 275 },
260 ); 276 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 277 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262 278
263 # right: accept 279 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button 280 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept", 281 text => "Accept",
266 on_activate => sub { 282 on_activate => sub {
267 $conn->send ("reply n"); 283 $conn->send ("reply n");
268 $STATS_WINDOW->hide; 284 $STATS_PAGE->hide;
269 destroy_query_dialog $conn; 285 destroy_query_dialog $conn;
286 0
270 }, 287 },
271 ); 288 );
272 289
273 unshift @dialog, new CFClient::UI::Label 290 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4, 291 max_w => $::WIDTH * 0.4,
… …
284 301
285 push @dialog, my $entry = new CFClient::UI::Entry 302 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub { 303 on_changed => sub {
287 $conn->send ("reply $_[1]"); 304 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn; 305 destroy_query_dialog $conn;
306 0
289 }, 307 },
290 ; 308 ;
291 309
292 $entry->focus_in; 310 $entry->grab_focus;
293 311
294 } else { 312 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 313 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296 314
297 push @dialog, my $entry = new CFClient::UI::Entry 315 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 316 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub { 317 on_activate => sub {
300 $conn->send ("reply $_[1]"); 318 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn; 319 destroy_query_dialog $conn;
320 0
302 }, 321 },
303 ; 322 ;
304 323
305 $entry->focus_in; 324 $entry->grab_focus;
306 } 325 }
307 326
308 $vbox->add (@dialog); 327 $vbox->add (@dialog);
309 $dialog->show; 328 $dialog->show;
310} 329}
… …
315 $LOGIN_BUTTON->set_text ("Logout"); 334 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide; 335 $SETUP_DIALOG->hide;
317 336
318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 337 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
319 338
320 my ($host, $port) = split /:/, $CFG->{host}; 339 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321 340
322 $MAP = new CFClient::Map $mapsize, $mapsize; 341 $MAP = new CFClient::Map $mapsize, $mapsize;
323 342
324 $CONN = eval { 343 $CONN = eval {
325 new CFClient::Protocol 344 new CFClient::Protocol
326 host => $host, 345 host => $host,
327 port => $port || 13327, 346 port => $port || 13327,
328 user => $CFG->{user}, 347 user => $CFG->{profile}{default}{user},
329 pass => $CFG->{password}, 348 pass => $CFG->{profile}{default}{password},
330 mapw => $mapsize, 349 mapw => $mapsize,
331 maph => $mapsize, 350 maph => $mapsize,
332 351
333 map_widget => $MAPWIDGET, 352 map_widget => $MAPWIDGET,
334 logview => $LOGVIEW, 353 logview => $LOGVIEW,
… …
362 381
363sub stop_game { 382sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login"); 383 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 384 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show; 385 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide; 386 $PL_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells; 387 $SPELL_PAGE->clear_spells;
369 388
370 return unless $CONN; 389 return unless $CONN;
371 390
372 status "connection closed"; 391 status "connection closed";
373 392
374 destroy_query_dialog $CONN; 393 destroy_query_dialog $CONN;
375 $CONN->destroy; 394 $CONN->destroy;
376 $CONN = 0; # false, does not autovivify 395 $CONN = 0; # false, does not autovivify
396
397 undef $MAP;
377} 398}
378 399
379sub graphics_setup { 400sub graphics_setup {
380 my $vbox = new CFClient::UI::VBox; 401 my $vbox = new CFClient::UI::VBox;
381 402
… …
396 $mode_slider->emit (changed => $mode_slider->{range}[0]); 417 $mode_slider->emit (changed => $mode_slider->{range}[0]);
397 418
398 my $row = 1; 419 my $row = 1;
399 420
400 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 421 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
401 $table->add (1, $row++, new CFClient::UI::CheckBox 422 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
402 state => $CFG->{fullscreen}, 423 state => $CFG->{fullscreen},
403 tooltip => "Bring the client into fullscreen mode.", 424 tooltip => "Bring the client into fullscreen mode.",
404 on_changed => sub { 425 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405 my ($self, $value) = @_;
406 $CFG->{fullscreen} = $value;
407 }
408 ); 426 );
409 427
410 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
411 $table->add (1, $row++, new CFClient::UI::CheckBox 429 $table->add (1, $row++, new CFClient::UI::CheckBox
412 state => $CFG->{fast}, 430 state => $CFG->{fast},
413 tooltip => "Lower the visual quality considerably to speed up rendering.", 431 tooltip => "Lower the visual quality considerably to speed up rendering.",
414 on_changed => sub { 432 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415 my ($self, $value) = @_;
416 $CFG->{fast} = $value;
417 }
418 ); 433 );
419 434
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 435 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
421 $table->add (1, $row++, new CFClient::UI::Slider 436 $table->add (1, $row++, new CFClient::UI::Slider
422 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 437 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 438 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424 on_changed => sub { 439 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425 my ($self, $value) = @_;
426 $CFG->{map_scale} = 2 ** $value;
427 }
428 ); 440 );
429 441
430 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 442 $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 443 $table->add (1, $row++, new CFClient::UI::CheckBox
432 state => $CFG->{fow_enable}, 444 state => $CFG->{fow_enable},
433 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 445 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
434 on_changed => sub { 446 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 my ($self, $value) = @_;
436 $CFG->{fow_enable} = $value;
437 }
438 ); 447 );
439 448
440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 449 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
441 $table->add (1, $row++, new CFClient::UI::Slider 450 $table->add (1, $row++, new CFClient::UI::Slider
442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 451 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.", 452 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 { 453 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445 my ($self, $value) = @_;
446 $CFG->{fow_intensity} = $value;
447 }
448 ); 454 );
449 455
450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 456 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
451 $table->add (1, $row++, new CFClient::UI::CheckBox 457 $table->add (1, $row++, new CFClient::UI::CheckBox
452 state => $CFG->{fow_smooth}, 458 state => $CFG->{fow_smooth},
453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 459 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
454 on_changed => sub { 460 on_changed => sub {
455 my ($self, $value) = @_; 461 my ($self, $value) = @_;
456 $CFG->{fow_smooth} = $value; 462 $CFG->{fow_smooth} = $value;
457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 463 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
464 0
458 } 465 }
459 ); 466 );
460 467
461 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 468 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
462 $table->add (1, $row++, new CFClient::UI::Slider 469 $table->add (1, $row++, new CFClient::UI::Slider
463 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 470 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.", 471 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] }, 472 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466 ); 473 );
467 474
468 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
469 $table->add (1, $row++, new CFClient::UI::Slider 476 $table->add (1, $row++, new CFClient::UI::Slider
470 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 477 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.", 478 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]) }, 479 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 ); 480 );
485 481
486 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 484 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.", 485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 486 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 487 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 488 &set_gauge_window_fontsize;
489 0
493 } 490 }
494 ); 491 );
495 492
496 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 493 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
497 $table->add (1, $row++, new CFClient::UI::Slider 494 $table->add (1, $row++, new CFClient::UI::Slider
498 range => [$CFG->{gauge_size}, 0.2, 0.8], 495 range => [$CFG->{gauge_size}, 0.2, 0.8],
499 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 496 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
500 on_changed => sub { 497 on_changed => sub {
501 $CFG->{gauge_size} = $_[1]; 498 $CFG->{gauge_size} = $_[1];
502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0
503 } 501 }
504 ); 502 );
505 503
506 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
507 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
509 on_activate => sub { 507 on_activate => sub {
510 video_shutdown (); 508 video_shutdown ();
511 video_init (); 509 video_init ();
510 0
512 } 511 }
513 ); 512 );
514 513
515 $vbox 514 $vbox
516} 515}
… …
524 523
525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
527 state => $CFG->{audio_enable}, 526 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.", 527 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 { 528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 $CFG->{audio_enable} = $_[1];
531 }
532 ); 529 );
533# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 530# $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 { 531# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
535# $CFG->{effects_volume} = $_[1]; 532# $CFG->{effects_volume} = $_[1];
536# }); 533# });
537 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 534 $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); 535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539 $hbox->add (new CFClient::UI::CheckBox 536 $hbox->add (new CFClient::UI::CheckBox
540 expand => 1, state => $CFG->{bgm_enable}, 537 expand => 1, state => $CFG->{bgm_enable},
541 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 538 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
542 on_changed => sub { 539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543 $CFG->{bgm_enable} = $_[1];
544 }
545 ); 540 );
546 $hbox->add (new CFClient::UI::Slider 541 $hbox->add (new CFClient::UI::Slider
547 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548 tooltip => "The volume of the background music. Changes are instant.", 543 tooltip => "The volume of the background music. Changes are instant.",
549 on_changed => sub { 544 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 ); 545 );
554 546
555 $table->add (1, $row++, new CFClient::UI::Button 547 $table->add (1, $row++, new CFClient::UI::Button
556 expand => 1, align => 0, text => "Apply", 548 expand => 1, align => 0, text => "Apply",
557 tooltip => "Apply the audio settings", 549 tooltip => "Apply the audio settings",
558 on_activate => sub { 550 on_activate => sub {
559 audio_shutdown (); 551 audio_shutdown ();
560 audio_init (); 552 audio_init ();
553 0
561 } 554 }
562 ); 555 );
563 556
564 $vbox 557 $vbox
565}
566
567sub set_stats_window_fontsize {
568 for (values %{$STATWIDS}) {
569 $_->set_fontsize ($::CFG->{stat_fontsize});
570 }
571} 558}
572 559
573sub set_gauge_window_fontsize { 560sub set_gauge_window_fontsize {
574 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 561 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
575 $_->set_fontsize ($::CFG->{gauge_fontsize}); 562 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
631 618
632sub debug_setup { 619sub debug_setup {
633 my $table = new CFClient::UI::Table; 620 my $table = new CFClient::UI::Table;
634 621
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 622 $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 }); 623 $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"); 624 $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 }); 625 $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"); 626 $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 }); 627 $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"); 628 $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 }); 629 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643 630
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 631 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645 632
646 for my $x (0..2) { 633 for my $x (0..2) {
647 for my $y (0 .. 2) { 634 for my $y (0 .. 2) {
… …
656 643
657 $table 644 $table
658} 645}
659 646
660sub stats_window { 647sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 648 my $vb = new CFClient::UI::VBox;
662 y => $HEIGHT * (2/8),
663 x => "max",
664 title => "Stats",
665 name => "stats_window";
666 649
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, 650 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 651 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."); 652 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, 653 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 654 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."], 678 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
697 679
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."], 680 [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."], 681 [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."], 682 [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."], 683 [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."], 684 [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."], 685 [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 ) { 686 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 687 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
706 688
… …
708 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 690 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 691 $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); 692 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
711 } 693 }
712 694
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 695 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
714 696
715 my $row = 0; 697 my $row = 0;
716 my $col = 0; 698 my $col = 0;
717 699
718 my %resist_names = ( 700 my %resist_names = (
701 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.)", 702 "<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 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.)", 704 "<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 conf => ["Confusion",
721 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 706 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
707 fire => ["Fire",
722 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 708 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
709 depl => ["Depletion",
723 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 710 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
711 magic => ["Magic",
724 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 712 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
713 drain => ["Draining",
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 714 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
715 acid => ["Acid",
726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 716 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
717 pois => ["Poison",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 718 "<b>Poison</b> (resistance to getting poisoned)"],
719 para => ["Paralysation",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 720 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
721 deat => ["Death",
729 deat => "<b>Death</b> (resistance against death spells)", 722 "<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)", 723 phys => ["Physical",
724 "<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.)"],
725 blind => ["Blind",
731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 726 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
727 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)", 728 "<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 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...", 730 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
731 elec => ["Electricity",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 732 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
733 cold => ["Cold",
735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 734 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
735 ghit => ["Ghost hit",
736 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 736 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737 ); 737 );
738 for (qw/slow holyw conf fire depl magic 738 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 739 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 740 blind fear tund elec cold ghit/)
741 { 741 {
… …
746 template => "-100%", 746 template => "-100%",
747 align => +1, 747 align => +1,
748 valign => 0, 748 valign => 0,
749 can_events => 1, 749 can_events => 1,
750 can_hover => 1, 750 can_hover => 1,
751 tooltip => $resist_names{$_}, 751 tooltip => $resist_names{$_}->[1],
752 ); 752 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 754 font => $FONT_FIXED,
755 can_hover => 1, 755 can_hover => 1,
756 can_events => 1, 756 can_events => 1,
757 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_}->[1],
759 );
760 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
761 text => $resist_names{$_}->[0],
762 font => $FONT_FIXED,
763 can_hover => 1,
764 can_events => 1,
765 tooltip => $resist_names{$_}->[1],
759 ); 766 );
760 767
761 $row++; 768 $row++;
762 if ($row % 6 == 0) { 769 if ($row % 6 == 0) {
763 $col += 2; 770 $col += 3;
764 $row = 0; 771 $row = 0;
765 } 772 }
766 } 773 }
767 774
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 775 update_stats_window ({});
770 776
771 $tgw 777 $vb
778}
779
780sub skill_window {
781 my ($self) = @_;
782 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 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}
… …
810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 821 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 822 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 823 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 824 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 825 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 826 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 827 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 828 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818 829
819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 830 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820 831
… …
837 deat => CS_STAT_RES_DEATH, 848 deat => CS_STAT_RES_DEATH,
838 holyw => CS_STAT_RES_HOLYWORD, 849 holyw => CS_STAT_RES_HOLYWORD,
839 blind => CS_STAT_RES_BLIND, 850 blind => CS_STAT_RES_BLIND,
840 ); 851 );
841 852
853 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
854 my $sktbl = $STATWIDS->{_skill_tbl};
855 $sktbl->clear;
856
857 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
858 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
859 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
860
861 my @skills;
862
863 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
864 push @skills, [$i, $::CONN->{skill_info}{$i}];
865 }
866
867 my $y = 1;
868 for (sort { $a->[1] cmp $b->[1] } @skills) {
869 my ($idx, $name) = @$_;
870
871 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
872 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
874 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
875 }
876 }
877
878 $STATWIDS->{_skill_tbl_init} = 1;
879 }
880
881 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
882 if (exists $stats->{$i}) {
883 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
884 if $STATWIDS->{"sk_xp_$i"};
885 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
886 if $STATWIDS->{"sk_lvl_$i"};
887 }
888 }
889
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 890 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl; 891 for keys %tbl;
844} 892}
845 893
846my $METASERVER_ATIME; 894my $METASERVER_ATIME;
847 895
848sub update_metaserver { 896sub update_metaserver {
897 my ($metaserver_dialog) = @_;
898
899 $METASERVER = $metaserver_dialog
900 if defined $metaserver_dialog;
901
849 return if $METASERVER_ATIME > time; 902 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 903 $METASERVER_ATIME = time + 60;
851 904
852 my $table = $METASERVER->{table}; 905 my $table = $METASERVER->{table};
853 $table->clear; 906 $table->clear;
… …
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 971 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 972 (new CFClient::UI::Button
920 text => "Use", 973 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 974 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 975 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 976 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 977 $METASERVER->hide;
978 0
925 }, 979 },
926 ), 980 ),
927 (new CFClient::UI::Empty expand => 1), 981 (new CFClient::UI::Empty expand => 1),
928 ]); 982 ]);
929 983
… …
940 } 994 }
941 }); 995 });
942} 996}
943 997
944sub metaserver_dialog { 998sub metaserver_dialog {
999 my $vbox = new CFClient::UI::VBox;
1000 my $table = new CFClient::UI::Table;
1001 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
1002
945 my $dialog = new CFClient::UI::FancyFrame 1003 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 1004 title => "Server List",
947 name => 'metaserver_dialog', 1005 name => 'metaserver_dialog',
948 x => 'center', 1006 x => 'center',
949 y => 'center', 1007 y => 'center',
950 z => 3, 1008 z => 3,
951 force_h => $::HEIGHT * 0.4, 1009 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 1010 child => $vbox,
1011 has_close_button => 1,
1012 table => $table,
953 on_visibility_change => sub { 1013 on_visibility_change => sub {
954 update_metaserver if $_[1]; 1014 update_metaserver ($_[0]) if $_[1];
1015 0
955 }, 1016 },
956 ; 1017 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 1018
962 $dialog 1019 $dialog
963} 1020}
964 1021
965sub server_setup { 1022sub server_setup {
… …
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1029 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 1030
974 $vbox->add ( 1031 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 1032 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 1033 expand => 1,
977 text => $CFG->{host}, 1034 text => $CFG->{profile}{default}{host},
978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1035 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979 on_changed => sub { 1036 on_changed => sub {
980 my ($self, $value) = @_; 1037 my ($self, $value) = @_;
981 $CFG->{host} = $value; 1038 $CFG->{profile}{default}{host} = $value;
1039 0
982 } 1040 }
983 ); 1041 );
984
985 $METASERVER = metaserver_dialog;
986 1042
987 $vbox->add (new CFClient::UI::Button 1043 $vbox->add (new CFClient::UI::Button
988 expand => 1, 1044 expand => 1,
989 text => "Server List", 1045 text => "Server List",
990 other => $METASERVER, 1046 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 1047 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 1048 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1049 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 1050 );
995 } 1051 }
996 1052
997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1053 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
998 $table->add (1, 4, new CFClient::UI::Entry 1054 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 1055 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 1056 tooltip => "The name of your character on the server",
1001 on_changed => sub { 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 1058 );
1006 1059
1007 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1060 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1008 $table->add (1, 5, new CFClient::UI::Entry 1061 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 1062 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 1063 hidden => 1,
1011 tooltip => "The password for your character", 1064 tooltip => "The password for your character",
1012 on_changed => sub { 1065 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 1066 );
1017 1067
1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1068 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1019 $table->add (1, 7, new CFClient::UI::Slider 1069 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 1070 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1071 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 tooltip => "This is the size of the portion of the map update the server sends you. " 1072 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, " 1073 . "If you set this to a high value you will be able to see further, "
1024 . "but you also increase bandwidth requirements and latency. " 1074 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1075 . "This option is only used once at log-in.",
1026 on_changed => sub { 1076 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 ); 1077 );
1032 1078
1033 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1079 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1080 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1081 state => $CFG->{face_prefetch},
… …
1038 . "This might increase or create lag, but increases the chances " 1084 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1085 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1086 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1087 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1088 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1089 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1090 );
1045 1091
1046 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1092 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1047 $table->add (1, 9, new CFClient::UI::Entry 1093 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1094 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.", 1095 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] }, 1096 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1097 );
1052 1098
1053 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1099 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054 $table->add (1, 10, new CFClient::UI::Entry 1100 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1101 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.", 1102 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] }, 1103 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1104 );
1059 1105
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1106 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1107 expand => 1,
1062 align => 0, 1108 align => 0,
1063 text => "Login", 1109 text => "Login",
1064 on_activate => sub { 1110 on_activate => sub {
1065 $CONN ? stop_game 1111 $CONN ? stop_game
1066 : start_game; 1112 : start_game;
1113 0
1067 }, 1114 },
1068 ); 1115 );
1069 1116
1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1117 $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 1118 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1121 . "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.", 1122 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub { 1123 on_changed => sub {
1077 my ($self, $value) = @_; 1124 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1125 $CFG->{say_command} = $value;
1126 0
1079 } 1127 }
1080 ); 1128 );
1081 1129
1082 $vbox->add (new CFClient::UI::Label 1130 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1131 text => "Server Info",
… …
1094sub message_window { 1142sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1143 my $window = new CFClient::UI::FancyFrame
1096 name => "message_window", 1144 name => "message_window",
1097 title => "Messages", 1145 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1146 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1147 x => "max",
1101 y => 0, 1148 y => 0,
1102 force_w => $::WIDTH * 0.4, 1149 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1150 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1151 child => (my $vbox = new CFClient::UI::VBox),
1152 has_close_button => 1;
1105 1153
1106 $vbox->add ($LOGVIEW); 1154 $vbox->add ($LOGVIEW);
1107 1155
1108 $vbox->add (my $input = new CFClient::UI::Entry 1156 $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> " 1157 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1117 1165
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1166 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1167 $input->{refocus_map} = 1;
1120 } 1168 }
1121 delete $input->{auto_activated}; 1169 delete $input->{auto_activated};
1170
1171 0
1122 }, 1172 },
1123 on_activate => sub { 1173 on_activate => sub {
1124 my ($input, $text) = @_; 1174 my ($input, $text) = @_;
1125 $input->set_text (''); 1175 $input->set_text ('');
1126 1176
… …
1132 } 1182 }
1133 if ($input->{refocus_map}) { 1183 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1184 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1185 $MAPWIDGET->focus_in
1136 } 1186 }
1187
1188 0
1137 }, 1189 },
1138 on_escape => sub { 1190 on_escape => sub {
1139 $MAPWIDGET->focus_in 1191 $MAPWIDGET->grab_focus;
1192
1193 0
1140 }, 1194 },
1141 ); 1195 );
1142 1196
1143 $CONSOLE = { 1197 $CONSOLE = {
1144 window => $window, 1198 window => $window,
… …
1166 ); 1220 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1221 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1222 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1223 text => "Ok",
1170 expand => 1, 1224 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1225 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1226 );
1173 $hb->add (new CFClient::UI::Button 1227 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1228 text => "Quit anyway",
1175 expand => 1, 1229 expand => 1,
1176 on_activate => sub { exit }, 1230 on_activate => sub { exit },
… …
1183sub autopickup_setup { 1237sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1238 my $table = new CFClient::UI::Table;
1185 1239
1186 for ( 1240 for (
1187 ["General", 0, 0, 1241 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1242 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1243 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1244 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1245 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1246 ],
1193 ["Weapons", 0, 6, 1247 ["Weapons", 0, 6,
… …
1230 for (@bits) { 1284 for (@bits) {
1231 ++$y; 1285 ++$y;
1232 1286
1233 my $mask = $_->[1]; 1287 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1289 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1291 on_changed => sub {
1238 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1239 1293
1240 if ($value) { 1294 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1295 $::CFG->{pickup} |= $mask;
… …
1243 $::CFG->{pickup} &= ~$mask; 1297 $::CFG->{pickup} &= ~$mask;
1244 } 1298 }
1245 1299
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1300 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1301 if defined $::CONN;
1302
1303 0
1248 }); 1304 });
1305
1306 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1307 }
1250 } 1308 }
1251 1309
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1310 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1313 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1314 on_changed => sub {
1256 my ($slider, $value) = @_; 1315 my ($slider, $value) = @_;
1257 1316
1258 $::CFG->{pickup} &= ~0x7; 1317 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1318 $::CFG->{pickup} |= int $value
1260 if $value; 1319 if $value;
1261 1; 1320 1;
1262 }); 1321 });
1322
1263 $table->add (3, 18, new CFClient::UI::Button 1323 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1324 text => "set",
1265 on_activate => sub { 1325 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1327 if defined $::CONN;
1268 1; 1328 0
1269 }); 1329 });
1270 1330
1271 $table 1331 $table
1272} 1332}
1273 1333
1274sub inventory_window { 1334sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336
1337 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1339 $vb1->add ($INV = new CFClient::UI::Inventory);
1340
1341 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344
1345 $vb2->add ($INVR = new CFClient::UI::Inventory);
1346
1347 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349
1350 $hb
1351}
1352
1353sub toggle_player_page {
1354 my ($widget) = @_;
1355
1356 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1357 $PL_WINDOW->hide;
1358 } else {
1359 $PL_NOTEBOOK->set_current_page ($widget);
1360 $PL_WINDOW->show;
1361 }
1362}
1363
1364sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1366 x => "center",
1277 y => "center", 1367 y => "center",
1278 force_w => $WIDTH * 9/10, 1368 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1369 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1370 title => "Player",
1371 name => "playerbook",
1372 has_close_button => 1
1281 ; 1373 ;
1282 1374
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1375 my $ntb =
1376 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1284 1382
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1383 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1384 "Stats" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 );
1387 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window,
1389 "Shows all your Skills."
1390 );
1391 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 );
1395 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 );
1288 1400
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1401 $ntb->set_current_page ($INVENTORY_PAGE);
1290 1402
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1403 $plwin->add ($ntb);
1292 1404 $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} 1405}
1300 1406
1301sub spell_setup { 1407sub update_bindings {
1302 new CFClient::UI::SpellList 1408 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1409}
1304 1410
1305sub keyboard_setup { 1411sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1412 my $binding_list = new CFClient::UI::VBox;
1307 1413
1308 my $refresh; 1414 my $refresh;
1309 $refresh = sub { 1415 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1416 $binding_list->clear ();
1311 1417
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1418 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1422
1317 my $lbl = join "; ", @$cmds; 1423 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1425 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1426 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1427 text => "delete",
1322 tooltip => "Deletes the binding", 1428 tooltip => "Deletes the binding",
1323 on_activate => sub { 1429 on_activate => sub {
1324 $binding_list->remove ($hb); 1430 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1431 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432 0
1326 }); 1433 });
1327 1434
1328 $hb->add (new CFClient::UI::Button 1435 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1436 text => "edit",
1330 tooltip => "Edits the binding", 1437 tooltip => "Edits the binding",
1331 on_activate => sub { 1438 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1439 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1440 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1441 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1442 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1443 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1444 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1445 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1446 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1447 $SETUP_DIALOG->show;
1341 }, 1448 },
1342 sub { 1449 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1450 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1451 $SETUP_DIALOG->show;
1345 }); 1452 });
1346 $::BIND_EDITOR->show; 1453 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1454 $SETUP_DIALOG->hide;
1455 0
1348 }); 1456 });
1349 1457
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1458 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1459 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1460 }
… …
1361 state => $CFG->{shift_fire_stop}, 1469 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1470 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1471 on_changed => sub {
1364 my ($cbox, $value) = @_; 1472 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1473 $CFG->{shift_fire_stop} = $value;
1474 0
1366 }); 1475 });
1367 1476
1368 $vb->add ($binding_list); 1477 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1478 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1479
… …
1374 tooltip => "This button opens the binding editor with an empty binding.", 1483 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1484 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1485 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1486 sub {
1378 my ($mod, $sym, $cmds) = @_; 1487 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1488 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1489 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1490 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1491 $SETUP_DIALOG->show;
1383 }, 1492 },
1384 sub { 1493 sub {
… …
1386 $SETUP_DIALOG->show; 1495 $SETUP_DIALOG->show;
1387 }, 1496 },
1388 ); 1497 );
1389 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1499 $::BIND_EDITOR->show;
1500 0
1391 }, 1501 },
1392 ); 1502 );
1393 1503
1394 $hb->add (new CFClient::UI::Button 1504 $hb->add (new CFClient::UI::Button
1395 text => "close", 1505 text => "close",
1396 tooltip => "Closes the binding window", 1506 tooltip => "Closes the binding window",
1397 expand => 1, 1507 expand => 1,
1398 on_activate => sub { 1508 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1509 $SETUP_DIALOG->hide;
1510 0
1400 } 1511 }
1401 ); 1512 );
1402 1513
1403 $refresh->(); 1514 $refresh->();
1404 1515
… …
1411 y => 'center', 1522 y => 'center',
1412 z => 2, 1523 z => 2,
1413 name => 'doc_browser', 1524 name => 'doc_browser',
1414 force_w => int $WIDTH * 7/8, 1525 force_w => int $WIDTH * 7/8,
1415 force_h => int $HEIGHT * 7/8, 1526 force_h => int $HEIGHT * 7/8,
1416 title => "Documentation"; 1527 title => "Help Browser",
1528 has_close_button => 1;
1417 1529
1418 $win->add (my $vbox = new CFClient::UI::VBox); 1530 $win->add (my $vbox = new CFClient::UI::VBox);
1419 1531
1420 $vbox->add (my $buttons = new CFClient::UI::HBox); 1532 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1536 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1537 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1538 value => undef,
1427 options => [ 1539 options => [
1428 [intro => "Introduction"], 1540 [intro => "Introduction"],
1429 [manual => "Manual"], 1541 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1542 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1543 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1544 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1545 [COPYING => "License Terms"],
1434 ], 1546 ],
1435 on_changed => sub { 1547 on_changed => sub {
1436 my ($self, $pod) = @_; 1548 my ($self, $pod) = @_;
1437 1549
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1552
1441 $viewer->clear; 1553 $viewer->clear;
1554
1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558# ]);#d#
1442 1559
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1561 for @$pom;
1445 1562
1446 $viewer->set_offset (0); 1563 $viewer->set_offset (0);
1564
1565 0
1447 }, 1566 },
1448 on_visibility_change => sub { 1567 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1568 my ($self, $visible) = @_;
1450 return unless $visible; 1569 return unless $visible;
1451 return if $self->{value}; 1570 return if $self->{value};
1452 $self->set_value ("intro"); 1571 $self->set_value ("intro");
1572 0
1453 }, 1573 },
1454 ); 1574 );
1455 1575
1456 $win 1576 $win
1457} 1577}
… …
1496 z => 100, 1616 z => 100,
1497 force_x => "max", 1617 force_x => "max",
1498 force_y => 0; 1618 force_y => 0;
1499 $DEBUG_STATUS->show; 1619 $DEBUG_STATUS->show;
1500 1620
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1622
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1623 $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]); 1624 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505 1625
1506 (new CFClient::UI::Frame 1626 (new CFClient::UI::Frame
… …
1515 name => "mapmap", 1635 name => "mapmap",
1516 x => 0, 1636 x => 0,
1517 y => $FONTSIZE + 8, 1637 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1638 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1639 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1640 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.", 1641 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1642 ),
1524 )->show; 1643 )->show;
1525 1644
… …
1527 $MAPWIDGET->connect (activate_console => sub { 1646 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1647 my ($mapwidget, $preset) = @_;
1529 1648
1530 if ($CONSOLE) { 1649 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1650 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1651 $CONSOLE->{input}->grab_focus;
1533 1652
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1653 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1654 $CONSOLE->{input}->set_text ($preset);
1536 } 1655 }
1537 } 1656 }
1538 }); 1657 });
1539 $MAPWIDGET->show; 1658 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1659 $MAPWIDGET->grab_focus;
1541 1660
1542 $LOGVIEW = new CFClient::UI::TextScroller 1661 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1662 expand => 1,
1544 font => $FONT_FIXED, 1663 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1664 fontsize => $::CFG->{log_fontsize},
… …
1555 x => 'center', 1674 x => 'center',
1556 y => 'center', 1675 y => 'center',
1557 z => 2, 1676 z => 2,
1558 force_w => $::WIDTH * 0.6, 1677 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1678 force_h => $::HEIGHT * 0.6,
1679 has_close_button => 1,
1560 ; 1680 ;
1681
1682 $METASERVER = metaserver_dialog;
1561 1683
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1684 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1685 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1686
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1687 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1691 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1692 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1693 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1694 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1695 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1696 "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 " 1697 . "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 " 1698 . "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. " 1699 . "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 " 1700 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes"); 1701 . "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, 1702 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1703 "Some debuggin' options. Do not ask.");
1584 1704
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586 1706
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1707 $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."); 1708 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, 1710 $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."); 1711 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592 1712
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 1713 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 1714
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, 1715 $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 :). " 1716 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 1717
1601 $BUTTONBAR->add (new CFClient::UI::Button 1718 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1719 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.", 1720 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 { 1721 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1722 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1723 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1724 status "Configuration Saved";
1725 0
1608 }, 1726 },
1609 ); 1727 );
1610 1728
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1729 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612 tooltip => "View Documentation"); 1730 tooltip => "View Documentation");
1613 1731
1614 $BUTTONBAR->add (new CFClient::UI::Button 1732 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Quit", 1733 text => "Quit",
1616 tooltip => "Terminates the program", 1734 tooltip => "Terminates the program",
… …
1618 if ($CONN) { 1736 if ($CONN) {
1619 open_quit_dialog; 1737 open_quit_dialog;
1620 } else { 1738 } else {
1621 exit; 1739 exit;
1622 } 1740 }
1741 0
1623 }, 1742 },
1624 ); 1743 );
1625 1744
1626 $BUTTONBAR->show; 1745 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1746 $SETUP_DIALOG->show;
… …
1629 1748
1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1749 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1631} 1750}
1632 1751
1633sub video_shutdown { 1752sub video_shutdown {
1753 CFClient::OpenGL::shutdown;
1754
1634 undef $SDL_ACTIVE; 1755 undef $SDL_ACTIVE;
1635} 1756}
1636 1757
1637my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1758my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1638my $bgmusic;#TODO#hack#d# 1759my $bgmusic;#TODO#hack#d#
… …
1819# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1940# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1820 }, 1941 },
1821 CFClient::SDL_KEYDOWN => sub { 1942 CFClient::SDL_KEYDOWN => sub {
1822 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1943 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1823 # alt-enter 1944 # alt-enter
1945 $FULLSCREEN_ENABLE->toggle;
1824 video_shutdown; 1946 video_shutdown;
1825 $CFG->{fullscreen} = !$CFG->{fullscreen};
1826 video_init; 1947 video_init;
1827 } else { 1948 } else {
1828 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1949 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1829 } 1950 }
1830 }, 1951 },
… …
1854 1975
1855 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1856 CFClient::UI::set_layout ($::CFG->{layout}); 1977 CFClient::UI::set_layout ($::CFG->{layout});
1857 1978
1858 my %DEF_CFG = ( 1979 my %DEF_CFG = (
1859 sdl_mode => 0, 1980 sdl_mode => 0,
1860 width => 640, 1981 width => 640,
1861 height => 480, 1982 height => 480,
1862 fullscreen => 0, 1983 fullscreen => 0,
1863 fast => 0, 1984 fast => 0,
1864 map_scale => 1, 1985 map_scale => 1,
1865 fow_enable => 1, 1986 fow_enable => 1,
1866 fow_intensity => 0.45, 1987 fow_intensity => 0.45,
1867 fow_smooth => 0, 1988 fow_smooth => 0,
1868 gui_fontsize => 1, 1989 gui_fontsize => 1,
1869 log_fontsize => 0.7, 1990 log_fontsize => 0.7,
1870 gauge_fontsize=> 1, 1991 gauge_fontsize => 1,
1871 gauge_size => 0.35, 1992 gauge_size => 0.35,
1872 stat_fontsize => 0.7, 1993 stat_fontsize => 0.7,
1873 mapsize => 100, 1994 mapsize => 100,
1874 host => "crossfire.schmorp.de",
1875 say_command => 'say', 1995 say_command => 'say',
1876 audio_enable => 1, 1996 audio_enable => 1,
1877 bgm_enable => 1, 1997 bgm_enable => 1,
1878 bgm_volume => 0.25, 1998 bgm_volume => 0.25,
1879 face_prefetch => 0, 1999 face_prefetch => 0,
1880 output_sync => 1, 2000 output_sync => 1,
1881 output_count => 1, 2001 output_count => 1,
1882 pickup => 0, 2002 pickup => 0,
2003 default => "profile", # default profile
2004 );
1883 ); 2005
1884
1885 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1886 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1887 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1888 2011
1889 sdl_init; 2012 sdl_init;
1890 2013
1891 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1892 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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