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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines