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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.98 by root, Sat Jul 22 13:20:33 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;
410 $SPELL_PAGE->clear_spells;
368 411
369 return unless $CONN; 412 return unless $CONN;
370 413
371 status "connection closed"; 414 status "connection closed";
372 415
373 destroy_query_dialog $CONN; 416 destroy_query_dialog $CONN;
374 $CONN->destroy; 417 $CONN->destroy;
375 $CONN = 0; # false, does not autovivify 418 $CONN = 0; # false, does not autovivify
419
420 undef $MAP;
376} 421}
377 422
378sub graphics_setup { 423sub graphics_setup {
379 my $vbox = new CFClient::UI::VBox; 424 my $vbox = new CFClient::UI::VBox;
380 425
395 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
396 441
397 my $row = 1; 442 my $row = 1;
398 443
399 $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");
400 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
401 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
402 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
403 on_changed => sub { 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
404 my ($self, $value) = @_;
405 $CFG->{fullscreen} = $value;
406 }
407 ); 449 );
408 450
409 $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");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 452 $table->add (1, $row++, new CFClient::UI::CheckBox
411 state => $CFG->{fast}, 453 state => $CFG->{fast},
412 tooltip => "Lower the visual quality considerably to speed up rendering.", 454 tooltip => "Lower the visual quality considerably to speed up rendering.",
413 on_changed => sub { 455 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
414 my ($self, $value) = @_;
415 $CFG->{fast} = $value;
416 }
417 ); 456 );
418 457
419 $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");
420 $table->add (1, $row++, new CFClient::UI::Slider 459 $table->add (1, $row++, new CFClient::UI::Slider
421 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 460 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
422 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 461 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
423 on_changed => sub { 462 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
424 my ($self, $value) = @_;
425 $CFG->{map_scale} = 2 ** $value;
426 }
427 ); 463 );
428 464
429 $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");
430 $table->add (1, $row++, new CFClient::UI::CheckBox 466 $table->add (1, $row++, new CFClient::UI::CheckBox
431 state => $CFG->{fow_enable}, 467 state => $CFG->{fow_enable},
432 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.",
433 on_changed => sub { 469 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
434 my ($self, $value) = @_;
435 $CFG->{fow_enable} = $value;
436 }
437 ); 470 );
438 471
439 $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");
440 $table->add (1, $row++, new CFClient::UI::Slider 473 $table->add (1, $row++, new CFClient::UI::Slider
441 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 474 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
442 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.",
443 on_changed => sub { 476 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
444 my ($self, $value) = @_;
445 $CFG->{fow_intensity} = $value;
446 }
447 ); 477 );
448 478
449 $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");
450 $table->add (1, $row++, new CFClient::UI::CheckBox 480 $table->add (1, $row++, new CFClient::UI::CheckBox
451 state => $CFG->{fow_smooth}, 481 state => $CFG->{fow_smooth},
452 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.",
453 on_changed => sub { 483 on_changed => sub {
454 my ($self, $value) = @_; 484 my ($self, $value) = @_;
455 $CFG->{fow_smooth} = $value; 485 $CFG->{fow_smooth} = $value;
456 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
457 } 488 }
458 ); 489 );
459 490
460 $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");
461 $table->add (1, $row++, new CFClient::UI::Slider 492 $table->add (1, $row++, new CFClient::UI::Slider
462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 493 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
463 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.",
464 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 495 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
465 ); 496 );
466 497
467 $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");
468 $table->add (1, $row++, new CFClient::UI::Slider 499 $table->add (1, $row++, new CFClient::UI::Slider
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 500 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
470 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.",
471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 502 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 );
473
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
475
476 $table->add (1, $row++, new CFClient::UI::Slider
477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
479 on_changed => sub {
480 $CFG->{stat_fontsize} = $_[1];
481 &set_stats_window_fontsize;
482 }
483 ); 503 );
484 504
485 $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");
486 $table->add (1, $row++, new CFClient::UI::Slider 506 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 507 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 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.",
489 on_changed => sub { 509 on_changed => sub {
490 $CFG->{gauge_fontsize} = $_[1]; 510 $CFG->{gauge_fontsize} = $_[1];
491 &set_gauge_window_fontsize; 511 &set_gauge_window_fontsize;
512 0
492 } 513 }
493 ); 514 );
494 515
495 $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");
496 $table->add (1, $row++, new CFClient::UI::Slider 517 $table->add (1, $row++, new CFClient::UI::Slider
497 range => [$CFG->{gauge_size}, 0.2, 0.8], 518 range => [$CFG->{gauge_size}, 0.2, 0.8],
498 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.",
499 on_changed => sub { 520 on_changed => sub {
500 $CFG->{gauge_size} = $_[1]; 521 $CFG->{gauge_size} = $_[1];
501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 522 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
523 0
502 } 524 }
503 ); 525 );
504 526
505 $table->add (1, $row++, new CFClient::UI::Button 527 $table->add (1, $row++, new CFClient::UI::Button
506 expand => 1, align => 0, text => "Apply", 528 expand => 1, align => 0, text => "Apply",
507 tooltip => "Apply the video settings", 529 tooltip => "Apply the video settings",
508 on_activate => sub { 530 on_activate => sub {
509 video_shutdown (); 531 video_shutdown ();
510 video_init (); 532 video_init ();
533 0
511 } 534 }
512 ); 535 );
513 536
514 $vbox 537 $vbox
515} 538}
523 546
524 $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");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 548 $table->add (1, $row++, new CFClient::UI::CheckBox
526 state => $CFG->{audio_enable}, 549 state => $CFG->{audio_enable},
527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
528 on_changed => sub { 551 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 $CFG->{audio_enable} = $_[1];
530 }
531 ); 552 );
532# $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");
533# $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 {
534# $CFG->{effects_volume} = $_[1]; 555# $CFG->{effects_volume} = $_[1];
535# }); 556# });
536 $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");
537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 558 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
538 $hbox->add (new CFClient::UI::CheckBox 559 $hbox->add (new CFClient::UI::CheckBox
539 expand => 1, state => $CFG->{bgm_enable}, 560 expand => 1, state => $CFG->{bgm_enable},
540 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.",
541 on_changed => sub { 562 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
542 $CFG->{bgm_enable} = $_[1];
543 }
544 ); 563 );
545 $hbox->add (new CFClient::UI::Slider 564 $hbox->add (new CFClient::UI::Slider
546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 565 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
547 tooltip => "The volume of the background music. Changes are instant.", 566 tooltip => "The volume of the background music. Changes are instant.",
548 on_changed => sub { 567 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
549 $CFG->{bgm_volume} = $_[1];
550 CFClient::MixMusic::volume $_[1] * 128;
551 }
552 ); 568 );
553 569
554 $table->add (1, $row++, new CFClient::UI::Button 570 $table->add (1, $row++, new CFClient::UI::Button
555 expand => 1, align => 0, text => "Apply", 571 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the audio settings", 572 tooltip => "Apply the audio settings",
557 on_activate => sub { 573 on_activate => sub {
558 audio_shutdown (); 574 audio_shutdown ();
559 audio_init (); 575 audio_init ();
576 0
560 } 577 }
561 ); 578 );
562 579
563 $vbox 580 $vbox
564}
565
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570} 581}
571 582
572sub set_gauge_window_fontsize { 583sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 584 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 585 $_->set_fontsize ($::CFG->{gauge_fontsize});
630 641
631sub debug_setup { 642sub debug_setup {
632 my $table = new CFClient::UI::Table; 643 my $table = new CFClient::UI::Table;
633 644
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 645 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $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 });
636 $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");
637 $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 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 649 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $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 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 651 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $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 });
642 653
643 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);
644 655
645 for my $x (0..2) { 656 for my $x (0..2) {
646 for my $y (0 .. 2) { 657 for my $y (0 .. 2) {
655 666
656 $table 667 $table
657} 668}
658 669
659sub stats_window { 670sub stats_window {
660 my $tgw = new CFClient::UI::FancyFrame 671 my $r = new CFClient::UI::ScrolledWindow (
661 y => $HEIGHT * (2/8), 672 expand => 1,
662 x => "max", 673 scroll_y => 1
663 title => "Stats", 674 );
664 name => "stats_window"; 675 $r->add (my $vb = new CFClient::UI::VBox);
665 676
666 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
667 $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,
668 can_hover => 1, can_events => 1, 678 can_hover => 1, can_events => 1,
669 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.");
670 $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,
671 can_hover => 1, can_events => 1, 681 can_hover => 1, can_events => 1,
684 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
685 695
686 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
687 697
688 for ( 698 for (
689 [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],
690 [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],
691 [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],
692 [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],
693 [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],
694 [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],
695 [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],
696 706
697 [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],
698 [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],
699 [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],
700 [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],
701 [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],
702 [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],
703 ) { 713 ) {
704 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
705 715
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
707 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});
708 $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
709 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});
710 } 722 }
711 723
712 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
713 725
714 my $row = 0; 726 my $row = 0;
715 my $col = 0; 727 my $col = 0;
716 728
717 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
718 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",
719 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",
720 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",
721 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",
722 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",
723 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",
724 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",
725 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",
726 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
727 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",
728 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
729 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",
730 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",
731 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",
732 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",
733 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",
734 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",
735 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)"],
736 ); 766 );
737 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
738 drain acid pois para deat phys 768 drain acid pois para deat phys
739 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
740 { 770 {
745 template => "-100%", 775 template => "-100%",
746 align => +1, 776 align => +1,
747 valign => 0, 777 valign => 0,
748 can_events => 1, 778 can_events => 1,
749 can_hover => 1, 779 can_hover => 1,
750 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
751 ); 781 );
752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
753 font => $FONT_FIXED, 783 font => $FONT_FIXED,
754 can_hover => 1, 784 can_hover => 1,
755 can_events => 1, 785 can_events => 1,
756 image => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
757 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],
758 ); 795 );
759 796
760 $row++; 797 $row++;
761 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
762 $col += 2; 799 $col += 3;
763 $row = 0; 800 $row = 0;
764 } 801 }
765 } 802 }
766 803
767 &set_stats_window_fontsize;
768 update_stats_window ({}); 804 #update_stats_window ({});
769 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]);
770 $tgw 812 $sw
771} 813}
772 814
773sub formsep($) { 815sub formsep($) {
774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
775} 817}
776 818
777sub update_stats_window {
778 my ($stats) = @_;
779
780 # I love text protocols...
781
782 my $hp = $stats->{+CS_STAT_HP} * 1;
783 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
784 my $sp = $stats->{+CS_STAT_SP} * 1;
785 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
786 my $fo = $stats->{+CS_STAT_FOOD} * 1;
787 my $fo_m = 999;
788 my $gr = $stats->{+CS_STAT_GRACE} * 1;
789 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
790
791 $GAUGES->{hp} ->set_value ($hp, $hp_m);
792 $GAUGES->{mana} ->set_value ($sp, $sp_m);
793 $GAUGES->{food} ->set_value ($fo, $fo_m);
794 $GAUGES->{grace} ->set_value ($gr, $gr_m);
795 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
796 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
797 my $rng = $stats->{+CS_STAT_RANGE};
798 $rng =~ s/^Range: //; # thank you so much dear server
799 $GAUGES->{range} ->set_text ("Rng: " . $rng);
800 my $title = $stats->{+CS_STAT_TITLE};
801 $title =~ s/^Player: //;
802 $STATWIDS->{title} ->set_text ("Title: " . $title);
803
804 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
805 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
806 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
807 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
808 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
809 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
810 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
811 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
812 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
813 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
814 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
815 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
816 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
817
818 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
819
820 # TODO: replace by CS_STAT_RES_xxx constants
821 my %tbl = (
822 phys => 100,
823 magic => 101,
824 fire => 102,
825 elec => 103,
826 cold => 104,
827 conf => 105,
828 acid => 106,
829 drain => 107,
830 ghit => 108,
831 pois => 109,
832 slow => 110,
833 para => 111,
834 tund => 112,
835 fear => 113,
836 depl => 113,
837 deat => 115,
838 holyw => 116,
839 blind => 117,
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 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1265 $sw1->add ($INV = new CFClient::UI::Inventory);
1266
1267 $hb->add (my $vb2 = new CFClient::UI::VBox);
1268
1269 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1270
1271 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 $sw2->add ($INVR = new CFClient::UI::Inventory);
1273
1274 # XXX: Call after $INVR = ... because set_opencont sets the items
1275 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1276
1277 $hb
1278}
1279
1280sub toggle_player_page {
1281 my ($widget) = @_;
1282
1283 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1284 $PL_WINDOW->hide;
1285 } else {
1286 $PL_NOTEBOOK->set_current_page ($widget);
1287 $PL_WINDOW->show;
1288 }
1289}
1290
1291sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1292 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1293 x => "center",
1277 y => "center", 1294 y => "center",
1278 force_w => $WIDTH * 9/10, 1295 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1296 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1297 title => "Player",
1298 name => "playerbook",
1299 has_close_button => 1
1281 ; 1300 ;
1282 1301
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1302 my $ntb =
1303 $PL_NOTEBOOK =
1304 new CFClient::UI::Notebook expand => 1, debug => 1;
1284 1305
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1306 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1307 "Statistics (F2)" => $STATS_PAGE = stats_window,
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1308 "Shows statistics, where all your Stats and Resistances are shown."
1309 );
1310 $ntb->add (
1311 "Skills (F3)" => $SKILL_PAGE = skill_window,
1312 "Shows all your Skills."
1313 );
1288 1314
1289 $hb->add (my $vb2 = new CFClient::UI::VBox); 1315 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1316 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1317 $ntb->add (
1318 "Spellbook (F4)" => $spellsw,
1319 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1320 );
1321 $ntb->add (
1322 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1323 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1324 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1325 );
1290 1326
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1328
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1329 $plwin->add ($ntb);
1294 1330 $plwin
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299} 1331}
1300 1332
1301sub spell_setup { 1333sub update_bindings {
1302 new CFClient::UI::SpellList 1334 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1335}
1304 1336
1305sub keyboard_setup { 1337sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1338 my $binding_list = new CFClient::UI::VBox;
1307 1339
1308 my $refresh; 1340 my $refresh;
1309 $refresh = sub { 1341 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1342 $binding_list->clear ();
1311 1343
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1344 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1345 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1346 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1347 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1348
1317 my $lbl = join "; ", @$cmds; 1349 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1350 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1351 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1352 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1353 text => "delete",
1322 tooltip => "Deletes the binding", 1354 tooltip => "Deletes the binding",
1323 on_activate => sub { 1355 on_activate => sub {
1324 $binding_list->remove ($hb); 1356 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1357 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1358 0
1326 }); 1359 });
1327 1360
1328 $hb->add (new CFClient::UI::Button 1361 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1362 text => "edit",
1330 tooltip => "Edits the binding", 1363 tooltip => "Edits the binding",
1331 on_activate => sub { 1364 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1365 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1366 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1367 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1368 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1369 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1370 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1371 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1372 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1373 $SETUP_DIALOG->show;
1341 }, 1374 },
1342 sub { 1375 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1376 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1377 $SETUP_DIALOG->show;
1345 }); 1378 });
1346 $::BIND_EDITOR->show; 1379 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1380 $SETUP_DIALOG->hide;
1381 0
1348 }); 1382 });
1349 1383
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1384 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1385 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1386 }
1353 } 1387 }
1354 }; 1388 };
1355 1389
1356 my $vb = new CFClient::UI::VBox; 1390 my $vb = new CFClient::UI::VBox;
1391 $vb->add (my $hb = new CFClient::UI::HBox);
1392 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1393 $hb->add (new CFClient::UI::CheckBox
1394 expand => 1,
1395 state => $CFG->{shift_fire_stop},
1396 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1397 on_changed => sub {
1398 my ($cbox, $value) = @_;
1399 $CFG->{shift_fire_stop} = $value;
1400 0
1401 });
1402
1357 $vb->add ($binding_list); 1403 $vb->add ($binding_list);
1358 $vb->add (my $hb = new CFClient::UI::HBox); 1404 $vb->add (my $hb = new CFClient::UI::HBox);
1359 1405
1360 $hb->add (new CFClient::UI::Button 1406 $hb->add (new CFClient::UI::Button
1361 text => "record new", 1407 text => "record new",
1363 tooltip => "This button opens the binding editor with an empty binding.", 1409 tooltip => "This button opens the binding editor with an empty binding.",
1364 on_activate => sub { 1410 on_activate => sub {
1365 $::BIND_EDITOR->set_binding (undef, undef, [], 1411 $::BIND_EDITOR->set_binding (undef, undef, [],
1366 sub { 1412 sub {
1367 my ($mod, $sym, $cmds) = @_; 1413 my ($mod, $sym, $cmds) = @_;
1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1414 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1369 $refresh->(); 1415 $refresh->();
1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1416 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show; 1417 $SETUP_DIALOG->show;
1372 }, 1418 },
1373 sub { 1419 sub {
1375 $SETUP_DIALOG->show; 1421 $SETUP_DIALOG->show;
1376 }, 1422 },
1377 ); 1423 );
1378 $SETUP_DIALOG->hide; 1424 $SETUP_DIALOG->hide;
1379 $::BIND_EDITOR->show; 1425 $::BIND_EDITOR->show;
1426 0
1380 }, 1427 },
1381 ); 1428 );
1382 1429
1383 $hb->add (new CFClient::UI::Button 1430 $hb->add (new CFClient::UI::Button
1384 text => "close", 1431 text => "close",
1385 tooltip => "Closes the binding window", 1432 tooltip => "Closes the binding window",
1386 expand => 1, 1433 expand => 1,
1387 on_activate => sub { 1434 on_activate => sub {
1388 $SETUP_DIALOG->hide; 1435 $SETUP_DIALOG->hide;
1436 0
1389 } 1437 }
1390 ); 1438 );
1391 1439
1392 $refresh->(); 1440 $refresh->();
1393 1441
1394 $vb 1442 $vb
1443}
1444
1445# just weirdness, pls. ignore
1446sub load_html_page {
1447 my ($viewer, $base) = @_;
1448
1449 $viewer->clear;
1450
1451 require LWP::Simple;
1452 require HTML::Parser;
1453 require URI;
1454
1455 my $page = LWP::Simple::get ($base)
1456 or return;
1457
1458 my @s = { };
1459 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1460
1461 my $parser = HTML::Parser->new (
1462 text_h => [sub {
1463 my ($text) = @_;
1464 $text =~ s/\s+/ /g;
1465 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1466 }, "dtext"],
1467 start_h => [sub {
1468 my ($tag, $attr) = @_;
1469 if ($passthrough{$tag}) {
1470 $s[-1]{text} .= "<$tag>";
1471 } elsif ($tag eq "h1") {
1472 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1473 } elsif ($tag eq "h2") {
1474 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1475 } elsif ($tag eq "h3") {
1476 push @s, { text => "<span size='large'>" };
1477 } elsif ($tag eq "a") {
1478 push @s, { text => "", url => $attr->{href} };
1479 } elsif ($tag eq "p") {
1480 push @s, { };
1481 } elsif ($tag eq "img") {
1482 eval {
1483 push @{$s[-1]{obj}}, new CFClient::UI::Image
1484 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1485 $s[-1]{text} .= "\x{fffc}";
1486 };
1487 }
1488 }, "tagname, attr"],
1489 end_h => [sub {
1490 my ($tag) = @_;
1491 if ($passthrough{$tag}) {
1492 $s[-1]{text} .= "</$tag>";
1493 } elsif ($tag =~ /^h\d$/) {
1494 $s[-1]{text} .= "</span>";
1495 push @s, { };
1496 } elsif ($tag eq "a") {
1497 my $S = pop @s;
1498 $s[-1]{text} .= "\x{fffc}";
1499 push @{$s[-1]{obj}}, new CFClient::UI::Label
1500 fg => [0.8, 0.8, 1],
1501 markup => "<u>$S->{text}</u>",
1502 fontsize => 0.8,
1503 can_events => 1,
1504 can_focus => 1,
1505 on_button_up => sub {
1506 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1507 },
1508 ;
1509 }
1510 }, "tagname"],
1511 );
1512
1513 $parser->parse ($page);
1514 $parser->eof;
1515
1516 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1517 for @s;
1518
1519 $viewer->set_offset (0);
1395} 1520}
1396 1521
1397sub help_window { 1522sub help_window {
1398 my $win = new CFClient::UI::FancyFrame 1523 my $win = new CFClient::UI::FancyFrame
1399 x => 'center', 1524 x => 'center',
1400 y => 'center', 1525 y => 'center',
1401 z => 2, 1526 z => 2,
1402 name => 'doc_browser', 1527 name => 'doc_browser',
1403 force_w => int $WIDTH * 7/8, 1528 force_w => int $WIDTH * 7/8,
1404 force_h => int $HEIGHT * 7/8, 1529 force_h => int $HEIGHT * 7/8,
1405 title => "Documentation"; 1530 title => "Help Browser",
1531 has_close_button => 1;
1406 1532
1407 $win->add (my $vbox = new CFClient::UI::VBox); 1533 $win->add (my $vbox = new CFClient::UI::VBox);
1408 1534
1409 $vbox->add (my $buttons = new CFClient::UI::HBox); 1535 $vbox->add (my $buttons = new CFClient::UI::HBox);
1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1536 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1539 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox 1540 $buttons->add (my $combo = new CFClient::UI::Combobox
1415 value => undef, 1541 value => undef,
1416 options => [ 1542 options => [
1417 [intro => "Introduction"], 1543 [intro => "Introduction"],
1418 [manual => "Manual"], 1544 [manual => "Main Manual"],
1419 [skill_help => "Skills"], 1545 [skill_help => "Skill Reference"],
1420 [command_help => "Commands"], 1546 [command_help => "Command Reference"],
1421 [dmcommand_help => "DM Commands"], 1547 [dmcommand_help => "DM Commands"],
1422 [COPYING => "License Terms"], 1548 [COPYING => "License Terms"],
1549 [test => "test (do not select)"], #d#TODO
1423 ], 1550 ],
1424 on_changed => sub { 1551 on_changed => sub {
1425 my ($self, $pod) = @_; 1552 my ($self, $pod) = @_;
1426 1553
1554 if ($pod eq "test") {#d#TODO
1555 eval {
1556 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1557 };
1558 warn "$@" if $@;
1559 return;
1560 }
1561
1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1562 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1428 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1563 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1429 1564
1430 $viewer->clear; 1565 $viewer->clear;
1566
1567# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1568# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1569# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1570# ]);#d#
1431 1571
1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1572 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1433 for @$pom; 1573 for @$pom;
1434 1574
1435 $viewer->set_offset (0); 1575 $viewer->set_offset (0);
1576
1577 0
1436 }, 1578 },
1437 on_visibility_change => sub { 1579 on_visibility_change => sub {
1438 my ($self, $visible) = @_; 1580 my ($self, $visible) = @_;
1439 return unless $visible; 1581 return unless $visible;
1440 return if $self->{value}; 1582 return if $self->{value};
1441 $self->set_value ("intro"); 1583 $self->set_value ("intro");
1584 0
1442 }, 1585 },
1443 ); 1586 );
1444 1587
1445 $win 1588 $win
1446} 1589}
1485 z => 100, 1628 z => 100,
1486 force_x => "max", 1629 force_x => "max",
1487 force_y => 0; 1630 force_y => 0;
1488 $DEBUG_STATUS->show; 1631 $DEBUG_STATUS->show;
1489 1632
1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1633 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1491 1634
1492 $STATUSBOX = new CFClient::UI::Statusbox; 1635 $STATUSBOX = new CFClient::UI::Statusbox;
1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1636 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1494 1637
1495 (new CFClient::UI::Frame 1638 (new CFClient::UI::Frame
1515 $MAPWIDGET->connect (activate_console => sub { 1658 $MAPWIDGET->connect (activate_console => sub {
1516 my ($mapwidget, $preset) = @_; 1659 my ($mapwidget, $preset) = @_;
1517 1660
1518 if ($CONSOLE) { 1661 if ($CONSOLE) {
1519 $CONSOLE->{input}->{auto_activated} = 1; 1662 $CONSOLE->{input}->{auto_activated} = 1;
1520 $CONSOLE->{input}->focus_in; 1663 $CONSOLE->{input}->grab_focus;
1521 1664
1522 if ($preset && $CONSOLE->{input}->get_text eq '') { 1665 if ($preset && $CONSOLE->{input}->get_text eq '') {
1523 $CONSOLE->{input}->set_text ($preset); 1666 $CONSOLE->{input}->set_text ($preset);
1524 } 1667 }
1525 } 1668 }
1526 }); 1669 });
1527 $MAPWIDGET->show; 1670 $MAPWIDGET->show;
1528 $MAPWIDGET->focus_in; 1671 $MAPWIDGET->grab_focus;
1529 1672
1530 $LOGVIEW = new CFClient::UI::TextScroller 1673 $LOGVIEW = new CFClient::UI::TextScroller
1531 expand => 1, 1674 expand => 1,
1532 font => $FONT_FIXED, 1675 font => $FONT_FIXED,
1533 fontsize => $::CFG->{log_fontsize}, 1676 fontsize => $::CFG->{log_fontsize},
1543 x => 'center', 1686 x => 'center',
1544 y => 'center', 1687 y => 'center',
1545 z => 2, 1688 z => 2,
1546 force_w => $::WIDTH * 0.6, 1689 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6, 1690 force_h => $::HEIGHT * 0.6,
1691 has_close_button => 1,
1548 ; 1692 ;
1693
1694 $METASERVER = metaserver_dialog;
1549 1695
1550 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1696 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1697 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552 1698
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1699 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1703 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1704 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1705 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music."); 1706 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1707 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings." 1708 "Lets you define, edit and delete key bindings."
1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1709 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1564 . "with nothing set and the recording started. After doing the actions you " 1710 . "with nothing set and the recording started. After doing the actions you "
1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1711 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1566 . "After pressing the combo the binding will be saved automatically and the " 1712 . "After pressing the combo the binding will be saved automatically and the "
1567 . "binding editor closes"); 1713 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1714 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask."); 1715 "Some debuggin' options. Do not ask.");
1572 1716
1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1717 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1574 1718
1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1719 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1576 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1720 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1578 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1722 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1723 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1580 1724
1581 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 1725 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
1582 1726
1583 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1584 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1585 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1727 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1586 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1728 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1588 1729
1589 $BUTTONBAR->add (new CFClient::UI::Button 1730 $BUTTONBAR->add (new CFClient::UI::Button
1590 text => "Save Config", 1731 text => "Save Config",
1591 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1732 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1592 on_activate => sub { 1733 on_activate => sub {
1593 $::CFG->{layout} = CFClient::UI::get_layout; 1734 $::CFG->{layout} = CFClient::UI::get_layout;
1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1735 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1595 status "Configuration Saved"; 1736 status "Configuration Saved";
1737 0
1596 }, 1738 },
1597 ); 1739 );
1598 1740
1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1741 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1600 tooltip => "View Documentation"); 1742 tooltip => "View Documentation");
1601 1743
1602 $BUTTONBAR->add (new CFClient::UI::Button 1744 $BUTTONBAR->add (new CFClient::UI::Button
1603 text => "Quit", 1745 text => "Quit",
1604 tooltip => "Terminates the program", 1746 tooltip => "Terminates the program",
1606 if ($CONN) { 1748 if ($CONN) {
1607 open_quit_dialog; 1749 open_quit_dialog;
1608 } else { 1750 } else {
1609 exit; 1751 exit;
1610 } 1752 }
1753 0
1611 }, 1754 },
1612 ); 1755 );
1613 1756
1614 $BUTTONBAR->show; 1757 $BUTTONBAR->show;
1615 $SETUP_DIALOG->show; 1758 $SETUP_DIALOG->show;
1617 1760
1618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1761 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1619} 1762}
1620 1763
1621sub video_shutdown { 1764sub video_shutdown {
1765 CFClient::OpenGL::shutdown;
1766
1622 undef $SDL_ACTIVE; 1767 undef $SDL_ACTIVE;
1623} 1768}
1624 1769
1625my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1770my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1626my $bgmusic;#TODO#hack#d# 1771my $bgmusic;#TODO#hack#d#
1807# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1952# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1808 }, 1953 },
1809 CFClient::SDL_KEYDOWN => sub { 1954 CFClient::SDL_KEYDOWN => sub {
1810 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1955 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1811 # alt-enter 1956 # alt-enter
1957 $FULLSCREEN_ENABLE->toggle;
1812 video_shutdown; 1958 video_shutdown;
1813 $CFG->{fullscreen} = !$CFG->{fullscreen};
1814 video_init; 1959 video_init;
1815 } else { 1960 } else {
1816 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1961 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1817 } 1962 }
1818 }, 1963 },
1834$SIG{INT} = $SIG{TERM} = sub { exit }; 1979$SIG{INT} = $SIG{TERM} = sub { exit };
1835 1980
1836{ 1981{
1837 local $SIG{__DIE__} = sub { 1982 local $SIG{__DIE__} = sub {
1838 return unless defined $^S && !$^S; 1983 return unless defined $^S && !$^S;
1839 Carp::confess $_[1];#d#TODO: remove when stable 1984 Carp::confess $_[0];#d#TODO: remove when stable
1840 CFClient::fatal $_[0]; 1985 CFClient::fatal $_[0];
1841 }; 1986 };
1842 1987
1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1988 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1844 CFClient::UI::set_layout ($::CFG->{layout}); 1989 CFClient::UI::set_layout ($::CFG->{layout});
1845 1990
1846 my %DEF_CFG = ( 1991 my %DEF_CFG = (
1847 sdl_mode => 0, 1992 sdl_mode => 0,
1848 width => 640, 1993 width => 640,
1849 height => 480, 1994 height => 480,
1850 fullscreen => 0, 1995 fullscreen => 0,
1851 fast => 0, 1996 fast => 0,
1852 map_scale => 1, 1997 map_scale => 1,
1853 fow_enable => 1, 1998 fow_enable => 1,
1854 fow_intensity => 0.45, 1999 fow_intensity => 0.45,
1855 fow_smooth => 0, 2000 fow_smooth => 0,
1856 gui_fontsize => 1, 2001 gui_fontsize => 1,
1857 log_fontsize => 0.7, 2002 log_fontsize => 0.7,
1858 gauge_fontsize=> 1, 2003 gauge_fontsize => 1,
1859 gauge_size => 0.35, 2004 gauge_size => 0.35,
1860 stat_fontsize => 0.7, 2005 stat_fontsize => 0.7,
1861 mapsize => 100, 2006 mapsize => 100,
1862 host => "crossfire.schmorp.de",
1863 say_command => 'say', 2007 say_command => 'say',
1864 audio_enable => 1, 2008 audio_enable => 1,
1865 bgm_enable => 1, 2009 bgm_enable => 1,
1866 bgm_volume => 0.25, 2010 bgm_volume => 0.25,
1867 face_prefetch => 0, 2011 face_prefetch => 0,
1868 output_sync => 1, 2012 output_sync => 1,
1869 output_count => 1, 2013 output_count => 1,
1870 pickup => 0, 2014 pickup => 0,
2015 default => "profile", # default profile
2016 );
1871 ); 2017
1872
1873 while (my ($k, $v) = each %DEF_CFG) { 2018 while (my ($k, $v) = each %DEF_CFG) {
1874 $CFG->{$k} = $v unless exists $CFG->{$k}; 2019 $CFG->{$k} = $v unless exists $CFG->{$k};
1875 } 2020 }
2021
2022 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1876 2023
1877 sdl_init; 2024 sdl_init;
1878 2025
1879 @SDL_MODES = reverse 2026 @SDL_MODES = reverse
1880 grep $_->[0] >= 640 && $_->[1] >= 480, 2027 grep $_->[0] >= 640 && $_->[1] >= 480,
1922 video_init; 2069 video_init;
1923 audio_init; 2070 audio_init;
1924} 2071}
1925 2072
1926Event::loop; 2073Event::loop;
2074#CFClient::SDL_Quit;
2075#CFClient::_exit 0;
1927 2076
1928END { CFClient::SDL_Quit } 2077END { CFClient::SDL_Quit }
1929 2078
1930=head1 NAME 2079=head1 NAME
1931 2080

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines