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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines