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

Diff Legend

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