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.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.91 by root, Tue Jul 11 13:51:38 2006 UTC

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

Diff Legend

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