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

Diff Legend

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