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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.106 by root, Sun Aug 13 02:43:22 2006 UTC

… …
32use Crossfire; 32use Crossfire;
33use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
34 34
35use Compress::LZF; 35use Compress::LZF;
36 36
37use CFClient; 37use CFPlus;
38use CFClient::OpenGL (); 38use CFPlus::OpenGL ();
39use CFClient::Protocol; 39use CFPlus::Protocol;
40use CFClient::UI; 40use CFPlus::UI;
41use CFPlus::Pod;
41use CFClient::BindingEditor; 42use CFPlus::BindingEditor;
42use CFClient::MapWidget; 43use CFPlus::MapWidget;
43 44
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE'; 46$SIG{PIPE} = 'IGNORE';
46 47
48$Event::Eval = 0;
47$Event::DIED = sub { 49$Event::DIED = sub {
48 # TODO: display dialog box or so 50 # TODO: display dialog box or so
49 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
50 CFClient::error $_[1]; 52 CFPlus::error $_[1];
51}; 53};
52 54
53#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
54 63
55our $VERSION = '0.1'; 64our $VERSION = '0.1';
56 65
57my $MAX_FPS = 60; 66my $MAX_FPS = 60;
58my $MIN_FPS = 5; # unused as of yet 67my $MIN_FPS = 5; # unused as of yet
… …
100our $PL_NOTEBOOK; 109our $PL_NOTEBOOK;
101our $PL_WINDOW; 110our $PL_WINDOW;
102 111
103our $INVENTORY_PAGE; 112our $INVENTORY_PAGE;
104our $STATS_PAGE; 113our $STATS_PAGE;
114our $SKILL_PAGE;
105our $SPELL_PAGE; 115our $SPELL_PAGE;
106 116
107our $HELP_WINDOW; 117our $HELP_WINDOW;
108our $MESSAGE_WINDOW; 118our $MESSAGE_WINDOW;
109our $FLOORBOX; 119our $FLOORBOX;
… …
129our $BIND_UPD_CB; 139our $BIND_UPD_CB;
130 140
131our $PICKUP_CFG; 141our $PICKUP_CFG;
132 142
133sub status { 143sub status {
134 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
135} 145}
136 146
137sub debug { 147sub debug {
138 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
139} 149}
… …
145 155
146# server query dialog 156# server query dialog
147sub server_query { 157sub server_query {
148 my ($conn, $flags, $prompt) = @_; 158 my ($conn, $flags, $prompt) = @_;
149 159
150 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
151 x => "center", 161 x => "center",
152 y => "center", 162 y => "center",
153 title => "Server Query", 163 title => "Server Query",
154 child => my $vbox = new CFClient::UI::VBox, 164 child => my $vbox = new CFPlus::UI::VBox,
155 ; 165 ;
156 166
157 my @dialog = my $label = new CFClient::UI::Label 167 my @dialog = my $label = new CFPlus::UI::Label
158 max_w => $::WIDTH * 0.4, 168 max_w => $::WIDTH * 0.4,
159 ellipsise => 0, 169 ellipsise => 0,
160 text => $prompt; 170 text => $prompt;
161 171
162 if ($flags & CS_QUERY_YESNO) { 172 if ($flags & CS_QUERY_YESNO) {
163 push @dialog, my $hbox = new CFClient::UI::HBox; 173 push @dialog, my $hbox = new CFPlus::UI::HBox;
164 174
165 $hbox->add (new CFClient::UI::Button 175 $hbox->add (new CFPlus::UI::Button
166 text => "No", 176 text => "No",
167 on_activate => sub { 177 on_activate => sub {
168 $conn->send ("reply n"); 178 $conn->send ("reply n");
169 $dialog->destroy; 179 $dialog->destroy;
170 0 180 0
171 } 181 }
172 ); 182 );
173 $hbox->add (new CFClient::UI::Button 183 $hbox->add (new CFPlus::UI::Button
174 text => "Yes", 184 text => "Yes",
175 on_activate => sub { 185 on_activate => sub {
176 $conn->send ("reply y"); 186 $conn->send ("reply y");
177 destroy_query_dialog $conn; 187 destroy_query_dialog $conn;
178 0 188 0
… …
185 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
186 196
187 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
188 $MESSAGE_WINDOW->show; 198 $MESSAGE_WINDOW->show;
189 199
190 unshift @dialog, new CFClient::UI::Label 200 unshift @dialog, new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 201 max_w => $::WIDTH * 0.4,
192 ellipsise => 0, 202 ellipsise => 0,
193 markup => "\nOr use your keyboard:\n"; 203 markup => "\nOr use your keyboard and the text entry below:\n";
194 204
195 unshift @dialog, my $table = new CFClient::UI::Table; 205 unshift @dialog, my $table = new CFPlus::UI::Table;
196 206
197 $table->add (0, 0, new CFClient::UI::Button 207 $table->add (0, 0, new CFPlus::UI::Button
198 text => "Next Race", 208 text => "Next Race",
199 on_activate => sub { 209 on_activate => sub {
200 $conn->send ("reply n"); 210 $conn->send ("reply n");
201 destroy_query_dialog $conn; 211 destroy_query_dialog $conn;
202 0 212 0
203 }, 213 },
204 ); 214 );
205 $table->add (2, 0, new CFClient::UI::Button 215 $table->add (2, 0, new CFPlus::UI::Button
206 text => "Accept", 216 text => "Accept",
207 on_activate => sub { 217 on_activate => sub {
208 $conn->send ("reply d"); 218 $conn->send ("reply d");
209 destroy_query_dialog $conn; 219 destroy_query_dialog $conn;
210 0 220 0
211 }, 221 },
212 ); 222 );
213 223
214 unshift @dialog, new CFClient::UI::Label 224 unshift @dialog, new CFPlus::UI::Label
215 max_w => $::WIDTH * 0.4, 225 max_w => $::WIDTH * 0.4,
216 ellipsise => 0, 226 ellipsise => 0,
217 markup => 227 markup =>
218 "<big><b>Character Creation: Race</b></big>\n\n" 228 "<big><b>Character Creation: Race</b></big>\n\n"
219 . "Look at the <b>Messages</b> window to see a description of this race " 229 . "Look at the <b>Messages</b> window to see a description of this race "
220 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
221 . "and the center of the screen to see how this race looks like " 230 . "and the center of the screen to see how this race looks like "
222 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
223 . "You can look at another race, or accept this race (you will come back to this race eventually, " 233 . "You can look at another race, or accept this race (you will cycle back to "
224 . "so you can take your time making this important choice." 234 . "this race eventually, so you can take your time making this important choice."
225 ; 235 ;
226 236
227 } elsif ($prompt =~ /roll new stats/) { 237 } elsif ($prompt =~ /roll new stats/) {
228 if (my $stat = delete $conn->{stat_change_with}) { 238 if (my $stat = delete $conn->{stat_change_with}) {
229 $conn->send ("reply $stat"); 239 $conn->send ("reply $stat");
… …
232 } 242 }
233 243
234 $STATS_PAGE->show; 244 $STATS_PAGE->show;
235 $MESSAGE_WINDOW->hide; 245 $MESSAGE_WINDOW->hide;
236 246
237 unshift @dialog, new CFClient::UI::Label 247 unshift @dialog, new CFPlus::UI::Label
238 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
239 ellipsise => 0, 249 ellipsise => 0,
240 markup => "\nOr use your keyboard:\n"; 250 markup => "\nOr use your keyboard and the text entry below:\n";
241 251
242 unshift @dialog, my $table = new CFClient::UI::Table; 252 unshift @dialog, my $table = new CFPlus::UI::Table;
243 253
244 # left: re-roll 254 # left: re-roll
245 $table->add (0, 0, new CFClient::UI::Button 255 $table->add (0, 0, new CFPlus::UI::Button
246 text => "Roll Again", 256 text => "Roll Again",
247 on_activate => sub { 257 on_activate => sub {
248 $conn->send ("reply y"); 258 $conn->send ("reply y");
249 destroy_query_dialog $conn; 259 destroy_query_dialog $conn;
250 0 260 0
251 }, 261 },
252 ); 262 );
253 263
254 # center: swap stats 264 # center: swap stats
255 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 265 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266 expand => 1,
256 value => $_, 267 value => $_,
257 options => [ 268 options => [
258 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
259 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
260 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 271 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
263 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
264 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 275 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
265 ], 276 ],
266 ), 1 .. 2; 277 ), 1 .. 2;
267 278
268 $table->add (2, 0, new CFClient::UI::Button 279 $table->add (2, 0, new CFPlus::UI::Button
269 text => "Swap Stats", 280 text => "Swap Stats",
270 on_activate => sub { 281 on_activate => sub {
271 $conn->{stat_change_with} = $sw2->{value}; 282 $conn->{stat_change_with} = $sw2->{value};
272 $conn->send ("reply $sw1->{value}"); 283 $conn->send ("reply $sw1->{value}");
273 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
274 0 285 0
275 }, 286 },
276 ); 287 );
277 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 288 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
278 289
279 # right: accept 290 # right: accept
280 $table->add (4, 0, new CFClient::UI::Button 291 $table->add (4, 0, new CFPlus::UI::Button
281 text => "Accept", 292 text => "Accept",
282 on_activate => sub { 293 on_activate => sub {
283 $conn->send ("reply n"); 294 $conn->send ("reply n");
284 $STATS_PAGE->hide; 295 $STATS_PAGE->hide;
285 destroy_query_dialog $conn; 296 destroy_query_dialog $conn;
286 0 297 0
287 }, 298 },
288 ); 299 );
289 300
301 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
302 for (
303 [Str => CS_STAT_STR],
304 [Dex => CS_STAT_DEX],
305 [Con => CS_STAT_CON],
306 [Int => CS_STAT_INT],
307 [Wis => CS_STAT_WIS],
308 [Pow => CS_STAT_POW],
309 [Cha => CS_STAT_CHA],
310 ) {
311 my ($name, $id) = @$_;
312 $hbox->add (new CFPlus::UI::Label
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0,
315 expand => 1,
316 can_events => 1,
317 can_hover => 1,
318 tooltip => $CFPlus::STAT_TOOLTIP{$name},
319 );
320 }
321
290 unshift @dialog, new CFClient::UI::Label 322 unshift @dialog, new CFPlus::UI::Label
291 max_w => $::WIDTH * 0.4, 323 max_w => $::WIDTH * 0.4,
292 ellipsise => 0, 324 ellipsise => 0,
293 markup => 325 markup =>
294 "<big><b>Character Creation: Stats</b></big>\n\n" 326 "<big><b>Character Creation: Stats</b></big>\n\n"
295 . "Look at the <b>Stats</b> window to see your basic stats " 327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
296 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
297 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
298 . "Race selection will influence those values later on."
299 ; 331 ;
300 } 332 }
301 333
302 push @dialog, my $entry = new CFClient::UI::Entry 334 push @dialog, my $entry = new CFPlus::UI::Entry
303 on_changed => sub { 335 on_changed => sub {
304 $conn->send ("reply $_[1]"); 336 $conn->send ("reply $_[1]");
305 destroy_query_dialog $conn; 337 destroy_query_dialog $conn;
306 0 338 0
307 }, 339 },
… …
310 $entry->grab_focus; 342 $entry->grab_focus;
311 343
312 } else { 344 } else {
313 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 345 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
314 346
315 push @dialog, my $entry = new CFClient::UI::Entry 347 push @dialog, my $entry = new CFPlus::UI::Entry
316 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 348 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
317 on_activate => sub { 349 on_activate => sub {
318 $conn->send ("reply $_[1]"); 350 $conn->send ("reply $_[1]");
319 destroy_query_dialog $conn; 351 destroy_query_dialog $conn;
320 0 352 0
… …
336 368
337 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
338 370
339 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
340 372
341 $MAP = new CFClient::Map $mapsize, $mapsize; 373 $MAP = new CFPlus::Map $mapsize, $mapsize;
342 374
343 $CONN = eval { 375 $CONN = eval {
344 new CFClient::Protocol 376 new CFPlus::Protocol
345 host => $host, 377 host => $host,
346 port => $port || 13327, 378 port => $port || 13327,
347 user => $CFG->{profile}{default}{user}, 379 user => $CFG->{profile}{default}{user},
348 pass => $CFG->{profile}{default}{password}, 380 pass => $CFG->{profile}{default}{password},
349 mapw => $mapsize, 381 mapw => $mapsize,
… …
368 $chunk->play; 400 $chunk->play;
369 }, 401 },
370 }; 402 };
371 403
372 if ($CONN) { 404 if ($CONN) {
373 CFClient::lowdelay fileno $CONN->{fh}; 405 CFPlus::lowdelay fileno $CONN->{fh};
374 406
375 status "login successful"; 407 status "login successful";
376 } else { 408 } else {
377 status "unable to connect"; 409 status "unable to connect";
378 stop_game(); 410 stop_game();
… …
396 428
397 undef $MAP; 429 undef $MAP;
398} 430}
399 431
400sub graphics_setup { 432sub graphics_setup {
401 my $vbox = new CFClient::UI::VBox; 433 my $vbox = new CFPlus::UI::VBox;
402 434
403 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 435 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
404 436
405 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 437 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
406 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 438 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
407 439
408 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 440 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
409 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 441 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
410 442
411 $mode_slider->connect (changed => sub { 443 $mode_slider->connect (changed => sub {
412 my ($self, $value) = @_; 444 my ($self, $value) = @_;
413 445
414 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
416 }); 448 });
417 $mode_slider->emit (changed => $mode_slider->{range}[0]); 449 $mode_slider->emit (changed => $mode_slider->{range}[0]);
418 450
419 my $row = 1; 451 my $row = 1;
420 452
421 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
422 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
423 state => $CFG->{fullscreen}, 455 state => $CFG->{fullscreen},
424 tooltip => "Bring the client into fullscreen mode.", 456 tooltip => "Bring the client into fullscreen mode.",
425 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
426 ); 458 );
427 459
428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 460 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 461 $table->add (1, $row++, new CFPlus::UI::CheckBox
430 state => $CFG->{fast}, 462 state => $CFG->{fast},
431 tooltip => "Lower the visual quality considerably to speed up rendering.", 463 tooltip => "Lower the visual quality considerably to speed up rendering.",
432 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
433 ); 465 );
434 466
435 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 467 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
436 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFPlus::UI::Slider
437 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
438 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
439 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
440 ); 472 );
441 473
442 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 474 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
443 $table->add (1, $row++, new CFClient::UI::CheckBox 475 $table->add (1, $row++, new CFPlus::UI::CheckBox
444 state => $CFG->{fow_enable}, 476 state => $CFG->{fow_enable},
445 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 477 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
446 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 478 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
447 ); 479 );
448 480
449 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 481 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
450 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFPlus::UI::Slider
451 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 483 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
452 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 484 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
453 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 485 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
454 ); 486 );
455 487
456 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
457 $table->add (1, $row++, new CFClient::UI::CheckBox 489 $table->add (1, $row++, new CFPlus::UI::CheckBox
458 state => $CFG->{fow_smooth}, 490 state => $CFG->{fow_smooth},
459 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 491 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
460 on_changed => sub { 492 on_changed => sub {
461 my ($self, $value) = @_; 493 my ($self, $value) = @_;
462 $CFG->{fow_smooth} = $value; 494 $CFG->{fow_smooth} = $value;
463 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 495 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
464 0 496 0
465 } 497 }
466 ); 498 );
467 499
468 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
469 $table->add (1, $row++, new CFClient::UI::Slider 501 $table->add (1, $row++, new CFPlus::UI::Slider
470 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
471 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 503 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
472 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 504 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
473 ); 505 );
474 506
475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
476 $table->add (1, $row++, new CFClient::UI::Slider 508 $table->add (1, $row++, new CFPlus::UI::Slider
477 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 510 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
479 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
480 ); 512 );
481 513
482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 514 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
483 $table->add (1, $row++, new CFClient::UI::Slider 515 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 517 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
486 on_changed => sub { 518 on_changed => sub {
487 $CFG->{gauge_fontsize} = $_[1]; 519 $CFG->{gauge_fontsize} = $_[1];
488 &set_gauge_window_fontsize; 520 &set_gauge_window_fontsize;
489 0 521 0
490 } 522 }
491 ); 523 );
492 524
493 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
494 $table->add (1, $row++, new CFClient::UI::Slider 526 $table->add (1, $row++, new CFPlus::UI::Slider
495 range => [$CFG->{gauge_size}, 0.2, 0.8], 527 range => [$CFG->{gauge_size}, 0.2, 0.8],
496 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 528 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
497 on_changed => sub { 529 on_changed => sub {
498 $CFG->{gauge_size} = $_[1]; 530 $CFG->{gauge_size} = $_[1];
499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0 532 0
501 } 533 }
502 ); 534 );
503 535
504 $table->add (1, $row++, new CFClient::UI::Button 536 $table->add (1, $row++, new CFPlus::UI::Button
505 expand => 1, align => 0, text => "Apply", 537 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings", 538 tooltip => "Apply the video settings",
507 on_activate => sub { 539 on_activate => sub {
508 video_shutdown (); 540 video_shutdown ();
509 video_init (); 541 video_init ();
… …
513 545
514 $vbox 546 $vbox
515} 547}
516 548
517sub audio_setup { 549sub audio_setup {
518 my $vbox = new CFClient::UI::VBox; 550 my $vbox = new CFPlus::UI::VBox;
519 551
520 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 552 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
521 553
522 my $row = 0; 554 my $row = 0;
523 555
524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 557 $table->add (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{audio_enable}, 558 state => $CFG->{audio_enable},
527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 559 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 560 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 ); 561 );
530# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 562# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
531# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 563# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
532# $CFG->{effects_volume} = $_[1]; 564# $CFG->{effects_volume} = $_[1];
533# }); 565# });
534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 566 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 567 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
536 $hbox->add (new CFClient::UI::CheckBox 568 $hbox->add (new CFPlus::UI::CheckBox
537 expand => 1, state => $CFG->{bgm_enable}, 569 expand => 1, state => $CFG->{bgm_enable},
538 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 570 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 571 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
540 ); 572 );
541 $hbox->add (new CFClient::UI::Slider 573 $hbox->add (new CFPlus::UI::Slider
542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 574 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
543 tooltip => "The volume of the background music. Changes are instant.", 575 tooltip => "The volume of the background music. Changes are instant.",
544 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 576 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
545 ); 577 );
546 578
547 $table->add (1, $row++, new CFClient::UI::Button 579 $table->add (1, $row++, new CFPlus::UI::Button
548 expand => 1, align => 0, text => "Apply", 580 expand => 1, align => 0, text => "Apply",
549 tooltip => "Apply the audio settings", 581 tooltip => "Apply the audio settings",
550 on_activate => sub { 582 on_activate => sub {
551 audio_shutdown (); 583 audio_shutdown ();
552 audio_init (); 584 audio_init ();
… …
564} 596}
565 597
566sub make_gauge_window { 598sub make_gauge_window {
567 my $gh = int $HEIGHT * $CFG->{gauge_size}; 599 my $gh = int $HEIGHT * $CFG->{gauge_size};
568 600
569 my $win = new CFClient::UI::Frame ( 601 my $win = new CFPlus::UI::Frame (
570 force_x => 0, 602 force_x => 0,
571 force_y => "max", 603 force_y => "max",
572 force_w => $WIDTH, 604 force_w => $WIDTH,
573 force_h => $gh, 605 force_h => $gh,
574 ); 606 );
575 607
576 $win->add (my $hbox = new CFClient::UI::HBox 608 $win->add (my $hbox = new CFPlus::UI::HBox
577 children => [ 609 children => [
578 (new CFClient::UI::HBox expand => 1), 610 (new CFPlus::UI::HBox expand => 1),
579 (new CFClient::UI::VBox children => [ 611 (new CFPlus::UI::VBox children => [
580 (new CFClient::UI::Empty expand => 1), 612 (new CFPlus::UI::Empty expand => 1),
581 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 613 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
582 ]), 614 ]),
583 (my $vbox = new CFClient::UI::VBox), 615 (my $vbox = new CFPlus::UI::VBox),
584 ], 616 ],
585 ); 617 );
586 618
587 $vbox->add (new CFClient::UI::HBox 619 $vbox->add (new CFPlus::UI::HBox
588 expand => 1, 620 expand => 1,
589 children => [ 621 children => [
590 (new CFClient::UI::Empty expand => 1), 622 (new CFPlus::UI::Empty expand => 1),
591 (my $hb = new CFClient::UI::HBox), 623 (my $hb = new CFPlus::UI::HBox),
592 ], 624 ],
593 ); 625 );
594 626
595 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp',
596 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment."); 628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
597 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana',
598 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana."); 630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
599 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace',
600 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods."); 632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
601 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food',
602 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too."); 634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
603 635
604 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
605 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
606 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 638 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
607 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
608 640
609 $GAUGES = { 641 $GAUGES = {
610 exp => $exp, win => $win, range => $rng, 642 exp => $exp, win => $win, range => $rng,
611 food => $fg, mana => $mg, hp => $hg, grace => $gg 643 food => $fg, mana => $mg, hp => $hg, grace => $gg
… …
615 647
616 $win 648 $win
617} 649}
618 650
619sub debug_setup { 651sub debug_setup {
620 my $table = new CFClient::UI::Table; 652 my $table = new CFPlus::UI::Table;
621 653
622 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 654 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
623 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 655 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
624 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 656 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
625 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
626 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 658 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
627 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 659 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
628 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 660 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
629 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 661 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
630 662
631 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
632 664
633 for my $x (0..2) { 665 for my $x (0..2) {
634 for my $y (0 .. 2) { 666 for my $y (0 .. 2) {
635 $table->add ($x + 3, $y, 667 $table->add ($x + 3, $y,
636 new CFClient::UI::Entry 668 new CFPlus::UI::Entry
637 text => $default_smooth[$x * 3 + $y], 669 text => $default_smooth[$x * 3 + $y],
638 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
639 ); 671 );
640 } 672 }
641 } 673 }
… …
643 675
644 $table 676 $table
645} 677}
646 678
647sub stats_window { 679sub stats_window {
680 my $r = new CFPlus::UI::ScrolledWindow (
681 expand => 1,
682 scroll_y => 1
683 );
648 my $vb = new CFClient::UI::VBox; 684 $r->add (my $vb = new CFPlus::UI::VBox);
649 685
650 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
651 can_hover => 1, can_events => 1, 687 can_hover => 1, can_events => 1,
652 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
653 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 689 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
654 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
655 tooltip => "The map you are currently on (if supported by the server)."); 691 tooltip => "The map you are currently on (if supported by the server).");
656 692
657 $vb->add (my $hb0 = new CFClient::UI::HBox); 693 $vb->add (my $hb0 = new CFPlus::UI::HBox);
658 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 694 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
659 can_hover => 1, can_events => 1, 695 can_hover => 1, can_events => 1,
660 tooltip => "The weight of the player including all inventory items."); 696 tooltip => "The weight of the player including all inventory items.");
661 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 697 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
662 can_hover => 1, can_events => 1, 698 can_hover => 1, can_events => 1,
663 tooltip => "The weight limit: you cannot carry more than this."); 699 tooltip => "The weight limit: you cannot carry more than this.");
664 700
665
666 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
667 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
668 703
669 my $color2 = [1, 1, 0]; 704 my $color2 = [1, 1, 0];
670 705
671 for ( 706 for (
672 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 707 [0, 0, st_str => "Str", 30],
673 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 708 [0, 1, st_dex => "Dex", 30],
674 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 709 [0, 2, st_con => "Con", 30],
675 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 710 [0, 3, st_int => "Int", 30],
676 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 711 [0, 4, st_wis => "Wis", 30],
677 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 712 [0, 5, st_pow => "Pow", 30],
678 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 713 [0, 6, st_cha => "Cha", 30],
679 714
680 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 715 [2, 0, st_wc => "Wc", -120],
681 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 716 [2, 1, st_ac => "Ac", -120],
682 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 717 [2, 2, st_dam => "Dam", 120],
683 [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. This is the same as the physical resistance."], 718 [2, 3, st_arm => "Arm", 120],
684 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 719 [2, 4, st_spd => "Spd", 10.54],
685 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 720 [2, 5, st_wspd => "WSp", 10.54],
686 ) { 721 ) {
687 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 722 my ($col, $row, $id, $label, $template) = @$_;
688 723
689 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
690 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label});
691 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
692 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label});
693 } 730 }
694 731
695 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
696 733
697 my $row = 0; 734 my $row = 0;
698 my $col = 0; 735 my $col = 0;
699 736
700 my %resist_names = ( 737 my %resist_names = (
… …
739 drain acid pois para deat phys 776 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 777 blind fear tund elec cold ghit/)
741 { 778 {
742 $tbl2->add ($col, $row, 779 $tbl2->add ($col, $row,
743 $STATWIDS->{"res_$_"} = 780 $STATWIDS->{"res_$_"} =
744 new CFClient::UI::Label 781 new CFPlus::UI::Label
745 font => $FONT_FIXED, 782 font => $FONT_FIXED,
746 template => "-100%", 783 template => "-100%",
747 align => +1, 784 align => +1,
748 valign => 0, 785 valign => 0,
749 can_events => 1, 786 can_events => 1,
750 can_hover => 1, 787 can_hover => 1,
751 tooltip => $resist_names{$_}->[1], 788 tooltip => $resist_names{$_}->[1],
752 ); 789 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 790 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
754 font => $FONT_FIXED, 791 font => $FONT_FIXED,
755 can_hover => 1, 792 can_hover => 1,
756 can_events => 1, 793 can_events => 1,
757 path => "ui/resist/resist_$_.png", 794 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}->[1], 795 tooltip => $resist_names{$_}->[1],
759 ); 796 );
760 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 797 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
761 text => $resist_names{$_}->[0], 798 text => $resist_names{$_}->[0],
762 font => $FONT_FIXED, 799 font => $FONT_FIXED,
763 can_hover => 1, 800 can_hover => 1,
764 can_events => 1, 801 can_events => 1,
765 tooltip => $resist_names{$_}->[1], 802 tooltip => $resist_names{$_}->[1],
… …
770 $col += 3; 807 $col += 3;
771 $row = 0; 808 $row = 0;
772 } 809 }
773 } 810 }
774 811
775 update_stats_window ({}); 812 #update_stats_window ({});
776 813
777 $vb 814 $r
778} 815}
779 816
780sub skill_window { 817sub skill_window {
781 my ($self) = @_; 818 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
782 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1; 819 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
820 $sw
783} 821}
784 822
785sub formsep($) { 823sub formsep($) {
786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
787} 825}
788 826
789sub update_stats_window {
790 my ($stats) = @_;
791
792 # I love text protocols...
793
794 my $hp = $stats->{+CS_STAT_HP} * 1;
795 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
796 my $sp = $stats->{+CS_STAT_SP} * 1;
797 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
798 my $fo = $stats->{+CS_STAT_FOOD} * 1;
799 my $fo_m = 999;
800 my $gr = $stats->{+CS_STAT_GRACE} * 1;
801 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
802
803 $GAUGES->{hp} ->set_value ($hp, $hp_m);
804 $GAUGES->{mana} ->set_value ($sp, $sp_m);
805 $GAUGES->{food} ->set_value ($fo, $fo_m);
806 $GAUGES->{grace} ->set_value ($gr, $gr_m);
807 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
808 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
809 my $rng = $stats->{+CS_STAT_RANGE};
810 $rng =~ s/^Range: //; # thank you so much dear server
811 $GAUGES->{range} ->set_text ("Rng: " . $rng);
812 my $title = $stats->{+CS_STAT_TITLE};
813 $title =~ s/^Player: //;
814 $STATWIDS->{title} ->set_text ("Title: " . $title);
815
816 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
817 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
818 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
819 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
820 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
821 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
822 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
823 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
824 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
825 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
826 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
827 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
828 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
829
830 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
831
832 my %tbl = (
833 phys => CS_STAT_RES_PHYS,
834 magic => CS_STAT_RES_MAG,
835 fire => CS_STAT_RES_FIRE,
836 elec => CS_STAT_RES_ELEC,
837 cold => CS_STAT_RES_COLD,
838 conf => CS_STAT_RES_CONF,
839 acid => CS_STAT_RES_ACID,
840 drain => CS_STAT_RES_DRAIN,
841 ghit => CS_STAT_RES_GHOSTHIT,
842 pois => CS_STAT_RES_POISON,
843 slow => CS_STAT_RES_SLOW,
844 para => CS_STAT_RES_PARA,
845 tund => CS_STAT_TURN_UNDEAD,
846 fear => CS_STAT_RES_FEAR,
847 depl => CS_STAT_RES_DEPLETE,
848 deat => CS_STAT_RES_DEATH,
849 holyw => CS_STAT_RES_HOLYWORD,
850 blind => CS_STAT_RES_BLIND,
851 );
852
853 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
854 my $sktbl = $STATWIDS->{_skill_tbl};
855 $sktbl->clear;
856
857 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
858 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
859 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
860
861 my @skills;
862
863 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
864 push @skills, [$i, $::CONN->{skill_info}{$i}];
865 }
866
867 my $y = 1;
868 for (sort { $a->[1] cmp $b->[1] } @skills) {
869 my ($idx, $name) = @$_;
870
871 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
872 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
874 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
875 }
876 }
877
878 $STATWIDS->{_skill_tbl_init} = 1;
879 }
880
881 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
882 if (exists $stats->{$i}) {
883 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
884 if $STATWIDS->{"sk_xp_$i"};
885 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
886 if $STATWIDS->{"sk_lvl_$i"};
887 }
888 }
889
890 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
891 for keys %tbl;
892}
893
894my $METASERVER_ATIME; 827my $METASERVER_ATIME;
895 828
896sub update_metaserver { 829sub update_metaserver {
897 my ($metaserver_dialog) = @_; 830 my ($metaserver_dialog) = @_;
898 831
… …
902 return if $METASERVER_ATIME > time; 835 return if $METASERVER_ATIME > time;
903 $METASERVER_ATIME = time + 60; 836 $METASERVER_ATIME = time + 60;
904 837
905 my $table = $METASERVER->{table}; 838 my $table = $METASERVER->{table};
906 $table->clear; 839 $table->clear;
907 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
908 841
909 my $buf; 842 my $buf;
910 843
911 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
912 845
… …
935 "The time this server has been running without being restarted.", 868 "The time this server has been running without being restarted.",
936 "The server software version - a '+' indicates a Crossfire+ server.", 869 "The server software version - a '+' indicates a Crossfire+ server.",
937 "Short information about this server provided by its admins.", 870 "Short information about this server provided by its admins.",
938 ); 871 );
939 my @col = qw(#Users Host Uptime Version Description); 872 my @col = qw(#Users Host Uptime Version Description);
940 $table->add ($_, 0, new CFClient::UI::Label 873 $table->add ($_, 0, new CFPlus::UI::Label
941 can_hover => 1, can_events => 1, 874 can_hover => 1, can_events => 1,
942 align => 0, fg => [1, 1, 0], 875 align => 0, fg => [1, 1, 0],
943 text => $col[$_], tooltip => $tip[$_]) 876 text => $col[$_], tooltip => $tip[$_])
944 for 0 .. $#col; 877 for 0 .. $#col;
945 878
… …
966 899
967 $m = [$users, $host, $uptime, $version, $desc]; 900 $m = [$users, $host, $uptime, $version, $desc];
968 901
969 $y++; 902 $y++;
970 903
971 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 904 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
972 (new CFClient::UI::Button 905 (new CFPlus::UI::Button
973 text => "Use", 906 text => "Use",
974 tooltip => "Put this server into the <b>Host:Port</b> field", 907 tooltip => "Put this server into the <b>Host:Port</b> field",
975 on_activate => sub { 908 on_activate => sub {
976 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
977 $METASERVER->hide; 910 $METASERVER->hide;
978 0 911 0
979 }, 912 },
980 ), 913 ),
981 (new CFClient::UI::Empty expand => 1), 914 (new CFPlus::UI::Empty expand => 1),
982 ]); 915 ]);
983 916
984 $table->add ($_, $y, new CFClient::UI::Label 917 $table->add ($_, $y, new CFPlus::UI::Label
985 ellipsise => 0, 918 ellipsise => 0,
986 align => $align[$_], 919 align => $align[$_],
987 text => $m->[$_], 920 text => $m->[$_],
988 tooltip => $tip[$_], 921 tooltip => $tip[$_],
989 can_hover => 1, 922 can_hover => 1,
… …
994 } 927 }
995 }); 928 });
996} 929}
997 930
998sub metaserver_dialog { 931sub metaserver_dialog {
999 my $vbox = new CFClient::UI::VBox; 932 my $vbox = new CFPlus::UI::VBox;
1000 my $table = new CFClient::UI::Table; 933 my $table = new CFPlus::UI::Table;
1001 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1002 935
1003 my $dialog = new CFClient::UI::FancyFrame 936 my $dialog = new CFPlus::UI::FancyFrame
1004 title => "Server List", 937 title => "Server List",
1005 name => 'metaserver_dialog', 938 name => 'metaserver_dialog',
1006 x => 'center', 939 x => 'center',
1007 y => 'center', 940 y => 'center',
1008 z => 3, 941 z => 3,
… …
1018 951
1019 $dialog 952 $dialog
1020} 953}
1021 954
1022sub server_setup { 955sub server_setup {
1023 my $vbox = new CFClient::UI::VBox; 956 my $vbox = new CFPlus::UI::VBox;
1024 957
1025 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
1026 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1027 960
1028 { 961 {
1029 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
1030 963
1031 $vbox->add ( 964 $vbox->add (
1032 $HOST_ENTRY = new CFClient::UI::Entry 965 $HOST_ENTRY = new CFPlus::UI::Entry
1033 expand => 1, 966 expand => 1,
1034 text => $CFG->{profile}{default}{host}, 967 text => $CFG->{profile}{default}{host},
1035 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 968 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1036 on_changed => sub { 969 on_changed => sub {
1037 my ($self, $value) = @_; 970 my ($self, $value) = @_;
1038 $CFG->{profile}{default}{host} = $value; 971 $CFG->{profile}{default}{host} = $value;
1039 0 972 0
1040 } 973 }
1041 ); 974 );
1042 975
1043 $vbox->add (new CFClient::UI::Button 976 $vbox->add (new CFPlus::UI::Button
1044 expand => 1, 977 expand => 1,
1045 text => "Server List", 978 text => "Server List",
1046 other => $METASERVER, 979 other => $METASERVER,
1047 tooltip => "Show a list of available crossfire servers", 980 tooltip => "Show a list of available crossfire servers",
1048 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 981 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1049 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1050 ); 983 );
1051 } 984 }
1052 985
1053 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 986 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1054 $table->add (1, 4, new CFClient::UI::Entry 987 $table->add (1, 4, new CFPlus::UI::Entry
1055 text => $CFG->{profile}{default}{user}, 988 text => $CFG->{profile}{default}{user},
1056 tooltip => "The name of your character on the server", 989 tooltip => "The name of your character on the server",
1057 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1058 ); 991 );
1059 992
1060 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 993 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1061 $table->add (1, 5, new CFClient::UI::Entry 994 $table->add (1, 5, new CFPlus::UI::Entry
1062 text => $CFG->{profile}{default}{password}, 995 text => $CFG->{profile}{default}{password},
1063 hidden => 1, 996 hidden => 1,
1064 tooltip => "The password for your character", 997 tooltip => "The password for your character",
1065 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1066 ); 999 );
1067 1000
1068 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1001 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1069 $table->add (1, 7, new CFClient::UI::Slider 1002 $table->add (1, 7, new CFPlus::UI::Slider
1070 force_w => 100, 1003 force_w => 100,
1071 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1004 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1072 tooltip => "This is the size of the portion of the map update the server sends you. " 1005 tooltip => "This is the size of the portion of the map update the server sends you. "
1073 . "If you set this to a high value you will be able to see further, " 1006 . "If you set this to a high value you will be able to see further, "
1074 . "but you also increase bandwidth requirements and latency. " 1007 . "but you also increase bandwidth requirements and latency. "
1075 . "This option is only used once at log-in.", 1008 . "This option is only used once at log-in.",
1076 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1077 ); 1010 );
1078 1011
1079 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1012 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1080 $table->add (1, 8, new CFClient::UI::CheckBox 1013 $table->add (1, 8, new CFPlus::UI::CheckBox
1081 state => $CFG->{face_prefetch}, 1014 state => $CFG->{face_prefetch},
1082 tooltip => "<b>Background Image Prefetch</b>\n\n" 1015 tooltip => "<b>Background Image Prefetch</b>\n\n"
1083 . "If enabled, the client automatically pre-fetches images from the server. " 1016 . "If enabled, the client automatically pre-fetches images from the server. "
1084 . "This might increase or create lag, but increases the chances " 1017 . "This might increase or create lag, but increases the chances "
1085 . "of faces being ready for display when you encounter them. " 1018 . "of faces being ready for display when you encounter them. "
… …
1087 . "so only set it if you really need to prefetch images. " 1020 . "so only set it if you really need to prefetch images. "
1088 . "This option can be set and unset any time.", 1021 . "This option can be set and unset any time.",
1089 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1090 ); 1023 );
1091 1024
1092 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1025 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1093 $table->add (1, 9, new CFClient::UI::Entry 1026 $table->add (1, 9, new CFPlus::UI::Entry
1094 text => $CFG->{output_count}, 1027 text => $CFG->{output_count},
1095 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1096 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1097 ); 1030 );
1098 1031
1099 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1032 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1100 $table->add (1, 10, new CFClient::UI::Entry 1033 $table->add (1, 10, new CFPlus::UI::Entry
1101 text => $CFG->{output_sync}, 1034 text => $CFG->{output_sync},
1102 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1035 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1103 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1104 ); 1037 );
1105 1038
1106 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1107 expand => 1, 1040 expand => 1,
1108 align => 0, 1041 align => 0,
1109 text => "Login", 1042 text => "Login",
1110 on_activate => sub { 1043 on_activate => sub {
1111 $CONN ? stop_game 1044 $CONN ? stop_game
1112 : start_game; 1045 : start_game;
1113 0 1046 0
1114 }, 1047 },
1115 ); 1048 );
1116 1049
1117 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1118 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1119 text => $CFG->{say_command}, 1052 text => $CFG->{say_command},
1120 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1053 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1121 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1122 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1123 on_changed => sub { 1056 on_changed => sub {
… …
1125 $CFG->{say_command} = $value; 1058 $CFG->{say_command} = $value;
1126 0 1059 0
1127 } 1060 }
1128 ); 1061 );
1129 1062
1130 $vbox->add (new CFClient::UI::Label 1063 $vbox->add (new CFPlus::UI::Label
1131 text => "Server Info", 1064 text => "Server Info",
1132 fontsize => 1.2, 1065 fontsize => 1.2,
1133 padding_y => 8, 1066 padding_y => 8,
1134 fg => [1, 1, 0, 1], 1067 fg => [1, 1, 0, 1],
1135 ); 1068 );
1136 1069
1137 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1138 1071
1139 $vbox 1072 $vbox
1140} 1073}
1141 1074
1142sub message_window { 1075sub message_window {
1143 my $window = new CFClient::UI::FancyFrame 1076 my $window = new CFPlus::UI::FancyFrame
1144 name => "message_window", 1077 name => "message_window",
1145 title => "Messages", 1078 title => "Messages",
1146 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1147 x => "max", 1080 x => "max",
1148 y => 0, 1081 y => 0,
1149 force_w => $::WIDTH * 0.4, 1082 force_w => $::WIDTH * 0.4,
1150 force_h => $::HEIGHT * 0.5, 1083 force_h => $::HEIGHT * 0.5,
1151 child => (my $vbox = new CFClient::UI::VBox), 1084 child => (my $vbox = new CFPlus::UI::VBox),
1152 has_close_button => 1; 1085 has_close_button => 1;
1153 1086
1154 $vbox->add ($LOGVIEW); 1087 $vbox->add ($LOGVIEW);
1155 1088
1156 $vbox->add (my $input = new CFClient::UI::Entry 1089 $vbox->add (my $input = new CFPlus::UI::Entry
1157 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1090 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1158 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1091 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1159 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1092 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1160 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1093 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1161 on_focus_in => sub { 1094 on_focus_in => sub {
… …
1200 }; 1133 };
1201 1134
1202 $window 1135 $window
1203} 1136}
1204 1137
1138sub open_string_query {
1139 my $cb = $_[1];
1140 my $dialog = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 force_w => $WIDTH * 4/5,
1145 title => $_[0];
1146
1147 $dialog->add (
1148 my $e = new CFPlus::UI::Entry
1149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1151 );
1152
1153 $e->grab_focus;
1154 $dialog->show;
1155}
1156
1205sub open_quit_dialog { 1157sub open_quit_dialog {
1206 unless ($QUIT_DIALOG) { 1158 unless ($QUIT_DIALOG) {
1207 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1208 x => "center", 1160 x => "center",
1209 y => "center", 1161 y => "center",
1210 z => 50, 1162 z => 50,
1211 title => "Really Quit?", 1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1212 ; 1168 ;
1213 1169
1214 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1215 1171
1216 $vb->add (new CFClient::UI::Label 1172 $vb->add (new CFPlus::UI::Label
1217 text => "You should find a savebed and apply it first!", 1173 text => "You should find a savebed and apply it first!",
1218 max_w => $WIDTH * 0.25, 1174 max_w => $WIDTH * 0.25,
1219 ellipsize => 0, 1175 ellipsize => 0,
1220 ); 1176 );
1221 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1222 $hb->add (new CFClient::UI::Button 1178 $hb->add (new CFPlus::UI::Button
1223 text => "Ok", 1179 text => "Ok",
1224 expand => 1, 1180 expand => 1,
1225 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1226 ); 1182 );
1227 $hb->add (new CFClient::UI::Button 1183 $hb->add (new CFPlus::UI::Button
1228 text => "Quit anyway", 1184 text => "Quit anyway",
1229 expand => 1, 1185 expand => 1,
1230 on_activate => sub { exit }, 1186 on_activate => sub { exit },
1231 ); 1187 );
1232 } 1188 }
1233 1189
1234 $QUIT_DIALOG->show; 1190 $QUIT_DIALOG->show;
1191 $QUIT_DIALOG->grab_focus;
1235} 1192}
1236 1193
1237sub autopickup_setup { 1194sub autopickup_setup {
1238 my $table = new CFClient::UI::Table; 1195 my $table = new CFPlus::UI::Table;
1239 1196
1240 for ( 1197 for (
1241 ["General", 0, 0, 1198 ["General", 0, 0,
1242 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1199 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1243 ["Inhibit autopickup" => PICKUP_INHIBIT], 1200 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1277 ], 1234 ],
1278 ["Weight/Value ratio", 2, 17] 1235 ["Weight/Value ratio", 2, 17]
1279 ) 1236 )
1280 { 1237 {
1281 my ($title, $x, $y, @bits) = @$_; 1238 my ($title, $x, $y, @bits) = @$_;
1282 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1239 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1283 1240
1284 for (@bits) { 1241 for (@bits) {
1285 ++$y; 1242 ++$y;
1286 1243
1287 my $mask = $_->[1]; 1244 my $mask = $_->[1];
1288 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1245 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1289 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1246 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1290 state => $::CFG->{pickup} & $mask, 1247 state => $::CFG->{pickup} & $mask,
1291 on_changed => sub { 1248 on_changed => sub {
1292 my ($box, $value) = @_; 1249 my ($box, $value) = @_;
1293 1250
1294 if ($value) { 1251 if ($value) {
… …
1305 1262
1306 ${$_->[2]} = $checkbox if $_->[2]; 1263 ${$_->[2]} = $checkbox if $_->[2];
1307 } 1264 }
1308 } 1265 }
1309 1266
1310 $table->add (2, 18, new CFClient::UI::ValSlider 1267 $table->add (2, 18, new CFPlus::UI::ValSlider
1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1268 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312 template => ">= 99", 1269 template => ">= 99",
1313 to_value => sub { ">= " . 5 * $_[0] }, 1270 to_value => sub { ">= " . 5 * $_[0] },
1314 on_changed => sub { 1271 on_changed => sub {
1315 my ($slider, $value) = @_; 1272 my ($slider, $value) = @_;
… …
1318 $::CFG->{pickup} |= int $value 1275 $::CFG->{pickup} |= int $value
1319 if $value; 1276 if $value;
1320 1; 1277 1;
1321 }); 1278 });
1322 1279
1323 $table->add (3, 18, new CFClient::UI::Button 1280 $table->add (3, 18, new CFPlus::UI::Button
1324 text => "set", 1281 text => "set",
1325 on_activate => sub { 1282 on_activate => sub {
1326 $::CONN->send_command ("pickup $::CFG->{pickup}") 1283 $::CONN->send_command ("pickup $::CFG->{pickup}")
1327 if defined $::CONN; 1284 if defined $::CONN;
1328 0 1285 0
1329 }); 1286 });
1330 1287
1331 $table 1288 $table
1332} 1289}
1333 1290
1291my %SORT_ORDER = (
1292 type => undef,
1293 mtime => sub { sort {
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime}
1296 or $a->{type} <=> $b->{type}
1297 } @_ },
1298 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type}
1301 } @_ },
1302);
1303
1334sub inventory_widget { 1304sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1; 1305 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1336 1306
1337 $hb->add (my $vb1 = new CFClient::UI::VBox); 1307 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1308 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1309
1310 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1311
1312 use sort 'stable';
1313
1314 $hb1->add (new CFPlus::UI::Selector
1315 value => $::CFG->{inv_sort},
1316 options => [
1317 [type => "Type/Name"],
1318 [mtime => "Recent/Normal/Locked"],
1319 [weight => "Weight/Type"],
1320 ],
1321 on_changed => sub {
1322 $::CFG->{inv_sort} = $_[1];
1323 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1324 },
1325 );
1326 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1327 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1339 $vb1->add ($INV = new CFClient::UI::Inventory); 1331 $sw1->add ($INV = new CFPlus::UI::Inventory);
1340 1332
1341 $hb->add (my $vb2 = new CFClient::UI::VBox); 1333 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1342 1334
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1344 1336
1337 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1345 $vb2->add ($INVR = new CFClient::UI::Inventory); 1338 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1346 1339
1347 # XXX: Call after $INVR = ... because set_opencont sets the items 1340 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1341 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1349 1342
1350 $hb 1343 $hb
1351} 1344}
1352 1345
1353sub toggle_player_page { 1346sub toggle_player_page {
… …
1360 $PL_WINDOW->show; 1353 $PL_WINDOW->show;
1361 } 1354 }
1362} 1355}
1363 1356
1364sub player_window { 1357sub player_window {
1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1366 x => "center", 1359 x => "center",
1367 y => "center", 1360 y => "center",
1368 force_w => $WIDTH * 9/10, 1361 force_w => $WIDTH * 9/10,
1369 force_h => $HEIGHT * 9/10, 1362 force_h => $HEIGHT * 9/10,
1370 title => "Player", 1363 title => "Player",
… …
1372 has_close_button => 1 1365 has_close_button => 1
1373 ; 1366 ;
1374 1367
1375 my $ntb = 1368 my $ntb =
1376 $PL_NOTEBOOK = 1369 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook 1370 new CFPlus::UI::Notebook expand => 1, debug => 1;
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1382 1371
1383 $ntb->add ( 1372 $ntb->add (
1384 "Stats" => $STATS_PAGE = stats_window, 1373 "Statistics (F2)" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown." 1374 "Shows statistics, where all your Stats and Resistances are shown."
1386 ); 1375 );
1387 $ntb->add ( 1376 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window, 1377 "Skills (F3)" => $SKILL_PAGE = skill_window,
1389 "Shows all your Skills." 1378 "Shows all your Skills."
1390 ); 1379 );
1380
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1391 $ntb->add ( 1383 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1384 "Spellbook (F4)" => $spellsw,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1385 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 ); 1386 );
1395 $ntb->add ( 1387 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget, 1388 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1389 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1390 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 ); 1391 );
1400 1392
1401 $ntb->set_current_page ($INVENTORY_PAGE); 1393 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1407sub update_bindings { 1399sub update_bindings {
1408 $BIND_UPD_CB->() if $BIND_UPD_CB; 1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1409} 1401}
1410 1402
1411sub keyboard_setup { 1403sub keyboard_setup {
1412 my $binding_list = new CFClient::UI::VBox; 1404 my $binding_list = new CFPlus::UI::VBox;
1413 1405
1414 my $refresh; 1406 my $refresh;
1415 $refresh = $BIND_UPD_CB = sub { 1407 $refresh = $BIND_UPD_CB = sub {
1416 $binding_list->clear (); 1408 $binding_list->clear ();
1417 1409
… …
1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1422 1414
1423 my $lbl = join "; ", @$cmds; 1415 my $lbl = join "; ", @$cmds;
1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1425 $binding_list->add (my $hb = new CFClient::UI::HBox); 1417 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1426 $hb->add (new CFClient::UI::Button 1418 $hb->add (new CFPlus::UI::Button
1427 text => "delete", 1419 text => "delete",
1428 tooltip => "Deletes the binding", 1420 tooltip => "Deletes the binding",
1429 on_activate => sub { 1421 on_activate => sub {
1430 $binding_list->remove ($hb); 1422 $binding_list->remove ($hb);
1431 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432 0 1424 0
1433 }); 1425 });
1434 1426
1435 $hb->add (new CFClient::UI::Button 1427 $hb->add (new CFPlus::UI::Button
1436 text => "edit", 1428 text => "edit",
1437 tooltip => "Edits the binding", 1429 tooltip => "Edits the binding",
1438 on_activate => sub { 1430 on_activate => sub {
1439 $::BIND_EDITOR->set_binding ( 1431 $::BIND_EDITOR->set_binding (
1440 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1453 $::BIND_EDITOR->show; 1445 $::BIND_EDITOR->show;
1454 $SETUP_DIALOG->hide; 1446 $SETUP_DIALOG->hide;
1455 0 1447 0
1456 }); 1448 });
1457 1449
1458 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1450 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1459 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1451 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1460 } 1452 }
1461 } 1453 }
1462 }; 1454 };
1463 1455
1464 my $vb = new CFClient::UI::VBox; 1456 my $vb = new CFPlus::UI::VBox;
1465 $vb->add (my $hb = new CFClient::UI::HBox); 1457 $vb->add (my $hb = new CFPlus::UI::HBox);
1466 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1458 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1467 $hb->add (new CFClient::UI::CheckBox 1459 $hb->add (new CFPlus::UI::CheckBox
1468 expand => 1, 1460 expand => 1,
1469 state => $CFG->{shift_fire_stop}, 1461 state => $CFG->{shift_fire_stop},
1470 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1462 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1471 on_changed => sub { 1463 on_changed => sub {
1472 my ($cbox, $value) = @_; 1464 my ($cbox, $value) = @_;
1473 $CFG->{shift_fire_stop} = $value; 1465 $CFG->{shift_fire_stop} = $value;
1474 0 1466 0
1475 }); 1467 });
1476 1468
1477 $vb->add ($binding_list); 1469 $vb->add ($binding_list);
1478 $vb->add (my $hb = new CFClient::UI::HBox); 1470 $vb->add (my $hb = new CFPlus::UI::HBox);
1479 1471
1480 $hb->add (new CFClient::UI::Button 1472 $hb->add (new CFPlus::UI::Button
1481 text => "record new", 1473 text => "record new",
1482 expand => 1, 1474 expand => 1,
1483 tooltip => "This button opens the binding editor with an empty binding.", 1475 tooltip => "This button opens the binding editor with an empty binding.",
1484 on_activate => sub { 1476 on_activate => sub {
1485 $::BIND_EDITOR->set_binding (undef, undef, [], 1477 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1499 $::BIND_EDITOR->show; 1491 $::BIND_EDITOR->show;
1500 0 1492 0
1501 }, 1493 },
1502 ); 1494 );
1503 1495
1504 $hb->add (new CFClient::UI::Button 1496 $hb->add (new CFPlus::UI::Button
1505 text => "close", 1497 text => "close",
1506 tooltip => "Closes the binding window", 1498 tooltip => "Closes the binding window",
1507 expand => 1, 1499 expand => 1,
1508 on_activate => sub { 1500 on_activate => sub {
1509 $SETUP_DIALOG->hide; 1501 $SETUP_DIALOG->hide;
… …
1515 1507
1516 $vb 1508 $vb
1517} 1509}
1518 1510
1519sub help_window { 1511sub help_window {
1520 my $win = new CFClient::UI::FancyFrame 1512 my $win = new CFPlus::UI::FancyFrame
1521 x => 'center', 1513 x => 'center',
1522 y => 'center', 1514 y => 'center',
1523 z => 2, 1515 z => 2,
1524 name => 'doc_browser', 1516 name => 'doc_browser',
1525 force_w => int $WIDTH * 7/8, 1517 force_w => int $WIDTH * 7/8,
1526 force_h => int $HEIGHT * 7/8, 1518 force_h => int $HEIGHT * 7/8,
1527 title => "Help Browser", 1519 title => "Help Browser",
1528 has_close_button => 1; 1520 has_close_button => 1;
1529 1521
1530 $win->add (my $vbox = new CFClient::UI::VBox); 1522 $win->add (my $vbox = new CFPlus::UI::VBox);
1531 1523
1532 $vbox->add (my $buttons = new CFClient::UI::HBox); 1524 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1534 expand => 1, fontsize => 0.8, padding_x => 4); 1526 expand => 1, fontsize => 0.8, padding_x => 4);
1535 1527
1536 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: ");
1537 $buttons->add (my $combo = new CFClient::UI::Combobox 1529 $buttons->add (my $combo = new CFPlus::UI::Selector
1538 value => undef, 1530 value => undef,
1539 options => [ 1531 options => [
1540 [intro => "Introduction"], 1532 [intro => "Introduction"],
1541 [manual => "Main Manual"], 1533 [manual => "Main Manual"],
1542 [skill_help => "Skill Reference"], 1534 [skill_help => "Skill Reference"],
… …
1545 [COPYING => "License Terms"], 1537 [COPYING => "License Terms"],
1546 ], 1538 ],
1547 on_changed => sub { 1539 on_changed => sub {
1548 my ($self, $pod) = @_; 1540 my ($self, $pod) = @_;
1549 1541
1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1552
1553 $viewer->clear; 1542 $viewer->clear;
1554 1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod);
1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558# ]);#d#
1559
1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1561 for @$pom;
1562
1563 $viewer->set_offset (0); 1544 $viewer->set_offset (0);
1564 1545
1565 0 1546 0
1566 }, 1547 },
1567 on_visibility_change => sub { 1548 on_visibility_change => sub {
… …
1575 1556
1576 $win 1557 $win
1577} 1558}
1578 1559
1579sub sdl_init { 1560sub sdl_init {
1580 CFClient::SDL_Init 1561 CFPlus::SDL_Init
1581 and die "SDL::Init failed!\n"; 1562 and die "SDL::Init failed!\n";
1582} 1563}
1583 1564
1584sub video_init { 1565sub video_init {
1585 sdl_init; 1566 sdl_init;
… …
1590 1571
1591 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1572 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1592 $FULLSCREEN = $CFG->{fullscreen}; 1573 $FULLSCREEN = $CFG->{fullscreen};
1593 $FAST = $CFG->{fast}; 1574 $FAST = $CFG->{fast};
1594 1575
1595 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1576 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1596 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1577 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1597 1578
1598 $SDL_ACTIVE = 1; 1579 $SDL_ACTIVE = 1;
1599 $LAST_REFRESH = time - 0.01; 1580 $LAST_REFRESH = time - 0.01;
1600 1581
1601 CFClient::OpenGL::init; 1582 CFPlus::OpenGL::init;
1602 1583
1603 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1584 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1604 1585
1605 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1586 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1606 1587
1607 ############################################################################# 1588 #############################################################################
1608 1589
1609 if ($DEBUG_STATUS) { 1590 if ($DEBUG_STATUS) {
1610 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1591 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1611 } else { 1592 } else {
1612 # create the widgets 1593 # create the widgets
1613 1594
1614 $DEBUG_STATUS = new CFClient::UI::Label 1595 $DEBUG_STATUS = new CFPlus::UI::Label
1615 padding => 0, 1596 padding => 0,
1616 z => 100, 1597 z => 100,
1617 force_x => "max", 1598 force_x => "max",
1618 force_y => 0; 1599 force_y => 0;
1619 $DEBUG_STATUS->show; 1600 $DEBUG_STATUS->show;
1620 1601
1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1622 1603
1623 $STATUSBOX = new CFClient::UI::Statusbox; 1604 $STATUSBOX = new CFPlus::UI::Statusbox;
1624 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1605 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1625 1606
1626 (new CFClient::UI::Frame 1607 (new CFPlus::UI::Frame
1627 bg => [0, 0, 0, 0.4], 1608 bg => [0, 0, 0, 0.4],
1628 force_x => 0, 1609 force_x => 0,
1629 force_y => "max", 1610 force_y => "max",
1630 child => $STATUSBOX, 1611 child => $STATUSBOX,
1631 )->show; 1612 )->show;
1632 1613
1633 CFClient::UI::FancyFrame->new ( 1614 CFPlus::UI::FancyFrame->new (
1634 title => "Map", 1615 title => "Map",
1635 name => "mapmap", 1616 name => "mapmap",
1636 x => 0, 1617 x => 0,
1637 y => $FONTSIZE + 8, 1618 y => $FONTSIZE + 8,
1638 border_bg => [1, 1, 1, 192/255], 1619 border_bg => [1, 1, 1, 192/255],
1639 bg => [1, 1, 1, 0], 1620 bg => [1, 1, 1, 0],
1640 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1621 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1641 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1622 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1642 ), 1623 ),
1643 )->show; 1624 )->show;
1644 1625
1645 $MAPWIDGET = new CFClient::MapWidget; 1626 $MAPWIDGET = new CFPlus::MapWidget;
1646 $MAPWIDGET->connect (activate_console => sub { 1627 $MAPWIDGET->connect (activate_console => sub {
1647 my ($mapwidget, $preset) = @_; 1628 my ($mapwidget, $preset) = @_;
1648 1629
1649 if ($CONSOLE) { 1630 if ($CONSOLE) {
1650 $CONSOLE->{input}->{auto_activated} = 1; 1631 $CONSOLE->{input}->{auto_activated} = 1;
… …
1656 } 1637 }
1657 }); 1638 });
1658 $MAPWIDGET->show; 1639 $MAPWIDGET->show;
1659 $MAPWIDGET->grab_focus; 1640 $MAPWIDGET->grab_focus;
1660 1641
1661 $LOGVIEW = new CFClient::UI::TextScroller 1642 $LOGVIEW = new CFPlus::UI::TextScroller
1662 expand => 1, 1643 expand => 1,
1663 font => $FONT_FIXED, 1644 font => $FONT_FIXED,
1664 fontsize => $::CFG->{log_fontsize}, 1645 fontsize => $::CFG->{log_fontsize},
1665 indent => -4, 1646 indent => -4,
1666 can_hover => 1, 1647 can_hover => 1,
1667 can_events => 1, 1648 can_events => 1,
1668 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1669 ; 1650 ;
1670 1651
1671 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1672 title => "Setup", 1653 title => "Setup",
1673 name => "setup_dialog", 1654 name => "setup_dialog",
1674 x => 'center', 1655 x => 'center',
1675 y => 'center', 1656 y => 'center',
1676 z => 2, 1657 z => 2,
… …
1679 has_close_button => 1, 1660 has_close_button => 1,
1680 ; 1661 ;
1681 1662
1682 $METASERVER = metaserver_dialog; 1663 $METASERVER = metaserver_dialog;
1683 1664
1684 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1685 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1666 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1686 1667
1687 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1688 "Configure the server to play on, your username, password and other server-related options."); 1669 "Configure the server to play on, your username, password and other server-related options.");
1689 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1690 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1671 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1700 . "After pressing the combo the binding will be saved automatically and the " 1681 . "After pressing the combo the binding will be saved automatically and the "
1701 . "binding editor closes"); 1682 . "binding editor closes");
1702 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1683 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1703 "Some debuggin' options. Do not ask."); 1684 "Some debuggin' options. Do not ask.");
1704 1685
1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1686 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1706 1687
1707 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1688 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1708 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1689 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1709 1690
1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1691 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1711 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1692 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1712 1693
1713 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 1694 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
1714 1695
1715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1696 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1716 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1697 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1717 1698
1718 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFPlus::UI::Button
1719 text => "Save Config", 1700 text => "Save Config",
1720 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1701 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1721 on_activate => sub { 1702 on_activate => sub {
1722 $::CFG->{layout} = CFClient::UI::get_layout; 1703 $::CFG->{layout} = CFPlus::UI::get_layout;
1723 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1704 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1724 status "Configuration Saved"; 1705 status "Configuration Saved";
1725 0 1706 0
1726 }, 1707 },
1727 ); 1708 );
1728 1709
1729 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1730 tooltip => "View Documentation"); 1711 tooltip => "View Documentation");
1731 1712
1732 $BUTTONBAR->add (new CFClient::UI::Button 1713 $BUTTONBAR->add (new CFPlus::UI::Button
1733 text => "Quit", 1714 text => "Quit",
1734 tooltip => "Terminates the program", 1715 tooltip => "Terminates the program",
1735 on_activate => sub { 1716 on_activate => sub {
1736 if ($CONN) { 1717 if ($CONN) {
1737 open_quit_dialog; 1718 open_quit_dialog;
… …
1748 1729
1749 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1750} 1731}
1751 1732
1752sub video_shutdown { 1733sub video_shutdown {
1753 CFClient::OpenGL::shutdown; 1734 CFPlus::OpenGL::shutdown;
1754 1735
1755 undef $SDL_ACTIVE; 1736 undef $SDL_ACTIVE;
1756} 1737}
1757 1738
1758my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1739my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1766 1747
1767sub audio_music_finished { 1748sub audio_music_finished {
1768 return unless $CFG->{bgm_enable}; 1749 return unless $CFG->{bgm_enable};
1769 1750
1770 # TODO: hack, do play loop and mood music 1751 # TODO: hack, do play loop and mood music
1771 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1752 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1772 $bgmusic->play (0); 1753 $bgmusic->play (0);
1773 1754
1774 push @bgmusic, shift @bgmusic; 1755 push @bgmusic, shift @bgmusic;
1775} 1756}
1776 1757
1777sub audio_init { 1758sub audio_init {
1778 if ($CFG->{audio_enable}) { 1759 if ($CFG->{audio_enable}) {
1779 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1760 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1780 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1761 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1781 1762
1782 unless ($SDL_MIXER) { 1763 unless ($SDL_MIXER) {
1783 status "Unable to open sound device: there will be no sound"; 1764 status "Unable to open sound device: there will be no sound";
1784 return; 1765 return;
1785 } 1766 }
1786 1767
1787 CFClient::Mix_AllocateChannels 8; 1768 CFPlus::Mix_AllocateChannels 8;
1788 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1789 1770
1790 audio_music_finished; 1771 audio_music_finished;
1791 1772
1792 while (<$fh>) { 1773 while (<$fh>) {
1793 next if /^\s*#/; 1774 next if /^\s*#/;
… …
1796 my ($file, $volume, $event) = split /\s+/, $_, 3; 1777 my ($file, $volume, $event) = split /\s+/, $_, 3;
1797 1778
1798 push @SOUNDS, "$volume,$file"; 1779 push @SOUNDS, "$volume,$file";
1799 1780
1800 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1781 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1801 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1782 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1802 $chunk->volume ($volume * 128 / 100); 1783 $chunk->volume ($volume * 128 / 100);
1803 $chunk 1784 $chunk
1804 }; 1785 };
1805 } 1786 }
1806 } else { 1787 } else {
… …
1808 } 1789 }
1809 } 1790 }
1810} 1791}
1811 1792
1812sub audio_shutdown { 1793sub audio_shutdown {
1813 CFClient::Mix_CloseAudio if $SDL_MIXER; 1794 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1814 undef $SDL_MIXER; 1795 undef $SDL_MIXER;
1815 @SOUNDS = (); 1796 @SOUNDS = ();
1816 %AUDIO_CHUNKS = (); 1797 %AUDIO_CHUNKS = ();
1817} 1798}
1818 1799
… …
1825 1806
1826sub force_refresh { 1807sub force_refresh {
1827 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1808 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1828 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1809 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1829 1810
1830 $CFClient::UI::ROOT->draw; 1811 $CFPlus::UI::ROOT->draw;
1831 1812
1832 $WANT_REFRESH = 0; 1813 $WANT_REFRESH = 0;
1833 $CAN_REFRESH = 0; 1814 $CAN_REFRESH = 0;
1834 $LAST_REFRESH = $NOW; 1815 $LAST_REFRESH = $NOW;
1835 1816
18360 && do {
1837 # some weird model-drawing code, just a joke right now
1838 use CFClient::OpenGL;
1839
1840 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1841 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1842 $demo{r} ||= do {
1843 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1844 $mod->{v} = pack "f*", @{$mod->{v}};
1845 $_ = [scalar @$_, pack "S!*", @$_]
1846 for values %{$mod->{g}};
1847 $mod
1848 };
1849
1850 my $r = $demo{r} or die;
1851
1852 glDepthMask 1;
1853 glClear GL_DEPTH_BUFFER_BIT;
1854 glEnable GL_TEXTURE_2D;
1855 glEnable GL_DEPTH_TEST;
1856 glEnable GL_CULL_FACE;
1857 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1858
1859 glMatrixMode GL_PROJECTION;
1860 glLoadIdentity;
1861 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1862 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1863 glMatrixMode GL_MODELVIEW;
1864 glLoadIdentity;
1865
1866 glPushMatrix;
1867 glTranslate 0, 0, -800;
1868 glScale 1, -1, 1;
1869 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1870 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1871 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1872 glScale 50, 50, 50;
1873
1874 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1875 while (my ($k, $v) = each %{$r->{g}}) {
1876 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1877 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1878 }
1879
1880 glPopMatrix;
1881
1882 glShadeModel GL_FLAT;
1883 glDisable GL_DEPTH_TEST;
1884 glDisable GL_TEXTURE_2D;
1885 glDepthMask 0;
1886
1887 $WANT_REFRESH++;
1888};
1889
1890 CFClient::SDL_GL_SwapBuffers; 1817 CFPlus::SDL_GL_SwapBuffers;
1891} 1818}
1892 1819
1893my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1820my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1894 $NOW = time; 1821 $NOW = time;
1895 1822
1896 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1823 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1897 for CFClient::SDL_PollEvent; 1824 for CFPlus::SDL_PollEvent;
1898 1825
1899 if (%animate_object) { 1826 if (%animate_object) {
1900 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1827 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1901 $WANT_REFRESH++; 1828 $WANT_REFRESH++;
1902 } 1829 }
… …
1926 $CONN->face_prefetch 1853 $CONN->face_prefetch
1927 if $CONN; 1854 if $CONN;
1928}); 1855});
1929 1856
1930%SDL_CB = ( 1857%SDL_CB = (
1931 CFClient::SDL_QUIT => sub { 1858 CFPlus::SDL_QUIT => sub {
1932 Event::unloop -1; 1859 Event::unloop -1;
1933 }, 1860 },
1934 CFClient::SDL_VIDEORESIZE => sub { 1861 CFPlus::SDL_VIDEORESIZE => sub {
1935 }, 1862 },
1936 CFClient::SDL_VIDEOEXPOSE => sub { 1863 CFPlus::SDL_VIDEOEXPOSE => sub {
1937 CFClient::UI::full_refresh; 1864 CFPlus::UI::full_refresh;
1938 }, 1865 },
1939 CFClient::SDL_ACTIVEEVENT => sub { 1866 CFPlus::SDL_ACTIVEEVENT => sub {
1940# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1941 }, 1868 },
1942 CFClient::SDL_KEYDOWN => sub { 1869 CFPlus::SDL_KEYDOWN => sub {
1943 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1944 # alt-enter 1871 # alt-enter
1945 $FULLSCREEN_ENABLE->toggle; 1872 $FULLSCREEN_ENABLE->toggle;
1946 video_shutdown; 1873 video_shutdown;
1947 video_init; 1874 video_init;
1948 } else { 1875 } else {
1949 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1876 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1950 } 1877 }
1951 }, 1878 },
1952 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1879 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1953 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1880 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1954 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1881 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1955 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1882 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1956 CFClient::SDL_USEREVENT => sub { 1883 CFPlus::SDL_USEREVENT => sub {
1957 if ($_[0]{code} == 1) { 1884 if ($_[0]{code} == 1) {
1958 audio_channel_finished $_[0]{data1}; 1885 audio_channel_finished $_[0]{data1};
1959 } elsif ($_[0]{code} == 0) { 1886 } elsif ($_[0]{code} == 0) {
1960 audio_music_finished; 1887 audio_music_finished;
1961 } 1888 }
… …
1965############################################################################# 1892#############################################################################
1966 1893
1967$SIG{INT} = $SIG{TERM} = sub { exit }; 1894$SIG{INT} = $SIG{TERM} = sub { exit };
1968 1895
1969{ 1896{
1970 local $SIG{__DIE__} = sub {
1971 return unless defined $^S && !$^S;
1972 Carp::confess $_[1];#d#TODO: remove when stable
1973 CFClient::fatal $_[0];
1974 };
1975
1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1977 CFClient::UI::set_layout ($::CFG->{layout}); 1898 CFPlus::UI::set_layout ($::CFG->{layout});
1978 1899
1979 my %DEF_CFG = ( 1900 my %DEF_CFG = (
1980 sdl_mode => 0, 1901 sdl_mode => 0,
1981 width => 640, 1902 width => 640,
1982 height => 480, 1903 height => 480,
… …
1998 bgm_volume => 0.25, 1919 bgm_volume => 0.25,
1999 face_prefetch => 0, 1920 face_prefetch => 0,
2000 output_sync => 1, 1921 output_sync => 1,
2001 output_count => 1, 1922 output_count => 1,
2002 pickup => 0, 1923 pickup => 0,
1924 inv_sort => "mtime",
2003 default => "profile", # default profile 1925 default => "profile", # default profile
2004 ); 1926 );
2005 1927
2006 while (my ($k, $v) = each %DEF_CFG) { 1928 while (my ($k, $v) = each %DEF_CFG) {
2007 $CFG->{$k} = $v unless exists $CFG->{$k}; 1929 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
2011 1933
2012 sdl_init; 1934 sdl_init;
2013 1935
2014 @SDL_MODES = reverse 1936 @SDL_MODES = reverse
2015 grep $_->[0] >= 640 && $_->[1] >= 480, 1937 grep $_->[0] >= 640 && $_->[1] >= 480,
2016 CFClient::SDL_ListModes; 1938 CFPlus::SDL_ListModes;
2017 1939
2018 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1940 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2019 1941
2020 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021 1943
2022 { 1944 {
2023 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1945 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024 DejaVuSans.ttf 1946 DejaVuSans.ttf
2025 DejaVuSansMono.ttf 1947 DejaVuSansMono.ttf
2026 DejaVuSans-Bold.ttf 1948 DejaVuSans-Bold.ttf
2027 DejaVuSansMono-Bold.ttf 1949 DejaVuSansMono-Bold.ttf
2028 DejaVuSans-Oblique.ttf 1950 DejaVuSans-Oblique.ttf
2029 DejaVuSansMono-Oblique.ttf 1951 DejaVuSansMono-Oblique.ttf
2030 DejaVuSans-BoldOblique.ttf 1952 DejaVuSans-BoldOblique.ttf
2031 DejaVuSansMono-BoldOblique.ttf 1953 DejaVuSansMono-BoldOblique.ttf
2032 ); 1954 );
2033 1955
2034 CFClient::add_font $_ for @fonts; 1956 CFPlus::add_font $_ for @fonts;
2035 1957
2036 CFClient::pango_init; 1958 CFPlus::pango_init;
2037 1959
2038 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1960 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1961 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040 1962
2041 $FONT_PROP->make_default; 1963 $FONT_PROP->make_default;
2042 } 1964 }
2043 1965
2044# compare mono (ft) vs. rgba (cairo) 1966# compare mono (ft) vs. rgba (cairo)
2045# ft - 1.8s, cairo 3s, even in alpha-only mode 1967# ft - 1.8s, cairo 3s, even in alpha-only mode
2046# for my $rgba (0..1) { 1968# for my $rgba (0..1) {
2047# my $t1 = Time::HiRes::time; 1969# my $t1 = Time::HiRes::time;
2048# for (1..1000) { 1970# for (1..1000) {
2049# my $layout = CFClient::Layout->new ($rgba); 1971# my $layout = CFPlus::Layout->new ($rgba);
2050# $layout->set_text ("hallo" x 100); 1972# $layout->set_text ("hallo" x 100);
2051# $layout->render; 1973# $layout->render;
2052# } 1974# }
2053# my $t2 = Time::HiRes::time; 1975# my $t2 = Time::HiRes::time;
2054# warn $t2-$t1; 1976# warn $t2-$t1;
… …
2057 video_init; 1979 video_init;
2058 audio_init; 1980 audio_init;
2059} 1981}
2060 1982
2061Event::loop; 1983Event::loop;
2062#CFClient::SDL_Quit; 1984#CFPlus::SDL_Quit;
2063#CFClient::_exit 0; 1985#CFPlus::_exit 0;
2064 1986
2065END { CFClient::SDL_Quit } 1987END { CFPlus::SDL_Quit }
2066 1988
2067=head1 NAME 1989=head1 NAME
2068 1990
2069cfplus - A Crossfire+ and Crossfire game client 1991cfplus - A Crossfire+ and Crossfire game client
2070 1992

Diff Legend

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