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.96 by root, Mon Jul 17 01:41:54 2006 UTC vs.
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC

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

Diff Legend

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