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.64 by root, Wed Jun 7 06:28:30 2006 UTC vs.
Revision 1.93 by root, Sat Jul 15 01:19:55 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $PICKUP_ENABLE;
92our $SERVER_INFO;
89 93
90our $SETUP_DIALOG; 94our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 95our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 96our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 97our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 98
99our $PL_NOTEBOOK;
96our $STATS_WINDOW; 100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
97our $MESSAGE_WINDOW; 107our $MESSAGE_WINDOW;
98our $FLOORBOX; 108our $FLOORBOX;
99our $GAUGES; 109our $GAUGES;
100our $STATWIDS; 110our $STATWIDS;
101 111
… …
108 118
109our $ALT_ENTER_MESSAGE; 119our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 120our $STATUSBOX;
111our $DEBUG_STATUS; 121our $DEBUG_STATUS;
112 122
113our $INV_WINDOW;
114our $INV; 123our $INV;
115our $INVR; 124our $INVR;
116our $INV_RIGHT_HB; 125our $INV_RIGHT_HB;
117 126
118our $BIND_EDITOR; 127our $BIND_EDITOR;
128our $BIND_UPD_CB;
119 129
120our $PICKUP_CFG; 130our $PICKUP_CFG;
121 131
122sub status { 132sub status {
123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 133 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
154 $hbox->add (new CFClient::UI::Button 164 $hbox->add (new CFClient::UI::Button
155 text => "No", 165 text => "No",
156 on_activate => sub { 166 on_activate => sub {
157 $conn->send ("reply n"); 167 $conn->send ("reply n");
158 $dialog->destroy; 168 $dialog->destroy;
169 0
159 } 170 }
160 ); 171 );
161 $hbox->add (new CFClient::UI::Button 172 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 173 text => "Yes",
163 on_activate => sub { 174 on_activate => sub {
164 $conn->send ("reply y"); 175 $conn->send ("reply y");
165 destroy_query_dialog $conn; 176 destroy_query_dialog $conn;
177 0
166 }, 178 },
167 ); 179 );
168 180
169 $dialog->focus_in; 181 $dialog->grab_focus;
170 182
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 183 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 184 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173 185
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 186 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
… …
184 $table->add (0, 0, new CFClient::UI::Button 196 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 197 text => "Next Race",
186 on_activate => sub { 198 on_activate => sub {
187 $conn->send ("reply n"); 199 $conn->send ("reply n");
188 destroy_query_dialog $conn; 200 destroy_query_dialog $conn;
201 0
189 }, 202 },
190 ); 203 );
191 $table->add (2, 0, new CFClient::UI::Button 204 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 205 text => "Accept",
193 on_activate => sub { 206 on_activate => sub {
194 $conn->send ("reply d"); 207 $conn->send ("reply d");
195 destroy_query_dialog $conn; 208 destroy_query_dialog $conn;
209 0
196 }, 210 },
197 ); 211 );
198 212
199 unshift @dialog, new CFClient::UI::Label 213 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 214 max_w => $::WIDTH * 0.4,
… …
214 $conn->send ("reply $stat"); 228 $conn->send ("reply $stat");
215 destroy_query_dialog $conn; 229 destroy_query_dialog $conn;
216 return; 230 return;
217 } 231 }
218 232
219 $STATS_WINDOW->show; 233 $STATS_PAGE->show;
220 $MESSAGE_WINDOW->hide; 234 $MESSAGE_WINDOW->hide;
221 235
222 unshift @dialog, new CFClient::UI::Label 236 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4, 237 max_w => $::WIDTH * 0.4,
224 ellipsise => 0, 238 ellipsise => 0,
… …
230 $table->add (0, 0, new CFClient::UI::Button 244 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 245 text => "Roll Again",
232 on_activate => sub { 246 on_activate => sub {
233 $conn->send ("reply y"); 247 $conn->send ("reply y");
234 destroy_query_dialog $conn; 248 destroy_query_dialog $conn;
249 0
235 }, 250 },
236 ); 251 );
237 252
238 # center: swap stats 253 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
… …
253 text => "Swap Stats", 268 text => "Swap Stats",
254 on_activate => sub { 269 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 270 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 271 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 272 destroy_query_dialog $conn;
273 0
258 }, 274 },
259 ); 275 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 276 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 277
262 # right: accept 278 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button 279 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept", 280 text => "Accept",
265 on_activate => sub { 281 on_activate => sub {
266 $conn->send ("reply n"); 282 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 283 $STATS_PAGE->hide;
268 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
285 0
269 }, 286 },
270 ); 287 );
271 288
272 unshift @dialog, new CFClient::UI::Label 289 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 290 max_w => $::WIDTH * 0.4,
… …
283 300
284 push @dialog, my $entry = new CFClient::UI::Entry 301 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 302 on_changed => sub {
286 $conn->send ("reply $_[1]"); 303 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 304 destroy_query_dialog $conn;
305 0
288 }, 306 },
289 ; 307 ;
290 308
291 $entry->focus_in; 309 $entry->grab_focus;
292 310
293 } else { 311 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 312 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295 313
296 push @dialog, my $entry = new CFClient::UI::Entry 314 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 315 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 316 on_activate => sub {
299 $conn->send ("reply $_[1]"); 317 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 318 destroy_query_dialog $conn;
319 0
301 }, 320 },
302 ; 321 ;
303 322
304 $entry->focus_in; 323 $entry->grab_focus;
305 } 324 }
306 325
307 $vbox->add (@dialog); 326 $vbox->add (@dialog);
308 $dialog->show; 327 $dialog->show;
309} 328}
… …
314 $LOGIN_BUTTON->set_text ("Logout"); 333 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 334 $SETUP_DIALOG->hide;
316 335
317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 336 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318 337
319 my ($host, $port) = split /:/, $CFG->{host}; 338 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 339
321 $MAP = new CFClient::Map $mapsize, $mapsize; 340 $MAP = new CFClient::Map $mapsize, $mapsize;
322 341
323 $CONN = eval { 342 $CONN = eval {
324 new CFClient::Protocol 343 new CFClient::Protocol
325 host => $host, 344 host => $host,
326 port => $port || 13327, 345 port => $port || 13327,
327 user => $CFG->{user}, 346 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 347 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 348 mapw => $mapsize,
330 maph => $mapsize, 349 maph => $mapsize,
331 350
332 map_widget => $MAPWIDGET, 351 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 352 logview => $LOGVIEW,
… …
361 380
362sub stop_game { 381sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 384 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 385 $PL_WINDOW->hide;
386 $SPELL_PAGE->clear_spells;
367 387
368 return unless $CONN; 388 return unless $CONN;
369 389
370 status "connection closed"; 390 status "connection closed";
371 391
372 destroy_query_dialog $CONN; 392 destroy_query_dialog $CONN;
373 $CONN->destroy; 393 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 394 $CONN = 0; # false, does not autovivify
395
396 undef $MAP;
375} 397}
376 398
377sub graphics_setup { 399sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 400 my $vbox = new CFClient::UI::VBox;
379 401
… …
397 419
398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 422 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 423 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 425 );
407 426
408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 428 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 429 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 430 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 432 );
417 433
418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419 $table->add (1, $row++, new CFClient::UI::Slider 435 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 439 );
427 440
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 441 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 443 state => $CFG->{fow_enable},
431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 444 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 446 );
437 447
438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439 $table->add (1, $row++, new CFClient::UI::Slider 449 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 450 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 451 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442 on_changed => sub { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 453 );
447 454
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 455 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 456 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 457 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 458 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub { 459 on_changed => sub {
453 my ($self, $value) = @_; 460 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 461 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 462 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
463 0
456 } 464 }
457 ); 465 );
458 466
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 470 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 471 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 472 );
465 473
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 477 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 );
472
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 }
482 ); 479 );
483 480
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 485 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 486 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 487 &set_gauge_window_fontsize;
488 0
491 } 489 }
492 ); 490 );
493 491
494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 494 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 495 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498 on_changed => sub { 496 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 497 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0
501 } 500 }
502 ); 501 );
503 502
504 $table->add (1, $row++, new CFClient::UI::Button 503 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 504 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 505 tooltip => "Apply the video settings",
507 on_activate => sub { 506 on_activate => sub {
508 video_shutdown (); 507 video_shutdown ();
509 video_init (); 508 video_init ();
509 0
510 } 510 }
511 ); 511 );
512 512
513 $vbox 513 $vbox
514} 514}
… …
522 522
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
527 on_changed => sub { 527 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 528 );
531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 529# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 530# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533# $CFG->{effects_volume} = $_[1]; 531# $CFG->{effects_volume} = $_[1];
534# }); 532# });
535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 533 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 534 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 535 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 536 expand => 1, state => $CFG->{bgm_enable},
539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 537 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540 on_changed => sub { 538 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 539 );
544 $hbox->add (new CFClient::UI::Slider 540 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 542 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 544 );
552 545
553 $table->add (1, $row++, new CFClient::UI::Button 546 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 547 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 548 tooltip => "Apply the audio settings",
556 on_activate => sub { 549 on_activate => sub {
557 audio_shutdown (); 550 audio_shutdown ();
558 audio_init (); 551 audio_init ();
552 0
559 } 553 }
560 ); 554 );
561 555
562 $vbox 556 $vbox
563}
564
565sub set_stats_window_fontsize {
566 for (values %{$STATWIDS}) {
567 $_->set_fontsize ($::CFG->{stat_fontsize});
568 }
569} 557}
570 558
571sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
572 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
573 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
625 &set_gauge_window_fontsize; 613 &set_gauge_window_fontsize;
626 614
627 $win 615 $win
628} 616}
629 617
618sub debug_setup {
619 my $table = new CFClient::UI::Table;
620
621 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
622 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
623 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
624 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
625 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
626 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
627 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
628 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
629
630 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
631
632 for my $x (0..2) {
633 for my $y (0 .. 2) {
634 $table->add ($x + 3, $y,
635 new CFClient::UI::Entry
636 text => $default_smooth[$x * 3 + $y],
637 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
638 );
639 }
640 }
641
642
643 $table
644}
630 645
631sub stats_window { 646sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 647 my $vb = new CFClient::UI::VBox;
633 y => $HEIGHT * (2/8),
634 x => "max",
635 title => "Stats",
636 name => "stats_window";
637 648
638 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
639 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640 can_hover => 1, can_events => 1, 650 can_hover => 1, can_events => 1,
641 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 651 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
642 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
643 can_hover => 1, can_events => 1, 653 can_hover => 1, can_events => 1,
… …
667 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
668 678
669 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 679 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
670 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 680 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
671 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 681 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
672 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 682 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
673 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 683 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
674 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 684 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
675 ) { 685 ) {
676 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
677 687
… …
679 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 689 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
680 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 690 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
681 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 691 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
682 } 692 }
683 693
684 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
685 695
686 my $row = 0; 696 my $row = 0;
687 my $col = 0; 697 my $col = 0;
688 698
689 my %resist_names = ( 699 my %resist_names = (
700 slow => ["Slow",
690 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 701 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
702 holyw => ["Holy Word",
691 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 703 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
704 conf => ["Confusion",
692 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 705 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
706 fire => ["Fire",
693 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 707 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
708 depl => ["Depletion",
694 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 709 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
710 magic => ["Magic",
695 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 711 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
712 drain => ["Draining",
696 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 713 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
714 acid => ["Acid",
697 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 715 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
716 pois => ["Poison",
698 pois => "<b>Poison</b> (resistance to getting poisoned)", 717 "<b>Poison</b> (resistance to getting poisoned)"],
718 para => ["Paralysation",
699 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 719 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
720 deat => ["Death",
700 deat => "<b>Death</b> (resistance against death spells)", 721 "<b>Death</b> (resistance against death spells)"],
701 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 722 phys => ["Physical",
723 "<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.)"],
724 blind => ["Blind",
702 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 725 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
726 fear => ["Fear",
703 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)", 727 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
728 tund => ["Turn undead",
704 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
730 elec => ["Electricity",
705 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 731 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
732 cold => ["Cold",
706 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 733 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
734 ghit => ["Ghost hit",
707 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 735 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
708 ); 736 );
709 for (qw/slow holyw conf fire depl magic 737 for (qw/slow holyw conf fire depl magic
710 drain acid pois para deat phys 738 drain acid pois para deat phys
711 blind fear tund elec cold ghit/) 739 blind fear tund elec cold ghit/)
712 { 740 {
… …
717 template => "-100%", 745 template => "-100%",
718 align => +1, 746 align => +1,
719 valign => 0, 747 valign => 0,
720 can_events => 1, 748 can_events => 1,
721 can_hover => 1, 749 can_hover => 1,
722 tooltip => $resist_names{$_}, 750 tooltip => $resist_names{$_}->[1],
723 ); 751 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
725 font => $FONT_FIXED, 753 font => $FONT_FIXED,
726 can_hover => 1, 754 can_hover => 1,
727 can_events => 1, 755 can_events => 1,
728 image => "ui/resist/resist_$_.png", 756 path => "ui/resist/resist_$_.png",
729 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
758 );
759 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
760 text => $resist_names{$_}->[0],
761 font => $FONT_FIXED,
762 can_hover => 1,
763 can_events => 1,
764 tooltip => $resist_names{$_}->[1],
730 ); 765 );
731 766
732 $row++; 767 $row++;
733 if ($row % 6 == 0) { 768 if ($row % 6 == 0) {
734 $col += 2; 769 $col += 3;
735 $row = 0; 770 $row = 0;
736 } 771 }
737 } 772 }
738 773
739 &set_stats_window_fontsize;
740 update_stats_window ({}); 774 update_stats_window ({});
741 775
742 $tgw 776 $vb
777}
778
779sub skill_window {
780 my ($self) = @_;
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
743} 782}
744 783
745sub formsep($) { 784sub formsep($) {
746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
747} 786}
… …
781 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 820 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
782 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 821 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
783 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 822 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
784 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 823 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
785 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 824 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
786 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 825 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 826 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 827 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789 828
790 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 829 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791 830
792 # TODO: replace by CS_STAT_RES_xxx constants
793 my %tbl = ( 831 my %tbl = (
794 phys => 100, 832 phys => CS_STAT_RES_PHYS,
795 magic => 101, 833 magic => CS_STAT_RES_MAG,
796 fire => 102, 834 fire => CS_STAT_RES_FIRE,
797 elec => 103, 835 elec => CS_STAT_RES_ELEC,
798 cold => 104, 836 cold => CS_STAT_RES_COLD,
799 conf => 105, 837 conf => CS_STAT_RES_CONF,
800 acid => 106, 838 acid => CS_STAT_RES_ACID,
801 drain => 107, 839 drain => CS_STAT_RES_DRAIN,
802 ghit => 108, 840 ghit => CS_STAT_RES_GHOSTHIT,
803 pois => 109, 841 pois => CS_STAT_RES_POISON,
804 slow => 110, 842 slow => CS_STAT_RES_SLOW,
805 para => 111, 843 para => CS_STAT_RES_PARA,
806 tund => 112, 844 tund => CS_STAT_TURN_UNDEAD,
807 fear => 113, 845 fear => CS_STAT_RES_FEAR,
808 depl => 113, 846 depl => CS_STAT_RES_DEPLETE,
809 deat => 115, 847 deat => CS_STAT_RES_DEATH,
810 holyw => 116, 848 holyw => CS_STAT_RES_HOLYWORD,
811 blind => 117, 849 blind => CS_STAT_RES_BLIND,
812 ); 850 );
851
852 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
853 my $sktbl = $STATWIDS->{_skill_tbl};
854 $sktbl->clear;
855
856 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
857 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
858 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
859
860 my @skills;
861
862 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
863 push @skills, [$i, $::CONN->{skill_info}{$i}];
864 }
865
866 my $y = 1;
867 for (sort { $a->[1] cmp $b->[1] } @skills) {
868 my ($idx, $name) = @$_;
869
870 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
871 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
872 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
874 }
875 }
876
877 $STATWIDS->{_skill_tbl_init} = 1;
878 }
879
880 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
881 if (exists $stats->{$i}) {
882 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
883 if $STATWIDS->{"sk_xp_$i"};
884 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
885 if $STATWIDS->{"sk_lvl_$i"};
886 }
887 }
813 888
814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 889 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815 for keys %tbl; 890 for keys %tbl;
816} 891}
817 892
818my $METASERVER_ATIME; 893my $METASERVER_ATIME;
819 894
820sub update_metaserver { 895sub update_metaserver {
896 my ($metaserver_dialog) = @_;
897
898 $METASERVER = $metaserver_dialog
899 if defined $metaserver_dialog;
900
821 return if $METASERVER_ATIME > time; 901 return if $METASERVER_ATIME > time;
822 $METASERVER_ATIME = time + 60; 902 $METASERVER_ATIME = time + 60;
823 903
824 my $table = $METASERVER->{table}; 904 my $table = $METASERVER->{table};
825 $table->clear; 905 $table->clear;
… …
890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 970 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
891 (new CFClient::UI::Button 971 (new CFClient::UI::Button
892 text => "Use", 972 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field", 973 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub { 974 on_activate => sub {
895 $HOST_ENTRY->set_text ($CFG->{host} = $host); 975 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
896 $METASERVER->hide; 976 $METASERVER->hide;
977 0
897 }, 978 },
898 ), 979 ),
899 (new CFClient::UI::Empty expand => 1), 980 (new CFClient::UI::Empty expand => 1),
900 ]); 981 ]);
901 982
… …
912 } 993 }
913 }); 994 });
914} 995}
915 996
916sub metaserver_dialog { 997sub metaserver_dialog {
998 my $vbox = new CFClient::UI::VBox;
999 my $table = new CFClient::UI::Table;
1000 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
1001
917 my $dialog = new CFClient::UI::FancyFrame 1002 my $dialog = new CFClient::UI::FancyFrame
918 title => "Server List", 1003 title => "Server List",
919 name => 'metaserver_dialog', 1004 name => 'metaserver_dialog',
920 x => 'center', 1005 x => 'center',
921 y => 'center', 1006 y => 'center',
922 z => 3, 1007 z => 3,
923 force_h => $::HEIGHT * 0.4, 1008 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox), 1009 child => $vbox,
1010 has_close_button => 1,
1011 table => $table,
925 on_visibility_change => sub { 1012 on_visibility_change => sub {
926 update_metaserver if $_[1]; 1013 update_metaserver ($_[0]) if $_[1];
1014 0
927 }, 1015 },
928 ; 1016 ;
929
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933 1017
934 $dialog 1018 $dialog
935} 1019}
936 1020
937sub server_setup { 1021sub server_setup {
… …
944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1028 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
945 1029
946 $vbox->add ( 1030 $vbox->add (
947 $HOST_ENTRY = new CFClient::UI::Entry 1031 $HOST_ENTRY = new CFClient::UI::Entry
948 expand => 1, 1032 expand => 1,
949 text => $CFG->{host}, 1033 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1034 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 1035 on_changed => sub {
952 my ($self, $value) = @_; 1036 my ($self, $value) = @_;
953 $CFG->{host} = $value; 1037 $CFG->{profile}{default}{host} = $value;
1038 0
954 } 1039 }
955 ); 1040 );
956
957 $METASERVER = metaserver_dialog;
958 1041
959 $vbox->add (new CFClient::UI::Button 1042 $vbox->add (new CFClient::UI::Button
960 expand => 1, 1043 expand => 1,
961 text => "Server List", 1044 text => "Server List",
962 other => $METASERVER, 1045 other => $METASERVER,
963 tooltip => "Show a list of available crossfire servers", 1046 tooltip => "Show a list of available crossfire servers",
964 on_activate => sub { $METASERVER->toggle_visibility }, 1047 on_activate => sub { $METASERVER->toggle_visibility; 0 },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1048 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
966 ); 1049 );
967 } 1050 }
968 1051
969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1052 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
970 $table->add (1, 4, new CFClient::UI::Entry 1053 $table->add (1, 4, new CFClient::UI::Entry
971 text => $CFG->{user}, 1054 text => $CFG->{profile}{default}{user},
972 tooltip => "The name of your character on the server", 1055 tooltip => "The name of your character on the server",
973 on_changed => sub { 1056 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
974 my ($self, $value) = @_;
975 $CFG->{user} = $value;
976 }
977 ); 1057 );
978 1058
979 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1059 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
980 $table->add (1, 5, new CFClient::UI::Entry 1060 $table->add (1, 5, new CFClient::UI::Entry
981 text => $CFG->{password}, 1061 text => $CFG->{profile}{default}{password},
982 hidden => 1, 1062 hidden => 1,
983 tooltip => "The password for your character", 1063 tooltip => "The password for your character",
984 on_changed => sub { 1064 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
985 my ($self, $value) = @_;
986 $CFG->{password} = $value;
987 }
988 ); 1065 );
989 1066
990 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1067 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
991 $table->add (1, 7, new CFClient::UI::Slider 1068 $table->add (1, 7, new CFClient::UI::Slider
992 force_w => 100, 1069 force_w => 100,
993 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1070 range => [$CFG->{mapsize}, 10, 100, 0, 1],
994 tooltip => "This is the size of the portion of the map update the server sends you. " 1071 tooltip => "This is the size of the portion of the map update the server sends you. "
995 . "If you set this to a high value you will be able to see further, " 1072 . "If you set this to a high value you will be able to see further, "
996 . "but you also increase bandwidth requirements and latency. " 1073 . "but you also increase bandwidth requirements and latency. "
997 . "This option is only used once at log-in.", 1074 . "This option is only used once at log-in.",
998 on_changed => sub { 1075 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
999 my ($self, $value) = @_;
1000
1001 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1002 },
1003 ); 1076 );
1004 1077
1005 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1078 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1079 $table->add (1, 8, new CFClient::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1080 state => $CFG->{face_prefetch},
… …
1010 . "This might increase or create lag, but increases the chances " 1083 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1084 . "of faces being ready for display when you encounter them. "
1012 . "It also uses up server bandwidth on every connect, " 1085 . "It also uses up server bandwidth on every connect, "
1013 . "so only set it if you really need to prefetch images. " 1086 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1087 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1088 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1089 );
1017 1090
1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1091 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1019 $table->add (1, 9, new CFClient::UI::Entry 1092 $table->add (1, 9, new CFClient::UI::Entry
1020 text => $CFG->{output_count}, 1093 text => $CFG->{output_count},
1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022 on_changed => sub { $CFG->{output_count} = $_[1] }, 1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1096 );
1024 1097
1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1098 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026 $table->add (1, 10, new CFClient::UI::Entry 1099 $table->add (1, 10, new CFClient::UI::Entry
1027 text => $CFG->{output_sync}, 1100 text => $CFG->{output_sync},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1103 );
1031 1104
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1105 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1033 expand => 1, 1106 expand => 1,
1034 align => 0, 1107 align => 0,
1035 text => "Login", 1108 text => "Login",
1036 on_activate => sub { 1109 on_activate => sub {
1037 $CONN ? stop_game 1110 $CONN ? stop_game
1038 : start_game; 1111 : start_game;
1112 0
1039 }, 1113 },
1040 ); 1114 );
1041 1115
1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1116 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1117 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1120 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1121 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub { 1122 on_changed => sub {
1049 my ($self, $value) = @_; 1123 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value; 1124 $CFG->{say_command} = $value;
1125 0
1051 } 1126 }
1052 ); 1127 );
1128
1129 $vbox->add (new CFClient::UI::Label
1130 text => "Server Info",
1131 fontsize => 1.2,
1132 padding_y => 8,
1133 fg => [1, 1, 0, 1],
1134 );
1135
1136 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1053 1137
1054 $vbox 1138 $vbox
1055} 1139}
1056 1140
1057sub message_window { 1141sub message_window {
1058 my $window = new CFClient::UI::FancyFrame 1142 my $window = new CFClient::UI::FancyFrame
1059 name => "message_window", 1143 name => "message_window",
1060 title => "Messages", 1144 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1145 border_bg => [1, 1, 1, 1],
1062 bg => [0, 0, 0, 0.75],
1063 x => "max", 1146 x => "max",
1064 y => 0, 1147 y => 0,
1065 force_w => $::WIDTH * 0.4, 1148 force_w => $::WIDTH * 0.4,
1066 force_h => $::HEIGHT * 0.5, 1149 force_h => $::HEIGHT * 0.5,
1067 child => (my $vbox = new CFClient::UI::VBox); 1150 child => (my $vbox = new CFClient::UI::VBox),
1151 has_close_button => 1;
1068 1152
1069 $vbox->add ($LOGVIEW); 1153 $vbox->add ($LOGVIEW);
1070 1154
1071 $vbox->add (my $input = new CFClient::UI::Entry 1155 $vbox->add (my $input = new CFClient::UI::Entry
1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1156 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1080 1164
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1165 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1; 1166 $input->{refocus_map} = 1;
1083 } 1167 }
1084 delete $input->{auto_activated}; 1168 delete $input->{auto_activated};
1169
1170 0
1085 }, 1171 },
1086 on_activate => sub { 1172 on_activate => sub {
1087 my ($input, $text) = @_; 1173 my ($input, $text) = @_;
1088 $input->set_text (''); 1174 $input->set_text ('');
1089 1175
… …
1095 } 1181 }
1096 if ($input->{refocus_map}) { 1182 if ($input->{refocus_map}) {
1097 delete $input->{refocus_map}; 1183 delete $input->{refocus_map};
1098 $MAPWIDGET->focus_in 1184 $MAPWIDGET->focus_in
1099 } 1185 }
1186
1187 0
1100 }, 1188 },
1101 on_escape => sub { 1189 on_escape => sub {
1102 $MAPWIDGET->focus_in 1190 $MAPWIDGET->grab_focus;
1191
1192 0
1103 }, 1193 },
1104 ); 1194 );
1105 1195
1106 $CONSOLE = { 1196 $CONSOLE = {
1107 window => $window, 1197 window => $window,
… …
1129 ); 1219 );
1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1220 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1131 $hb->add (new CFClient::UI::Button 1221 $hb->add (new CFClient::UI::Button
1132 text => "Ok", 1222 text => "Ok",
1133 expand => 1, 1223 expand => 1,
1134 on_activate => sub { $QUIT_DIALOG->hide }, 1224 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1135 ); 1225 );
1136 $hb->add (new CFClient::UI::Button 1226 $hb->add (new CFClient::UI::Button
1137 text => "Quit anyway", 1227 text => "Quit anyway",
1138 expand => 1, 1228 expand => 1,
1139 on_activate => sub { exit }, 1229 on_activate => sub { exit },
… …
1146sub autopickup_setup { 1236sub autopickup_setup {
1147 my $table = new CFClient::UI::Table; 1237 my $table = new CFClient::UI::Table;
1148 1238
1149 for ( 1239 for (
1150 ["General", 0, 0, 1240 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE], 1241 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT], 1242 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP], 1243 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG], 1244 ["Debug autopickup" => PICKUP_DEBUG],
1155 ], 1245 ],
1156 ["Weapons", 0, 6, 1246 ["Weapons", 0, 6,
… …
1182 ["Potions" => PICKUP_POTION], 1272 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1273 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED], 1274 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS], 1275 ["Jewelery" => PICKUP_JEWELS],
1186 ], 1276 ],
1277 ["Weight/Value ratio", 2, 17]
1187 ) 1278 )
1188 { 1279 {
1189 my ($title, $x, $y, @bits) = @$_; 1280 my ($title, $x, $y, @bits) = @$_;
1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1281 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1191 1282
1192 for (@bits) { 1283 for (@bits) {
1193 ++$y; 1284 ++$y;
1194 1285
1195 my $mask = $_->[1]; 1286 my $mask = $_->[1];
1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1287 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1288 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1198 state => $CFG->{pickup} & $mask, 1289 state => $::CFG->{pickup} & $mask,
1199 on_changed => sub { 1290 on_changed => sub {
1200 my ($box, $value) = @_; 1291 my ($box, $value) = @_;
1201 1292
1202 if ($value) { 1293 if ($value) {
1203 $::CFG->{pickup} |= $mask; 1294 $::CFG->{pickup} |= $mask;
… …
1205 $::CFG->{pickup} &= ~$mask; 1296 $::CFG->{pickup} &= ~$mask;
1206 } 1297 }
1207 1298
1208 $::CONN->send_command ("pickup $::CFG->{pickup}") 1299 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN; 1300 if defined $::CONN;
1301
1302 0
1210 }); 1303 });
1304
1305 ${$_->[2]} = $checkbox if $_->[2];
1211 } 1306 }
1212 } 1307 }
1213 1308
1309 $table->add (2, 18, new CFClient::UI::ValSlider
1310 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1311 template => ">= 99",
1312 to_value => sub { ">= " . 5 * $_[0] },
1313 on_changed => sub {
1314 my ($slider, $value) = @_;
1315
1316 $::CFG->{pickup} &= ~0xF;
1317 $::CFG->{pickup} |= int $value
1318 if $value;
1319 1;
1320 });
1321
1322 $table->add (3, 18, new CFClient::UI::Button
1323 text => "set",
1324 on_activate => sub {
1325 $::CONN->send_command ("pickup $::CFG->{pickup}")
1326 if defined $::CONN;
1327 0
1328 });
1329
1214 $table 1330 $table
1215} 1331}
1216 1332
1217sub inventory_window { 1333sub inventory_widget {
1334 my $hb = new CFClient::UI::HBox homogeneous => 1;
1335
1336 $hb->add (my $vb1 = new CFClient::UI::VBox);
1337 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1338 $vb1->add ($INV = new CFClient::UI::Inventory);
1339
1340 $hb->add (my $vb2 = new CFClient::UI::VBox);
1341
1342 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1343
1344 $vb2->add ($INVR = new CFClient::UI::Inventory);
1345
1346 # XXX: Call after $INVR = ... because set_opencont sets the items
1347 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1348
1349 $hb
1350}
1351
1352sub toggle_player_page {
1353 my ($widget) = @_;
1354
1355 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1356 $PL_WINDOW->hide;
1357 } else {
1358 $PL_NOTEBOOK->set_current_page ($widget);
1359 $PL_WINDOW->show;
1360 }
1361}
1362
1363sub player_window {
1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1364 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1219 x => "center", 1365 x => "center",
1220 y => "center", 1366 y => "center",
1221 force_w => $WIDTH * 9/10, 1367 force_w => $WIDTH * 9/10,
1222 force_h => $HEIGHT * 9/10, 1368 force_h => $HEIGHT * 9/10,
1223 title => "Inventory", 1369 title => "Player",
1370 name => "playerbook",
1371 has_close_button => 1
1224 ; 1372 ;
1225 1373
1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1374 my $ntb =
1375 $PL_NOTEBOOK =
1376 new CFClient::UI::Notebook
1377 expand => 1,
1378 debug => 1,
1379 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1380 ;
1227 1381
1228 $hb->add (my $vb1 = new CFClient::UI::VBox); 1382 $ntb->add (
1229 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1383 "Stats" => $STATS_PAGE = stats_window,
1230 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1384 "Shows statistics, where all your Stats and Resistances are shown."
1385 );
1386 $ntb->add (
1387 "Skills" => $STATS_PAGE = skill_window,
1388 "Shows all your Skills."
1389 );
1390 $ntb->add (
1391 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1392 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1393 );
1394 $ntb->add (
1395 Inventory => $INVENTORY_PAGE = inventory_widget,
1396 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1397 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1398 );
1231 1399
1232 $hb->add (my $vb2 = new CFClient::UI::VBox); 1400 $ntb->set_current_page ($INVENTORY_PAGE);
1233 1401
1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1402 $plwin->add ($ntb);
1235 1403 $plwin
1236 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1237
1238 # XXX: Call after $INVR = ... because set_opencont sets the items
1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1240
1241 $invwin
1242} 1404}
1243 1405
1244sub spell_setup { 1406sub update_bindings {
1245 new CFClient::UI::SpellList 1407 $BIND_UPD_CB->() if $BIND_UPD_CB;
1246} 1408}
1247 1409
1248sub keyboard_setup { 1410sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox; 1411 my $binding_list = new CFClient::UI::VBox;
1250 1412
1251 my $refresh; 1413 my $refresh;
1252 $refresh = sub { 1414 $refresh = $BIND_UPD_CB = sub {
1253 $binding_list->clear (); 1415 $binding_list->clear ();
1254 1416
1255 for my $mod (keys %{$::CFG->{bindings}}) { 1417 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1418 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1419 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1420 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259 1421
1260 my $lbl = join "; ", @$cmds; 1422 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1423 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox); 1424 $binding_list->add (my $hb = new CFClient::UI::HBox);
1263 $hb->add (new CFClient::UI::Button 1425 $hb->add (new CFClient::UI::Button
1264 text => "delete", 1426 text => "delete",
1265 tooltip => "Deletes the binding", 1427 tooltip => "Deletes the binding",
1266 on_activate => sub { 1428 on_activate => sub {
1267 $binding_list->remove ($hb); 1429 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym}; 1430 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1431 0
1269 }); 1432 });
1270 1433
1271 $hb->add (new CFClient::UI::Button 1434 $hb->add (new CFClient::UI::Button
1272 text => "edit", 1435 text => "edit",
1273 tooltip => "Edits the binding", 1436 tooltip => "Edits the binding",
1274 on_activate => sub { 1437 on_activate => sub {
1275 $::BIND_EDITOR->set_binding ( 1438 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1439 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1277 sub { 1440 sub {
1278 my ($nmod, $nsym, $ncmds) = @_; 1441 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym}; 1442 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1443 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1281 $refresh->(); 1444 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1445 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show; 1446 $SETUP_DIALOG->show;
1284 }, 1447 },
1285 sub { 1448 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1449 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show; 1450 $SETUP_DIALOG->show;
1288 }); 1451 });
1289 $::BIND_EDITOR->show; 1452 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide; 1453 $SETUP_DIALOG->hide;
1454 0
1291 }); 1455 });
1292 1456
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1457 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1458 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1295 } 1459 }
1296 } 1460 }
1297 }; 1461 };
1298 1462
1299 my $vb = new CFClient::UI::VBox; 1463 my $vb = new CFClient::UI::VBox;
1464 $vb->add (my $hb = new CFClient::UI::HBox);
1465 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1466 $hb->add (new CFClient::UI::CheckBox
1467 expand => 1,
1468 state => $CFG->{shift_fire_stop},
1469 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1470 on_changed => sub {
1471 my ($cbox, $value) = @_;
1472 $CFG->{shift_fire_stop} = $value;
1473 0
1474 });
1475
1300 $vb->add ($binding_list); 1476 $vb->add ($binding_list);
1301 $vb->add (my $hb = new CFClient::UI::HBox); 1477 $vb->add (my $hb = new CFClient::UI::HBox);
1302 1478
1303 $hb->add (new CFClient::UI::Button 1479 $hb->add (new CFClient::UI::Button
1304 text => "record new", 1480 text => "record new",
… …
1306 tooltip => "This button opens the binding editor with an empty binding.", 1482 tooltip => "This button opens the binding editor with an empty binding.",
1307 on_activate => sub { 1483 on_activate => sub {
1308 $::BIND_EDITOR->set_binding (undef, undef, [], 1484 $::BIND_EDITOR->set_binding (undef, undef, [],
1309 sub { 1485 sub {
1310 my ($mod, $sym, $cmds) = @_; 1486 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1487 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1312 $refresh->(); 1488 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1489 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1490 $SETUP_DIALOG->show;
1315 }, 1491 },
1316 sub { 1492 sub {
… …
1318 $SETUP_DIALOG->show; 1494 $SETUP_DIALOG->show;
1319 }, 1495 },
1320 ); 1496 );
1321 $SETUP_DIALOG->hide; 1497 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show; 1498 $::BIND_EDITOR->show;
1499 0
1323 }, 1500 },
1324 ); 1501 );
1325 1502
1326 $hb->add (new CFClient::UI::Button 1503 $hb->add (new CFClient::UI::Button
1327 text => "close", 1504 text => "close",
1328 tooltip => "Closes the binding window", 1505 tooltip => "Closes the binding window",
1329 expand => 1, 1506 expand => 1,
1330 on_activate => sub { 1507 on_activate => sub {
1331 $SETUP_DIALOG->hide; 1508 $SETUP_DIALOG->hide;
1509 0
1332 } 1510 }
1333 ); 1511 );
1334 1512
1335 $refresh->(); 1513 $refresh->();
1336 1514
… …
1343 y => 'center', 1521 y => 'center',
1344 z => 2, 1522 z => 2,
1345 name => 'doc_browser', 1523 name => 'doc_browser',
1346 force_w => int $WIDTH * 7/8, 1524 force_w => int $WIDTH * 7/8,
1347 force_h => int $HEIGHT * 7/8, 1525 force_h => int $HEIGHT * 7/8,
1348 title => "Documentation"; 1526 title => "Help Browser",
1527 has_close_button => 1;
1349 1528
1350 $win->add (my $vbox = new CFClient::UI::VBox); 1529 $win->add (my $vbox = new CFClient::UI::VBox);
1351 1530
1352 $vbox->add (my $buttons = new CFClient::UI::HBox); 1531 $vbox->add (my $buttons = new CFClient::UI::HBox);
1353 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1532 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1356 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1535 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1357 $buttons->add (my $combo = new CFClient::UI::Combobox 1536 $buttons->add (my $combo = new CFClient::UI::Combobox
1358 value => undef, 1537 value => undef,
1359 options => [ 1538 options => [
1360 [intro => "Introduction"], 1539 [intro => "Introduction"],
1361 [manual => "Manual"], 1540 [manual => "Main Manual"],
1362 [skill_help => "Skills"], 1541 [skill_help => "Skill Reference"],
1363 [command_help => "Commands"], 1542 [command_help => "Command Reference"],
1364 [dmcommand_help => "DM Commands"], 1543 [dmcommand_help => "DM Commands"],
1365 [COPYING => "License Terms"], 1544 [COPYING => "License Terms"],
1366 ], 1545 ],
1367 on_changed => sub { 1546 on_changed => sub {
1368 my ($self, $pod) = @_; 1547 my ($self, $pod) = @_;
1369 1548
1370 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1549 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1371 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1550 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1372 1551
1373 $viewer->clear; 1552 $viewer->clear;
1553
1554# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1555# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1556# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1557# ]);#d#
1374 1558
1375 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1559 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1376 for @$pom; 1560 for @$pom;
1377 1561
1378 $viewer->set_offset (0); 1562 $viewer->set_offset (0);
1563
1564 0
1379 }, 1565 },
1380 on_visibility_change => sub { 1566 on_visibility_change => sub {
1381 my ($self, $visible) = @_; 1567 my ($self, $visible) = @_;
1382 return unless $visible; 1568 return unless $visible;
1383 return if $self->{value}; 1569 return if $self->{value};
1384 $self->set_value ("intro"); 1570 $self->set_value ("intro");
1571 0
1385 }, 1572 },
1386 ); 1573 );
1387 1574
1388 $win 1575 $win
1389} 1576}
… …
1428 z => 100, 1615 z => 100,
1429 force_x => "max", 1616 force_x => "max",
1430 force_y => 0; 1617 force_y => 0;
1431 $DEBUG_STATUS->show; 1618 $DEBUG_STATUS->show;
1432 1619
1433 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1620 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1434 1621
1435 $STATUSBOX = new CFClient::UI::Statusbox; 1622 $STATUSBOX = new CFClient::UI::Statusbox;
1436 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1623 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1437 1624
1438 (new CFClient::UI::Frame 1625 (new CFClient::UI::Frame
… …
1458 $MAPWIDGET->connect (activate_console => sub { 1645 $MAPWIDGET->connect (activate_console => sub {
1459 my ($mapwidget, $preset) = @_; 1646 my ($mapwidget, $preset) = @_;
1460 1647
1461 if ($CONSOLE) { 1648 if ($CONSOLE) {
1462 $CONSOLE->{input}->{auto_activated} = 1; 1649 $CONSOLE->{input}->{auto_activated} = 1;
1463 $CONSOLE->{input}->focus_in; 1650 $CONSOLE->{input}->grab_focus;
1464 1651
1465 if ($preset && $CONSOLE->{input}->get_text eq '') { 1652 if ($preset && $CONSOLE->{input}->get_text eq '') {
1466 $CONSOLE->{input}->set_text ($preset); 1653 $CONSOLE->{input}->set_text ($preset);
1467 } 1654 }
1468 } 1655 }
1469 }); 1656 });
1470 $MAPWIDGET->show; 1657 $MAPWIDGET->show;
1471 $MAPWIDGET->focus_in; 1658 $MAPWIDGET->grab_focus;
1472 1659
1473 $LOGVIEW = new CFClient::UI::TextScroller 1660 $LOGVIEW = new CFClient::UI::TextScroller
1474 expand => 1, 1661 expand => 1,
1475 font => $FONT_FIXED, 1662 font => $FONT_FIXED,
1476 fontsize => $::CFG->{log_fontsize}, 1663 fontsize => $::CFG->{log_fontsize},
… …
1486 x => 'center', 1673 x => 'center',
1487 y => 'center', 1674 y => 'center',
1488 z => 2, 1675 z => 2,
1489 force_w => $::WIDTH * 0.6, 1676 force_w => $::WIDTH * 0.6,
1490 force_h => $::HEIGHT * 0.6, 1677 force_h => $::HEIGHT * 0.6,
1678 has_close_button => 1,
1491 ; 1679 ;
1680
1681 $METASERVER = metaserver_dialog;
1492 1682
1493 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1683 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1494 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1684 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1495 1685
1496 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1686 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1500 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1690 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1501 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1691 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1502 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1692 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1503 "Configure the use of audio, sound effects and background music."); 1693 "Configure the use of audio, sound effects and background music.");
1504 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1694 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1505 "Lets you define, edit and delete bindings." 1695 "Lets you define, edit and delete key bindings."
1506 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1696 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1507 . "with nothing set and the recording started. After doing the actions you " 1697 . "with nothing set and the recording started. After doing the actions you "
1508 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1698 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1509 . "After pressing the combo the binding will be saved automatically and the " 1699 . "After pressing the combo the binding will be saved automatically and the "
1510 . "binding editor closes"); 1700 . "binding editor closes");
1511 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1701 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1512 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1702 "Some debuggin' options. Do not ask.");
1513 1703
1514 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1704 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1515 1705
1516 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1706 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1517 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1707 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1709 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1520 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1710 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1521 1711
1522 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 1712 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
1523 1713
1524 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1525 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1526 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1714 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1527 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1715 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1528 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1529 1716
1530 $BUTTONBAR->add (new CFClient::UI::Button 1717 $BUTTONBAR->add (new CFClient::UI::Button
1531 text => "Save Config", 1718 text => "Save Config",
1532 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1719 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1533 on_activate => sub { 1720 on_activate => sub {
1534 $::CFG->{layout} = CFClient::UI::get_layout; 1721 $::CFG->{layout} = CFClient::UI::get_layout;
1535 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1722 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1536 status "Configuration Saved"; 1723 status "Configuration Saved";
1724 0
1537 }, 1725 },
1538 ); 1726 );
1539 1727
1540 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1728 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1541 tooltip => "View Documentation"); 1729 tooltip => "View Documentation");
1542 1730
1543 $BUTTONBAR->add (new CFClient::UI::Button 1731 $BUTTONBAR->add (new CFClient::UI::Button
1544 text => "Quit", 1732 text => "Quit",
1545 tooltip => "Terminates the program", 1733 tooltip => "Terminates the program",
… …
1547 if ($CONN) { 1735 if ($CONN) {
1548 open_quit_dialog; 1736 open_quit_dialog;
1549 } else { 1737 } else {
1550 exit; 1738 exit;
1551 } 1739 }
1740 0
1552 }, 1741 },
1553 ); 1742 );
1554 1743
1555 $BUTTONBAR->show; 1744 $BUTTONBAR->show;
1556 $SETUP_DIALOG->show; 1745 $SETUP_DIALOG->show;
… …
1558 1747
1559 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1748 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1560} 1749}
1561 1750
1562sub video_shutdown { 1751sub video_shutdown {
1752 CFClient::OpenGL::shutdown;
1753
1563 undef $SDL_ACTIVE; 1754 undef $SDL_ACTIVE;
1564} 1755}
1565 1756
1566my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1757my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1567my $bgmusic;#TODO#hack#d# 1758my $bgmusic;#TODO#hack#d#
… …
1783 1974
1784 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1785 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
1786 1977
1787 my %DEF_CFG = ( 1978 my %DEF_CFG = (
1788 sdl_mode => 0, 1979 sdl_mode => 0,
1789 width => 640, 1980 width => 640,
1790 height => 480, 1981 height => 480,
1791 fullscreen => 0, 1982 fullscreen => 0,
1792 fast => 0, 1983 fast => 0,
1793 map_scale => 1, 1984 map_scale => 1,
1794 fow_enable => 1, 1985 fow_enable => 1,
1795 fow_intensity => 0.45, 1986 fow_intensity => 0.45,
1796 fow_smooth => 0, 1987 fow_smooth => 0,
1797 gui_fontsize => 1, 1988 gui_fontsize => 1,
1798 log_fontsize => 0.7, 1989 log_fontsize => 0.7,
1799 gauge_fontsize=> 1, 1990 gauge_fontsize => 1,
1800 gauge_size => 0.35, 1991 gauge_size => 0.35,
1801 stat_fontsize => 0.7, 1992 stat_fontsize => 0.7,
1802 mapsize => 100, 1993 mapsize => 100,
1803 host => "crossfire.schmorp.de",
1804 say_command => 'say', 1994 say_command => 'say',
1805 audio_enable => 1, 1995 audio_enable => 1,
1806 bgm_enable => 1, 1996 bgm_enable => 1,
1807 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1808 face_prefetch => 0, 1998 face_prefetch => 0,
1809 output_sync => 1, 1999 output_sync => 1,
1810 output_count => 1, 2000 output_count => 1,
1811 pickup => 0, 2001 pickup => 0,
2002 default => "profile", # default profile
2003 );
1812 ); 2004
1813
1814 while (my ($k, $v) = each %DEF_CFG) { 2005 while (my ($k, $v) = each %DEF_CFG) {
1815 $CFG->{$k} = $v unless exists $CFG->{$k}; 2006 $CFG->{$k} = $v unless exists $CFG->{$k};
1816 } 2007 }
2008
2009 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1817 2010
1818 sdl_init; 2011 sdl_init;
1819 2012
1820 @SDL_MODES = reverse 2013 @SDL_MODES = reverse
1821 grep $_->[0] >= 640 && $_->[1] >= 480, 2014 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1863 video_init; 2056 video_init;
1864 audio_init; 2057 audio_init;
1865} 2058}
1866 2059
1867Event::loop; 2060Event::loop;
2061#CFClient::SDL_Quit;
2062#CFClient::_exit 0;
1868 2063
1869END { CFClient::SDL_Quit } 2064END { CFClient::SDL_Quit }
1870 2065
1871=head1 NAME 2066=head1 NAME
1872 2067

Diff Legend

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