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.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.86 by root, Sun Jul 2 21:07:27 2006 UTC

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

Diff Legend

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