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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.114 by root, Mon Aug 14 01:21:02 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 CFClient::Pod; 41use CFPlus::Pod;
42use CFClient::BindingEditor; 42use CFPlus::BindingEditor;
43use CFClient::MapWidget; 43use CFPlus::MapWidget;
44 44
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 46$SIG{PIPE} = 'IGNORE';
47 47
48$Event::Eval = 0;
48$Event::DIED = sub { 49$Event::DIED = sub {
49 # TODO: display dialog box or so 50 # TODO: display dialog box or so
50 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
51 CFClient::error $_[1]; 52 CFPlus::error $_[1];
52}; 53};
53 54
54#$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};
55 63
56our $VERSION = '0.1'; 64our $VERSION = '0.1';
57 65
58my $MAX_FPS = 60; 66my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 67my $MIN_FPS = 5; # unused as of yet
… …
131our $BIND_UPD_CB; 139our $BIND_UPD_CB;
132 140
133our $PICKUP_CFG; 141our $PICKUP_CFG;
134 142
135sub status { 143sub status {
136 $STATUSBOX->add (CFClient::asxml $_[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]);
137} 145}
138 146
139sub debug { 147sub debug {
140 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
141} 149}
… …
147 155
148# server query dialog 156# server query dialog
149sub server_query { 157sub server_query {
150 my ($conn, $flags, $prompt) = @_; 158 my ($conn, $flags, $prompt) = @_;
151 159
152 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153 x => "center", 161 x => "center",
154 y => "center", 162 y => "center",
155 title => "Server Query", 163 title => "Server Query",
156 child => my $vbox = new CFClient::UI::VBox, 164 child => my $vbox = new CFPlus::UI::VBox,
157 ; 165 ;
158 166
159 my @dialog = my $label = new CFClient::UI::Label 167 my @dialog = my $label = new CFPlus::UI::Label
160 max_w => $::WIDTH * 0.4, 168 max_w => $::WIDTH * 0.4,
161 ellipsise => 0, 169 ellipsise => 0,
162 text => $prompt; 170 text => $prompt;
163 171
164 if ($flags & CS_QUERY_YESNO) { 172 if ($flags & CS_QUERY_YESNO) {
165 push @dialog, my $hbox = new CFClient::UI::HBox; 173 push @dialog, my $hbox = new CFPlus::UI::HBox;
166 174
167 $hbox->add (new CFClient::UI::Button 175 $hbox->add (new CFPlus::UI::Button
168 text => "No", 176 text => "No",
169 on_activate => sub { 177 on_activate => sub {
170 $conn->send ("reply n"); 178 $conn->send ("reply n");
171 $dialog->destroy; 179 $dialog->destroy;
172 0 180 0
173 } 181 }
174 ); 182 );
175 $hbox->add (new CFClient::UI::Button 183 $hbox->add (new CFPlus::UI::Button
176 text => "Yes", 184 text => "Yes",
177 on_activate => sub { 185 on_activate => sub {
178 $conn->send ("reply y"); 186 $conn->send ("reply y");
179 destroy_query_dialog $conn; 187 destroy_query_dialog $conn;
180 0 188 0
… …
182 ); 190 );
183 191
184 $dialog->grab_focus; 192 $dialog->grab_focus;
185 193
186 } elsif ($flags & CS_QUERY_SINGLECHAR) { 194 } elsif ($flags & CS_QUERY_SINGLECHAR) {
187 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 195 $dialog->{tooltip} = "#charcreation_focus";
188 196
189 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) {
190 $MESSAGE_WINDOW->show; 198 $MESSAGE_WINDOW->show;
191 199
192 unshift @dialog, new CFClient::UI::Label 200 unshift @dialog, new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 201 max_w => $::WIDTH * 0.4,
194 ellipsise => 0, 202 ellipsise => 0,
195 markup => "\nOr use your keyboard and the text entry below:\n"; 203 markup => "\nOr use your keyboard and the text entry below:\n";
196 204
197 unshift @dialog, my $table = new CFClient::UI::Table; 205 unshift @dialog, my $table = new CFPlus::UI::Table;
198 206
199 $table->add (0, 0, new CFClient::UI::Button 207 $table->add (0, 0, new CFPlus::UI::Button
200 text => "Next Race", 208 text => "Next Race",
201 on_activate => sub { 209 on_activate => sub {
202 $conn->send ("reply n"); 210 $conn->send ("reply n");
203 destroy_query_dialog $conn; 211 destroy_query_dialog $conn;
204 0 212 0
205 }, 213 },
206 ); 214 );
207 $table->add (2, 0, new CFClient::UI::Button 215 $table->add (2, 0, new CFPlus::UI::Button
208 text => "Accept", 216 text => "Accept",
209 on_activate => sub { 217 on_activate => sub {
210 $conn->send ("reply d"); 218 $conn->send ("reply d");
211 destroy_query_dialog $conn; 219 destroy_query_dialog $conn;
212 0 220 0
213 }, 221 },
214 ); 222 );
215 223
216 unshift @dialog, new CFClient::UI::Label 224 unshift @dialog, new CFPlus::UI::Label
217 max_w => $::WIDTH * 0.4, 225 max_w => $::WIDTH * 0.4,
218 ellipsise => 0, 226 ellipsise => 0,
219 markup => 227 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220 "<big><b>Character Creation: Race</b></big>\n\n"
221 . "Look at the <b>Messages</b> window to see a description of this race "
222 . "and the center of the screen to see how this race looks like "
223 . "(<small>below this dialog window: you may need to move the dialog away and "
224 . "click into the display area to make it visible</small>).\n\n"
225 . "You can look at another race, or accept this race (you will cycle back to "
226 . "this race eventually, so you can take your time making this important choice."
227 ; 228 ;
228 229
229 } elsif ($prompt =~ /roll new stats/) { 230 } elsif ($prompt =~ /roll new stats/) {
230 if (my $stat = delete $conn->{stat_change_with}) { 231 if (my $stat = delete $conn->{stat_change_with}) {
231 $conn->send ("reply $stat"); 232 $conn->send ("reply $stat");
… …
234 } 235 }
235 236
236 $STATS_PAGE->show; 237 $STATS_PAGE->show;
237 $MESSAGE_WINDOW->hide; 238 $MESSAGE_WINDOW->hide;
238 239
239 unshift @dialog, new CFClient::UI::Label 240 unshift @dialog, new CFPlus::UI::Label
240 max_w => $::WIDTH * 0.4, 241 max_w => $::WIDTH * 0.4,
241 ellipsise => 0, 242 ellipsise => 0,
242 markup => "\nOr use your keyboard and the text entry below:\n"; 243 markup => "\nOr use your keyboard and the text entry below:\n";
243 244
244 unshift @dialog, my $table = new CFClient::UI::Table; 245 unshift @dialog, my $table = new CFPlus::UI::Table;
245 246
246 # left: re-roll 247 # left: re-roll
247 $table->add (0, 0, new CFClient::UI::Button 248 $table->add (0, 0, new CFPlus::UI::Button
248 text => "Roll Again", 249 text => "Roll Again",
249 on_activate => sub { 250 on_activate => sub {
250 $conn->send ("reply y"); 251 $conn->send ("reply y");
251 destroy_query_dialog $conn; 252 destroy_query_dialog $conn;
252 0 253 0
253 }, 254 },
254 ); 255 );
255 256
256 # center: swap stats 257 # center: swap stats
257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 258 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258 expand => 1, 259 expand => 1,
259 value => $_, 260 value => $_,
260 options => [ 261 options => [
261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 262 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 263 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
266 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268 ], 269 ],
269 ), 1 .. 2; 270 ), 1 .. 2;
270 271
271 $table->add (2, 0, new CFClient::UI::Button 272 $table->add (2, 0, new CFPlus::UI::Button
272 text => "Swap Stats", 273 text => "Swap Stats",
273 on_activate => sub { 274 on_activate => sub {
274 $conn->{stat_change_with} = $sw2->{value}; 275 $conn->{stat_change_with} = $sw2->{value};
275 $conn->send ("reply $sw1->{value}"); 276 $conn->send ("reply $sw1->{value}");
276 destroy_query_dialog $conn; 277 destroy_query_dialog $conn;
277 0 278 0
278 }, 279 },
279 ); 280 );
280 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281 282
282 # right: accept 283 # right: accept
283 $table->add (4, 0, new CFClient::UI::Button 284 $table->add (4, 0, new CFPlus::UI::Button
284 text => "Accept", 285 text => "Accept",
285 on_activate => sub { 286 on_activate => sub {
286 $conn->send ("reply n"); 287 $conn->send ("reply n");
287 $STATS_PAGE->hide; 288 $STATS_PAGE->hide;
288 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
289 0 290 0
290 }, 291 },
291 ); 292 );
292 293
293 unshift @dialog, my $hbox = new CFClient::UI::HBox; 294 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294 for ( 295 for (
295 [Str => CS_STAT_STR], 296 [Str => CS_STAT_STR],
296 [Dex => CS_STAT_DEX], 297 [Dex => CS_STAT_DEX],
297 [Con => CS_STAT_CON], 298 [Con => CS_STAT_CON],
298 [Int => CS_STAT_INT], 299 [Int => CS_STAT_INT],
299 [Wis => CS_STAT_WIS], 300 [Wis => CS_STAT_WIS],
300 [Pow => CS_STAT_POW], 301 [Pow => CS_STAT_POW],
301 [Cha => CS_STAT_CHA], 302 [Cha => CS_STAT_CHA],
302 ) { 303 ) {
303 my ($name, $id) = @$_; 304 my ($name, $id) = @$_;
304 $hbox->add (new CFClient::UI::Label 305 $hbox->add (new CFPlus::UI::Label
305 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 306 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306 align => 0, 307 align => 0,
307 expand => 1, 308 expand => 1,
308 can_events => 1, 309 can_events => 1,
309 can_hover => 1, 310 can_hover => 1,
310 tooltip => $CFClient::STAT_TOOLTIP{$name}, 311 tooltip => "#stat_$name",
311 ); 312 );
312 } 313 }
313 314
314 unshift @dialog, new CFClient::UI::Label 315 unshift @dialog, new CFPlus::UI::Label
315 max_w => $::WIDTH * 0.4, 316 max_w => $::WIDTH * 0.4,
316 ellipsise => 0, 317 ellipsise => 0,
317 markup => 318 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
318 "<big><b>Character Creation: Stats</b></big>\n\n"
319 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
320 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321 . "They will be modified later by both the race and the class you choose.\n\n"
322 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323 ; 319 ;
324 } 320 }
325 321
326 push @dialog, my $entry = new CFClient::UI::Entry 322 push @dialog, my $entry = new CFPlus::UI::Entry
327 on_changed => sub { 323 on_changed => sub {
328 $conn->send ("reply $_[1]"); 324 $conn->send ("reply $_[1]");
329 destroy_query_dialog $conn; 325 destroy_query_dialog $conn;
330 0 326 0
331 }, 327 },
… …
334 $entry->grab_focus; 330 $entry->grab_focus;
335 331
336 } else { 332 } else {
337 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 333 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338 334
339 push @dialog, my $entry = new CFClient::UI::Entry 335 push @dialog, my $entry = new CFPlus::UI::Entry
340 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 336 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341 on_activate => sub { 337 on_activate => sub {
342 $conn->send ("reply $_[1]"); 338 $conn->send ("reply $_[1]");
343 destroy_query_dialog $conn; 339 destroy_query_dialog $conn;
344 0 340 0
… …
360 356
361 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362 358
363 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
364 360
365 $MAP = new CFClient::Map $mapsize, $mapsize; 361 $MAP = new CFPlus::Map $mapsize, $mapsize;
366 362
367 $CONN = eval { 363 $CONN = eval {
368 new CFClient::Protocol 364 new CFPlus::Protocol
369 host => $host, 365 host => $host,
370 port => $port || 13327, 366 port => $port || 13327,
371 user => $CFG->{profile}{default}{user}, 367 user => $CFG->{profile}{default}{user},
372 pass => $CFG->{profile}{default}{password}, 368 pass => $CFG->{profile}{default}{password},
373 mapw => $mapsize, 369 mapw => $mapsize,
… …
392 $chunk->play; 388 $chunk->play;
393 }, 389 },
394 }; 390 };
395 391
396 if ($CONN) { 392 if ($CONN) {
397 CFClient::lowdelay fileno $CONN->{fh}; 393 CFPlus::lowdelay fileno $CONN->{fh};
398 394
399 status "login successful"; 395 status "login successful";
400 } else { 396 } else {
401 status "unable to connect"; 397 status "unable to connect";
402 stop_game(); 398 stop_game();
… …
420 416
421 undef $MAP; 417 undef $MAP;
422} 418}
423 419
424sub graphics_setup { 420sub graphics_setup {
425 my $vbox = new CFClient::UI::VBox; 421 my $vbox = new CFPlus::UI::VBox;
426 422
427 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428 424
429 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
431 427
432 $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]); 428 $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]);
433 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434 430
435 $mode_slider->connect (changed => sub { 431 $mode_slider->connect (changed => sub {
436 my ($self, $value) = @_; 432 my ($self, $value) = @_;
437 433
438 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
440 }); 436 });
441 $mode_slider->emit (changed => $mode_slider->{range}[0]); 437 $mode_slider->emit (changed => $mode_slider->{range}[0]);
442 438
443 my $row = 1; 439 my $row = 1;
444 440
445 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447 state => $CFG->{fullscreen}, 443 state => $CFG->{fullscreen},
448 tooltip => "Bring the client into fullscreen mode.", 444 tooltip => "Bring the client into fullscreen mode.",
449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450 ); 446 );
451 447
452 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFPlus::UI::CheckBox
454 state => $CFG->{fast}, 450 state => $CFG->{fast},
455 tooltip => "Lower the visual quality considerably to speed up rendering.", 451 tooltip => "Lower the visual quality considerably to speed up rendering.",
456 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457 ); 453 );
458 454
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460 $table->add (1, $row++, new CFClient::UI::Slider 456 $table->add (1, $row++, new CFPlus::UI::Slider
461 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464 ); 460 );
465 461
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467 $table->add (1, $row++, new CFClient::UI::CheckBox 463 $table->add (1, $row++, new CFPlus::UI::CheckBox
468 state => $CFG->{fow_enable}, 464 state => $CFG->{fow_enable},
469 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471 ); 467 );
472 468
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFPlus::UI::Slider
475 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 472 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478 ); 474 );
479 475
480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481 $table->add (1, $row++, new CFClient::UI::CheckBox 477 $table->add (1, $row++, new CFPlus::UI::CheckBox
482 state => $CFG->{fow_smooth}, 478 state => $CFG->{fow_smooth},
483 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484 on_changed => sub { 480 on_changed => sub {
485 my ($self, $value) = @_; 481 my ($self, $value) = @_;
486 $CFG->{fow_smooth} = $value; 482 $CFG->{fow_smooth} = $value;
487 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488 0 484 0
489 } 485 }
490 ); 486 );
491 487
492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFPlus::UI::Slider
494 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497 ); 493 );
498 494
499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500 $table->add (1, $row++, new CFClient::UI::Slider 496 $table->add (1, $row++, new CFPlus::UI::Slider
501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504 ); 500 );
505 501
506 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507 $table->add (1, $row++, new CFClient::UI::Slider 503 $table->add (1, $row++, new CFPlus::UI::Slider
508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510 on_changed => sub { 506 on_changed => sub {
511 $CFG->{gauge_fontsize} = $_[1]; 507 $CFG->{gauge_fontsize} = $_[1];
512 &set_gauge_window_fontsize; 508 &set_gauge_window_fontsize;
513 0 509 0
514 } 510 }
515 ); 511 );
516 512
517 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518 $table->add (1, $row++, new CFClient::UI::Slider 514 $table->add (1, $row++, new CFPlus::UI::Slider
519 range => [$CFG->{gauge_size}, 0.2, 0.8], 515 range => [$CFG->{gauge_size}, 0.2, 0.8],
520 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521 on_changed => sub { 517 on_changed => sub {
522 $CFG->{gauge_size} = $_[1]; 518 $CFG->{gauge_size} = $_[1];
523 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524 0 520 0
525 } 521 }
526 ); 522 );
527 523
528 $table->add (1, $row++, new CFClient::UI::Button 524 $table->add (1, $row++, new CFPlus::UI::Button
529 expand => 1, align => 0, text => "Apply", 525 expand => 1, align => 0, text => "Apply",
530 tooltip => "Apply the video settings", 526 tooltip => "Apply the video settings",
531 on_activate => sub { 527 on_activate => sub {
532 video_shutdown (); 528 video_shutdown ();
533 video_init (); 529 video_init ();
… …
537 533
538 $vbox 534 $vbox
539} 535}
540 536
541sub audio_setup { 537sub audio_setup {
542 my $vbox = new CFClient::UI::VBox; 538 my $vbox = new CFPlus::UI::VBox;
543 539
544 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545 541
546 my $row = 0; 542 my $row = 0;
547 543
548 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549 $table->add (1, $row++, new CFClient::UI::CheckBox 545 $table->add (1, $row++, new CFPlus::UI::CheckBox
550 state => $CFG->{audio_enable}, 546 state => $CFG->{audio_enable},
551 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 547 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.",
552 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553 ); 549 );
554# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
555# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556# $CFG->{effects_volume} = $_[1]; 552# $CFG->{effects_volume} = $_[1];
557# }); 553# });
558 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560 $hbox->add (new CFClient::UI::CheckBox 556 $hbox->add (new CFPlus::UI::CheckBox
561 expand => 1, state => $CFG->{bgm_enable}, 557 expand => 1, state => $CFG->{bgm_enable},
562 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564 ); 560 );
565 $hbox->add (new CFClient::UI::Slider 561 $hbox->add (new CFPlus::UI::Slider
566 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567 tooltip => "The volume of the background music. Changes are instant.", 563 tooltip => "The volume of the background music. Changes are instant.",
568 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569 ); 565 );
570 566
571 $table->add (1, $row++, new CFClient::UI::Button 567 $table->add (1, $row++, new CFPlus::UI::Button
572 expand => 1, align => 0, text => "Apply", 568 expand => 1, align => 0, text => "Apply",
573 tooltip => "Apply the audio settings", 569 tooltip => "Apply the audio settings",
574 on_activate => sub { 570 on_activate => sub {
575 audio_shutdown (); 571 audio_shutdown ();
576 audio_init (); 572 audio_init ();
… …
588} 584}
589 585
590sub make_gauge_window { 586sub make_gauge_window {
591 my $gh = int $HEIGHT * $CFG->{gauge_size}; 587 my $gh = int $HEIGHT * $CFG->{gauge_size};
592 588
593 my $win = new CFClient::UI::Frame ( 589 my $win = new CFPlus::UI::Frame (
594 force_x => 0, 590 force_x => 0,
595 force_y => "max", 591 force_y => "max",
596 force_w => $WIDTH, 592 force_w => $WIDTH,
597 force_h => $gh, 593 force_h => $gh,
598 ); 594 );
599 595
600 $win->add (my $hbox = new CFClient::UI::HBox 596 $win->add (my $hbox = new CFPlus::UI::HBox
601 children => [ 597 children => [
602 (new CFClient::UI::HBox expand => 1), 598 (new CFPlus::UI::HBox expand => 1),
603 (new CFClient::UI::VBox children => [ 599 (new CFPlus::UI::VBox children => [
604 (new CFClient::UI::Empty expand => 1), 600 (new CFPlus::UI::Empty expand => 1),
605 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 601 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606 ]), 602 ]),
607 (my $vbox = new CFClient::UI::VBox), 603 (my $vbox = new CFPlus::UI::VBox),
608 ], 604 ],
609 ); 605 );
610 606
611 $vbox->add (new CFClient::UI::HBox 607 $vbox->add (new CFPlus::UI::HBox
612 expand => 1, 608 expand => 1,
613 children => [ 609 children => [
614 (new CFClient::UI::Empty expand => 1), 610 (new CFPlus::UI::Empty expand => 1),
615 (my $hb = new CFClient::UI::HBox), 611 (my $hb = new CFPlus::UI::HBox),
616 ], 612 ],
617 ); 613 );
618 614
619 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 615 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
620 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.");
621 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 616 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
622 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.");
623 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 617 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
624 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.");
625 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 618 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
626 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.");
627 619
628 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 620 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
629 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.");
630 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 621 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
631 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632 622
633 $GAUGES = { 623 $GAUGES = {
634 exp => $exp, win => $win, range => $rng, 624 exp => $exp, win => $win, range => $rng,
635 food => $fg, mana => $mg, hp => $hg, grace => $gg 625 food => $fg, mana => $mg, hp => $hg, grace => $gg
636 }; 626 };
… …
639 629
640 $win 630 $win
641} 631}
642 632
643sub debug_setup { 633sub debug_setup {
644 my $table = new CFClient::UI::Table; 634 my $table = new CFPlus::UI::Table;
645 635
646 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
654 644
655 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656 646
657 for my $x (0..2) { 647 for my $x (0..2) {
658 for my $y (0 .. 2) { 648 for my $y (0 .. 2) {
659 $table->add ($x + 3, $y, 649 $table->add ($x + 3, $y,
660 new CFClient::UI::Entry 650 new CFPlus::UI::Entry
661 text => $default_smooth[$x * 3 + $y], 651 text => $default_smooth[$x * 3 + $y],
662 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663 ); 653 );
664 } 654 }
665 } 655 }
… …
667 657
668 $table 658 $table
669} 659}
670 660
671sub stats_window { 661sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow ( 662 my $r = new CFPlus::UI::ScrolledWindow (
673 expand => 1, 663 expand => 1,
674 scroll_y => 1 664 scroll_y => 1
675 ); 665 );
676 $r->add (my $vb = new CFClient::UI::VBox); 666 $r->add (my $vb = new CFPlus::UI::VBox);
677 667
668 $vb->add (new CFPlus::UI::FancyFrame
669 label => "Player",
670 child => (my $pi = new CFPlus::UI::VBox),
671 );
672
678 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 673 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679 can_hover => 1, can_events => 1, 674 can_hover => 1, can_events => 1,
680 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 675 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 676 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
683 tooltip => "The map you are currently on (if supported by the server)."); 678 tooltip => "The map you are currently on (if supported by the server).");
684 679
685 $vb->add (my $hb0 = new CFClient::UI::HBox); 680 $pi->add (my $hb0 = new CFPlus::UI::HBox);
686 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 681 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
688 tooltip => "The weight of the player including all inventory items."); 683 tooltip => "The weight of the player including all inventory items.");
689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 684 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690 can_hover => 1, can_events => 1, 685 can_hover => 1, can_events => 1,
691 tooltip => "The weight limit: you cannot carry more than this."); 686 tooltip => "The weight limit: you cannot carry more than this.");
692 687
693 688 $vb->add (new CFPlus::UI::FancyFrame
689 label => "Primary/Secondary Statistics",
694 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 690 child => (my $hb = new CFPlus::UI::HBox expand => 1),
691 );
695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 692 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696 693
697 my $color2 = [1, 1, 0]; 694 my $color2 = [1, 1, 0];
698 695
699 for ( 696 for (
700 [0, 0, st_str => "Str", 30], 697 [0, 0, st_str => "Str", 30],
… …
712 [2, 4, st_spd => "Spd", 10.54], 709 [2, 4, st_spd => "Spd", 10.54],
713 [2, 5, st_wspd => "WSp", 10.54], 710 [2, 5, st_wspd => "WSp", 10.54],
714 ) { 711 ) {
715 my ($col, $row, $id, $label, $template) = @$_; 712 my ($col, $row, $id, $label, $template) = @$_;
716 713
717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 716 align => +1, template => $template, tooltip => "#stat_$label");
720 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 717 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
721 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 718 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 719 align => -1, text => $label, tooltip => "#stat_$label");
723 } 720 }
724 721
722 $vb->add (new CFPlus::UI::FancyFrame
723 label => "Resistancies",
725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
725 );
726 726
727 my $row = 0; 727 my $row = 0;
728 my $col = 0; 728 my $col = 0;
729 729
730 my %resist_names = ( 730 my %resist_names = (
… …
769 drain acid pois para deat phys 769 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
771 { 771 {
772 $tbl2->add ($col, $row, 772 $tbl2->add ($col, $row,
773 $STATWIDS->{"res_$_"} = 773 $STATWIDS->{"res_$_"} =
774 new CFClient::UI::Label 774 new CFPlus::UI::Label
775 font => $FONT_FIXED, 775 font => $FONT_FIXED,
776 template => "-100%", 776 template => "-100%",
777 align => +1, 777 align => +1,
778 valign => 0, 778 valign => 0,
779 can_events => 1, 779 can_events => 1,
780 can_hover => 1, 780 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 781 tooltip => $resist_names{$_}->[1],
782 ); 782 );
783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 784 font => $FONT_FIXED,
785 can_hover => 1, 785 can_hover => 1,
786 can_events => 1, 786 can_events => 1,
787 path => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 788 tooltip => $resist_names{$_}->[1],
789 ); 789 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 790 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 791 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 792 font => $FONT_FIXED,
793 can_hover => 1, 793 can_hover => 1,
794 can_events => 1, 794 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 795 tooltip => $resist_names{$_}->[1],
… …
806 806
807 $r 807 $r
808} 808}
809 809
810sub skill_window { 810sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 811 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 812 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813 $sw 813 $sw
814} 814}
815 815
816sub formsep($) { 816sub formsep($) {
817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
828 return if $METASERVER_ATIME > time; 828 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 829 $METASERVER_ATIME = time + 60;
830 830
831 my $table = $METASERVER->{table}; 831 my $table = $METASERVER->{table};
832 $table->clear; 832 $table->clear;
833 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 834
835 my $buf; 835 my $buf;
836 836
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
838 838
… …
861 "The time this server has been running without being restarted.", 861 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 862 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 863 "Short information about this server provided by its admins.",
864 ); 864 );
865 my @col = qw(#Users Host Uptime Version Description); 865 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFClient::UI::Label 866 $table->add ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 867 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 868 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 869 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 870 for 0 .. $#col;
871 871
… …
892 892
893 $m = [$users, $host, $uptime, $version, $desc]; 893 $m = [$users, $host, $uptime, $version, $desc];
894 894
895 $y++; 895 $y++;
896 896
897 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFClient::UI::Button 898 (new CFPlus::UI::Button
899 text => "Use", 899 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 900 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 901 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903 $METASERVER->hide; 903 $METASERVER->hide;
904 0 904 0
905 }, 905 },
906 ), 906 ),
907 (new CFClient::UI::Empty expand => 1), 907 (new CFPlus::UI::Empty expand => 1),
908 ]); 908 ]);
909 909
910 $table->add ($_, $y, new CFClient::UI::Label 910 $table->add ($_, $y, new CFPlus::UI::Label
911 ellipsise => 0, 911 ellipsise => 0,
912 align => $align[$_], 912 align => $align[$_],
913 text => $m->[$_], 913 text => $m->[$_],
914 tooltip => $tip[$_], 914 tooltip => $tip[$_],
915 can_hover => 1, 915 can_hover => 1,
… …
920 } 920 }
921 }); 921 });
922} 922}
923 923
924sub metaserver_dialog { 924sub metaserver_dialog {
925 my $vbox = new CFClient::UI::VBox; 925 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFClient::UI::Table; 926 my $table = new CFPlus::UI::Table;
927 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 927 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928 928
929 my $dialog = new CFClient::UI::FancyFrame 929 my $dialog = new CFPlus::UI::Toplevel
930 title => "Server List", 930 title => "Server List",
931 name => 'metaserver_dialog', 931 name => 'metaserver_dialog',
932 x => 'center', 932 x => 'center',
933 y => 'center', 933 y => 'center',
934 z => 3, 934 z => 3,
… …
944 944
945 $dialog 945 $dialog
946} 946}
947 947
948sub server_setup { 948sub server_setup {
949 my $vbox = new CFClient::UI::VBox; 949 my $vbox = new CFPlus::UI::VBox;
950 950
951 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings",
951 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 953 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
954 );
952 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 955 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953 956
954 { 957 {
955 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956 959
957 $vbox->add ( 960 $vbox->add (
958 $HOST_ENTRY = new CFClient::UI::Entry 961 $HOST_ENTRY = new CFPlus::UI::Entry
959 expand => 1, 962 expand => 1,
960 text => $CFG->{profile}{default}{host}, 963 text => $CFG->{profile}{default}{host},
961 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 964 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962 on_changed => sub { 965 on_changed => sub {
963 my ($self, $value) = @_; 966 my ($self, $value) = @_;
964 $CFG->{profile}{default}{host} = $value; 967 $CFG->{profile}{default}{host} = $value;
965 0 968 0
966 } 969 }
967 ); 970 );
968 971
969 $vbox->add (new CFClient::UI::Button 972 $vbox->add (new CFPlus::UI::Button
970 expand => 1, 973 expand => 1,
971 text => "Server List", 974 text => "Server List",
972 other => $METASERVER, 975 other => $METASERVER,
973 tooltip => "Show a list of available crossfire servers", 976 tooltip => "Show a list of available crossfire servers",
974 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 977 on_activate => sub { $METASERVER->toggle_visibility; 0 },
975 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976 ); 979 );
977 } 980 }
978 981
979 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 982 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980 $table->add (1, 4, new CFClient::UI::Entry 983 $table->add (1, 4, new CFPlus::UI::Entry
981 text => $CFG->{profile}{default}{user}, 984 text => $CFG->{profile}{default}{user},
982 tooltip => "The name of your character on the server", 985 tooltip => "The name of your character on the server",
983 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984 ); 987 );
985 988
986 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 989 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987 $table->add (1, 5, new CFClient::UI::Entry 990 $table->add (1, 5, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{password}, 991 text => $CFG->{profile}{default}{password},
989 hidden => 1, 992 hidden => 1,
990 tooltip => "The password for your character", 993 tooltip => "The password for your character",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992 ); 995 );
993 996
994 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 997 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995 $table->add (1, 7, new CFClient::UI::Slider 998 $table->add (1, 7, new CFPlus::UI::Slider
996 force_w => 100, 999 force_w => 100,
997 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1000 range => [$CFG->{mapsize}, 10, 100, 0, 1],
998 tooltip => "This is the size of the portion of the map update the server sends you. " 1001 tooltip => "This is the size of the portion of the map update the server sends you. "
999 . "If you set this to a high value you will be able to see further, " 1002 . "If you set this to a high value you will be able to see further, "
1000 . "but you also increase bandwidth requirements and latency. " 1003 . "but you also increase bandwidth requirements and latency. "
1001 . "This option is only used once at log-in.", 1004 . "This option is only used once at log-in.",
1002 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003 ); 1006 );
1004 1007
1005 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1008 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1009 $table->add (1, 8, new CFPlus::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1010 state => $CFG->{face_prefetch},
1008 tooltip => "<b>Background Image Prefetch</b>\n\n" 1011 tooltip => "<b>Background Image Prefetch</b>\n\n"
1009 . "If enabled, the client automatically pre-fetches images from the server. " 1012 . "If enabled, the client automatically pre-fetches images from the server. "
1010 . "This might increase or create lag, but increases the chances " 1013 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1014 . "of faces being ready for display when you encounter them. "
… …
1013 . "so only set it if you really need to prefetch images. " 1016 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1017 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1019 );
1017 1020
1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1021 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019 $table->add (1, 9, new CFClient::UI::Entry 1022 $table->add (1, 9, new CFPlus::UI::Entry
1020 text => $CFG->{output_count}, 1023 text => $CFG->{output_count},
1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1026 );
1024 1027
1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1028 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026 $table->add (1, 10, new CFClient::UI::Entry 1029 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_sync}, 1030 text => $CFG->{output_sync},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1033 );
1031 1034
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033 expand => 1, 1036 expand => 1,
1034 align => 0, 1037 align => 0,
1035 text => "Login", 1038 text => "Login",
1036 on_activate => sub { 1039 on_activate => sub {
1037 $CONN ? stop_game 1040 $CONN ? stop_game
1038 : start_game; 1041 : start_game;
1039 0 1042 0
1040 }, 1043 },
1041 ); 1044 );
1042 1045
1043 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045 text => $CFG->{say_command}, 1048 text => $CFG->{say_command},
1046 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. " 1049 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. "
1047 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049 on_changed => sub { 1052 on_changed => sub {
… …
1051 $CFG->{say_command} = $value; 1054 $CFG->{say_command} = $value;
1052 0 1055 0
1053 } 1056 }
1054 ); 1057 );
1055 1058
1056 $vbox->add (new CFClient::UI::Label 1059 $vbox->add (new CFPlus::UI::FancyFrame
1057 text => "Server Info", 1060 label => "Server Info",
1058 fontsize => 1.2,
1059 padding_y => 8,
1060 fg => [1, 1, 0, 1],
1061 );
1062
1063 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 );
1064 1063
1065 $vbox 1064 $vbox
1066} 1065}
1067 1066
1068sub message_window { 1067sub message_window {
1069 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFPlus::UI::Toplevel
1070 name => "message_window", 1069 name => "message_window",
1071 title => "Messages", 1070 title => "Messages",
1072 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1073 x => "max", 1072 x => "max",
1074 y => 0, 1073 y => 0,
1075 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1076 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1077 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFPlus::UI::VBox),
1078 has_close_button => 1; 1077 has_close_button => 1;
1079 1078
1080 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1081 1080
1082 $vbox->add (my $input = new CFClient::UI::Entry 1081 $vbox->add (my $input = new CFPlus::UI::Entry
1083 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087 on_focus_in => sub { 1086 on_focus_in => sub {
… …
1126 }; 1125 };
1127 1126
1128 $window 1127 $window
1129} 1128}
1130 1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1131sub open_quit_dialog { 1149sub open_quit_dialog {
1132 unless ($QUIT_DIALOG) { 1150 unless ($QUIT_DIALOG) {
1133 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1134 x => "center", 1152 x => "center",
1135 y => "center", 1153 y => "center",
1136 z => 50, 1154 z => 50,
1137 title => "Really Quit?", 1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1138 ; 1160 ;
1139 1161
1140 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1141 1163
1142 $vb->add (new CFClient::UI::Label 1164 $vb->add (new CFPlus::UI::Label
1143 text => "You should find a savebed and apply it first!", 1165 text => "You should find a savebed and apply it first!",
1144 max_w => $WIDTH * 0.25, 1166 max_w => $WIDTH * 0.25,
1145 ellipsize => 0, 1167 ellipsize => 0,
1146 ); 1168 );
1147 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1148 $hb->add (new CFClient::UI::Button 1170 $hb->add (new CFPlus::UI::Button
1149 text => "Ok", 1171 text => "Ok",
1150 expand => 1, 1172 expand => 1,
1151 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152 ); 1174 );
1153 $hb->add (new CFClient::UI::Button 1175 $hb->add (new CFPlus::UI::Button
1154 text => "Quit anyway", 1176 text => "Quit anyway",
1155 expand => 1, 1177 expand => 1,
1156 on_activate => sub { exit }, 1178 on_activate => sub { exit },
1157 ); 1179 );
1158 } 1180 }
1159 1181
1160 $QUIT_DIALOG->show; 1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1161} 1184}
1162 1185
1163sub autopickup_setup { 1186sub autopickup_setup {
1164 my $table = new CFClient::UI::Table; 1187 my $table = new CFPlus::UI::Table;
1165 1188
1166 for ( 1189 for (
1167 ["General", 0, 0, 1190 ["General", 0, 0,
1168 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1191 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169 ["Inhibit autopickup" => PICKUP_INHIBIT], 1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1203 ], 1226 ],
1204 ["Weight/Value ratio", 2, 17] 1227 ["Weight/Value ratio", 2, 17]
1205 ) 1228 )
1206 { 1229 {
1207 my ($title, $x, $y, @bits) = @$_; 1230 my ($title, $x, $y, @bits) = @$_;
1208 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1231 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1209 1232
1210 for (@bits) { 1233 for (@bits) {
1211 ++$y; 1234 ++$y;
1212 1235
1213 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1214 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1215 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216 state => $::CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1217 on_changed => sub { 1240 on_changed => sub {
1218 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1219 1242
1220 if ($value) { 1243 if ($value) {
… …
1231 1254
1232 ${$_->[2]} = $checkbox if $_->[2]; 1255 ${$_->[2]} = $checkbox if $_->[2];
1233 } 1256 }
1234 } 1257 }
1235 1258
1236 $table->add (2, 18, new CFClient::UI::ValSlider 1259 $table->add (2, 18, new CFPlus::UI::ValSlider
1237 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238 template => ">= 99", 1261 template => ">= 99",
1239 to_value => sub { ">= " . 5 * $_[0] }, 1262 to_value => sub { ">= " . 5 * $_[0] },
1240 on_changed => sub { 1263 on_changed => sub {
1241 my ($slider, $value) = @_; 1264 my ($slider, $value) = @_;
… …
1244 $::CFG->{pickup} |= int $value 1267 $::CFG->{pickup} |= int $value
1245 if $value; 1268 if $value;
1246 1; 1269 1;
1247 }); 1270 });
1248 1271
1249 $table->add (3, 18, new CFClient::UI::Button 1272 $table->add (3, 18, new CFPlus::UI::Button
1250 text => "set", 1273 text => "set",
1251 on_activate => sub { 1274 on_activate => sub {
1252 $::CONN->send_command ("pickup $::CFG->{pickup}") 1275 $::CONN->send_command ("pickup $::CFG->{pickup}")
1253 if defined $::CONN; 1276 if defined $::CONN;
1254 0 1277 0
1255 }); 1278 });
1256 1279
1257 $table 1280 $table
1258} 1281}
1259 1282
1283my %SORT_ORDER = (
1284 type => undef,
1285 mtime => sub { sort {
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime}
1288 or $a->{type} <=> $b->{type}
1289 } @_ },
1290 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type}
1293 } @_ },
1294);
1295
1260sub inventory_widget { 1296sub inventory_widget {
1261 my $hb = new CFClient::UI::HBox homogeneous => 1; 1297 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262 1298
1263 $hb->add (my $vb1 = new CFClient::UI::VBox); 1299 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1264 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1300 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265 1301
1266 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1302 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267 1303
1268 use sort 'stable'; 1304 use sort 'stable';
1269 1305
1270 $hb1->add (new CFClient::UI::Combobox 1306 $hb1->add (new CFPlus::UI::Selector
1271 value => undef, 1307 value => $::CFG->{inv_sort},
1272 options => [ 1308 options => [
1273 [undef, "Type/Name"], 1309 [type => "Type/Name"],
1274 [ 1310 [mtime => "Recent/Normal/Locked"],
1275 sub { sort {
1276 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 "Weight/Type", 1311 [weight => "Weight/Type"],
1280 ],
1281 [sub { } => "#TODO#"],
1282 ], 1312 ],
1283 on_changed => sub { 1313 on_changed => sub {
1314 $::CFG->{inv_sort} = $_[1];
1284 $INV->set_sort_order ($_[1]); 1315 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1285 }, 1316 },
1286 ); 1317 );
1287 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1318 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1288 #TODO# update to weigh/maxweight 1319 #TODO# update to weigh/maxweight
1289 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290 1321
1291 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292 $sw1->add ($INV = new CFClient::UI::Inventory); 1323 $sw1->add ($INV = new CFPlus::UI::Inventory);
1293 1324
1294 $hb->add (my $vb2 = new CFClient::UI::VBox); 1325 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1295 1326
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297 1328
1298 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1329 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1299 $sw2->add ($INVR = new CFClient::UI::Inventory); 1330 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1300 1331
1301 # XXX: Call after $INVR = ... because set_opencont sets the items 1332 # XXX: Call after $INVR = ... because set_opencont sets the items
1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1333 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303 1334
1304 $hb 1335 $hb
1305} 1336}
1306 1337
1307sub toggle_player_page { 1338sub toggle_player_page {
… …
1314 $PL_WINDOW->show; 1345 $PL_WINDOW->show;
1315 } 1346 }
1316} 1347}
1317 1348
1318sub player_window { 1349sub player_window {
1319 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1350 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320 x => "center", 1351 x => "center",
1321 y => "center", 1352 y => "center",
1322 force_w => $WIDTH * 9/10, 1353 force_w => $WIDTH * 9/10,
1323 force_h => $HEIGHT * 9/10, 1354 force_h => $HEIGHT * 9/10,
1324 title => "Player", 1355 title => "Player",
… …
1326 has_close_button => 1 1357 has_close_button => 1
1327 ; 1358 ;
1328 1359
1329 my $ntb = 1360 my $ntb =
1330 $PL_NOTEBOOK = 1361 $PL_NOTEBOOK =
1331 new CFClient::UI::Notebook expand => 1, debug => 1; 1362 new CFPlus::UI::Notebook expand => 1, debug => 1;
1332 1363
1333 $ntb->add ( 1364 $ntb->add (
1334 "Statistics (F2)" => $STATS_PAGE = stats_window, 1365 "Statistics (F2)" => $STATS_PAGE = stats_window,
1335 "Shows statistics, where all your Stats and Resistances are shown." 1366 "Shows statistics, where all your Stats and Resistances are shown."
1336 ); 1367 );
1337 $ntb->add ( 1368 $ntb->add (
1338 "Skills (F3)" => $SKILL_PAGE = skill_window, 1369 "Skills (F3)" => $SKILL_PAGE = skill_window,
1339 "Shows all your Skills." 1370 "Shows all your Skills."
1340 ); 1371 );
1341 1372
1342 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1344 $ntb->add ( 1375 $ntb->add (
1345 "Spellbook (F4)" => $spellsw, 1376 "Spellbook (F4)" => $spellsw,
1346 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1377 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1347 ); 1378 );
1348 $ntb->add ( 1379 $ntb->add (
… …
1360sub update_bindings { 1391sub update_bindings {
1361 $BIND_UPD_CB->() if $BIND_UPD_CB; 1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1362} 1393}
1363 1394
1364sub keyboard_setup { 1395sub keyboard_setup {
1365 my $binding_list = new CFClient::UI::VBox; 1396 my $binding_list = new CFPlus::UI::VBox;
1366 1397
1367 my $refresh; 1398 my $refresh;
1368 $refresh = $BIND_UPD_CB = sub { 1399 $refresh = $BIND_UPD_CB = sub {
1369 $binding_list->clear (); 1400 $binding_list->clear ();
1370 1401
… …
1372 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1373 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1374 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375 1406
1376 my $lbl = join "; ", @$cmds; 1407 my $lbl = join "; ", @$cmds;
1377 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1378 $binding_list->add (my $hb = new CFClient::UI::HBox); 1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1379 $hb->add (new CFClient::UI::Button 1410 $hb->add (new CFPlus::UI::Button
1380 text => "delete", 1411 text => "delete",
1381 tooltip => "Deletes the binding", 1412 tooltip => "Deletes the binding",
1382 on_activate => sub { 1413 on_activate => sub {
1383 $binding_list->remove ($hb); 1414 $binding_list->remove ($hb);
1384 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385 0 1416 0
1386 }); 1417 });
1387 1418
1388 $hb->add (new CFClient::UI::Button 1419 $hb->add (new CFPlus::UI::Button
1389 text => "edit", 1420 text => "edit",
1390 tooltip => "Edits the binding", 1421 tooltip => "Edits the binding",
1391 on_activate => sub { 1422 on_activate => sub {
1392 $::BIND_EDITOR->set_binding ( 1423 $::BIND_EDITOR->set_binding (
1393 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1406 $::BIND_EDITOR->show; 1437 $::BIND_EDITOR->show;
1407 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1408 0 1439 0
1409 }); 1440 });
1410 1441
1411 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1412 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1413 } 1444 }
1414 } 1445 }
1415 }; 1446 };
1416 1447
1417 my $vb = new CFClient::UI::VBox; 1448 my $vb = new CFPlus::UI::VBox;
1418 $vb->add (my $hb = new CFClient::UI::HBox); 1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1419 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1420 $hb->add (new CFClient::UI::CheckBox 1454 $hb->add (new CFPlus::UI::CheckBox
1421 expand => 1, 1455 expand => 1,
1422 state => $CFG->{shift_fire_stop}, 1456 state => $CFG->{shift_fire_stop},
1423 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424 on_changed => sub { 1458 on_changed => sub {
1425 my ($cbox, $value) = @_; 1459 my ($cbox, $value) = @_;
1426 $CFG->{shift_fire_stop} = $value; 1460 $CFG->{shift_fire_stop} = $value;
1427 0 1461 0
1428 }); 1462 });
1429 1463
1430 $vb->add ($binding_list); 1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1431 $vb->add (my $hb = new CFClient::UI::HBox); 1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1432 1468
1433 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFPlus::UI::Button
1434 text => "record new", 1470 text => "record new",
1435 expand => 1, 1471 expand => 1,
1436 tooltip => "This button opens the binding editor with an empty binding.", 1472 tooltip => "This button opens the binding editor with an empty binding.",
1437 on_activate => sub { 1473 on_activate => sub {
1438 $::BIND_EDITOR->set_binding (undef, undef, [], 1474 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1452 $::BIND_EDITOR->show; 1488 $::BIND_EDITOR->show;
1453 0 1489 0
1454 }, 1490 },
1455 ); 1491 );
1456 1492
1457 $hb->add (new CFClient::UI::Button 1493 $hb->add (new CFPlus::UI::Button
1458 text => "close", 1494 text => "close",
1459 tooltip => "Closes the binding window", 1495 tooltip => "Closes the binding window",
1460 expand => 1, 1496 expand => 1,
1461 on_activate => sub { 1497 on_activate => sub {
1462 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
… …
1467 $refresh->(); 1503 $refresh->();
1468 1504
1469 $vb 1505 $vb
1470} 1506}
1471 1507
1472# just weirdness, pls. ignore
1473sub load_html_page {
1474 my ($viewer, $base) = @_;
1475
1476 $viewer->clear;
1477
1478 require LWP::Simple;
1479 require HTML::Parser;
1480 require URI;
1481
1482 my $page = LWP::Simple::get ($base)
1483 or return;
1484
1485 my @s = { };
1486 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488 my $parser = HTML::Parser->new (
1489 text_h => [sub {
1490 my ($text) = @_;
1491 $text =~ s/\s+/ /g;
1492 $s[-1]{text} .= CFClient::asxml $text;
1493 }, "dtext"],
1494 start_h => [sub {
1495 my ($tag, $attr) = @_;
1496 if ($passthrough{$tag}) {
1497 $s[-1]{text} .= "<$tag>";
1498 } elsif ($tag eq "h1") {
1499 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500 } elsif ($tag eq "h2") {
1501 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502 } elsif ($tag eq "h3") {
1503 push @s, { text => "<span size='large'>" };
1504 } elsif ($tag eq "a") {
1505 push @s, { text => "", url => $attr->{href} };
1506 } elsif ($tag eq "p") {
1507 push @s, { };
1508 } elsif ($tag eq "img") {
1509 eval {
1510 push @{$s[-1]{obj}}, new CFClient::UI::Image
1511 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512 $s[-1]{text} .= "\x{fffc}";
1513 };
1514 }
1515 }, "tagname, attr"],
1516 end_h => [sub {
1517 my ($tag) = @_;
1518 if ($passthrough{$tag}) {
1519 $s[-1]{text} .= "</$tag>";
1520 } elsif ($tag =~ /^h\d$/) {
1521 $s[-1]{text} .= "</span>";
1522 push @s, { };
1523 } elsif ($tag eq "a") {
1524 my $S = pop @s;
1525 $s[-1]{text} .= "\x{fffc}";
1526 push @{$s[-1]{obj}}, new CFClient::UI::Label
1527 fg => [0.8, 0.8, 1],
1528 markup => "<u>$S->{text}</u>",
1529 fontsize => 0.8,
1530 can_events => 1,
1531 can_focus => 1,
1532 on_button_up => sub {
1533 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534 },
1535 ;
1536 }
1537 }, "tagname"],
1538 );
1539
1540 $parser->parse ($page);
1541 $parser->eof;
1542
1543 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544 for @s;
1545
1546 $viewer->set_offset (0);
1547}
1548
1549sub help_window { 1508sub help_window {
1550 my $win = new CFClient::UI::FancyFrame 1509 my $win = new CFPlus::UI::Toplevel
1551 x => 'center', 1510 x => 'center',
1552 y => 'center', 1511 y => 'center',
1553 z => 2, 1512 z => 2,
1554 name => 'doc_browser', 1513 name => 'doc_browser',
1555 force_w => int $WIDTH * 7/8, 1514 force_w => int $WIDTH * 7/8,
1556 force_h => int $HEIGHT * 7/8, 1515 force_h => int $HEIGHT * 7/8,
1557 title => "Help Browser", 1516 title => "Help Browser",
1558 has_close_button => 1; 1517 has_close_button => 1;
1559 1518
1560 $win->add (my $vbox = new CFClient::UI::VBox); 1519 $win->add (my $vbox = new CFPlus::UI::VBox);
1561 1520
1562 $vbox->add (my $buttons = new CFClient::UI::HBox); 1521 $vbox->add (new CFPlus::UI::FancyFrame
1522 label => "Navigation",
1523 child => (my $buttons = new CFPlus::UI::HBox),
1524 );
1563 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564 expand => 1, fontsize => 0.8, padding_x => 4); 1526 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565 1527
1566 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1528 my @history;
1567 $buttons->add (my $combo = new CFClient::UI::Combobox 1529 my @future;
1568 value => undef, 1530 my $curnode;
1569 options => [ 1531
1570 [intro => "Introduction"], 1532 my $load_node; $load_node = sub {
1571 [manual => "Main Manual"],
1572 [skill_help => "Skill Reference"],
1573 [command_help => "Command Reference"],
1574 [dmcommand_help => "DM Commands"],
1575 [COPYING => "License Terms"],
1576 [test => "test (do not select)"], #d#TODO
1577 ],
1578 on_changed => sub {
1579 my ($self, $pod) = @_; 1533 my ($node) = @_;
1580 1534
1581 if ($pod eq "test") {#d#TODO 1535 $buttons->clear;
1582 eval { 1536
1583 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html"; 1537 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>",
1541 on_activate => sub {
1542 unshift @future, $curnode if $curnode;
1543 $load_node->(pop @history);
1584 }; 1544 },
1585 warn "$@" if $@;
1586 return;
1587 } 1545 );
1546 }
1588 1547
1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod", 1548 if (@future) {
1590 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] }; 1549 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>",
1552 on_activate => sub {
1553 push @history, $curnode;
1554 $load_node->(shift @future);
1555 },
1556 );
1557 }
1591 1558
1592 #use Data::Dumper; warn Dumper $pom;#d# 1559 $buttons->add (new CFPlus::UI::Label text => " ");
1593 1560
1561 my @path = CFPlus::Pod::full_path_of $node;
1562 pop @path; # drop current node
1563
1564 for my $node (@path) {
1565 $buttons->add (new CFPlus::UI::Button
1566 text => $node->{kw}[0],
1567 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1568 on_activate => sub {
1569 push @history, $curnode if $curnode; @future = ();
1570 $load_node->($node);
1571 },
1572 );
1573 $buttons->add (new CFPlus::UI::Label text => "/");
1574 }
1575
1576 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1577
1578 $curnode = $node;
1579
1594 $viewer->clear; 1580 $viewer->clear;
1595 1581 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1596# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1597# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1598# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1599# ]);#d#
1600
1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602 for @$pom;
1603
1604 $viewer->set_offset (0); 1582 $viewer->set_offset (0);
1605
1606 0
1607 },
1608 on_visibility_change => sub {
1609 my ($self, $visible) = @_;
1610 return unless $visible;
1611 return if $self->{value};
1612 $self->set_value ("intro");
1613 0
1614 },
1615 ); 1583 };
1584
1585 $load_node->(CFPlus::Pod::find pod => "mainpage");
1586
1587 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_;
1589
1590 push @history, $curnode if $curnode; @future = ();
1591
1592 $load_node->(CFPlus::Pod::find @path);
1593 $win->show;
1594 };
1616 1595
1617 $win 1596 $win
1618} 1597}
1619 1598
1620sub sdl_init { 1599sub sdl_init {
1621 CFClient::SDL_Init 1600 CFPlus::SDL_Init
1622 and die "SDL::Init failed!\n"; 1601 and die "SDL::Init failed!\n";
1623} 1602}
1624 1603
1625sub video_init { 1604sub video_init {
1626 sdl_init; 1605 sdl_init;
… …
1631 1610
1632 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1611 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633 $FULLSCREEN = $CFG->{fullscreen}; 1612 $FULLSCREEN = $CFG->{fullscreen};
1634 $FAST = $CFG->{fast}; 1613 $FAST = $CFG->{fast};
1635 1614
1636 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1615 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1637 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1616 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638 1617
1639 $SDL_ACTIVE = 1; 1618 $SDL_ACTIVE = 1;
1640 $LAST_REFRESH = time - 0.01; 1619 $LAST_REFRESH = time - 0.01;
1641 1620
1642 CFClient::OpenGL::init; 1621 CFPlus::OpenGL::init;
1643 1622
1644 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1623 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645 1624
1646 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1625 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647 1626
1648 ############################################################################# 1627 #############################################################################
1649 1628
1650 if ($DEBUG_STATUS) { 1629 if ($DEBUG_STATUS) {
1651 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1630 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652 } else { 1631 } else {
1653 # create the widgets 1632 # create the widgets
1654 1633
1655 $DEBUG_STATUS = new CFClient::UI::Label 1634 $DEBUG_STATUS = new CFPlus::UI::Label
1656 padding => 0, 1635 padding => 0,
1657 z => 100, 1636 z => 100,
1658 force_x => "max", 1637 force_x => "max",
1659 force_y => 0; 1638 force_y => 0;
1660 $DEBUG_STATUS->show; 1639 $DEBUG_STATUS->show;
1661 1640
1662 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1641 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1663 1642
1664 $STATUSBOX = new CFClient::UI::Statusbox; 1643 $STATUSBOX = new CFPlus::UI::Statusbox;
1665 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1644 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1666 1645
1667 (new CFClient::UI::Frame 1646 (new CFPlus::UI::Frame
1668 bg => [0, 0, 0, 0.4], 1647 bg => [0, 0, 0, 0.4],
1669 force_x => 0, 1648 force_x => 0,
1670 force_y => "max", 1649 force_y => "max",
1671 child => $STATUSBOX, 1650 child => $STATUSBOX,
1672 )->show; 1651 )->show;
1673 1652
1674 CFClient::UI::FancyFrame->new ( 1653 CFPlus::UI::Toplevel->new (
1675 title => "Map", 1654 title => "Map",
1676 name => "mapmap", 1655 name => "mapmap",
1677 x => 0, 1656 x => 0,
1678 y => $FONTSIZE + 8, 1657 y => $FONTSIZE + 8,
1679 border_bg => [1, 1, 1, 192/255], 1658 border_bg => [1, 1, 1, 192/255],
1680 bg => [1, 1, 1, 0], 1659 bg => [1, 1, 1, 0],
1681 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1660 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1661 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1683 ), 1662 ),
1684 )->show; 1663 )->show;
1685 1664
1686 $MAPWIDGET = new CFClient::MapWidget; 1665 $MAPWIDGET = new CFPlus::MapWidget;
1687 $MAPWIDGET->connect (activate_console => sub { 1666 $MAPWIDGET->connect (activate_console => sub {
1688 my ($mapwidget, $preset) = @_; 1667 my ($mapwidget, $preset) = @_;
1689 1668
1690 if ($CONSOLE) { 1669 if ($CONSOLE) {
1691 $CONSOLE->{input}->{auto_activated} = 1; 1670 $CONSOLE->{input}->{auto_activated} = 1;
… …
1697 } 1676 }
1698 }); 1677 });
1699 $MAPWIDGET->show; 1678 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 1679 $MAPWIDGET->grab_focus;
1701 1680
1702 $LOGVIEW = new CFClient::UI::TextScroller 1681 $LOGVIEW = new CFPlus::UI::TextScroller
1703 expand => 1, 1682 expand => 1,
1704 font => $FONT_FIXED, 1683 font => $FONT_FIXED,
1705 fontsize => $::CFG->{log_fontsize}, 1684 fontsize => $::CFG->{log_fontsize},
1706 indent => -4, 1685 indent => -4,
1707 can_hover => 1, 1686 can_hover => 1,
1708 can_events => 1, 1687 can_events => 1,
1709 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1688 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1710 ; 1689 ;
1711 1690
1712 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1691 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1713 title => "Setup", 1692 title => "Setup",
1714 name => "setup_dialog", 1693 name => "setup_dialog",
1715 x => 'center', 1694 x => 'center',
1716 y => 'center', 1695 y => 'center',
1717 z => 2, 1696 z => 2,
… …
1720 has_close_button => 1, 1699 has_close_button => 1,
1721 ; 1700 ;
1722 1701
1723 $METASERVER = metaserver_dialog; 1702 $METASERVER = metaserver_dialog;
1724 1703
1725 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1704 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1726 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1705 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727 1706
1728 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1707 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1729 "Configure the server to play on, your username, password and other server-related options."); 1708 "Configure the server to play on, your username, password and other server-related options.");
1730 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1709 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1731 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1710 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1741 . "After pressing the combo the binding will be saved automatically and the " 1720 . "After pressing the combo the binding will be saved automatically and the "
1742 . "binding editor closes"); 1721 . "binding editor closes");
1743 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1722 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1744 "Some debuggin' options. Do not ask."); 1723 "Some debuggin' options. Do not ask.");
1745 1724
1746 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1725 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1747 1726
1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1727 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1728 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1750 1729
1751 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1730 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1752 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1731 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1753 1732
1754 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 1733 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
1755 1734
1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1735 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1736 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1758 1737
1759 $BUTTONBAR->add (new CFClient::UI::Button 1738 $BUTTONBAR->add (new CFPlus::UI::Button
1760 text => "Save Config", 1739 text => "Save Config",
1761 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1740 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1762 on_activate => sub { 1741 on_activate => sub {
1763 $::CFG->{layout} = CFClient::UI::get_layout; 1742 $::CFG->{layout} = CFPlus::UI::get_layout;
1764 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1743 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765 status "Configuration Saved"; 1744 status "Configuration Saved";
1766 0 1745 0
1767 }, 1746 },
1768 ); 1747 );
1769 1748
1770 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1749 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1771 tooltip => "View Documentation"); 1750 tooltip => "View Documentation");
1772 1751
1773 $BUTTONBAR->add (new CFClient::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1774 text => "Quit", 1753 text => "Quit",
1775 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1776 on_activate => sub { 1755 on_activate => sub {
1777 if ($CONN) { 1756 if ($CONN) {
1778 open_quit_dialog; 1757 open_quit_dialog;
… …
1789 1768
1790 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1769 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1791} 1770}
1792 1771
1793sub video_shutdown { 1772sub video_shutdown {
1794 CFClient::OpenGL::shutdown; 1773 CFPlus::OpenGL::shutdown;
1795 1774
1796 undef $SDL_ACTIVE; 1775 undef $SDL_ACTIVE;
1797} 1776}
1798 1777
1799my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1778my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1807 1786
1808sub audio_music_finished { 1787sub audio_music_finished {
1809 return unless $CFG->{bgm_enable}; 1788 return unless $CFG->{bgm_enable};
1810 1789
1811 # TODO: hack, do play loop and mood music 1790 # TODO: hack, do play loop and mood music
1812 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1791 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1813 $bgmusic->play (0); 1792 $bgmusic->play (0);
1814 1793
1815 push @bgmusic, shift @bgmusic; 1794 push @bgmusic, shift @bgmusic;
1816} 1795}
1817 1796
1818sub audio_init { 1797sub audio_init {
1819 if ($CFG->{audio_enable}) { 1798 if ($CFG->{audio_enable}) {
1820 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1799 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1800 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822 1801
1823 unless ($SDL_MIXER) { 1802 unless ($SDL_MIXER) {
1824 status "Unable to open sound device: there will be no sound"; 1803 status "Unable to open sound device: there will be no sound";
1825 return; 1804 return;
1826 } 1805 }
1827 1806
1828 CFClient::Mix_AllocateChannels 8; 1807 CFPlus::Mix_AllocateChannels 8;
1829 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830 1809
1831 audio_music_finished; 1810 audio_music_finished;
1832 1811
1833 while (<$fh>) { 1812 while (<$fh>) {
1834 next if /^\s*#/; 1813 next if /^\s*#/;
… …
1837 my ($file, $volume, $event) = split /\s+/, $_, 3; 1816 my ($file, $volume, $event) = split /\s+/, $_, 3;
1838 1817
1839 push @SOUNDS, "$volume,$file"; 1818 push @SOUNDS, "$volume,$file";
1840 1819
1841 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1820 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1821 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843 $chunk->volume ($volume * 128 / 100); 1822 $chunk->volume ($volume * 128 / 100);
1844 $chunk 1823 $chunk
1845 }; 1824 };
1846 } 1825 }
1847 } else { 1826 } else {
… …
1849 } 1828 }
1850 } 1829 }
1851} 1830}
1852 1831
1853sub audio_shutdown { 1832sub audio_shutdown {
1854 CFClient::Mix_CloseAudio if $SDL_MIXER; 1833 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855 undef $SDL_MIXER; 1834 undef $SDL_MIXER;
1856 @SOUNDS = (); 1835 @SOUNDS = ();
1857 %AUDIO_CHUNKS = (); 1836 %AUDIO_CHUNKS = ();
1858} 1837}
1859 1838
… …
1866 1845
1867sub force_refresh { 1846sub force_refresh {
1868 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1847 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1848 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870 1849
1871 $CFClient::UI::ROOT->draw; 1850 $CFPlus::UI::ROOT->draw;
1872 1851
1873 $WANT_REFRESH = 0; 1852 $WANT_REFRESH = 0;
1874 $CAN_REFRESH = 0; 1853 $CAN_REFRESH = 0;
1875 $LAST_REFRESH = $NOW; 1854 $LAST_REFRESH = $NOW;
1876 1855
1877 CFClient::SDL_GL_SwapBuffers; 1856 CFPlus::SDL_GL_SwapBuffers;
1878} 1857}
1879 1858
1880my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1859my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881 $NOW = time; 1860 $NOW = time;
1882 1861
1883 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1862 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884 for CFClient::SDL_PollEvent; 1863 for CFPlus::SDL_PollEvent;
1885 1864
1886 if (%animate_object) { 1865 if (%animate_object) {
1887 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1866 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888 $WANT_REFRESH++; 1867 $WANT_REFRESH++;
1889 } 1868 }
… …
1913 $CONN->face_prefetch 1892 $CONN->face_prefetch
1914 if $CONN; 1893 if $CONN;
1915}); 1894});
1916 1895
1917%SDL_CB = ( 1896%SDL_CB = (
1918 CFClient::SDL_QUIT => sub { 1897 CFPlus::SDL_QUIT => sub {
1919 Event::unloop -1; 1898 Event::unloop -1;
1920 }, 1899 },
1921 CFClient::SDL_VIDEORESIZE => sub { 1900 CFPlus::SDL_VIDEORESIZE => sub {
1922 }, 1901 },
1923 CFClient::SDL_VIDEOEXPOSE => sub { 1902 CFPlus::SDL_VIDEOEXPOSE => sub {
1924 CFClient::UI::full_refresh; 1903 CFPlus::UI::full_refresh;
1925 }, 1904 },
1926 CFClient::SDL_ACTIVEEVENT => sub { 1905 CFPlus::SDL_ACTIVEEVENT => sub {
1927# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1906# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1928 }, 1907 },
1929 CFClient::SDL_KEYDOWN => sub { 1908 CFPlus::SDL_KEYDOWN => sub {
1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1909 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931 # alt-enter 1910 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle; 1911 $FULLSCREEN_ENABLE->toggle;
1933 video_shutdown; 1912 video_shutdown;
1934 video_init; 1913 video_init;
1935 } else { 1914 } else {
1936 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1915 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937 } 1916 }
1938 }, 1917 },
1939 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1918 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1919 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1920 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1921 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943 CFClient::SDL_USEREVENT => sub { 1922 CFPlus::SDL_USEREVENT => sub {
1944 if ($_[0]{code} == 1) { 1923 if ($_[0]{code} == 1) {
1945 audio_channel_finished $_[0]{data1}; 1924 audio_channel_finished $_[0]{data1};
1946 } elsif ($_[0]{code} == 0) { 1925 } elsif ($_[0]{code} == 0) {
1947 audio_music_finished; 1926 audio_music_finished;
1948 } 1927 }
… …
1952############################################################################# 1931#############################################################################
1953 1932
1954$SIG{INT} = $SIG{TERM} = sub { exit }; 1933$SIG{INT} = $SIG{TERM} = sub { exit };
1955 1934
1956{ 1935{
1957 local $SIG{__DIE__} = sub {
1958 return unless defined $^S && !$^S;
1959 Carp::confess $_[0];#d#TODO: remove when stable
1960 CFClient::fatal $_[0];
1961 };
1962
1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1936 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1964 CFClient::UI::set_layout ($::CFG->{layout}); 1937 CFPlus::UI::set_layout ($::CFG->{layout});
1965 1938
1966 my %DEF_CFG = ( 1939 my %DEF_CFG = (
1967 sdl_mode => 0, 1940 sdl_mode => 0,
1968 width => 640, 1941 width => 640,
1969 height => 480, 1942 height => 480,
… …
1985 bgm_volume => 0.25, 1958 bgm_volume => 0.25,
1986 face_prefetch => 0, 1959 face_prefetch => 0,
1987 output_sync => 1, 1960 output_sync => 1,
1988 output_count => 1, 1961 output_count => 1,
1989 pickup => 0, 1962 pickup => 0,
1963 inv_sort => "mtime",
1990 default => "profile", # default profile 1964 default => "profile", # default profile
1991 ); 1965 );
1992 1966
1993 while (my ($k, $v) = each %DEF_CFG) { 1967 while (my ($k, $v) = each %DEF_CFG) {
1994 $CFG->{$k} = $v unless exists $CFG->{$k}; 1968 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
1998 1972
1999 sdl_init; 1973 sdl_init;
2000 1974
2001 @SDL_MODES = reverse 1975 @SDL_MODES = reverse
2002 grep $_->[0] >= 640 && $_->[1] >= 480, 1976 grep $_->[0] >= 640 && $_->[1] >= 480,
2003 CFClient::SDL_ListModes; 1977 CFPlus::SDL_ListModes;
2004 1978
2005 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1979 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2006 1980
2007 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1981 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008 1982
2009 { 1983 {
2010 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1984 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011 DejaVuSans.ttf 1985 DejaVuSans.ttf
2012 DejaVuSansMono.ttf 1986 DejaVuSansMono.ttf
2013 DejaVuSans-Bold.ttf 1987 DejaVuSans-Bold.ttf
2014 DejaVuSansMono-Bold.ttf 1988 DejaVuSansMono-Bold.ttf
2015 DejaVuSans-Oblique.ttf 1989 DejaVuSans-Oblique.ttf
2016 DejaVuSansMono-Oblique.ttf 1990 DejaVuSansMono-Oblique.ttf
2017 DejaVuSans-BoldOblique.ttf 1991 DejaVuSans-BoldOblique.ttf
2018 DejaVuSansMono-BoldOblique.ttf 1992 DejaVuSansMono-BoldOblique.ttf
2019 ); 1993 );
2020 1994
2021 CFClient::add_font $_ for @fonts; 1995 CFPlus::add_font $_ for @fonts;
2022 1996
2023 CFClient::pango_init; 1997 CFPlus::pango_init;
2024 1998
2025 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1999 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2000 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027 2001
2028 $FONT_PROP->make_default; 2002 $FONT_PROP->make_default;
2029 } 2003 }
2030 2004
2031# compare mono (ft) vs. rgba (cairo) 2005# compare mono (ft) vs. rgba (cairo)
2032# ft - 1.8s, cairo 3s, even in alpha-only mode 2006# ft - 1.8s, cairo 3s, even in alpha-only mode
2033# for my $rgba (0..1) { 2007# for my $rgba (0..1) {
2034# my $t1 = Time::HiRes::time; 2008# my $t1 = Time::HiRes::time;
2035# for (1..1000) { 2009# for (1..1000) {
2036# my $layout = CFClient::Layout->new ($rgba); 2010# my $layout = CFPlus::Layout->new ($rgba);
2037# $layout->set_text ("hallo" x 100); 2011# $layout->set_text ("hallo" x 100);
2038# $layout->render; 2012# $layout->render;
2039# } 2013# }
2040# my $t2 = Time::HiRes::time; 2014# my $t2 = Time::HiRes::time;
2041# warn $t2-$t1; 2015# warn $t2-$t1;
… …
2044 video_init; 2018 video_init;
2045 audio_init; 2019 audio_init;
2046} 2020}
2047 2021
2048Event::loop; 2022Event::loop;
2049#CFClient::SDL_Quit; 2023#CFPlus::SDL_Quit;
2050#CFClient::_exit 0; 2024#CFPlus::_exit 0;
2051 2025
2052END { CFClient::SDL_Quit } 2026END { CFPlus::SDL_Quit }
2053 2027
2054=head1 NAME 2028=head1 NAME
2055 2029
2056cfplus - A Crossfire+ and Crossfire game client 2030cfplus - A Crossfire+ and Crossfire game client
2057 2031

Diff Legend

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