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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.90 by elmex, Mon Jul 10 06:59:14 2006 UTC

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

Diff Legend

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