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.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.99 by root, Sun Jul 23 08:58:44 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;
846 852
847 utf8::decode $buf if utf8::valid $buf; 853 utf8::decode $buf if utf8::valid $buf;
848 854
849 $table->clear; 855 $table->clear;
850 856
857 my @tip = (
858 "The current number of users logged in on the server.",
859 "The hostname of the server.",
860 "The time this server has been running without being restarted.",
861 "The server software version - a '+' indicates a Crossfire+ server.",
862 "Short information about this server provided by its admins.",
863 );
851 my @col = qw(Use #Users Host Uptime Version Description); 864 my @col = qw(#Users Host Uptime Version Description);
852 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 865 $table->add ($_, 0, new CFClient::UI::Label
866 can_hover => 1, can_events => 1,
867 align => 0, fg => [1, 1, 0],
868 text => $col[$_], tooltip => $tip[$_])
853 for 0 .. $#col; 869 for 0 .. $#col;
854 870
855 my @align = qw(1 0 1 1 -1); 871 my @align = qw(1 0 1 1 -1);
856 872
857 my $y = 0; 873 my $y = 0;
858 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 874 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
875 891
876 $m = [$users, $host, $uptime, $version, $desc]; 892 $m = [$users, $host, $uptime, $version, $desc];
877 893
878 $y++; 894 $y++;
879 895
880 $table->add (0, $y, new CFClient::UI::VBox children => [ 896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
881 (new CFClient::UI::Button text => "Use", on_activate => sub { 897 (new CFClient::UI::Button
898 text => "Use",
899 tooltip => "Put this server into the <b>Host:Port</b> field",
900 on_activate => sub {
882 $HOST_ENTRY->set_text ($CFG->{host} = $host); 901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
883 $METASERVER->toggle_visibility; 902 $METASERVER->hide;
903 0
904 },
884 }), 905 ),
885 (new CFClient::UI::Empty expand => 1), 906 (new CFClient::UI::Empty expand => 1),
886 ]); 907 ]);
887 908
888 $table->add ($_ + 1, $y, new CFClient::UI::Label 909 $table->add ($_, $y, new CFClient::UI::Label
889 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 910 ellipsise => 0,
911 align => $align[$_],
912 text => $m->[$_],
913 tooltip => $tip[$_],
914 can_hover => 1,
915 can_events => 1,
916 fontsize => 0.8)
890 for 0 .. $#$m; 917 for 0 .. $#$m;
891 } 918 }
892 } 919 }
893 }); 920 });
894} 921}
895 922
896sub 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
897 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
898 title => "Server List", 929 title => "Server List",
899 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
900 x => 'center', 931 x => 'center',
901 y => 'center', 932 y => 'center',
902 z => 3, 933 z => 3,
903 child => (my $vbox = new CFClient::UI::VBox), 934 force_h => $::HEIGHT * 0.4,
935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
904 on_visibility_change => sub { 938 on_visibility_change => sub {
905 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
940 0
906 }, 941 },
907 ; 942 ;
908
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910 943
911 $dialog 944 $dialog
912} 945}
913 946
914sub server_setup { 947sub server_setup {
921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
922 955
923 $vbox->add ( 956 $vbox->add (
924 $HOST_ENTRY = new CFClient::UI::Entry 957 $HOST_ENTRY = new CFClient::UI::Entry
925 expand => 1, 958 expand => 1,
926 text => $CFG->{host}, 959 text => $CFG->{profile}{default}{host},
927 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",
928 on_changed => sub { 961 on_changed => sub {
929 my ($self, $value) = @_; 962 my ($self, $value) = @_;
930 $CFG->{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
964 0
931 } 965 }
932 ); 966 );
933
934 $METASERVER = metaserver_dialog;
935 967
936 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
937 expand => 1, 969 expand => 1,
938 text => "Server List", 970 text => "Server List",
939 other => $METASERVER, 971 other => $METASERVER,
940 tooltip => "Show a list of available crossfire servers", 972 tooltip => "Show a list of available crossfire servers",
941 on_activate => sub { $METASERVER->toggle_visibility }, 973 on_activate => sub { $METASERVER->toggle_visibility; 0 },
974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
942 ); 975 );
943 } 976 }
944 977
945 $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");
946 $table->add (1, 4, new CFClient::UI::Entry 979 $table->add (1, 4, new CFClient::UI::Entry
947 text => $CFG->{user}, 980 text => $CFG->{profile}{default}{user},
948 tooltip => "The name of your character on the server", 981 tooltip => "The name of your character on the server",
949 on_changed => sub { 982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
950 my ($self, $value) = @_;
951 $CFG->{user} = $value;
952 }
953 ); 983 );
954 984
955 $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");
956 $table->add (1, 5, new CFClient::UI::Entry 986 $table->add (1, 5, new CFClient::UI::Entry
957 text => $CFG->{password}, 987 text => $CFG->{profile}{default}{password},
958 hidden => 1, 988 hidden => 1,
959 tooltip => "The password for your character", 989 tooltip => "The password for your character",
960 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961 my ($self, $value) = @_;
962 $CFG->{password} = $value;
963 }
964 ); 991 );
965 992
966 $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");
967 $table->add (1, 7, new CFClient::UI::Slider 994 $table->add (1, 7, new CFClient::UI::Slider
968 force_w => 100, 995 force_w => 100,
969 range => [$CFG->{mapsize}, 10, 100, 0, 1], 996 range => [$CFG->{mapsize}, 10, 100, 0, 1],
970 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. "
971 . "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, "
972 . "but you also increase bandwidth requirements and latency. " 999 . "but you also increase bandwidth requirements and latency. "
973 . "This option is only used once at log-in.", 1000 . "This option is only used once at log-in.",
974 on_changed => sub { 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
975 my ($self, $value) = @_;
976
977 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
978 },
979 ); 1002 );
980 1003
981 $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");
982 $table->add (1, 8, new CFClient::UI::CheckBox 1005 $table->add (1, 8, new CFClient::UI::CheckBox
983 state => $CFG->{face_prefetch}, 1006 state => $CFG->{face_prefetch},
986 . "This might increase or create lag, but increases the chances " 1009 . "This might increase or create lag, but increases the chances "
987 . "of faces being ready for display when you encounter them. " 1010 . "of faces being ready for display when you encounter them. "
988 . "It also uses up server bandwidth on every connect, " 1011 . "It also uses up server bandwidth on every connect, "
989 . "so only set it if you really need to prefetch images. " 1012 . "so only set it if you really need to prefetch images. "
990 . "This option can be set and unset any time.", 1013 . "This option can be set and unset any time.",
991 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992 ); 1015 );
993 1016
994 $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");
995 $table->add (1, 9, new CFClient::UI::Entry 1018 $table->add (1, 9, new CFClient::UI::Entry
996 text => $CFG->{output_count}, 1019 text => $CFG->{output_count},
997 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.",
998 on_changed => sub { $CFG->{output_count} = $_[1] }, 1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999 ); 1022 );
1000 1023
1001 $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");
1002 $table->add (1, 10, new CFClient::UI::Entry 1025 $table->add (1, 10, new CFClient::UI::Entry
1003 text => $CFG->{output_sync}, 1026 text => $CFG->{output_sync},
1004 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.",
1005 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006 ); 1029 );
1007 1030
1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1009 expand => 1, 1032 expand => 1,
1010 align => 0, 1033 align => 0,
1011 text => "Login", 1034 text => "Login",
1012 on_activate => sub { 1035 on_activate => sub {
1013 $CONN ? stop_game 1036 $CONN ? stop_game
1014 : start_game; 1037 : start_game;
1038 0
1015 }, 1039 },
1016 ); 1040 );
1017 1041
1018 $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");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1022 . "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. "
1023 . "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.",
1024 on_changed => sub { 1048 on_changed => sub {
1025 my ($self, $value) = @_; 1049 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value; 1050 $CFG->{say_command} = $value;
1051 0
1027 } 1052 }
1028 ); 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);
1029 1063
1030 $vbox 1064 $vbox
1031} 1065}
1032 1066
1033sub message_window { 1067sub message_window {
1034 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1035 name => "message_window", 1069 name => "message_window",
1036 title => "Messages", 1070 title => "Messages",
1037 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1038 bg => [0, 0, 0, 0.75],
1039 x => "max", 1072 x => "max",
1040 y => 0, 1073 y => 0,
1041 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1042 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1043 child => (my $vbox = new CFClient::UI::VBox); 1076 child => (my $vbox = new CFClient::UI::VBox),
1077 has_close_button => 1;
1044 1078
1045 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1046 1080
1047 $vbox->add (my $input = new CFClient::UI::Entry 1081 $vbox->add (my $input = new CFClient::UI::Entry
1048 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> "
1056 1090
1057 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1058 $input->{refocus_map} = 1; 1092 $input->{refocus_map} = 1;
1059 } 1093 }
1060 delete $input->{auto_activated}; 1094 delete $input->{auto_activated};
1095
1096 0
1061 }, 1097 },
1062 on_activate => sub { 1098 on_activate => sub {
1063 my ($input, $text) = @_; 1099 my ($input, $text) = @_;
1064 $input->set_text (''); 1100 $input->set_text ('');
1065 1101
1071 } 1107 }
1072 if ($input->{refocus_map}) { 1108 if ($input->{refocus_map}) {
1073 delete $input->{refocus_map}; 1109 delete $input->{refocus_map};
1074 $MAPWIDGET->focus_in 1110 $MAPWIDGET->focus_in
1075 } 1111 }
1112
1113 0
1076 }, 1114 },
1077 on_escape => sub { 1115 on_escape => sub {
1078 $MAPWIDGET->focus_in 1116 $MAPWIDGET->grab_focus;
1117
1118 0
1079 }, 1119 },
1080 ); 1120 );
1081 1121
1082 $CONSOLE = { 1122 $CONSOLE = {
1083 window => $window, 1123 window => $window,
1105 ); 1145 );
1106 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1146 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107 $hb->add (new CFClient::UI::Button 1147 $hb->add (new CFClient::UI::Button
1108 text => "Ok", 1148 text => "Ok",
1109 expand => 1, 1149 expand => 1,
1110 on_activate => sub { $QUIT_DIALOG->hide }, 1150 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1111 ); 1151 );
1112 $hb->add (new CFClient::UI::Button 1152 $hb->add (new CFClient::UI::Button
1113 text => "Quit anyway", 1153 text => "Quit anyway",
1114 expand => 1, 1154 expand => 1,
1115 on_activate => sub { exit }, 1155 on_activate => sub { exit },
1122sub autopickup_setup { 1162sub autopickup_setup {
1123 my $table = new CFClient::UI::Table; 1163 my $table = new CFClient::UI::Table;
1124 1164
1125 for ( 1165 for (
1126 ["General", 0, 0, 1166 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE], 1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT], 1168 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP], 1169 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG], 1170 ["Debug autopickup" => PICKUP_DEBUG],
1131 ], 1171 ],
1132 ["Weapons", 0, 6, 1172 ["Weapons", 0, 6,
1158 ["Potions" => PICKUP_POTION], 1198 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1199 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED], 1200 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS], 1201 ["Jewelery" => PICKUP_JEWELS],
1162 ], 1202 ],
1203 ["Weight/Value ratio", 2, 17]
1163 ) 1204 )
1164 { 1205 {
1165 my ($title, $x, $y, @bits) = @$_; 1206 my ($title, $x, $y, @bits) = @$_;
1166 $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]);
1167 1208
1168 for (@bits) { 1209 for (@bits) {
1169 ++$y; 1210 ++$y;
1170 1211
1171 my $mask = $_->[1]; 1212 my $mask = $_->[1];
1172 $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);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask, 1215 state => $::CFG->{pickup} & $mask,
1175 on_changed => sub { 1216 on_changed => sub {
1176 my ($box, $value) = @_; 1217 my ($box, $value) = @_;
1218
1177 if ($value) { 1219 if ($value) {
1178 $::CFG->{pickup} |= $mask; 1220 $::CFG->{pickup} |= $mask;
1179 } else { 1221 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1222 $::CFG->{pickup} &= ~$mask;
1181 } 1223 }
1224
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1183 if defined $::CONN; 1226 if defined $::CONN;
1227
1228 0
1184 }); 1229 });
1230
1231 ${$_->[2]} = $checkbox if $_->[2];
1185 } 1232 }
1186 } 1233 }
1187 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
1188 $table 1256 $table
1189} 1257}
1190 1258
1191sub 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
1265 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1266
1267 use sort 'stable';
1268
1269 $hb1->add (new CFClient::UI::Combobox
1270 value => undef,
1271 options => [
1272 [undef, "Type/Name"],
1273 [
1274 sub { sort {
1275 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1276 or $a->{type} <=> $b->{type}
1277 } @_ },
1278 "Weight/Type",
1279 ],
1280 [sub { } => "#TODO#"],
1281 ],
1282 on_changed => sub {
1283 $INV->set_sort_order ($_[1]);
1284 },
1285 );
1286 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1287 #TODO# update to weigh/maxweight
1288 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1289
1290 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1291 $sw1->add ($INV = new CFClient::UI::Inventory);
1292
1293 $hb->add (my $vb2 = new CFClient::UI::VBox);
1294
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1296
1297 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1298 $sw2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1193 x => "center", 1319 x => "center",
1194 y => "center", 1320 y => "center",
1195 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1196 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1197 title => "Inventory", 1323 title => "Player",
1324 name => "playerbook",
1325 has_close_button => 1
1198 ; 1326 ;
1199 1327
1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1328 my $ntb =
1329 $PL_NOTEBOOK =
1330 new CFClient::UI::Notebook expand => 1, debug => 1;
1201 1331
1202 $hb->add (my $vb1 = new CFClient::UI::VBox); 1332 $ntb->add (
1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1333 "Statistics (F2)" => $STATS_PAGE = stats_window,
1204 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1334 "Shows statistics, where all your Stats and Resistances are shown."
1335 );
1336 $ntb->add (
1337 "Skills (F3)" => $SKILL_PAGE = skill_window,
1338 "Shows all your Skills."
1339 );
1205 1340
1206 $hb->add (my $vb2 = new CFClient::UI::VBox); 1341 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1342 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1343 $ntb->add (
1344 "Spellbook (F4)" => $spellsw,
1345 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1346 );
1347 $ntb->add (
1348 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1349 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1350 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1351 );
1207 1352
1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1353 $ntb->set_current_page ($INVENTORY_PAGE);
1209 1354
1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1355 $plwin->add ($ntb);
1211 1356 $plwin
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
1215 $invwin
1216} 1357}
1217 1358
1218sub spell_setup { 1359sub update_bindings {
1219 new CFClient::UI::SpellList 1360 $BIND_UPD_CB->() if $BIND_UPD_CB;
1220} 1361}
1221 1362
1222sub keyboard_setup { 1363sub keyboard_setup {
1223 my $binding_list = new CFClient::UI::VBox; 1364 my $binding_list = new CFClient::UI::VBox;
1224 1365
1225 my $refresh; 1366 my $refresh;
1226 $refresh = sub { 1367 $refresh = $BIND_UPD_CB = sub {
1227 $binding_list->clear (); 1368 $binding_list->clear ();
1228 1369
1229 for my $mod (keys %{$::CFG->{bindings}}) { 1370 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1371 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1372 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1373 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233 1374
1234 my $lbl = join "; ", @$cmds; 1375 my $lbl = join "; ", @$cmds;
1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1376 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1236 $binding_list->add (my $hb = new CFClient::UI::HBox); 1377 $binding_list->add (my $hb = new CFClient::UI::HBox);
1237 $hb->add (new CFClient::UI::Button 1378 $hb->add (new CFClient::UI::Button
1238 text => "delete", 1379 text => "delete",
1239 tooltip => "Deletes the binding", 1380 tooltip => "Deletes the binding",
1240 on_activate => sub { 1381 on_activate => sub {
1241 $binding_list->remove ($hb); 1382 $binding_list->remove ($hb);
1242 delete $::CFG->{bindings}->{$mod}->{$sym}; 1383 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1384 0
1243 }); 1385 });
1244 1386
1245 $hb->add (new CFClient::UI::Button 1387 $hb->add (new CFClient::UI::Button
1246 text => "edit", 1388 text => "edit",
1247 tooltip => "Edits the binding", 1389 tooltip => "Edits the binding",
1248 on_activate => sub { 1390 on_activate => sub {
1249 $::BIND_EDITOR->set_binding ( 1391 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1392 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1251 sub { 1393 sub {
1252 my ($nmod, $nsym, $ncmds) = @_; 1394 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym}; 1395 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1396 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1255 $refresh->(); 1397 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1398 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show; 1399 $SETUP_DIALOG->show;
1258 }, 1400 },
1259 sub { 1401 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1402 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show; 1403 $SETUP_DIALOG->show;
1262 }); 1404 });
1263 $::BIND_EDITOR->show; 1405 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide; 1406 $SETUP_DIALOG->hide;
1407 0
1265 }); 1408 });
1266 1409
1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1410 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1411 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269 } 1412 }
1270 } 1413 }
1271 }; 1414 };
1272 1415
1273 my $vb = new CFClient::UI::VBox; 1416 my $vb = new CFClient::UI::VBox;
1417 $vb->add (my $hb = new CFClient::UI::HBox);
1418 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1419 $hb->add (new CFClient::UI::CheckBox
1420 expand => 1,
1421 state => $CFG->{shift_fire_stop},
1422 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1423 on_changed => sub {
1424 my ($cbox, $value) = @_;
1425 $CFG->{shift_fire_stop} = $value;
1426 0
1427 });
1428
1274 $vb->add ($binding_list); 1429 $vb->add ($binding_list);
1275 $vb->add (my $hb = new CFClient::UI::HBox); 1430 $vb->add (my $hb = new CFClient::UI::HBox);
1276 1431
1277 $hb->add (new CFClient::UI::Button 1432 $hb->add (new CFClient::UI::Button
1278 text => "record new", 1433 text => "record new",
1280 tooltip => "This button opens the binding editor with an empty binding.", 1435 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub { 1436 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [], 1437 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub { 1438 sub {
1284 my ($mod, $sym, $cmds) = @_; 1439 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1440 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1286 $refresh->(); 1441 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1442 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show; 1443 $SETUP_DIALOG->show;
1289 }, 1444 },
1290 sub { 1445 sub {
1292 $SETUP_DIALOG->show; 1447 $SETUP_DIALOG->show;
1293 }, 1448 },
1294 ); 1449 );
1295 $SETUP_DIALOG->hide; 1450 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show; 1451 $::BIND_EDITOR->show;
1452 0
1297 }, 1453 },
1298 ); 1454 );
1299 1455
1300 $hb->add (new CFClient::UI::Button 1456 $hb->add (new CFClient::UI::Button
1301 text => "close", 1457 text => "close",
1302 tooltip => "Closes the binding window", 1458 tooltip => "Closes the binding window",
1303 expand => 1, 1459 expand => 1,
1304 on_activate => sub { 1460 on_activate => sub {
1305 $SETUP_DIALOG->hide; 1461 $SETUP_DIALOG->hide;
1462 0
1306 } 1463 }
1307 ); 1464 );
1308 1465
1309 $refresh->(); 1466 $refresh->();
1310 1467
1311 $vb 1468 $vb
1312} 1469}
1313 1470
1471# just weirdness, pls. ignore
1472sub load_html_page {
1473 my ($viewer, $base) = @_;
1474
1475 $viewer->clear;
1476
1477 require LWP::Simple;
1478 require HTML::Parser;
1479 require URI;
1480
1481 my $page = LWP::Simple::get ($base)
1482 or return;
1483
1484 my @s = { };
1485 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1486
1487 my $parser = HTML::Parser->new (
1488 text_h => [sub {
1489 my ($text) = @_;
1490 $text =~ s/\s+/ /g;
1491 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1492 }, "dtext"],
1493 start_h => [sub {
1494 my ($tag, $attr) = @_;
1495 if ($passthrough{$tag}) {
1496 $s[-1]{text} .= "<$tag>";
1497 } elsif ($tag eq "h1") {
1498 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1499 } elsif ($tag eq "h2") {
1500 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1501 } elsif ($tag eq "h3") {
1502 push @s, { text => "<span size='large'>" };
1503 } elsif ($tag eq "a") {
1504 push @s, { text => "", url => $attr->{href} };
1505 } elsif ($tag eq "p") {
1506 push @s, { };
1507 } elsif ($tag eq "img") {
1508 eval {
1509 push @{$s[-1]{obj}}, new CFClient::UI::Image
1510 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1511 $s[-1]{text} .= "\x{fffc}";
1512 };
1513 }
1514 }, "tagname, attr"],
1515 end_h => [sub {
1516 my ($tag) = @_;
1517 if ($passthrough{$tag}) {
1518 $s[-1]{text} .= "</$tag>";
1519 } elsif ($tag =~ /^h\d$/) {
1520 $s[-1]{text} .= "</span>";
1521 push @s, { };
1522 } elsif ($tag eq "a") {
1523 my $S = pop @s;
1524 $s[-1]{text} .= "\x{fffc}";
1525 push @{$s[-1]{obj}}, new CFClient::UI::Label
1526 fg => [0.8, 0.8, 1],
1527 markup => "<u>$S->{text}</u>",
1528 fontsize => 0.8,
1529 can_events => 1,
1530 can_focus => 1,
1531 on_button_up => sub {
1532 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1533 },
1534 ;
1535 }
1536 }, "tagname"],
1537 );
1538
1539 $parser->parse ($page);
1540 $parser->eof;
1541
1542 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1543 for @s;
1544
1545 $viewer->set_offset (0);
1546}
1547
1314sub make_help_window { 1548sub help_window {
1315 my $win = new CFClient::UI::FancyFrame 1549 my $win = new CFClient::UI::FancyFrame
1316 x => 'center', 1550 x => 'center',
1317 y => 'center', 1551 y => 'center',
1318 z => 2, 1552 z => 2,
1319 name => 'doc_browser', 1553 name => 'doc_browser',
1320 force_w => int $WIDTH * 7/8, 1554 force_w => int $WIDTH * 7/8,
1321 force_h => int $HEIGHT * 7/8, 1555 force_h => int $HEIGHT * 7/8,
1322 title => "Documentation"; 1556 title => "Help Browser",
1557 has_close_button => 1;
1323 1558
1324 $win->add (my $vbox = new CFClient::UI::VBox); 1559 $win->add (my $vbox = new CFClient::UI::VBox);
1325 1560
1326 $vbox->add (my $buttons = new CFClient::UI::HBox); 1561 $vbox->add (my $buttons = new CFClient::UI::HBox);
1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1562 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1563 expand => 1, fontsize => 0.8, padding_x => 4);
1328 1564
1329 for ( 1565 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1566 $buttons->add (my $combo = new CFClient::UI::Combobox
1567 value => undef,
1568 options => [
1330 [intro => "Introduction"], 1569 [intro => "Introduction"],
1331 [manual => "Manual"], 1570 [manual => "Main Manual"],
1571 [skill_help => "Skill Reference"],
1572 [command_help => "Command Reference"],
1332 [command_help => "Commands"], 1573 [dmcommand_help => "DM Commands"],
1333 [skill_help => "Skills"], 1574 [COPYING => "License Terms"],
1334 ) { 1575 [test => "test (do not select)"], #d#TODO
1335 my ($pod, $label) = @$_; 1576 ],
1577 on_changed => sub {
1578 my ($self, $pod) = @_;
1336 1579
1337 $buttons->add (new CFClient::UI::Button 1580 if ($pod eq "test") {#d#TODO
1338 text => $label, 1581 eval {
1339 on_activate => sub { 1582 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1583 };
1584 warn "$@" if $@;
1585 return;
1586 }
1587
1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1588 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1589 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1342 1590
1343 $viewer->clear; 1591 $viewer->clear;
1592
1593# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1594# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1595# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1596# ]);#d#
1344 1597
1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1598 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1346 for @$pom; 1599 for @$pom;
1347 1600
1348 $viewer->set_offset (0); 1601 $viewer->set_offset (0);
1602
1349 }, 1603 0
1604 },
1605 on_visibility_change => sub {
1606 my ($self, $visible) = @_;
1607 return unless $visible;
1608 return if $self->{value};
1609 $self->set_value ("intro");
1610 0
1611 },
1350 ); 1612 );
1351 }
1352
1353 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1354 1613
1355 $win 1614 $win
1356} 1615}
1357 1616
1358sub sdl_init { 1617sub sdl_init {
1395 z => 100, 1654 z => 100,
1396 force_x => "max", 1655 force_x => "max",
1397 force_y => 0; 1656 force_y => 0;
1398 $DEBUG_STATUS->show; 1657 $DEBUG_STATUS->show;
1399 1658
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1659 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1401 1660
1402 $STATUSBOX = new CFClient::UI::Statusbox; 1661 $STATUSBOX = new CFClient::UI::Statusbox;
1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1662 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1404 1663
1405 (new CFClient::UI::Frame 1664 (new CFClient::UI::Frame
1425 $MAPWIDGET->connect (activate_console => sub { 1684 $MAPWIDGET->connect (activate_console => sub {
1426 my ($mapwidget, $preset) = @_; 1685 my ($mapwidget, $preset) = @_;
1427 1686
1428 if ($CONSOLE) { 1687 if ($CONSOLE) {
1429 $CONSOLE->{input}->{auto_activated} = 1; 1688 $CONSOLE->{input}->{auto_activated} = 1;
1430 $CONSOLE->{input}->focus_in; 1689 $CONSOLE->{input}->grab_focus;
1431 1690
1432 if ($preset && $CONSOLE->{input}->get_text eq '') { 1691 if ($preset && $CONSOLE->{input}->get_text eq '') {
1433 $CONSOLE->{input}->set_text ($preset); 1692 $CONSOLE->{input}->set_text ($preset);
1434 } 1693 }
1435 } 1694 }
1436 }); 1695 });
1437 $MAPWIDGET->show; 1696 $MAPWIDGET->show;
1438 $MAPWIDGET->focus_in; 1697 $MAPWIDGET->grab_focus;
1439 1698
1440 $LOGVIEW = new CFClient::UI::TextView 1699 $LOGVIEW = new CFClient::UI::TextScroller
1441 expand => 1, 1700 expand => 1,
1442 font => $FONT_FIXED, 1701 font => $FONT_FIXED,
1443 fontsize => $::CFG->{log_fontsize}, 1702 fontsize => $::CFG->{log_fontsize},
1444 indent => -4, 1703 indent => -4,
1445 can_hover => 1, 1704 can_hover => 1,
1453 x => 'center', 1712 x => 'center',
1454 y => 'center', 1713 y => 'center',
1455 z => 2, 1714 z => 2,
1456 force_w => $::WIDTH * 0.6, 1715 force_w => $::WIDTH * 0.6,
1457 force_h => $::HEIGHT * 0.6, 1716 force_h => $::HEIGHT * 0.6,
1717 has_close_button => 1,
1458 ; 1718 ;
1719
1720 $METASERVER = metaserver_dialog;
1459 1721
1460 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1722 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1461 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1723 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1462 1724
1463 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1725 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1467 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1729 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1468 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1730 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1469 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1731 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1470 "Configure the use of audio, sound effects and background music."); 1732 "Configure the use of audio, sound effects and background music.");
1471 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1733 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1472 "Lets you define, edit and delete bindings." 1734 "Lets you define, edit and delete key bindings."
1473 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1735 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1474 . "with nothing set and the recording started. After doing the actions you " 1736 . "with nothing set and the recording started. After doing the actions you "
1475 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1737 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1476 . "After pressing the combo the binding will be saved automatically and the " 1738 . "After pressing the combo the binding will be saved automatically and the "
1477 . "binding editor closes"); 1739 . "binding editor closes");
1478 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1740 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1479 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1741 "Some debuggin' options. Do not ask.");
1480 1742
1481 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1743 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1482 1744
1483 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1745 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1484 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1746 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1486 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1487 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1749 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1488 1750
1489 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 1751 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
1490 1752
1491 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1492 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1493 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1753 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1494 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1754 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1496 1755
1497 $BUTTONBAR->add (new CFClient::UI::Button 1756 $BUTTONBAR->add (new CFClient::UI::Button
1498 text => "Save Config", 1757 text => "Save Config",
1499 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1758 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1500 on_activate => sub { 1759 on_activate => sub {
1501 $::CFG->{layout} = CFClient::UI::get_layout; 1760 $::CFG->{layout} = CFClient::UI::get_layout;
1502 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1761 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1503 status "Configuration Saved"; 1762 status "Configuration Saved";
1763 0
1504 }, 1764 },
1505 ); 1765 );
1506 1766
1507 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1767 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1508 tooltip => "View Documentation"); 1768 tooltip => "View Documentation");
1509 1769
1510 $BUTTONBAR->add (new CFClient::UI::Button 1770 $BUTTONBAR->add (new CFClient::UI::Button
1511 text => "Quit", 1771 text => "Quit",
1512 tooltip => "Terminates the program", 1772 tooltip => "Terminates the program",
1514 if ($CONN) { 1774 if ($CONN) {
1515 open_quit_dialog; 1775 open_quit_dialog;
1516 } else { 1776 } else {
1517 exit; 1777 exit;
1518 } 1778 }
1779 0
1519 }, 1780 },
1520 ); 1781 );
1521 1782
1522 $BUTTONBAR->show; 1783 $BUTTONBAR->show;
1523 $SETUP_DIALOG->show; 1784 $SETUP_DIALOG->show;
1525 1786
1526 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1787 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1527} 1788}
1528 1789
1529sub video_shutdown { 1790sub video_shutdown {
1791 CFClient::OpenGL::shutdown;
1792
1530 undef $SDL_ACTIVE; 1793 undef $SDL_ACTIVE;
1531} 1794}
1532 1795
1533my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1796my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1534my $bgmusic;#TODO#hack#d# 1797my $bgmusic;#TODO#hack#d#
1715# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1978# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1716 }, 1979 },
1717 CFClient::SDL_KEYDOWN => sub { 1980 CFClient::SDL_KEYDOWN => sub {
1718 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1981 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1719 # alt-enter 1982 # alt-enter
1983 $FULLSCREEN_ENABLE->toggle;
1720 video_shutdown; 1984 video_shutdown;
1721 $CFG->{fullscreen} = !$CFG->{fullscreen};
1722 video_init; 1985 video_init;
1723 } else { 1986 } else {
1724 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1987 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1725 } 1988 }
1726 }, 1989 },
1742$SIG{INT} = $SIG{TERM} = sub { exit }; 2005$SIG{INT} = $SIG{TERM} = sub { exit };
1743 2006
1744{ 2007{
1745 local $SIG{__DIE__} = sub { 2008 local $SIG{__DIE__} = sub {
1746 return unless defined $^S && !$^S; 2009 return unless defined $^S && !$^S;
1747 Carp::confess $_[1];#d#TODO: remove when stable 2010 Carp::confess $_[0];#d#TODO: remove when stable
1748 CFClient::fatal $_[0]; 2011 CFClient::fatal $_[0];
1749 }; 2012 };
1750 2013
1751 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2014 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1752 CFClient::UI::set_layout ($::CFG->{layout}); 2015 CFClient::UI::set_layout ($::CFG->{layout});
1753 2016
1754 my %DEF_CFG = ( 2017 my %DEF_CFG = (
1755 sdl_mode => 0, 2018 sdl_mode => 0,
1756 width => 640, 2019 width => 640,
1757 height => 480, 2020 height => 480,
1758 fullscreen => 0, 2021 fullscreen => 0,
1759 fast => 0, 2022 fast => 0,
1760 map_scale => 1, 2023 map_scale => 1,
1761 fow_enable => 1, 2024 fow_enable => 1,
1762 fow_intensity => 0.45, 2025 fow_intensity => 0.45,
1763 fow_smooth => 0, 2026 fow_smooth => 0,
1764 gui_fontsize => 1, 2027 gui_fontsize => 1,
1765 log_fontsize => 0.7, 2028 log_fontsize => 0.7,
1766 gauge_fontsize=> 1, 2029 gauge_fontsize => 1,
1767 gauge_size => 0.35, 2030 gauge_size => 0.35,
1768 stat_fontsize => 0.7, 2031 stat_fontsize => 0.7,
1769 mapsize => 100, 2032 mapsize => 100,
1770 host => "crossfire.schmorp.de",
1771 say_command => 'say', 2033 say_command => 'say',
1772 audio_enable => 1, 2034 audio_enable => 1,
1773 bgm_enable => 1, 2035 bgm_enable => 1,
1774 bgm_volume => 0.25, 2036 bgm_volume => 0.25,
1775 face_prefetch => 0, 2037 face_prefetch => 0,
1776 output_sync => 1, 2038 output_sync => 1,
1777 output_count => 1, 2039 output_count => 1,
2040 pickup => 0,
2041 default => "profile", # default profile
2042 );
1778 ); 2043
1779
1780 while (my ($k, $v) = each %DEF_CFG) { 2044 while (my ($k, $v) = each %DEF_CFG) {
1781 $CFG->{$k} = $v unless exists $CFG->{$k}; 2045 $CFG->{$k} = $v unless exists $CFG->{$k};
1782 } 2046 }
2047
2048 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1783 2049
1784 sdl_init; 2050 sdl_init;
1785 2051
1786 @SDL_MODES = reverse 2052 @SDL_MODES = reverse
1787 grep $_->[0] >= 640 && $_->[1] >= 480, 2053 grep $_->[0] >= 640 && $_->[1] >= 480,
1829 video_init; 2095 video_init;
1830 audio_init; 2096 audio_init;
1831} 2097}
1832 2098
1833Event::loop; 2099Event::loop;
2100#CFClient::SDL_Quit;
2101#CFClient::_exit 0;
1834 2102
1835END { CFClient::SDL_Quit } 2103END { CFClient::SDL_Quit }
1836 2104
1837=head1 NAME 2105=head1 NAME
1838 2106

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines