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.102 by root, Mon Jul 24 04:24:43 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::Selector
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,
678 tooltip => "The weight of the player including all inventory items."); 688 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 691 tooltip => "The weight limit: you cannot carry more than this.");
682 692
683
684 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
685 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
686 695
687 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
688 697
689 for ( 698 for (
690 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 699 [0, 0, st_str => "Str", 30],
691 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
692 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
693 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 702 [0, 3, st_int => "Int", 30],
694 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 703 [0, 4, st_wis => "Wis", 30],
695 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 704 [0, 5, st_pow => "Pow", 30],
696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
697 706
698 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 707 [2, 0, st_wc => "Wc", -120],
699 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 708 [2, 1, st_ac => "Ac", -120],
700 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 709 [2, 2, st_dam => "Dam", 120],
701 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 710 [2, 3, st_arm => "Arm", 120],
702 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 711 [2, 4, st_spd => "Spd", 10.54],
703 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 712 [2, 5, st_wspd => "WSp", 10.54],
704 ) { 713 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
706 715
707 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
708 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
711 } 722 }
712 723
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
714 725
715 my $row = 0; 726 my $row = 0;
716 my $col = 0; 727 my $col = 0;
717 728
718 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
719 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 731 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
732 holyw => ["Holy Word",
720 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
721 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
722 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
723 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
724 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
729 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
730 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 752 phys => ["Physical",
753 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
754 blind => ["Blind",
731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
732 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 757 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
758 tund => ["Turn undead",
733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
736 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737 ); 766 );
738 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 768 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
741 { 770 {
746 template => "-100%", 775 template => "-100%",
747 align => +1, 776 align => +1,
748 valign => 0, 777 valign => 0,
749 can_events => 1, 778 can_events => 1,
750 can_hover => 1, 779 can_hover => 1,
751 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
752 ); 781 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
754 font => $FONT_FIXED, 783 font => $FONT_FIXED,
755 can_hover => 1, 784 can_hover => 1,
756 can_events => 1, 785 can_events => 1,
757 image => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
759 ); 795 );
760 796
761 $row++; 797 $row++;
762 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
763 $col += 2; 799 $col += 3;
764 $row = 0; 800 $row = 0;
765 } 801 }
766 } 802 }
767 803
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 804 #update_stats_window ({});
770 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771 $tgw 812 $sw
772} 813}
773 814
774sub formsep($) { 815sub formsep($) {
775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776} 817}
777 818
778sub update_stats_window {
779 my ($stats) = @_;
780
781 # I love text protocols...
782
783 my $hp = $stats->{+CS_STAT_HP} * 1;
784 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
785 my $sp = $stats->{+CS_STAT_SP} * 1;
786 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
787 my $fo = $stats->{+CS_STAT_FOOD} * 1;
788 my $fo_m = 999;
789 my $gr = $stats->{+CS_STAT_GRACE} * 1;
790 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
791
792 $GAUGES->{hp} ->set_value ($hp, $hp_m);
793 $GAUGES->{mana} ->set_value ($sp, $sp_m);
794 $GAUGES->{food} ->set_value ($fo, $fo_m);
795 $GAUGES->{grace} ->set_value ($gr, $gr_m);
796 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
797 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
798 my $rng = $stats->{+CS_STAT_RANGE};
799 $rng =~ s/^Range: //; # thank you so much dear server
800 $GAUGES->{range} ->set_text ("Rng: " . $rng);
801 my $title = $stats->{+CS_STAT_TITLE};
802 $title =~ s/^Player: //;
803 $STATWIDS->{title} ->set_text ("Title: " . $title);
804
805 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
806 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
807 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
808 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
809 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818
819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820
821 # 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; 819my $METASERVER_ATIME;
848 820
849sub update_metaserver { 821sub update_metaserver {
822 my ($metaserver_dialog) = @_;
823
824 $METASERVER = $metaserver_dialog
825 if defined $metaserver_dialog;
826
850 return if $METASERVER_ATIME > time; 827 return if $METASERVER_ATIME > time;
851 $METASERVER_ATIME = time + 60; 828 $METASERVER_ATIME = time + 60;
852 829
853 my $table = $METASERVER->{table}; 830 my $table = $METASERVER->{table};
854 $table->clear; 831 $table->clear;
919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
920 (new CFClient::UI::Button 897 (new CFClient::UI::Button
921 text => "Use", 898 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field", 899 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub { 900 on_activate => sub {
924 $HOST_ENTRY->set_text ($CFG->{host} = $host); 901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925 $METASERVER->hide; 902 $METASERVER->hide;
903 0
926 }, 904 },
927 ), 905 ),
928 (new CFClient::UI::Empty expand => 1), 906 (new CFClient::UI::Empty expand => 1),
929 ]); 907 ]);
930 908
941 } 919 }
942 }); 920 });
943} 921}
944 922
945sub 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
946 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
947 title => "Server List", 929 title => "Server List",
948 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
949 x => 'center', 931 x => 'center',
950 y => 'center', 932 y => 'center',
951 z => 3, 933 z => 3,
952 force_h => $::HEIGHT * 0.4, 934 force_h => $::HEIGHT * 0.4,
953 child => (my $vbox = new CFClient::UI::VBox), 935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
954 on_visibility_change => sub { 938 on_visibility_change => sub {
955 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
940 0
956 }, 941 },
957 ; 942 ;
958
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962 943
963 $dialog 944 $dialog
964} 945}
965 946
966sub server_setup { 947sub server_setup {
973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
974 955
975 $vbox->add ( 956 $vbox->add (
976 $HOST_ENTRY = new CFClient::UI::Entry 957 $HOST_ENTRY = new CFClient::UI::Entry
977 expand => 1, 958 expand => 1,
978 text => $CFG->{host}, 959 text => $CFG->{profile}{default}{host},
979 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",
980 on_changed => sub { 961 on_changed => sub {
981 my ($self, $value) = @_; 962 my ($self, $value) = @_;
982 $CFG->{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
964 0
983 } 965 }
984 ); 966 );
985
986 $METASERVER = metaserver_dialog;
987 967
988 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
989 expand => 1, 969 expand => 1,
990 text => "Server List", 970 text => "Server List",
991 other => $METASERVER, 971 other => $METASERVER,
992 tooltip => "Show a list of available crossfire servers", 972 tooltip => "Show a list of available crossfire servers",
993 on_activate => sub { $METASERVER->toggle_visibility }, 973 on_activate => sub { $METASERVER->toggle_visibility; 0 },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
995 ); 975 );
996 } 976 }
997 977
998 $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");
999 $table->add (1, 4, new CFClient::UI::Entry 979 $table->add (1, 4, new CFClient::UI::Entry
1000 text => $CFG->{user}, 980 text => $CFG->{profile}{default}{user},
1001 tooltip => "The name of your character on the server", 981 tooltip => "The name of your character on the server",
1002 on_changed => sub { 982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1003 my ($self, $value) = @_;
1004 $CFG->{user} = $value;
1005 }
1006 ); 983 );
1007 984
1008 $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");
1009 $table->add (1, 5, new CFClient::UI::Entry 986 $table->add (1, 5, new CFClient::UI::Entry
1010 text => $CFG->{password}, 987 text => $CFG->{profile}{default}{password},
1011 hidden => 1, 988 hidden => 1,
1012 tooltip => "The password for your character", 989 tooltip => "The password for your character",
1013 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1014 my ($self, $value) = @_;
1015 $CFG->{password} = $value;
1016 }
1017 ); 991 );
1018 992
1019 $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");
1020 $table->add (1, 7, new CFClient::UI::Slider 994 $table->add (1, 7, new CFClient::UI::Slider
1021 force_w => 100, 995 force_w => 100,
1022 range => [$CFG->{mapsize}, 10, 100, 0, 1], 996 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1023 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. "
1024 . "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, "
1025 . "but you also increase bandwidth requirements and latency. " 999 . "but you also increase bandwidth requirements and latency. "
1026 . "This option is only used once at log-in.", 1000 . "This option is only used once at log-in.",
1027 on_changed => sub { 1001 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 ); 1002 );
1033 1003
1034 $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");
1035 $table->add (1, 8, new CFClient::UI::CheckBox 1005 $table->add (1, 8, new CFClient::UI::CheckBox
1036 state => $CFG->{face_prefetch}, 1006 state => $CFG->{face_prefetch},
1039 . "This might increase or create lag, but increases the chances " 1009 . "This might increase or create lag, but increases the chances "
1040 . "of faces being ready for display when you encounter them. " 1010 . "of faces being ready for display when you encounter them. "
1041 . "It also uses up server bandwidth on every connect, " 1011 . "It also uses up server bandwidth on every connect, "
1042 . "so only set it if you really need to prefetch images. " 1012 . "so only set it if you really need to prefetch images. "
1043 . "This option can be set and unset any time.", 1013 . "This option can be set and unset any time.",
1044 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1045 ); 1015 );
1046 1016
1047 $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");
1048 $table->add (1, 9, new CFClient::UI::Entry 1018 $table->add (1, 9, new CFClient::UI::Entry
1049 text => $CFG->{output_count}, 1019 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.", 1020 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] }, 1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1052 ); 1022 );
1053 1023
1054 $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");
1055 $table->add (1, 10, new CFClient::UI::Entry 1025 $table->add (1, 10, new CFClient::UI::Entry
1056 text => $CFG->{output_sync}, 1026 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.", 1027 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] }, 1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1059 ); 1029 );
1060 1030
1061 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1062 expand => 1, 1032 expand => 1,
1063 align => 0, 1033 align => 0,
1064 text => "Login", 1034 text => "Login",
1065 on_activate => sub { 1035 on_activate => sub {
1066 $CONN ? stop_game 1036 $CONN ? stop_game
1067 : start_game; 1037 : start_game;
1038 0
1068 }, 1039 },
1069 ); 1040 );
1070 1041
1071 $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");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1075 . "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. "
1076 . "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.",
1077 on_changed => sub { 1048 on_changed => sub {
1078 my ($self, $value) = @_; 1049 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value; 1050 $CFG->{say_command} = $value;
1051 0
1080 } 1052 }
1081 ); 1053 );
1082 1054
1083 $vbox->add (new CFClient::UI::Label 1055 $vbox->add (new CFClient::UI::Label
1084 text => "Server Info", 1056 text => "Server Info",
1095sub message_window { 1067sub message_window {
1096 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1097 name => "message_window", 1069 name => "message_window",
1098 title => "Messages", 1070 title => "Messages",
1099 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1100 bg => [0, 0, 0, 0.75],
1101 x => "max", 1072 x => "max",
1102 y => 0, 1073 y => 0,
1103 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1104 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1105 child => (my $vbox = new CFClient::UI::VBox); 1076 child => (my $vbox = new CFClient::UI::VBox),
1077 has_close_button => 1;
1106 1078
1107 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1108 1080
1109 $vbox->add (my $input = new CFClient::UI::Entry 1081 $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> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1118 1090
1119 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1120 $input->{refocus_map} = 1; 1092 $input->{refocus_map} = 1;
1121 } 1093 }
1122 delete $input->{auto_activated}; 1094 delete $input->{auto_activated};
1095
1096 0
1123 }, 1097 },
1124 on_activate => sub { 1098 on_activate => sub {
1125 my ($input, $text) = @_; 1099 my ($input, $text) = @_;
1126 $input->set_text (''); 1100 $input->set_text ('');
1127 1101
1133 } 1107 }
1134 if ($input->{refocus_map}) { 1108 if ($input->{refocus_map}) {
1135 delete $input->{refocus_map}; 1109 delete $input->{refocus_map};
1136 $MAPWIDGET->focus_in 1110 $MAPWIDGET->focus_in
1137 } 1111 }
1112
1113 0
1138 }, 1114 },
1139 on_escape => sub { 1115 on_escape => sub {
1140 $MAPWIDGET->focus_in 1116 $MAPWIDGET->grab_focus;
1117
1118 0
1141 }, 1119 },
1142 ); 1120 );
1143 1121
1144 $CONSOLE = { 1122 $CONSOLE = {
1145 window => $window, 1123 window => $window,
1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1155 x => "center", 1133 x => "center",
1156 y => "center", 1134 y => "center",
1157 z => 50, 1135 z => 50,
1158 title => "Really Quit?", 1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1159 ; 1141 ;
1160 1142
1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1162 1144
1163 $vb->add (new CFClient::UI::Label 1145 $vb->add (new CFClient::UI::Label
1167 ); 1149 );
1168 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1150 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1169 $hb->add (new CFClient::UI::Button 1151 $hb->add (new CFClient::UI::Button
1170 text => "Ok", 1152 text => "Ok",
1171 expand => 1, 1153 expand => 1,
1172 on_activate => sub { $QUIT_DIALOG->hide }, 1154 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1173 ); 1155 );
1174 $hb->add (new CFClient::UI::Button 1156 $hb->add (new CFClient::UI::Button
1175 text => "Quit anyway", 1157 text => "Quit anyway",
1176 expand => 1, 1158 expand => 1,
1177 on_activate => sub { exit }, 1159 on_activate => sub { exit },
1178 ); 1160 );
1179 } 1161 }
1180 1162
1181 $QUIT_DIALOG->show; 1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1182} 1165}
1183 1166
1184sub autopickup_setup { 1167sub autopickup_setup {
1185 my $table = new CFClient::UI::Table; 1168 my $table = new CFClient::UI::Table;
1186 1169
1187 for ( 1170 for (
1188 ["General", 0, 0, 1171 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE], 1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT], 1173 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP], 1174 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG], 1175 ["Debug autopickup" => PICKUP_DEBUG],
1193 ], 1176 ],
1194 ["Weapons", 0, 6, 1177 ["Weapons", 0, 6,
1231 for (@bits) { 1214 for (@bits) {
1232 ++$y; 1215 ++$y;
1233 1216
1234 my $mask = $_->[1]; 1217 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1218 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask, 1220 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1221 on_changed => sub {
1239 my ($box, $value) = @_; 1222 my ($box, $value) = @_;
1240 1223
1241 if ($value) { 1224 if ($value) {
1242 $::CFG->{pickup} |= $mask; 1225 $::CFG->{pickup} |= $mask;
1244 $::CFG->{pickup} &= ~$mask; 1227 $::CFG->{pickup} &= ~$mask;
1245 } 1228 }
1246 1229
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1230 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1231 if defined $::CONN;
1232
1233 0
1249 }); 1234 });
1235
1236 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1237 }
1251 } 1238 }
1252 1239
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1240 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1243 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1244 on_changed => sub {
1257 my ($slider, $value) = @_; 1245 my ($slider, $value) = @_;
1258 1246
1259 $::CFG->{pickup} &= ~0x7; 1247 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1248 $::CFG->{pickup} |= int $value
1261 if $value; 1249 if $value;
1262 1; 1250 1;
1263 }); 1251 });
1252
1264 $table->add (3, 18, new CFClient::UI::Button 1253 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set", 1254 text => "set",
1266 on_activate => sub { 1255 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1256 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1257 if defined $::CONN;
1269 1; 1258 0
1270 }); 1259 });
1271 1260
1272 $table 1261 $table
1273} 1262}
1274 1263
1264my %SORT_ORDER = (
1265 type => undef,
1266 mtime => sub { sort {
1267 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268 or $b->{mtime} <=> $a->{mtime}
1269 or $a->{type} <=> $b->{type}
1270 } @_ },
1271 weight => sub { sort {
1272 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273 or $a->{type} <=> $b->{type}
1274 } @_ },
1275);
1276
1275sub inventory_window { 1277sub inventory_widget {
1278 my $hb = new CFClient::UI::HBox homogeneous => 1;
1279
1280 $hb->add (my $vb1 = new CFClient::UI::VBox);
1281 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1282
1283 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1284
1285 use sort 'stable';
1286
1287 $hb1->add (new CFClient::UI::Selector
1288 value => $::CFG->{inv_sort},
1289 options => [
1290 [type => "Type/Name"],
1291 [mtime => "Recent/Normal/Locked"],
1292 [weight => "Weight/Type"],
1293 ],
1294 on_changed => sub {
1295 $::CFG->{inv_sort} = $_[1];
1296 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1297 },
1298 );
1299 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1300 #TODO# update to weigh/maxweight
1301 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1302
1303 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304 $sw1->add ($INV = new CFClient::UI::Inventory);
1305
1306 $hb->add (my $vb2 = new CFClient::UI::VBox);
1307
1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1309
1310 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $sw2->add ($INVR = new CFClient::UI::Inventory);
1312
1313 # XXX: Call after $INVR = ... because set_opencont sets the items
1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1315
1316 $hb
1317}
1318
1319sub toggle_player_page {
1320 my ($widget) = @_;
1321
1322 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1323 $PL_WINDOW->hide;
1324 } else {
1325 $PL_NOTEBOOK->set_current_page ($widget);
1326 $PL_WINDOW->show;
1327 }
1328}
1329
1330sub player_window {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center", 1332 x => "center",
1278 y => "center", 1333 y => "center",
1279 force_w => $WIDTH * 9/10, 1334 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1335 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1336 title => "Player",
1337 name => "playerbook",
1338 has_close_button => 1
1282 ; 1339 ;
1283 1340
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1341 my $ntb =
1342 $PL_NOTEBOOK =
1343 new CFClient::UI::Notebook expand => 1, debug => 1;
1285 1344
1286 $hb->add (my $vb1 = new CFClient::UI::VBox); 1345 $ntb->add (
1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1346 "Statistics (F2)" => $STATS_PAGE = stats_window,
1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1347 "Shows statistics, where all your Stats and Resistances are shown."
1348 );
1349 $ntb->add (
1350 "Skills (F3)" => $SKILL_PAGE = skill_window,
1351 "Shows all your Skills."
1352 );
1289 1353
1290 $hb->add (my $vb2 = new CFClient::UI::VBox); 1354 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1356 $ntb->add (
1357 "Spellbook (F4)" => $spellsw,
1358 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1359 );
1360 $ntb->add (
1361 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1362 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1363 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1364 );
1291 1365
1292 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1366 $ntb->set_current_page ($INVENTORY_PAGE);
1293 1367
1294 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1368 $plwin->add ($ntb);
1295 1369 $plwin
1296 # XXX: Call after $INVR = ... because set_opencont sets the items
1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299 $invwin
1300} 1370}
1301 1371
1302sub spell_setup { 1372sub update_bindings {
1303 new CFClient::UI::SpellList 1373 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1374}
1305 1375
1306sub keyboard_setup { 1376sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1377 my $binding_list = new CFClient::UI::VBox;
1308 1378
1309 my $refresh; 1379 my $refresh;
1310 $refresh = sub { 1380 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1381 $binding_list->clear ();
1312 1382
1313 for my $mod (keys %{$::CFG->{bindings}}) { 1383 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1384 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1385 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1386 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1387
1318 my $lbl = join "; ", @$cmds; 1388 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1389 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1390 $binding_list->add (my $hb = new CFClient::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1391 $hb->add (new CFClient::UI::Button
1322 text => "delete", 1392 text => "delete",
1323 tooltip => "Deletes the binding", 1393 tooltip => "Deletes the binding",
1324 on_activate => sub { 1394 on_activate => sub {
1325 $binding_list->remove ($hb); 1395 $binding_list->remove ($hb);
1326 delete $::CFG->{bindings}->{$mod}->{$sym}; 1396 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397 0
1327 }); 1398 });
1328 1399
1329 $hb->add (new CFClient::UI::Button 1400 $hb->add (new CFClient::UI::Button
1330 text => "edit", 1401 text => "edit",
1331 tooltip => "Edits the binding", 1402 tooltip => "Edits the binding",
1332 on_activate => sub { 1403 on_activate => sub {
1333 $::BIND_EDITOR->set_binding ( 1404 $::BIND_EDITOR->set_binding (
1334 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1405 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1335 sub { 1406 sub {
1336 my ($nmod, $nsym, $ncmds) = @_; 1407 my ($nmod, $nsym, $ncmds) = @_;
1337 delete $::CFG->{bindings}->{$mod}->{$sym}; 1408 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1409 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1339 $refresh->(); 1410 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1411 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show; 1412 $SETUP_DIALOG->show;
1342 }, 1413 },
1343 sub { 1414 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345 $SETUP_DIALOG->show; 1416 $SETUP_DIALOG->show;
1346 }); 1417 });
1347 $::BIND_EDITOR->show; 1418 $::BIND_EDITOR->show;
1348 $SETUP_DIALOG->hide; 1419 $SETUP_DIALOG->hide;
1420 0
1349 }); 1421 });
1350 1422
1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1423 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1424 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1353 } 1425 }
1354 } 1426 }
1355 }; 1427 };
1356 1428
1357 my $vb = new CFClient::UI::VBox; 1429 my $vb = new CFClient::UI::VBox;
1430 $vb->add (my $hb = new CFClient::UI::HBox);
1431 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1432 $hb->add (new CFClient::UI::CheckBox
1433 expand => 1,
1434 state => $CFG->{shift_fire_stop},
1435 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1436 on_changed => sub {
1437 my ($cbox, $value) = @_;
1438 $CFG->{shift_fire_stop} = $value;
1439 0
1440 });
1441
1358 $vb->add ($binding_list); 1442 $vb->add ($binding_list);
1359 $vb->add (my $hb = new CFClient::UI::HBox); 1443 $vb->add (my $hb = new CFClient::UI::HBox);
1360 1444
1361 $hb->add (new CFClient::UI::Button 1445 $hb->add (new CFClient::UI::Button
1362 text => "record new", 1446 text => "record new",
1364 tooltip => "This button opens the binding editor with an empty binding.", 1448 tooltip => "This button opens the binding editor with an empty binding.",
1365 on_activate => sub { 1449 on_activate => sub {
1366 $::BIND_EDITOR->set_binding (undef, undef, [], 1450 $::BIND_EDITOR->set_binding (undef, undef, [],
1367 sub { 1451 sub {
1368 my ($mod, $sym, $cmds) = @_; 1452 my ($mod, $sym, $cmds) = @_;
1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1453 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1370 $refresh->(); 1454 $refresh->();
1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1455 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show; 1456 $SETUP_DIALOG->show;
1373 }, 1457 },
1374 sub { 1458 sub {
1376 $SETUP_DIALOG->show; 1460 $SETUP_DIALOG->show;
1377 }, 1461 },
1378 ); 1462 );
1379 $SETUP_DIALOG->hide; 1463 $SETUP_DIALOG->hide;
1380 $::BIND_EDITOR->show; 1464 $::BIND_EDITOR->show;
1465 0
1381 }, 1466 },
1382 ); 1467 );
1383 1468
1384 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFClient::UI::Button
1385 text => "close", 1470 text => "close",
1386 tooltip => "Closes the binding window", 1471 tooltip => "Closes the binding window",
1387 expand => 1, 1472 expand => 1,
1388 on_activate => sub { 1473 on_activate => sub {
1389 $SETUP_DIALOG->hide; 1474 $SETUP_DIALOG->hide;
1475 0
1390 } 1476 }
1391 ); 1477 );
1392 1478
1393 $refresh->(); 1479 $refresh->();
1394 1480
1395 $vb 1481 $vb
1482}
1483
1484# just weirdness, pls. ignore
1485sub load_html_page {
1486 my ($viewer, $base) = @_;
1487
1488 $viewer->clear;
1489
1490 require LWP::Simple;
1491 require HTML::Parser;
1492 require URI;
1493
1494 my $page = LWP::Simple::get ($base)
1495 or return;
1496
1497 my @s = { };
1498 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500 my $parser = HTML::Parser->new (
1501 text_h => [sub {
1502 my ($text) = @_;
1503 $text =~ s/\s+/ /g;
1504 $s[-1]{text} .= CFClient::asxml $text;
1505 }, "dtext"],
1506 start_h => [sub {
1507 my ($tag, $attr) = @_;
1508 if ($passthrough{$tag}) {
1509 $s[-1]{text} .= "<$tag>";
1510 } elsif ($tag eq "h1") {
1511 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512 } elsif ($tag eq "h2") {
1513 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514 } elsif ($tag eq "h3") {
1515 push @s, { text => "<span size='large'>" };
1516 } elsif ($tag eq "a") {
1517 push @s, { text => "", url => $attr->{href} };
1518 } elsif ($tag eq "p") {
1519 push @s, { };
1520 } elsif ($tag eq "img") {
1521 eval {
1522 push @{$s[-1]{obj}}, new CFClient::UI::Image
1523 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524 $s[-1]{text} .= "\x{fffc}";
1525 };
1526 }
1527 }, "tagname, attr"],
1528 end_h => [sub {
1529 my ($tag) = @_;
1530 if ($passthrough{$tag}) {
1531 $s[-1]{text} .= "</$tag>";
1532 } elsif ($tag =~ /^h\d$/) {
1533 $s[-1]{text} .= "</span>";
1534 push @s, { };
1535 } elsif ($tag eq "a") {
1536 my $S = pop @s;
1537 $s[-1]{text} .= "\x{fffc}";
1538 push @{$s[-1]{obj}}, new CFClient::UI::Label
1539 fg => [0.8, 0.8, 1],
1540 markup => "<u>$S->{text}</u>",
1541 fontsize => 0.8,
1542 can_events => 1,
1543 can_focus => 1,
1544 on_button_up => sub {
1545 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546 },
1547 ;
1548 }
1549 }, "tagname"],
1550 );
1551
1552 $parser->parse ($page);
1553 $parser->eof;
1554
1555 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556 for @s;
1557
1558 $viewer->set_offset (0);
1396} 1559}
1397 1560
1398sub help_window { 1561sub help_window {
1399 my $win = new CFClient::UI::FancyFrame 1562 my $win = new CFClient::UI::FancyFrame
1400 x => 'center', 1563 x => 'center',
1401 y => 'center', 1564 y => 'center',
1402 z => 2, 1565 z => 2,
1403 name => 'doc_browser', 1566 name => 'doc_browser',
1404 force_w => int $WIDTH * 7/8, 1567 force_w => int $WIDTH * 7/8,
1405 force_h => int $HEIGHT * 7/8, 1568 force_h => int $HEIGHT * 7/8,
1406 title => "Documentation"; 1569 title => "Help Browser",
1570 has_close_button => 1;
1407 1571
1408 $win->add (my $vbox = new CFClient::UI::VBox); 1572 $win->add (my $vbox = new CFClient::UI::VBox);
1409 1573
1410 $vbox->add (my $buttons = new CFClient::UI::HBox); 1574 $vbox->add (my $buttons = new CFClient::UI::HBox);
1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4); 1576 expand => 1, fontsize => 0.8, padding_x => 4);
1413 1577
1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1578 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415 $buttons->add (my $combo = new CFClient::UI::Combobox 1579 $buttons->add (my $combo = new CFClient::UI::Selector
1416 value => undef, 1580 value => undef,
1417 options => [ 1581 options => [
1418 [intro => "Introduction"], 1582 [intro => "Introduction"],
1419 [manual => "Manual"], 1583 [manual => "Main Manual"],
1420 [skill_help => "Skills"], 1584 [skill_help => "Skill Reference"],
1421 [command_help => "Commands"], 1585 [command_help => "Command Reference"],
1422 [dmcommand_help => "DM Commands"], 1586 [dmcommand_help => "DM Commands"],
1423 [COPYING => "License Terms"], 1587 [COPYING => "License Terms"],
1588 [test => "test (do not select)"], #d#TODO
1424 ], 1589 ],
1425 on_changed => sub { 1590 on_changed => sub {
1426 my ($self, $pod) = @_; 1591 my ($self, $pod) = @_;
1427 1592
1593 if ($pod eq "test") {#d#TODO
1594 eval {
1595 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1596 };
1597 warn "$@" if $@;
1598 return;
1599 }
1600
1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1429 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1602 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603
1604 #use Data::Dumper; warn Dumper $pom;#d#
1430 1605
1431 $viewer->clear; 1606 $viewer->clear;
1607
1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1611# ]);#d#
1432 1612
1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1434 for @$pom; 1614 for @$pom;
1435 1615
1436 $viewer->set_offset (0); 1616 $viewer->set_offset (0);
1617
1618 0
1437 }, 1619 },
1438 on_visibility_change => sub { 1620 on_visibility_change => sub {
1439 my ($self, $visible) = @_; 1621 my ($self, $visible) = @_;
1440 return unless $visible; 1622 return unless $visible;
1441 return if $self->{value}; 1623 return if $self->{value};
1442 $self->set_value ("intro"); 1624 $self->set_value ("intro");
1625 0
1443 }, 1626 },
1444 ); 1627 );
1445 1628
1446 $win 1629 $win
1447} 1630}
1486 z => 100, 1669 z => 100,
1487 force_x => "max", 1670 force_x => "max",
1488 force_y => 0; 1671 force_y => 0;
1489 $DEBUG_STATUS->show; 1672 $DEBUG_STATUS->show;
1490 1673
1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1674 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1492 1675
1493 $STATUSBOX = new CFClient::UI::Statusbox; 1676 $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]); 1677 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1495 1678
1496 (new CFClient::UI::Frame 1679 (new CFClient::UI::Frame
1516 $MAPWIDGET->connect (activate_console => sub { 1699 $MAPWIDGET->connect (activate_console => sub {
1517 my ($mapwidget, $preset) = @_; 1700 my ($mapwidget, $preset) = @_;
1518 1701
1519 if ($CONSOLE) { 1702 if ($CONSOLE) {
1520 $CONSOLE->{input}->{auto_activated} = 1; 1703 $CONSOLE->{input}->{auto_activated} = 1;
1521 $CONSOLE->{input}->focus_in; 1704 $CONSOLE->{input}->grab_focus;
1522 1705
1523 if ($preset && $CONSOLE->{input}->get_text eq '') { 1706 if ($preset && $CONSOLE->{input}->get_text eq '') {
1524 $CONSOLE->{input}->set_text ($preset); 1707 $CONSOLE->{input}->set_text ($preset);
1525 } 1708 }
1526 } 1709 }
1527 }); 1710 });
1528 $MAPWIDGET->show; 1711 $MAPWIDGET->show;
1529 $MAPWIDGET->focus_in; 1712 $MAPWIDGET->grab_focus;
1530 1713
1531 $LOGVIEW = new CFClient::UI::TextScroller 1714 $LOGVIEW = new CFClient::UI::TextScroller
1532 expand => 1, 1715 expand => 1,
1533 font => $FONT_FIXED, 1716 font => $FONT_FIXED,
1534 fontsize => $::CFG->{log_fontsize}, 1717 fontsize => $::CFG->{log_fontsize},
1544 x => 'center', 1727 x => 'center',
1545 y => 'center', 1728 y => 'center',
1546 z => 2, 1729 z => 2,
1547 force_w => $::WIDTH * 0.6, 1730 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6, 1731 force_h => $::HEIGHT * 0.6,
1732 has_close_button => 1,
1549 ; 1733 ;
1734
1735 $METASERVER = metaserver_dialog;
1550 1736
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1737 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1738 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553 1739
1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1740 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1744 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1745 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1746 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music."); 1747 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1748 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings." 1749 "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 " 1750 . "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 " 1751 . "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. " 1752 . "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 " 1753 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes"); 1754 . "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, 1755 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask."); 1756 "Some debuggin' options. Do not ask.");
1573 1757
1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1758 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575 1759
1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1760 $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."); 1761 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, 1763 $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."); 1764 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1581 1765
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 1766 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 1767
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, 1768 $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 :). " 1769 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 1770
1590 $BUTTONBAR->add (new CFClient::UI::Button 1771 $BUTTONBAR->add (new CFClient::UI::Button
1591 text => "Save Config", 1772 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.", 1773 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 { 1774 on_activate => sub {
1594 $::CFG->{layout} = CFClient::UI::get_layout; 1775 $::CFG->{layout} = CFClient::UI::get_layout;
1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1776 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1596 status "Configuration Saved"; 1777 status "Configuration Saved";
1778 0
1597 }, 1779 },
1598 ); 1780 );
1599 1781
1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1782 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1601 tooltip => "View Documentation"); 1783 tooltip => "View Documentation");
1602 1784
1603 $BUTTONBAR->add (new CFClient::UI::Button 1785 $BUTTONBAR->add (new CFClient::UI::Button
1604 text => "Quit", 1786 text => "Quit",
1605 tooltip => "Terminates the program", 1787 tooltip => "Terminates the program",
1607 if ($CONN) { 1789 if ($CONN) {
1608 open_quit_dialog; 1790 open_quit_dialog;
1609 } else { 1791 } else {
1610 exit; 1792 exit;
1611 } 1793 }
1794 0
1612 }, 1795 },
1613 ); 1796 );
1614 1797
1615 $BUTTONBAR->show; 1798 $BUTTONBAR->show;
1616 $SETUP_DIALOG->show; 1799 $SETUP_DIALOG->show;
1618 1801
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1802 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1620} 1803}
1621 1804
1622sub video_shutdown { 1805sub video_shutdown {
1806 CFClient::OpenGL::shutdown;
1807
1623 undef $SDL_ACTIVE; 1808 undef $SDL_ACTIVE;
1624} 1809}
1625 1810
1626my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1811my @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# 1812my $bgmusic;#TODO#hack#d#
1699 1884
1700 $WANT_REFRESH = 0; 1885 $WANT_REFRESH = 0;
1701 $CAN_REFRESH = 0; 1886 $CAN_REFRESH = 0;
1702 $LAST_REFRESH = $NOW; 1887 $LAST_REFRESH = $NOW;
1703 1888
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; 1889 CFClient::SDL_GL_SwapBuffers;
1759} 1890}
1760 1891
1761my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1892my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1762 $NOW = time; 1893 $NOW = time;
1808# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1939# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1809 }, 1940 },
1810 CFClient::SDL_KEYDOWN => sub { 1941 CFClient::SDL_KEYDOWN => sub {
1811 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1812 # alt-enter 1943 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle;
1813 video_shutdown; 1945 video_shutdown;
1814 $CFG->{fullscreen} = !$CFG->{fullscreen};
1815 video_init; 1946 video_init;
1816 } else { 1947 } else {
1817 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1948 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1818 } 1949 }
1819 }, 1950 },
1835$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1836 1967
1837{ 1968{
1838 local $SIG{__DIE__} = sub { 1969 local $SIG{__DIE__} = sub {
1839 return unless defined $^S && !$^S; 1970 return unless defined $^S && !$^S;
1840 Carp::confess $_[1];#d#TODO: remove when stable 1971 Carp::confess $_[0];#d#TODO: remove when stable
1841 CFClient::fatal $_[0]; 1972 CFClient::fatal $_[0];
1842 }; 1973 };
1843 1974
1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1845 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
1846 1977
1847 my %DEF_CFG = ( 1978 my %DEF_CFG = (
1848 sdl_mode => 0, 1979 sdl_mode => 0,
1849 width => 640, 1980 width => 640,
1850 height => 480, 1981 height => 480,
1851 fullscreen => 0, 1982 fullscreen => 0,
1852 fast => 0, 1983 fast => 0,
1853 map_scale => 1, 1984 map_scale => 1,
1854 fow_enable => 1, 1985 fow_enable => 1,
1855 fow_intensity => 0.45, 1986 fow_intensity => 0.45,
1856 fow_smooth => 0, 1987 fow_smooth => 0,
1857 gui_fontsize => 1, 1988 gui_fontsize => 1,
1858 log_fontsize => 0.7, 1989 log_fontsize => 0.7,
1859 gauge_fontsize=> 1, 1990 gauge_fontsize => 1,
1860 gauge_size => 0.35, 1991 gauge_size => 0.35,
1861 stat_fontsize => 0.7, 1992 stat_fontsize => 0.7,
1862 mapsize => 100, 1993 mapsize => 100,
1863 host => "crossfire.schmorp.de",
1864 say_command => 'say', 1994 say_command => 'say',
1865 audio_enable => 1, 1995 audio_enable => 1,
1866 bgm_enable => 1, 1996 bgm_enable => 1,
1867 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1868 face_prefetch => 0, 1998 face_prefetch => 0,
1869 output_sync => 1, 1999 output_sync => 1,
1870 output_count => 1, 2000 output_count => 1,
1871 pickup => 0, 2001 pickup => 0,
2002 inv_sort => "mtime",
2003 default => "profile", # default profile
2004 );
1872 ); 2005
1873
1874 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1875 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1876 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1877 2011
1878 sdl_init; 2012 sdl_init;
1879 2013
1880 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1881 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines