ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.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;
411 $SPELL_PAGE->clear_spells;
368 412
369 return unless $CONN; 413 return unless $CONN;
370 414
371 status "connection closed"; 415 status "connection closed";
372 416
373 destroy_query_dialog $CONN; 417 destroy_query_dialog $CONN;
374 $CONN->destroy; 418 $CONN->destroy;
375 $CONN = 0; # false, does not autovivify 419 $CONN = 0; # false, does not autovivify
420
421 undef $MAP;
376} 422}
377 423
378sub graphics_setup { 424sub graphics_setup {
379 my $vbox = new CFClient::UI::VBox; 425 my $vbox = new CFClient::UI::VBox;
380 426
395 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
396 442
397 my $row = 1; 443 my $row = 1;
398 444
399 $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");
400 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
401 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
402 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
403 on_changed => sub { 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
404 my ($self, $value) = @_;
405 $CFG->{fullscreen} = $value;
406 }
407 ); 450 );
408 451
409 $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");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 453 $table->add (1, $row++, new CFClient::UI::CheckBox
411 state => $CFG->{fast}, 454 state => $CFG->{fast},
412 tooltip => "Lower the visual quality considerably to speed up rendering.", 455 tooltip => "Lower the visual quality considerably to speed up rendering.",
413 on_changed => sub { 456 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
414 my ($self, $value) = @_;
415 $CFG->{fast} = $value;
416 }
417 ); 457 );
418 458
419 $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");
420 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
421 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 461 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
422 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 462 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
423 on_changed => sub { 463 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
424 my ($self, $value) = @_;
425 $CFG->{map_scale} = 2 ** $value;
426 }
427 ); 464 );
428 465
429 $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");
430 $table->add (1, $row++, new CFClient::UI::CheckBox 467 $table->add (1, $row++, new CFClient::UI::CheckBox
431 state => $CFG->{fow_enable}, 468 state => $CFG->{fow_enable},
432 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.",
433 on_changed => sub { 470 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
434 my ($self, $value) = @_;
435 $CFG->{fow_enable} = $value;
436 }
437 ); 471 );
438 472
439 $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");
440 $table->add (1, $row++, new CFClient::UI::Slider 474 $table->add (1, $row++, new CFClient::UI::Slider
441 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 475 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
442 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 476 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
443 on_changed => sub { 477 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
444 my ($self, $value) = @_;
445 $CFG->{fow_intensity} = $value;
446 }
447 ); 478 );
448 479
449 $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");
450 $table->add (1, $row++, new CFClient::UI::CheckBox 481 $table->add (1, $row++, new CFClient::UI::CheckBox
451 state => $CFG->{fow_smooth}, 482 state => $CFG->{fow_smooth},
452 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.",
453 on_changed => sub { 484 on_changed => sub {
454 my ($self, $value) = @_; 485 my ($self, $value) = @_;
455 $CFG->{fow_smooth} = $value; 486 $CFG->{fow_smooth} = $value;
456 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
457 } 489 }
458 ); 490 );
459 491
460 $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");
461 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 494 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
463 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 495 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
464 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 496 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
465 ); 497 );
466 498
467 $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");
468 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
470 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 502 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 );
473
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
475
476 $table->add (1, $row++, new CFClient::UI::Slider
477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
479 on_changed => sub {
480 $CFG->{stat_fontsize} = $_[1];
481 &set_stats_window_fontsize;
482 }
483 ); 504 );
484 505
485 $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");
486 $table->add (1, $row++, new CFClient::UI::Slider 507 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 509 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
489 on_changed => sub { 510 on_changed => sub {
490 $CFG->{gauge_fontsize} = $_[1]; 511 $CFG->{gauge_fontsize} = $_[1];
491 &set_gauge_window_fontsize; 512 &set_gauge_window_fontsize;
513 0
492 } 514 }
493 ); 515 );
494 516
495 $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");
496 $table->add (1, $row++, new CFClient::UI::Slider 518 $table->add (1, $row++, new CFClient::UI::Slider
497 range => [$CFG->{gauge_size}, 0.2, 0.8], 519 range => [$CFG->{gauge_size}, 0.2, 0.8],
498 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.",
499 on_changed => sub { 521 on_changed => sub {
500 $CFG->{gauge_size} = $_[1]; 522 $CFG->{gauge_size} = $_[1];
501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 523 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524 0
502 } 525 }
503 ); 526 );
504 527
505 $table->add (1, $row++, new CFClient::UI::Button 528 $table->add (1, $row++, new CFClient::UI::Button
506 expand => 1, align => 0, text => "Apply", 529 expand => 1, align => 0, text => "Apply",
507 tooltip => "Apply the video settings", 530 tooltip => "Apply the video settings",
508 on_activate => sub { 531 on_activate => sub {
509 video_shutdown (); 532 video_shutdown ();
510 video_init (); 533 video_init ();
534 0
511 } 535 }
512 ); 536 );
513 537
514 $vbox 538 $vbox
515} 539}
523 547
524 $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");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 549 $table->add (1, $row++, new CFClient::UI::CheckBox
526 state => $CFG->{audio_enable}, 550 state => $CFG->{audio_enable},
527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
528 on_changed => sub { 552 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 $CFG->{audio_enable} = $_[1];
530 }
531 ); 553 );
532# $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");
533# $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 {
534# $CFG->{effects_volume} = $_[1]; 556# $CFG->{effects_volume} = $_[1];
535# }); 557# });
536 $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");
537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 559 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
538 $hbox->add (new CFClient::UI::CheckBox 560 $hbox->add (new CFClient::UI::CheckBox
539 expand => 1, state => $CFG->{bgm_enable}, 561 expand => 1, state => $CFG->{bgm_enable},
540 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.",
541 on_changed => sub { 563 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
542 $CFG->{bgm_enable} = $_[1];
543 }
544 ); 564 );
545 $hbox->add (new CFClient::UI::Slider 565 $hbox->add (new CFClient::UI::Slider
546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 566 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
547 tooltip => "The volume of the background music. Changes are instant.", 567 tooltip => "The volume of the background music. Changes are instant.",
548 on_changed => sub { 568 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
549 $CFG->{bgm_volume} = $_[1];
550 CFClient::MixMusic::volume $_[1] * 128;
551 }
552 ); 569 );
553 570
554 $table->add (1, $row++, new CFClient::UI::Button 571 $table->add (1, $row++, new CFClient::UI::Button
555 expand => 1, align => 0, text => "Apply", 572 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the audio settings", 573 tooltip => "Apply the audio settings",
557 on_activate => sub { 574 on_activate => sub {
558 audio_shutdown (); 575 audio_shutdown ();
559 audio_init (); 576 audio_init ();
577 0
560 } 578 }
561 ); 579 );
562 580
563 $vbox 581 $vbox
564}
565
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570} 582}
571 583
572sub set_gauge_window_fontsize { 584sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 586 $_->set_fontsize ($::CFG->{gauge_fontsize});
630 642
631sub debug_setup { 643sub debug_setup {
632 my $table = new CFClient::UI::Table; 644 my $table = new CFClient::UI::Table;
633 645
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 646 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 647 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 648 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 649 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 650 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 651 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 652 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 653 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
642 654
643 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);
644 656
645 for my $x (0..2) { 657 for my $x (0..2) {
646 for my $y (0 .. 2) { 658 for my $y (0 .. 2) {
655 667
656 $table 668 $table
657} 669}
658 670
659sub stats_window { 671sub stats_window {
660 my $tgw = new CFClient::UI::FancyFrame 672 my $r = new CFClient::UI::ScrolledWindow (
661 y => $HEIGHT * (2/8), 673 expand => 1,
662 x => "max", 674 scroll_y => 1
663 title => "Stats", 675 );
664 name => "stats_window"; 676 $r->add (my $vb = new CFClient::UI::VBox);
665 677
666 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
667 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 678 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
668 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
669 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 680 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
670 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 681 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
671 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
677 tooltip => "The weight of the player including all inventory items."); 688 tooltip => "The weight of the player including all inventory items.");
678 $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,
679 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
680 tooltip => "The weight limit: you cannot carry more than this."); 691 tooltip => "The weight limit: you cannot carry more than this.");
681 692
682
683 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
684 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
685 695
686 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
687 697
688 for ( 698 for (
689 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 699 [0, 0, st_str => "Str", 30],
690 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
691 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
692 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 702 [0, 3, st_int => "Int", 30],
693 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 703 [0, 4, st_wis => "Wis", 30],
694 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 704 [0, 5, st_pow => "Pow", 30],
695 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
696 706
697 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 707 [2, 0, st_wc => "Wc", -120],
698 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 708 [2, 1, st_ac => "Ac", -120],
699 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 709 [2, 2, st_dam => "Dam", 120],
700 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 710 [2, 3, st_arm => "Arm", 120],
701 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 711 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 712 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 713 ) {
704 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
705 715
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
708 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
709 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
710 } 722 }
711 723
712 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
713 725
714 my $row = 0; 726 my $row = 0;
715 my $col = 0; 727 my $col = 0;
716 728
717 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
718 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 731 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
732 holyw => ["Holy Word",
719 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
720 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
721 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
722 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
723 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
724 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
725 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
726 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
727 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
728 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
729 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 752 phys => ["Physical",
753 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
754 blind => ["Blind",
730 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
731 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 757 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
758 tund => ["Turn undead",
732 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
733 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
734 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
735 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
736 ); 766 );
737 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
738 drain acid pois para deat phys 768 drain acid pois para deat phys
739 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
740 { 770 {
745 template => "-100%", 775 template => "-100%",
746 align => +1, 776 align => +1,
747 valign => 0, 777 valign => 0,
748 can_events => 1, 778 can_events => 1,
749 can_hover => 1, 779 can_hover => 1,
750 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
751 ); 781 );
752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
753 font => $FONT_FIXED, 783 font => $FONT_FIXED,
754 can_hover => 1, 784 can_hover => 1,
755 can_events => 1, 785 can_events => 1,
756 image => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
757 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
758 ); 795 );
759 796
760 $row++; 797 $row++;
761 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
762 $col += 2; 799 $col += 3;
763 $row = 0; 800 $row = 0;
764 } 801 }
765 } 802 }
766 803
767 &set_stats_window_fontsize;
768 update_stats_window ({}); 804 #update_stats_window ({});
769 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
770 $tgw 812 $sw
771} 813}
772 814
773sub formsep($) { 815sub formsep($) {
774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
775} 817}
776 818
777sub update_stats_window {
778 my ($stats) = @_;
779
780 # I love text protocols...
781
782 my $hp = $stats->{+CS_STAT_HP} * 1;
783 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
784 my $sp = $stats->{+CS_STAT_SP} * 1;
785 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
786 my $fo = $stats->{+CS_STAT_FOOD} * 1;
787 my $fo_m = 999;
788 my $gr = $stats->{+CS_STAT_GRACE} * 1;
789 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
790
791 $GAUGES->{hp} ->set_value ($hp, $hp_m);
792 $GAUGES->{mana} ->set_value ($sp, $sp_m);
793 $GAUGES->{food} ->set_value ($fo, $fo_m);
794 $GAUGES->{grace} ->set_value ($gr, $gr_m);
795 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
796 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
797 my $rng = $stats->{+CS_STAT_RANGE};
798 $rng =~ s/^Range: //; # thank you so much dear server
799 $GAUGES->{range} ->set_text ("Rng: " . $rng);
800 my $title = $stats->{+CS_STAT_TITLE};
801 $title =~ s/^Player: //;
802 $STATWIDS->{title} ->set_text ("Title: " . $title);
803
804 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
805 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
806 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
807 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
808 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
809 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
810 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
811 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
812 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
813 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
814 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
815 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
816 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
817
818 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
819
820 # TODO: replace by CS_STAT_RES_xxx constants
821 my %tbl = (
822 phys => 100,
823 magic => 101,
824 fire => 102,
825 elec => 103,
826 cold => 104,
827 conf => 105,
828 acid => 106,
829 drain => 107,
830 ghit => 108,
831 pois => 109,
832 slow => 110,
833 para => 111,
834 tund => 112,
835 fear => 113,
836 depl => 113,
837 deat => 115,
838 holyw => 116,
839 blind => 117,
840 );
841
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl;
844}
845
846my $METASERVER_ATIME; 819my $METASERVER_ATIME;
847 820
848sub update_metaserver { 821sub update_metaserver {
822 my ($metaserver_dialog) = @_;
823
824 $METASERVER = $metaserver_dialog
825 if defined $metaserver_dialog;
826
849 return if $METASERVER_ATIME > time; 827 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 828 $METASERVER_ATIME = time + 60;
851 829
852 my $table = $METASERVER->{table}; 830 my $table = $METASERVER->{table};
853 $table->clear; 831 $table->clear;
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
919 (new CFClient::UI::Button 897 (new CFClient::UI::Button
920 text => "Use", 898 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 899 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 900 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 902 $METASERVER->hide;
903 0
925 }, 904 },
926 ), 905 ),
927 (new CFClient::UI::Empty expand => 1), 906 (new CFClient::UI::Empty expand => 1),
928 ]); 907 ]);
929 908
940 } 919 }
941 }); 920 });
942} 921}
943 922
944sub metaserver_dialog { 923sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox;
925 my $table = new CFClient::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
927
945 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List", 929 title => "Server List",
947 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
948 x => 'center', 931 x => 'center',
949 y => 'center', 932 y => 'center',
950 z => 3, 933 z => 3,
951 force_h => $::HEIGHT * 0.4, 934 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox), 935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
953 on_visibility_change => sub { 938 on_visibility_change => sub {
954 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
940 0
955 }, 941 },
956 ; 942 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961 943
962 $dialog 944 $dialog
963} 945}
964 946
965sub server_setup { 947sub server_setup {
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
973 955
974 $vbox->add ( 956 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 957 $HOST_ENTRY = new CFClient::UI::Entry
976 expand => 1, 958 expand => 1,
977 text => $CFG->{host}, 959 text => $CFG->{profile}{default}{host},
978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 960 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979 on_changed => sub { 961 on_changed => sub {
980 my ($self, $value) = @_; 962 my ($self, $value) = @_;
981 $CFG->{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
964 0
982 } 965 }
983 ); 966 );
984
985 $METASERVER = metaserver_dialog;
986 967
987 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
988 expand => 1, 969 expand => 1,
989 text => "Server List", 970 text => "Server List",
990 other => $METASERVER, 971 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 972 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 973 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 975 );
995 } 976 }
996 977
997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 978 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
998 $table->add (1, 4, new CFClient::UI::Entry 979 $table->add (1, 4, new CFClient::UI::Entry
999 text => $CFG->{user}, 980 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 981 tooltip => "The name of your character on the server",
1001 on_changed => sub { 982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 983 );
1006 984
1007 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 985 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1008 $table->add (1, 5, new CFClient::UI::Entry 986 $table->add (1, 5, new CFClient::UI::Entry
1009 text => $CFG->{password}, 987 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 988 hidden => 1,
1011 tooltip => "The password for your character", 989 tooltip => "The password for your character",
1012 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 991 );
1017 992
1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 993 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1019 $table->add (1, 7, new CFClient::UI::Slider 994 $table->add (1, 7, new CFClient::UI::Slider
1020 force_w => 100, 995 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 996 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 tooltip => "This is the size of the portion of the map update the server sends you. " 997 tooltip => "This is the size of the portion of the map update the server sends you. "
1023 . "If you set this to a high value you will be able to see further, " 998 . "If you set this to a high value you will be able to see further, "
1024 . "but you also increase bandwidth requirements and latency. " 999 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1000 . "This option is only used once at log-in.",
1026 on_changed => sub { 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027 my ($self, $value) = @_;
1028
1029 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030 },
1031 ); 1002 );
1032 1003
1033 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1004 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1005 $table->add (1, 8, new CFClient::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1006 state => $CFG->{face_prefetch},
1038 . "This might increase or create lag, but increases the chances " 1009 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1010 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1011 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1012 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1013 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1015 );
1045 1016
1046 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1017 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1047 $table->add (1, 9, new CFClient::UI::Entry 1018 $table->add (1, 9, new CFClient::UI::Entry
1048 text => $CFG->{output_count}, 1019 text => $CFG->{output_count},
1049 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1020 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1050 on_changed => sub { $CFG->{output_count} = $_[1] }, 1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1022 );
1052 1023
1053 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1024 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054 $table->add (1, 10, new CFClient::UI::Entry 1025 $table->add (1, 10, new CFClient::UI::Entry
1055 text => $CFG->{output_sync}, 1026 text => $CFG->{output_sync},
1056 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1027 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1029 );
1059 1030
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1061 expand => 1, 1032 expand => 1,
1062 align => 0, 1033 align => 0,
1063 text => "Login", 1034 text => "Login",
1064 on_activate => sub { 1035 on_activate => sub {
1065 $CONN ? stop_game 1036 $CONN ? stop_game
1066 : start_game; 1037 : start_game;
1038 0
1067 }, 1039 },
1068 ); 1040 );
1069 1041
1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub { 1048 on_changed => sub {
1077 my ($self, $value) = @_; 1049 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value; 1050 $CFG->{say_command} = $value;
1051 0
1079 } 1052 }
1080 ); 1053 );
1081 1054
1082 $vbox->add (new CFClient::UI::Label 1055 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info", 1056 text => "Server Info",
1094sub message_window { 1067sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1096 name => "message_window", 1069 name => "message_window",
1097 title => "Messages", 1070 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1072 x => "max",
1101 y => 0, 1073 y => 0,
1102 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1076 child => (my $vbox = new CFClient::UI::VBox),
1077 has_close_button => 1;
1105 1078
1106 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1107 1080
1108 $vbox->add (my $input = new CFClient::UI::Entry 1081 $vbox->add (my $input = new CFClient::UI::Entry
1109 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1117 1090
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1092 $input->{refocus_map} = 1;
1120 } 1093 }
1121 delete $input->{auto_activated}; 1094 delete $input->{auto_activated};
1095
1096 0
1122 }, 1097 },
1123 on_activate => sub { 1098 on_activate => sub {
1124 my ($input, $text) = @_; 1099 my ($input, $text) = @_;
1125 $input->set_text (''); 1100 $input->set_text ('');
1126 1101
1132 } 1107 }
1133 if ($input->{refocus_map}) { 1108 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1109 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1110 $MAPWIDGET->focus_in
1136 } 1111 }
1112
1113 0
1137 }, 1114 },
1138 on_escape => sub { 1115 on_escape => sub {
1139 $MAPWIDGET->focus_in 1116 $MAPWIDGET->grab_focus;
1117
1118 0
1140 }, 1119 },
1141 ); 1120 );
1142 1121
1143 $CONSOLE = { 1122 $CONSOLE = {
1144 window => $window, 1123 window => $window,
1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1154 x => "center", 1133 x => "center",
1155 y => "center", 1134 y => "center",
1156 z => 50, 1135 z => 50,
1157 title => "Really Quit?", 1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1158 ; 1141 ;
1159 1142
1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1161 1144
1162 $vb->add (new CFClient::UI::Label 1145 $vb->add (new CFClient::UI::Label
1166 ); 1149 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1150 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button 1151 $hb->add (new CFClient::UI::Button
1169 text => "Ok", 1152 text => "Ok",
1170 expand => 1, 1153 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide }, 1154 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172 ); 1155 );
1173 $hb->add (new CFClient::UI::Button 1156 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway", 1157 text => "Quit anyway",
1175 expand => 1, 1158 expand => 1,
1176 on_activate => sub { exit }, 1159 on_activate => sub { exit },
1177 ); 1160 );
1178 } 1161 }
1179 1162
1180 $QUIT_DIALOG->show; 1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1181} 1165}
1182 1166
1183sub autopickup_setup { 1167sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1168 my $table = new CFClient::UI::Table;
1185 1169
1186 for ( 1170 for (
1187 ["General", 0, 0, 1171 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1173 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1174 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1175 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1176 ],
1193 ["Weapons", 0, 6, 1177 ["Weapons", 0, 6,
1230 for (@bits) { 1214 for (@bits) {
1231 ++$y; 1215 ++$y;
1232 1216
1233 my $mask = $_->[1]; 1217 my $mask = $_->[1];
1234 $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);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1220 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1221 on_changed => sub {
1238 my ($box, $value) = @_; 1222 my ($box, $value) = @_;
1239 1223
1240 if ($value) { 1224 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1225 $::CFG->{pickup} |= $mask;
1243 $::CFG->{pickup} &= ~$mask; 1227 $::CFG->{pickup} &= ~$mask;
1244 } 1228 }
1245 1229
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1230 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1231 if defined $::CONN;
1232
1233 0
1248 }); 1234 });
1235
1236 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1237 }
1250 } 1238 }
1251 1239
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1240 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1243 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1244 on_changed => sub {
1256 my ($slider, $value) = @_; 1245 my ($slider, $value) = @_;
1257 1246
1258 $::CFG->{pickup} &= ~0x7; 1247 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1248 $::CFG->{pickup} |= int $value
1260 if $value; 1249 if $value;
1261 1; 1250 1;
1262 }); 1251 });
1252
1263 $table->add (3, 18, new CFClient::UI::Button 1253 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1254 text => "set",
1265 on_activate => sub { 1255 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1256 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1257 if defined $::CONN;
1268 1; 1258 0
1269 }); 1259 });
1270 1260
1271 $table 1261 $table
1272} 1262}
1273 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
1274sub 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 {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1332 x => "center",
1277 y => "center", 1333 y => "center",
1278 force_w => $WIDTH * 9/10, 1334 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1335 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1336 title => "Player",
1337 name => "playerbook",
1338 has_close_button => 1
1281 ; 1339 ;
1282 1340
1283 $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;
1284 1344
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1345 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1346 "Statistics (F2)" => $STATS_PAGE = stats_window,
1287 $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 );
1288 1353
1289 $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 );
1290 1365
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1366 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1367
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1368 $plwin->add ($ntb);
1294 1369 $plwin
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299} 1370}
1300 1371
1301sub spell_setup { 1372sub update_bindings {
1302 new CFClient::UI::SpellList 1373 $BIND_UPD_CB->() if $BIND_UPD_CB;
1303} 1374}
1304 1375
1305sub keyboard_setup { 1376sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1377 my $binding_list = new CFClient::UI::VBox;
1307 1378
1308 my $refresh; 1379 my $refresh;
1309 $refresh = sub { 1380 $refresh = $BIND_UPD_CB = sub {
1310 $binding_list->clear (); 1381 $binding_list->clear ();
1311 1382
1312 for my $mod (keys %{$::CFG->{bindings}}) { 1383 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1384 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1385 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1386 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316 1387
1317 my $lbl = join "; ", @$cmds; 1388 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1389 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox); 1390 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button 1391 $hb->add (new CFClient::UI::Button
1321 text => "delete", 1392 text => "delete",
1322 tooltip => "Deletes the binding", 1393 tooltip => "Deletes the binding",
1323 on_activate => sub { 1394 on_activate => sub {
1324 $binding_list->remove ($hb); 1395 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym}; 1396 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397 0
1326 }); 1398 });
1327 1399
1328 $hb->add (new CFClient::UI::Button 1400 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1401 text => "edit",
1330 tooltip => "Edits the binding", 1402 tooltip => "Edits the binding",
1331 on_activate => sub { 1403 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1404 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1405 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1406 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1407 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1408 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1409 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1410 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1411 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1412 $SETUP_DIALOG->show;
1341 }, 1413 },
1342 sub { 1414 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show; 1416 $SETUP_DIALOG->show;
1345 }); 1417 });
1346 $::BIND_EDITOR->show; 1418 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide; 1419 $SETUP_DIALOG->hide;
1420 0
1348 }); 1421 });
1349 1422
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1423 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1424 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 } 1425 }
1353 } 1426 }
1354 }; 1427 };
1355 1428
1356 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
1357 $vb->add ($binding_list); 1442 $vb->add ($binding_list);
1358 $vb->add (my $hb = new CFClient::UI::HBox); 1443 $vb->add (my $hb = new CFClient::UI::HBox);
1359 1444
1360 $hb->add (new CFClient::UI::Button 1445 $hb->add (new CFClient::UI::Button
1361 text => "record new", 1446 text => "record new",
1363 tooltip => "This button opens the binding editor with an empty binding.", 1448 tooltip => "This button opens the binding editor with an empty binding.",
1364 on_activate => sub { 1449 on_activate => sub {
1365 $::BIND_EDITOR->set_binding (undef, undef, [], 1450 $::BIND_EDITOR->set_binding (undef, undef, [],
1366 sub { 1451 sub {
1367 my ($mod, $sym, $cmds) = @_; 1452 my ($mod, $sym, $cmds) = @_;
1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1453 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1369 $refresh->(); 1454 $refresh->();
1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1455 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show; 1456 $SETUP_DIALOG->show;
1372 }, 1457 },
1373 sub { 1458 sub {
1375 $SETUP_DIALOG->show; 1460 $SETUP_DIALOG->show;
1376 }, 1461 },
1377 ); 1462 );
1378 $SETUP_DIALOG->hide; 1463 $SETUP_DIALOG->hide;
1379 $::BIND_EDITOR->show; 1464 $::BIND_EDITOR->show;
1465 0
1380 }, 1466 },
1381 ); 1467 );
1382 1468
1383 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFClient::UI::Button
1384 text => "close", 1470 text => "close",
1385 tooltip => "Closes the binding window", 1471 tooltip => "Closes the binding window",
1386 expand => 1, 1472 expand => 1,
1387 on_activate => sub { 1473 on_activate => sub {
1388 $SETUP_DIALOG->hide; 1474 $SETUP_DIALOG->hide;
1475 0
1389 } 1476 }
1390 ); 1477 );
1391 1478
1392 $refresh->(); 1479 $refresh->();
1393 1480
1394 $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);
1395} 1559}
1396 1560
1397sub help_window { 1561sub help_window {
1398 my $win = new CFClient::UI::FancyFrame 1562 my $win = new CFClient::UI::FancyFrame
1399 x => 'center', 1563 x => 'center',
1400 y => 'center', 1564 y => 'center',
1401 z => 2, 1565 z => 2,
1402 name => 'doc_browser', 1566 name => 'doc_browser',
1403 force_w => int $WIDTH * 7/8, 1567 force_w => int $WIDTH * 7/8,
1404 force_h => int $HEIGHT * 7/8, 1568 force_h => int $HEIGHT * 7/8,
1405 title => "Documentation"; 1569 title => "Help Browser",
1570 has_close_button => 1;
1406 1571
1407 $win->add (my $vbox = new CFClient::UI::VBox); 1572 $win->add (my $vbox = new CFClient::UI::VBox);
1408 1573
1409 $vbox->add (my $buttons = new CFClient::UI::HBox); 1574 $vbox->add (my $buttons = new CFClient::UI::HBox);
1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1411 expand => 1, fontsize => 0.8, padding_x => 4); 1576 expand => 1, fontsize => 0.8, padding_x => 4);
1412 1577
1413 $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: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox 1579 $buttons->add (my $combo = new CFClient::UI::Selector
1415 value => undef, 1580 value => undef,
1416 options => [ 1581 options => [
1417 [intro => "Introduction"], 1582 [intro => "Introduction"],
1418 [manual => "Manual"], 1583 [manual => "Main Manual"],
1419 [skill_help => "Skills"], 1584 [skill_help => "Skill Reference"],
1420 [command_help => "Commands"], 1585 [command_help => "Command Reference"],
1421 [dmcommand_help => "DM Commands"], 1586 [dmcommand_help => "DM Commands"],
1422 [COPYING => "License Terms"], 1587 [COPYING => "License Terms"],
1588 [test => "test (do not select)"], #d#TODO
1423 ], 1589 ],
1424 on_changed => sub { 1590 on_changed => sub {
1425 my ($self, $pod) = @_; 1591 my ($self, $pod) = @_;
1426 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
1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1428 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#
1429 1605
1430 $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#
1431 1612
1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1433 for @$pom; 1614 for @$pom;
1434 1615
1435 $viewer->set_offset (0); 1616 $viewer->set_offset (0);
1617
1618 0
1436 }, 1619 },
1437 on_visibility_change => sub { 1620 on_visibility_change => sub {
1438 my ($self, $visible) = @_; 1621 my ($self, $visible) = @_;
1439 return unless $visible; 1622 return unless $visible;
1440 return if $self->{value}; 1623 return if $self->{value};
1441 $self->set_value ("intro"); 1624 $self->set_value ("intro");
1625 0
1442 }, 1626 },
1443 ); 1627 );
1444 1628
1445 $win 1629 $win
1446} 1630}
1485 z => 100, 1669 z => 100,
1486 force_x => "max", 1670 force_x => "max",
1487 force_y => 0; 1671 force_y => 0;
1488 $DEBUG_STATUS->show; 1672 $DEBUG_STATUS->show;
1489 1673
1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1674 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1491 1675
1492 $STATUSBOX = new CFClient::UI::Statusbox; 1676 $STATUSBOX = new CFClient::UI::Statusbox;
1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1677 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1494 1678
1495 (new CFClient::UI::Frame 1679 (new CFClient::UI::Frame
1515 $MAPWIDGET->connect (activate_console => sub { 1699 $MAPWIDGET->connect (activate_console => sub {
1516 my ($mapwidget, $preset) = @_; 1700 my ($mapwidget, $preset) = @_;
1517 1701
1518 if ($CONSOLE) { 1702 if ($CONSOLE) {
1519 $CONSOLE->{input}->{auto_activated} = 1; 1703 $CONSOLE->{input}->{auto_activated} = 1;
1520 $CONSOLE->{input}->focus_in; 1704 $CONSOLE->{input}->grab_focus;
1521 1705
1522 if ($preset && $CONSOLE->{input}->get_text eq '') { 1706 if ($preset && $CONSOLE->{input}->get_text eq '') {
1523 $CONSOLE->{input}->set_text ($preset); 1707 $CONSOLE->{input}->set_text ($preset);
1524 } 1708 }
1525 } 1709 }
1526 }); 1710 });
1527 $MAPWIDGET->show; 1711 $MAPWIDGET->show;
1528 $MAPWIDGET->focus_in; 1712 $MAPWIDGET->grab_focus;
1529 1713
1530 $LOGVIEW = new CFClient::UI::TextScroller 1714 $LOGVIEW = new CFClient::UI::TextScroller
1531 expand => 1, 1715 expand => 1,
1532 font => $FONT_FIXED, 1716 font => $FONT_FIXED,
1533 fontsize => $::CFG->{log_fontsize}, 1717 fontsize => $::CFG->{log_fontsize},
1543 x => 'center', 1727 x => 'center',
1544 y => 'center', 1728 y => 'center',
1545 z => 2, 1729 z => 2,
1546 force_w => $::WIDTH * 0.6, 1730 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6, 1731 force_h => $::HEIGHT * 0.6,
1732 has_close_button => 1,
1548 ; 1733 ;
1734
1735 $METASERVER = metaserver_dialog;
1549 1736
1550 $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,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1738 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552 1739
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1740 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1744 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "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.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1746 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music."); 1747 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1748 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings." 1749 "Lets you define, edit and delete key bindings."
1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1750 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1564 . "with nothing set and the recording started. After doing the actions you " 1751 . "with nothing set and the recording started. After doing the actions you "
1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1752 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1566 . "After pressing the combo the binding will be saved automatically and the " 1753 . "After pressing the combo the binding will be saved automatically and the "
1567 . "binding editor closes"); 1754 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1755 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask."); 1756 "Some debuggin' options. Do not ask.");
1572 1757
1573 $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
1574 1759
1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1760 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1576 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1761 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1578 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1763 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1764 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1580 1765
1581 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 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
1582 1767
1583 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1584 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1585 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1768 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1586 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1769 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1588 1770
1589 $BUTTONBAR->add (new CFClient::UI::Button 1771 $BUTTONBAR->add (new CFClient::UI::Button
1590 text => "Save Config", 1772 text => "Save Config",
1591 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1773 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1592 on_activate => sub { 1774 on_activate => sub {
1593 $::CFG->{layout} = CFClient::UI::get_layout; 1775 $::CFG->{layout} = CFClient::UI::get_layout;
1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1776 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1595 status "Configuration Saved"; 1777 status "Configuration Saved";
1778 0
1596 }, 1779 },
1597 ); 1780 );
1598 1781
1599 $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,
1600 tooltip => "View Documentation"); 1783 tooltip => "View Documentation");
1601 1784
1602 $BUTTONBAR->add (new CFClient::UI::Button 1785 $BUTTONBAR->add (new CFClient::UI::Button
1603 text => "Quit", 1786 text => "Quit",
1604 tooltip => "Terminates the program", 1787 tooltip => "Terminates the program",
1606 if ($CONN) { 1789 if ($CONN) {
1607 open_quit_dialog; 1790 open_quit_dialog;
1608 } else { 1791 } else {
1609 exit; 1792 exit;
1610 } 1793 }
1794 0
1611 }, 1795 },
1612 ); 1796 );
1613 1797
1614 $BUTTONBAR->show; 1798 $BUTTONBAR->show;
1615 $SETUP_DIALOG->show; 1799 $SETUP_DIALOG->show;
1617 1801
1618 $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]);
1619} 1803}
1620 1804
1621sub video_shutdown { 1805sub video_shutdown {
1806 CFClient::OpenGL::shutdown;
1807
1622 undef $SDL_ACTIVE; 1808 undef $SDL_ACTIVE;
1623} 1809}
1624 1810
1625my @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#
1626my $bgmusic;#TODO#hack#d# 1812my $bgmusic;#TODO#hack#d#
1698 1884
1699 $WANT_REFRESH = 0; 1885 $WANT_REFRESH = 0;
1700 $CAN_REFRESH = 0; 1886 $CAN_REFRESH = 0;
1701 $LAST_REFRESH = $NOW; 1887 $LAST_REFRESH = $NOW;
1702 1888
17030 && do {
1704 # some weird model-drawing code, just a joke right now
1705 use CFClient::OpenGL;
1706
1707 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1708 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1709 $demo{r} ||= do {
1710 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1711 $mod->{v} = pack "f*", @{$mod->{v}};
1712 $_ = [scalar @$_, pack "S!*", @$_]
1713 for values %{$mod->{g}};
1714 $mod
1715 };
1716
1717 my $r = $demo{r} or die;
1718
1719 glDepthMask 1;
1720 glClear GL_DEPTH_BUFFER_BIT;
1721 glEnable GL_TEXTURE_2D;
1722 glEnable GL_DEPTH_TEST;
1723 glEnable GL_CULL_FACE;
1724 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1725
1726 glMatrixMode GL_PROJECTION;
1727 glLoadIdentity;
1728 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1729 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1730 glMatrixMode GL_MODELVIEW;
1731 glLoadIdentity;
1732
1733 glPushMatrix;
1734 glTranslate 0, 0, -800;
1735 glScale 1, -1, 1;
1736 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1737 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1738 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1739 glScale 50, 50, 50;
1740
1741 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1742 while (my ($k, $v) = each %{$r->{g}}) {
1743 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1744 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1745 }
1746
1747 glPopMatrix;
1748
1749 glShadeModel GL_FLAT;
1750 glDisable GL_DEPTH_TEST;
1751 glDisable GL_TEXTURE_2D;
1752 glDepthMask 0;
1753
1754 $WANT_REFRESH++;
1755};
1756
1757 CFClient::SDL_GL_SwapBuffers; 1889 CFClient::SDL_GL_SwapBuffers;
1758} 1890}
1759 1891
1760my $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 {
1761 $NOW = time; 1893 $NOW = time;
1807# 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#
1808 }, 1940 },
1809 CFClient::SDL_KEYDOWN => sub { 1941 CFClient::SDL_KEYDOWN => sub {
1810 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1811 # alt-enter 1943 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle;
1812 video_shutdown; 1945 video_shutdown;
1813 $CFG->{fullscreen} = !$CFG->{fullscreen};
1814 video_init; 1946 video_init;
1815 } else { 1947 } else {
1816 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1948 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1817 } 1949 }
1818 }, 1950 },
1834$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1835 1967
1836{ 1968{
1837 local $SIG{__DIE__} = sub { 1969 local $SIG{__DIE__} = sub {
1838 return unless defined $^S && !$^S; 1970 return unless defined $^S && !$^S;
1839 Carp::confess $_[1];#d#TODO: remove when stable 1971 Carp::confess $_[0];#d#TODO: remove when stable
1840 CFClient::fatal $_[0]; 1972 CFClient::fatal $_[0];
1841 }; 1973 };
1842 1974
1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1844 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
1845 1977
1846 my %DEF_CFG = ( 1978 my %DEF_CFG = (
1847 sdl_mode => 0, 1979 sdl_mode => 0,
1848 width => 640, 1980 width => 640,
1849 height => 480, 1981 height => 480,
1850 fullscreen => 0, 1982 fullscreen => 0,
1851 fast => 0, 1983 fast => 0,
1852 map_scale => 1, 1984 map_scale => 1,
1853 fow_enable => 1, 1985 fow_enable => 1,
1854 fow_intensity => 0.45, 1986 fow_intensity => 0.45,
1855 fow_smooth => 0, 1987 fow_smooth => 0,
1856 gui_fontsize => 1, 1988 gui_fontsize => 1,
1857 log_fontsize => 0.7, 1989 log_fontsize => 0.7,
1858 gauge_fontsize=> 1, 1990 gauge_fontsize => 1,
1859 gauge_size => 0.35, 1991 gauge_size => 0.35,
1860 stat_fontsize => 0.7, 1992 stat_fontsize => 0.7,
1861 mapsize => 100, 1993 mapsize => 100,
1862 host => "crossfire.schmorp.de",
1863 say_command => 'say', 1994 say_command => 'say',
1864 audio_enable => 1, 1995 audio_enable => 1,
1865 bgm_enable => 1, 1996 bgm_enable => 1,
1866 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1867 face_prefetch => 0, 1998 face_prefetch => 0,
1868 output_sync => 1, 1999 output_sync => 1,
1869 output_count => 1, 2000 output_count => 1,
1870 pickup => 0, 2001 pickup => 0,
2002 inv_sort => "mtime",
2003 default => "profile", # default profile
2004 );
1871 ); 2005
1872
1873 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1874 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1875 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1876 2011
1877 sdl_init; 2012 sdl_init;
1878 2013
1879 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1880 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,
1922 video_init; 2057 video_init;
1923 audio_init; 2058 audio_init;
1924} 2059}
1925 2060
1926Event::loop; 2061Event::loop;
2062#CFClient::SDL_Quit;
2063#CFClient::_exit 0;
1927 2064
1928END { CFClient::SDL_Quit } 2065END { CFClient::SDL_Quit }
1929 2066
1930=head1 NAME 2067=head1 NAME
1931 2068

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines