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

Diff Legend

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