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.72 by elmex, Tue Jun 13 18:14:03 2006 UTC vs.
Revision 1.100 by root, Sun Jul 23 16:11:12 2006 UTC

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

Diff Legend

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