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.89 by elmex, Sun Jul 9 21:11:48 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
… …
837 deat => CS_STAT_RES_DEATH, 819 deat => CS_STAT_RES_DEATH,
838 holyw => CS_STAT_RES_HOLYWORD, 820 holyw => CS_STAT_RES_HOLYWORD,
839 blind => CS_STAT_RES_BLIND, 821 blind => CS_STAT_RES_BLIND,
840 ); 822 );
841 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 }
860
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl; 862 for keys %tbl;
844} 863}
845 864
846my $METASERVER_ATIME; 865my $METASERVER_ATIME;
847 866
848sub update_metaserver { 867sub update_metaserver {
868 my ($metaserver_dialog) = @_;
869
870 $METASERVER = $metaserver_dialog
871 if defined $metaserver_dialog;
872
849 return if $METASERVER_ATIME > time; 873 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 874 $METASERVER_ATIME = time + 60;
851 875
852 my $table = $METASERVER->{table}; 876 my $table = $METASERVER->{table};
853 $table->clear; 877 $table->clear;
… …
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 942 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 943 (new CFClient::UI::Button
920 text => "Use", 944 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 945 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 946 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 947 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 948 $METASERVER->hide;
949 0
925 }, 950 },
926 ), 951 ),
927 (new CFClient::UI::Empty expand => 1), 952 (new CFClient::UI::Empty expand => 1),
928 ]); 953 ]);
929 954
… …
940 } 965 }
941 }); 966 });
942} 967}
943 968
944sub 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
945 my $dialog = new CFClient::UI::FancyFrame 974 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 975 title => "Server List",
947 name => 'metaserver_dialog', 976 name => 'metaserver_dialog',
948 x => 'center', 977 x => 'center',
949 y => 'center', 978 y => 'center',
950 z => 3, 979 z => 3,
951 force_h => $::HEIGHT * 0.4, 980 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 981 child => $vbox,
982 has_close_button => 1,
983 table => $table,
953 on_visibility_change => sub { 984 on_visibility_change => sub {
954 update_metaserver if $_[1]; 985 update_metaserver ($_[0]) if $_[1];
986 0
955 }, 987 },
956 ; 988 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 989
962 $dialog 990 $dialog
963} 991}
964 992
965sub server_setup { 993sub server_setup {
… …
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1000 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 1001
974 $vbox->add ( 1002 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 1003 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 1004 expand => 1,
977 text => $CFG->{host}, 1005 text => $CFG->{profile}{default}{host},
978 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",
979 on_changed => sub { 1007 on_changed => sub {
980 my ($self, $value) = @_; 1008 my ($self, $value) = @_;
981 $CFG->{host} = $value; 1009 $CFG->{profile}{default}{host} = $value;
1010 0
982 } 1011 }
983 ); 1012 );
984
985 $METASERVER = metaserver_dialog;
986 1013
987 $vbox->add (new CFClient::UI::Button 1014 $vbox->add (new CFClient::UI::Button
988 expand => 1, 1015 expand => 1,
989 text => "Server List", 1016 text => "Server List",
990 other => $METASERVER, 1017 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 1018 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 1019 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 1021 );
995 } 1022 }
996 1023
997 $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");
998 $table->add (1, 4, new CFClient::UI::Entry 1025 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 1026 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 1027 tooltip => "The name of your character on the server",
1001 on_changed => sub { 1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 1029 );
1006 1030
1007 $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");
1008 $table->add (1, 5, new CFClient::UI::Entry 1032 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 1033 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 1034 hidden => 1,
1011 tooltip => "The password for your character", 1035 tooltip => "The password for your character",
1012 on_changed => sub { 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 1037 );
1017 1038
1018 $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");
1019 $table->add (1, 7, new CFClient::UI::Slider 1040 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 1041 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1042 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 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. "
1023 . "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, "
1024 . "but you also increase bandwidth requirements and latency. " 1045 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1046 . "This option is only used once at log-in.",
1026 on_changed => sub { 1047 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 ); 1048 );
1032 1049
1033 $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");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1051 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1052 state => $CFG->{face_prefetch},
… …
1038 . "This might increase or create lag, but increases the chances " 1055 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1056 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1057 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1058 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1059 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1061 );
1045 1062
1046 $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");
1047 $table->add (1, 9, new CFClient::UI::Entry 1064 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1065 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.", 1066 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] }, 1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1068 );
1052 1069
1053 $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");
1054 $table->add (1, 10, new CFClient::UI::Entry 1071 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1072 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.", 1073 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] }, 1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1075 );
1059 1076
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1077 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1078 expand => 1,
1062 align => 0, 1079 align => 0,
1063 text => "Login", 1080 text => "Login",
1064 on_activate => sub { 1081 on_activate => sub {
1065 $CONN ? stop_game 1082 $CONN ? stop_game
1066 : start_game; 1083 : start_game;
1084 0
1067 }, 1085 },
1068 ); 1086 );
1069 1087
1070 $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");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1089 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1074 . "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. "
1075 . "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.",
1076 on_changed => sub { 1094 on_changed => sub {
1077 my ($self, $value) = @_; 1095 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1096 $CFG->{say_command} = $value;
1097 0
1079 } 1098 }
1080 ); 1099 );
1081 1100
1082 $vbox->add (new CFClient::UI::Label 1101 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1102 text => "Server Info",
… …
1099 bg => [0, 0, 0, 0.75], 1118 bg => [0, 0, 0, 0.75],
1100 x => "max", 1119 x => "max",
1101 y => 0, 1120 y => 0,
1102 force_w => $::WIDTH * 0.4, 1121 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1122 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1123 child => (my $vbox = new CFClient::UI::VBox),
1124 has_close_button => 1;
1105 1125
1106 $vbox->add ($LOGVIEW); 1126 $vbox->add ($LOGVIEW);
1107 1127
1108 $vbox->add (my $input = new CFClient::UI::Entry 1128 $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> " 1129 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1117 1137
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1138 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1139 $input->{refocus_map} = 1;
1120 } 1140 }
1121 delete $input->{auto_activated}; 1141 delete $input->{auto_activated};
1142
1143 0
1122 }, 1144 },
1123 on_activate => sub { 1145 on_activate => sub {
1124 my ($input, $text) = @_; 1146 my ($input, $text) = @_;
1125 $input->set_text (''); 1147 $input->set_text ('');
1126 1148
… …
1132 } 1154 }
1133 if ($input->{refocus_map}) { 1155 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1156 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1157 $MAPWIDGET->focus_in
1136 } 1158 }
1159
1160 0
1137 }, 1161 },
1138 on_escape => sub { 1162 on_escape => sub {
1139 $MAPWIDGET->focus_in 1163 $MAPWIDGET->grab_focus;
1164
1165 0
1140 }, 1166 },
1141 ); 1167 );
1142 1168
1143 $CONSOLE = { 1169 $CONSOLE = {
1144 window => $window, 1170 window => $window,
… …
1166 ); 1192 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1193 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1194 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1195 text => "Ok",
1170 expand => 1, 1196 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1198 );
1173 $hb->add (new CFClient::UI::Button 1199 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1200 text => "Quit anyway",
1175 expand => 1, 1201 expand => 1,
1176 on_activate => sub { exit }, 1202 on_activate => sub { exit },
… …
1183sub autopickup_setup { 1209sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1210 my $table = new CFClient::UI::Table;
1185 1211
1186 for ( 1212 for (
1187 ["General", 0, 0, 1213 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1214 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1215 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1216 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1217 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1218 ],
1193 ["Weapons", 0, 6, 1219 ["Weapons", 0, 6,
… …
1230 for (@bits) { 1256 for (@bits) {
1231 ++$y; 1257 ++$y;
1232 1258
1233 my $mask = $_->[1]; 1259 my $mask = $_->[1];
1234 $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);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1261 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1262 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1263 on_changed => sub {
1238 my ($box, $value) = @_; 1264 my ($box, $value) = @_;
1239 1265
1240 if ($value) { 1266 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1267 $::CFG->{pickup} |= $mask;
… …
1243 $::CFG->{pickup} &= ~$mask; 1269 $::CFG->{pickup} &= ~$mask;
1244 } 1270 }
1245 1271
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1272 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1273 if defined $::CONN;
1274
1275 0
1248 }); 1276 });
1277
1278 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1279 }
1250 } 1280 }
1251 1281
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1282 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1283 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1284 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1285 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1286 on_changed => sub {
1256 my ($slider, $value) = @_; 1287 my ($slider, $value) = @_;
1257 1288
1258 $::CFG->{pickup} &= ~0x7; 1289 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1290 $::CFG->{pickup} |= int $value
1260 if $value; 1291 if $value;
1261 1; 1292 1;
1262 }); 1293 });
1294
1263 $table->add (3, 18, new CFClient::UI::Button 1295 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1296 text => "set",
1265 on_activate => sub { 1297 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1298 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1299 if defined $::CONN;
1268 1; 1300 0
1269 }); 1301 });
1270 1302
1271 $table 1303 $table
1272} 1304}
1273 1305
1274sub 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 {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1337 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1338 x => "center",
1277 y => "center", 1339 y => "center",
1278 force_w => $WIDTH * 9/10, 1340 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1341 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1342 title => "Player",
1343 has_close_button => 1
1281 ; 1344 ;
1282 1345
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1346 my $ntb =
1347 $PL_NOTEBOOK =
1348 new CFClient::UI::Notebook
1349 expand => 1,
1350 debug => 1,
1351 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1352 ;
1284 1353
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1354 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1355 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1356 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1357 );
1358 $ntb->add (
1359 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 );
1362 $ntb->add (
1363 Inventory => $INVENTORY_PAGE = inventory_widget,
1364 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1365 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1366 );
1288 1367
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1368 $ntb->set_current_page ($INVENTORY_PAGE);
1290 1369
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1370 $plwin->add ($ntb);
1292 1371 $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} 1372}
1300 1373
1301sub spell_setup { 1374sub update_bindings {
1302 new CFClient::UI::SpellList 1375 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1376}
1304 1377
1305sub keyboard_setup { 1378sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1379 my $binding_list = new CFClient::UI::VBox;
1307 1380
1308 my $refresh; 1381 my $refresh;
1309 $refresh = sub { 1382 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1383 $binding_list->clear ();
1311 1384
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1385 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1386 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1387 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1388 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1389
1317 my $lbl = join "; ", @$cmds; 1390 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1391 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1392 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1393 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1394 text => "delete",
1322 tooltip => "Deletes the binding", 1395 tooltip => "Deletes the binding",
1323 on_activate => sub { 1396 on_activate => sub {
1324 $binding_list->remove ($hb); 1397 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1398 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1399 0
1326 }); 1400 });
1327 1401
1328 $hb->add (new CFClient::UI::Button 1402 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1403 text => "edit",
1330 tooltip => "Edits the binding", 1404 tooltip => "Edits the binding",
1331 on_activate => sub { 1405 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1406 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1407 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1408 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1409 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1410 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1411 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1412 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1413 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1414 $SETUP_DIALOG->show;
1341 }, 1415 },
1342 sub { 1416 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1417 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1418 $SETUP_DIALOG->show;
1345 }); 1419 });
1346 $::BIND_EDITOR->show; 1420 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1421 $SETUP_DIALOG->hide;
1422 0
1348 }); 1423 });
1349 1424
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1425 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1426 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1427 }
… …
1361 state => $CFG->{shift_fire_stop}, 1436 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1437 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1438 on_changed => sub {
1364 my ($cbox, $value) = @_; 1439 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1440 $CFG->{shift_fire_stop} = $value;
1441 0
1366 }); 1442 });
1367 1443
1368 $vb->add ($binding_list); 1444 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1445 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1446
… …
1374 tooltip => "This button opens the binding editor with an empty binding.", 1450 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1451 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1452 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1453 sub {
1378 my ($mod, $sym, $cmds) = @_; 1454 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1455 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1456 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1457 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1458 $SETUP_DIALOG->show;
1383 }, 1459 },
1384 sub { 1460 sub {
… …
1386 $SETUP_DIALOG->show; 1462 $SETUP_DIALOG->show;
1387 }, 1463 },
1388 ); 1464 );
1389 $SETUP_DIALOG->hide; 1465 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1466 $::BIND_EDITOR->show;
1467 0
1391 }, 1468 },
1392 ); 1469 );
1393 1470
1394 $hb->add (new CFClient::UI::Button 1471 $hb->add (new CFClient::UI::Button
1395 text => "close", 1472 text => "close",
1396 tooltip => "Closes the binding window", 1473 tooltip => "Closes the binding window",
1397 expand => 1, 1474 expand => 1,
1398 on_activate => sub { 1475 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1476 $SETUP_DIALOG->hide;
1477 0
1400 } 1478 }
1401 ); 1479 );
1402 1480
1403 $refresh->(); 1481 $refresh->();
1404 1482
… …
1411 y => 'center', 1489 y => 'center',
1412 z => 2, 1490 z => 2,
1413 name => 'doc_browser', 1491 name => 'doc_browser',
1414 force_w => int $WIDTH * 7/8, 1492 force_w => int $WIDTH * 7/8,
1415 force_h => int $HEIGHT * 7/8, 1493 force_h => int $HEIGHT * 7/8,
1416 title => "Documentation"; 1494 title => "Help Browser",
1495 has_close_button => 1;
1417 1496
1418 $win->add (my $vbox = new CFClient::UI::VBox); 1497 $win->add (my $vbox = new CFClient::UI::VBox);
1419 1498
1420 $vbox->add (my $buttons = new CFClient::UI::HBox); 1499 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1500 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1503 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1504 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1505 value => undef,
1427 options => [ 1506 options => [
1428 [intro => "Introduction"], 1507 [intro => "Introduction"],
1429 [manual => "Manual"], 1508 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1509 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1510 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1511 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1512 [COPYING => "License Terms"],
1434 ], 1513 ],
1435 on_changed => sub { 1514 on_changed => sub {
1436 my ($self, $pod) = @_; 1515 my ($self, $pod) = @_;
1437 1516
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1517 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1518 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1519
1441 $viewer->clear; 1520 $viewer->clear;
1521
1522# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1523# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1524# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1525# ]);#d#
1442 1526
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1527 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1528 for @$pom;
1445 1529
1446 $viewer->set_offset (0); 1530 $viewer->set_offset (0);
1531
1532 0
1447 }, 1533 },
1448 on_visibility_change => sub { 1534 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1535 my ($self, $visible) = @_;
1450 return unless $visible; 1536 return unless $visible;
1451 return if $self->{value}; 1537 return if $self->{value};
1452 $self->set_value ("intro"); 1538 $self->set_value ("intro");
1539 0
1453 }, 1540 },
1454 ); 1541 );
1455 1542
1456 $win 1543 $win
1457} 1544}
… …
1496 z => 100, 1583 z => 100,
1497 force_x => "max", 1584 force_x => "max",
1498 force_y => 0; 1585 force_y => 0;
1499 $DEBUG_STATUS->show; 1586 $DEBUG_STATUS->show;
1500 1587
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1588 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1589
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1590 $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]); 1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505 1592
1506 (new CFClient::UI::Frame 1593 (new CFClient::UI::Frame
… …
1515 name => "mapmap", 1602 name => "mapmap",
1516 x => 0, 1603 x => 0,
1517 y => $FONTSIZE + 8, 1604 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1605 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1606 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1607 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.", 1608 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1609 ),
1524 )->show; 1610 )->show;
1525 1611
… …
1527 $MAPWIDGET->connect (activate_console => sub { 1613 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1614 my ($mapwidget, $preset) = @_;
1529 1615
1530 if ($CONSOLE) { 1616 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1617 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1618 $CONSOLE->{input}->grab_focus;
1533 1619
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1620 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1621 $CONSOLE->{input}->set_text ($preset);
1536 } 1622 }
1537 } 1623 }
1538 }); 1624 });
1539 $MAPWIDGET->show; 1625 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1626 $MAPWIDGET->grab_focus;
1541 1627
1542 $LOGVIEW = new CFClient::UI::TextScroller 1628 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1629 expand => 1,
1544 font => $FONT_FIXED, 1630 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1631 fontsize => $::CFG->{log_fontsize},
… …
1555 x => 'center', 1641 x => 'center',
1556 y => 'center', 1642 y => 'center',
1557 z => 2, 1643 z => 2,
1558 force_w => $::WIDTH * 0.6, 1644 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1645 force_h => $::HEIGHT * 0.6,
1646 has_close_button => 1,
1560 ; 1647 ;
1648
1649 $METASERVER = metaserver_dialog;
1561 1650
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1652 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1653
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1658 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1659 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1660 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1661 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1662 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1663 "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 " 1664 . "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 " 1665 . "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. " 1666 . "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 " 1667 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes"); 1668 . "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, 1669 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1670 "Some debuggin' options. Do not ask.");
1584 1671
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1672 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586 1673
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1674 $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."); 1675 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, 1677 $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."); 1678 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592 1679
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 1680 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 1681
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, 1682 $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 :). " 1683 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 1684
1601 $BUTTONBAR->add (new CFClient::UI::Button 1685 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1686 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.", 1687 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 { 1688 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1689 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1690 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1691 status "Configuration Saved";
1692 0
1608 }, 1693 },
1609 ); 1694 );
1610 1695
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612 tooltip => "View Documentation"); 1697 tooltip => "View Documentation");
1613 1698
1614 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Quit", 1700 text => "Quit",
1616 tooltip => "Terminates the program", 1701 tooltip => "Terminates the program",
… …
1618 if ($CONN) { 1703 if ($CONN) {
1619 open_quit_dialog; 1704 open_quit_dialog;
1620 } else { 1705 } else {
1621 exit; 1706 exit;
1622 } 1707 }
1708 0
1623 }, 1709 },
1624 ); 1710 );
1625 1711
1626 $BUTTONBAR->show; 1712 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1713 $SETUP_DIALOG->show;
… …
1629 1715
1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1716 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1631} 1717}
1632 1718
1633sub video_shutdown { 1719sub video_shutdown {
1720 CFClient::OpenGL::shutdown;
1721
1634 undef $SDL_ACTIVE; 1722 undef $SDL_ACTIVE;
1635} 1723}
1636 1724
1637my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1725my @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# 1726my $bgmusic;#TODO#hack#d#
… …
1854 1942
1855 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1943 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1856 CFClient::UI::set_layout ($::CFG->{layout}); 1944 CFClient::UI::set_layout ($::CFG->{layout});
1857 1945
1858 my %DEF_CFG = ( 1946 my %DEF_CFG = (
1859 sdl_mode => 0, 1947 sdl_mode => 0,
1860 width => 640, 1948 width => 640,
1861 height => 480, 1949 height => 480,
1862 fullscreen => 0, 1950 fullscreen => 0,
1863 fast => 0, 1951 fast => 0,
1864 map_scale => 1, 1952 map_scale => 1,
1865 fow_enable => 1, 1953 fow_enable => 1,
1866 fow_intensity => 0.45, 1954 fow_intensity => 0.45,
1867 fow_smooth => 0, 1955 fow_smooth => 0,
1868 gui_fontsize => 1, 1956 gui_fontsize => 1,
1869 log_fontsize => 0.7, 1957 log_fontsize => 0.7,
1870 gauge_fontsize=> 1, 1958 gauge_fontsize => 1,
1871 gauge_size => 0.35, 1959 gauge_size => 0.35,
1872 stat_fontsize => 0.7, 1960 stat_fontsize => 0.7,
1873 mapsize => 100, 1961 mapsize => 100,
1874 host => "crossfire.schmorp.de",
1875 say_command => 'say', 1962 say_command => 'say',
1876 audio_enable => 1, 1963 audio_enable => 1,
1877 bgm_enable => 1, 1964 bgm_enable => 1,
1878 bgm_volume => 0.25, 1965 bgm_volume => 0.25,
1879 face_prefetch => 0, 1966 face_prefetch => 0,
1880 output_sync => 1, 1967 output_sync => 1,
1881 output_count => 1, 1968 output_count => 1,
1882 pickup => 0, 1969 pickup => 0,
1970 default => "profile", # default profile
1971 );
1883 ); 1972
1884
1885 while (my ($k, $v) = each %DEF_CFG) { 1973 while (my ($k, $v) = each %DEF_CFG) {
1886 $CFG->{$k} = $v unless exists $CFG->{$k}; 1974 $CFG->{$k} = $v unless exists $CFG->{$k};
1887 } 1975 }
1976
1977 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1888 1978
1889 sdl_init; 1979 sdl_init;
1890 1980
1891 @SDL_MODES = reverse 1981 @SDL_MODES = reverse
1892 grep $_->[0] >= 640 && $_->[1] >= 480, 1982 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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