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.63 by root, Wed Jun 7 05:54:09 2006 UTC vs.
Revision 1.98 by root, Sat Jul 22 13:20:33 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::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
93our $SERVER_INFO;
89 94
90our $SETUP_DIALOG; 95our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 97our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 99
100our $PL_NOTEBOOK;
96our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
97our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
98our $FLOORBOX; 110our $FLOORBOX;
99our $GAUGES; 111our $GAUGES;
100our $STATWIDS; 112our $STATWIDS;
101 113
… …
108 120
109our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 122our $STATUSBOX;
111our $DEBUG_STATUS; 123our $DEBUG_STATUS;
112 124
113our $INV_WINDOW;
114our $INV; 125our $INV;
115our $INVR; 126our $INVR;
116our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
117 128
118our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
119 131
120our $PICKUP_CFG; 132our $PICKUP_CFG;
121 133
122sub status { 134sub status {
123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 135 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
154 $hbox->add (new CFClient::UI::Button 166 $hbox->add (new CFClient::UI::Button
155 text => "No", 167 text => "No",
156 on_activate => sub { 168 on_activate => sub {
157 $conn->send ("reply n"); 169 $conn->send ("reply n");
158 $dialog->destroy; 170 $dialog->destroy;
171 0
159 } 172 }
160 ); 173 );
161 $hbox->add (new CFClient::UI::Button 174 $hbox->add (new CFClient::UI::Button
162 text => "Yes", 175 text => "Yes",
163 on_activate => sub { 176 on_activate => sub {
164 $conn->send ("reply y"); 177 $conn->send ("reply y");
165 destroy_query_dialog $conn; 178 destroy_query_dialog $conn;
179 0
166 }, 180 },
167 ); 181 );
168 182
169 $dialog->focus_in; 183 $dialog->grab_focus;
170 184
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 186 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173 187
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 188 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
176 190
177 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
179 ellipsise => 0, 193 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
181 195
182 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
183 197
184 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race", 199 text => "Next Race",
186 on_activate => sub { 200 on_activate => sub {
187 $conn->send ("reply n"); 201 $conn->send ("reply n");
188 destroy_query_dialog $conn; 202 destroy_query_dialog $conn;
203 0
189 }, 204 },
190 ); 205 );
191 $table->add (2, 0, new CFClient::UI::Button 206 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept", 207 text => "Accept",
193 on_activate => sub { 208 on_activate => sub {
194 $conn->send ("reply d"); 209 $conn->send ("reply d");
195 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
211 0
196 }, 212 },
197 ); 213 );
198 214
199 unshift @dialog, new CFClient::UI::Label 215 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
201 ellipsise => 0, 217 ellipsise => 0,
202 markup => 218 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "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 " 221 . "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" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "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, " 224 . "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." 225 . "this race eventually, so you can take your time making this important choice."
210 ; 226 ;
211 227
212 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
215 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
216 return; 232 return;
217 } 233 }
218 234
219 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
220 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
221 237
222 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
224 ellipsise => 0, 240 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
226 242
227 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
228 244
229 # left: re-roll 245 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again", 247 text => "Roll Again",
232 on_activate => sub { 248 on_activate => sub {
233 $conn->send ("reply y"); 249 $conn->send ("reply y");
234 destroy_query_dialog $conn; 250 destroy_query_dialog $conn;
251 0
235 }, 252 },
236 ); 253 );
237 254
238 # center: swap stats 255 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
240 value => $_, 258 value => $_,
241 options => [ 259 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"], 263 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"], 264 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"], 265 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 266 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ], 267 ],
250 ), 1 .. 2; 268 ), 1 .. 2;
251 269
252 $table->add (2, 0, new CFClient::UI::Button 270 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats", 271 text => "Swap Stats",
254 on_activate => sub { 272 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 273 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 274 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
276 0
258 }, 277 },
259 ); 278 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 279 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261 280
262 # right: accept 281 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button 282 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept", 283 text => "Accept",
265 on_activate => sub { 284 on_activate => sub {
266 $conn->send ("reply n"); 285 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 286 $STATS_PAGE->hide;
268 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
288 0
269 }, 289 },
270 ); 290 );
291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
271 312
272 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
274 ellipsise => 0, 315 ellipsise => 0,
275 markup => 316 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<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" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "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. " 321 . "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 ; 322 ;
282 } 323 }
283 324
284 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub { 326 on_changed => sub {
286 $conn->send ("reply $_[1]"); 327 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 328 destroy_query_dialog $conn;
329 0
288 }, 330 },
289 ; 331 ;
290 332
291 $entry->focus_in; 333 $entry->grab_focus;
292 334
293 } else { 335 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 336 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295 337
296 push @dialog, my $entry = new CFClient::UI::Entry 338 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 339 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 340 on_activate => sub {
299 $conn->send ("reply $_[1]"); 341 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
343 0
301 }, 344 },
302 ; 345 ;
303 346
304 $entry->focus_in; 347 $entry->grab_focus;
305 } 348 }
306 349
307 $vbox->add (@dialog); 350 $vbox->add (@dialog);
308 $dialog->show; 351 $dialog->show;
309} 352}
… …
314 $LOGIN_BUTTON->set_text ("Logout"); 357 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 358 $SETUP_DIALOG->hide;
316 359
317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 360 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318 361
319 my ($host, $port) = split /:/, $CFG->{host}; 362 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320 363
321 $MAP = new CFClient::Map $mapsize, $mapsize; 364 $MAP = new CFClient::Map $mapsize, $mapsize;
322 365
323 $CONN = eval { 366 $CONN = eval {
324 new CFClient::Protocol 367 new CFClient::Protocol
325 host => $host, 368 host => $host,
326 port => $port || 13327, 369 port => $port || 13327,
327 user => $CFG->{user}, 370 user => $CFG->{profile}{default}{user},
328 pass => $CFG->{password}, 371 pass => $CFG->{profile}{default}{password},
329 mapw => $mapsize, 372 mapw => $mapsize,
330 maph => $mapsize, 373 maph => $mapsize,
331 374
332 map_widget => $MAPWIDGET, 375 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 376 logview => $LOGVIEW,
… …
361 404
362sub stop_game { 405sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 406 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 407 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 408 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 409 $PL_WINDOW->hide;
410 $SPELL_PAGE->clear_spells;
367 411
368 return unless $CONN; 412 return unless $CONN;
369 413
370 status "connection closed"; 414 status "connection closed";
371 415
372 destroy_query_dialog $CONN; 416 destroy_query_dialog $CONN;
373 $CONN->destroy; 417 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 418 $CONN = 0; # false, does not autovivify
419
420 undef $MAP;
375} 421}
376 422
377sub graphics_setup { 423sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 424 my $vbox = new CFClient::UI::VBox;
379 425
… …
394 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
395 441
396 my $row = 1; 442 my $row = 1;
397 443
398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
400 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 449 );
407 450
408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 451 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 452 $table->add (1, $row++, new CFClient::UI::CheckBox
410 state => $CFG->{fast}, 453 state => $CFG->{fast},
411 tooltip => "Lower the visual quality considerably to speed up rendering.", 454 tooltip => "Lower the visual quality considerably to speed up rendering.",
412 on_changed => sub { 455 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413 my ($self, $value) = @_;
414 $CFG->{fast} = $value;
415 }
416 ); 456 );
417 457
418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 458 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419 $table->add (1, $row++, new CFClient::UI::Slider 459 $table->add (1, $row++, new CFClient::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 460 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 461 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 462 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 463 );
427 464
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 465 $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 466 $table->add (1, $row++, new CFClient::UI::CheckBox
430 state => $CFG->{fow_enable}, 467 state => $CFG->{fow_enable},
431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 468 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432 on_changed => sub { 469 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 470 );
437 471
438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 472 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439 $table->add (1, $row++, new CFClient::UI::Slider 473 $table->add (1, $row++, new CFClient::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 474 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.", 475 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 { 476 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 477 );
447 478
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 479 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 480 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth}, 481 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 482 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub { 483 on_changed => sub {
453 my ($self, $value) = @_; 484 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 485 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 486 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
487 0
456 } 488 }
457 ); 489 );
458 490
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 491 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider 492 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 493 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.", 494 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] }, 495 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464 ); 496 );
465 497
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 498 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467 $table->add (1, $row++, new CFClient::UI::Slider 499 $table->add (1, $row++, new CFClient::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 500 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.", 501 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]) }, 502 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 ); 503 );
483 504
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 505 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 506 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 507 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.", 508 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 509 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 510 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 511 &set_gauge_window_fontsize;
512 0
491 } 513 }
492 ); 514 );
493 515
494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 516 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495 $table->add (1, $row++, new CFClient::UI::Slider 517 $table->add (1, $row++, new CFClient::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 518 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 519 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498 on_changed => sub { 520 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 521 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 522 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
523 0
501 } 524 }
502 ); 525 );
503 526
504 $table->add (1, $row++, new CFClient::UI::Button 527 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply", 528 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 529 tooltip => "Apply the video settings",
507 on_activate => sub { 530 on_activate => sub {
508 video_shutdown (); 531 video_shutdown ();
509 video_init (); 532 video_init ();
533 0
510 } 534 }
511 ); 535 );
512 536
513 $vbox 537 $vbox
514} 538}
… …
522 546
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 547 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 548 $table->add (1, $row++, new CFClient::UI::CheckBox
525 state => $CFG->{audio_enable}, 549 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.", 550 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 { 551 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 552 );
531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 553# $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 { 554# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533# $CFG->{effects_volume} = $_[1]; 555# $CFG->{effects_volume} = $_[1];
534# }); 556# });
535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 557 $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); 558 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 559 $hbox->add (new CFClient::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 560 expand => 1, state => $CFG->{bgm_enable},
539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 561 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540 on_changed => sub { 562 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 563 );
544 $hbox->add (new CFClient::UI::Slider 564 $hbox->add (new CFClient::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 565 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 566 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 567 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 ); 568 );
552 569
553 $table->add (1, $row++, new CFClient::UI::Button 570 $table->add (1, $row++, new CFClient::UI::Button
554 expand => 1, align => 0, text => "Apply", 571 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 572 tooltip => "Apply the audio settings",
556 on_activate => sub { 573 on_activate => sub {
557 audio_shutdown (); 574 audio_shutdown ();
558 audio_init (); 575 audio_init ();
576 0
559 } 577 }
560 ); 578 );
561 579
562 $vbox 580 $vbox
563}
564
565sub set_stats_window_fontsize {
566 for (values %{$STATWIDS}) {
567 $_->set_fontsize ($::CFG->{stat_fontsize});
568 }
569} 581}
570 582
571sub set_gauge_window_fontsize { 583sub set_gauge_window_fontsize {
572 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 584 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
573 $_->set_fontsize ($::CFG->{gauge_fontsize}); 585 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
625 &set_gauge_window_fontsize; 637 &set_gauge_window_fontsize;
626 638
627 $win 639 $win
628} 640}
629 641
642sub debug_setup {
643 my $table = new CFClient::UI::Table;
644
645 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
646 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
647 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
648 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
649 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
650 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
651 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
652 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
653
654 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
655
656 for my $x (0..2) {
657 for my $y (0 .. 2) {
658 $table->add ($x + 3, $y,
659 new CFClient::UI::Entry
660 text => $default_smooth[$x * 3 + $y],
661 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
662 );
663 }
664 }
665
666
667 $table
668}
630 669
631sub stats_window { 670sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 671 my $r = new CFClient::UI::ScrolledWindow (
633 y => $HEIGHT * (2/8), 672 expand => 1,
634 x => "max", 673 scroll_y => 1
635 title => "Stats", 674 );
636 name => "stats_window"; 675 $r->add (my $vb = new CFClient::UI::VBox);
637 676
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, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640 can_hover => 1, can_events => 1, 678 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."); 679 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, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
643 can_hover => 1, can_events => 1, 681 can_hover => 1, can_events => 1,
… …
656 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
657 695
658 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
659 697
660 for ( 698 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"], 699 [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"], 700 [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"], 701 [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"], 702 [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"], 703 [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"], 704 [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."], 705 [0, 6, st_cha => "Cha", 30],
668 706
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."], 707 [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."], 708 [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."], 709 [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."], 710 [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."], 711 [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."], 712 [2, 5, st_wspd => "WSp", 10.54],
675 ) { 713 ) {
676 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
677 715
678 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $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); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
680 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
681 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
682 } 722 }
683 723
684 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
685 725
686 my $row = 0; 726 my $row = 0;
687 my $col = 0; 727 my $col = 0;
688 728
689 my %resist_names = ( 729 my %resist_names = (
730 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.)", 731 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
732 holyw => ["Holy Word",
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.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
692 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
693 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
694 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
695 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
696 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
697 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
698 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
699 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
700 deat => "<b>Death</b> (resistance against death spells)", 751 "<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)", 752 phys => ["Physical",
753 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
754 blind => ["Blind",
702 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
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)", 757 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
758 tund => ["Turn undead",
704 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
705 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
706 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
707 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
708 ); 766 );
709 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
710 drain acid pois para deat phys 768 drain acid pois para deat phys
711 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
712 { 770 {
… …
717 template => "-100%", 775 template => "-100%",
718 align => +1, 776 align => +1,
719 valign => 0, 777 valign => 0,
720 can_events => 1, 778 can_events => 1,
721 can_hover => 1, 779 can_hover => 1,
722 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
723 ); 781 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
725 font => $FONT_FIXED, 783 font => $FONT_FIXED,
726 can_hover => 1, 784 can_hover => 1,
727 can_events => 1, 785 can_events => 1,
728 image => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
729 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
730 ); 795 );
731 796
732 $row++; 797 $row++;
733 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
734 $col += 2; 799 $col += 3;
735 $row = 0; 800 $row = 0;
736 } 801 }
737 } 802 }
738 803
739 &set_stats_window_fontsize;
740 update_stats_window ({}); 804 #update_stats_window ({});
741 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
742 $tgw 812 $sw
743} 813}
744 814
745sub formsep($) { 815sub formsep($) {
746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
747} 817}
748 818
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; 819my $METASERVER_ATIME;
819 820
820sub update_metaserver { 821sub update_metaserver {
822 my ($metaserver_dialog) = @_;
823
824 $METASERVER = $metaserver_dialog
825 if defined $metaserver_dialog;
826
821 return if $METASERVER_ATIME > time; 827 return if $METASERVER_ATIME > time;
822 $METASERVER_ATIME = time + 60; 828 $METASERVER_ATIME = time + 60;
823 829
824 my $table = $METASERVER->{table}; 830 my $table = $METASERVER->{table};
825 $table->clear; 831 $table->clear;
… …
890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
891 (new CFClient::UI::Button 897 (new CFClient::UI::Button
892 text => "Use", 898 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field", 899 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub { 900 on_activate => sub {
895 $HOST_ENTRY->set_text ($CFG->{host} = $host); 901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
896 $METASERVER->hide; 902 $METASERVER->hide;
903 0
897 }, 904 },
898 ), 905 ),
899 (new CFClient::UI::Empty expand => 1), 906 (new CFClient::UI::Empty expand => 1),
900 ]); 907 ]);
901 908
… …
912 } 919 }
913 }); 920 });
914} 921}
915 922
916sub metaserver_dialog { 923sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox;
925 my $table = new CFClient::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
927
917 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
918 title => "Server List", 929 title => "Server List",
919 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
920 x => 'center', 931 x => 'center',
921 y => 'center', 932 y => 'center',
922 z => 3, 933 z => 3,
923 force_h => $::HEIGHT * 0.4, 934 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox), 935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
925 on_visibility_change => sub { 938 on_visibility_change => sub {
926 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
940 0
927 }, 941 },
928 ; 942 ;
929
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933 943
934 $dialog 944 $dialog
935} 945}
936 946
937sub server_setup { 947sub server_setup {
… …
944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
945 955
946 $vbox->add ( 956 $vbox->add (
947 $HOST_ENTRY = new CFClient::UI::Entry 957 $HOST_ENTRY = new CFClient::UI::Entry
948 expand => 1, 958 expand => 1,
949 text => $CFG->{host}, 959 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 960 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 961 on_changed => sub {
952 my ($self, $value) = @_; 962 my ($self, $value) = @_;
953 $CFG->{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
964 0
954 } 965 }
955 ); 966 );
956
957 $METASERVER = metaserver_dialog;
958 967
959 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
960 expand => 1, 969 expand => 1,
961 text => "Server List", 970 text => "Server List",
962 other => $METASERVER, 971 other => $METASERVER,
963 tooltip => "Show a list of available crossfire servers", 972 tooltip => "Show a list of available crossfire servers",
964 on_activate => sub { $METASERVER->toggle_visibility }, 973 on_activate => sub { $METASERVER->toggle_visibility; 0 },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
966 ); 975 );
967 } 976 }
968 977
969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 978 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
970 $table->add (1, 4, new CFClient::UI::Entry 979 $table->add (1, 4, new CFClient::UI::Entry
971 text => $CFG->{user}, 980 text => $CFG->{profile}{default}{user},
972 tooltip => "The name of your character on the server", 981 tooltip => "The name of your character on the server",
973 on_changed => sub { 982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
974 my ($self, $value) = @_;
975 $CFG->{user} = $value;
976 }
977 ); 983 );
978 984
979 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 985 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
980 $table->add (1, 5, new CFClient::UI::Entry 986 $table->add (1, 5, new CFClient::UI::Entry
981 text => $CFG->{password}, 987 text => $CFG->{profile}{default}{password},
982 hidden => 1, 988 hidden => 1,
983 tooltip => "The password for your character", 989 tooltip => "The password for your character",
984 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
985 my ($self, $value) = @_;
986 $CFG->{password} = $value;
987 }
988 ); 991 );
989 992
990 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 993 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
991 $table->add (1, 7, new CFClient::UI::Slider 994 $table->add (1, 7, new CFClient::UI::Slider
992 force_w => 100, 995 force_w => 100,
993 range => [$CFG->{mapsize}, 10, 100, 0, 1], 996 range => [$CFG->{mapsize}, 10, 100, 0, 1],
994 tooltip => "This is the size of the portion of the map update the server sends you. " 997 tooltip => "This is the size of the portion of the map update the server sends you. "
995 . "If you set this to a high value you will be able to see further, " 998 . "If you set this to a high value you will be able to see further, "
996 . "but you also increase bandwidth requirements and latency. " 999 . "but you also increase bandwidth requirements and latency. "
997 . "This option is only used once at log-in.", 1000 . "This option is only used once at log-in.",
998 on_changed => sub { 1001 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 ); 1002 );
1004 1003
1005 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1004 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1005 $table->add (1, 8, new CFClient::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1006 state => $CFG->{face_prefetch},
… …
1010 . "This might increase or create lag, but increases the chances " 1009 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1010 . "of faces being ready for display when you encounter them. "
1012 . "It also uses up server bandwidth on every connect, " 1011 . "It also uses up server bandwidth on every connect, "
1013 . "so only set it if you really need to prefetch images. " 1012 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1013 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1015 );
1017 1016
1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1017 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1019 $table->add (1, 9, new CFClient::UI::Entry 1018 $table->add (1, 9, new CFClient::UI::Entry
1020 text => $CFG->{output_count}, 1019 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.", 1020 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] }, 1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1022 );
1024 1023
1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1024 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026 $table->add (1, 10, new CFClient::UI::Entry 1025 $table->add (1, 10, new CFClient::UI::Entry
1027 text => $CFG->{output_sync}, 1026 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.", 1027 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] }, 1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1029 );
1031 1030
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1033 expand => 1, 1032 expand => 1,
1034 align => 0, 1033 align => 0,
1035 text => "Login", 1034 text => "Login",
1036 on_activate => sub { 1035 on_activate => sub {
1037 $CONN ? stop_game 1036 $CONN ? stop_game
1038 : start_game; 1037 : start_game;
1038 0
1039 }, 1039 },
1040 ); 1040 );
1041 1041
1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub { 1048 on_changed => sub {
1049 my ($self, $value) = @_; 1049 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value; 1050 $CFG->{say_command} = $value;
1051 0
1051 } 1052 }
1052 ); 1053 );
1054
1055 $vbox->add (new CFClient::UI::Label
1056 text => "Server Info",
1057 fontsize => 1.2,
1058 padding_y => 8,
1059 fg => [1, 1, 0, 1],
1060 );
1061
1062 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1053 1063
1054 $vbox 1064 $vbox
1055} 1065}
1056 1066
1057sub message_window { 1067sub message_window {
1058 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1059 name => "message_window", 1069 name => "message_window",
1060 title => "Messages", 1070 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1062 bg => [0, 0, 0, 0.75],
1063 x => "max", 1072 x => "max",
1064 y => 0, 1073 y => 0,
1065 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1066 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1067 child => (my $vbox = new CFClient::UI::VBox); 1076 child => (my $vbox = new CFClient::UI::VBox),
1077 has_close_button => 1;
1068 1078
1069 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1070 1080
1071 $vbox->add (my $input = new CFClient::UI::Entry 1081 $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> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
1080 1090
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1; 1092 $input->{refocus_map} = 1;
1083 } 1093 }
1084 delete $input->{auto_activated}; 1094 delete $input->{auto_activated};
1095
1096 0
1085 }, 1097 },
1086 on_activate => sub { 1098 on_activate => sub {
1087 my ($input, $text) = @_; 1099 my ($input, $text) = @_;
1088 $input->set_text (''); 1100 $input->set_text ('');
1089 1101
… …
1095 } 1107 }
1096 if ($input->{refocus_map}) { 1108 if ($input->{refocus_map}) {
1097 delete $input->{refocus_map}; 1109 delete $input->{refocus_map};
1098 $MAPWIDGET->focus_in 1110 $MAPWIDGET->focus_in
1099 } 1111 }
1112
1113 0
1100 }, 1114 },
1101 on_escape => sub { 1115 on_escape => sub {
1102 $MAPWIDGET->focus_in 1116 $MAPWIDGET->grab_focus;
1117
1118 0
1103 }, 1119 },
1104 ); 1120 );
1105 1121
1106 $CONSOLE = { 1122 $CONSOLE = {
1107 window => $window, 1123 window => $window,
… …
1129 ); 1145 );
1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1146 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1131 $hb->add (new CFClient::UI::Button 1147 $hb->add (new CFClient::UI::Button
1132 text => "Ok", 1148 text => "Ok",
1133 expand => 1, 1149 expand => 1,
1134 on_activate => sub { $QUIT_DIALOG->hide }, 1150 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1135 ); 1151 );
1136 $hb->add (new CFClient::UI::Button 1152 $hb->add (new CFClient::UI::Button
1137 text => "Quit anyway", 1153 text => "Quit anyway",
1138 expand => 1, 1154 expand => 1,
1139 on_activate => sub { exit }, 1155 on_activate => sub { exit },
… …
1146sub autopickup_setup { 1162sub autopickup_setup {
1147 my $table = new CFClient::UI::Table; 1163 my $table = new CFClient::UI::Table;
1148 1164
1149 for ( 1165 for (
1150 ["General", 0, 0, 1166 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE], 1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT], 1168 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP], 1169 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG], 1170 ["Debug autopickup" => PICKUP_DEBUG],
1155 ], 1171 ],
1156 ["Weapons", 0, 6, 1172 ["Weapons", 0, 6,
… …
1182 ["Potions" => PICKUP_POTION], 1198 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1199 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED], 1200 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS], 1201 ["Jewelery" => PICKUP_JEWELS],
1186 ], 1202 ],
1203 ["Weight/Value ratio", 2, 17]
1187 ) 1204 )
1188 { 1205 {
1189 my ($title, $x, $y, @bits) = @$_; 1206 my ($title, $x, $y, @bits) = @$_;
1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1207 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1191 1208
1192 for (@bits) { 1209 for (@bits) {
1193 ++$y; 1210 ++$y;
1194 1211
1195 my $mask = $_->[1]; 1212 my $mask = $_->[1];
1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1213 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1198 state => $CFG->{pickup} & $mask, 1215 state => $::CFG->{pickup} & $mask,
1199 on_changed => sub { 1216 on_changed => sub {
1200 my ($box, $value) = @_; 1217 my ($box, $value) = @_;
1201 1218
1202 if ($value) { 1219 if ($value) {
1203 $::CFG->{pickup} |= $mask; 1220 $::CFG->{pickup} |= $mask;
… …
1205 $::CFG->{pickup} &= ~$mask; 1222 $::CFG->{pickup} &= ~$mask;
1206 } 1223 }
1207 1224
1208 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN; 1226 if defined $::CONN;
1227
1228 0
1210 }); 1229 });
1230
1231 ${$_->[2]} = $checkbox if $_->[2];
1211 } 1232 }
1212 } 1233 }
1213 1234
1235 $table->add (2, 18, new CFClient::UI::ValSlider
1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1237 template => ">= 99",
1238 to_value => sub { ">= " . 5 * $_[0] },
1239 on_changed => sub {
1240 my ($slider, $value) = @_;
1241
1242 $::CFG->{pickup} &= ~0xF;
1243 $::CFG->{pickup} |= int $value
1244 if $value;
1245 1;
1246 });
1247
1248 $table->add (3, 18, new CFClient::UI::Button
1249 text => "set",
1250 on_activate => sub {
1251 $::CONN->send_command ("pickup $::CFG->{pickup}")
1252 if defined $::CONN;
1253 0
1254 });
1255
1214 $table 1256 $table
1215} 1257}
1216 1258
1217sub inventory_window { 1259sub inventory_widget {
1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1261
1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1265 $sw1->add ($INV = new CFClient::UI::Inventory);
1266
1267 $hb->add (my $vb2 = new CFClient::UI::VBox);
1268
1269 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1270
1271 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 $sw2->add ($INVR = new CFClient::UI::Inventory);
1273
1274 # XXX: Call after $INVR = ... because set_opencont sets the items
1275 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1276
1277 $hb
1278}
1279
1280sub toggle_player_page {
1281 my ($widget) = @_;
1282
1283 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1284 $PL_WINDOW->hide;
1285 } else {
1286 $PL_NOTEBOOK->set_current_page ($widget);
1287 $PL_WINDOW->show;
1288 }
1289}
1290
1291sub player_window {
1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1292 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1219 x => "center", 1293 x => "center",
1220 y => "center", 1294 y => "center",
1221 force_w => $WIDTH * 9/10, 1295 force_w => $WIDTH * 9/10,
1222 force_h => $HEIGHT * 9/10, 1296 force_h => $HEIGHT * 9/10,
1223 title => "Inventory", 1297 title => "Player",
1298 name => "playerbook",
1299 has_close_button => 1
1224 ; 1300 ;
1225 1301
1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1302 my $ntb =
1303 $PL_NOTEBOOK =
1304 new CFClient::UI::Notebook expand => 1, debug => 1;
1227 1305
1228 $hb->add (my $vb1 = new CFClient::UI::VBox); 1306 $ntb->add (
1229 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1307 "Statistics (F2)" => $STATS_PAGE = stats_window,
1230 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1308 "Shows statistics, where all your Stats and Resistances are shown."
1309 );
1310 $ntb->add (
1311 "Skills (F3)" => $SKILL_PAGE = skill_window,
1312 "Shows all your Skills."
1313 );
1231 1314
1232 $hb->add (my $vb2 = new CFClient::UI::VBox); 1315 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1316 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1317 $ntb->add (
1318 "Spellbook (F4)" => $spellsw,
1319 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1320 );
1321 $ntb->add (
1322 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1323 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1324 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1325 );
1233 1326
1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $ntb->set_current_page ($INVENTORY_PAGE);
1235 1328
1236 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1329 $plwin->add ($ntb);
1237 1330 $plwin
1238 # XXX: Call after $INVR = ... because set_opencont sets the items
1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1240
1241 $invwin
1242} 1331}
1243 1332
1244sub spell_setup { 1333sub update_bindings {
1245 new CFClient::UI::SpellList 1334 $BIND_UPD_CB->() if $BIND_UPD_CB;
1246} 1335}
1247 1336
1248sub keyboard_setup { 1337sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox; 1338 my $binding_list = new CFClient::UI::VBox;
1250 1339
1251 my $refresh; 1340 my $refresh;
1252 $refresh = sub { 1341 $refresh = $BIND_UPD_CB = sub {
1253 $binding_list->clear (); 1342 $binding_list->clear ();
1254 1343
1255 for my $mod (keys %{$::CFG->{bindings}}) { 1344 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1345 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1346 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1347 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259 1348
1260 my $lbl = join "; ", @$cmds; 1349 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1350 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox); 1351 $binding_list->add (my $hb = new CFClient::UI::HBox);
1263 $hb->add (new CFClient::UI::Button 1352 $hb->add (new CFClient::UI::Button
1264 text => "delete", 1353 text => "delete",
1265 tooltip => "Deletes the binding", 1354 tooltip => "Deletes the binding",
1266 on_activate => sub { 1355 on_activate => sub {
1267 $binding_list->remove ($hb); 1356 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym}; 1357 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1358 0
1269 }); 1359 });
1270 1360
1271 $hb->add (new CFClient::UI::Button 1361 $hb->add (new CFClient::UI::Button
1272 text => "edit", 1362 text => "edit",
1273 tooltip => "Edits the binding", 1363 tooltip => "Edits the binding",
1274 on_activate => sub { 1364 on_activate => sub {
1275 $::BIND_EDITOR->set_binding ( 1365 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1366 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1277 sub { 1367 sub {
1278 my ($nmod, $nsym, $ncmds) = @_; 1368 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym}; 1369 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1370 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1281 $refresh->(); 1371 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1372 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show; 1373 $SETUP_DIALOG->show;
1284 }, 1374 },
1285 sub { 1375 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1376 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show; 1377 $SETUP_DIALOG->show;
1288 }); 1378 });
1289 $::BIND_EDITOR->show; 1379 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide; 1380 $SETUP_DIALOG->hide;
1381 0
1291 }); 1382 });
1292 1383
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1384 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1385 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1295 } 1386 }
1296 } 1387 }
1297 }; 1388 };
1298 1389
1299 my $vb = new CFClient::UI::VBox; 1390 my $vb = new CFClient::UI::VBox;
1391 $vb->add (my $hb = new CFClient::UI::HBox);
1392 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1393 $hb->add (new CFClient::UI::CheckBox
1394 expand => 1,
1395 state => $CFG->{shift_fire_stop},
1396 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1397 on_changed => sub {
1398 my ($cbox, $value) = @_;
1399 $CFG->{shift_fire_stop} = $value;
1400 0
1401 });
1402
1300 $vb->add ($binding_list); 1403 $vb->add ($binding_list);
1301 $vb->add (my $hb = new CFClient::UI::HBox); 1404 $vb->add (my $hb = new CFClient::UI::HBox);
1302 1405
1303 $hb->add (new CFClient::UI::Button 1406 $hb->add (new CFClient::UI::Button
1304 text => "record new", 1407 text => "record new",
… …
1306 tooltip => "This button opens the binding editor with an empty binding.", 1409 tooltip => "This button opens the binding editor with an empty binding.",
1307 on_activate => sub { 1410 on_activate => sub {
1308 $::BIND_EDITOR->set_binding (undef, undef, [], 1411 $::BIND_EDITOR->set_binding (undef, undef, [],
1309 sub { 1412 sub {
1310 my ($mod, $sym, $cmds) = @_; 1413 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1414 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1312 $refresh->(); 1415 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1416 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1417 $SETUP_DIALOG->show;
1315 }, 1418 },
1316 sub { 1419 sub {
… …
1318 $SETUP_DIALOG->show; 1421 $SETUP_DIALOG->show;
1319 }, 1422 },
1320 ); 1423 );
1321 $SETUP_DIALOG->hide; 1424 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show; 1425 $::BIND_EDITOR->show;
1426 0
1323 }, 1427 },
1324 ); 1428 );
1325 1429
1326 $hb->add (new CFClient::UI::Button 1430 $hb->add (new CFClient::UI::Button
1327 text => "close", 1431 text => "close",
1328 tooltip => "Closes the binding window", 1432 tooltip => "Closes the binding window",
1329 expand => 1, 1433 expand => 1,
1330 on_activate => sub { 1434 on_activate => sub {
1331 $SETUP_DIALOG->hide; 1435 $SETUP_DIALOG->hide;
1436 0
1332 } 1437 }
1333 ); 1438 );
1334 1439
1335 $refresh->(); 1440 $refresh->();
1336 1441
1337 $vb 1442 $vb
1338} 1443}
1339 1444
1445# just weirdness, pls. ignore
1446sub load_html_page {
1447 my ($viewer, $base) = @_;
1448
1449 $viewer->clear;
1450
1451 require LWP::Simple;
1452 require HTML::Parser;
1453 require URI;
1454
1455 my $page = LWP::Simple::get ($base)
1456 or return;
1457
1458 my @s = { };
1459 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1460
1461 my $parser = HTML::Parser->new (
1462 text_h => [sub {
1463 my ($text) = @_;
1464 $text =~ s/\s+/ /g;
1465 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1466 }, "dtext"],
1467 start_h => [sub {
1468 my ($tag, $attr) = @_;
1469 if ($passthrough{$tag}) {
1470 $s[-1]{text} .= "<$tag>";
1471 } elsif ($tag eq "h1") {
1472 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1473 } elsif ($tag eq "h2") {
1474 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1475 } elsif ($tag eq "h3") {
1476 push @s, { text => "<span size='large'>" };
1477 } elsif ($tag eq "a") {
1478 push @s, { text => "", url => $attr->{href} };
1479 } elsif ($tag eq "p") {
1480 push @s, { };
1481 } elsif ($tag eq "img") {
1482 eval {
1483 push @{$s[-1]{obj}}, new CFClient::UI::Image
1484 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1485 $s[-1]{text} .= "\x{fffc}";
1486 };
1487 }
1488 }, "tagname, attr"],
1489 end_h => [sub {
1490 my ($tag) = @_;
1491 if ($passthrough{$tag}) {
1492 $s[-1]{text} .= "</$tag>";
1493 } elsif ($tag =~ /^h\d$/) {
1494 $s[-1]{text} .= "</span>";
1495 push @s, { };
1496 } elsif ($tag eq "a") {
1497 my $S = pop @s;
1498 $s[-1]{text} .= "\x{fffc}";
1499 push @{$s[-1]{obj}}, new CFClient::UI::Label
1500 fg => [0.8, 0.8, 1],
1501 markup => "<u>$S->{text}</u>",
1502 fontsize => 0.8,
1503 can_events => 1,
1504 can_focus => 1,
1505 on_button_up => sub {
1506 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1507 },
1508 ;
1509 }
1510 }, "tagname"],
1511 );
1512
1513 $parser->parse ($page);
1514 $parser->eof;
1515
1516 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1517 for @s;
1518
1519 $viewer->set_offset (0);
1520}
1521
1340sub make_help_window { 1522sub help_window {
1341 my $win = new CFClient::UI::FancyFrame 1523 my $win = new CFClient::UI::FancyFrame
1342 x => 'center', 1524 x => 'center',
1343 y => 'center', 1525 y => 'center',
1344 z => 2, 1526 z => 2,
1345 name => 'doc_browser', 1527 name => 'doc_browser',
1346 force_w => int $WIDTH * 7/8, 1528 force_w => int $WIDTH * 7/8,
1347 force_h => int $HEIGHT * 7/8, 1529 force_h => int $HEIGHT * 7/8,
1348 title => "Documentation"; 1530 title => "Help Browser",
1531 has_close_button => 1;
1349 1532
1350 $win->add (my $vbox = new CFClient::UI::VBox); 1533 $win->add (my $vbox = new CFClient::UI::VBox);
1351 1534
1352 $vbox->add (my $buttons = new CFClient::UI::HBox); 1535 $vbox->add (my $buttons = new CFClient::UI::HBox);
1353 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1536 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1537 expand => 1, fontsize => 0.8, padding_x => 4);
1354 1538
1355 for ( 1539 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1540 $buttons->add (my $combo = new CFClient::UI::Combobox
1541 value => undef,
1542 options => [
1356 [intro => "Introduction"], 1543 [intro => "Introduction"],
1357 [manual => "Manual"], 1544 [manual => "Main Manual"],
1545 [skill_help => "Skill Reference"],
1546 [command_help => "Command Reference"],
1358 [command_help => "Commands"], 1547 [dmcommand_help => "DM Commands"],
1359 [skill_help => "Skills"], 1548 [COPYING => "License Terms"],
1360 ) { 1549 [test => "test (do not select)"], #d#TODO
1361 my ($pod, $label) = @$_; 1550 ],
1551 on_changed => sub {
1552 my ($self, $pod) = @_;
1362 1553
1363 $buttons->add (new CFClient::UI::Button 1554 if ($pod eq "test") {#d#TODO
1364 text => $label, 1555 eval {
1365 on_activate => sub { 1556 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1557 };
1558 warn "$@" if $@;
1559 return;
1560 }
1561
1366 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1562 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1367 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1563 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1368 1564
1369 $viewer->clear; 1565 $viewer->clear;
1566
1567# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1568# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1569# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1570# ]);#d#
1370 1571
1371 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1572 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1372 for @$pom; 1573 for @$pom;
1373 1574
1374 $viewer->set_offset (0); 1575 $viewer->set_offset (0);
1576
1375 }, 1577 0
1578 },
1579 on_visibility_change => sub {
1580 my ($self, $visible) = @_;
1581 return unless $visible;
1582 return if $self->{value};
1583 $self->set_value ("intro");
1584 0
1585 },
1376 ); 1586 );
1377 }
1378
1379 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1380 1587
1381 $win 1588 $win
1382} 1589}
1383 1590
1384sub sdl_init { 1591sub sdl_init {
… …
1421 z => 100, 1628 z => 100,
1422 force_x => "max", 1629 force_x => "max",
1423 force_y => 0; 1630 force_y => 0;
1424 $DEBUG_STATUS->show; 1631 $DEBUG_STATUS->show;
1425 1632
1426 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1633 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1427 1634
1428 $STATUSBOX = new CFClient::UI::Statusbox; 1635 $STATUSBOX = new CFClient::UI::Statusbox;
1429 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1636 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1430 1637
1431 (new CFClient::UI::Frame 1638 (new CFClient::UI::Frame
… …
1451 $MAPWIDGET->connect (activate_console => sub { 1658 $MAPWIDGET->connect (activate_console => sub {
1452 my ($mapwidget, $preset) = @_; 1659 my ($mapwidget, $preset) = @_;
1453 1660
1454 if ($CONSOLE) { 1661 if ($CONSOLE) {
1455 $CONSOLE->{input}->{auto_activated} = 1; 1662 $CONSOLE->{input}->{auto_activated} = 1;
1456 $CONSOLE->{input}->focus_in; 1663 $CONSOLE->{input}->grab_focus;
1457 1664
1458 if ($preset && $CONSOLE->{input}->get_text eq '') { 1665 if ($preset && $CONSOLE->{input}->get_text eq '') {
1459 $CONSOLE->{input}->set_text ($preset); 1666 $CONSOLE->{input}->set_text ($preset);
1460 } 1667 }
1461 } 1668 }
1462 }); 1669 });
1463 $MAPWIDGET->show; 1670 $MAPWIDGET->show;
1464 $MAPWIDGET->focus_in; 1671 $MAPWIDGET->grab_focus;
1465 1672
1466 $LOGVIEW = new CFClient::UI::TextView 1673 $LOGVIEW = new CFClient::UI::TextScroller
1467 expand => 1, 1674 expand => 1,
1468 font => $FONT_FIXED, 1675 font => $FONT_FIXED,
1469 fontsize => $::CFG->{log_fontsize}, 1676 fontsize => $::CFG->{log_fontsize},
1470 indent => -4, 1677 indent => -4,
1471 can_hover => 1, 1678 can_hover => 1,
… …
1479 x => 'center', 1686 x => 'center',
1480 y => 'center', 1687 y => 'center',
1481 z => 2, 1688 z => 2,
1482 force_w => $::WIDTH * 0.6, 1689 force_w => $::WIDTH * 0.6,
1483 force_h => $::HEIGHT * 0.6, 1690 force_h => $::HEIGHT * 0.6,
1691 has_close_button => 1,
1484 ; 1692 ;
1693
1694 $METASERVER = metaserver_dialog;
1485 1695
1486 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1696 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1487 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1697 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1488 1698
1489 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1699 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1493 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1703 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1494 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1704 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1495 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1705 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1496 "Configure the use of audio, sound effects and background music."); 1706 "Configure the use of audio, sound effects and background music.");
1497 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1707 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1498 "Lets you define, edit and delete bindings." 1708 "Lets you define, edit and delete key bindings."
1499 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1709 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1500 . "with nothing set and the recording started. After doing the actions you " 1710 . "with nothing set and the recording started. After doing the actions you "
1501 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1711 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1502 . "After pressing the combo the binding will be saved automatically and the " 1712 . "After pressing the combo the binding will be saved automatically and the "
1503 . "binding editor closes"); 1713 . "binding editor closes");
1504 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1714 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1505 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1715 "Some debuggin' options. Do not ask.");
1506 1716
1507 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1717 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1508 1718
1509 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1719 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1510 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1720 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1512 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1722 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1513 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1723 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1514 1724
1515 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 1725 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
1516 1726
1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1518 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1727 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1520 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1728 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1521 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1522 1729
1523 $BUTTONBAR->add (new CFClient::UI::Button 1730 $BUTTONBAR->add (new CFClient::UI::Button
1524 text => "Save Config", 1731 text => "Save Config",
1525 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1732 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1526 on_activate => sub { 1733 on_activate => sub {
1527 $::CFG->{layout} = CFClient::UI::get_layout; 1734 $::CFG->{layout} = CFClient::UI::get_layout;
1528 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1735 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1529 status "Configuration Saved"; 1736 status "Configuration Saved";
1737 0
1530 }, 1738 },
1531 ); 1739 );
1532 1740
1533 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1741 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1534 tooltip => "View Documentation"); 1742 tooltip => "View Documentation");
1535 1743
1536 $BUTTONBAR->add (new CFClient::UI::Button 1744 $BUTTONBAR->add (new CFClient::UI::Button
1537 text => "Quit", 1745 text => "Quit",
1538 tooltip => "Terminates the program", 1746 tooltip => "Terminates the program",
… …
1540 if ($CONN) { 1748 if ($CONN) {
1541 open_quit_dialog; 1749 open_quit_dialog;
1542 } else { 1750 } else {
1543 exit; 1751 exit;
1544 } 1752 }
1753 0
1545 }, 1754 },
1546 ); 1755 );
1547 1756
1548 $BUTTONBAR->show; 1757 $BUTTONBAR->show;
1549 $SETUP_DIALOG->show; 1758 $SETUP_DIALOG->show;
… …
1551 1760
1552 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1761 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1553} 1762}
1554 1763
1555sub video_shutdown { 1764sub video_shutdown {
1765 CFClient::OpenGL::shutdown;
1766
1556 undef $SDL_ACTIVE; 1767 undef $SDL_ACTIVE;
1557} 1768}
1558 1769
1559my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1770my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1560my $bgmusic;#TODO#hack#d# 1771my $bgmusic;#TODO#hack#d#
… …
1741# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1952# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1742 }, 1953 },
1743 CFClient::SDL_KEYDOWN => sub { 1954 CFClient::SDL_KEYDOWN => sub {
1744 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1955 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1745 # alt-enter 1956 # alt-enter
1957 $FULLSCREEN_ENABLE->toggle;
1746 video_shutdown; 1958 video_shutdown;
1747 $CFG->{fullscreen} = !$CFG->{fullscreen};
1748 video_init; 1959 video_init;
1749 } else { 1960 } else {
1750 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1961 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1751 } 1962 }
1752 }, 1963 },
… …
1768$SIG{INT} = $SIG{TERM} = sub { exit }; 1979$SIG{INT} = $SIG{TERM} = sub { exit };
1769 1980
1770{ 1981{
1771 local $SIG{__DIE__} = sub { 1982 local $SIG{__DIE__} = sub {
1772 return unless defined $^S && !$^S; 1983 return unless defined $^S && !$^S;
1773 Carp::confess $_[1];#d#TODO: remove when stable 1984 Carp::confess $_[0];#d#TODO: remove when stable
1774 CFClient::fatal $_[0]; 1985 CFClient::fatal $_[0];
1775 }; 1986 };
1776 1987
1777 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1988 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1778 CFClient::UI::set_layout ($::CFG->{layout}); 1989 CFClient::UI::set_layout ($::CFG->{layout});
1779 1990
1780 my %DEF_CFG = ( 1991 my %DEF_CFG = (
1781 sdl_mode => 0, 1992 sdl_mode => 0,
1782 width => 640, 1993 width => 640,
1783 height => 480, 1994 height => 480,
1784 fullscreen => 0, 1995 fullscreen => 0,
1785 fast => 0, 1996 fast => 0,
1786 map_scale => 1, 1997 map_scale => 1,
1787 fow_enable => 1, 1998 fow_enable => 1,
1788 fow_intensity => 0.45, 1999 fow_intensity => 0.45,
1789 fow_smooth => 0, 2000 fow_smooth => 0,
1790 gui_fontsize => 1, 2001 gui_fontsize => 1,
1791 log_fontsize => 0.7, 2002 log_fontsize => 0.7,
1792 gauge_fontsize=> 1, 2003 gauge_fontsize => 1,
1793 gauge_size => 0.35, 2004 gauge_size => 0.35,
1794 stat_fontsize => 0.7, 2005 stat_fontsize => 0.7,
1795 mapsize => 100, 2006 mapsize => 100,
1796 host => "crossfire.schmorp.de",
1797 say_command => 'say', 2007 say_command => 'say',
1798 audio_enable => 1, 2008 audio_enable => 1,
1799 bgm_enable => 1, 2009 bgm_enable => 1,
1800 bgm_volume => 0.25, 2010 bgm_volume => 0.25,
1801 face_prefetch => 0, 2011 face_prefetch => 0,
1802 output_sync => 1, 2012 output_sync => 1,
1803 output_count => 1, 2013 output_count => 1,
1804 pickup => 0, 2014 pickup => 0,
2015 default => "profile", # default profile
2016 );
1805 ); 2017
1806
1807 while (my ($k, $v) = each %DEF_CFG) { 2018 while (my ($k, $v) = each %DEF_CFG) {
1808 $CFG->{$k} = $v unless exists $CFG->{$k}; 2019 $CFG->{$k} = $v unless exists $CFG->{$k};
1809 } 2020 }
2021
2022 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1810 2023
1811 sdl_init; 2024 sdl_init;
1812 2025
1813 @SDL_MODES = reverse 2026 @SDL_MODES = reverse
1814 grep $_->[0] >= 640 && $_->[1] >= 480, 2027 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1856 video_init; 2069 video_init;
1857 audio_init; 2070 audio_init;
1858} 2071}
1859 2072
1860Event::loop; 2073Event::loop;
2074#CFClient::SDL_Quit;
2075#CFClient::_exit 0;
1861 2076
1862END { CFClient::SDL_Quit } 2077END { CFClient::SDL_Quit }
1863 2078
1864=head1 NAME 2079=head1 NAME
1865 2080

Diff Legend

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