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.73 by root, Sat Jun 17 15:07:54 2006 UTC vs.
Revision 1.99 by root, Sun Jul 23 08:58:44 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;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
99our $FLOORBOX; 110our $FLOORBOX;
100our $GAUGES; 111our $GAUGES;
101our $STATWIDS; 112our $STATWIDS;
102 113
109 120
110our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 122our $STATUSBOX;
112our $DEBUG_STATUS; 123our $DEBUG_STATUS;
113 124
114our $INV_WINDOW;
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118 128
119our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
120 131
121our $PICKUP_CFG; 132our $PICKUP_CFG;
122 133
123sub status { 134sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 135 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
155 $hbox->add (new CFClient::UI::Button 166 $hbox->add (new CFClient::UI::Button
156 text => "No", 167 text => "No",
157 on_activate => sub { 168 on_activate => sub {
158 $conn->send ("reply n"); 169 $conn->send ("reply n");
159 $dialog->destroy; 170 $dialog->destroy;
171 0
160 } 172 }
161 ); 173 );
162 $hbox->add (new CFClient::UI::Button 174 $hbox->add (new CFClient::UI::Button
163 text => "Yes", 175 text => "Yes",
164 on_activate => sub { 176 on_activate => sub {
165 $conn->send ("reply y"); 177 $conn->send ("reply y");
166 destroy_query_dialog $conn; 178 destroy_query_dialog $conn;
179 0
167 }, 180 },
168 ); 181 );
169 182
170 $dialog->focus_in; 183 $dialog->grab_focus;
171 184
172 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 186 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174 187
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 188 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
177 190
178 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
179 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
180 ellipsise => 0, 193 ellipsise => 0,
181 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
182 195
183 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
184 197
185 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race", 199 text => "Next Race",
187 on_activate => sub { 200 on_activate => sub {
188 $conn->send ("reply n"); 201 $conn->send ("reply n");
189 destroy_query_dialog $conn; 202 destroy_query_dialog $conn;
203 0
190 }, 204 },
191 ); 205 );
192 $table->add (2, 0, new CFClient::UI::Button 206 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept", 207 text => "Accept",
194 on_activate => sub { 208 on_activate => sub {
195 $conn->send ("reply d"); 209 $conn->send ("reply d");
196 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
211 0
197 }, 212 },
198 ); 213 );
199 214
200 unshift @dialog, new CFClient::UI::Label 215 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
202 ellipsise => 0, 217 ellipsise => 0,
203 markup => 218 markup =>
204 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
205 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "Look at the <b>Messages</b> window to see a description of this race "
206 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207 . "and the center of the screen to see how this race looks like " 221 . "and the center of the screen to see how this race looks like "
208 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "click into the display area to make it visible</small>).\n\n"
209 . "You can look at another race, or accept this race (you will come back to this race eventually, " 224 . "You can look at another race, or accept this race (you will cycle back to "
210 . "so you can take your time making this important choice." 225 . "this race eventually, so you can take your time making this important choice."
211 ; 226 ;
212 227
213 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
214 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
215 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
216 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
217 return; 232 return;
218 } 233 }
219 234
220 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
221 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
222 237
223 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
225 ellipsise => 0, 240 ellipsise => 0,
226 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
227 242
228 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
229 244
230 # left: re-roll 245 # left: re-roll
231 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again", 247 text => "Roll Again",
233 on_activate => sub { 248 on_activate => sub {
234 $conn->send ("reply y"); 249 $conn->send ("reply y");
235 destroy_query_dialog $conn; 250 destroy_query_dialog $conn;
251 0
236 }, 252 },
237 ); 253 );
238 254
239 # center: swap stats 255 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
241 value => $_, 258 value => $_,
242 options => [ 259 options => [
243 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
254 text => "Swap Stats", 271 text => "Swap Stats",
255 on_activate => sub { 272 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value}; 273 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}"); 274 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
276 0
259 }, 277 },
260 ); 278 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 279 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262 280
263 # right: accept 281 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button 282 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept", 283 text => "Accept",
266 on_activate => sub { 284 on_activate => sub {
267 $conn->send ("reply n"); 285 $conn->send ("reply n");
268 $STATS_WINDOW->hide; 286 $STATS_PAGE->hide;
269 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
288 0
270 }, 289 },
271 ); 290 );
291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
272 312
273 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
275 ellipsise => 0, 315 ellipsise => 0,
276 markup => 316 markup =>
277 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
278 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
279 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "They will be modified later by both the race and the class you choose.\n\n"
280 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 321 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
281 . "Race selection will influence those values later on."
282 ; 322 ;
283 } 323 }
284 324
285 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub { 326 on_changed => sub {
287 $conn->send ("reply $_[1]"); 327 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn; 328 destroy_query_dialog $conn;
329 0
289 }, 330 },
290 ; 331 ;
291 332
292 $entry->focus_in; 333 $entry->grab_focus;
293 334
294 } else { 335 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 336 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296 337
297 push @dialog, my $entry = new CFClient::UI::Entry 338 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 339 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub { 340 on_activate => sub {
300 $conn->send ("reply $_[1]"); 341 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
343 0
302 }, 344 },
303 ; 345 ;
304 346
305 $entry->focus_in; 347 $entry->grab_focus;
306 } 348 }
307 349
308 $vbox->add (@dialog); 350 $vbox->add (@dialog);
309 $dialog->show; 351 $dialog->show;
310} 352}
315 $LOGIN_BUTTON->set_text ("Logout"); 357 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide; 358 $SETUP_DIALOG->hide;
317 359
318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 360 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
319 361
320 my ($host, $port) = split /:/, $CFG->{host}; 362 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321 363
322 $MAP = new CFClient::Map $mapsize, $mapsize; 364 $MAP = new CFClient::Map $mapsize, $mapsize;
323 365
324 $CONN = eval { 366 $CONN = eval {
325 new CFClient::Protocol 367 new CFClient::Protocol
326 host => $host, 368 host => $host,
327 port => $port || 13327, 369 port => $port || 13327,
328 user => $CFG->{user}, 370 user => $CFG->{profile}{default}{user},
329 pass => $CFG->{password}, 371 pass => $CFG->{profile}{default}{password},
330 mapw => $mapsize, 372 mapw => $mapsize,
331 maph => $mapsize, 373 maph => $mapsize,
332 374
333 map_widget => $MAPWIDGET, 375 map_widget => $MAPWIDGET,
334 logview => $LOGVIEW, 376 logview => $LOGVIEW,
362 404
363sub stop_game { 405sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login"); 406 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 407 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show; 408 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide; 409 $PL_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells; 410 $SPELL_PAGE->clear_spells;
369 411
370 return unless $CONN; 412 return unless $CONN;
371 413
372 status "connection closed"; 414 status "connection closed";
373 415
374 destroy_query_dialog $CONN; 416 destroy_query_dialog $CONN;
375 $CONN->destroy; 417 $CONN->destroy;
376 $CONN = 0; # false, does not autovivify 418 $CONN = 0; # false, does not autovivify
419
420 undef $MAP;
377} 421}
378 422
379sub graphics_setup { 423sub graphics_setup {
380 my $vbox = new CFClient::UI::VBox; 424 my $vbox = new CFClient::UI::VBox;
381 425
396 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
397 441
398 my $row = 1; 442 my $row = 1;
399 443
400 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
401 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
402 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
403 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
404 on_changed => sub { 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405 my ($self, $value) = @_;
406 $CFG->{fullscreen} = $value;
407 }
408 ); 449 );
409 450
410 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 451 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
411 $table->add (1, $row++, new CFClient::UI::CheckBox 452 $table->add (1, $row++, new CFClient::UI::CheckBox
412 state => $CFG->{fast}, 453 state => $CFG->{fast},
413 tooltip => "Lower the visual quality considerably to speed up rendering.", 454 tooltip => "Lower the visual quality considerably to speed up rendering.",
414 on_changed => sub { 455 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415 my ($self, $value) = @_;
416 $CFG->{fast} = $value;
417 }
418 ); 456 );
419 457
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 458 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
421 $table->add (1, $row++, new CFClient::UI::Slider 459 $table->add (1, $row++, new CFClient::UI::Slider
422 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 460 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 461 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424 on_changed => sub { 462 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425 my ($self, $value) = @_;
426 $CFG->{map_scale} = 2 ** $value;
427 }
428 ); 463 );
429 464
430 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 465 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
431 $table->add (1, $row++, new CFClient::UI::CheckBox 466 $table->add (1, $row++, new CFClient::UI::CheckBox
432 state => $CFG->{fow_enable}, 467 state => $CFG->{fow_enable},
433 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 468 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
434 on_changed => sub { 469 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 my ($self, $value) = @_;
436 $CFG->{fow_enable} = $value;
437 }
438 ); 470 );
439 471
440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 472 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
441 $table->add (1, $row++, new CFClient::UI::Slider 473 $table->add (1, $row++, new CFClient::UI::Slider
442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 474 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
443 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 475 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
444 on_changed => sub { 476 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445 my ($self, $value) = @_;
446 $CFG->{fow_intensity} = $value;
447 }
448 ); 477 );
449 478
450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 479 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
451 $table->add (1, $row++, new CFClient::UI::CheckBox 480 $table->add (1, $row++, new CFClient::UI::CheckBox
452 state => $CFG->{fow_smooth}, 481 state => $CFG->{fow_smooth},
453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 482 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
454 on_changed => sub { 483 on_changed => sub {
455 my ($self, $value) = @_; 484 my ($self, $value) = @_;
456 $CFG->{fow_smooth} = $value; 485 $CFG->{fow_smooth} = $value;
457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 486 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
487 0
458 } 488 }
459 ); 489 );
460 490
461 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 491 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
462 $table->add (1, $row++, new CFClient::UI::Slider 492 $table->add (1, $row++, new CFClient::UI::Slider
463 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 493 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
464 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 494 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
465 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 495 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466 ); 496 );
467 497
468 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 498 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
469 $table->add (1, $row++, new CFClient::UI::Slider 499 $table->add (1, $row++, new CFClient::UI::Slider
470 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 500 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
471 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 501 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
472 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 502 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473 );
474
475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476
477 $table->add (1, $row++, new CFClient::UI::Slider
478 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
479 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480 on_changed => sub {
481 $CFG->{stat_fontsize} = $_[1];
482 &set_stats_window_fontsize;
483 }
484 ); 503 );
485 504
486 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 505 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 506 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 507 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 508 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 509 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 510 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 511 &set_gauge_window_fontsize;
512 0
493 } 513 }
494 ); 514 );
495 515
496 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 516 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
497 $table->add (1, $row++, new CFClient::UI::Slider 517 $table->add (1, $row++, new CFClient::UI::Slider
498 range => [$CFG->{gauge_size}, 0.2, 0.8], 518 range => [$CFG->{gauge_size}, 0.2, 0.8],
499 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 519 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
500 on_changed => sub { 520 on_changed => sub {
501 $CFG->{gauge_size} = $_[1]; 521 $CFG->{gauge_size} = $_[1];
502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 522 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
523 0
503 } 524 }
504 ); 525 );
505 526
506 $table->add (1, $row++, new CFClient::UI::Button 527 $table->add (1, $row++, new CFClient::UI::Button
507 expand => 1, align => 0, text => "Apply", 528 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 529 tooltip => "Apply the video settings",
509 on_activate => sub { 530 on_activate => sub {
510 video_shutdown (); 531 video_shutdown ();
511 video_init (); 532 video_init ();
533 0
512 } 534 }
513 ); 535 );
514 536
515 $vbox 537 $vbox
516} 538}
524 546
525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 547 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 548 $table->add (1, $row++, new CFClient::UI::CheckBox
527 state => $CFG->{audio_enable}, 549 state => $CFG->{audio_enable},
528 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.", 550 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.",
529 on_changed => sub { 551 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 $CFG->{audio_enable} = $_[1];
531 }
532 ); 552 );
533# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 553# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
534# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 554# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
535# $CFG->{effects_volume} = $_[1]; 555# $CFG->{effects_volume} = $_[1];
536# }); 556# });
537 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 557 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
538 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 558 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539 $hbox->add (new CFClient::UI::CheckBox 559 $hbox->add (new CFClient::UI::CheckBox
540 expand => 1, state => $CFG->{bgm_enable}, 560 expand => 1, state => $CFG->{bgm_enable},
541 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 561 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
542 on_changed => sub { 562 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543 $CFG->{bgm_enable} = $_[1];
544 }
545 ); 563 );
546 $hbox->add (new CFClient::UI::Slider 564 $hbox->add (new CFClient::UI::Slider
547 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 565 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548 tooltip => "The volume of the background music. Changes are instant.", 566 tooltip => "The volume of the background music. Changes are instant.",
549 on_changed => sub { 567 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
550 $CFG->{bgm_volume} = $_[1];
551 CFClient::MixMusic::volume $_[1] * 128;
552 }
553 ); 568 );
554 569
555 $table->add (1, $row++, new CFClient::UI::Button 570 $table->add (1, $row++, new CFClient::UI::Button
556 expand => 1, align => 0, text => "Apply", 571 expand => 1, align => 0, text => "Apply",
557 tooltip => "Apply the audio settings", 572 tooltip => "Apply the audio settings",
558 on_activate => sub { 573 on_activate => sub {
559 audio_shutdown (); 574 audio_shutdown ();
560 audio_init (); 575 audio_init ();
576 0
561 } 577 }
562 ); 578 );
563 579
564 $vbox 580 $vbox
565}
566
567sub set_stats_window_fontsize {
568 for (values %{$STATWIDS}) {
569 $_->set_fontsize ($::CFG->{stat_fontsize});
570 }
571} 581}
572 582
573sub set_gauge_window_fontsize { 583sub set_gauge_window_fontsize {
574 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 584 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
575 $_->set_fontsize ($::CFG->{gauge_fontsize}); 585 $_->set_fontsize ($::CFG->{gauge_fontsize});
631 641
632sub debug_setup { 642sub debug_setup {
633 my $table = new CFClient::UI::Table; 643 my $table = new CFClient::UI::Table;
634 644
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 645 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 646 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
637 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 647 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 648 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 649 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 650 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 651 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 652 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643 653
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 654 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645 655
646 for my $x (0..2) { 656 for my $x (0..2) {
647 for my $y (0 .. 2) { 657 for my $y (0 .. 2) {
656 666
657 $table 667 $table
658} 668}
659 669
660sub stats_window { 670sub stats_window {
661 my $tgw = new CFClient::UI::FancyFrame 671 my $r = new CFClient::UI::ScrolledWindow (
662 y => $HEIGHT * (2/8), 672 expand => 1,
663 x => "max", 673 scroll_y => 1
664 title => "Stats", 674 );
665 name => "stats_window"; 675 $r->add (my $vb = new CFClient::UI::VBox);
666 676
667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 678 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 679 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 681 can_hover => 1, can_events => 1,
685 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
686 695
687 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
688 697
689 for ( 698 for (
690 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 699 [0, 0, st_str => "Str", 30],
691 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
692 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
693 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 702 [0, 3, st_int => "Int", 30],
694 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 703 [0, 4, st_wis => "Wis", 30],
695 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 704 [0, 5, st_pow => "Pow", 30],
696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
697 706
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."], 707 [2, 0, st_wc => "Wc", -120],
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."], 708 [2, 1, st_ac => "Ac", -120],
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."], 709 [2, 2, st_dam => "Dam", 120],
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."], 710 [2, 3, st_arm => "Arm", 120],
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."], 711 [2, 4, st_spd => "Spd", 10.54],
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."], 712 [2, 5, st_wspd => "WSp", 10.54],
704 ) { 713 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
706 715
707 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
708 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
711 } 722 }
712 723
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
714 725
715 my $row = 0; 726 my $row = 0;
716 my $col = 0; 727 my $col = 0;
717 728
718 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
719 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.)", 731 "<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.)"],
732 holyw => ["Holy Word",
720 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.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
721 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
722 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
723 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
724 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
729 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
730 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 752 phys => ["Physical",
753 "<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.)"],
754 blind => ["Blind",
731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
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)", 757 "<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)"],
758 tund => ["Turn 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...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
736 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737 ); 766 );
738 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 768 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
741 { 770 {
746 template => "-100%", 775 template => "-100%",
747 align => +1, 776 align => +1,
748 valign => 0, 777 valign => 0,
749 can_events => 1, 778 can_events => 1,
750 can_hover => 1, 779 can_hover => 1,
751 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
752 ); 781 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 783 font => $FONT_FIXED,
755 can_hover => 1, 784 can_hover => 1,
756 can_events => 1, 785 can_events => 1,
757 image => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
759 ); 795 );
760 796
761 $row++; 797 $row++;
762 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
763 $col += 2; 799 $col += 3;
764 $row = 0; 800 $row = 0;
765 } 801 }
766 } 802 }
767 803
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 804 #update_stats_window ({});
770 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771 $tgw 812 $sw
772} 813}
773 814
774sub formsep($) { 815sub formsep($) {
775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776} 817}
777 818
778sub update_stats_window {
779 my ($stats) = @_;
780
781 # I love text protocols...
782
783 my $hp = $stats->{+CS_STAT_HP} * 1;
784 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
785 my $sp = $stats->{+CS_STAT_SP} * 1;
786 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
787 my $fo = $stats->{+CS_STAT_FOOD} * 1;
788 my $fo_m = 999;
789 my $gr = $stats->{+CS_STAT_GRACE} * 1;
790 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
791
792 $GAUGES->{hp} ->set_value ($hp, $hp_m);
793 $GAUGES->{mana} ->set_value ($sp, $sp_m);
794 $GAUGES->{food} ->set_value ($fo, $fo_m);
795 $GAUGES->{grace} ->set_value ($gr, $gr_m);
796 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
797 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
798 my $rng = $stats->{+CS_STAT_RANGE};
799 $rng =~ s/^Range: //; # thank you so much dear server
800 $GAUGES->{range} ->set_text ("Rng: " . $rng);
801 my $title = $stats->{+CS_STAT_TITLE};
802 $title =~ s/^Player: //;
803 $STATWIDS->{title} ->set_text ("Title: " . $title);
804
805 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
806 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
807 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
808 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
809 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818
819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820
821 my %tbl = (
822 phys => CS_STAT_RES_PHYS,
823 magic => CS_STAT_RES_MAG,
824 fire => CS_STAT_RES_FIRE,
825 elec => CS_STAT_RES_ELEC,
826 cold => CS_STAT_RES_COLD,
827 conf => CS_STAT_RES_CONF,
828 acid => CS_STAT_RES_ACID,
829 drain => CS_STAT_RES_DRAIN,
830 ghit => CS_STAT_RES_GHOSTHIT,
831 pois => CS_STAT_RES_POISON,
832 slow => CS_STAT_RES_SLOW,
833 para => CS_STAT_RES_PARA,
834 tund => CS_STAT_TURN_UNDEAD,
835 fear => CS_STAT_RES_FEAR,
836 depl => CS_STAT_RES_DEPLETE,
837 deat => CS_STAT_RES_DEATH,
838 holyw => CS_STAT_RES_HOLYWORD,
839 blind => CS_STAT_RES_BLIND,
840 );
841
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl;
844}
845
846my $METASERVER_ATIME; 819my $METASERVER_ATIME;
847 820
848sub update_metaserver { 821sub update_metaserver {
822 my ($metaserver_dialog) = @_;
823
824 $METASERVER = $metaserver_dialog
825 if defined $metaserver_dialog;
826
849 return if $METASERVER_ATIME > time; 827 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 828 $METASERVER_ATIME = time + 60;
851 829
852 my $table = $METASERVER->{table}; 830 my $table = $METASERVER->{table};
853 $table->clear; 831 $table->clear;
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 897 (new CFClient::UI::Button
920 text => "Use", 898 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 899 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 900 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 902 $METASERVER->hide;
903 0
925 }, 904 },
926 ), 905 ),
927 (new CFClient::UI::Empty expand => 1), 906 (new CFClient::UI::Empty expand => 1),
928 ]); 907 ]);
929 908
940 } 919 }
941 }); 920 });
942} 921}
943 922
944sub metaserver_dialog { 923sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox;
925 my $table = new CFClient::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
927
945 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 929 title => "Server List",
947 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
948 x => 'center', 931 x => 'center',
949 y => 'center', 932 y => 'center',
950 z => 3, 933 z => 3,
951 force_h => $::HEIGHT * 0.4, 934 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
953 on_visibility_change => sub { 938 on_visibility_change => sub {
954 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
940 0
955 }, 941 },
956 ; 942 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 943
962 $dialog 944 $dialog
963} 945}
964 946
965sub server_setup { 947sub server_setup {
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 955
974 $vbox->add ( 956 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 957 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 958 expand => 1,
977 text => $CFG->{host}, 959 text => $CFG->{profile}{default}{host},
978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 960 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979 on_changed => sub { 961 on_changed => sub {
980 my ($self, $value) = @_; 962 my ($self, $value) = @_;
981 $CFG->{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
964 0
982 } 965 }
983 ); 966 );
984
985 $METASERVER = metaserver_dialog;
986 967
987 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
988 expand => 1, 969 expand => 1,
989 text => "Server List", 970 text => "Server List",
990 other => $METASERVER, 971 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 972 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 973 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 975 );
995 } 976 }
996 977
997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 978 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
998 $table->add (1, 4, new CFClient::UI::Entry 979 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 980 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 981 tooltip => "The name of your character on the server",
1001 on_changed => sub { 982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 983 );
1006 984
1007 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 985 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1008 $table->add (1, 5, new CFClient::UI::Entry 986 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 987 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 988 hidden => 1,
1011 tooltip => "The password for your character", 989 tooltip => "The password for your character",
1012 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 991 );
1017 992
1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 993 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1019 $table->add (1, 7, new CFClient::UI::Slider 994 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 995 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 996 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 tooltip => "This is the size of the portion of the map update the server sends you. " 997 tooltip => "This is the size of the portion of the map update the server sends you. "
1023 . "If you set this to a high value you will be able to see further, " 998 . "If you set this to a high value you will be able to see further, "
1024 . "but you also increase bandwidth requirements and latency. " 999 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1000 . "This option is only used once at log-in.",
1026 on_changed => sub { 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027 my ($self, $value) = @_;
1028
1029 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030 },
1031 ); 1002 );
1032 1003
1033 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1004 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1005 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1006 state => $CFG->{face_prefetch},
1038 . "This might increase or create lag, but increases the chances " 1009 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1010 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1011 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1012 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1013 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1015 );
1045 1016
1046 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1017 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1047 $table->add (1, 9, new CFClient::UI::Entry 1018 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1019 text => $CFG->{output_count},
1049 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1020 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1050 on_changed => sub { $CFG->{output_count} = $_[1] }, 1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1022 );
1052 1023
1053 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1024 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054 $table->add (1, 10, new CFClient::UI::Entry 1025 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1026 text => $CFG->{output_sync},
1056 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1027 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1029 );
1059 1030
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1032 expand => 1,
1062 align => 0, 1033 align => 0,
1063 text => "Login", 1034 text => "Login",
1064 on_activate => sub { 1035 on_activate => sub {
1065 $CONN ? stop_game 1036 $CONN ? stop_game
1066 : start_game; 1037 : start_game;
1038 0
1067 }, 1039 },
1068 ); 1040 );
1069 1041
1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub { 1048 on_changed => sub {
1077 my ($self, $value) = @_; 1049 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1050 $CFG->{say_command} = $value;
1051 0
1079 } 1052 }
1080 ); 1053 );
1081 1054
1082 $vbox->add (new CFClient::UI::Label 1055 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1056 text => "Server Info",
1094sub message_window { 1067sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1096 name => "message_window", 1069 name => "message_window",
1097 title => "Messages", 1070 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1072 x => "max",
1101 y => 0, 1073 y => 0,
1102 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1076 child => (my $vbox = new CFClient::UI::VBox),
1077 has_close_button => 1;
1105 1078
1106 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1107 1080
1108 $vbox->add (my $input = new CFClient::UI::Entry 1081 $vbox->add (my $input = new CFClient::UI::Entry
1109 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1117 1090
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1092 $input->{refocus_map} = 1;
1120 } 1093 }
1121 delete $input->{auto_activated}; 1094 delete $input->{auto_activated};
1095
1096 0
1122 }, 1097 },
1123 on_activate => sub { 1098 on_activate => sub {
1124 my ($input, $text) = @_; 1099 my ($input, $text) = @_;
1125 $input->set_text (''); 1100 $input->set_text ('');
1126 1101
1132 } 1107 }
1133 if ($input->{refocus_map}) { 1108 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1109 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1110 $MAPWIDGET->focus_in
1136 } 1111 }
1112
1113 0
1137 }, 1114 },
1138 on_escape => sub { 1115 on_escape => sub {
1139 $MAPWIDGET->focus_in 1116 $MAPWIDGET->grab_focus;
1117
1118 0
1140 }, 1119 },
1141 ); 1120 );
1142 1121
1143 $CONSOLE = { 1122 $CONSOLE = {
1144 window => $window, 1123 window => $window,
1166 ); 1145 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1146 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1147 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1148 text => "Ok",
1170 expand => 1, 1149 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1150 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1151 );
1173 $hb->add (new CFClient::UI::Button 1152 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1153 text => "Quit anyway",
1175 expand => 1, 1154 expand => 1,
1176 on_activate => sub { exit }, 1155 on_activate => sub { exit },
1183sub autopickup_setup { 1162sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1163 my $table = new CFClient::UI::Table;
1185 1164
1186 for ( 1165 for (
1187 ["General", 0, 0, 1166 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1168 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1169 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1170 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1171 ],
1193 ["Weapons", 0, 6, 1172 ["Weapons", 0, 6,
1230 for (@bits) { 1209 for (@bits) {
1231 ++$y; 1210 ++$y;
1232 1211
1233 my $mask = $_->[1]; 1212 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1213 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1215 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1216 on_changed => sub {
1238 my ($box, $value) = @_; 1217 my ($box, $value) = @_;
1239 1218
1240 if ($value) { 1219 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1220 $::CFG->{pickup} |= $mask;
1243 $::CFG->{pickup} &= ~$mask; 1222 $::CFG->{pickup} &= ~$mask;
1244 } 1223 }
1245 1224
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1226 if defined $::CONN;
1227
1228 0
1248 }); 1229 });
1230
1231 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1232 }
1250 } 1233 }
1251 1234
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1235 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1237 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1238 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1239 on_changed => sub {
1256 my ($slider, $value) = @_; 1240 my ($slider, $value) = @_;
1257 1241
1258 $::CFG->{pickup} &= ~0x7; 1242 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1243 $::CFG->{pickup} |= int $value
1260 if $value; 1244 if $value;
1261 1; 1245 1;
1262 }); 1246 });
1247
1263 $table->add (3, 18, new CFClient::UI::Button 1248 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1249 text => "set",
1265 on_activate => sub { 1250 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1251 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1252 if defined $::CONN;
1268 1; 1253 0
1269 }); 1254 });
1270 1255
1271 $table 1256 $table
1272} 1257}
1273 1258
1274sub inventory_window { 1259sub inventory_widget {
1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1261
1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264
1265 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1266
1267 use sort 'stable';
1268
1269 $hb1->add (new CFClient::UI::Combobox
1270 value => undef,
1271 options => [
1272 [undef, "Type/Name"],
1273 [
1274 sub { sort {
1275 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1276 or $a->{type} <=> $b->{type}
1277 } @_ },
1278 "Weight/Type",
1279 ],
1280 [sub { } => "#TODO#"],
1281 ],
1282 on_changed => sub {
1283 $INV->set_sort_order ($_[1]);
1284 },
1285 );
1286 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1287 #TODO# update to weigh/maxweight
1288 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1289
1290 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1291 $sw1->add ($INV = new CFClient::UI::Inventory);
1292
1293 $hb->add (my $vb2 = new CFClient::UI::VBox);
1294
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1296
1297 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1298 $sw2->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 {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1319 x => "center",
1277 y => "center", 1320 y => "center",
1278 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1323 title => "Player",
1324 name => "playerbook",
1325 has_close_button => 1
1281 ; 1326 ;
1282 1327
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1328 my $ntb =
1329 $PL_NOTEBOOK =
1330 new CFClient::UI::Notebook expand => 1, debug => 1;
1284 1331
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1332 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1333 "Statistics (F2)" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1334 "Shows statistics, where all your Stats and Resistances are shown."
1335 );
1336 $ntb->add (
1337 "Skills (F3)" => $SKILL_PAGE = skill_window,
1338 "Shows all your Skills."
1339 );
1288 1340
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1341 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1342 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1343 $ntb->add (
1344 "Spellbook (F4)" => $spellsw,
1345 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1346 );
1347 $ntb->add (
1348 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1349 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1350 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1351 );
1290 1352
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1353 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1354
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1355 $plwin->add ($ntb);
1294 1356 $plwin
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299} 1357}
1300 1358
1301sub spell_setup { 1359sub update_bindings {
1302 new CFClient::UI::SpellList 1360 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1361}
1304 1362
1305sub keyboard_setup { 1363sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1364 my $binding_list = new CFClient::UI::VBox;
1307 1365
1308 my $refresh; 1366 my $refresh;
1309 $refresh = sub { 1367 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1368 $binding_list->clear ();
1311 1369
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1370 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1371 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1372 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1373 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1374
1317 my $lbl = join "; ", @$cmds; 1375 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1376 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1377 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1378 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1379 text => "delete",
1322 tooltip => "Deletes the binding", 1380 tooltip => "Deletes the binding",
1323 on_activate => sub { 1381 on_activate => sub {
1324 $binding_list->remove ($hb); 1382 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1383 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1384 0
1326 }); 1385 });
1327 1386
1328 $hb->add (new CFClient::UI::Button 1387 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1388 text => "edit",
1330 tooltip => "Edits the binding", 1389 tooltip => "Edits the binding",
1331 on_activate => sub { 1390 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1391 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1392 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1393 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1394 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1395 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1396 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1397 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1398 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1399 $SETUP_DIALOG->show;
1341 }, 1400 },
1342 sub { 1401 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1402 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1403 $SETUP_DIALOG->show;
1345 }); 1404 });
1346 $::BIND_EDITOR->show; 1405 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1406 $SETUP_DIALOG->hide;
1407 0
1348 }); 1408 });
1349 1409
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1410 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1411 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1412 }
1361 state => $CFG->{shift_fire_stop}, 1421 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1422 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub { 1423 on_changed => sub {
1364 my ($cbox, $value) = @_; 1424 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value; 1425 $CFG->{shift_fire_stop} = $value;
1426 0
1366 }); 1427 });
1367 1428
1368 $vb->add ($binding_list); 1429 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox); 1430 $vb->add (my $hb = new CFClient::UI::HBox);
1370 1431
1374 tooltip => "This button opens the binding editor with an empty binding.", 1435 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub { 1436 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [], 1437 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub { 1438 sub {
1378 my ($mod, $sym, $cmds) = @_; 1439 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1440 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380 $refresh->(); 1441 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1442 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show; 1443 $SETUP_DIALOG->show;
1383 }, 1444 },
1384 sub { 1445 sub {
1386 $SETUP_DIALOG->show; 1447 $SETUP_DIALOG->show;
1387 }, 1448 },
1388 ); 1449 );
1389 $SETUP_DIALOG->hide; 1450 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show; 1451 $::BIND_EDITOR->show;
1452 0
1391 }, 1453 },
1392 ); 1454 );
1393 1455
1394 $hb->add (new CFClient::UI::Button 1456 $hb->add (new CFClient::UI::Button
1395 text => "close", 1457 text => "close",
1396 tooltip => "Closes the binding window", 1458 tooltip => "Closes the binding window",
1397 expand => 1, 1459 expand => 1,
1398 on_activate => sub { 1460 on_activate => sub {
1399 $SETUP_DIALOG->hide; 1461 $SETUP_DIALOG->hide;
1462 0
1400 } 1463 }
1401 ); 1464 );
1402 1465
1403 $refresh->(); 1466 $refresh->();
1404 1467
1405 $vb 1468 $vb
1469}
1470
1471# just weirdness, pls. ignore
1472sub load_html_page {
1473 my ($viewer, $base) = @_;
1474
1475 $viewer->clear;
1476
1477 require LWP::Simple;
1478 require HTML::Parser;
1479 require URI;
1480
1481 my $page = LWP::Simple::get ($base)
1482 or return;
1483
1484 my @s = { };
1485 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1486
1487 my $parser = HTML::Parser->new (
1488 text_h => [sub {
1489 my ($text) = @_;
1490 $text =~ s/\s+/ /g;
1491 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1492 }, "dtext"],
1493 start_h => [sub {
1494 my ($tag, $attr) = @_;
1495 if ($passthrough{$tag}) {
1496 $s[-1]{text} .= "<$tag>";
1497 } elsif ($tag eq "h1") {
1498 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1499 } elsif ($tag eq "h2") {
1500 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1501 } elsif ($tag eq "h3") {
1502 push @s, { text => "<span size='large'>" };
1503 } elsif ($tag eq "a") {
1504 push @s, { text => "", url => $attr->{href} };
1505 } elsif ($tag eq "p") {
1506 push @s, { };
1507 } elsif ($tag eq "img") {
1508 eval {
1509 push @{$s[-1]{obj}}, new CFClient::UI::Image
1510 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1511 $s[-1]{text} .= "\x{fffc}";
1512 };
1513 }
1514 }, "tagname, attr"],
1515 end_h => [sub {
1516 my ($tag) = @_;
1517 if ($passthrough{$tag}) {
1518 $s[-1]{text} .= "</$tag>";
1519 } elsif ($tag =~ /^h\d$/) {
1520 $s[-1]{text} .= "</span>";
1521 push @s, { };
1522 } elsif ($tag eq "a") {
1523 my $S = pop @s;
1524 $s[-1]{text} .= "\x{fffc}";
1525 push @{$s[-1]{obj}}, new CFClient::UI::Label
1526 fg => [0.8, 0.8, 1],
1527 markup => "<u>$S->{text}</u>",
1528 fontsize => 0.8,
1529 can_events => 1,
1530 can_focus => 1,
1531 on_button_up => sub {
1532 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1533 },
1534 ;
1535 }
1536 }, "tagname"],
1537 );
1538
1539 $parser->parse ($page);
1540 $parser->eof;
1541
1542 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1543 for @s;
1544
1545 $viewer->set_offset (0);
1406} 1546}
1407 1547
1408sub help_window { 1548sub help_window {
1409 my $win = new CFClient::UI::FancyFrame 1549 my $win = new CFClient::UI::FancyFrame
1410 x => 'center', 1550 x => 'center',
1411 y => 'center', 1551 y => 'center',
1412 z => 2, 1552 z => 2,
1413 name => 'doc_browser', 1553 name => 'doc_browser',
1414 force_w => int $WIDTH * 7/8, 1554 force_w => int $WIDTH * 7/8,
1415 force_h => int $HEIGHT * 7/8, 1555 force_h => int $HEIGHT * 7/8,
1416 title => "Documentation"; 1556 title => "Help Browser",
1557 has_close_button => 1;
1417 1558
1418 $win->add (my $vbox = new CFClient::UI::VBox); 1559 $win->add (my $vbox = new CFClient::UI::VBox);
1419 1560
1420 $vbox->add (my $buttons = new CFClient::UI::HBox); 1561 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1562 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1565 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox 1566 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef, 1567 value => undef,
1427 options => [ 1568 options => [
1428 [intro => "Introduction"], 1569 [intro => "Introduction"],
1429 [manual => "Manual"], 1570 [manual => "Main Manual"],
1430 [skill_help => "Skills"], 1571 [skill_help => "Skill Reference"],
1431 [command_help => "Commands"], 1572 [command_help => "Command Reference"],
1432 [dmcommand_help => "DM Commands"], 1573 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"], 1574 [COPYING => "License Terms"],
1575 [test => "test (do not select)"], #d#TODO
1434 ], 1576 ],
1435 on_changed => sub { 1577 on_changed => sub {
1436 my ($self, $pod) = @_; 1578 my ($self, $pod) = @_;
1437 1579
1580 if ($pod eq "test") {#d#TODO
1581 eval {
1582 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1583 };
1584 warn "$@" if $@;
1585 return;
1586 }
1587
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1588 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1589 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440 1590
1441 $viewer->clear; 1591 $viewer->clear;
1592
1593# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1594# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1595# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1596# ]);#d#
1442 1597
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1598 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom; 1599 for @$pom;
1445 1600
1446 $viewer->set_offset (0); 1601 $viewer->set_offset (0);
1602
1603 0
1447 }, 1604 },
1448 on_visibility_change => sub { 1605 on_visibility_change => sub {
1449 my ($self, $visible) = @_; 1606 my ($self, $visible) = @_;
1450 return unless $visible; 1607 return unless $visible;
1451 return if $self->{value}; 1608 return if $self->{value};
1452 $self->set_value ("intro"); 1609 $self->set_value ("intro");
1610 0
1453 }, 1611 },
1454 ); 1612 );
1455 1613
1456 $win 1614 $win
1457} 1615}
1496 z => 100, 1654 z => 100,
1497 force_x => "max", 1655 force_x => "max",
1498 force_y => 0; 1656 force_y => 0;
1499 $DEBUG_STATUS->show; 1657 $DEBUG_STATUS->show;
1500 1658
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1659 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1502 1660
1503 $STATUSBOX = new CFClient::UI::Statusbox; 1661 $STATUSBOX = new CFClient::UI::Statusbox;
1504 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1662 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505 1663
1506 (new CFClient::UI::Frame 1664 (new CFClient::UI::Frame
1515 name => "mapmap", 1673 name => "mapmap",
1516 x => 0, 1674 x => 0,
1517 y => $FONTSIZE + 8, 1675 y => $FONTSIZE + 8,
1518 border_bg => [1, 1, 1, 192/255], 1676 border_bg => [1, 1, 1, 192/255],
1519 bg => [1, 1, 1, 0], 1677 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1678 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1679 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523 ), 1680 ),
1524 )->show; 1681 )->show;
1525 1682
1527 $MAPWIDGET->connect (activate_console => sub { 1684 $MAPWIDGET->connect (activate_console => sub {
1528 my ($mapwidget, $preset) = @_; 1685 my ($mapwidget, $preset) = @_;
1529 1686
1530 if ($CONSOLE) { 1687 if ($CONSOLE) {
1531 $CONSOLE->{input}->{auto_activated} = 1; 1688 $CONSOLE->{input}->{auto_activated} = 1;
1532 $CONSOLE->{input}->focus_in; 1689 $CONSOLE->{input}->grab_focus;
1533 1690
1534 if ($preset && $CONSOLE->{input}->get_text eq '') { 1691 if ($preset && $CONSOLE->{input}->get_text eq '') {
1535 $CONSOLE->{input}->set_text ($preset); 1692 $CONSOLE->{input}->set_text ($preset);
1536 } 1693 }
1537 } 1694 }
1538 }); 1695 });
1539 $MAPWIDGET->show; 1696 $MAPWIDGET->show;
1540 $MAPWIDGET->focus_in; 1697 $MAPWIDGET->grab_focus;
1541 1698
1542 $LOGVIEW = new CFClient::UI::TextScroller 1699 $LOGVIEW = new CFClient::UI::TextScroller
1543 expand => 1, 1700 expand => 1,
1544 font => $FONT_FIXED, 1701 font => $FONT_FIXED,
1545 fontsize => $::CFG->{log_fontsize}, 1702 fontsize => $::CFG->{log_fontsize},
1555 x => 'center', 1712 x => 'center',
1556 y => 'center', 1713 y => 'center',
1557 z => 2, 1714 z => 2,
1558 force_w => $::WIDTH * 0.6, 1715 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6, 1716 force_h => $::HEIGHT * 0.6,
1717 has_close_button => 1,
1560 ; 1718 ;
1719
1720 $METASERVER = metaserver_dialog;
1561 1721
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1722 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1723 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564 1724
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1725 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1729 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1730 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1731 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music."); 1732 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1733 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings." 1734 "Lets you define, edit and delete key bindings."
1575 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1735 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1576 . "with nothing set and the recording started. After doing the actions you " 1736 . "with nothing set and the recording started. After doing the actions you "
1577 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1737 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1578 . "After pressing the combo the binding will be saved automatically and the " 1738 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes"); 1739 . "binding editor closes");
1580 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1740 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask."); 1741 "Some debuggin' options. Do not ask.");
1584 1742
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1743 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586 1744
1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1745 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1588 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1746 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1590 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1591 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1749 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592 1750
1593 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 1751 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
1594 1752
1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1596 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1597 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1753 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1598 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1754 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1599 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1600 1755
1601 $BUTTONBAR->add (new CFClient::UI::Button 1756 $BUTTONBAR->add (new CFClient::UI::Button
1602 text => "Save Config", 1757 text => "Save Config",
1603 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1758 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1604 on_activate => sub { 1759 on_activate => sub {
1605 $::CFG->{layout} = CFClient::UI::get_layout; 1760 $::CFG->{layout} = CFClient::UI::get_layout;
1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1761 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607 status "Configuration Saved"; 1762 status "Configuration Saved";
1763 0
1608 }, 1764 },
1609 ); 1765 );
1610 1766
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1767 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612 tooltip => "View Documentation"); 1768 tooltip => "View Documentation");
1613 1769
1614 $BUTTONBAR->add (new CFClient::UI::Button 1770 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Quit", 1771 text => "Quit",
1616 tooltip => "Terminates the program", 1772 tooltip => "Terminates the program",
1618 if ($CONN) { 1774 if ($CONN) {
1619 open_quit_dialog; 1775 open_quit_dialog;
1620 } else { 1776 } else {
1621 exit; 1777 exit;
1622 } 1778 }
1779 0
1623 }, 1780 },
1624 ); 1781 );
1625 1782
1626 $BUTTONBAR->show; 1783 $BUTTONBAR->show;
1627 $SETUP_DIALOG->show; 1784 $SETUP_DIALOG->show;
1821# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1978# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1822 }, 1979 },
1823 CFClient::SDL_KEYDOWN => sub { 1980 CFClient::SDL_KEYDOWN => sub {
1824 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1981 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1825 # alt-enter 1982 # alt-enter
1983 $FULLSCREEN_ENABLE->toggle;
1826 video_shutdown; 1984 video_shutdown;
1827 $CFG->{fullscreen} = !$CFG->{fullscreen};
1828 video_init; 1985 video_init;
1829 } else { 1986 } else {
1830 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1987 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1831 } 1988 }
1832 }, 1989 },
1848$SIG{INT} = $SIG{TERM} = sub { exit }; 2005$SIG{INT} = $SIG{TERM} = sub { exit };
1849 2006
1850{ 2007{
1851 local $SIG{__DIE__} = sub { 2008 local $SIG{__DIE__} = sub {
1852 return unless defined $^S && !$^S; 2009 return unless defined $^S && !$^S;
1853 Carp::confess $_[1];#d#TODO: remove when stable 2010 Carp::confess $_[0];#d#TODO: remove when stable
1854 CFClient::fatal $_[0]; 2011 CFClient::fatal $_[0];
1855 }; 2012 };
1856 2013
1857 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2014 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1858 CFClient::UI::set_layout ($::CFG->{layout}); 2015 CFClient::UI::set_layout ($::CFG->{layout});
1859 2016
1860 my %DEF_CFG = ( 2017 my %DEF_CFG = (
1861 sdl_mode => 0, 2018 sdl_mode => 0,
1862 width => 640, 2019 width => 640,
1863 height => 480, 2020 height => 480,
1864 fullscreen => 0, 2021 fullscreen => 0,
1865 fast => 0, 2022 fast => 0,
1866 map_scale => 1, 2023 map_scale => 1,
1867 fow_enable => 1, 2024 fow_enable => 1,
1868 fow_intensity => 0.45, 2025 fow_intensity => 0.45,
1869 fow_smooth => 0, 2026 fow_smooth => 0,
1870 gui_fontsize => 1, 2027 gui_fontsize => 1,
1871 log_fontsize => 0.7, 2028 log_fontsize => 0.7,
1872 gauge_fontsize=> 1, 2029 gauge_fontsize => 1,
1873 gauge_size => 0.35, 2030 gauge_size => 0.35,
1874 stat_fontsize => 0.7, 2031 stat_fontsize => 0.7,
1875 mapsize => 100, 2032 mapsize => 100,
1876 host => "crossfire.schmorp.de",
1877 say_command => 'say', 2033 say_command => 'say',
1878 audio_enable => 1, 2034 audio_enable => 1,
1879 bgm_enable => 1, 2035 bgm_enable => 1,
1880 bgm_volume => 0.25, 2036 bgm_volume => 0.25,
1881 face_prefetch => 0, 2037 face_prefetch => 0,
1882 output_sync => 1, 2038 output_sync => 1,
1883 output_count => 1, 2039 output_count => 1,
1884 pickup => 0, 2040 pickup => 0,
2041 default => "profile", # default profile
2042 );
1885 ); 2043
1886
1887 while (my ($k, $v) = each %DEF_CFG) { 2044 while (my ($k, $v) = each %DEF_CFG) {
1888 $CFG->{$k} = $v unless exists $CFG->{$k}; 2045 $CFG->{$k} = $v unless exists $CFG->{$k};
1889 } 2046 }
2047
2048 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1890 2049
1891 sdl_init; 2050 sdl_init;
1892 2051
1893 @SDL_MODES = reverse 2052 @SDL_MODES = reverse
1894 grep $_->[0] >= 640 && $_->[1] >= 480, 2053 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines