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.95 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.108 by elmex, Sun Aug 13 11:29:19 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
… …
130our $BIND_UPD_CB; 139our $BIND_UPD_CB;
131 140
132our $PICKUP_CFG; 141our $PICKUP_CFG;
133 142
134sub status { 143sub status {
135 $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]);
136} 145}
137 146
138sub debug { 147sub debug {
139 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
140} 149}
… …
146 155
147# server query dialog 156# server query dialog
148sub server_query { 157sub server_query {
149 my ($conn, $flags, $prompt) = @_; 158 my ($conn, $flags, $prompt) = @_;
150 159
151 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
152 x => "center", 161 x => "center",
153 y => "center", 162 y => "center",
154 title => "Server Query", 163 title => "Server Query",
155 child => my $vbox = new CFClient::UI::VBox, 164 child => my $vbox = new CFPlus::UI::VBox,
156 ; 165 ;
157 166
158 my @dialog = my $label = new CFClient::UI::Label 167 my @dialog = my $label = new CFPlus::UI::Label
159 max_w => $::WIDTH * 0.4, 168 max_w => $::WIDTH * 0.4,
160 ellipsise => 0, 169 ellipsise => 0,
161 text => $prompt; 170 text => $prompt;
162 171
163 if ($flags & CS_QUERY_YESNO) { 172 if ($flags & CS_QUERY_YESNO) {
164 push @dialog, my $hbox = new CFClient::UI::HBox; 173 push @dialog, my $hbox = new CFPlus::UI::HBox;
165 174
166 $hbox->add (new CFClient::UI::Button 175 $hbox->add (new CFPlus::UI::Button
167 text => "No", 176 text => "No",
168 on_activate => sub { 177 on_activate => sub {
169 $conn->send ("reply n"); 178 $conn->send ("reply n");
170 $dialog->destroy; 179 $dialog->destroy;
171 0 180 0
172 } 181 }
173 ); 182 );
174 $hbox->add (new CFClient::UI::Button 183 $hbox->add (new CFPlus::UI::Button
175 text => "Yes", 184 text => "Yes",
176 on_activate => sub { 185 on_activate => sub {
177 $conn->send ("reply y"); 186 $conn->send ("reply y");
178 destroy_query_dialog $conn; 187 destroy_query_dialog $conn;
179 0 188 0
… …
181 ); 190 );
182 191
183 $dialog->grab_focus; 192 $dialog->grab_focus;
184 193
185 } elsif ($flags & CS_QUERY_SINGLECHAR) { 194 } elsif ($flags & CS_QUERY_SINGLECHAR) {
186 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 195 $dialog->{tooltip} = "#charcreation_focus";
187 196
188 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) {
189 $MESSAGE_WINDOW->show; 198 $MESSAGE_WINDOW->show;
190 199
191 unshift @dialog, new CFClient::UI::Label 200 unshift @dialog, new CFPlus::UI::Label
192 max_w => $::WIDTH * 0.4, 201 max_w => $::WIDTH * 0.4,
193 ellipsise => 0, 202 ellipsise => 0,
194 markup => "\nOr use your keyboard:\n"; 203 markup => "\nOr use your keyboard and the text entry below:\n";
195 204
196 unshift @dialog, my $table = new CFClient::UI::Table; 205 unshift @dialog, my $table = new CFPlus::UI::Table;
197 206
198 $table->add (0, 0, new CFClient::UI::Button 207 $table->add (0, 0, new CFPlus::UI::Button
199 text => "Next Race", 208 text => "Next Race",
200 on_activate => sub { 209 on_activate => sub {
201 $conn->send ("reply n"); 210 $conn->send ("reply n");
202 destroy_query_dialog $conn; 211 destroy_query_dialog $conn;
203 0 212 0
204 }, 213 },
205 ); 214 );
206 $table->add (2, 0, new CFClient::UI::Button 215 $table->add (2, 0, new CFPlus::UI::Button
207 text => "Accept", 216 text => "Accept",
208 on_activate => sub { 217 on_activate => sub {
209 $conn->send ("reply d"); 218 $conn->send ("reply d");
210 destroy_query_dialog $conn; 219 destroy_query_dialog $conn;
211 0 220 0
212 }, 221 },
213 ); 222 );
214 223
215 unshift @dialog, new CFClient::UI::Label 224 unshift @dialog, new CFPlus::UI::Label
216 max_w => $::WIDTH * 0.4, 225 max_w => $::WIDTH * 0.4,
217 ellipsise => 0, 226 ellipsise => 0,
218 markup => 227 markup =>
219 "<big><b>Character Creation: Race</b></big>\n\n" 228 "<big><b>Character Creation: Race</b></big>\n\n"
220 . "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 "
221 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
222 . "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 "
223 . "(<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"
224 . "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 "
225 . "so you can take your time making this important choice." 234 . "this race eventually, so you can take your time making this important choice."
226 ; 235 ;
227 236
228 } elsif ($prompt =~ /roll new stats/) { 237 } elsif ($prompt =~ /roll new stats/) {
229 if (my $stat = delete $conn->{stat_change_with}) { 238 if (my $stat = delete $conn->{stat_change_with}) {
230 $conn->send ("reply $stat"); 239 $conn->send ("reply $stat");
… …
233 } 242 }
234 243
235 $STATS_PAGE->show; 244 $STATS_PAGE->show;
236 $MESSAGE_WINDOW->hide; 245 $MESSAGE_WINDOW->hide;
237 246
238 unshift @dialog, new CFClient::UI::Label 247 unshift @dialog, new CFPlus::UI::Label
239 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
240 ellipsise => 0, 249 ellipsise => 0,
241 markup => "\nOr use your keyboard:\n"; 250 markup => "\nOr use your keyboard and the text entry below:\n";
242 251
243 unshift @dialog, my $table = new CFClient::UI::Table; 252 unshift @dialog, my $table = new CFPlus::UI::Table;
244 253
245 # left: re-roll 254 # left: re-roll
246 $table->add (0, 0, new CFClient::UI::Button 255 $table->add (0, 0, new CFPlus::UI::Button
247 text => "Roll Again", 256 text => "Roll Again",
248 on_activate => sub { 257 on_activate => sub {
249 $conn->send ("reply y"); 258 $conn->send ("reply y");
250 destroy_query_dialog $conn; 259 destroy_query_dialog $conn;
251 0 260 0
252 }, 261 },
253 ); 262 );
254 263
255 # center: swap stats 264 # center: swap stats
256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 265 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266 expand => 1,
257 value => $_, 267 value => $_,
258 options => [ 268 options => [
259 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
260 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
261 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 271 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
264 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
265 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 275 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
266 ], 276 ],
267 ), 1 .. 2; 277 ), 1 .. 2;
268 278
269 $table->add (2, 0, new CFClient::UI::Button 279 $table->add (2, 0, new CFPlus::UI::Button
270 text => "Swap Stats", 280 text => "Swap Stats",
271 on_activate => sub { 281 on_activate => sub {
272 $conn->{stat_change_with} = $sw2->{value}; 282 $conn->{stat_change_with} = $sw2->{value};
273 $conn->send ("reply $sw1->{value}"); 283 $conn->send ("reply $sw1->{value}");
274 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
275 0 285 0
276 }, 286 },
277 ); 287 );
278 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 288 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
279 289
280 # right: accept 290 # right: accept
281 $table->add (4, 0, new CFClient::UI::Button 291 $table->add (4, 0, new CFPlus::UI::Button
282 text => "Accept", 292 text => "Accept",
283 on_activate => sub { 293 on_activate => sub {
284 $conn->send ("reply n"); 294 $conn->send ("reply n");
285 $STATS_PAGE->hide; 295 $STATS_PAGE->hide;
286 destroy_query_dialog $conn; 296 destroy_query_dialog $conn;
287 0 297 0
288 }, 298 },
289 ); 299 );
290 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 => "#stat_$name",
319 );
320 }
321
291 unshift @dialog, new CFClient::UI::Label 322 unshift @dialog, new CFPlus::UI::Label
292 max_w => $::WIDTH * 0.4, 323 max_w => $::WIDTH * 0.4,
293 ellipsise => 0, 324 ellipsise => 0,
294 markup => 325 markup =>
295 "<big><b>Character Creation: Stats</b></big>\n\n" 326 "<big><b>Character Creation: Stats</b></big>\n\n"
296 . "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"
297 . "(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"
298 . "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"
299 . "Race selection will influence those values later on."
300 ; 331 ;
301 } 332 }
302 333
303 push @dialog, my $entry = new CFClient::UI::Entry 334 push @dialog, my $entry = new CFPlus::UI::Entry
304 on_changed => sub { 335 on_changed => sub {
305 $conn->send ("reply $_[1]"); 336 $conn->send ("reply $_[1]");
306 destroy_query_dialog $conn; 337 destroy_query_dialog $conn;
307 0 338 0
308 }, 339 },
… …
311 $entry->grab_focus; 342 $entry->grab_focus;
312 343
313 } else { 344 } else {
314 $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)";
315 346
316 push @dialog, my $entry = new CFClient::UI::Entry 347 push @dialog, my $entry = new CFPlus::UI::Entry
317 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 348 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
318 on_activate => sub { 349 on_activate => sub {
319 $conn->send ("reply $_[1]"); 350 $conn->send ("reply $_[1]");
320 destroy_query_dialog $conn; 351 destroy_query_dialog $conn;
321 0 352 0
… …
337 368
338 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;
339 370
340 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
341 372
342 $MAP = new CFClient::Map $mapsize, $mapsize; 373 $MAP = new CFPlus::Map $mapsize, $mapsize;
343 374
344 $CONN = eval { 375 $CONN = eval {
345 new CFClient::Protocol 376 new CFPlus::Protocol
346 host => $host, 377 host => $host,
347 port => $port || 13327, 378 port => $port || 13327,
348 user => $CFG->{profile}{default}{user}, 379 user => $CFG->{profile}{default}{user},
349 pass => $CFG->{profile}{default}{password}, 380 pass => $CFG->{profile}{default}{password},
350 mapw => $mapsize, 381 mapw => $mapsize,
… …
369 $chunk->play; 400 $chunk->play;
370 }, 401 },
371 }; 402 };
372 403
373 if ($CONN) { 404 if ($CONN) {
374 CFClient::lowdelay fileno $CONN->{fh}; 405 CFPlus::lowdelay fileno $CONN->{fh};
375 406
376 status "login successful"; 407 status "login successful";
377 } else { 408 } else {
378 status "unable to connect"; 409 status "unable to connect";
379 stop_game(); 410 stop_game();
… …
397 428
398 undef $MAP; 429 undef $MAP;
399} 430}
400 431
401sub graphics_setup { 432sub graphics_setup {
402 my $vbox = new CFClient::UI::VBox; 433 my $vbox = new CFPlus::UI::VBox;
403 434
404 $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]);
405 436
406 $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");
407 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 438 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
408 439
409 $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]);
410 $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");
411 442
412 $mode_slider->connect (changed => sub { 443 $mode_slider->connect (changed => sub {
413 my ($self, $value) = @_; 444 my ($self, $value) = @_;
414 445
415 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
417 }); 448 });
418 $mode_slider->emit (changed => $mode_slider->{range}[0]); 449 $mode_slider->emit (changed => $mode_slider->{range}[0]);
419 450
420 my $row = 1; 451 my $row = 1;
421 452
422 $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");
423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
424 state => $CFG->{fullscreen}, 455 state => $CFG->{fullscreen},
425 tooltip => "Bring the client into fullscreen mode.", 456 tooltip => "Bring the client into fullscreen mode.",
426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
427 ); 458 );
428 459
429 $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");
430 $table->add (1, $row++, new CFClient::UI::CheckBox 461 $table->add (1, $row++, new CFPlus::UI::CheckBox
431 state => $CFG->{fast}, 462 state => $CFG->{fast},
432 tooltip => "Lower the visual quality considerably to speed up rendering.", 463 tooltip => "Lower the visual quality considerably to speed up rendering.",
433 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
434 ); 465 );
435 466
436 $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");
437 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFPlus::UI::Slider
438 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
439 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
440 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 }
441 ); 472 );
442 473
443 $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");
444 $table->add (1, $row++, new CFClient::UI::CheckBox 475 $table->add (1, $row++, new CFPlus::UI::CheckBox
445 state => $CFG->{fow_enable}, 476 state => $CFG->{fow_enable},
446 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.",
447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 478 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
448 ); 479 );
449 480
450 $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");
451 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFPlus::UI::Slider
452 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 483 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
453 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.",
454 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 485 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
455 ); 486 );
456 487
457 $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");
458 $table->add (1, $row++, new CFClient::UI::CheckBox 489 $table->add (1, $row++, new CFPlus::UI::CheckBox
459 state => $CFG->{fow_smooth}, 490 state => $CFG->{fow_smooth},
460 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.",
461 on_changed => sub { 492 on_changed => sub {
462 my ($self, $value) = @_; 493 my ($self, $value) = @_;
463 $CFG->{fow_smooth} = $value; 494 $CFG->{fow_smooth} = $value;
464 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;
465 0 496 0
466 } 497 }
467 ); 498 );
468 499
469 $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");
470 $table->add (1, $row++, new CFClient::UI::Slider 501 $table->add (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
472 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.",
473 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 504 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
474 ); 505 );
475 506
476 $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");
477 $table->add (1, $row++, new CFClient::UI::Slider 508 $table->add (1, $row++, new CFPlus::UI::Slider
478 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
479 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.",
480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
481 ); 512 );
482 513
483 $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");
484 $table->add (1, $row++, new CFClient::UI::Slider 515 $table->add (1, $row++, new CFPlus::UI::Slider
485 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
486 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.",
487 on_changed => sub { 518 on_changed => sub {
488 $CFG->{gauge_fontsize} = $_[1]; 519 $CFG->{gauge_fontsize} = $_[1];
489 &set_gauge_window_fontsize; 520 &set_gauge_window_fontsize;
490 0 521 0
491 } 522 }
492 ); 523 );
493 524
494 $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");
495 $table->add (1, $row++, new CFClient::UI::Slider 526 $table->add (1, $row++, new CFPlus::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 527 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 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.",
498 on_changed => sub { 529 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 530 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501 0 532 0
502 } 533 }
503 ); 534 );
504 535
505 $table->add (1, $row++, new CFClient::UI::Button 536 $table->add (1, $row++, new CFPlus::UI::Button
506 expand => 1, align => 0, text => "Apply", 537 expand => 1, align => 0, text => "Apply",
507 tooltip => "Apply the video settings", 538 tooltip => "Apply the video settings",
508 on_activate => sub { 539 on_activate => sub {
509 video_shutdown (); 540 video_shutdown ();
510 video_init (); 541 video_init ();
… …
514 545
515 $vbox 546 $vbox
516} 547}
517 548
518sub audio_setup { 549sub audio_setup {
519 my $vbox = new CFClient::UI::VBox; 550 my $vbox = new CFPlus::UI::VBox;
520 551
521 $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]);
522 553
523 my $row = 0; 554 my $row = 0;
524 555
525 $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");
526 $table->add (1, $row++, new CFClient::UI::CheckBox 557 $table->add (1, $row++, new CFPlus::UI::CheckBox
527 state => $CFG->{audio_enable}, 558 state => $CFG->{audio_enable},
528 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.",
529 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 560 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530 ); 561 );
531# $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");
532# $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 {
533# $CFG->{effects_volume} = $_[1]; 564# $CFG->{effects_volume} = $_[1];
534# }); 565# });
535 $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");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 567 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 568 $hbox->add (new CFPlus::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 569 expand => 1, state => $CFG->{bgm_enable},
539 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.",
540 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 571 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 ); 572 );
542 $hbox->add (new CFClient::UI::Slider 573 $hbox->add (new CFPlus::UI::Slider
543 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 574 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
544 tooltip => "The volume of the background music. Changes are instant.", 575 tooltip => "The volume of the background music. Changes are instant.",
545 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 }
546 ); 577 );
547 578
548 $table->add (1, $row++, new CFClient::UI::Button 579 $table->add (1, $row++, new CFPlus::UI::Button
549 expand => 1, align => 0, text => "Apply", 580 expand => 1, align => 0, text => "Apply",
550 tooltip => "Apply the audio settings", 581 tooltip => "Apply the audio settings",
551 on_activate => sub { 582 on_activate => sub {
552 audio_shutdown (); 583 audio_shutdown ();
553 audio_init (); 584 audio_init ();
… …
565} 596}
566 597
567sub make_gauge_window { 598sub make_gauge_window {
568 my $gh = int $HEIGHT * $CFG->{gauge_size}; 599 my $gh = int $HEIGHT * $CFG->{gauge_size};
569 600
570 my $win = new CFClient::UI::Frame ( 601 my $win = new CFPlus::UI::Frame (
571 force_x => 0, 602 force_x => 0,
572 force_y => "max", 603 force_y => "max",
573 force_w => $WIDTH, 604 force_w => $WIDTH,
574 force_h => $gh, 605 force_h => $gh,
575 ); 606 );
576 607
577 $win->add (my $hbox = new CFClient::UI::HBox 608 $win->add (my $hbox = new CFPlus::UI::HBox
578 children => [ 609 children => [
579 (new CFClient::UI::HBox expand => 1), 610 (new CFPlus::UI::HBox expand => 1),
580 (new CFClient::UI::VBox children => [ 611 (new CFPlus::UI::VBox children => [
581 (new CFClient::UI::Empty expand => 1), 612 (new CFPlus::UI::Empty expand => 1),
582 (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)),
583 ]), 614 ]),
584 (my $vbox = new CFClient::UI::VBox), 615 (my $vbox = new CFPlus::UI::VBox),
585 ], 616 ],
586 ); 617 );
587 618
588 $vbox->add (new CFClient::UI::HBox 619 $vbox->add (new CFPlus::UI::HBox
589 expand => 1, 620 expand => 1,
590 children => [ 621 children => [
591 (new CFClient::UI::Empty expand => 1), 622 (new CFPlus::UI::Empty expand => 1),
592 (my $hb = new CFClient::UI::HBox), 623 (my $hb = new CFPlus::UI::HBox),
593 ], 624 ],
594 ); 625 );
595 626
596 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp',
597 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.");
598 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana',
599 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.");
600 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace',
601 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.");
602 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food',
603 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.");
604 635
605 $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,
606 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.");
607 $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,
608 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.)");
609 640
610 $GAUGES = { 641 $GAUGES = {
611 exp => $exp, win => $win, range => $rng, 642 exp => $exp, win => $win, range => $rng,
612 food => $fg, mana => $mg, hp => $hg, grace => $gg 643 food => $fg, mana => $mg, hp => $hg, grace => $gg
… …
616 647
617 $win 648 $win
618} 649}
619 650
620sub debug_setup { 651sub debug_setup {
621 my $table = new CFClient::UI::Table; 652 my $table = new CFPlus::UI::Table;
622 653
623 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 654 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
624 $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 });
625 $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");
626 $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 });
627 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 658 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
628 $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 });
629 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 660 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
630 $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 });
631 662
632 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);
633 664
634 for my $x (0..2) { 665 for my $x (0..2) {
635 for my $y (0 .. 2) { 666 for my $y (0 .. 2) {
636 $table->add ($x + 3, $y, 667 $table->add ($x + 3, $y,
637 new CFClient::UI::Entry 668 new CFPlus::UI::Entry
638 text => $default_smooth[$x * 3 + $y], 669 text => $default_smooth[$x * 3 + $y],
639 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 },
640 ); 671 );
641 } 672 }
642 } 673 }
… …
644 675
645 $table 676 $table
646} 677}
647 678
648sub stats_window { 679sub stats_window {
680 my $r = new CFPlus::UI::ScrolledWindow (
681 expand => 1,
682 scroll_y => 1
683 );
649 my $vb = new CFClient::UI::VBox; 684 $r->add (my $vb = new CFPlus::UI::VBox);
650 685
651 $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,
652 can_hover => 1, can_events => 1, 687 can_hover => 1, can_events => 1,
653 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.");
654 $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,
655 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
656 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).");
657 692
658 $vb->add (my $hb0 = new CFClient::UI::HBox); 693 $vb->add (my $hb0 = new CFPlus::UI::HBox);
659 $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,
660 can_hover => 1, can_events => 1, 695 can_hover => 1, can_events => 1,
661 tooltip => "The weight of the player including all inventory items."); 696 tooltip => "The weight of the player including all inventory items.");
662 $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,
663 can_hover => 1, can_events => 1, 698 can_hover => 1, can_events => 1,
664 tooltip => "The weight limit: you cannot carry more than this."); 699 tooltip => "The weight limit: you cannot carry more than this.");
665 700
666
667 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
668 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
669 703
670 my $color2 = [1, 1, 0]; 704 my $color2 = [1, 1, 0];
671 705
672 for ( 706 for (
673 [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],
674 [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],
675 [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],
676 [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],
677 [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],
678 [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],
679 [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],
680 714
681 [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],
682 [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],
683 [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],
684 [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],
685 [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],
686 [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],
687 ) { 721 ) {
688 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 722 my ($col, $row, $id, $label, $template) = @$_;
689 723
690 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
691 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 => "#stat_$label");
692 $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
693 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 => "#stat_$label");
694 } 730 }
695 731
696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
697 733
698 my $row = 0; 734 my $row = 0;
699 my $col = 0; 735 my $col = 0;
700 736
701 my %resist_names = ( 737 my %resist_names = (
… …
740 drain acid pois para deat phys 776 drain acid pois para deat phys
741 blind fear tund elec cold ghit/) 777 blind fear tund elec cold ghit/)
742 { 778 {
743 $tbl2->add ($col, $row, 779 $tbl2->add ($col, $row,
744 $STATWIDS->{"res_$_"} = 780 $STATWIDS->{"res_$_"} =
745 new CFClient::UI::Label 781 new CFPlus::UI::Label
746 font => $FONT_FIXED, 782 font => $FONT_FIXED,
747 template => "-100%", 783 template => "-100%",
748 align => +1, 784 align => +1,
749 valign => 0, 785 valign => 0,
750 can_events => 1, 786 can_events => 1,
751 can_hover => 1, 787 can_hover => 1,
752 tooltip => $resist_names{$_}->[1], 788 tooltip => $resist_names{$_}->[1],
753 ); 789 );
754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 790 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
755 font => $FONT_FIXED, 791 font => $FONT_FIXED,
756 can_hover => 1, 792 can_hover => 1,
757 can_events => 1, 793 can_events => 1,
758 path => "ui/resist/resist_$_.png", 794 path => "ui/resist/resist_$_.png",
759 tooltip => $resist_names{$_}->[1], 795 tooltip => $resist_names{$_}->[1],
760 ); 796 );
761 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 797 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
762 text => $resist_names{$_}->[0], 798 text => $resist_names{$_}->[0],
763 font => $FONT_FIXED, 799 font => $FONT_FIXED,
764 can_hover => 1, 800 can_hover => 1,
765 can_events => 1, 801 can_events => 1,
766 tooltip => $resist_names{$_}->[1], 802 tooltip => $resist_names{$_}->[1],
… …
773 } 809 }
774 } 810 }
775 811
776 #update_stats_window ({}); 812 #update_stats_window ({});
777 813
778 $vb 814 $r
779} 815}
780 816
781sub skill_window { 817sub skill_window {
818 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
782 $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 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}
… …
797 return if $METASERVER_ATIME > time; 835 return if $METASERVER_ATIME > time;
798 $METASERVER_ATIME = time + 60; 836 $METASERVER_ATIME = time + 60;
799 837
800 my $table = $METASERVER->{table}; 838 my $table = $METASERVER->{table};
801 $table->clear; 839 $table->clear;
802 $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...");
803 841
804 my $buf; 842 my $buf;
805 843
806 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
807 845
… …
830 "The time this server has been running without being restarted.", 868 "The time this server has been running without being restarted.",
831 "The server software version - a '+' indicates a Crossfire+ server.", 869 "The server software version - a '+' indicates a Crossfire+ server.",
832 "Short information about this server provided by its admins.", 870 "Short information about this server provided by its admins.",
833 ); 871 );
834 my @col = qw(#Users Host Uptime Version Description); 872 my @col = qw(#Users Host Uptime Version Description);
835 $table->add ($_, 0, new CFClient::UI::Label 873 $table->add ($_, 0, new CFPlus::UI::Label
836 can_hover => 1, can_events => 1, 874 can_hover => 1, can_events => 1,
837 align => 0, fg => [1, 1, 0], 875 align => 0, fg => [1, 1, 0],
838 text => $col[$_], tooltip => $tip[$_]) 876 text => $col[$_], tooltip => $tip[$_])
839 for 0 .. $#col; 877 for 0 .. $#col;
840 878
… …
861 899
862 $m = [$users, $host, $uptime, $version, $desc]; 900 $m = [$users, $host, $uptime, $version, $desc];
863 901
864 $y++; 902 $y++;
865 903
866 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 904 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
867 (new CFClient::UI::Button 905 (new CFPlus::UI::Button
868 text => "Use", 906 text => "Use",
869 tooltip => "Put this server into the <b>Host:Port</b> field", 907 tooltip => "Put this server into the <b>Host:Port</b> field",
870 on_activate => sub { 908 on_activate => sub {
871 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
872 $METASERVER->hide; 910 $METASERVER->hide;
873 0 911 0
874 }, 912 },
875 ), 913 ),
876 (new CFClient::UI::Empty expand => 1), 914 (new CFPlus::UI::Empty expand => 1),
877 ]); 915 ]);
878 916
879 $table->add ($_, $y, new CFClient::UI::Label 917 $table->add ($_, $y, new CFPlus::UI::Label
880 ellipsise => 0, 918 ellipsise => 0,
881 align => $align[$_], 919 align => $align[$_],
882 text => $m->[$_], 920 text => $m->[$_],
883 tooltip => $tip[$_], 921 tooltip => $tip[$_],
884 can_hover => 1, 922 can_hover => 1,
… …
889 } 927 }
890 }); 928 });
891} 929}
892 930
893sub metaserver_dialog { 931sub metaserver_dialog {
894 my $vbox = new CFClient::UI::VBox; 932 my $vbox = new CFPlus::UI::VBox;
895 my $table = new CFClient::UI::Table; 933 my $table = new CFPlus::UI::Table;
896 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
897 935
898 my $dialog = new CFClient::UI::FancyFrame 936 my $dialog = new CFPlus::UI::FancyFrame
899 title => "Server List", 937 title => "Server List",
900 name => 'metaserver_dialog', 938 name => 'metaserver_dialog',
901 x => 'center', 939 x => 'center',
902 y => 'center', 940 y => 'center',
903 z => 3, 941 z => 3,
… …
913 951
914 $dialog 952 $dialog
915} 953}
916 954
917sub server_setup { 955sub server_setup {
918 my $vbox = new CFClient::UI::VBox; 956 my $vbox = new CFPlus::UI::VBox;
919 957
920 $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]);
921 $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");
922 960
923 { 961 {
924 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
925 963
926 $vbox->add ( 964 $vbox->add (
927 $HOST_ENTRY = new CFClient::UI::Entry 965 $HOST_ENTRY = new CFPlus::UI::Entry
928 expand => 1, 966 expand => 1,
929 text => $CFG->{profile}{default}{host}, 967 text => $CFG->{profile}{default}{host},
930 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",
931 on_changed => sub { 969 on_changed => sub {
932 my ($self, $value) = @_; 970 my ($self, $value) = @_;
933 $CFG->{profile}{default}{host} = $value; 971 $CFG->{profile}{default}{host} = $value;
934 0 972 0
935 } 973 }
936 ); 974 );
937 975
938 $vbox->add (new CFClient::UI::Button 976 $vbox->add (new CFPlus::UI::Button
939 expand => 1, 977 expand => 1,
940 text => "Server List", 978 text => "Server List",
941 other => $METASERVER, 979 other => $METASERVER,
942 tooltip => "Show a list of available crossfire servers", 980 tooltip => "Show a list of available crossfire servers",
943 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 981 on_activate => sub { $METASERVER->toggle_visibility; 0 },
944 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
945 ); 983 );
946 } 984 }
947 985
948 $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");
949 $table->add (1, 4, new CFClient::UI::Entry 987 $table->add (1, 4, new CFPlus::UI::Entry
950 text => $CFG->{profile}{default}{user}, 988 text => $CFG->{profile}{default}{user},
951 tooltip => "The name of your character on the server", 989 tooltip => "The name of your character on the server",
952 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
953 ); 991 );
954 992
955 $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");
956 $table->add (1, 5, new CFClient::UI::Entry 994 $table->add (1, 5, new CFPlus::UI::Entry
957 text => $CFG->{profile}{default}{password}, 995 text => $CFG->{profile}{default}{password},
958 hidden => 1, 996 hidden => 1,
959 tooltip => "The password for your character", 997 tooltip => "The password for your character",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961 ); 999 );
962 1000
963 $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");
964 $table->add (1, 7, new CFClient::UI::Slider 1002 $table->add (1, 7, new CFPlus::UI::Slider
965 force_w => 100, 1003 force_w => 100,
966 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1004 range => [$CFG->{mapsize}, 10, 100, 0, 1],
967 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. "
968 . "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, "
969 . "but you also increase bandwidth requirements and latency. " 1007 . "but you also increase bandwidth requirements and latency. "
970 . "This option is only used once at log-in.", 1008 . "This option is only used once at log-in.",
971 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 },
972 ); 1010 );
973 1011
974 $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");
975 $table->add (1, 8, new CFClient::UI::CheckBox 1013 $table->add (1, 8, new CFPlus::UI::CheckBox
976 state => $CFG->{face_prefetch}, 1014 state => $CFG->{face_prefetch},
977 tooltip => "<b>Background Image Prefetch</b>\n\n" 1015 tooltip => "<b>Background Image Prefetch</b>\n\n"
978 . "If enabled, the client automatically pre-fetches images from the server. " 1016 . "If enabled, the client automatically pre-fetches images from the server. "
979 . "This might increase or create lag, but increases the chances " 1017 . "This might increase or create lag, but increases the chances "
980 . "of faces being ready for display when you encounter them. " 1018 . "of faces being ready for display when you encounter them. "
… …
982 . "so only set it if you really need to prefetch images. " 1020 . "so only set it if you really need to prefetch images. "
983 . "This option can be set and unset any time.", 1021 . "This option can be set and unset any time.",
984 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
985 ); 1023 );
986 1024
987 $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");
988 $table->add (1, 9, new CFClient::UI::Entry 1026 $table->add (1, 9, new CFPlus::UI::Entry
989 text => $CFG->{output_count}, 1027 text => $CFG->{output_count},
990 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.",
991 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
992 ); 1030 );
993 1031
994 $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");
995 $table->add (1, 10, new CFClient::UI::Entry 1033 $table->add (1, 10, new CFPlus::UI::Entry
996 text => $CFG->{output_sync}, 1034 text => $CFG->{output_sync},
997 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.",
998 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
999 ); 1037 );
1000 1038
1001 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1002 expand => 1, 1040 expand => 1,
1003 align => 0, 1041 align => 0,
1004 text => "Login", 1042 text => "Login",
1005 on_activate => sub { 1043 on_activate => sub {
1006 $CONN ? stop_game 1044 $CONN ? stop_game
1007 : start_game; 1045 : start_game;
1008 0 1046 0
1009 }, 1047 },
1010 ); 1048 );
1011 1049
1012 $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");
1013 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1014 text => $CFG->{say_command}, 1052 text => $CFG->{say_command},
1015 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. "
1016 . "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. "
1017 . "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.",
1018 on_changed => sub { 1056 on_changed => sub {
… …
1020 $CFG->{say_command} = $value; 1058 $CFG->{say_command} = $value;
1021 0 1059 0
1022 } 1060 }
1023 ); 1061 );
1024 1062
1025 $vbox->add (new CFClient::UI::Label 1063 $vbox->add (new CFPlus::UI::Label
1026 text => "Server Info", 1064 text => "Server Info",
1027 fontsize => 1.2, 1065 fontsize => 1.2,
1028 padding_y => 8, 1066 padding_y => 8,
1029 fg => [1, 1, 0, 1], 1067 fg => [1, 1, 0, 1],
1030 ); 1068 );
1031 1069
1032 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1033 1071
1034 $vbox 1072 $vbox
1035} 1073}
1036 1074
1037sub message_window { 1075sub message_window {
1038 my $window = new CFClient::UI::FancyFrame 1076 my $window = new CFPlus::UI::FancyFrame
1039 name => "message_window", 1077 name => "message_window",
1040 title => "Messages", 1078 title => "Messages",
1041 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1042 x => "max", 1080 x => "max",
1043 y => 0, 1081 y => 0,
1044 force_w => $::WIDTH * 0.4, 1082 force_w => $::WIDTH * 0.4,
1045 force_h => $::HEIGHT * 0.5, 1083 force_h => $::HEIGHT * 0.5,
1046 child => (my $vbox = new CFClient::UI::VBox), 1084 child => (my $vbox = new CFPlus::UI::VBox),
1047 has_close_button => 1; 1085 has_close_button => 1;
1048 1086
1049 $vbox->add ($LOGVIEW); 1087 $vbox->add ($LOGVIEW);
1050 1088
1051 $vbox->add (my $input = new CFClient::UI::Entry 1089 $vbox->add (my $input = new CFPlus::UI::Entry
1052 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> "
1053 . "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>...). "
1054 . "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). "
1055 . "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.",
1056 on_focus_in => sub { 1094 on_focus_in => sub {
… …
1095 }; 1133 };
1096 1134
1097 $window 1135 $window
1098} 1136}
1099 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
1100sub open_quit_dialog { 1157sub open_quit_dialog {
1101 unless ($QUIT_DIALOG) { 1158 unless ($QUIT_DIALOG) {
1102 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1103 x => "center", 1160 x => "center",
1104 y => "center", 1161 y => "center",
1105 z => 50, 1162 z => 50,
1106 title => "Really Quit?", 1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1107 ; 1168 ;
1108 1169
1109 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1110 1171
1111 $vb->add (new CFClient::UI::Label 1172 $vb->add (new CFPlus::UI::Label
1112 text => "You should find a savebed and apply it first!", 1173 text => "You should find a savebed and apply it first!",
1113 max_w => $WIDTH * 0.25, 1174 max_w => $WIDTH * 0.25,
1114 ellipsize => 0, 1175 ellipsize => 0,
1115 ); 1176 );
1116 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1117 $hb->add (new CFClient::UI::Button 1178 $hb->add (new CFPlus::UI::Button
1118 text => "Ok", 1179 text => "Ok",
1119 expand => 1, 1180 expand => 1,
1120 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1121 ); 1182 );
1122 $hb->add (new CFClient::UI::Button 1183 $hb->add (new CFPlus::UI::Button
1123 text => "Quit anyway", 1184 text => "Quit anyway",
1124 expand => 1, 1185 expand => 1,
1125 on_activate => sub { exit }, 1186 on_activate => sub { exit },
1126 ); 1187 );
1127 } 1188 }
1128 1189
1129 $QUIT_DIALOG->show; 1190 $QUIT_DIALOG->show;
1191 $QUIT_DIALOG->grab_focus;
1130} 1192}
1131 1193
1132sub autopickup_setup { 1194sub autopickup_setup {
1133 my $table = new CFClient::UI::Table; 1195 my $table = new CFPlus::UI::Table;
1134 1196
1135 for ( 1197 for (
1136 ["General", 0, 0, 1198 ["General", 0, 0,
1137 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1199 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1138 ["Inhibit autopickup" => PICKUP_INHIBIT], 1200 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1172 ], 1234 ],
1173 ["Weight/Value ratio", 2, 17] 1235 ["Weight/Value ratio", 2, 17]
1174 ) 1236 )
1175 { 1237 {
1176 my ($title, $x, $y, @bits) = @$_; 1238 my ($title, $x, $y, @bits) = @$_;
1177 $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]);
1178 1240
1179 for (@bits) { 1241 for (@bits) {
1180 ++$y; 1242 ++$y;
1181 1243
1182 my $mask = $_->[1]; 1244 my $mask = $_->[1];
1183 $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);
1184 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1246 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1185 state => $::CFG->{pickup} & $mask, 1247 state => $::CFG->{pickup} & $mask,
1186 on_changed => sub { 1248 on_changed => sub {
1187 my ($box, $value) = @_; 1249 my ($box, $value) = @_;
1188 1250
1189 if ($value) { 1251 if ($value) {
… …
1200 1262
1201 ${$_->[2]} = $checkbox if $_->[2]; 1263 ${$_->[2]} = $checkbox if $_->[2];
1202 } 1264 }
1203 } 1265 }
1204 1266
1205 $table->add (2, 18, new CFClient::UI::ValSlider 1267 $table->add (2, 18, new CFPlus::UI::ValSlider
1206 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1268 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207 template => ">= 99", 1269 template => ">= 99",
1208 to_value => sub { ">= " . 5 * $_[0] }, 1270 to_value => sub { ">= " . 5 * $_[0] },
1209 on_changed => sub { 1271 on_changed => sub {
1210 my ($slider, $value) = @_; 1272 my ($slider, $value) = @_;
… …
1213 $::CFG->{pickup} |= int $value 1275 $::CFG->{pickup} |= int $value
1214 if $value; 1276 if $value;
1215 1; 1277 1;
1216 }); 1278 });
1217 1279
1218 $table->add (3, 18, new CFClient::UI::Button 1280 $table->add (3, 18, new CFPlus::UI::Button
1219 text => "set", 1281 text => "set",
1220 on_activate => sub { 1282 on_activate => sub {
1221 $::CONN->send_command ("pickup $::CFG->{pickup}") 1283 $::CONN->send_command ("pickup $::CFG->{pickup}")
1222 if defined $::CONN; 1284 if defined $::CONN;
1223 0 1285 0
1224 }); 1286 });
1225 1287
1226 $table 1288 $table
1227} 1289}
1228 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
1229sub inventory_widget { 1304sub inventory_widget {
1230 my $hb = new CFClient::UI::HBox homogeneous => 1; 1305 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1231 1306
1232 $hb->add (my $vb1 = new CFClient::UI::VBox); 1307 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1233 $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);
1234 $vb1->add ($INV = new CFClient::UI::Inventory); 1331 $sw1->add ($INV = new CFPlus::UI::Inventory);
1235 1332
1236 $hb->add (my $vb2 = new CFClient::UI::VBox); 1333 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1237 1334
1238 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1239 1336
1337 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1240 $vb2->add ($INVR = new CFClient::UI::Inventory); 1338 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1241 1339
1242 # XXX: Call after $INVR = ... because set_opencont sets the items 1340 # XXX: Call after $INVR = ... because set_opencont sets the items
1243 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1341 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1244 1342
1245 $hb 1343 $hb
1246} 1344}
1247 1345
1248sub toggle_player_page { 1346sub toggle_player_page {
… …
1255 $PL_WINDOW->show; 1353 $PL_WINDOW->show;
1256 } 1354 }
1257} 1355}
1258 1356
1259sub player_window { 1357sub player_window {
1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1261 x => "center", 1359 x => "center",
1262 y => "center", 1360 y => "center",
1263 force_w => $WIDTH * 9/10, 1361 force_w => $WIDTH * 9/10,
1264 force_h => $HEIGHT * 9/10, 1362 force_h => $HEIGHT * 9/10,
1265 title => "Player", 1363 title => "Player",
… …
1267 has_close_button => 1 1365 has_close_button => 1
1268 ; 1366 ;
1269 1367
1270 my $ntb = 1368 my $ntb =
1271 $PL_NOTEBOOK = 1369 $PL_NOTEBOOK =
1272 new CFClient::UI::Notebook 1370 new CFPlus::UI::Notebook expand => 1, debug => 1;
1273 expand => 1,
1274 debug => 1,
1275 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1276 ;
1277 1371
1278 $ntb->add ( 1372 $ntb->add (
1279 "Statistics (F2)" => $STATS_PAGE = stats_window, 1373 "Statistics (F2)" => $STATS_PAGE = stats_window,
1280 "Shows statistics, where all your Stats and Resistances are shown." 1374 "Shows statistics, where all your Stats and Resistances are shown."
1281 ); 1375 );
1282 $ntb->add ( 1376 $ntb->add (
1283 "Skills (F3)" => $SKILL_PAGE = skill_window, 1377 "Skills (F3)" => $SKILL_PAGE = skill_window,
1284 "Shows all your Skills." 1378 "Shows all your Skills."
1285 ); 1379 );
1380
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1286 $ntb->add ( 1383 $ntb->add (
1287 "Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList, 1384 "Spellbook (F4)" => $spellsw,
1288 "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."
1289 ); 1386 );
1290 $ntb->add ( 1387 $ntb->add (
1291 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1388 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292 "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 :). "
… …
1302sub update_bindings { 1399sub update_bindings {
1303 $BIND_UPD_CB->() if $BIND_UPD_CB; 1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1401}
1305 1402
1306sub keyboard_setup { 1403sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1404 my $binding_list = new CFPlus::UI::VBox;
1308 1405
1309 my $refresh; 1406 my $refresh;
1310 $refresh = $BIND_UPD_CB = sub { 1407 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1408 $binding_list->clear ();
1312 1409
… …
1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1414
1318 my $lbl = join "; ", @$cmds; 1415 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1417 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1418 $hb->add (new CFPlus::UI::Button
1322 text => "delete", 1419 text => "delete",
1323 tooltip => "Deletes the binding", 1420 tooltip => "Deletes the binding",
1324 on_activate => sub { 1421 on_activate => sub {
1325 $binding_list->remove ($hb); 1422 $binding_list->remove ($hb);
1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0 1424 0
1328 }); 1425 });
1329 1426
1330 $hb->add (new CFClient::UI::Button 1427 $hb->add (new CFPlus::UI::Button
1331 text => "edit", 1428 text => "edit",
1332 tooltip => "Edits the binding", 1429 tooltip => "Edits the binding",
1333 on_activate => sub { 1430 on_activate => sub {
1334 $::BIND_EDITOR->set_binding ( 1431 $::BIND_EDITOR->set_binding (
1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1348 $::BIND_EDITOR->show; 1445 $::BIND_EDITOR->show;
1349 $SETUP_DIALOG->hide; 1446 $SETUP_DIALOG->hide;
1350 0 1447 0
1351 }); 1448 });
1352 1449
1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1450 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1451 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1355 } 1452 }
1356 } 1453 }
1357 }; 1454 };
1358 1455
1359 my $vb = new CFClient::UI::VBox; 1456 my $vb = new CFPlus::UI::VBox;
1360 $vb->add (my $hb = new CFClient::UI::HBox); 1457 $vb->add (my $hb = new CFPlus::UI::HBox);
1361 $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");
1362 $hb->add (new CFClient::UI::CheckBox 1459 $hb->add (new CFPlus::UI::CheckBox
1363 expand => 1, 1460 expand => 1,
1364 state => $CFG->{shift_fire_stop}, 1461 state => $CFG->{shift_fire_stop},
1365 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",
1366 on_changed => sub { 1463 on_changed => sub {
1367 my ($cbox, $value) = @_; 1464 my ($cbox, $value) = @_;
1368 $CFG->{shift_fire_stop} = $value; 1465 $CFG->{shift_fire_stop} = $value;
1369 0 1466 0
1370 }); 1467 });
1371 1468
1372 $vb->add ($binding_list); 1469 $vb->add ($binding_list);
1373 $vb->add (my $hb = new CFClient::UI::HBox); 1470 $vb->add (my $hb = new CFPlus::UI::HBox);
1374 1471
1375 $hb->add (new CFClient::UI::Button 1472 $hb->add (new CFPlus::UI::Button
1376 text => "record new", 1473 text => "record new",
1377 expand => 1, 1474 expand => 1,
1378 tooltip => "This button opens the binding editor with an empty binding.", 1475 tooltip => "This button opens the binding editor with an empty binding.",
1379 on_activate => sub { 1476 on_activate => sub {
1380 $::BIND_EDITOR->set_binding (undef, undef, [], 1477 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1394 $::BIND_EDITOR->show; 1491 $::BIND_EDITOR->show;
1395 0 1492 0
1396 }, 1493 },
1397 ); 1494 );
1398 1495
1399 $hb->add (new CFClient::UI::Button 1496 $hb->add (new CFPlus::UI::Button
1400 text => "close", 1497 text => "close",
1401 tooltip => "Closes the binding window", 1498 tooltip => "Closes the binding window",
1402 expand => 1, 1499 expand => 1,
1403 on_activate => sub { 1500 on_activate => sub {
1404 $SETUP_DIALOG->hide; 1501 $SETUP_DIALOG->hide;
… …
1410 1507
1411 $vb 1508 $vb
1412} 1509}
1413 1510
1414sub help_window { 1511sub help_window {
1415 my $win = new CFClient::UI::FancyFrame 1512 my $win = new CFPlus::UI::FancyFrame
1416 x => 'center', 1513 x => 'center',
1417 y => 'center', 1514 y => 'center',
1418 z => 2, 1515 z => 2,
1419 name => 'doc_browser', 1516 name => 'doc_browser',
1420 force_w => int $WIDTH * 7/8, 1517 force_w => int $WIDTH * 7/8,
1421 force_h => int $HEIGHT * 7/8, 1518 force_h => int $HEIGHT * 7/8,
1422 title => "Help Browser", 1519 title => "Help Browser",
1423 has_close_button => 1; 1520 has_close_button => 1;
1424 1521
1425 $win->add (my $vbox = new CFClient::UI::VBox); 1522 $win->add (my $vbox = new CFPlus::UI::VBox);
1426 1523
1427 $vbox->add (my $buttons = new CFClient::UI::HBox); 1524 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1428 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1429 expand => 1, fontsize => 0.8, padding_x => 4); 1526 expand => 1, fontsize => 0.8, padding_x => 4);
1430 1527
1431 $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: ");
1432 $buttons->add (my $combo = new CFClient::UI::Combobox 1529 $buttons->add (my $combo = new CFPlus::UI::Selector
1433 value => undef, 1530 value => undef,
1434 options => [ 1531 options => [
1435 [intro => "Introduction"], 1532 [intro => "Introduction"],
1436 [manual => "Main Manual"], 1533 [manual => "Main Manual"],
1437 [skill_help => "Skill Reference"], 1534 [skill_help => "Skill Reference"],
… …
1440 [COPYING => "License Terms"], 1537 [COPYING => "License Terms"],
1441 ], 1538 ],
1442 on_changed => sub { 1539 on_changed => sub {
1443 my ($self, $pod) = @_; 1540 my ($self, $pod) = @_;
1444 1541
1445 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1446 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1447
1448 $viewer->clear; 1542 $viewer->clear;
1449 1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod);
1450# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1451# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1452# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1453# ]);#d#
1454
1455 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1456 for @$pom;
1457
1458 $viewer->set_offset (0); 1544 $viewer->set_offset (0);
1459 1545
1460 0 1546 0
1461 }, 1547 },
1462 on_visibility_change => sub { 1548 on_visibility_change => sub {
… …
1470 1556
1471 $win 1557 $win
1472} 1558}
1473 1559
1474sub sdl_init { 1560sub sdl_init {
1475 CFClient::SDL_Init 1561 CFPlus::SDL_Init
1476 and die "SDL::Init failed!\n"; 1562 and die "SDL::Init failed!\n";
1477} 1563}
1478 1564
1479sub video_init { 1565sub video_init {
1480 sdl_init; 1566 sdl_init;
… …
1485 1571
1486 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1572 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1487 $FULLSCREEN = $CFG->{fullscreen}; 1573 $FULLSCREEN = $CFG->{fullscreen};
1488 $FAST = $CFG->{fast}; 1574 $FAST = $CFG->{fast};
1489 1575
1490 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1576 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1491 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1577 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1492 1578
1493 $SDL_ACTIVE = 1; 1579 $SDL_ACTIVE = 1;
1494 $LAST_REFRESH = time - 0.01; 1580 $LAST_REFRESH = time - 0.01;
1495 1581
1496 CFClient::OpenGL::init; 1582 CFPlus::OpenGL::init;
1497 1583
1498 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1584 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1499 1585
1500 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1586 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1501 1587
1502 ############################################################################# 1588 #############################################################################
1503 1589
1504 if ($DEBUG_STATUS) { 1590 if ($DEBUG_STATUS) {
1505 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1591 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1506 } else { 1592 } else {
1507 # create the widgets 1593 # create the widgets
1508 1594
1509 $DEBUG_STATUS = new CFClient::UI::Label 1595 $DEBUG_STATUS = new CFPlus::UI::Label
1510 padding => 0, 1596 padding => 0,
1511 z => 100, 1597 z => 100,
1512 force_x => "max", 1598 force_x => "max",
1513 force_y => 0; 1599 force_y => 0;
1514 $DEBUG_STATUS->show; 1600 $DEBUG_STATUS->show;
1515 1601
1516 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1517 1603
1518 $STATUSBOX = new CFClient::UI::Statusbox; 1604 $STATUSBOX = new CFPlus::UI::Statusbox;
1519 $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]);
1520 1606
1521 (new CFClient::UI::Frame 1607 (new CFPlus::UI::Frame
1522 bg => [0, 0, 0, 0.4], 1608 bg => [0, 0, 0, 0.4],
1523 force_x => 0, 1609 force_x => 0,
1524 force_y => "max", 1610 force_y => "max",
1525 child => $STATUSBOX, 1611 child => $STATUSBOX,
1526 )->show; 1612 )->show;
1527 1613
1528 CFClient::UI::FancyFrame->new ( 1614 CFPlus::UI::FancyFrame->new (
1529 title => "Map", 1615 title => "Map",
1530 name => "mapmap", 1616 name => "mapmap",
1531 x => 0, 1617 x => 0,
1532 y => $FONTSIZE + 8, 1618 y => $FONTSIZE + 8,
1533 border_bg => [1, 1, 1, 192/255], 1619 border_bg => [1, 1, 1, 192/255],
1534 bg => [1, 1, 1, 0], 1620 bg => [1, 1, 1, 0],
1535 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1621 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1536 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.",
1537 ), 1623 ),
1538 )->show; 1624 )->show;
1539 1625
1540 $MAPWIDGET = new CFClient::MapWidget; 1626 $MAPWIDGET = new CFPlus::MapWidget;
1541 $MAPWIDGET->connect (activate_console => sub { 1627 $MAPWIDGET->connect (activate_console => sub {
1542 my ($mapwidget, $preset) = @_; 1628 my ($mapwidget, $preset) = @_;
1543 1629
1544 if ($CONSOLE) { 1630 if ($CONSOLE) {
1545 $CONSOLE->{input}->{auto_activated} = 1; 1631 $CONSOLE->{input}->{auto_activated} = 1;
… …
1551 } 1637 }
1552 }); 1638 });
1553 $MAPWIDGET->show; 1639 $MAPWIDGET->show;
1554 $MAPWIDGET->grab_focus; 1640 $MAPWIDGET->grab_focus;
1555 1641
1556 $LOGVIEW = new CFClient::UI::TextScroller 1642 $LOGVIEW = new CFPlus::UI::TextScroller
1557 expand => 1, 1643 expand => 1,
1558 font => $FONT_FIXED, 1644 font => $FONT_FIXED,
1559 fontsize => $::CFG->{log_fontsize}, 1645 fontsize => $::CFG->{log_fontsize},
1560 indent => -4, 1646 indent => -4,
1561 can_hover => 1, 1647 can_hover => 1,
1562 can_events => 1, 1648 can_events => 1,
1563 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.",
1564 ; 1650 ;
1565 1651
1566 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1567 title => "Setup", 1653 title => "Setup",
1568 name => "setup_dialog", 1654 name => "setup_dialog",
1569 x => 'center', 1655 x => 'center',
1570 y => 'center', 1656 y => 'center',
1571 z => 2, 1657 z => 2,
… …
1574 has_close_button => 1, 1660 has_close_button => 1,
1575 ; 1661 ;
1576 1662
1577 $METASERVER = metaserver_dialog; 1663 $METASERVER = metaserver_dialog;
1578 1664
1579 $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,
1580 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1666 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1581 1667
1582 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1583 "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.");
1584 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1585 "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.");
… …
1595 . "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 "
1596 . "binding editor closes"); 1682 . "binding editor closes");
1597 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1683 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1598 "Some debuggin' options. Do not ask."); 1684 "Some debuggin' options. Do not ask.");
1599 1685
1600 $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
1601 1687
1602 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1688 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1603 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.");
1604 1690
1605 $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,
1606 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.");
1607 1693
1608 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
1609 1695
1610 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1696 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1611 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.");
1612 1698
1613 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFPlus::UI::Button
1614 text => "Save Config", 1700 text => "Save Config",
1615 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.",
1616 on_activate => sub { 1702 on_activate => sub {
1617 $::CFG->{layout} = CFClient::UI::get_layout; 1703 $::CFG->{layout} = CFPlus::UI::get_layout;
1618 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1704 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1619 status "Configuration Saved"; 1705 status "Configuration Saved";
1620 0 1706 0
1621 }, 1707 },
1622 ); 1708 );
1623 1709
1624 $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,
1625 tooltip => "View Documentation"); 1711 tooltip => "View Documentation");
1626 1712
1627 $BUTTONBAR->add (new CFClient::UI::Button 1713 $BUTTONBAR->add (new CFPlus::UI::Button
1628 text => "Quit", 1714 text => "Quit",
1629 tooltip => "Terminates the program", 1715 tooltip => "Terminates the program",
1630 on_activate => sub { 1716 on_activate => sub {
1631 if ($CONN) { 1717 if ($CONN) {
1632 open_quit_dialog; 1718 open_quit_dialog;
… …
1643 1729
1644 $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]);
1645} 1731}
1646 1732
1647sub video_shutdown { 1733sub video_shutdown {
1648 CFClient::OpenGL::shutdown; 1734 CFPlus::OpenGL::shutdown;
1649 1735
1650 undef $SDL_ACTIVE; 1736 undef $SDL_ACTIVE;
1651} 1737}
1652 1738
1653my @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#
… …
1661 1747
1662sub audio_music_finished { 1748sub audio_music_finished {
1663 return unless $CFG->{bgm_enable}; 1749 return unless $CFG->{bgm_enable};
1664 1750
1665 # TODO: hack, do play loop and mood music 1751 # TODO: hack, do play loop and mood music
1666 $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]";
1667 $bgmusic->play (0); 1753 $bgmusic->play (0);
1668 1754
1669 push @bgmusic, shift @bgmusic; 1755 push @bgmusic, shift @bgmusic;
1670} 1756}
1671 1757
1672sub audio_init { 1758sub audio_init {
1673 if ($CFG->{audio_enable}) { 1759 if ($CFG->{audio_enable}) {
1674 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1760 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1675 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1761 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1676 1762
1677 unless ($SDL_MIXER) { 1763 unless ($SDL_MIXER) {
1678 status "Unable to open sound device: there will be no sound"; 1764 status "Unable to open sound device: there will be no sound";
1679 return; 1765 return;
1680 } 1766 }
1681 1767
1682 CFClient::Mix_AllocateChannels 8; 1768 CFPlus::Mix_AllocateChannels 8;
1683 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1684 1770
1685 audio_music_finished; 1771 audio_music_finished;
1686 1772
1687 while (<$fh>) { 1773 while (<$fh>) {
1688 next if /^\s*#/; 1774 next if /^\s*#/;
… …
1691 my ($file, $volume, $event) = split /\s+/, $_, 3; 1777 my ($file, $volume, $event) = split /\s+/, $_, 3;
1692 1778
1693 push @SOUNDS, "$volume,$file"; 1779 push @SOUNDS, "$volume,$file";
1694 1780
1695 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1781 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1696 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";
1697 $chunk->volume ($volume * 128 / 100); 1783 $chunk->volume ($volume * 128 / 100);
1698 $chunk 1784 $chunk
1699 }; 1785 };
1700 } 1786 }
1701 } else { 1787 } else {
… …
1703 } 1789 }
1704 } 1790 }
1705} 1791}
1706 1792
1707sub audio_shutdown { 1793sub audio_shutdown {
1708 CFClient::Mix_CloseAudio if $SDL_MIXER; 1794 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1709 undef $SDL_MIXER; 1795 undef $SDL_MIXER;
1710 @SOUNDS = (); 1796 @SOUNDS = ();
1711 %AUDIO_CHUNKS = (); 1797 %AUDIO_CHUNKS = ();
1712} 1798}
1713 1799
… …
1720 1806
1721sub force_refresh { 1807sub force_refresh {
1722 $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;
1723 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1809 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1724 1810
1725 $CFClient::UI::ROOT->draw; 1811 $CFPlus::UI::ROOT->draw;
1726 1812
1727 $WANT_REFRESH = 0; 1813 $WANT_REFRESH = 0;
1728 $CAN_REFRESH = 0; 1814 $CAN_REFRESH = 0;
1729 $LAST_REFRESH = $NOW; 1815 $LAST_REFRESH = $NOW;
1730 1816
17310 && do {
1732 # some weird model-drawing code, just a joke right now
1733 use CFClient::OpenGL;
1734
1735 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1736 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1737 $demo{r} ||= do {
1738 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1739 $mod->{v} = pack "f*", @{$mod->{v}};
1740 $_ = [scalar @$_, pack "S!*", @$_]
1741 for values %{$mod->{g}};
1742 $mod
1743 };
1744
1745 my $r = $demo{r} or die;
1746
1747 glDepthMask 1;
1748 glClear GL_DEPTH_BUFFER_BIT;
1749 glEnable GL_TEXTURE_2D;
1750 glEnable GL_DEPTH_TEST;
1751 glEnable GL_CULL_FACE;
1752 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1753
1754 glMatrixMode GL_PROJECTION;
1755 glLoadIdentity;
1756 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1757 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1758 glMatrixMode GL_MODELVIEW;
1759 glLoadIdentity;
1760
1761 glPushMatrix;
1762 glTranslate 0, 0, -800;
1763 glScale 1, -1, 1;
1764 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1765 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1766 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1767 glScale 50, 50, 50;
1768
1769 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1770 while (my ($k, $v) = each %{$r->{g}}) {
1771 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1772 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1773 }
1774
1775 glPopMatrix;
1776
1777 glShadeModel GL_FLAT;
1778 glDisable GL_DEPTH_TEST;
1779 glDisable GL_TEXTURE_2D;
1780 glDepthMask 0;
1781
1782 $WANT_REFRESH++;
1783};
1784
1785 CFClient::SDL_GL_SwapBuffers; 1817 CFPlus::SDL_GL_SwapBuffers;
1786} 1818}
1787 1819
1788my $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 {
1789 $NOW = time; 1821 $NOW = time;
1790 1822
1791 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1823 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1792 for CFClient::SDL_PollEvent; 1824 for CFPlus::SDL_PollEvent;
1793 1825
1794 if (%animate_object) { 1826 if (%animate_object) {
1795 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1827 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1796 $WANT_REFRESH++; 1828 $WANT_REFRESH++;
1797 } 1829 }
… …
1821 $CONN->face_prefetch 1853 $CONN->face_prefetch
1822 if $CONN; 1854 if $CONN;
1823}); 1855});
1824 1856
1825%SDL_CB = ( 1857%SDL_CB = (
1826 CFClient::SDL_QUIT => sub { 1858 CFPlus::SDL_QUIT => sub {
1827 Event::unloop -1; 1859 Event::unloop -1;
1828 }, 1860 },
1829 CFClient::SDL_VIDEORESIZE => sub { 1861 CFPlus::SDL_VIDEORESIZE => sub {
1830 }, 1862 },
1831 CFClient::SDL_VIDEOEXPOSE => sub { 1863 CFPlus::SDL_VIDEOEXPOSE => sub {
1832 CFClient::UI::full_refresh; 1864 CFPlus::UI::full_refresh;
1833 }, 1865 },
1834 CFClient::SDL_ACTIVEEVENT => sub { 1866 CFPlus::SDL_ACTIVEEVENT => sub {
1835# 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#
1836 }, 1868 },
1837 CFClient::SDL_KEYDOWN => sub { 1869 CFPlus::SDL_KEYDOWN => sub {
1838 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1839 # alt-enter 1871 # alt-enter
1840 $FULLSCREEN_ENABLE->toggle; 1872 $FULLSCREEN_ENABLE->toggle;
1841 video_shutdown; 1873 video_shutdown;
1842 video_init; 1874 video_init;
1843 } else { 1875 } else {
1844 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1876 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1845 } 1877 }
1846 }, 1878 },
1847 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1879 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1848 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1880 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1849 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1881 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1850 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1882 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1851 CFClient::SDL_USEREVENT => sub { 1883 CFPlus::SDL_USEREVENT => sub {
1852 if ($_[0]{code} == 1) { 1884 if ($_[0]{code} == 1) {
1853 audio_channel_finished $_[0]{data1}; 1885 audio_channel_finished $_[0]{data1};
1854 } elsif ($_[0]{code} == 0) { 1886 } elsif ($_[0]{code} == 0) {
1855 audio_music_finished; 1887 audio_music_finished;
1856 } 1888 }
… …
1860############################################################################# 1892#############################################################################
1861 1893
1862$SIG{INT} = $SIG{TERM} = sub { exit }; 1894$SIG{INT} = $SIG{TERM} = sub { exit };
1863 1895
1864{ 1896{
1865 local $SIG{__DIE__} = sub {
1866 return unless defined $^S && !$^S;
1867 Carp::confess $_[0];#d#TODO: remove when stable
1868 CFClient::fatal $_[0];
1869 };
1870
1871 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1872 CFClient::UI::set_layout ($::CFG->{layout}); 1898 CFPlus::UI::set_layout ($::CFG->{layout});
1873 1899
1874 my %DEF_CFG = ( 1900 my %DEF_CFG = (
1875 sdl_mode => 0, 1901 sdl_mode => 0,
1876 width => 640, 1902 width => 640,
1877 height => 480, 1903 height => 480,
… …
1893 bgm_volume => 0.25, 1919 bgm_volume => 0.25,
1894 face_prefetch => 0, 1920 face_prefetch => 0,
1895 output_sync => 1, 1921 output_sync => 1,
1896 output_count => 1, 1922 output_count => 1,
1897 pickup => 0, 1923 pickup => 0,
1924 inv_sort => "mtime",
1898 default => "profile", # default profile 1925 default => "profile", # default profile
1899 ); 1926 );
1900 1927
1901 while (my ($k, $v) = each %DEF_CFG) { 1928 while (my ($k, $v) = each %DEF_CFG) {
1902 $CFG->{$k} = $v unless exists $CFG->{$k}; 1929 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
1906 1933
1907 sdl_init; 1934 sdl_init;
1908 1935
1909 @SDL_MODES = reverse 1936 @SDL_MODES = reverse
1910 grep $_->[0] >= 640 && $_->[1] >= 480, 1937 grep $_->[0] >= 640 && $_->[1] >= 480,
1911 CFClient::SDL_ListModes; 1938 CFPlus::SDL_ListModes;
1912 1939
1913 @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)";
1914 1941
1915 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1916 1943
1917 { 1944 {
1918 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1945 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1919 DejaVuSans.ttf 1946 DejaVuSans.ttf
1920 DejaVuSansMono.ttf 1947 DejaVuSansMono.ttf
1921 DejaVuSans-Bold.ttf 1948 DejaVuSans-Bold.ttf
1922 DejaVuSansMono-Bold.ttf 1949 DejaVuSansMono-Bold.ttf
1923 DejaVuSans-Oblique.ttf 1950 DejaVuSans-Oblique.ttf
1924 DejaVuSansMono-Oblique.ttf 1951 DejaVuSansMono-Oblique.ttf
1925 DejaVuSans-BoldOblique.ttf 1952 DejaVuSans-BoldOblique.ttf
1926 DejaVuSansMono-BoldOblique.ttf 1953 DejaVuSansMono-BoldOblique.ttf
1927 ); 1954 );
1928 1955
1929 CFClient::add_font $_ for @fonts; 1956 CFPlus::add_font $_ for @fonts;
1930 1957
1931 CFClient::pango_init; 1958 CFPlus::pango_init;
1932 1959
1933 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1960 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1934 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1961 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1935 1962
1936 $FONT_PROP->make_default; 1963 $FONT_PROP->make_default;
1937 } 1964 }
1938 1965
1939# compare mono (ft) vs. rgba (cairo) 1966# compare mono (ft) vs. rgba (cairo)
1940# ft - 1.8s, cairo 3s, even in alpha-only mode 1967# ft - 1.8s, cairo 3s, even in alpha-only mode
1941# for my $rgba (0..1) { 1968# for my $rgba (0..1) {
1942# my $t1 = Time::HiRes::time; 1969# my $t1 = Time::HiRes::time;
1943# for (1..1000) { 1970# for (1..1000) {
1944# my $layout = CFClient::Layout->new ($rgba); 1971# my $layout = CFPlus::Layout->new ($rgba);
1945# $layout->set_text ("hallo" x 100); 1972# $layout->set_text ("hallo" x 100);
1946# $layout->render; 1973# $layout->render;
1947# } 1974# }
1948# my $t2 = Time::HiRes::time; 1975# my $t2 = Time::HiRes::time;
1949# warn $t2-$t1; 1976# warn $t2-$t1;
… …
1952 video_init; 1979 video_init;
1953 audio_init; 1980 audio_init;
1954} 1981}
1955 1982
1956Event::loop; 1983Event::loop;
1957#CFClient::SDL_Quit; 1984#CFPlus::SDL_Quit;
1958#CFClient::_exit 0; 1985#CFPlus::_exit 0;
1959 1986
1960END { CFClient::SDL_Quit } 1987END { CFPlus::SDL_Quit }
1961 1988
1962=head1 NAME 1989=head1 NAME
1963 1990
1964cfplus - A Crossfire+ and Crossfire game client 1991cfplus - A Crossfire+ and Crossfire game client
1965 1992

Diff Legend

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