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.66 by elmex, Thu Jun 8 19:43:26 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;
94our $SERVER_INFO;
89 95
90our $SETUP_DIALOG; 96our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 97our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 98our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 99our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 100
101our $PL_NOTEBOOK;
96our $STATS_WINDOW; 102our $PL_WINDOW;
103
104our $INVENTORY_PAGE;
105our $STATS_PAGE;
106our $SKILL_PAGE;
107our $SPELL_PAGE;
108
109our $HELP_WINDOW;
97our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
98our $FLOORBOX; 111our $FLOORBOX;
99our $GAUGES; 112our $GAUGES;
100our $STATWIDS; 113our $STATWIDS;
101 114
108 121
109our $ALT_ENTER_MESSAGE; 122our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 123our $STATUSBOX;
111our $DEBUG_STATUS; 124our $DEBUG_STATUS;
112 125
113our $INV_WINDOW;
114our $INV; 126our $INV;
115our $INVR; 127our $INVR;
116our $INV_RIGHT_HB; 128our $INV_RIGHT_HB;
117 129
118our $BIND_EDITOR; 130our $BIND_EDITOR;
131our $BIND_UPD_CB;
119 132
120our $PICKUP_CFG; 133our $PICKUP_CFG;
121 134
122sub status { 135sub status {
123 $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]);
124} 137}
125 138
126sub debug { 139sub debug {
127 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
128} 141}
154 $hbox->add (new CFClient::UI::Button 167 $hbox->add (new CFClient::UI::Button
155 text => "No", 168 text => "No",
156 on_activate => sub { 169 on_activate => sub {
157 $conn->send ("reply n"); 170 $conn->send ("reply n");
158 $dialog->destroy; 171 $dialog->destroy;
172 0
159 } 173 }
160 ); 174 );
161 $hbox->add (new CFClient::UI::Button 175 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 176 text => "Yes",
163 on_activate => sub { 177 on_activate => sub {
164 $conn->send ("reply y"); 178 $conn->send ("reply y");
165 destroy_query_dialog $conn; 179 destroy_query_dialog $conn;
180 0
166 }, 181 },
167 ); 182 );
168 183
169 $dialog->focus_in; 184 $dialog->grab_focus;
170 185
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 186 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $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)";
173 188
174 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) {
175 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
176 191
177 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
179 ellipsise => 0, 194 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
181 196
182 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
183 198
184 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 200 text => "Next Race",
186 on_activate => sub { 201 on_activate => sub {
187 $conn->send ("reply n"); 202 $conn->send ("reply n");
188 destroy_query_dialog $conn; 203 destroy_query_dialog $conn;
204 0
189 }, 205 },
190 ); 206 );
191 $table->add (2, 0, new CFClient::UI::Button 207 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 208 text => "Accept",
193 on_activate => sub { 209 on_activate => sub {
194 $conn->send ("reply d"); 210 $conn->send ("reply d");
195 destroy_query_dialog $conn; 211 destroy_query_dialog $conn;
212 0
196 }, 213 },
197 ); 214 );
198 215
199 unshift @dialog, new CFClient::UI::Label 216 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
201 ellipsise => 0, 218 ellipsise => 0,
202 markup => 219 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "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 "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "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 "
207 . "(<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"
208 . "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 "
209 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
210 ; 227 ;
211 228
212 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
215 destroy_query_dialog $conn; 232 destroy_query_dialog $conn;
216 return; 233 return;
217 } 234 }
218 235
219 $STATS_WINDOW->show; 236 $STATS_PAGE->show;
220 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
221 238
222 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
224 ellipsise => 0, 241 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
226 243
227 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
228 245
229 # left: re-roll 246 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 248 text => "Roll Again",
232 on_activate => sub { 249 on_activate => sub {
233 $conn->send ("reply y"); 250 $conn->send ("reply y");
234 destroy_query_dialog $conn; 251 destroy_query_dialog $conn;
252 0
235 }, 253 },
236 ); 254 );
237 255
238 # center: swap stats 256 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
258 expand => 1,
240 value => $_, 259 value => $_,
241 options => [ 260 options => [
242 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
253 text => "Swap Stats", 272 text => "Swap Stats",
254 on_activate => sub { 273 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 274 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 275 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 276 destroy_query_dialog $conn;
277 0
258 }, 278 },
259 ); 279 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 280 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 281
262 # right: accept 282 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button 283 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept", 284 text => "Accept",
265 on_activate => sub { 285 on_activate => sub {
266 $conn->send ("reply n"); 286 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 287 $STATS_PAGE->hide;
268 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
289 0
269 }, 290 },
270 ); 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 }
271 313
272 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
274 ellipsise => 0, 316 ellipsise => 0,
275 markup => 317 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "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"
278 . "(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"
279 . "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"
280 . "Race selection will influence those values later on."
281 ; 323 ;
282 } 324 }
283 325
284 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 327 on_changed => sub {
286 $conn->send ("reply $_[1]"); 328 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 329 destroy_query_dialog $conn;
330 0
288 }, 331 },
289 ; 332 ;
290 333
291 $entry->focus_in; 334 $entry->grab_focus;
292 335
293 } else { 336 } else {
294 $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)";
295 338
296 push @dialog, my $entry = new CFClient::UI::Entry 339 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 340 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 341 on_activate => sub {
299 $conn->send ("reply $_[1]"); 342 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 343 destroy_query_dialog $conn;
344 0
301 }, 345 },
302 ; 346 ;
303 347
304 $entry->focus_in; 348 $entry->grab_focus;
305 } 349 }
306 350
307 $vbox->add (@dialog); 351 $vbox->add (@dialog);
308 $dialog->show; 352 $dialog->show;
309} 353}
314 $LOGIN_BUTTON->set_text ("Logout"); 358 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 359 $SETUP_DIALOG->hide;
316 360
317 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;
318 362
319 my ($host, $port) = split /:/, $CFG->{host}; 363 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 364
321 $MAP = new CFClient::Map $mapsize, $mapsize; 365 $MAP = new CFClient::Map $mapsize, $mapsize;
322 366
323 $CONN = eval { 367 $CONN = eval {
324 new CFClient::Protocol 368 new CFClient::Protocol
325 host => $host, 369 host => $host,
326 port => $port || 13327, 370 port => $port || 13327,
327 user => $CFG->{user}, 371 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 372 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 373 mapw => $mapsize,
330 maph => $mapsize, 374 maph => $mapsize,
331 375
332 map_widget => $MAPWIDGET, 376 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 377 logview => $LOGVIEW,
361 405
362sub stop_game { 406sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 407 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 408 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 409 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 410 $PL_WINDOW->hide;
411 $SPELL_PAGE->clear_spells;
367 412
368 return unless $CONN; 413 return unless $CONN;
369 414
370 status "connection closed"; 415 status "connection closed";
371 416
372 destroy_query_dialog $CONN; 417 destroy_query_dialog $CONN;
373 $CONN->destroy; 418 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 419 $CONN = 0; # false, does not autovivify
420
421 undef $MAP;
375} 422}
376 423
377sub graphics_setup { 424sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 425 my $vbox = new CFClient::UI::VBox;
379 426
394 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
395 442
396 my $row = 1; 443 my $row = 1;
397 444
398 $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");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 450 );
407 451
408 $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");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 453 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 454 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 455 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 456 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 457 );
417 458
418 $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");
419 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 461 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 462 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 463 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 464 );
427 465
428 $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");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 467 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 468 state => $CFG->{fow_enable},
431 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.",
432 on_changed => sub { 470 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 471 );
437 472
438 $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");
439 $table->add (1, $row++, new CFClient::UI::Slider 474 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 475 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 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.",
442 on_changed => sub { 477 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 478 );
447 479
448 $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");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 481 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 482 state => $CFG->{fow_smooth},
451 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.",
452 on_changed => sub { 484 on_changed => sub {
453 my ($self, $value) = @_; 485 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 486 $CFG->{fow_smooth} = $value;
455 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
456 } 489 }
457 ); 490 );
458 491
459 $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");
460 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 494 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 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.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 496 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 497 );
465 498
466 $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");
467 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 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.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 );
472
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 }
482 ); 504 );
483 505
484 $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");
485 $table->add (1, $row++, new CFClient::UI::Slider 507 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 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.",
488 on_changed => sub { 510 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 511 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 512 &set_gauge_window_fontsize;
513 0
491 } 514 }
492 ); 515 );
493 516
494 $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");
495 $table->add (1, $row++, new CFClient::UI::Slider 518 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 519 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 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.",
498 on_changed => sub { 521 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 522 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 523 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524 0
501 } 525 }
502 ); 526 );
503 527
504 $table->add (1, $row++, new CFClient::UI::Button 528 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 529 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 530 tooltip => "Apply the video settings",
507 on_activate => sub { 531 on_activate => sub {
508 video_shutdown (); 532 video_shutdown ();
509 video_init (); 533 video_init ();
534 0
510 } 535 }
511 ); 536 );
512 537
513 $vbox 538 $vbox
514} 539}
522 547
523 $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");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 549 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 550 state => $CFG->{audio_enable},
526 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.",
527 on_changed => sub { 552 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 553 );
531# $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");
532# $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 {
533# $CFG->{effects_volume} = $_[1]; 556# $CFG->{effects_volume} = $_[1];
534# }); 557# });
535 $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");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 559 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 560 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 561 expand => 1, state => $CFG->{bgm_enable},
539 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.",
540 on_changed => sub { 563 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 564 );
544 $hbox->add (new CFClient::UI::Slider 565 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 566 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 567 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 568 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 569 );
552 570
553 $table->add (1, $row++, new CFClient::UI::Button 571 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 572 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 573 tooltip => "Apply the audio settings",
556 on_activate => sub { 574 on_activate => sub {
557 audio_shutdown (); 575 audio_shutdown ();
558 audio_init (); 576 audio_init ();
577 0
559 } 578 }
560 ); 579 );
561 580
562 $vbox 581 $vbox
563}
564
565sub set_stats_window_fontsize {
566 for (values %{$STATWIDS}) {
567 $_->set_fontsize ($::CFG->{stat_fontsize});
568 }
569} 582}
570 583
571sub set_gauge_window_fontsize { 584sub set_gauge_window_fontsize {
572 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
573 $_->set_fontsize ($::CFG->{gauge_fontsize}); 586 $_->set_fontsize ($::CFG->{gauge_fontsize});
629 642
630sub debug_setup { 643sub debug_setup {
631 my $table = new CFClient::UI::Table; 644 my $table = new CFClient::UI::Table;
632 645
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 646 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $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 });
635 $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");
636 $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 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 650 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $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 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 652 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $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 });
641 654
642 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);
643 656
644 for my $x (0..2) { 657 for my $x (0..2) {
645 for my $y (0 .. 2) { 658 for my $y (0 .. 2) {
654 667
655 $table 668 $table
656} 669}
657 670
658sub stats_window { 671sub stats_window {
659 my $tgw = new CFClient::UI::FancyFrame 672 my $r = new CFClient::UI::ScrolledWindow (
660 y => $HEIGHT * (2/8), 673 expand => 1,
661 x => "max", 674 scroll_y => 1
662 title => "Stats", 675 );
663 name => "stats_window"; 676 $r->add (my $vb = new CFClient::UI::VBox);
664 677
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $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,
667 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
668 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.");
669 $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,
670 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
683 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
684 696
685 my $color2 = [1, 1, 0]; 697 my $color2 = [1, 1, 0];
686 698
687 for ( 699 for (
688 [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],
689 [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],
690 [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],
691 [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],
692 [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],
693 [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],
694 [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],
695 707
696 [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],
697 [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],
698 [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],
699 [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],
700 [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],
701 [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],
702 ) { 714 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 715 my ($col, $row, $id, $label, $template) = @$_;
704 716
705 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
706 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});
707 $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
708 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});
709 } 723 }
710 724
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
712 726
713 my $row = 0; 727 my $row = 0;
714 my $col = 0; 728 my $col = 0;
715 729
716 my %resist_names = ( 730 my %resist_names = (
731 slow => ["Slow",
717 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",
718 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",
719 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",
720 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",
721 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",
722 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",
723 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",
724 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",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 748 "<b>Poison</b> (resistance to getting poisoned)"],
749 para => ["Paralysation",
726 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",
727 deat => "<b>Death</b> (resistance against death spells)", 752 "<b>Death</b> (resistance against death spells)"],
728 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",
729 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",
730 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",
731 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",
732 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",
733 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",
734 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)"],
735 ); 767 );
736 for (qw/slow holyw conf fire depl magic 768 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 769 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
739 { 771 {
744 template => "-100%", 776 template => "-100%",
745 align => +1, 777 align => +1,
746 valign => 0, 778 valign => 0,
747 can_events => 1, 779 can_events => 1,
748 can_hover => 1, 780 can_hover => 1,
749 tooltip => $resist_names{$_}, 781 tooltip => $resist_names{$_}->[1],
750 ); 782 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
752 font => $FONT_FIXED, 784 font => $FONT_FIXED,
753 can_hover => 1, 785 can_hover => 1,
754 can_events => 1, 786 can_events => 1,
755 image => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
756 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],
757 ); 796 );
758 797
759 $row++; 798 $row++;
760 if ($row % 6 == 0) { 799 if ($row % 6 == 0) {
761 $col += 2; 800 $col += 3;
762 $row = 0; 801 $row = 0;
763 } 802 }
764 } 803 }
765 804
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 805 #update_stats_window ({});
768 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]);
769 $tgw 813 $sw
770} 814}
771 815
772sub formsep($) { 816sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 818}
775 819
776sub update_stats_window {
777 my ($stats) = @_;
778
779 # I love text protocols...
780
781 my $hp = $stats->{+CS_STAT_HP} * 1;
782 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
783 my $sp = $stats->{+CS_STAT_SP} * 1;
784 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
785 my $fo = $stats->{+CS_STAT_FOOD} * 1;
786 my $fo_m = 999;
787 my $gr = $stats->{+CS_STAT_GRACE} * 1;
788 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
789
790 $GAUGES->{hp} ->set_value ($hp, $hp_m);
791 $GAUGES->{mana} ->set_value ($sp, $sp_m);
792 $GAUGES->{food} ->set_value ($fo, $fo_m);
793 $GAUGES->{grace} ->set_value ($gr, $gr_m);
794 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
795 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
796 my $rng = $stats->{+CS_STAT_RANGE};
797 $rng =~ s/^Range: //; # thank you so much dear server
798 $GAUGES->{range} ->set_text ("Rng: " . $rng);
799 my $title = $stats->{+CS_STAT_TITLE};
800 $title =~ s/^Player: //;
801 $STATWIDS->{title} ->set_text ("Title: " . $title);
802
803 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
804 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
805 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
806 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
807 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818
819 # TODO: replace by CS_STAT_RES_xxx constants
820 my %tbl = (
821 phys => 100,
822 magic => 101,
823 fire => 102,
824 elec => 103,
825 cold => 104,
826 conf => 105,
827 acid => 106,
828 drain => 107,
829 ghit => 108,
830 pois => 109,
831 slow => 110,
832 para => 111,
833 tund => 112,
834 fear => 113,
835 depl => 113,
836 deat => 115,
837 holyw => 116,
838 blind => 117,
839 );
840
841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
842 for keys %tbl;
843}
844
845my $METASERVER_ATIME; 820my $METASERVER_ATIME;
846 821
847sub update_metaserver { 822sub update_metaserver {
823 my ($metaserver_dialog) = @_;
824
825 $METASERVER = $metaserver_dialog
826 if defined $metaserver_dialog;
827
848 return if $METASERVER_ATIME > time; 828 return if $METASERVER_ATIME > time;
849 $METASERVER_ATIME = time + 60; 829 $METASERVER_ATIME = time + 60;
850 830
851 my $table = $METASERVER->{table}; 831 my $table = $METASERVER->{table};
852 $table->clear; 832 $table->clear;
917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 897 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
918 (new CFClient::UI::Button 898 (new CFClient::UI::Button
919 text => "Use", 899 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field", 900 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub { 901 on_activate => sub {
922 $HOST_ENTRY->set_text ($CFG->{host} = $host); 902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
923 $METASERVER->hide; 903 $METASERVER->hide;
904 0
924 }, 905 },
925 ), 906 ),
926 (new CFClient::UI::Empty expand => 1), 907 (new CFClient::UI::Empty expand => 1),
927 ]); 908 ]);
928 909
939 } 920 }
940 }); 921 });
941} 922}
942 923
943sub 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
944 my $dialog = new CFClient::UI::FancyFrame 929 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List", 930 title => "Server List",
946 name => 'metaserver_dialog', 931 name => 'metaserver_dialog',
947 x => 'center', 932 x => 'center',
948 y => 'center', 933 y => 'center',
949 z => 3, 934 z => 3,
950 force_h => $::HEIGHT * 0.4, 935 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 936 child => $vbox,
937 has_close_button => 1,
938 table => $table,
952 on_visibility_change => sub { 939 on_visibility_change => sub {
953 update_metaserver if $_[1]; 940 update_metaserver ($_[0]) if $_[1];
941 0
954 }, 942 },
955 ; 943 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 944
961 $dialog 945 $dialog
962} 946}
963 947
964sub server_setup { 948sub server_setup {
971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 955 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
972 956
973 $vbox->add ( 957 $vbox->add (
974 $HOST_ENTRY = new CFClient::UI::Entry 958 $HOST_ENTRY = new CFClient::UI::Entry
975 expand => 1, 959 expand => 1,
976 text => $CFG->{host}, 960 text => $CFG->{profile}{default}{host},
977 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",
978 on_changed => sub { 962 on_changed => sub {
979 my ($self, $value) = @_; 963 my ($self, $value) = @_;
980 $CFG->{host} = $value; 964 $CFG->{profile}{default}{host} = $value;
965 0
981 } 966 }
982 ); 967 );
983
984 $METASERVER = metaserver_dialog;
985 968
986 $vbox->add (new CFClient::UI::Button 969 $vbox->add (new CFClient::UI::Button
987 expand => 1, 970 expand => 1,
988 text => "Server List", 971 text => "Server List",
989 other => $METASERVER, 972 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 973 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility }, 974 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 975 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 976 );
994 } 977 }
995 978
996 $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");
997 $table->add (1, 4, new CFClient::UI::Entry 980 $table->add (1, 4, new CFClient::UI::Entry
998 text => $CFG->{user}, 981 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 982 tooltip => "The name of your character on the server",
1000 on_changed => sub { 983 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 my ($self, $value) = @_;
1002 $CFG->{user} = $value;
1003 }
1004 ); 984 );
1005 985
1006 $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");
1007 $table->add (1, 5, new CFClient::UI::Entry 987 $table->add (1, 5, new CFClient::UI::Entry
1008 text => $CFG->{password}, 988 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 989 hidden => 1,
1010 tooltip => "The password for your character", 990 tooltip => "The password for your character",
1011 on_changed => sub { 991 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 my ($self, $value) = @_;
1013 $CFG->{password} = $value;
1014 }
1015 ); 992 );
1016 993
1017 $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");
1018 $table->add (1, 7, new CFClient::UI::Slider 995 $table->add (1, 7, new CFClient::UI::Slider
1019 force_w => 100, 996 force_w => 100,
1020 range => [$CFG->{mapsize}, 10, 100, 0, 1], 997 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1021 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. "
1022 . "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, "
1023 . "but you also increase bandwidth requirements and latency. " 1000 . "but you also increase bandwidth requirements and latency. "
1024 . "This option is only used once at log-in.", 1001 . "This option is only used once at log-in.",
1025 on_changed => sub { 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1026 my ($self, $value) = @_;
1027
1028 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1029 },
1030 ); 1003 );
1031 1004
1032 $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");
1033 $table->add (1, 8, new CFClient::UI::CheckBox 1006 $table->add (1, 8, new CFClient::UI::CheckBox
1034 state => $CFG->{face_prefetch}, 1007 state => $CFG->{face_prefetch},
1037 . "This might increase or create lag, but increases the chances " 1010 . "This might increase or create lag, but increases the chances "
1038 . "of faces being ready for display when you encounter them. " 1011 . "of faces being ready for display when you encounter them. "
1039 . "It also uses up server bandwidth on every connect, " 1012 . "It also uses up server bandwidth on every connect, "
1040 . "so only set it if you really need to prefetch images. " 1013 . "so only set it if you really need to prefetch images. "
1041 . "This option can be set and unset any time.", 1014 . "This option can be set and unset any time.",
1042 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1015 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1043 ); 1016 );
1044 1017
1045 $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");
1046 $table->add (1, 9, new CFClient::UI::Entry 1019 $table->add (1, 9, new CFClient::UI::Entry
1047 text => $CFG->{output_count}, 1020 text => $CFG->{output_count},
1048 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.",
1049 on_changed => sub { $CFG->{output_count} = $_[1] }, 1022 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1050 ); 1023 );
1051 1024
1052 $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");
1053 $table->add (1, 10, new CFClient::UI::Entry 1026 $table->add (1, 10, new CFClient::UI::Entry
1054 text => $CFG->{output_sync}, 1027 text => $CFG->{output_sync},
1055 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.",
1056 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1029 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1057 ); 1030 );
1058 1031
1059 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1060 expand => 1, 1033 expand => 1,
1061 align => 0, 1034 align => 0,
1062 text => "Login", 1035 text => "Login",
1063 on_activate => sub { 1036 on_activate => sub {
1064 $CONN ? stop_game 1037 $CONN ? stop_game
1065 : start_game; 1038 : start_game;
1039 0
1066 }, 1040 },
1067 ); 1041 );
1068 1042
1069 $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");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1044 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1073 . "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. "
1074 . "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.",
1075 on_changed => sub { 1049 on_changed => sub {
1076 my ($self, $value) = @_; 1050 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1051 $CFG->{say_command} = $value;
1052 0
1078 } 1053 }
1079 ); 1054 );
1055
1056 $vbox->add (new CFClient::UI::Label
1057 text => "Server Info",
1058 fontsize => 1.2,
1059 padding_y => 8,
1060 fg => [1, 1, 0, 1],
1061 );
1062
1063 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1080 1064
1081 $vbox 1065 $vbox
1082} 1066}
1083 1067
1084sub message_window { 1068sub message_window {
1085 my $window = new CFClient::UI::FancyFrame 1069 my $window = new CFClient::UI::FancyFrame
1086 name => "message_window", 1070 name => "message_window",
1087 title => "Messages", 1071 title => "Messages",
1088 border_bg => [1, 1, 1, 1], 1072 border_bg => [1, 1, 1, 1],
1089 bg => [0, 0, 0, 0.75],
1090 x => "max", 1073 x => "max",
1091 y => 0, 1074 y => 0,
1092 force_w => $::WIDTH * 0.4, 1075 force_w => $::WIDTH * 0.4,
1093 force_h => $::HEIGHT * 0.5, 1076 force_h => $::HEIGHT * 0.5,
1094 child => (my $vbox = new CFClient::UI::VBox); 1077 child => (my $vbox = new CFClient::UI::VBox),
1078 has_close_button => 1;
1095 1079
1096 $vbox->add ($LOGVIEW); 1080 $vbox->add ($LOGVIEW);
1097 1081
1098 $vbox->add (my $input = new CFClient::UI::Entry 1082 $vbox->add (my $input = new CFClient::UI::Entry
1099 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> "
1107 1091
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1092 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1; 1093 $input->{refocus_map} = 1;
1110 } 1094 }
1111 delete $input->{auto_activated}; 1095 delete $input->{auto_activated};
1096
1097 0
1112 }, 1098 },
1113 on_activate => sub { 1099 on_activate => sub {
1114 my ($input, $text) = @_; 1100 my ($input, $text) = @_;
1115 $input->set_text (''); 1101 $input->set_text ('');
1116 1102
1122 } 1108 }
1123 if ($input->{refocus_map}) { 1109 if ($input->{refocus_map}) {
1124 delete $input->{refocus_map}; 1110 delete $input->{refocus_map};
1125 $MAPWIDGET->focus_in 1111 $MAPWIDGET->focus_in
1126 } 1112 }
1113
1114 0
1127 }, 1115 },
1128 on_escape => sub { 1116 on_escape => sub {
1129 $MAPWIDGET->focus_in 1117 $MAPWIDGET->grab_focus;
1118
1119 0
1130 }, 1120 },
1131 ); 1121 );
1132 1122
1133 $CONSOLE = { 1123 $CONSOLE = {
1134 window => $window, 1124 window => $window,
1156 ); 1146 );
1157 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1147 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1158 $hb->add (new CFClient::UI::Button 1148 $hb->add (new CFClient::UI::Button
1159 text => "Ok", 1149 text => "Ok",
1160 expand => 1, 1150 expand => 1,
1161 on_activate => sub { $QUIT_DIALOG->hide }, 1151 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1162 ); 1152 );
1163 $hb->add (new CFClient::UI::Button 1153 $hb->add (new CFClient::UI::Button
1164 text => "Quit anyway", 1154 text => "Quit anyway",
1165 expand => 1, 1155 expand => 1,
1166 on_activate => sub { exit }, 1156 on_activate => sub { exit },
1173sub autopickup_setup { 1163sub autopickup_setup {
1174 my $table = new CFClient::UI::Table; 1164 my $table = new CFClient::UI::Table;
1175 1165
1176 for ( 1166 for (
1177 ["General", 0, 0, 1167 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE], 1168 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT], 1169 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP], 1170 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG], 1171 ["Debug autopickup" => PICKUP_DEBUG],
1182 ], 1172 ],
1183 ["Weapons", 0, 6, 1173 ["Weapons", 0, 6,
1220 for (@bits) { 1210 for (@bits) {
1221 ++$y; 1211 ++$y;
1222 1212
1223 my $mask = $_->[1]; 1213 my $mask = $_->[1];
1224 $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);
1225 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1215 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1226 state => $CFG->{pickup} & $mask, 1216 state => $::CFG->{pickup} & $mask,
1227 on_changed => sub { 1217 on_changed => sub {
1228 my ($box, $value) = @_; 1218 my ($box, $value) = @_;
1229 1219
1230 if ($value) { 1220 if ($value) {
1231 $::CFG->{pickup} |= $mask; 1221 $::CFG->{pickup} |= $mask;
1233 $::CFG->{pickup} &= ~$mask; 1223 $::CFG->{pickup} &= ~$mask;
1234 } 1224 }
1235 1225
1236 $::CONN->send_command ("pickup $::CFG->{pickup}") 1226 $::CONN->send_command ("pickup $::CFG->{pickup}")
1237 if defined $::CONN; 1227 if defined $::CONN;
1228
1229 0
1238 }); 1230 });
1231
1232 ${$_->[2]} = $checkbox if $_->[2];
1239 } 1233 }
1240 } 1234 }
1241 1235
1242 $table->add (2, 18, new CFClient::UI::ValSlider 1236 $table->add (2, 18, new CFClient::UI::ValSlider
1243 range => [0, 0, 16, 1, 1], 1237 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238 template => ">= 99",
1244 to_value => sub { ">= " . 5 * $_[0] }, 1239 to_value => sub { ">= " . 5 * $_[0] },
1245 on_changed => sub { 1240 on_changed => sub {
1246 my ($slider, $value) = @_; 1241 my ($slider, $value) = @_;
1247 1242
1248 $::CFG->{pickup} &= ~0x7; 1243 $::CFG->{pickup} &= ~0xF;
1249 $::CFG->{pickup} |= int $value 1244 $::CFG->{pickup} |= int $value
1250 if $value; 1245 if $value;
1251 1; 1246 1;
1252 }); 1247 });
1248
1253 $table->add (3, 18, new CFClient::UI::Button 1249 $table->add (3, 18, new CFClient::UI::Button
1254 text => "set", 1250 text => "set",
1255 on_activate => sub { 1251 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}") 1252 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN; 1253 if defined $::CONN;
1258 1; 1254 0
1259 }); 1255 });
1260 1256
1261 $table 1257 $table
1262} 1258}
1263 1259
1264sub 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 {
1265 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1319 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1266 x => "center", 1320 x => "center",
1267 y => "center", 1321 y => "center",
1268 force_w => $WIDTH * 9/10, 1322 force_w => $WIDTH * 9/10,
1269 force_h => $HEIGHT * 9/10, 1323 force_h => $HEIGHT * 9/10,
1270 title => "Inventory", 1324 title => "Player",
1325 name => "playerbook",
1326 has_close_button => 1
1271 ; 1327 ;
1272 1328
1273 $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;
1274 1332
1275 $hb->add (my $vb1 = new CFClient::UI::VBox); 1333 $ntb->add (
1276 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1334 "Statistics (F2)" => $STATS_PAGE = stats_window,
1277 $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 );
1278 1341
1279 $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 );
1280 1353
1281 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1354 $ntb->set_current_page ($INVENTORY_PAGE);
1282 1355
1283 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1356 $plwin->add ($ntb);
1284 1357 $plwin
1285 # XXX: Call after $INVR = ... because set_opencont sets the items
1286 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1287
1288 $invwin
1289} 1358}
1290 1359
1291sub spell_setup { 1360sub update_bindings {
1292 new CFClient::UI::SpellList 1361 $BIND_UPD_CB->() if $BIND_UPD_CB;
1293} 1362}
1294 1363
1295sub keyboard_setup { 1364sub keyboard_setup {
1296 my $binding_list = new CFClient::UI::VBox; 1365 my $binding_list = new CFClient::UI::VBox;
1297 1366
1298 my $refresh; 1367 my $refresh;
1299 $refresh = sub { 1368 $refresh = $BIND_UPD_CB = sub {
1300 $binding_list->clear (); 1369 $binding_list->clear ();
1301 1370
1302 for my $mod (keys %{$::CFG->{bindings}}) { 1371 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1303 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1372 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1304 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1373 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1305 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1374 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1306 1375
1307 my $lbl = join "; ", @$cmds; 1376 my $lbl = join "; ", @$cmds;
1308 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1377 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1309 $binding_list->add (my $hb = new CFClient::UI::HBox); 1378 $binding_list->add (my $hb = new CFClient::UI::HBox);
1310 $hb->add (new CFClient::UI::Button 1379 $hb->add (new CFClient::UI::Button
1311 text => "delete", 1380 text => "delete",
1312 tooltip => "Deletes the binding", 1381 tooltip => "Deletes the binding",
1313 on_activate => sub { 1382 on_activate => sub {
1314 $binding_list->remove ($hb); 1383 $binding_list->remove ($hb);
1315 delete $::CFG->{bindings}->{$mod}->{$sym}; 1384 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385 0
1316 }); 1386 });
1317 1387
1318 $hb->add (new CFClient::UI::Button 1388 $hb->add (new CFClient::UI::Button
1319 text => "edit", 1389 text => "edit",
1320 tooltip => "Edits the binding", 1390 tooltip => "Edits the binding",
1321 on_activate => sub { 1391 on_activate => sub {
1322 $::BIND_EDITOR->set_binding ( 1392 $::BIND_EDITOR->set_binding (
1323 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1393 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1324 sub { 1394 sub {
1325 my ($nmod, $nsym, $ncmds) = @_; 1395 my ($nmod, $nsym, $ncmds) = @_;
1326 delete $::CFG->{bindings}->{$mod}->{$sym}; 1396 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1327 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1397 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1328 $refresh->(); 1398 $refresh->();
1329 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1399 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1330 $SETUP_DIALOG->show; 1400 $SETUP_DIALOG->show;
1331 }, 1401 },
1332 sub { 1402 sub {
1333 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1403 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1334 $SETUP_DIALOG->show; 1404 $SETUP_DIALOG->show;
1335 }); 1405 });
1336 $::BIND_EDITOR->show; 1406 $::BIND_EDITOR->show;
1337 $SETUP_DIALOG->hide; 1407 $SETUP_DIALOG->hide;
1408 0
1338 }); 1409 });
1339 1410
1340 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1411 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1341 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1412 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1342 } 1413 }
1343 } 1414 }
1344 }; 1415 };
1345 1416
1346 my $vb = new CFClient::UI::VBox; 1417 my $vb = new CFClient::UI::VBox;
1418 $vb->add (my $hb = new CFClient::UI::HBox);
1419 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1420 $hb->add (new CFClient::UI::CheckBox
1421 expand => 1,
1422 state => $CFG->{shift_fire_stop},
1423 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424 on_changed => sub {
1425 my ($cbox, $value) = @_;
1426 $CFG->{shift_fire_stop} = $value;
1427 0
1428 });
1429
1347 $vb->add ($binding_list); 1430 $vb->add ($binding_list);
1348 $vb->add (my $hb = new CFClient::UI::HBox); 1431 $vb->add (my $hb = new CFClient::UI::HBox);
1349 1432
1350 $hb->add (new CFClient::UI::Button 1433 $hb->add (new CFClient::UI::Button
1351 text => "record new", 1434 text => "record new",
1353 tooltip => "This button opens the binding editor with an empty binding.", 1436 tooltip => "This button opens the binding editor with an empty binding.",
1354 on_activate => sub { 1437 on_activate => sub {
1355 $::BIND_EDITOR->set_binding (undef, undef, [], 1438 $::BIND_EDITOR->set_binding (undef, undef, [],
1356 sub { 1439 sub {
1357 my ($mod, $sym, $cmds) = @_; 1440 my ($mod, $sym, $cmds) = @_;
1358 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1441 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1359 $refresh->(); 1442 $refresh->();
1360 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1443 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1361 $SETUP_DIALOG->show; 1444 $SETUP_DIALOG->show;
1362 }, 1445 },
1363 sub { 1446 sub {
1365 $SETUP_DIALOG->show; 1448 $SETUP_DIALOG->show;
1366 }, 1449 },
1367 ); 1450 );
1368 $SETUP_DIALOG->hide; 1451 $SETUP_DIALOG->hide;
1369 $::BIND_EDITOR->show; 1452 $::BIND_EDITOR->show;
1453 0
1370 }, 1454 },
1371 ); 1455 );
1372 1456
1373 $hb->add (new CFClient::UI::Button 1457 $hb->add (new CFClient::UI::Button
1374 text => "close", 1458 text => "close",
1375 tooltip => "Closes the binding window", 1459 tooltip => "Closes the binding window",
1376 expand => 1, 1460 expand => 1,
1377 on_activate => sub { 1461 on_activate => sub {
1378 $SETUP_DIALOG->hide; 1462 $SETUP_DIALOG->hide;
1463 0
1379 } 1464 }
1380 ); 1465 );
1381 1466
1382 $refresh->(); 1467 $refresh->();
1383 1468
1384 $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);
1385} 1547}
1386 1548
1387sub help_window { 1549sub help_window {
1388 my $win = new CFClient::UI::FancyFrame 1550 my $win = new CFClient::UI::FancyFrame
1389 x => 'center', 1551 x => 'center',
1390 y => 'center', 1552 y => 'center',
1391 z => 2, 1553 z => 2,
1392 name => 'doc_browser', 1554 name => 'doc_browser',
1393 force_w => int $WIDTH * 7/8, 1555 force_w => int $WIDTH * 7/8,
1394 force_h => int $HEIGHT * 7/8, 1556 force_h => int $HEIGHT * 7/8,
1395 title => "Documentation"; 1557 title => "Help Browser",
1558 has_close_button => 1;
1396 1559
1397 $win->add (my $vbox = new CFClient::UI::VBox); 1560 $win->add (my $vbox = new CFClient::UI::VBox);
1398 1561
1399 $vbox->add (my $buttons = new CFClient::UI::HBox); 1562 $vbox->add (my $buttons = new CFClient::UI::HBox);
1400 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1563 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1403 $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: ");
1404 $buttons->add (my $combo = new CFClient::UI::Combobox 1567 $buttons->add (my $combo = new CFClient::UI::Combobox
1405 value => undef, 1568 value => undef,
1406 options => [ 1569 options => [
1407 [intro => "Introduction"], 1570 [intro => "Introduction"],
1408 [manual => "Manual"], 1571 [manual => "Main Manual"],
1409 [skill_help => "Skills"], 1572 [skill_help => "Skill Reference"],
1410 [command_help => "Commands"], 1573 [command_help => "Command Reference"],
1411 [dmcommand_help => "DM Commands"], 1574 [dmcommand_help => "DM Commands"],
1412 [COPYING => "License Terms"], 1575 [COPYING => "License Terms"],
1576 [test => "test (do not select)"], #d#TODO
1413 ], 1577 ],
1414 on_changed => sub { 1578 on_changed => sub {
1415 my ($self, $pod) = @_; 1579 my ($self, $pod) = @_;
1416 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
1417 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1418 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#
1419 1593
1420 $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#
1421 1600
1422 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1423 for @$pom; 1602 for @$pom;
1424 1603
1425 $viewer->set_offset (0); 1604 $viewer->set_offset (0);
1605
1606 0
1426 }, 1607 },
1427 on_visibility_change => sub { 1608 on_visibility_change => sub {
1428 my ($self, $visible) = @_; 1609 my ($self, $visible) = @_;
1429 return unless $visible; 1610 return unless $visible;
1430 return if $self->{value}; 1611 return if $self->{value};
1431 $self->set_value ("intro"); 1612 $self->set_value ("intro");
1613 0
1432 }, 1614 },
1433 ); 1615 );
1434 1616
1435 $win 1617 $win
1436} 1618}
1475 z => 100, 1657 z => 100,
1476 force_x => "max", 1658 force_x => "max",
1477 force_y => 0; 1659 force_y => 0;
1478 $DEBUG_STATUS->show; 1660 $DEBUG_STATUS->show;
1479 1661
1480 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1662 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1481 1663
1482 $STATUSBOX = new CFClient::UI::Statusbox; 1664 $STATUSBOX = new CFClient::UI::Statusbox;
1483 $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]);
1484 1666
1485 (new CFClient::UI::Frame 1667 (new CFClient::UI::Frame
1505 $MAPWIDGET->connect (activate_console => sub { 1687 $MAPWIDGET->connect (activate_console => sub {
1506 my ($mapwidget, $preset) = @_; 1688 my ($mapwidget, $preset) = @_;
1507 1689
1508 if ($CONSOLE) { 1690 if ($CONSOLE) {
1509 $CONSOLE->{input}->{auto_activated} = 1; 1691 $CONSOLE->{input}->{auto_activated} = 1;
1510 $CONSOLE->{input}->focus_in; 1692 $CONSOLE->{input}->grab_focus;
1511 1693
1512 if ($preset && $CONSOLE->{input}->get_text eq '') { 1694 if ($preset && $CONSOLE->{input}->get_text eq '') {
1513 $CONSOLE->{input}->set_text ($preset); 1695 $CONSOLE->{input}->set_text ($preset);
1514 } 1696 }
1515 } 1697 }
1516 }); 1698 });
1517 $MAPWIDGET->show; 1699 $MAPWIDGET->show;
1518 $MAPWIDGET->focus_in; 1700 $MAPWIDGET->grab_focus;
1519 1701
1520 $LOGVIEW = new CFClient::UI::TextScroller 1702 $LOGVIEW = new CFClient::UI::TextScroller
1521 expand => 1, 1703 expand => 1,
1522 font => $FONT_FIXED, 1704 font => $FONT_FIXED,
1523 fontsize => $::CFG->{log_fontsize}, 1705 fontsize => $::CFG->{log_fontsize},
1533 x => 'center', 1715 x => 'center',
1534 y => 'center', 1716 y => 'center',
1535 z => 2, 1717 z => 2,
1536 force_w => $::WIDTH * 0.6, 1718 force_w => $::WIDTH * 0.6,
1537 force_h => $::HEIGHT * 0.6, 1719 force_h => $::HEIGHT * 0.6,
1720 has_close_button => 1,
1538 ; 1721 ;
1722
1723 $METASERVER = metaserver_dialog;
1539 1724
1540 $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,
1541 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1726 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1542 1727
1543 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1728 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1547 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1732 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1548 "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.");
1549 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1734 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1550 "Configure the use of audio, sound effects and background music."); 1735 "Configure the use of audio, sound effects and background music.");
1551 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1736 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1552 "Lets you define, edit and delete bindings." 1737 "Lets you define, edit and delete key bindings."
1553 . "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 "
1554 . "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 "
1555 . "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. "
1556 . "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 "
1557 . "binding editor closes"); 1742 . "binding editor closes");
1558 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1559 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1560 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1743 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1561 "Some debuggign options. Do not ask."); 1744 "Some debuggin' options. Do not ask.");
1562 1745
1563 $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
1564 1747
1565 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1566 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.");
1568 $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,
1569 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.");
1570 1753
1571 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
1572 1755
1573 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1574 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1576 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.");
1577 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1578 1758
1579 $BUTTONBAR->add (new CFClient::UI::Button 1759 $BUTTONBAR->add (new CFClient::UI::Button
1580 text => "Save Config", 1760 text => "Save Config",
1581 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.",
1582 on_activate => sub { 1762 on_activate => sub {
1583 $::CFG->{layout} = CFClient::UI::get_layout; 1763 $::CFG->{layout} = CFClient::UI::get_layout;
1584 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1764 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1585 status "Configuration Saved"; 1765 status "Configuration Saved";
1766 0
1586 }, 1767 },
1587 ); 1768 );
1588 1769
1589 $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,
1590 tooltip => "View Documentation"); 1771 tooltip => "View Documentation");
1591 1772
1592 $BUTTONBAR->add (new CFClient::UI::Button 1773 $BUTTONBAR->add (new CFClient::UI::Button
1593 text => "Quit", 1774 text => "Quit",
1594 tooltip => "Terminates the program", 1775 tooltip => "Terminates the program",
1596 if ($CONN) { 1777 if ($CONN) {
1597 open_quit_dialog; 1778 open_quit_dialog;
1598 } else { 1779 } else {
1599 exit; 1780 exit;
1600 } 1781 }
1782 0
1601 }, 1783 },
1602 ); 1784 );
1603 1785
1604 $BUTTONBAR->show; 1786 $BUTTONBAR->show;
1605 $SETUP_DIALOG->show; 1787 $SETUP_DIALOG->show;
1607 1789
1608 $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]);
1609} 1791}
1610 1792
1611sub video_shutdown { 1793sub video_shutdown {
1794 CFClient::OpenGL::shutdown;
1795
1612 undef $SDL_ACTIVE; 1796 undef $SDL_ACTIVE;
1613} 1797}
1614 1798
1615my @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#
1616my $bgmusic;#TODO#hack#d# 1800my $bgmusic;#TODO#hack#d#
1688 1872
1689 $WANT_REFRESH = 0; 1873 $WANT_REFRESH = 0;
1690 $CAN_REFRESH = 0; 1874 $CAN_REFRESH = 0;
1691 $LAST_REFRESH = $NOW; 1875 $LAST_REFRESH = $NOW;
1692 1876
16930 && do {
1694 # some weird model-drawing code, just a joke right now
1695 use CFClient::OpenGL;
1696
1697 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1698 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1699 $demo{r} ||= do {
1700 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1701 $mod->{v} = pack "f*", @{$mod->{v}};
1702 $_ = [scalar @$_, pack "S!*", @$_]
1703 for values %{$mod->{g}};
1704 $mod
1705 };
1706
1707 my $r = $demo{r} or die;
1708
1709 glDepthMask 1;
1710 glClear GL_DEPTH_BUFFER_BIT;
1711 glEnable GL_TEXTURE_2D;
1712 glEnable GL_DEPTH_TEST;
1713 glEnable GL_CULL_FACE;
1714 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1715
1716 glMatrixMode GL_PROJECTION;
1717 glLoadIdentity;
1718 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1719 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1720 glMatrixMode GL_MODELVIEW;
1721 glLoadIdentity;
1722
1723 glPushMatrix;
1724 glTranslate 0, 0, -800;
1725 glScale 1, -1, 1;
1726 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1727 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1728 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1729 glScale 50, 50, 50;
1730
1731 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1732 while (my ($k, $v) = each %{$r->{g}}) {
1733 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1734 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1735 }
1736
1737 glPopMatrix;
1738
1739 glShadeModel GL_FLAT;
1740 glDisable GL_DEPTH_TEST;
1741 glDisable GL_TEXTURE_2D;
1742 glDepthMask 0;
1743
1744 $WANT_REFRESH++;
1745};
1746
1747 CFClient::SDL_GL_SwapBuffers; 1877 CFClient::SDL_GL_SwapBuffers;
1748} 1878}
1749 1879
1750my $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 {
1751 $NOW = time; 1881 $NOW = time;
1797# 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#
1798 }, 1928 },
1799 CFClient::SDL_KEYDOWN => sub { 1929 CFClient::SDL_KEYDOWN => sub {
1800 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1801 # alt-enter 1931 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle;
1802 video_shutdown; 1933 video_shutdown;
1803 $CFG->{fullscreen} = !$CFG->{fullscreen};
1804 video_init; 1934 video_init;
1805 } else { 1935 } else {
1806 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1936 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1807 } 1937 }
1808 }, 1938 },
1824$SIG{INT} = $SIG{TERM} = sub { exit }; 1954$SIG{INT} = $SIG{TERM} = sub { exit };
1825 1955
1826{ 1956{
1827 local $SIG{__DIE__} = sub { 1957 local $SIG{__DIE__} = sub {
1828 return unless defined $^S && !$^S; 1958 return unless defined $^S && !$^S;
1829 Carp::confess $_[1];#d#TODO: remove when stable 1959 Carp::confess $_[0];#d#TODO: remove when stable
1830 CFClient::fatal $_[0]; 1960 CFClient::fatal $_[0];
1831 }; 1961 };
1832 1962
1833 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1834 CFClient::UI::set_layout ($::CFG->{layout}); 1964 CFClient::UI::set_layout ($::CFG->{layout});
1835 1965
1836 my %DEF_CFG = ( 1966 my %DEF_CFG = (
1837 sdl_mode => 0, 1967 sdl_mode => 0,
1838 width => 640, 1968 width => 640,
1839 height => 480, 1969 height => 480,
1840 fullscreen => 0, 1970 fullscreen => 0,
1841 fast => 0, 1971 fast => 0,
1842 map_scale => 1, 1972 map_scale => 1,
1843 fow_enable => 1, 1973 fow_enable => 1,
1844 fow_intensity => 0.45, 1974 fow_intensity => 0.45,
1845 fow_smooth => 0, 1975 fow_smooth => 0,
1846 gui_fontsize => 1, 1976 gui_fontsize => 1,
1847 log_fontsize => 0.7, 1977 log_fontsize => 0.7,
1848 gauge_fontsize=> 1, 1978 gauge_fontsize => 1,
1849 gauge_size => 0.35, 1979 gauge_size => 0.35,
1850 stat_fontsize => 0.7, 1980 stat_fontsize => 0.7,
1851 mapsize => 100, 1981 mapsize => 100,
1852 host => "crossfire.schmorp.de",
1853 say_command => 'say', 1982 say_command => 'say',
1854 audio_enable => 1, 1983 audio_enable => 1,
1855 bgm_enable => 1, 1984 bgm_enable => 1,
1856 bgm_volume => 0.25, 1985 bgm_volume => 0.25,
1857 face_prefetch => 0, 1986 face_prefetch => 0,
1858 output_sync => 1, 1987 output_sync => 1,
1859 output_count => 1, 1988 output_count => 1,
1860 pickup => 0, 1989 pickup => 0,
1990 default => "profile", # default profile
1991 );
1861 ); 1992
1862
1863 while (my ($k, $v) = each %DEF_CFG) { 1993 while (my ($k, $v) = each %DEF_CFG) {
1864 $CFG->{$k} = $v unless exists $CFG->{$k}; 1994 $CFG->{$k} = $v unless exists $CFG->{$k};
1865 } 1995 }
1996
1997 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1866 1998
1867 sdl_init; 1999 sdl_init;
1868 2000
1869 @SDL_MODES = reverse 2001 @SDL_MODES = reverse
1870 grep $_->[0] >= 640 && $_->[1] >= 480, 2002 grep $_->[0] >= 640 && $_->[1] >= 480,
1912 video_init; 2044 video_init;
1913 audio_init; 2045 audio_init;
1914} 2046}
1915 2047
1916Event::loop; 2048Event::loop;
2049#CFClient::SDL_Quit;
2050#CFClient::_exit 0;
1917 2051
1918END { CFClient::SDL_Quit } 2052END { CFClient::SDL_Quit }
1919 2053
1920=head1 NAME 2054=head1 NAME
1921 2055

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines