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

Diff Legend

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