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.87 by root, Sun Jul 2 21:41:34 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 ); 478 );
474 479
475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476 481
477 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
478 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 483 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.", 484 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480 on_changed => sub { 485 on_changed => sub {
481 $CFG->{stat_fontsize} = $_[1]; 486 $CFG->{stat_fontsize} = $_[1];
482 &set_stats_window_fontsize; 487 &set_stats_window_fontsize;
488 0
483 } 489 }
484 ); 490 );
485 491
486 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 494 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.", 495 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 496 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 497 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 498 &set_gauge_window_fontsize;
499 0
493 } 500 }
494 ); 501 );
495 502
496 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 503 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
497 $table->add (1, $row++, new CFClient::UI::Slider 504 $table->add (1, $row++, new CFClient::UI::Slider
498 range => [$CFG->{gauge_size}, 0.2, 0.8], 505 range => [$CFG->{gauge_size}, 0.2, 0.8],
499 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 506 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
500 on_changed => sub { 507 on_changed => sub {
501 $CFG->{gauge_size} = $_[1]; 508 $CFG->{gauge_size} = $_[1];
502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 509 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
510 0
503 } 511 }
504 ); 512 );
505 513
506 $table->add (1, $row++, new CFClient::UI::Button 514 $table->add (1, $row++, new CFClient::UI::Button
507 expand => 1, align => 0, text => "Apply", 515 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 516 tooltip => "Apply the video settings",
509 on_activate => sub { 517 on_activate => sub {
510 video_shutdown (); 518 video_shutdown ();
511 video_init (); 519 video_init ();
520 0
512 } 521 }
513 ); 522 );
514 523
515 $vbox 524 $vbox
516} 525}
… …
524 533
525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 535 $table->add (1, $row++, new CFClient::UI::CheckBox
527 state => $CFG->{audio_enable}, 536 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.", 537 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 { 538 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 $CFG->{audio_enable} = $_[1];
531 }
532 ); 539 );
533# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 540# $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 { 541# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
535# $CFG->{effects_volume} = $_[1]; 542# $CFG->{effects_volume} = $_[1];
536# }); 543# });
537 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 544 $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); 545 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539 $hbox->add (new CFClient::UI::CheckBox 546 $hbox->add (new CFClient::UI::CheckBox
540 expand => 1, state => $CFG->{bgm_enable}, 547 expand => 1, state => $CFG->{bgm_enable},
541 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 548 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
542 on_changed => sub { 549 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543 $CFG->{bgm_enable} = $_[1];
544 }
545 ); 550 );
546 $hbox->add (new CFClient::UI::Slider 551 $hbox->add (new CFClient::UI::Slider
547 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 552 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548 tooltip => "The volume of the background music. Changes are instant.", 553 tooltip => "The volume of the background music. Changes are instant.",
549 on_changed => sub { 554 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 ); 555 );
554 556
555 $table->add (1, $row++, new CFClient::UI::Button 557 $table->add (1, $row++, new CFClient::UI::Button
556 expand => 1, align => 0, text => "Apply", 558 expand => 1, align => 0, text => "Apply",
557 tooltip => "Apply the audio settings", 559 tooltip => "Apply the audio settings",
558 on_activate => sub { 560 on_activate => sub {
559 audio_shutdown (); 561 audio_shutdown ();
560 audio_init (); 562 audio_init ();
563 0
561 } 564 }
562 ); 565 );
563 566
564 $vbox 567 $vbox
565} 568}
… …
631 634
632sub debug_setup { 635sub debug_setup {
633 my $table = new CFClient::UI::Table; 636 my $table = new CFClient::UI::Table;
634 637
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 638 $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 }); 639 $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"); 640 $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 }); 641 $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"); 642 $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 }); 643 $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"); 644 $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 }); 645 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643 646
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 647 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645 648
646 for my $x (0..2) { 649 for my $x (0..2) {
647 for my $y (0 .. 2) { 650 for my $y (0 .. 2) {
… …
656 659
657 $table 660 $table
658} 661}
659 662
660sub stats_window { 663sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 664 my $tgw =
662 y => $HEIGHT * (2/8), 665 new CFClient::UI::Window
663 x => "max", 666 child => my $vb = new CFClient::UI::VBox;
664 title => "Stats",
665 name => "stats_window";
666 667
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, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 669 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."); 670 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, 671 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 672 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."], 696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
697 697
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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. 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."], 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."],
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."], 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."],
704 ) { 704 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 705 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
706 706
… …
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 725 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)", 726 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)", 727 pois => "<b>Poison</b> (resistance to getting poisoned)",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
729 deat => "<b>Death</b> (resistance against death spells)", 729 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)", 730 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)", 731 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)", 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)",
733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 734 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, ...)", 735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
752 ); 752 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 754 font => $FONT_FIXED,
755 can_hover => 1, 755 can_hover => 1,
756 can_events => 1, 756 can_events => 1,
757 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_},
759 ); 759 );
760 760
761 $row++; 761 $row++;
762 if ($row % 6 == 0) { 762 if ($row % 6 == 0) {
… …
810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818 818
819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820 820
… …
844} 844}
845 845
846my $METASERVER_ATIME; 846my $METASERVER_ATIME;
847 847
848sub update_metaserver { 848sub update_metaserver {
849 my ($metaserver_dialog) = @_;
850
851 $METASERVER = $metaserver_dialog
852 if defined $metaserver_dialog;
853
849 return if $METASERVER_ATIME > time; 854 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 855 $METASERVER_ATIME = time + 60;
851 856
852 my $table = $METASERVER->{table}; 857 my $table = $METASERVER->{table};
853 $table->clear; 858 $table->clear;
… …
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 923 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 924 (new CFClient::UI::Button
920 text => "Use", 925 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 926 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 927 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 928 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 929 $METASERVER->hide;
930 0
925 }, 931 },
926 ), 932 ),
927 (new CFClient::UI::Empty expand => 1), 933 (new CFClient::UI::Empty expand => 1),
928 ]); 934 ]);
929 935
… …
940 } 946 }
941 }); 947 });
942} 948}
943 949
944sub metaserver_dialog { 950sub metaserver_dialog {
951 my $vbox = new CFClient::UI::VBox;
952 my $table = new CFClient::UI::Table;
953 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
954
945 my $dialog = new CFClient::UI::FancyFrame 955 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 956 title => "Server List",
947 name => 'metaserver_dialog', 957 name => 'metaserver_dialog',
948 x => 'center', 958 x => 'center',
949 y => 'center', 959 y => 'center',
950 z => 3, 960 z => 3,
951 force_h => $::HEIGHT * 0.4, 961 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 962 child => $vbox,
963 has_close_button => 1,
964 table => $table,
953 on_visibility_change => sub { 965 on_visibility_change => sub {
954 update_metaserver if $_[1]; 966 update_metaserver ($_[0]) if $_[1];
967 0
955 }, 968 },
956 ; 969 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 970
962 $dialog 971 $dialog
963} 972}
964 973
965sub server_setup { 974sub server_setup {
… …
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 981 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 982
974 $vbox->add ( 983 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 984 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 985 expand => 1,
977 text => $CFG->{host}, 986 text => $CFG->{profile}{default}{host},
978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 987 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979 on_changed => sub { 988 on_changed => sub {
980 my ($self, $value) = @_; 989 my ($self, $value) = @_;
981 $CFG->{host} = $value; 990 $CFG->{profile}{default}{host} = $value;
991 0
982 } 992 }
983 ); 993 );
984
985 $METASERVER = metaserver_dialog;
986 994
987 $vbox->add (new CFClient::UI::Button 995 $vbox->add (new CFClient::UI::Button
988 expand => 1, 996 expand => 1,
989 text => "Server List", 997 text => "Server List",
990 other => $METASERVER, 998 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 999 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 1000 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1001 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 1002 );
995 } 1003 }
996 1004
997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1005 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
998 $table->add (1, 4, new CFClient::UI::Entry 1006 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 1007 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 1008 tooltip => "The name of your character on the server",
1001 on_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 1010 );
1006 1011
1007 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1012 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1008 $table->add (1, 5, new CFClient::UI::Entry 1013 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 1014 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 1015 hidden => 1,
1011 tooltip => "The password for your character", 1016 tooltip => "The password for your character",
1012 on_changed => sub { 1017 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 1018 );
1017 1019
1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1020 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1019 $table->add (1, 7, new CFClient::UI::Slider 1021 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 1022 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1023 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 tooltip => "This is the size of the portion of the map update the server sends you. " 1024 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, " 1025 . "If you set this to a high value you will be able to see further, "
1024 . "but you also increase bandwidth requirements and latency. " 1026 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1027 . "This option is only used once at log-in.",
1026 on_changed => sub { 1028 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 ); 1029 );
1032 1030
1033 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1031 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1032 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1033 state => $CFG->{face_prefetch},
… …
1038 . "This might increase or create lag, but increases the chances " 1036 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1037 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1038 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1039 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1040 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1041 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1042 );
1045 1043
1046 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1044 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1047 $table->add (1, 9, new CFClient::UI::Entry 1045 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1046 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.", 1047 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] }, 1048 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1049 );
1052 1050
1053 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1051 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054 $table->add (1, 10, new CFClient::UI::Entry 1052 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1053 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.", 1054 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] }, 1055 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1056 );
1059 1057
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1058 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1059 expand => 1,
1062 align => 0, 1060 align => 0,
1063 text => "Login", 1061 text => "Login",
1064 on_activate => sub { 1062 on_activate => sub {
1065 $CONN ? stop_game 1063 $CONN ? stop_game
1066 : start_game; 1064 : start_game;
1065 0
1067 }, 1066 },
1068 ); 1067 );
1069 1068
1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1069 $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 1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1073 . "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.", 1074 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub { 1075 on_changed => sub {
1077 my ($self, $value) = @_; 1076 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1077 $CFG->{say_command} = $value;
1078 0
1079 } 1079 }
1080 ); 1080 );
1081 1081
1082 $vbox->add (new CFClient::UI::Label 1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1083 text => "Server Info",
… …
1099 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1100 x => "max",
1101 y => 0, 1101 y => 0,
1102 force_w => $::WIDTH * 0.4, 1102 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1103 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox),
1105 has_close_button => 1;
1105 1106
1106 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
1107 1108
1108 $vbox->add (my $input = new CFClient::UI::Entry 1109 $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> " 1110 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1117 1118
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1119 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1120 $input->{refocus_map} = 1;
1120 } 1121 }
1121 delete $input->{auto_activated}; 1122 delete $input->{auto_activated};
1123
1124 0
1122 }, 1125 },
1123 on_activate => sub { 1126 on_activate => sub {
1124 my ($input, $text) = @_; 1127 my ($input, $text) = @_;
1125 $input->set_text (''); 1128 $input->set_text ('');
1126 1129
… …
1132 } 1135 }
1133 if ($input->{refocus_map}) { 1136 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1137 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1138 $MAPWIDGET->focus_in
1136 } 1139 }
1140
1141 0
1137 }, 1142 },
1138 on_escape => sub { 1143 on_escape => sub {
1139 $MAPWIDGET->focus_in 1144 $MAPWIDGET->grab_focus;
1145
1146 0
1140 }, 1147 },
1141 ); 1148 );
1142 1149
1143 $CONSOLE = { 1150 $CONSOLE = {
1144 window => $window, 1151 window => $window,
… …
1166 ); 1173 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1174 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1175 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1176 text => "Ok",
1170 expand => 1, 1177 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1178 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1179 );
1173 $hb->add (new CFClient::UI::Button 1180 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1181 text => "Quit anyway",
1175 expand => 1, 1182 expand => 1,
1176 on_activate => sub { exit }, 1183 on_activate => sub { exit },
… …
1183sub autopickup_setup { 1190sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1191 my $table = new CFClient::UI::Table;
1185 1192
1186 for ( 1193 for (
1187 ["General", 0, 0, 1194 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1196 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1197 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1198 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1199 ],
1193 ["Weapons", 0, 6, 1200 ["Weapons", 0, 6,
… …
1230 for (@bits) { 1237 for (@bits) {
1231 ++$y; 1238 ++$y;
1232 1239
1233 my $mask = $_->[1]; 1240 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1241 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1242 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1243 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1244 on_changed => sub {
1238 my ($box, $value) = @_; 1245 my ($box, $value) = @_;
1239 1246
1240 if ($value) { 1247 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1248 $::CFG->{pickup} |= $mask;
… …
1243 $::CFG->{pickup} &= ~$mask; 1250 $::CFG->{pickup} &= ~$mask;
1244 } 1251 }
1245 1252
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1253 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1254 if defined $::CONN;
1255
1256 0
1248 }); 1257 });
1258
1259 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1260 }
1250 } 1261 }
1251 1262
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1263 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1266 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1267 on_changed => sub {
1256 my ($slider, $value) = @_; 1268 my ($slider, $value) = @_;
1257 1269
1258 $::CFG->{pickup} &= ~0x7; 1270 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1271 $::CFG->{pickup} |= int $value
1260 if $value; 1272 if $value;
1261 1; 1273 1;
1262 }); 1274 });
1275
1263 $table->add (3, 18, new CFClient::UI::Button 1276 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1277 text => "set",
1265 on_activate => sub { 1278 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1279 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1280 if defined $::CONN;
1268 1; 1281 0
1269 }); 1282 });
1270 1283
1271 $table 1284 $table
1272} 1285}
1273 1286
1274sub inventory_window { 1287sub inventory_widget {
1288 my $hb = new CFClient::UI::HBox homogeneous => 1;
1289
1290 $hb->add (my $vb1 = new CFClient::UI::VBox);
1291 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1292 $vb1->add ($INV = new CFClient::UI::Inventory);
1293
1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1295
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1297
1298 $vb2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1319 x => "center",
1277 y => "center", 1320 y => "center",
1278 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1323 title => "Player",
1324 has_close_button => 1
1281 ; 1325 ;
1282 1326
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1327 my $ntb =
1328 $PL_NOTEBOOK =
1329 new CFClient::UI::Notebook
1330 expand => 1,
1331 debug => 1,
1332 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1333 ;
1284 1334
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1335 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1336 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1337 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1338 );
1339 $ntb->add (
1340 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1341 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1342 );
1343 $ntb->add (
1344 Inventory => $INVENTORY_PAGE = inventory_widget,
1345 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1346 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1347 );
1288 1348
1289 $hb->add (my $vb2 = new CFClient::UI::VBox);
1290 1349
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1350 $plwin->add ($ntb);
1292 1351 $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} 1352}
1300 1353
1301sub spell_setup { 1354sub update_bindings {
1302 new CFClient::UI::SpellList 1355 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1356}
1304 1357
1305sub keyboard_setup { 1358sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1359 my $binding_list = new CFClient::UI::VBox;
1307 1360
1308 my $refresh; 1361 my $refresh;
1309 $refresh = sub { 1362 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1363 $binding_list->clear ();
1311 1364
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1365 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1366 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1367 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1368 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1369
1317 my $lbl = join "; ", @$cmds; 1370 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1371 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1372 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1374 text => "delete",
1322 tooltip => "Deletes the binding", 1375 tooltip => "Deletes the binding",
1323 on_activate => sub { 1376 on_activate => sub {
1324 $binding_list->remove ($hb); 1377 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1378 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1379 0
1326 }); 1380 });
1327 1381
1328 $hb->add (new CFClient::UI::Button 1382 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1383 text => "edit",
1330 tooltip => "Edits the binding", 1384 tooltip => "Edits the binding",
1331 on_activate => sub { 1385 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1386 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1387 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1388 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1389 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1390 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1391 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1392 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1341 }, 1395 },
1342 sub { 1396 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1397 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1398 $SETUP_DIALOG->show;
1345 }); 1399 });
1346 $::BIND_EDITOR->show; 1400 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1401 $SETUP_DIALOG->hide;
1402 0
1348 }); 1403 });
1349 1404
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1405 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1406 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1407 }
… …
1361 state => $CFG->{shift_fire_stop}, 1416 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1417 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1418 on_changed => sub {
1364 my ($cbox, $value) = @_; 1419 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1420 $CFG->{shift_fire_stop} = $value;
1421 0
1366 }); 1422 });
1367 1423
1368 $vb->add ($binding_list); 1424 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1425 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1426
… …
1374 tooltip => "This button opens the binding editor with an empty binding.", 1430 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1431 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1432 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1433 sub {
1378 my ($mod, $sym, $cmds) = @_; 1434 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1435 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1436 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1437 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1438 $SETUP_DIALOG->show;
1383 }, 1439 },
1384 sub { 1440 sub {
… …
1386 $SETUP_DIALOG->show; 1442 $SETUP_DIALOG->show;
1387 }, 1443 },
1388 ); 1444 );
1389 $SETUP_DIALOG->hide; 1445 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1446 $::BIND_EDITOR->show;
1447 0
1391 }, 1448 },
1392 ); 1449 );
1393 1450
1394 $hb->add (new CFClient::UI::Button 1451 $hb->add (new CFClient::UI::Button
1395 text => "close", 1452 text => "close",
1396 tooltip => "Closes the binding window", 1453 tooltip => "Closes the binding window",
1397 expand => 1, 1454 expand => 1,
1398 on_activate => sub { 1455 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1456 $SETUP_DIALOG->hide;
1457 0
1400 } 1458 }
1401 ); 1459 );
1402 1460
1403 $refresh->(); 1461 $refresh->();
1404 1462
… …
1411 y => 'center', 1469 y => 'center',
1412 z => 2, 1470 z => 2,
1413 name => 'doc_browser', 1471 name => 'doc_browser',
1414 force_w => int $WIDTH * 7/8, 1472 force_w => int $WIDTH * 7/8,
1415 force_h => int $HEIGHT * 7/8, 1473 force_h => int $HEIGHT * 7/8,
1416 title => "Documentation"; 1474 title => "Help Browser",
1475 has_close_button => 1;
1417 1476
1418 $win->add (my $vbox = new CFClient::UI::VBox); 1477 $win->add (my $vbox = new CFClient::UI::VBox);
1419 1478
1420 $vbox->add (my $buttons = new CFClient::UI::HBox); 1479 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1480 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1483 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1484 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1485 value => undef,
1427 options => [ 1486 options => [
1428 [intro => "Introduction"], 1487 [intro => "Introduction"],
1429 [manual => "Manual"], 1488 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1489 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1490 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1491 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1492 [COPYING => "License Terms"],
1434 ], 1493 ],
1435 on_changed => sub { 1494 on_changed => sub {
1436 my ($self, $pod) = @_; 1495 my ($self, $pod) = @_;
1437 1496
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1497 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1498 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1499
1441 $viewer->clear; 1500 $viewer->clear;
1501
1502# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1503# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1504# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1505# ]);#d#
1442 1506
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1507 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1508 for @$pom;
1445 1509
1446 $viewer->set_offset (0); 1510 $viewer->set_offset (0);
1511
1512 0
1447 }, 1513 },
1448 on_visibility_change => sub { 1514 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1515 my ($self, $visible) = @_;
1450 return unless $visible; 1516 return unless $visible;
1451 return if $self->{value}; 1517 return if $self->{value};
1452 $self->set_value ("intro"); 1518 $self->set_value ("intro");
1519 0
1453 }, 1520 },
1454 ); 1521 );
1455 1522
1456 $win 1523 $win
1457} 1524}
… …
1496 z => 100, 1563 z => 100,
1497 force_x => "max", 1564 force_x => "max",
1498 force_y => 0; 1565 force_y => 0;
1499 $DEBUG_STATUS->show; 1566 $DEBUG_STATUS->show;
1500 1567
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1568 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1569
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1570 $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]); 1571 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505 1572
1506 (new CFClient::UI::Frame 1573 (new CFClient::UI::Frame
… …
1515 name => "mapmap", 1582 name => "mapmap",
1516 x => 0, 1583 x => 0,
1517 y => $FONTSIZE + 8, 1584 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1585 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1586 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1587 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.", 1588 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1589 ),
1524 )->show; 1590 )->show;
1525 1591
… …
1527 $MAPWIDGET->connect (activate_console => sub { 1593 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1594 my ($mapwidget, $preset) = @_;
1529 1595
1530 if ($CONSOLE) { 1596 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1597 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1598 $CONSOLE->{input}->grab_focus;
1533 1599
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1600 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1601 $CONSOLE->{input}->set_text ($preset);
1536 } 1602 }
1537 } 1603 }
1538 }); 1604 });
1539 $MAPWIDGET->show; 1605 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1606 $MAPWIDGET->grab_focus;
1541 1607
1542 $LOGVIEW = new CFClient::UI::TextScroller 1608 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1609 expand => 1,
1544 font => $FONT_FIXED, 1610 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1611 fontsize => $::CFG->{log_fontsize},
… …
1555 x => 'center', 1621 x => 'center',
1556 y => 'center', 1622 y => 'center',
1557 z => 2, 1623 z => 2,
1558 force_w => $::WIDTH * 0.6, 1624 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1625 force_h => $::HEIGHT * 0.6,
1626 has_close_button => 1,
1560 ; 1627 ;
1628
1629 $METASERVER = metaserver_dialog;
1561 1630
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1631 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1632 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1633
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1634 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1638 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1639 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1640 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1641 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1642 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1643 "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 " 1644 . "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 " 1645 . "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. " 1646 . "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 " 1647 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes"); 1648 . "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, 1649 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1650 "Some debuggin' options. Do not ask.");
1584 1651
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1652 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586 1653
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1654 $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."); 1655 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, 1657 $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."); 1658 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592 1659
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 1660 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 1661
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, 1662 $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 :). " 1663 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 1664
1601 $BUTTONBAR->add (new CFClient::UI::Button 1665 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1666 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.", 1667 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 { 1668 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1669 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1670 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1671 status "Configuration Saved";
1672 0
1608 }, 1673 },
1609 ); 1674 );
1610 1675
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612 tooltip => "View Documentation"); 1677 tooltip => "View Documentation");
1613 1678
1614 $BUTTONBAR->add (new CFClient::UI::Button 1679 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Quit", 1680 text => "Quit",
1616 tooltip => "Terminates the program", 1681 tooltip => "Terminates the program",
… …
1618 if ($CONN) { 1683 if ($CONN) {
1619 open_quit_dialog; 1684 open_quit_dialog;
1620 } else { 1685 } else {
1621 exit; 1686 exit;
1622 } 1687 }
1688 0
1623 }, 1689 },
1624 ); 1690 );
1625 1691
1626 $BUTTONBAR->show; 1692 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1693 $SETUP_DIALOG->show;
… …
1629 1695
1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1696 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1631} 1697}
1632 1698
1633sub video_shutdown { 1699sub video_shutdown {
1700 CFClient::OpenGL::shutdown;
1701
1634 undef $SDL_ACTIVE; 1702 undef $SDL_ACTIVE;
1635} 1703}
1636 1704
1637my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1705my @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# 1706my $bgmusic;#TODO#hack#d#
… …
1854 1922
1855 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1923 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1856 CFClient::UI::set_layout ($::CFG->{layout}); 1924 CFClient::UI::set_layout ($::CFG->{layout});
1857 1925
1858 my %DEF_CFG = ( 1926 my %DEF_CFG = (
1859 sdl_mode => 0, 1927 sdl_mode => 0,
1860 width => 640, 1928 width => 640,
1861 height => 480, 1929 height => 480,
1862 fullscreen => 0, 1930 fullscreen => 0,
1863 fast => 0, 1931 fast => 0,
1864 map_scale => 1, 1932 map_scale => 1,
1865 fow_enable => 1, 1933 fow_enable => 1,
1866 fow_intensity => 0.45, 1934 fow_intensity => 0.45,
1867 fow_smooth => 0, 1935 fow_smooth => 0,
1868 gui_fontsize => 1, 1936 gui_fontsize => 1,
1869 log_fontsize => 0.7, 1937 log_fontsize => 0.7,
1870 gauge_fontsize=> 1, 1938 gauge_fontsize => 1,
1871 gauge_size => 0.35, 1939 gauge_size => 0.35,
1872 stat_fontsize => 0.7, 1940 stat_fontsize => 0.7,
1873 mapsize => 100, 1941 mapsize => 100,
1874 host => "crossfire.schmorp.de",
1875 say_command => 'say', 1942 say_command => 'say',
1876 audio_enable => 1, 1943 audio_enable => 1,
1877 bgm_enable => 1, 1944 bgm_enable => 1,
1878 bgm_volume => 0.25, 1945 bgm_volume => 0.25,
1879 face_prefetch => 0, 1946 face_prefetch => 0,
1880 output_sync => 1, 1947 output_sync => 1,
1881 output_count => 1, 1948 output_count => 1,
1882 pickup => 0, 1949 pickup => 0,
1950 default => "profile", # default profile
1951 );
1883 ); 1952
1884
1885 while (my ($k, $v) = each %DEF_CFG) { 1953 while (my ($k, $v) = each %DEF_CFG) {
1886 $CFG->{$k} = $v unless exists $CFG->{$k}; 1954 $CFG->{$k} = $v unless exists $CFG->{$k};
1887 } 1955 }
1956
1957 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1888 1958
1889 sdl_init; 1959 sdl_init;
1890 1960
1891 @SDL_MODES = reverse 1961 @SDL_MODES = reverse
1892 grep $_->[0] >= 640 && $_->[1] >= 480, 1962 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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