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.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.102 by root, Mon Jul 24 04:24:43 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::Selector
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,
… …
649 tooltip => "The weight of the player including all inventory items."); 688 tooltip => "The weight of the player including all inventory items.");
650 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
651 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
652 tooltip => "The weight limit: you cannot carry more than this."); 691 tooltip => "The weight limit: you cannot carry more than this.");
653 692
654
655 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 693 $vb->add (my $hb = new CFClient::UI::HBox expand => 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,
… …
1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1093 x => "center", 1133 x => "center",
1094 y => "center", 1134 y => "center",
1095 z => 50, 1135 z => 50,
1096 title => "Really Quit?", 1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1097 ; 1141 ;
1098 1142
1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1100 1144
1101 $vb->add (new CFClient::UI::Label 1145 $vb->add (new CFClient::UI::Label
… …
1105 ); 1149 );
1106 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1150 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107 $hb->add (new CFClient::UI::Button 1151 $hb->add (new CFClient::UI::Button
1108 text => "Ok", 1152 text => "Ok",
1109 expand => 1, 1153 expand => 1,
1110 on_activate => sub { $QUIT_DIALOG->hide }, 1154 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1111 ); 1155 );
1112 $hb->add (new CFClient::UI::Button 1156 $hb->add (new CFClient::UI::Button
1113 text => "Quit anyway", 1157 text => "Quit anyway",
1114 expand => 1, 1158 expand => 1,
1115 on_activate => sub { exit }, 1159 on_activate => sub { exit },
1116 ); 1160 );
1117 } 1161 }
1118 1162
1119 $QUIT_DIALOG->show; 1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1120} 1165}
1121 1166
1122sub autopickup_setup { 1167sub autopickup_setup {
1123 my $table = new CFClient::UI::Table; 1168 my $table = new CFClient::UI::Table;
1124 1169
1125 for ( 1170 for (
1126 ["General", 0, 0, 1171 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE], 1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT], 1173 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP], 1174 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG], 1175 ["Debug autopickup" => PICKUP_DEBUG],
1131 ], 1176 ],
1132 ["Weapons", 0, 6, 1177 ["Weapons", 0, 6,
… …
1158 ["Potions" => PICKUP_POTION], 1203 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1204 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED], 1205 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS], 1206 ["Jewelery" => PICKUP_JEWELS],
1162 ], 1207 ],
1208 ["Weight/Value ratio", 2, 17]
1163 ) 1209 )
1164 { 1210 {
1165 my ($title, $x, $y, @bits) = @$_; 1211 my ($title, $x, $y, @bits) = @$_;
1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1212 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167 1213
1168 for (@bits) { 1214 for (@bits) {
1169 ++$y; 1215 ++$y;
1170 1216
1171 my $mask = $_->[1]; 1217 my $mask = $_->[1];
1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1218 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask, 1220 state => $::CFG->{pickup} & $mask,
1175 on_changed => sub { 1221 on_changed => sub {
1176 my ($box, $value) = @_; 1222 my ($box, $value) = @_;
1223
1177 if ($value) { 1224 if ($value) {
1178 $::CFG->{pickup} |= $mask; 1225 $::CFG->{pickup} |= $mask;
1179 } else { 1226 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1227 $::CFG->{pickup} &= ~$mask;
1181 } 1228 }
1229
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1230 $::CONN->send_command ("pickup $::CFG->{pickup}")
1183 if defined $::CONN; 1231 if defined $::CONN;
1232
1233 0
1184 }); 1234 });
1235
1236 ${$_->[2]} = $checkbox if $_->[2];
1185 } 1237 }
1186 } 1238 }
1187 1239
1240 $table->add (2, 18, new CFClient::UI::ValSlider
1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242 template => ">= 99",
1243 to_value => sub { ">= " . 5 * $_[0] },
1244 on_changed => sub {
1245 my ($slider, $value) = @_;
1246
1247 $::CFG->{pickup} &= ~0xF;
1248 $::CFG->{pickup} |= int $value
1249 if $value;
1250 1;
1251 });
1252
1253 $table->add (3, 18, new CFClient::UI::Button
1254 text => "set",
1255 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN;
1258 0
1259 });
1260
1188 $table 1261 $table
1189} 1262}
1190 1263
1264my %SORT_ORDER = (
1265 type => undef,
1266 mtime => sub { sort {
1267 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268 or $b->{mtime} <=> $a->{mtime}
1269 or $a->{type} <=> $b->{type}
1270 } @_ },
1271 weight => sub { sort {
1272 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273 or $a->{type} <=> $b->{type}
1274 } @_ },
1275);
1276
1191sub inventory_window { 1277sub inventory_widget {
1278 my $hb = new CFClient::UI::HBox homogeneous => 1;
1279
1280 $hb->add (my $vb1 = new CFClient::UI::VBox);
1281 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1282
1283 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1284
1285 use sort 'stable';
1286
1287 $hb1->add (new CFClient::UI::Selector
1288 value => $::CFG->{inv_sort},
1289 options => [
1290 [type => "Type/Name"],
1291 [mtime => "Recent/Normal/Locked"],
1292 [weight => "Weight/Type"],
1293 ],
1294 on_changed => sub {
1295 $::CFG->{inv_sort} = $_[1];
1296 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1297 },
1298 );
1299 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1300 #TODO# update to weigh/maxweight
1301 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1302
1303 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304 $sw1->add ($INV = new CFClient::UI::Inventory);
1305
1306 $hb->add (my $vb2 = new CFClient::UI::VBox);
1307
1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1309
1310 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $sw2->add ($INVR = new CFClient::UI::Inventory);
1312
1313 # XXX: Call after $INVR = ... because set_opencont sets the items
1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1315
1316 $hb
1317}
1318
1319sub toggle_player_page {
1320 my ($widget) = @_;
1321
1322 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1323 $PL_WINDOW->hide;
1324 } else {
1325 $PL_NOTEBOOK->set_current_page ($widget);
1326 $PL_WINDOW->show;
1327 }
1328}
1329
1330sub player_window {
1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1193 x => "center", 1332 x => "center",
1194 y => "center", 1333 y => "center",
1195 force_w => $WIDTH * 9/10, 1334 force_w => $WIDTH * 9/10,
1196 force_h => $HEIGHT * 9/10, 1335 force_h => $HEIGHT * 9/10,
1197 title => "Inventory", 1336 title => "Player",
1337 name => "playerbook",
1338 has_close_button => 1
1198 ; 1339 ;
1199 1340
1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1341 my $ntb =
1342 $PL_NOTEBOOK =
1343 new CFClient::UI::Notebook expand => 1, debug => 1;
1201 1344
1202 $hb->add (my $vb1 = new CFClient::UI::VBox); 1345 $ntb->add (
1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1346 "Statistics (F2)" => $STATS_PAGE = stats_window,
1204 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1347 "Shows statistics, where all your Stats and Resistances are shown."
1348 );
1349 $ntb->add (
1350 "Skills (F3)" => $SKILL_PAGE = skill_window,
1351 "Shows all your Skills."
1352 );
1205 1353
1206 $hb->add (my $vb2 = new CFClient::UI::VBox); 1354 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1356 $ntb->add (
1357 "Spellbook (F4)" => $spellsw,
1358 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1359 );
1360 $ntb->add (
1361 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1362 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1363 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1364 );
1207 1365
1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1366 $ntb->set_current_page ($INVENTORY_PAGE);
1209 1367
1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1368 $plwin->add ($ntb);
1211 1369 $plwin
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
1215 $invwin
1216} 1370}
1217 1371
1218sub spell_setup { 1372sub update_bindings {
1219 new CFClient::UI::SpellList 1373 $BIND_UPD_CB->() if $BIND_UPD_CB;
1220} 1374}
1221 1375
1222sub keyboard_setup { 1376sub keyboard_setup {
1223 my $binding_list = new CFClient::UI::VBox; 1377 my $binding_list = new CFClient::UI::VBox;
1224 1378
1225 my $refresh; 1379 my $refresh;
1226 $refresh = sub { 1380 $refresh = $BIND_UPD_CB = sub {
1227 $binding_list->clear (); 1381 $binding_list->clear ();
1228 1382
1229 for my $mod (keys %{$::CFG->{bindings}}) { 1383 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1384 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1385 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1386 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233 1387
1234 my $lbl = join "; ", @$cmds; 1388 my $lbl = join "; ", @$cmds;
1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1389 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1236 $binding_list->add (my $hb = new CFClient::UI::HBox); 1390 $binding_list->add (my $hb = new CFClient::UI::HBox);
1237 $hb->add (new CFClient::UI::Button 1391 $hb->add (new CFClient::UI::Button
1238 text => "delete", 1392 text => "delete",
1239 tooltip => "Deletes the binding", 1393 tooltip => "Deletes the binding",
1240 on_activate => sub { 1394 on_activate => sub {
1241 $binding_list->remove ($hb); 1395 $binding_list->remove ($hb);
1242 delete $::CFG->{bindings}->{$mod}->{$sym}; 1396 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397 0
1243 }); 1398 });
1244 1399
1245 $hb->add (new CFClient::UI::Button 1400 $hb->add (new CFClient::UI::Button
1246 text => "edit", 1401 text => "edit",
1247 tooltip => "Edits the binding", 1402 tooltip => "Edits the binding",
1248 on_activate => sub { 1403 on_activate => sub {
1249 $::BIND_EDITOR->set_binding ( 1404 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1405 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1251 sub { 1406 sub {
1252 my ($nmod, $nsym, $ncmds) = @_; 1407 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym}; 1408 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1409 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1255 $refresh->(); 1410 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1411 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show; 1412 $SETUP_DIALOG->show;
1258 }, 1413 },
1259 sub { 1414 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show; 1416 $SETUP_DIALOG->show;
1262 }); 1417 });
1263 $::BIND_EDITOR->show; 1418 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide; 1419 $SETUP_DIALOG->hide;
1420 0
1265 }); 1421 });
1266 1422
1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1423 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1424 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269 } 1425 }
1270 } 1426 }
1271 }; 1427 };
1272 1428
1273 my $vb = new CFClient::UI::VBox; 1429 my $vb = new CFClient::UI::VBox;
1430 $vb->add (my $hb = new CFClient::UI::HBox);
1431 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1432 $hb->add (new CFClient::UI::CheckBox
1433 expand => 1,
1434 state => $CFG->{shift_fire_stop},
1435 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1436 on_changed => sub {
1437 my ($cbox, $value) = @_;
1438 $CFG->{shift_fire_stop} = $value;
1439 0
1440 });
1441
1274 $vb->add ($binding_list); 1442 $vb->add ($binding_list);
1275 $vb->add (my $hb = new CFClient::UI::HBox); 1443 $vb->add (my $hb = new CFClient::UI::HBox);
1276 1444
1277 $hb->add (new CFClient::UI::Button 1445 $hb->add (new CFClient::UI::Button
1278 text => "record new", 1446 text => "record new",
… …
1280 tooltip => "This button opens the binding editor with an empty binding.", 1448 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub { 1449 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [], 1450 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub { 1451 sub {
1284 my ($mod, $sym, $cmds) = @_; 1452 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1453 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1286 $refresh->(); 1454 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1455 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show; 1456 $SETUP_DIALOG->show;
1289 }, 1457 },
1290 sub { 1458 sub {
… …
1292 $SETUP_DIALOG->show; 1460 $SETUP_DIALOG->show;
1293 }, 1461 },
1294 ); 1462 );
1295 $SETUP_DIALOG->hide; 1463 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show; 1464 $::BIND_EDITOR->show;
1465 0
1297 }, 1466 },
1298 ); 1467 );
1299 1468
1300 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFClient::UI::Button
1301 text => "close", 1470 text => "close",
1302 tooltip => "Closes the binding window", 1471 tooltip => "Closes the binding window",
1303 expand => 1, 1472 expand => 1,
1304 on_activate => sub { 1473 on_activate => sub {
1305 $SETUP_DIALOG->hide; 1474 $SETUP_DIALOG->hide;
1475 0
1306 } 1476 }
1307 ); 1477 );
1308 1478
1309 $refresh->(); 1479 $refresh->();
1310 1480
1311 $vb 1481 $vb
1312} 1482}
1313 1483
1484# just weirdness, pls. ignore
1485sub load_html_page {
1486 my ($viewer, $base) = @_;
1487
1488 $viewer->clear;
1489
1490 require LWP::Simple;
1491 require HTML::Parser;
1492 require URI;
1493
1494 my $page = LWP::Simple::get ($base)
1495 or return;
1496
1497 my @s = { };
1498 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500 my $parser = HTML::Parser->new (
1501 text_h => [sub {
1502 my ($text) = @_;
1503 $text =~ s/\s+/ /g;
1504 $s[-1]{text} .= CFClient::asxml $text;
1505 }, "dtext"],
1506 start_h => [sub {
1507 my ($tag, $attr) = @_;
1508 if ($passthrough{$tag}) {
1509 $s[-1]{text} .= "<$tag>";
1510 } elsif ($tag eq "h1") {
1511 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512 } elsif ($tag eq "h2") {
1513 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514 } elsif ($tag eq "h3") {
1515 push @s, { text => "<span size='large'>" };
1516 } elsif ($tag eq "a") {
1517 push @s, { text => "", url => $attr->{href} };
1518 } elsif ($tag eq "p") {
1519 push @s, { };
1520 } elsif ($tag eq "img") {
1521 eval {
1522 push @{$s[-1]{obj}}, new CFClient::UI::Image
1523 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524 $s[-1]{text} .= "\x{fffc}";
1525 };
1526 }
1527 }, "tagname, attr"],
1528 end_h => [sub {
1529 my ($tag) = @_;
1530 if ($passthrough{$tag}) {
1531 $s[-1]{text} .= "</$tag>";
1532 } elsif ($tag =~ /^h\d$/) {
1533 $s[-1]{text} .= "</span>";
1534 push @s, { };
1535 } elsif ($tag eq "a") {
1536 my $S = pop @s;
1537 $s[-1]{text} .= "\x{fffc}";
1538 push @{$s[-1]{obj}}, new CFClient::UI::Label
1539 fg => [0.8, 0.8, 1],
1540 markup => "<u>$S->{text}</u>",
1541 fontsize => 0.8,
1542 can_events => 1,
1543 can_focus => 1,
1544 on_button_up => sub {
1545 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546 },
1547 ;
1548 }
1549 }, "tagname"],
1550 );
1551
1552 $parser->parse ($page);
1553 $parser->eof;
1554
1555 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556 for @s;
1557
1558 $viewer->set_offset (0);
1559}
1560
1314sub make_help_window { 1561sub help_window {
1315 my $win = new CFClient::UI::FancyFrame 1562 my $win = new CFClient::UI::FancyFrame
1316 x => 'center', 1563 x => 'center',
1317 y => 'center', 1564 y => 'center',
1318 z => 2, 1565 z => 2,
1319 name => 'doc_browser', 1566 name => 'doc_browser',
1320 force_w => int $WIDTH * 7/8, 1567 force_w => int $WIDTH * 7/8,
1321 force_h => int $HEIGHT * 7/8, 1568 force_h => int $HEIGHT * 7/8,
1322 title => "Documentation"; 1569 title => "Help Browser",
1570 has_close_button => 1;
1323 1571
1324 $win->add (my $vbox = new CFClient::UI::VBox); 1572 $win->add (my $vbox = new CFClient::UI::VBox);
1325 1573
1326 $vbox->add (my $buttons = new CFClient::UI::HBox); 1574 $vbox->add (my $buttons = new CFClient::UI::HBox);
1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1576 expand => 1, fontsize => 0.8, padding_x => 4);
1328 1577
1329 for ( 1578 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1579 $buttons->add (my $combo = new CFClient::UI::Selector
1580 value => undef,
1581 options => [
1330 [intro => "Introduction"], 1582 [intro => "Introduction"],
1331 [manual => "Manual"], 1583 [manual => "Main Manual"],
1584 [skill_help => "Skill Reference"],
1585 [command_help => "Command Reference"],
1332 [command_help => "Commands"], 1586 [dmcommand_help => "DM Commands"],
1333 [skill_help => "Skills"], 1587 [COPYING => "License Terms"],
1334 ) { 1588 [test => "test (do not select)"], #d#TODO
1335 my ($pod, $label) = @$_; 1589 ],
1590 on_changed => sub {
1591 my ($self, $pod) = @_;
1336 1592
1337 $buttons->add (new CFClient::UI::Button 1593 if ($pod eq "test") {#d#TODO
1338 text => $label, 1594 eval {
1339 on_activate => sub { 1595 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1596 };
1597 warn "$@" if $@;
1598 return;
1599 }
1600
1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1602 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1342 1603
1604 #use Data::Dumper; warn Dumper $pom;#d#
1605
1343 $viewer->clear; 1606 $viewer->clear;
1607
1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1611# ]);#d#
1344 1612
1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1346 for @$pom; 1614 for @$pom;
1347 1615
1348 $viewer->set_offset (0); 1616 $viewer->set_offset (0);
1617
1349 }, 1618 0
1619 },
1620 on_visibility_change => sub {
1621 my ($self, $visible) = @_;
1622 return unless $visible;
1623 return if $self->{value};
1624 $self->set_value ("intro");
1625 0
1626 },
1350 ); 1627 );
1351 }
1352
1353 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1354 1628
1355 $win 1629 $win
1356} 1630}
1357 1631
1358sub sdl_init { 1632sub sdl_init {
… …
1395 z => 100, 1669 z => 100,
1396 force_x => "max", 1670 force_x => "max",
1397 force_y => 0; 1671 force_y => 0;
1398 $DEBUG_STATUS->show; 1672 $DEBUG_STATUS->show;
1399 1673
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1674 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1401 1675
1402 $STATUSBOX = new CFClient::UI::Statusbox; 1676 $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]); 1677 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1404 1678
1405 (new CFClient::UI::Frame 1679 (new CFClient::UI::Frame
… …
1425 $MAPWIDGET->connect (activate_console => sub { 1699 $MAPWIDGET->connect (activate_console => sub {
1426 my ($mapwidget, $preset) = @_; 1700 my ($mapwidget, $preset) = @_;
1427 1701
1428 if ($CONSOLE) { 1702 if ($CONSOLE) {
1429 $CONSOLE->{input}->{auto_activated} = 1; 1703 $CONSOLE->{input}->{auto_activated} = 1;
1430 $CONSOLE->{input}->focus_in; 1704 $CONSOLE->{input}->grab_focus;
1431 1705
1432 if ($preset && $CONSOLE->{input}->get_text eq '') { 1706 if ($preset && $CONSOLE->{input}->get_text eq '') {
1433 $CONSOLE->{input}->set_text ($preset); 1707 $CONSOLE->{input}->set_text ($preset);
1434 } 1708 }
1435 } 1709 }
1436 }); 1710 });
1437 $MAPWIDGET->show; 1711 $MAPWIDGET->show;
1438 $MAPWIDGET->focus_in; 1712 $MAPWIDGET->grab_focus;
1439 1713
1440 $LOGVIEW = new CFClient::UI::TextView 1714 $LOGVIEW = new CFClient::UI::TextScroller
1441 expand => 1, 1715 expand => 1,
1442 font => $FONT_FIXED, 1716 font => $FONT_FIXED,
1443 fontsize => $::CFG->{log_fontsize}, 1717 fontsize => $::CFG->{log_fontsize},
1718 indent => -4,
1444 can_hover => 1, 1719 can_hover => 1,
1445 can_events => 1, 1720 can_events => 1,
1446 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1721 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1447 ; 1722 ;
1448 1723
… …
1452 x => 'center', 1727 x => 'center',
1453 y => 'center', 1728 y => 'center',
1454 z => 2, 1729 z => 2,
1455 force_w => $::WIDTH * 0.6, 1730 force_w => $::WIDTH * 0.6,
1456 force_h => $::HEIGHT * 0.6, 1731 force_h => $::HEIGHT * 0.6,
1732 has_close_button => 1,
1457 ; 1733 ;
1734
1735 $METASERVER = metaserver_dialog;
1458 1736
1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1737 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1738 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461 1739
1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1740 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1744 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1745 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1746 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1469 "Configure the use of audio, sound effects and background music."); 1747 "Configure the use of audio, sound effects and background music.");
1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1748 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471 "Lets you define, edit and delete bindings." 1749 "Lets you define, edit and delete key bindings."
1472 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1750 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1473 . "with nothing set and the recording started. After doing the actions you " 1751 . "with nothing set and the recording started. After doing the actions you "
1474 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1752 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475 . "After pressing the combo the binding will be saved automatically and the " 1753 . "After pressing the combo the binding will be saved automatically and the "
1476 . "binding editor closes"); 1754 . "binding editor closes");
1477 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1755 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1478 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1756 "Some debuggin' options. Do not ask.");
1479 1757
1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1758 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1481 1759
1482 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1760 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1483 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1761 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1763 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1764 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1487 1765
1488 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 1766 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
1489 1767
1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1491 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1768 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1493 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1769 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1495 1770
1496 $BUTTONBAR->add (new CFClient::UI::Button 1771 $BUTTONBAR->add (new CFClient::UI::Button
1497 text => "Save Config", 1772 text => "Save Config",
1498 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1773 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1499 on_activate => sub { 1774 on_activate => sub {
1500 $::CFG->{layout} = CFClient::UI::get_layout; 1775 $::CFG->{layout} = CFClient::UI::get_layout;
1501 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1776 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1502 status "Configuration Saved"; 1777 status "Configuration Saved";
1778 0
1503 }, 1779 },
1504 ); 1780 );
1505 1781
1506 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1782 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1507 tooltip => "View Documentation"); 1783 tooltip => "View Documentation");
1508 1784
1509 $BUTTONBAR->add (new CFClient::UI::Button 1785 $BUTTONBAR->add (new CFClient::UI::Button
1510 text => "Quit", 1786 text => "Quit",
1511 tooltip => "Terminates the program", 1787 tooltip => "Terminates the program",
… …
1513 if ($CONN) { 1789 if ($CONN) {
1514 open_quit_dialog; 1790 open_quit_dialog;
1515 } else { 1791 } else {
1516 exit; 1792 exit;
1517 } 1793 }
1794 0
1518 }, 1795 },
1519 ); 1796 );
1520 1797
1521 $BUTTONBAR->show; 1798 $BUTTONBAR->show;
1522 $SETUP_DIALOG->show; 1799 $SETUP_DIALOG->show;
… …
1524 1801
1525 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1802 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1526} 1803}
1527 1804
1528sub video_shutdown { 1805sub video_shutdown {
1806 CFClient::OpenGL::shutdown;
1807
1529 undef $SDL_ACTIVE; 1808 undef $SDL_ACTIVE;
1530} 1809}
1531 1810
1532my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1811my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1533my $bgmusic;#TODO#hack#d# 1812my $bgmusic;#TODO#hack#d#
… …
1605 1884
1606 $WANT_REFRESH = 0; 1885 $WANT_REFRESH = 0;
1607 $CAN_REFRESH = 0; 1886 $CAN_REFRESH = 0;
1608 $LAST_REFRESH = $NOW; 1887 $LAST_REFRESH = $NOW;
1609 1888
16100 && do {
1611 # some weird model-drawing code, just a joke right now
1612 use CFClient::OpenGL;
1613
1614 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1615 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1616 $demo{r} ||= do {
1617 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1618 $mod->{v} = pack "f*", @{$mod->{v}};
1619 $_ = [scalar @$_, pack "S!*", @$_]
1620 for values %{$mod->{g}};
1621 $mod
1622 };
1623
1624 my $r = $demo{r} or die;
1625
1626 glDepthMask 1;
1627 glClear GL_DEPTH_BUFFER_BIT;
1628 glEnable GL_TEXTURE_2D;
1629 glEnable GL_DEPTH_TEST;
1630 glEnable GL_CULL_FACE;
1631 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1632
1633 glMatrixMode GL_PROJECTION;
1634 glLoadIdentity;
1635 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1636 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1637 glMatrixMode GL_MODELVIEW;
1638 glLoadIdentity;
1639
1640 glPushMatrix;
1641 glTranslate 0, 0, -800;
1642 glScale 1, -1, 1;
1643 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1644 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1645 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1646 glScale 50, 50, 50;
1647
1648 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1649 while (my ($k, $v) = each %{$r->{g}}) {
1650 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1651 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1652 }
1653
1654 glPopMatrix;
1655
1656 glShadeModel GL_FLAT;
1657 glDisable GL_DEPTH_TEST;
1658 glDisable GL_TEXTURE_2D;
1659 glDepthMask 0;
1660
1661 $WANT_REFRESH++;
1662};
1663
1664 CFClient::SDL_GL_SwapBuffers; 1889 CFClient::SDL_GL_SwapBuffers;
1665} 1890}
1666 1891
1667my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1892my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1668 $NOW = time; 1893 $NOW = time;
… …
1714# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1939# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1715 }, 1940 },
1716 CFClient::SDL_KEYDOWN => sub { 1941 CFClient::SDL_KEYDOWN => sub {
1717 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1718 # alt-enter 1943 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle;
1719 video_shutdown; 1945 video_shutdown;
1720 $CFG->{fullscreen} = !$CFG->{fullscreen};
1721 video_init; 1946 video_init;
1722 } else { 1947 } else {
1723 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1948 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1724 } 1949 }
1725 }, 1950 },
… …
1741$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1742 1967
1743{ 1968{
1744 local $SIG{__DIE__} = sub { 1969 local $SIG{__DIE__} = sub {
1745 return unless defined $^S && !$^S; 1970 return unless defined $^S && !$^S;
1746 Carp::confess $_[1];#d#TODO: remove when stable 1971 Carp::confess $_[0];#d#TODO: remove when stable
1747 CFClient::fatal $_[0]; 1972 CFClient::fatal $_[0];
1748 }; 1973 };
1749 1974
1750 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1751 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
1752 1977
1753 my %DEF_CFG = ( 1978 my %DEF_CFG = (
1754 sdl_mode => 0, 1979 sdl_mode => 0,
1755 width => 640, 1980 width => 640,
1756 height => 480, 1981 height => 480,
1757 fullscreen => 0, 1982 fullscreen => 0,
1758 fast => 0, 1983 fast => 0,
1759 map_scale => 1, 1984 map_scale => 1,
1760 fow_enable => 1, 1985 fow_enable => 1,
1761 fow_intensity => 0.45, 1986 fow_intensity => 0.45,
1762 fow_smooth => 0, 1987 fow_smooth => 0,
1763 gui_fontsize => 1, 1988 gui_fontsize => 1,
1764 log_fontsize => 0.7, 1989 log_fontsize => 0.7,
1765 gauge_fontsize=> 1, 1990 gauge_fontsize => 1,
1766 gauge_size => 0.35, 1991 gauge_size => 0.35,
1767 stat_fontsize => 0.7, 1992 stat_fontsize => 0.7,
1768 mapsize => 100, 1993 mapsize => 100,
1769 host => "crossfire.schmorp.de",
1770 say_command => 'say', 1994 say_command => 'say',
1771 audio_enable => 1, 1995 audio_enable => 1,
1772 bgm_enable => 1, 1996 bgm_enable => 1,
1773 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1774 face_prefetch => 0, 1998 face_prefetch => 0,
1775 output_sync => 1, 1999 output_sync => 1,
1776 output_count => 1, 2000 output_count => 1,
2001 pickup => 0,
2002 inv_sort => "mtime",
2003 default => "profile", # default profile
2004 );
1777 ); 2005
1778
1779 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1780 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1781 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1782 2011
1783 sdl_init; 2012 sdl_init;
1784 2013
1785 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1786 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1828 video_init; 2057 video_init;
1829 audio_init; 2058 audio_init;
1830} 2059}
1831 2060
1832Event::loop; 2061Event::loop;
2062#CFClient::SDL_Quit;
2063#CFClient::_exit 0;
1833 2064
1834END { CFClient::SDL_Quit } 2065END { CFClient::SDL_Quit }
1835 2066
1836=head1 NAME 2067=head1 NAME
1837 2068

Diff Legend

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