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.89 by elmex, Sun Jul 9 21:11:48 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44 45
45$Event::DIED = sub { 46$Event::DIED = sub {
… …
84our $CONSOLE; 85our $CONSOLE;
85our $METASERVER; 86our $METASERVER;
86our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 88our $QUIT_DIALOG;
88our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $PICKUP_ENABLE;
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});
… …
625 &set_gauge_window_fontsize; 612 &set_gauge_window_fontsize;
626 613
627 $win 614 $win
628} 615}
629 616
617sub debug_setup {
618 my $table = new CFClient::UI::Table;
619
620 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
621 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
622 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
623 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
624 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
625 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
626 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
627 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
628
629 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
630
631 for my $x (0..2) {
632 for my $y (0 .. 2) {
633 $table->add ($x + 3, $y,
634 new CFClient::UI::Entry
635 text => $default_smooth[$x * 3 + $y],
636 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
637 );
638 }
639 }
640
641
642 $table
643}
630 644
631sub stats_window { 645sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 646 my $vb = new CFClient::UI::VBox;
633 y => $HEIGHT * (2/8),
634 x => "max",
635 title => "Stats",
636 name => "stats_window";
637 647
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, 648 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640 can_hover => 1, can_events => 1, 649 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."); 650 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, 651 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
643 can_hover => 1, can_events => 1, 652 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."], 676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
668 677
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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."],
675 ) { 684 ) {
676 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 685 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
677 686
… …
696 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)",
697 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)",
698 pois => "<b>Poison</b> (resistance to getting poisoned)", 707 pois => "<b>Poison</b> (resistance to getting poisoned)",
699 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)",
700 deat => "<b>Death</b> (resistance against death spells)", 709 deat => "<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)", 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.)",
702 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)",
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)", 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)",
704 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...",
705 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, ...)",
706 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, ...)",
… …
723 ); 732 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
725 font => $FONT_FIXED, 734 font => $FONT_FIXED,
726 can_hover => 1, 735 can_hover => 1,
727 can_events => 1, 736 can_events => 1,
728 image => "ui/resist/resist_$_.png", 737 path => "ui/resist/resist_$_.png",
729 tooltip => $resist_names{$_}, 738 tooltip => $resist_names{$_},
730 ); 739 );
731 740
732 $row++; 741 $row++;
733 if ($row % 6 == 0) { 742 if ($row % 6 == 0) {
734 $col += 2; 743 $col += 2;
735 $row = 0; 744 $row = 0;
736 } 745 }
737 } 746 }
738 747
739 &set_stats_window_fontsize; 748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
740 update_stats_window ({}); 751 update_stats_window ({});
741 752
742 $tgw 753 $vb
743} 754}
744 755
745sub formsep($) { 756sub formsep($) {
746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
747} 758}
… …
781 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
782 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
783 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
784 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
785 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
786 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788 $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});
789 800
790 $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);
791 802
792 # TODO: replace by CS_STAT_RES_xxx constants
793 my %tbl = ( 803 my %tbl = (
794 phys => 100, 804 phys => CS_STAT_RES_PHYS,
795 magic => 101, 805 magic => CS_STAT_RES_MAG,
796 fire => 102, 806 fire => CS_STAT_RES_FIRE,
797 elec => 103, 807 elec => CS_STAT_RES_ELEC,
798 cold => 104, 808 cold => CS_STAT_RES_COLD,
799 conf => 105, 809 conf => CS_STAT_RES_CONF,
800 acid => 106, 810 acid => CS_STAT_RES_ACID,
801 drain => 107, 811 drain => CS_STAT_RES_DRAIN,
802 ghit => 108, 812 ghit => CS_STAT_RES_GHOSTHIT,
803 pois => 109, 813 pois => CS_STAT_RES_POISON,
804 slow => 110, 814 slow => CS_STAT_RES_SLOW,
805 para => 111, 815 para => CS_STAT_RES_PARA,
806 tund => 112, 816 tund => CS_STAT_TURN_UNDEAD,
807 fear => 113, 817 fear => CS_STAT_RES_FEAR,
808 depl => 113, 818 depl => CS_STAT_RES_DEPLETE,
809 deat => 115, 819 deat => CS_STAT_RES_DEATH,
810 holyw => 116, 820 holyw => CS_STAT_RES_HOLYWORD,
811 blind => 117, 821 blind => CS_STAT_RES_BLIND,
812 ); 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 }
813 860
814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815 for keys %tbl; 862 for keys %tbl;
816} 863}
817 864
818my $METASERVER_ATIME; 865my $METASERVER_ATIME;
819 866
820sub update_metaserver { 867sub update_metaserver {
868 my ($metaserver_dialog) = @_;
869
870 $METASERVER = $metaserver_dialog
871 if defined $metaserver_dialog;
872
821 return if $METASERVER_ATIME > time; 873 return if $METASERVER_ATIME > time;
822 $METASERVER_ATIME = time + 60; 874 $METASERVER_ATIME = time + 60;
823 875
824 my $table = $METASERVER->{table}; 876 my $table = $METASERVER->{table};
825 $table->clear; 877 $table->clear;
… …
890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 942 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
891 (new CFClient::UI::Button 943 (new CFClient::UI::Button
892 text => "Use", 944 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field", 945 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub { 946 on_activate => sub {
895 $HOST_ENTRY->set_text ($CFG->{host} = $host); 947 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
896 $METASERVER->hide; 948 $METASERVER->hide;
949 0
897 }, 950 },
898 ), 951 ),
899 (new CFClient::UI::Empty expand => 1), 952 (new CFClient::UI::Empty expand => 1),
900 ]); 953 ]);
901 954
… …
912 } 965 }
913 }); 966 });
914} 967}
915 968
916sub 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
917 my $dialog = new CFClient::UI::FancyFrame 974 my $dialog = new CFClient::UI::FancyFrame
918 title => "Server List", 975 title => "Server List",
919 name => 'metaserver_dialog', 976 name => 'metaserver_dialog',
920 x => 'center', 977 x => 'center',
921 y => 'center', 978 y => 'center',
922 z => 3, 979 z => 3,
923 force_h => $::HEIGHT * 0.4, 980 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox), 981 child => $vbox,
982 has_close_button => 1,
983 table => $table,
925 on_visibility_change => sub { 984 on_visibility_change => sub {
926 update_metaserver if $_[1]; 985 update_metaserver ($_[0]) if $_[1];
986 0
927 }, 987 },
928 ; 988 ;
929
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933 989
934 $dialog 990 $dialog
935} 991}
936 992
937sub server_setup { 993sub server_setup {
… …
944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1000 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
945 1001
946 $vbox->add ( 1002 $vbox->add (
947 $HOST_ENTRY = new CFClient::UI::Entry 1003 $HOST_ENTRY = new CFClient::UI::Entry
948 expand => 1, 1004 expand => 1,
949 text => $CFG->{host}, 1005 text => $CFG->{profile}{default}{host},
950 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",
951 on_changed => sub { 1007 on_changed => sub {
952 my ($self, $value) = @_; 1008 my ($self, $value) = @_;
953 $CFG->{host} = $value; 1009 $CFG->{profile}{default}{host} = $value;
1010 0
954 } 1011 }
955 ); 1012 );
956
957 $METASERVER = metaserver_dialog;
958 1013
959 $vbox->add (new CFClient::UI::Button 1014 $vbox->add (new CFClient::UI::Button
960 expand => 1, 1015 expand => 1,
961 text => "Server List", 1016 text => "Server List",
962 other => $METASERVER, 1017 other => $METASERVER,
963 tooltip => "Show a list of available crossfire servers", 1018 tooltip => "Show a list of available crossfire servers",
964 on_activate => sub { $METASERVER->toggle_visibility }, 1019 on_activate => sub { $METASERVER->toggle_visibility; 0 },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
966 ); 1021 );
967 } 1022 }
968 1023
969 $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");
970 $table->add (1, 4, new CFClient::UI::Entry 1025 $table->add (1, 4, new CFClient::UI::Entry
971 text => $CFG->{user}, 1026 text => $CFG->{profile}{default}{user},
972 tooltip => "The name of your character on the server", 1027 tooltip => "The name of your character on the server",
973 on_changed => sub { 1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
974 my ($self, $value) = @_;
975 $CFG->{user} = $value;
976 }
977 ); 1029 );
978 1030
979 $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");
980 $table->add (1, 5, new CFClient::UI::Entry 1032 $table->add (1, 5, new CFClient::UI::Entry
981 text => $CFG->{password}, 1033 text => $CFG->{profile}{default}{password},
982 hidden => 1, 1034 hidden => 1,
983 tooltip => "The password for your character", 1035 tooltip => "The password for your character",
984 on_changed => sub { 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
985 my ($self, $value) = @_;
986 $CFG->{password} = $value;
987 }
988 ); 1037 );
989 1038
990 $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");
991 $table->add (1, 7, new CFClient::UI::Slider 1040 $table->add (1, 7, new CFClient::UI::Slider
992 force_w => 100, 1041 force_w => 100,
993 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1042 range => [$CFG->{mapsize}, 10, 100, 0, 1],
994 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. "
995 . "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, "
996 . "but you also increase bandwidth requirements and latency. " 1045 . "but you also increase bandwidth requirements and latency. "
997 . "This option is only used once at log-in.", 1046 . "This option is only used once at log-in.",
998 on_changed => sub { 1047 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 ); 1048 );
1004 1049
1005 $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");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1051 $table->add (1, 8, new CFClient::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1052 state => $CFG->{face_prefetch},
… …
1010 . "This might increase or create lag, but increases the chances " 1055 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1056 . "of faces being ready for display when you encounter them. "
1012 . "It also uses up server bandwidth on every connect, " 1057 . "It also uses up server bandwidth on every connect, "
1013 . "so only set it if you really need to prefetch images. " 1058 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1059 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1061 );
1017 1062
1018 $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");
1019 $table->add (1, 9, new CFClient::UI::Entry 1064 $table->add (1, 9, new CFClient::UI::Entry
1020 text => $CFG->{output_count}, 1065 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.", 1066 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] }, 1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1068 );
1024 1069
1025 $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");
1026 $table->add (1, 10, new CFClient::UI::Entry 1071 $table->add (1, 10, new CFClient::UI::Entry
1027 text => $CFG->{output_sync}, 1072 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.", 1073 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] }, 1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1075 );
1031 1076
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1077 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1033 expand => 1, 1078 expand => 1,
1034 align => 0, 1079 align => 0,
1035 text => "Login", 1080 text => "Login",
1036 on_activate => sub { 1081 on_activate => sub {
1037 $CONN ? stop_game 1082 $CONN ? stop_game
1038 : start_game; 1083 : start_game;
1084 0
1039 }, 1085 },
1040 ); 1086 );
1041 1087
1042 $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");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1089 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1046 . "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. "
1047 . "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.",
1048 on_changed => sub { 1094 on_changed => sub {
1049 my ($self, $value) = @_; 1095 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value; 1096 $CFG->{say_command} = $value;
1097 0
1051 } 1098 }
1052 ); 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);
1053 1109
1054 $vbox 1110 $vbox
1055} 1111}
1056 1112
1057sub message_window { 1113sub message_window {
… …
1062 bg => [0, 0, 0, 0.75], 1118 bg => [0, 0, 0, 0.75],
1063 x => "max", 1119 x => "max",
1064 y => 0, 1120 y => 0,
1065 force_w => $::WIDTH * 0.4, 1121 force_w => $::WIDTH * 0.4,
1066 force_h => $::HEIGHT * 0.5, 1122 force_h => $::HEIGHT * 0.5,
1067 child => (my $vbox = new CFClient::UI::VBox); 1123 child => (my $vbox = new CFClient::UI::VBox),
1124 has_close_button => 1;
1068 1125
1069 $vbox->add ($LOGVIEW); 1126 $vbox->add ($LOGVIEW);
1070 1127
1071 $vbox->add (my $input = new CFClient::UI::Entry 1128 $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> " 1129 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1080 1137
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1138 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1; 1139 $input->{refocus_map} = 1;
1083 } 1140 }
1084 delete $input->{auto_activated}; 1141 delete $input->{auto_activated};
1142
1143 0
1085 }, 1144 },
1086 on_activate => sub { 1145 on_activate => sub {
1087 my ($input, $text) = @_; 1146 my ($input, $text) = @_;
1088 $input->set_text (''); 1147 $input->set_text ('');
1089 1148
… …
1095 } 1154 }
1096 if ($input->{refocus_map}) { 1155 if ($input->{refocus_map}) {
1097 delete $input->{refocus_map}; 1156 delete $input->{refocus_map};
1098 $MAPWIDGET->focus_in 1157 $MAPWIDGET->focus_in
1099 } 1158 }
1159
1160 0
1100 }, 1161 },
1101 on_escape => sub { 1162 on_escape => sub {
1102 $MAPWIDGET->focus_in 1163 $MAPWIDGET->grab_focus;
1164
1165 0
1103 }, 1166 },
1104 ); 1167 );
1105 1168
1106 $CONSOLE = { 1169 $CONSOLE = {
1107 window => $window, 1170 window => $window,
… …
1129 ); 1192 );
1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1193 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1131 $hb->add (new CFClient::UI::Button 1194 $hb->add (new CFClient::UI::Button
1132 text => "Ok", 1195 text => "Ok",
1133 expand => 1, 1196 expand => 1,
1134 on_activate => sub { $QUIT_DIALOG->hide }, 1197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1135 ); 1198 );
1136 $hb->add (new CFClient::UI::Button 1199 $hb->add (new CFClient::UI::Button
1137 text => "Quit anyway", 1200 text => "Quit anyway",
1138 expand => 1, 1201 expand => 1,
1139 on_activate => sub { exit }, 1202 on_activate => sub { exit },
… …
1146sub autopickup_setup { 1209sub autopickup_setup {
1147 my $table = new CFClient::UI::Table; 1210 my $table = new CFClient::UI::Table;
1148 1211
1149 for ( 1212 for (
1150 ["General", 0, 0, 1213 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE], 1214 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT], 1215 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP], 1216 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG], 1217 ["Debug autopickup" => PICKUP_DEBUG],
1155 ], 1218 ],
1156 ["Weapons", 0, 6, 1219 ["Weapons", 0, 6,
… …
1182 ["Potions" => PICKUP_POTION], 1245 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1246 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED], 1247 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS], 1248 ["Jewelery" => PICKUP_JEWELS],
1186 ], 1249 ],
1250 ["Weight/Value ratio", 2, 17]
1187 ) 1251 )
1188 { 1252 {
1189 my ($title, $x, $y, @bits) = @$_; 1253 my ($title, $x, $y, @bits) = @$_;
1190 $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]);
1191 1255
1192 for (@bits) { 1256 for (@bits) {
1193 ++$y; 1257 ++$y;
1194 1258
1195 my $mask = $_->[1]; 1259 my $mask = $_->[1];
1196 $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);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1261 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1198 state => $CFG->{pickup} & $mask, 1262 state => $::CFG->{pickup} & $mask,
1199 on_changed => sub { 1263 on_changed => sub {
1200 my ($box, $value) = @_; 1264 my ($box, $value) = @_;
1201 1265
1202 if ($value) { 1266 if ($value) {
1203 $::CFG->{pickup} |= $mask; 1267 $::CFG->{pickup} |= $mask;
… …
1205 $::CFG->{pickup} &= ~$mask; 1269 $::CFG->{pickup} &= ~$mask;
1206 } 1270 }
1207 1271
1208 $::CONN->send_command ("pickup $::CFG->{pickup}") 1272 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN; 1273 if defined $::CONN;
1274
1275 0
1210 }); 1276 });
1277
1278 ${$_->[2]} = $checkbox if $_->[2];
1211 } 1279 }
1212 } 1280 }
1213 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
1214 $table 1303 $table
1215} 1304}
1216 1305
1217sub 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 {
1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1337 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1219 x => "center", 1338 x => "center",
1220 y => "center", 1339 y => "center",
1221 force_w => $WIDTH * 9/10, 1340 force_w => $WIDTH * 9/10,
1222 force_h => $HEIGHT * 9/10, 1341 force_h => $HEIGHT * 9/10,
1223 title => "Inventory", 1342 title => "Player",
1343 has_close_button => 1
1224 ; 1344 ;
1225 1345
1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1346 my $ntb =
1347 $PL_NOTEBOOK =
1348 new CFClient::UI::Notebook
1349 expand => 1,
1350 debug => 1,
1351 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1352 ;
1227 1353
1228 $hb->add (my $vb1 = new CFClient::UI::VBox); 1354 $ntb->add (
1229 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1355 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1230 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1356 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1357 );
1358 $ntb->add (
1359 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 );
1362 $ntb->add (
1363 Inventory => $INVENTORY_PAGE = inventory_widget,
1364 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1365 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1366 );
1231 1367
1232 $hb->add (my $vb2 = new CFClient::UI::VBox); 1368 $ntb->set_current_page ($INVENTORY_PAGE);
1233 1369
1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1370 $plwin->add ($ntb);
1235 1371 $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} 1372}
1243 1373
1244sub spell_setup { 1374sub update_bindings {
1245 new CFClient::UI::SpellList 1375 $BIND_UPD_CB->() if $BIND_UPD_CB;
1246} 1376}
1247 1377
1248sub keyboard_setup { 1378sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox; 1379 my $binding_list = new CFClient::UI::VBox;
1250 1380
1251 my $refresh; 1381 my $refresh;
1252 $refresh = sub { 1382 $refresh = $BIND_UPD_CB = sub {
1253 $binding_list->clear (); 1383 $binding_list->clear ();
1254 1384
1255 for my $mod (keys %{$::CFG->{bindings}}) { 1385 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1386 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1387 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1388 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259 1389
1260 my $lbl = join "; ", @$cmds; 1390 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1391 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox); 1392 $binding_list->add (my $hb = new CFClient::UI::HBox);
1263 $hb->add (new CFClient::UI::Button 1393 $hb->add (new CFClient::UI::Button
1264 text => "delete", 1394 text => "delete",
1265 tooltip => "Deletes the binding", 1395 tooltip => "Deletes the binding",
1266 on_activate => sub { 1396 on_activate => sub {
1267 $binding_list->remove ($hb); 1397 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym}; 1398 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1399 0
1269 }); 1400 });
1270 1401
1271 $hb->add (new CFClient::UI::Button 1402 $hb->add (new CFClient::UI::Button
1272 text => "edit", 1403 text => "edit",
1273 tooltip => "Edits the binding", 1404 tooltip => "Edits the binding",
1274 on_activate => sub { 1405 on_activate => sub {
1275 $::BIND_EDITOR->set_binding ( 1406 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1407 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1277 sub { 1408 sub {
1278 my ($nmod, $nsym, $ncmds) = @_; 1409 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym}; 1410 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1411 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1281 $refresh->(); 1412 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1413 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show; 1414 $SETUP_DIALOG->show;
1284 }, 1415 },
1285 sub { 1416 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1417 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show; 1418 $SETUP_DIALOG->show;
1288 }); 1419 });
1289 $::BIND_EDITOR->show; 1420 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide; 1421 $SETUP_DIALOG->hide;
1422 0
1291 }); 1423 });
1292 1424
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1425 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1426 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1295 } 1427 }
1296 } 1428 }
1297 }; 1429 };
1298 1430
1299 my $vb = new CFClient::UI::VBox; 1431 my $vb = new CFClient::UI::VBox;
1432 $vb->add (my $hb = new CFClient::UI::HBox);
1433 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1434 $hb->add (new CFClient::UI::CheckBox
1435 expand => 1,
1436 state => $CFG->{shift_fire_stop},
1437 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1438 on_changed => sub {
1439 my ($cbox, $value) = @_;
1440 $CFG->{shift_fire_stop} = $value;
1441 0
1442 });
1443
1300 $vb->add ($binding_list); 1444 $vb->add ($binding_list);
1301 $vb->add (my $hb = new CFClient::UI::HBox); 1445 $vb->add (my $hb = new CFClient::UI::HBox);
1302 1446
1303 $hb->add (new CFClient::UI::Button 1447 $hb->add (new CFClient::UI::Button
1304 text => "record new", 1448 text => "record new",
… …
1306 tooltip => "This button opens the binding editor with an empty binding.", 1450 tooltip => "This button opens the binding editor with an empty binding.",
1307 on_activate => sub { 1451 on_activate => sub {
1308 $::BIND_EDITOR->set_binding (undef, undef, [], 1452 $::BIND_EDITOR->set_binding (undef, undef, [],
1309 sub { 1453 sub {
1310 my ($mod, $sym, $cmds) = @_; 1454 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1455 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1312 $refresh->(); 1456 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1457 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1458 $SETUP_DIALOG->show;
1315 }, 1459 },
1316 sub { 1460 sub {
… …
1318 $SETUP_DIALOG->show; 1462 $SETUP_DIALOG->show;
1319 }, 1463 },
1320 ); 1464 );
1321 $SETUP_DIALOG->hide; 1465 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show; 1466 $::BIND_EDITOR->show;
1467 0
1323 }, 1468 },
1324 ); 1469 );
1325 1470
1326 $hb->add (new CFClient::UI::Button 1471 $hb->add (new CFClient::UI::Button
1327 text => "close", 1472 text => "close",
1328 tooltip => "Closes the binding window", 1473 tooltip => "Closes the binding window",
1329 expand => 1, 1474 expand => 1,
1330 on_activate => sub { 1475 on_activate => sub {
1331 $SETUP_DIALOG->hide; 1476 $SETUP_DIALOG->hide;
1477 0
1332 } 1478 }
1333 ); 1479 );
1334 1480
1335 $refresh->(); 1481 $refresh->();
1336 1482
… …
1343 y => 'center', 1489 y => 'center',
1344 z => 2, 1490 z => 2,
1345 name => 'doc_browser', 1491 name => 'doc_browser',
1346 force_w => int $WIDTH * 7/8, 1492 force_w => int $WIDTH * 7/8,
1347 force_h => int $HEIGHT * 7/8, 1493 force_h => int $HEIGHT * 7/8,
1348 title => "Documentation"; 1494 title => "Help Browser",
1495 has_close_button => 1;
1349 1496
1350 $win->add (my $vbox = new CFClient::UI::VBox); 1497 $win->add (my $vbox = new CFClient::UI::VBox);
1351 1498
1352 $vbox->add (my $buttons = new CFClient::UI::HBox); 1499 $vbox->add (my $buttons = new CFClient::UI::HBox);
1353 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1500 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1356 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1503 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1357 $buttons->add (my $combo = new CFClient::UI::Combobox 1504 $buttons->add (my $combo = new CFClient::UI::Combobox
1358 value => undef, 1505 value => undef,
1359 options => [ 1506 options => [
1360 [intro => "Introduction"], 1507 [intro => "Introduction"],
1361 [manual => "Manual"], 1508 [manual => "Main Manual"],
1362 [skill_help => "Skills"], 1509 [skill_help => "Skill Reference"],
1363 [command_help => "Commands"], 1510 [command_help => "Command Reference"],
1364 [dmcommand_help => "DM Commands"], 1511 [dmcommand_help => "DM Commands"],
1365 [COPYING => "License Terms"], 1512 [COPYING => "License Terms"],
1366 ], 1513 ],
1367 on_changed => sub { 1514 on_changed => sub {
1368 my ($self, $pod) = @_; 1515 my ($self, $pod) = @_;
1369 1516
1370 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1517 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1371 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1518 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1372 1519
1373 $viewer->clear; 1520 $viewer->clear;
1521
1522# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1523# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1524# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1525# ]);#d#
1374 1526
1375 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1527 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1376 for @$pom; 1528 for @$pom;
1377 1529
1378 $viewer->set_offset (0); 1530 $viewer->set_offset (0);
1531
1532 0
1379 }, 1533 },
1380 on_visibility_change => sub { 1534 on_visibility_change => sub {
1381 my ($self, $visible) = @_; 1535 my ($self, $visible) = @_;
1382 return unless $visible; 1536 return unless $visible;
1383 return if $self->{value}; 1537 return if $self->{value};
1384 $self->set_value ("intro"); 1538 $self->set_value ("intro");
1539 0
1385 }, 1540 },
1386 ); 1541 );
1387 1542
1388 $win 1543 $win
1389} 1544}
… …
1428 z => 100, 1583 z => 100,
1429 force_x => "max", 1584 force_x => "max",
1430 force_y => 0; 1585 force_y => 0;
1431 $DEBUG_STATUS->show; 1586 $DEBUG_STATUS->show;
1432 1587
1433 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1588 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1434 1589
1435 $STATUSBOX = new CFClient::UI::Statusbox; 1590 $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]); 1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1437 1592
1438 (new CFClient::UI::Frame 1593 (new CFClient::UI::Frame
… …
1458 $MAPWIDGET->connect (activate_console => sub { 1613 $MAPWIDGET->connect (activate_console => sub {
1459 my ($mapwidget, $preset) = @_; 1614 my ($mapwidget, $preset) = @_;
1460 1615
1461 if ($CONSOLE) { 1616 if ($CONSOLE) {
1462 $CONSOLE->{input}->{auto_activated} = 1; 1617 $CONSOLE->{input}->{auto_activated} = 1;
1463 $CONSOLE->{input}->focus_in; 1618 $CONSOLE->{input}->grab_focus;
1464 1619
1465 if ($preset && $CONSOLE->{input}->get_text eq '') { 1620 if ($preset && $CONSOLE->{input}->get_text eq '') {
1466 $CONSOLE->{input}->set_text ($preset); 1621 $CONSOLE->{input}->set_text ($preset);
1467 } 1622 }
1468 } 1623 }
1469 }); 1624 });
1470 $MAPWIDGET->show; 1625 $MAPWIDGET->show;
1471 $MAPWIDGET->focus_in; 1626 $MAPWIDGET->grab_focus;
1472 1627
1473 $LOGVIEW = new CFClient::UI::TextScroller 1628 $LOGVIEW = new CFClient::UI::TextScroller
1474 expand => 1, 1629 expand => 1,
1475 font => $FONT_FIXED, 1630 font => $FONT_FIXED,
1476 fontsize => $::CFG->{log_fontsize}, 1631 fontsize => $::CFG->{log_fontsize},
… …
1486 x => 'center', 1641 x => 'center',
1487 y => 'center', 1642 y => 'center',
1488 z => 2, 1643 z => 2,
1489 force_w => $::WIDTH * 0.6, 1644 force_w => $::WIDTH * 0.6,
1490 force_h => $::HEIGHT * 0.6, 1645 force_h => $::HEIGHT * 0.6,
1646 has_close_button => 1,
1491 ; 1647 ;
1648
1649 $METASERVER = metaserver_dialog;
1492 1650
1493 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1494 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1652 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1495 1653
1496 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1500 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1658 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1501 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1659 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1502 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1660 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1503 "Configure the use of audio, sound effects and background music."); 1661 "Configure the use of audio, sound effects and background music.");
1504 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1662 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1505 "Lets you define, edit and delete bindings." 1663 "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 " 1664 . "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 " 1665 . "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. " 1666 . "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 " 1667 . "After pressing the combo the binding will be saved automatically and the "
1510 . "binding editor closes"); 1668 . "binding editor closes");
1511 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1669 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1512 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1670 "Some debuggin' options. Do not ask.");
1513 1671
1514 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1672 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1515 1673
1516 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1674 $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."); 1675 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, 1677 $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."); 1678 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1521 1679
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 1680 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1523 1681
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, 1682 $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 :). " 1683 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 1684
1530 $BUTTONBAR->add (new CFClient::UI::Button 1685 $BUTTONBAR->add (new CFClient::UI::Button
1531 text => "Save Config", 1686 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.", 1687 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 { 1688 on_activate => sub {
1534 $::CFG->{layout} = CFClient::UI::get_layout; 1689 $::CFG->{layout} = CFClient::UI::get_layout;
1535 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1690 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1536 status "Configuration Saved"; 1691 status "Configuration Saved";
1692 0
1537 }, 1693 },
1538 ); 1694 );
1539 1695
1540 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1541 tooltip => "View Documentation"); 1697 tooltip => "View Documentation");
1542 1698
1543 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFClient::UI::Button
1544 text => "Quit", 1700 text => "Quit",
1545 tooltip => "Terminates the program", 1701 tooltip => "Terminates the program",
… …
1547 if ($CONN) { 1703 if ($CONN) {
1548 open_quit_dialog; 1704 open_quit_dialog;
1549 } else { 1705 } else {
1550 exit; 1706 exit;
1551 } 1707 }
1708 0
1552 }, 1709 },
1553 ); 1710 );
1554 1711
1555 $BUTTONBAR->show; 1712 $BUTTONBAR->show;
1556 $SETUP_DIALOG->show; 1713 $SETUP_DIALOG->show;
… …
1558 1715
1559 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1716 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1560} 1717}
1561 1718
1562sub video_shutdown { 1719sub video_shutdown {
1720 CFClient::OpenGL::shutdown;
1721
1563 undef $SDL_ACTIVE; 1722 undef $SDL_ACTIVE;
1564} 1723}
1565 1724
1566my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1725my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1567my $bgmusic;#TODO#hack#d# 1726my $bgmusic;#TODO#hack#d#
… …
1783 1942
1784 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1943 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1785 CFClient::UI::set_layout ($::CFG->{layout}); 1944 CFClient::UI::set_layout ($::CFG->{layout});
1786 1945
1787 my %DEF_CFG = ( 1946 my %DEF_CFG = (
1788 sdl_mode => 0, 1947 sdl_mode => 0,
1789 width => 640, 1948 width => 640,
1790 height => 480, 1949 height => 480,
1791 fullscreen => 0, 1950 fullscreen => 0,
1792 fast => 0, 1951 fast => 0,
1793 map_scale => 1, 1952 map_scale => 1,
1794 fow_enable => 1, 1953 fow_enable => 1,
1795 fow_intensity => 0.45, 1954 fow_intensity => 0.45,
1796 fow_smooth => 0, 1955 fow_smooth => 0,
1797 gui_fontsize => 1, 1956 gui_fontsize => 1,
1798 log_fontsize => 0.7, 1957 log_fontsize => 0.7,
1799 gauge_fontsize=> 1, 1958 gauge_fontsize => 1,
1800 gauge_size => 0.35, 1959 gauge_size => 0.35,
1801 stat_fontsize => 0.7, 1960 stat_fontsize => 0.7,
1802 mapsize => 100, 1961 mapsize => 100,
1803 host => "crossfire.schmorp.de",
1804 say_command => 'say', 1962 say_command => 'say',
1805 audio_enable => 1, 1963 audio_enable => 1,
1806 bgm_enable => 1, 1964 bgm_enable => 1,
1807 bgm_volume => 0.25, 1965 bgm_volume => 0.25,
1808 face_prefetch => 0, 1966 face_prefetch => 0,
1809 output_sync => 1, 1967 output_sync => 1,
1810 output_count => 1, 1968 output_count => 1,
1811 pickup => 0, 1969 pickup => 0,
1970 default => "profile", # default profile
1971 );
1812 ); 1972
1813
1814 while (my ($k, $v) = each %DEF_CFG) { 1973 while (my ($k, $v) = each %DEF_CFG) {
1815 $CFG->{$k} = $v unless exists $CFG->{$k}; 1974 $CFG->{$k} = $v unless exists $CFG->{$k};
1816 } 1975 }
1976
1977 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1817 1978
1818 sdl_init; 1979 sdl_init;
1819 1980
1820 @SDL_MODES = reverse 1981 @SDL_MODES = reverse
1821 grep $_->[0] >= 640 && $_->[1] >= 480, 1982 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1863 video_init; 2024 video_init;
1864 audio_init; 2025 audio_init;
1865} 2026}
1866 2027
1867Event::loop; 2028Event::loop;
2029#CFClient::SDL_Quit;
2030#CFClient::_exit 0;
1868 2031
1869END { CFClient::SDL_Quit } 2032END { CFClient::SDL_Quit }
1870 2033
1871=head1 NAME 2034=head1 NAME
1872 2035

Diff Legend

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