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.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.116 by root, Mon Aug 14 04:15:04 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::Toplevel
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 {
649 my $r =
650 new CFClient::UI::ScrolledWindow ( 662 my $r = new CFPlus::UI::ScrolledWindow (
651 expand => 1, 663 expand => 1,
652 scroll_y => 1 664 scroll_y => 1
653 ); 665 );
654 $r->add (my $vb = new CFClient::UI::VBox); 666 $r->add (my $vb = new CFPlus::UI::VBox);
655 667
668 $vb->add (new CFPlus::UI::FancyFrame
669 label => "Player",
670 child => (my $pi = new CFPlus::UI::VBox),
671 );
672
656 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 673 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
657 can_hover => 1, can_events => 1, 674 can_hover => 1, can_events => 1,
658 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 675 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
659 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 676 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
660 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
661 tooltip => "The map you are currently on (if supported by the server)."); 678 tooltip => "The map you are currently on (if supported by the server).");
662 679
663 $vb->add (my $hb0 = new CFClient::UI::HBox); 680 $pi->add (my $hb0 = new CFPlus::UI::HBox);
664 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 681 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
665 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
666 tooltip => "The weight of the player including all inventory items."); 683 tooltip => "The weight of the player including all inventory items.");
667 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 684 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
668 can_hover => 1, can_events => 1, 685 can_hover => 1, can_events => 1,
669 tooltip => "The weight limit: you cannot carry more than this."); 686 tooltip => "The weight limit: you cannot carry more than this.");
670 687
671 688 $vb->add (new CFPlus::UI::FancyFrame
689 label => "Primary/Secondary Statistics",
672 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 690 child => (my $hb = new CFPlus::UI::HBox expand => 1),
691 );
673 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 692 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
674 693
675 my $color2 = [1, 1, 0]; 694 my $color2 = [1, 1, 0];
676 695
677 for ( 696 for (
678 [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"], 697 [0, 0, st_str => "Str", 30],
679 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 698 [0, 1, st_dex => "Dex", 30],
680 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 699 [0, 2, st_con => "Con", 30],
681 [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"], 700 [0, 3, st_int => "Int", 30],
682 [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"], 701 [0, 4, st_wis => "Wis", 30],
683 [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"], 702 [0, 5, st_pow => "Pow", 30],
684 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 703 [0, 6, st_cha => "Cha", 30],
685 704
686 [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."], 705 [2, 0, st_wc => "Wc", -120],
687 [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."], 706 [2, 1, st_ac => "Ac", -120],
688 [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."], 707 [2, 2, st_dam => "Dam", 120],
689 [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."], 708 [2, 3, st_arm => "Arm", 120],
690 [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."], 709 [2, 4, st_spd => "Spd", 10.54],
691 [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."], 710 [2, 5, st_wspd => "WSp", 10.54],
692 ) { 711 ) {
693 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 712 my ($col, $row, $id, $label, $template) = @$_;
694 713
695 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
696 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716 align => +1, template => $template, tooltip => "#stat_$label");
697 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 717 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
698 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 718 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
719 align => -1, text => $label, tooltip => "#stat_$label");
699 } 720 }
700 721
722 $vb->add (new CFPlus::UI::FancyFrame
723 label => "Resistancies",
701 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
725 );
702 726
703 my $row = 0; 727 my $row = 0;
704 my $col = 0; 728 my $col = 0;
705 729
706 my %resist_names = ( 730 my %resist_names = (
… …
745 drain acid pois para deat phys 769 drain acid pois para deat phys
746 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
747 { 771 {
748 $tbl2->add ($col, $row, 772 $tbl2->add ($col, $row,
749 $STATWIDS->{"res_$_"} = 773 $STATWIDS->{"res_$_"} =
750 new CFClient::UI::Label 774 new CFPlus::UI::Label
751 font => $FONT_FIXED, 775 font => $FONT_FIXED,
752 template => "-100%", 776 template => "-100%",
753 align => +1, 777 align => +1,
754 valign => 0, 778 valign => 0,
755 can_events => 1, 779 can_events => 1,
756 can_hover => 1, 780 can_hover => 1,
757 tooltip => $resist_names{$_}->[1], 781 tooltip => $resist_names{$_}->[1],
758 ); 782 );
759 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
760 font => $FONT_FIXED, 784 font => $FONT_FIXED,
761 can_hover => 1, 785 can_hover => 1,
762 can_events => 1, 786 can_events => 1,
763 path => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
764 tooltip => $resist_names{$_}->[1], 788 tooltip => $resist_names{$_}->[1],
765 ); 789 );
766 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 790 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
767 text => $resist_names{$_}->[0], 791 text => $resist_names{$_}->[0],
768 font => $FONT_FIXED, 792 font => $FONT_FIXED,
769 can_hover => 1, 793 can_hover => 1,
770 can_events => 1, 794 can_events => 1,
771 tooltip => $resist_names{$_}->[1], 795 tooltip => $resist_names{$_}->[1],
… …
782 806
783 $r 807 $r
784} 808}
785 809
786sub skill_window { 810sub skill_window {
787 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 811 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
788 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 812 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
789 $sw 813 $sw
790} 814}
791 815
792sub formsep($) { 816sub formsep($) {
793 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
804 return if $METASERVER_ATIME > time; 828 return if $METASERVER_ATIME > time;
805 $METASERVER_ATIME = time + 60; 829 $METASERVER_ATIME = time + 60;
806 830
807 my $table = $METASERVER->{table}; 831 my $table = $METASERVER->{table};
808 $table->clear; 832 $table->clear;
809 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
810 834
811 my $buf; 835 my $buf;
812 836
813 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
814 838
… …
837 "The time this server has been running without being restarted.", 861 "The time this server has been running without being restarted.",
838 "The server software version - a '+' indicates a Crossfire+ server.", 862 "The server software version - a '+' indicates a Crossfire+ server.",
839 "Short information about this server provided by its admins.", 863 "Short information about this server provided by its admins.",
840 ); 864 );
841 my @col = qw(#Users Host Uptime Version Description); 865 my @col = qw(#Users Host Uptime Version Description);
842 $table->add ($_, 0, new CFClient::UI::Label 866 $table->add ($_, 0, new CFPlus::UI::Label
843 can_hover => 1, can_events => 1, 867 can_hover => 1, can_events => 1,
844 align => 0, fg => [1, 1, 0], 868 align => 0, fg => [1, 1, 0],
845 text => $col[$_], tooltip => $tip[$_]) 869 text => $col[$_], tooltip => $tip[$_])
846 for 0 .. $#col; 870 for 0 .. $#col;
847 871
… …
868 892
869 $m = [$users, $host, $uptime, $version, $desc]; 893 $m = [$users, $host, $uptime, $version, $desc];
870 894
871 $y++; 895 $y++;
872 896
873 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
874 (new CFClient::UI::Button 898 (new CFPlus::UI::Button
875 text => "Use", 899 text => "Use",
876 tooltip => "Put this server into the <b>Host:Port</b> field", 900 tooltip => "Put this server into the <b>Host:Port</b> field",
877 on_activate => sub { 901 on_activate => sub {
878 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
879 $METASERVER->hide; 903 $METASERVER->hide;
880 0 904 0
881 }, 905 },
882 ), 906 ),
883 (new CFClient::UI::Empty expand => 1), 907 (new CFPlus::UI::Empty expand => 1),
884 ]); 908 ]);
885 909
886 $table->add ($_, $y, new CFClient::UI::Label 910 $table->add ($_, $y, new CFPlus::UI::Label
887 ellipsise => 0, 911 ellipsise => 0,
888 align => $align[$_], 912 align => $align[$_],
889 text => $m->[$_], 913 text => $m->[$_],
890 tooltip => $tip[$_], 914 tooltip => $tip[$_],
891 can_hover => 1, 915 can_hover => 1,
… …
896 } 920 }
897 }); 921 });
898} 922}
899 923
900sub metaserver_dialog { 924sub metaserver_dialog {
901 my $vbox = new CFClient::UI::VBox; 925 my $vbox = new CFPlus::UI::VBox;
902 my $table = new CFClient::UI::Table; 926 my $table = new CFPlus::UI::Table;
903 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 927 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
904 928
905 my $dialog = new CFClient::UI::FancyFrame 929 my $dialog = new CFPlus::UI::Toplevel
906 title => "Server List", 930 title => "Server List",
907 name => 'metaserver_dialog', 931 name => 'metaserver_dialog',
908 x => 'center', 932 x => 'center',
909 y => 'center', 933 y => 'center',
910 z => 3, 934 z => 3,
… …
920 944
921 $dialog 945 $dialog
922} 946}
923 947
924sub server_setup { 948sub server_setup {
925 my $vbox = new CFClient::UI::VBox; 949 my $vbox = new CFPlus::UI::VBox;
926 950
951 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings",
927 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 953 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
954 );
928 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 955 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
929 956
930 { 957 {
931 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
932 959
933 $vbox->add ( 960 $vbox->add (
934 $HOST_ENTRY = new CFClient::UI::Entry 961 $HOST_ENTRY = new CFPlus::UI::Entry
935 expand => 1, 962 expand => 1,
936 text => $CFG->{profile}{default}{host}, 963 text => $CFG->{profile}{default}{host},
937 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 964 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
938 on_changed => sub { 965 on_changed => sub {
939 my ($self, $value) = @_; 966 my ($self, $value) = @_;
940 $CFG->{profile}{default}{host} = $value; 967 $CFG->{profile}{default}{host} = $value;
941 0 968 0
942 } 969 }
943 ); 970 );
944 971
945 $vbox->add (new CFClient::UI::Button 972 $vbox->add (new CFPlus::UI::Button
946 expand => 1, 973 expand => 1,
947 text => "Server List", 974 text => "Server List",
948 other => $METASERVER, 975 other => $METASERVER,
949 tooltip => "Show a list of available crossfire servers", 976 tooltip => "Show a list of available crossfire servers",
950 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 977 on_activate => sub { $METASERVER->toggle_visibility; 0 },
951 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
952 ); 979 );
953 } 980 }
954 981
955 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 982 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
956 $table->add (1, 4, new CFClient::UI::Entry 983 $table->add (1, 4, new CFPlus::UI::Entry
957 text => $CFG->{profile}{default}{user}, 984 text => $CFG->{profile}{default}{user},
958 tooltip => "The name of your character on the server", 985 tooltip => "The name of your character on the server",
959 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
960 ); 987 );
961 988
962 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 989 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
963 $table->add (1, 5, new CFClient::UI::Entry 990 $table->add (1, 5, new CFPlus::UI::Entry
964 text => $CFG->{profile}{default}{password}, 991 text => $CFG->{profile}{default}{password},
965 hidden => 1, 992 hidden => 1,
966 tooltip => "The password for your character", 993 tooltip => "The password for your character",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
968 ); 995 );
969 996
970 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 997 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
971 $table->add (1, 7, new CFClient::UI::Slider 998 $table->add (1, 7, new CFPlus::UI::Slider
972 force_w => 100, 999 force_w => 100,
973 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1000 range => [$CFG->{mapsize}, 10, 100, 0, 1],
974 tooltip => "This is the size of the portion of the map update the server sends you. " 1001 tooltip => "This is the size of the portion of the map update the server sends you. "
975 . "If you set this to a high value you will be able to see further, " 1002 . "If you set this to a high value you will be able to see further, "
976 . "but you also increase bandwidth requirements and latency. " 1003 . "but you also increase bandwidth requirements and latency. "
977 . "This option is only used once at log-in.", 1004 . "This option is only used once at log-in.",
978 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
979 ); 1006 );
980 1007
981 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1008 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
982 $table->add (1, 8, new CFClient::UI::CheckBox 1009 $table->add (1, 8, new CFPlus::UI::CheckBox
983 state => $CFG->{face_prefetch}, 1010 state => $CFG->{face_prefetch},
984 tooltip => "<b>Background Image Prefetch</b>\n\n" 1011 tooltip => "<b>Background Image Prefetch</b>\n\n"
985 . "If enabled, the client automatically pre-fetches images from the server. " 1012 . "If enabled, the client automatically pre-fetches images from the server. "
986 . "This might increase or create lag, but increases the chances " 1013 . "This might increase or create lag, but increases the chances "
987 . "of faces being ready for display when you encounter them. " 1014 . "of faces being ready for display when you encounter them. "
… …
989 . "so only set it if you really need to prefetch images. " 1016 . "so only set it if you really need to prefetch images. "
990 . "This option can be set and unset any time.", 1017 . "This option can be set and unset any time.",
991 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992 ); 1019 );
993 1020
994 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1021 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
995 $table->add (1, 9, new CFClient::UI::Entry 1022 $table->add (1, 9, new CFPlus::UI::Entry
996 text => $CFG->{output_count}, 1023 text => $CFG->{output_count},
997 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
998 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999 ); 1026 );
1000 1027
1001 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1028 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1002 $table->add (1, 10, new CFClient::UI::Entry 1029 $table->add (1, 10, new CFPlus::UI::Entry
1003 text => $CFG->{output_sync}, 1030 text => $CFG->{output_sync},
1004 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1005 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006 ); 1033 );
1007 1034
1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1009 expand => 1, 1036 expand => 1,
1010 align => 0, 1037 align => 0,
1011 text => "Login", 1038 text => "Login",
1012 on_activate => sub { 1039 on_activate => sub {
1013 $CONN ? stop_game 1040 $CONN ? stop_game
1014 : start_game; 1041 : start_game;
1015 0 1042 0
1016 }, 1043 },
1017 ); 1044 );
1018 1045
1019 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1020 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1021 text => $CFG->{say_command}, 1048 text => $CFG->{say_command},
1022 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1049 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1023 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1024 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1025 on_changed => sub { 1052 on_changed => sub {
… …
1027 $CFG->{say_command} = $value; 1054 $CFG->{say_command} = $value;
1028 0 1055 0
1029 } 1056 }
1030 ); 1057 );
1031 1058
1032 $vbox->add (new CFClient::UI::Label 1059 $vbox->add (new CFPlus::UI::FancyFrame
1033 text => "Server Info", 1060 label => "Server Info",
1034 fontsize => 1.2,
1035 padding_y => 8,
1036 fg => [1, 1, 0, 1],
1037 );
1038
1039 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 );
1040 1063
1041 $vbox 1064 $vbox
1042} 1065}
1043 1066
1044sub message_window { 1067sub message_window {
1045 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFPlus::UI::Toplevel
1046 name => "message_window", 1069 name => "message_window",
1047 title => "Messages", 1070 title => "Messages",
1048 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1049 x => "max", 1072 x => "max",
1050 y => 0, 1073 y => 0,
1051 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1052 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1053 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFPlus::UI::VBox),
1054 has_close_button => 1; 1077 has_close_button => 1;
1055 1078
1056 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1057 1080
1058 $vbox->add (my $input = new CFClient::UI::Entry 1081 $vbox->add (my $input = new CFPlus::UI::Entry
1059 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1060 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1061 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1062 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1063 on_focus_in => sub { 1086 on_focus_in => sub {
… …
1102 }; 1125 };
1103 1126
1104 $window 1127 $window
1105} 1128}
1106 1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1107sub open_quit_dialog { 1149sub open_quit_dialog {
1108 unless ($QUIT_DIALOG) { 1150 unless ($QUIT_DIALOG) {
1109 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1110 x => "center", 1152 x => "center",
1111 y => "center", 1153 y => "center",
1112 z => 50, 1154 z => 50,
1113 title => "Really Quit?", 1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1114 ; 1160 ;
1115 1161
1116 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1117 1163
1118 $vb->add (new CFClient::UI::Label 1164 $vb->add (new CFPlus::UI::Label
1119 text => "You should find a savebed and apply it first!", 1165 text => "You should find a savebed and apply it first!",
1120 max_w => $WIDTH * 0.25, 1166 max_w => $WIDTH * 0.25,
1121 ellipsize => 0, 1167 ellipsize => 0,
1122 ); 1168 );
1123 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1124 $hb->add (new CFClient::UI::Button 1170 $hb->add (new CFPlus::UI::Button
1125 text => "Ok", 1171 text => "Ok",
1126 expand => 1, 1172 expand => 1,
1127 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1128 ); 1174 );
1129 $hb->add (new CFClient::UI::Button 1175 $hb->add (new CFPlus::UI::Button
1130 text => "Quit anyway", 1176 text => "Quit anyway",
1131 expand => 1, 1177 expand => 1,
1132 on_activate => sub { exit }, 1178 on_activate => sub { exit },
1133 ); 1179 );
1134 } 1180 }
1135 1181
1136 $QUIT_DIALOG->show; 1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1137} 1184}
1138 1185
1139sub autopickup_setup { 1186sub autopickup_setup {
1140 my $table = new CFClient::UI::Table; 1187 my $table = new CFPlus::UI::Table;
1141 1188
1142 for ( 1189 for (
1143 ["General", 0, 0, 1190 ["General", 0, 0,
1144 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1191 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1145 ["Inhibit autopickup" => PICKUP_INHIBIT], 1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1179 ], 1226 ],
1180 ["Weight/Value ratio", 2, 17] 1227 ["Weight/Value ratio", 2, 17]
1181 ) 1228 )
1182 { 1229 {
1183 my ($title, $x, $y, @bits) = @$_; 1230 my ($title, $x, $y, @bits) = @$_;
1184 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1231 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1185 1232
1186 for (@bits) { 1233 for (@bits) {
1187 ++$y; 1234 ++$y;
1188 1235
1189 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1190 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1191 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1192 state => $::CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1193 on_changed => sub { 1240 on_changed => sub {
1194 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1195 1242
1196 if ($value) { 1243 if ($value) {
… …
1207 1254
1208 ${$_->[2]} = $checkbox if $_->[2]; 1255 ${$_->[2]} = $checkbox if $_->[2];
1209 } 1256 }
1210 } 1257 }
1211 1258
1212 $table->add (2, 18, new CFClient::UI::ValSlider 1259 $table->add (2, 18, new CFPlus::UI::ValSlider
1213 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1214 template => ">= 99", 1261 template => ">= 99",
1215 to_value => sub { ">= " . 5 * $_[0] }, 1262 to_value => sub { ">= " . 5 * $_[0] },
1216 on_changed => sub { 1263 on_changed => sub {
1217 my ($slider, $value) = @_; 1264 my ($slider, $value) = @_;
… …
1220 $::CFG->{pickup} |= int $value 1267 $::CFG->{pickup} |= int $value
1221 if $value; 1268 if $value;
1222 1; 1269 1;
1223 }); 1270 });
1224 1271
1225 $table->add (3, 18, new CFClient::UI::Button 1272 $table->add (3, 18, new CFPlus::UI::Button
1226 text => "set", 1273 text => "set",
1227 on_activate => sub { 1274 on_activate => sub {
1228 $::CONN->send_command ("pickup $::CFG->{pickup}") 1275 $::CONN->send_command ("pickup $::CFG->{pickup}")
1229 if defined $::CONN; 1276 if defined $::CONN;
1230 0 1277 0
1231 }); 1278 });
1232 1279
1233 $table 1280 $table
1234} 1281}
1235 1282
1283my %SORT_ORDER = (
1284 type => undef,
1285 mtime => sub { sort {
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime}
1288 or $a->{type} <=> $b->{type}
1289 } @_ },
1290 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type}
1293 } @_ },
1294);
1295
1236sub inventory_widget { 1296sub inventory_widget {
1237 my $hb = new CFClient::UI::HBox homogeneous => 1; 1297 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1238 1298
1239 $hb->add (my $vb1 = new CFClient::UI::VBox); 1299 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1240 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1300 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1301
1302 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1303
1304 use sort 'stable';
1305
1306 $hb1->add (new CFPlus::UI::Selector
1307 value => $::CFG->{inv_sort},
1308 options => [
1309 [type => "Type/Name"],
1310 [mtime => "Recent/Normal/Locked"],
1311 [weight => "Weight/Type"],
1312 ],
1313 on_changed => sub {
1314 $::CFG->{inv_sort} = $_[1];
1315 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1316 },
1317 );
1318 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1319 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321
1241 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1242 $sw1->add ($INV = new CFClient::UI::Inventory); 1323 $sw1->add ($INV = new CFPlus::UI::Inventory);
1243 1324
1244 $hb->add (my $vb2 = new CFClient::UI::VBox); 1325 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1245 1326
1246 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1247 1328
1248 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1329 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1249 $sw2->add ($INVR = new CFClient::UI::Inventory); 1330 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1250 1331
1251 # XXX: Call after $INVR = ... because set_opencont sets the items 1332 # XXX: Call after $INVR = ... because set_opencont sets the items
1252 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1333 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1253 1334
1254 $hb 1335 $hb
1255} 1336}
1256 1337
1257sub toggle_player_page { 1338sub toggle_player_page {
… …
1264 $PL_WINDOW->show; 1345 $PL_WINDOW->show;
1265 } 1346 }
1266} 1347}
1267 1348
1268sub player_window { 1349sub player_window {
1269 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1350 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1270 x => "center", 1351 x => "center",
1271 y => "center", 1352 y => "center",
1272 force_w => $WIDTH * 9/10, 1353 force_w => $WIDTH * 9/10,
1273 force_h => $HEIGHT * 9/10, 1354 force_h => $HEIGHT * 9/10,
1274 title => "Player", 1355 title => "Player",
… …
1276 has_close_button => 1 1357 has_close_button => 1
1277 ; 1358 ;
1278 1359
1279 my $ntb = 1360 my $ntb =
1280 $PL_NOTEBOOK = 1361 $PL_NOTEBOOK =
1281 new CFClient::UI::Notebook expand => 1, debug => 1; 1362 new CFPlus::UI::Notebook expand => 1, debug => 1;
1282 1363
1283 $ntb->add ( 1364 $ntb->add (
1284 "Statistics (F2)" => $STATS_PAGE = stats_window, 1365 "Statistics (F2)" => $STATS_PAGE = stats_window,
1285 "Shows statistics, where all your Stats and Resistances are shown." 1366 "Shows statistics, where all your Stats and Resistances are shown."
1286 ); 1367 );
1287 $ntb->add ( 1368 $ntb->add (
1288 "Skills (F3)" => $SKILL_PAGE = skill_window, 1369 "Skills (F3)" => $SKILL_PAGE = skill_window,
1289 "Shows all your Skills." 1370 "Shows all your Skills."
1290 ); 1371 );
1291 1372
1292 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1293 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1294 $ntb->add ( 1375 $ntb->add (
1295 "Spellbook (F4)" => $spellsw, 1376 "Spellbook (F4)" => $spellsw,
1296 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1377 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1297 ); 1378 );
1298 $ntb->add ( 1379 $ntb->add (
… …
1310sub update_bindings { 1391sub update_bindings {
1311 $BIND_UPD_CB->() if $BIND_UPD_CB; 1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1312} 1393}
1313 1394
1314sub keyboard_setup { 1395sub keyboard_setup {
1315 my $binding_list = new CFClient::UI::VBox; 1396 my $binding_list = new CFPlus::UI::VBox;
1316 1397
1317 my $refresh; 1398 my $refresh;
1318 $refresh = $BIND_UPD_CB = sub { 1399 $refresh = $BIND_UPD_CB = sub {
1319 $binding_list->clear (); 1400 $binding_list->clear ();
1320 1401
… …
1322 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1323 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1324 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1325 1406
1326 my $lbl = join "; ", @$cmds; 1407 my $lbl = join "; ", @$cmds;
1327 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1328 $binding_list->add (my $hb = new CFClient::UI::HBox); 1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1329 $hb->add (new CFClient::UI::Button 1410 $hb->add (new CFPlus::UI::Button
1330 text => "delete", 1411 text => "delete",
1331 tooltip => "Deletes the binding", 1412 tooltip => "Deletes the binding",
1332 on_activate => sub { 1413 on_activate => sub {
1333 $binding_list->remove ($hb); 1414 $binding_list->remove ($hb);
1334 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1335 0 1416 0
1336 }); 1417 });
1337 1418
1338 $hb->add (new CFClient::UI::Button 1419 $hb->add (new CFPlus::UI::Button
1339 text => "edit", 1420 text => "edit",
1340 tooltip => "Edits the binding", 1421 tooltip => "Edits the binding",
1341 on_activate => sub { 1422 on_activate => sub {
1342 $::BIND_EDITOR->set_binding ( 1423 $::BIND_EDITOR->set_binding (
1343 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1356 $::BIND_EDITOR->show; 1437 $::BIND_EDITOR->show;
1357 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1358 0 1439 0
1359 }); 1440 });
1360 1441
1361 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1362 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1363 } 1444 }
1364 } 1445 }
1365 }; 1446 };
1366 1447
1367 my $vb = new CFClient::UI::VBox; 1448 my $vb = new CFPlus::UI::VBox;
1368 $vb->add (my $hb = new CFClient::UI::HBox); 1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1369 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1370 $hb->add (new CFClient::UI::CheckBox 1454 $hb->add (new CFPlus::UI::CheckBox
1371 expand => 1, 1455 expand => 1,
1372 state => $CFG->{shift_fire_stop}, 1456 state => $CFG->{shift_fire_stop},
1373 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1374 on_changed => sub { 1458 on_changed => sub {
1375 my ($cbox, $value) = @_; 1459 my ($cbox, $value) = @_;
1376 $CFG->{shift_fire_stop} = $value; 1460 $CFG->{shift_fire_stop} = $value;
1377 0 1461 0
1378 }); 1462 });
1379 1463
1380 $vb->add ($binding_list); 1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1381 $vb->add (my $hb = new CFClient::UI::HBox); 1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1382 1468
1383 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFPlus::UI::Button
1384 text => "record new", 1470 text => "record new",
1385 expand => 1, 1471 expand => 1,
1386 tooltip => "This button opens the binding editor with an empty binding.", 1472 tooltip => "This button opens the binding editor with an empty binding.",
1387 on_activate => sub { 1473 on_activate => sub {
1388 $::BIND_EDITOR->set_binding (undef, undef, [], 1474 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1402 $::BIND_EDITOR->show; 1488 $::BIND_EDITOR->show;
1403 0 1489 0
1404 }, 1490 },
1405 ); 1491 );
1406 1492
1407 $hb->add (new CFClient::UI::Button 1493 $hb->add (new CFPlus::UI::Button
1408 text => "close", 1494 text => "close",
1409 tooltip => "Closes the binding window", 1495 tooltip => "Closes the binding window",
1410 expand => 1, 1496 expand => 1,
1411 on_activate => sub { 1497 on_activate => sub {
1412 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
… …
1417 $refresh->(); 1503 $refresh->();
1418 1504
1419 $vb 1505 $vb
1420} 1506}
1421 1507
1422# just weirdness, pls. ignore
1423sub load_html_page {
1424 my ($viewer, $base) = @_;
1425
1426 $viewer->clear;
1427
1428 require LWP::Simple;
1429 require HTML::Parser;
1430 require URI;
1431
1432 my $page = LWP::Simple::get ($base)
1433 or return;
1434
1435 my @s = { };
1436 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1437
1438 my $parser = HTML::Parser->new (
1439 text_h => [sub {
1440 my ($text) = @_;
1441 $text =~ s/\s+/ /g;
1442 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1443 }, "dtext"],
1444 start_h => [sub {
1445 my ($tag, $attr) = @_;
1446 if ($passthrough{$tag}) {
1447 $s[-1]{text} .= "<$tag>";
1448 } elsif ($tag eq "h1") {
1449 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1450 } elsif ($tag eq "h2") {
1451 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1452 } elsif ($tag eq "h3") {
1453 push @s, { text => "<span size='large'>" };
1454 } elsif ($tag eq "a") {
1455 push @s, { text => "", url => $attr->{href} };
1456 } elsif ($tag eq "p") {
1457 push @s, { };
1458 } elsif ($tag eq "img") {
1459 eval {
1460 push @{$s[-1]{obj}}, new CFClient::UI::Image
1461 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1462 $s[-1]{text} .= "\x{fffc}";
1463 };
1464 }
1465 }, "tagname, attr"],
1466 end_h => [sub {
1467 my ($tag) = @_;
1468 if ($passthrough{$tag}) {
1469 $s[-1]{text} .= "</$tag>";
1470 } elsif ($tag =~ /^h\d$/) {
1471 $s[-1]{text} .= "</span>";
1472 push @s, { };
1473 } elsif ($tag eq "a") {
1474 my $S = pop @s;
1475 $s[-1]{text} .= "\x{fffc}";
1476 push @{$s[-1]{obj}}, new CFClient::UI::Label
1477 fg => [0.8, 0.8, 1],
1478 markup => "<u>$S->{text}</u>",
1479 fontsize => 0.8,
1480 can_events => 1,
1481 can_focus => 1,
1482 on_button_up => sub {
1483 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1484 },
1485 ;
1486 }
1487 }, "tagname"],
1488 );
1489
1490 $parser->parse ($page);
1491 $parser->eof;
1492
1493 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1494 for @s;
1495
1496 $viewer->set_offset (0);
1497}
1498
1499sub help_window { 1508sub help_window {
1500 my $win = new CFClient::UI::FancyFrame 1509 my $win = new CFPlus::UI::Toplevel
1501 x => 'center', 1510 x => 'center',
1502 y => 'center', 1511 y => 'center',
1503 z => 2, 1512 z => 2,
1504 name => 'doc_browser', 1513 name => 'doc_browser',
1505 force_w => int $WIDTH * 7/8, 1514 force_w => int $WIDTH * 7/8,
1506 force_h => int $HEIGHT * 7/8, 1515 force_h => int $HEIGHT * 7/8,
1507 title => "Help Browser", 1516 title => "Help Browser",
1508 has_close_button => 1; 1517 has_close_button => 1;
1509 1518
1510 $win->add (my $vbox = new CFClient::UI::VBox); 1519 $win->add (my $vbox = new CFPlus::UI::VBox);
1511 1520
1512 $vbox->add (my $buttons = new CFClient::UI::HBox); 1521 $vbox->add (new CFPlus::UI::FancyFrame
1522 label => "Navigation",
1523 child => (my $buttons = new CFPlus::UI::HBox),
1524 );
1513 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1514 expand => 1, fontsize => 0.8, padding_x => 4); 1526 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1515 1527
1516 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1528 my @history;
1517 $buttons->add (my $combo = new CFClient::UI::Combobox 1529 my @future;
1518 value => undef, 1530 my $curnode;
1519 options => [ 1531
1520 [intro => "Introduction"], 1532 my $load_node; $load_node = sub {
1521 [manual => "Main Manual"], 1533 my ($node, $para) = @_;
1522 [skill_help => "Skill Reference"], 1534
1523 [command_help => "Command Reference"], 1535 $buttons->clear;
1524 [dmcommand_help => "DM Commands"], 1536
1525 [COPYING => "License Terms"], 1537 $buttons->add (new CFPlus::UI::Button
1526 [test => "test (do not select)"], #d#TODO 1538 text => "⇤",
1527 ], 1539 tooltip => "back to the starting page",
1528 on_changed => sub { 1540 on_activate => sub {
1529 my ($self, $pod) = @_; 1541 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1530 1542 unshift @future, @history;
1531 if ($pod eq "test") {#d#TODO 1543 @history = ();
1532 eval { 1544 $load_node->(@{shift @future});
1533 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1534 };
1535 warn "$@" if $@;
1536 return;
1537 } 1545 },
1546 );
1538 1547
1539 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1548 if (@history) {
1540 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1549 $buttons->add (new CFPlus::UI::Button
1541 1550 text => "⋘",
1542 $viewer->clear; 1551 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1543 1552 on_activate => sub {
1544# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 1553 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1545# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1554 $load_node->(@{pop @history});
1546# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1555 },
1547# ]);#d#
1548 1556 );
1549 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1550 for @$pom;
1551
1552 $viewer->set_offset (0);
1553
1554 0
1555 }, 1557 }
1556 on_visibility_change => sub { 1558
1557 my ($self, $visible) = @_; 1559 if (@future) {
1558 return unless $visible; 1560 $buttons->add (new CFPlus::UI::Button
1559 return if $self->{value}; 1561 text => "⋙",
1560 $self->set_value ("intro"); 1562 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1563 on_activate => sub {
1564 push @history, [$curnode, $viewer->current_paragraph];
1565 $load_node->(@{shift @future});
1566 },
1561 0 1567 );
1562 }, 1568 }
1569
1570 $buttons->add (new CFPlus::UI::Label text => " ");
1571
1572 my @path = CFPlus::Pod::full_path_of $node;
1573 pop @path; # drop current node
1574
1575 for my $node (@path) {
1576 $buttons->add (new CFPlus::UI::Button
1577 text => $node->{kw}[0],
1578 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1579 on_activate => sub {
1580 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1581 $load_node->($node);
1582 },
1583 );
1584 $buttons->add (new CFPlus::UI::Label text => "/");
1585 }
1586
1587 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1588
1589 $curnode = $node;
1590
1591 $viewer->clear;
1592 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1593 $viewer->scroll_to ($para);
1563 ); 1594 };
1595
1596 $load_node->(CFPlus::Pod::find pod => "mainpage");
1597
1598 $CFPlus::Pod::goto_document = sub {
1599 my (@path) = @_;
1600
1601 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1602
1603 $load_node->((CFPlus::Pod::find @path)[0]);
1604 $win->show;
1605 };
1564 1606
1565 $win 1607 $win
1566} 1608}
1567 1609
1568sub sdl_init { 1610sub sdl_init {
1569 CFClient::SDL_Init 1611 CFPlus::SDL_Init
1570 and die "SDL::Init failed!\n"; 1612 and die "SDL::Init failed!\n";
1571} 1613}
1572 1614
1573sub video_init { 1615sub video_init {
1574 sdl_init; 1616 sdl_init;
… …
1579 1621
1580 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1622 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1581 $FULLSCREEN = $CFG->{fullscreen}; 1623 $FULLSCREEN = $CFG->{fullscreen};
1582 $FAST = $CFG->{fast}; 1624 $FAST = $CFG->{fast};
1583 1625
1584 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1626 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1585 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1627 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1586 1628
1587 $SDL_ACTIVE = 1; 1629 $SDL_ACTIVE = 1;
1588 $LAST_REFRESH = time - 0.01; 1630 $LAST_REFRESH = time - 0.01;
1589 1631
1590 CFClient::OpenGL::init; 1632 CFPlus::OpenGL::init;
1591 1633
1592 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1634 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1593 1635
1594 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1636 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1595 1637
1596 ############################################################################# 1638 #############################################################################
1597 1639
1598 if ($DEBUG_STATUS) { 1640 if ($DEBUG_STATUS) {
1599 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1641 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1600 } else { 1642 } else {
1601 # create the widgets 1643 # create the widgets
1602 1644
1603 $DEBUG_STATUS = new CFClient::UI::Label 1645 $DEBUG_STATUS = new CFPlus::UI::Label
1604 padding => 0, 1646 padding => 0,
1605 z => 100, 1647 z => 100,
1606 force_x => "max", 1648 force_x => "max",
1607 force_y => 0; 1649 force_y => 0;
1608 $DEBUG_STATUS->show; 1650 $DEBUG_STATUS->show;
1609 1651
1610 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1652 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1611 1653
1612 $STATUSBOX = new CFClient::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1613 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1614 1656
1615 (new CFClient::UI::Frame 1657 (new CFPlus::UI::Frame
1616 bg => [0, 0, 0, 0.4], 1658 bg => [0, 0, 0, 0.4],
1617 force_x => 0, 1659 force_x => 0,
1618 force_y => "max", 1660 force_y => "max",
1619 child => $STATUSBOX, 1661 child => $STATUSBOX,
1620 )->show; 1662 )->show;
1621 1663
1622 CFClient::UI::FancyFrame->new ( 1664 CFPlus::UI::Toplevel->new (
1623 title => "Map", 1665 title => "Map",
1624 name => "mapmap", 1666 name => "mapmap",
1625 x => 0, 1667 x => 0,
1626 y => $FONTSIZE + 8, 1668 y => $FONTSIZE + 8,
1627 border_bg => [1, 1, 1, 192/255], 1669 border_bg => [1, 1, 1, 192/255],
1628 bg => [1, 1, 1, 0], 1670 bg => [1, 1, 1, 0],
1629 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1671 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1630 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1672 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1631 ), 1673 ),
1632 )->show; 1674 )->show;
1633 1675
1634 $MAPWIDGET = new CFClient::MapWidget; 1676 $MAPWIDGET = new CFPlus::MapWidget;
1635 $MAPWIDGET->connect (activate_console => sub { 1677 $MAPWIDGET->connect (activate_console => sub {
1636 my ($mapwidget, $preset) = @_; 1678 my ($mapwidget, $preset) = @_;
1637 1679
1638 if ($CONSOLE) { 1680 if ($CONSOLE) {
1639 $CONSOLE->{input}->{auto_activated} = 1; 1681 $CONSOLE->{input}->{auto_activated} = 1;
… …
1645 } 1687 }
1646 }); 1688 });
1647 $MAPWIDGET->show; 1689 $MAPWIDGET->show;
1648 $MAPWIDGET->grab_focus; 1690 $MAPWIDGET->grab_focus;
1649 1691
1650 $LOGVIEW = new CFClient::UI::TextScroller 1692 $LOGVIEW = new CFPlus::UI::TextScroller
1651 expand => 1, 1693 expand => 1,
1652 font => $FONT_FIXED, 1694 font => $FONT_FIXED,
1653 fontsize => $::CFG->{log_fontsize}, 1695 fontsize => $::CFG->{log_fontsize},
1654 indent => -4, 1696 indent => -4,
1655 can_hover => 1, 1697 can_hover => 1,
1656 can_events => 1, 1698 can_events => 1,
1657 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1658 ; 1700 ;
1659 1701
1660 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1661 title => "Setup", 1703 title => "Setup",
1662 name => "setup_dialog", 1704 name => "setup_dialog",
1663 x => 'center', 1705 x => 'center',
1664 y => 'center', 1706 y => 'center',
1665 z => 2, 1707 z => 2,
… …
1668 has_close_button => 1, 1710 has_close_button => 1,
1669 ; 1711 ;
1670 1712
1671 $METASERVER = metaserver_dialog; 1713 $METASERVER = metaserver_dialog;
1672 1714
1673 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1674 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1675 1717
1676 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1677 "Configure the server to play on, your username, password and other server-related options."); 1719 "Configure the server to play on, your username, password and other server-related options.");
1678 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1679 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1689 . "After pressing the combo the binding will be saved automatically and the " 1731 . "After pressing the combo the binding will be saved automatically and the "
1690 . "binding editor closes"); 1732 . "binding editor closes");
1691 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1733 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1692 "Some debuggin' options. Do not ask."); 1734 "Some debuggin' options. Do not ask.");
1693 1735
1694 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1736 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1695 1737
1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1697 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1739 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1698 1740
1699 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1741 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1700 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1742 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1701 1743
1702 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 1744 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
1703 1745
1704 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1705 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1747 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1706 1748
1707 $BUTTONBAR->add (new CFClient::UI::Button 1749 $BUTTONBAR->add (new CFPlus::UI::Button
1708 text => "Save Config", 1750 text => "Save Config",
1709 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1751 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1710 on_activate => sub { 1752 on_activate => sub {
1711 $::CFG->{layout} = CFClient::UI::get_layout; 1753 $::CFG->{layout} = CFPlus::UI::get_layout;
1712 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1754 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1713 status "Configuration Saved"; 1755 status "Configuration Saved";
1714 0 1756 0
1715 }, 1757 },
1716 ); 1758 );
1717 1759
1718 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1719 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1720 1762
1721 $BUTTONBAR->add (new CFClient::UI::Button 1763 $BUTTONBAR->add (new CFPlus::UI::Button
1722 text => "Quit", 1764 text => "Quit",
1723 tooltip => "Terminates the program", 1765 tooltip => "Terminates the program",
1724 on_activate => sub { 1766 on_activate => sub {
1725 if ($CONN) { 1767 if ($CONN) {
1726 open_quit_dialog; 1768 open_quit_dialog;
… …
1737 1779
1738 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1780 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1739} 1781}
1740 1782
1741sub video_shutdown { 1783sub video_shutdown {
1742 CFClient::OpenGL::shutdown; 1784 CFPlus::OpenGL::shutdown;
1743 1785
1744 undef $SDL_ACTIVE; 1786 undef $SDL_ACTIVE;
1745} 1787}
1746 1788
1747my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1789my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1755 1797
1756sub audio_music_finished { 1798sub audio_music_finished {
1757 return unless $CFG->{bgm_enable}; 1799 return unless $CFG->{bgm_enable};
1758 1800
1759 # TODO: hack, do play loop and mood music 1801 # TODO: hack, do play loop and mood music
1760 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1802 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1761 $bgmusic->play (0); 1803 $bgmusic->play (0);
1762 1804
1763 push @bgmusic, shift @bgmusic; 1805 push @bgmusic, shift @bgmusic;
1764} 1806}
1765 1807
1766sub audio_init { 1808sub audio_init {
1767 if ($CFG->{audio_enable}) { 1809 if ($CFG->{audio_enable}) {
1768 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1810 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1769 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1811 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1770 1812
1771 unless ($SDL_MIXER) { 1813 unless ($SDL_MIXER) {
1772 status "Unable to open sound device: there will be no sound"; 1814 status "Unable to open sound device: there will be no sound";
1773 return; 1815 return;
1774 } 1816 }
1775 1817
1776 CFClient::Mix_AllocateChannels 8; 1818 CFPlus::Mix_AllocateChannels 8;
1777 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1819 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1778 1820
1779 audio_music_finished; 1821 audio_music_finished;
1780 1822
1781 while (<$fh>) { 1823 while (<$fh>) {
1782 next if /^\s*#/; 1824 next if /^\s*#/;
… …
1785 my ($file, $volume, $event) = split /\s+/, $_, 3; 1827 my ($file, $volume, $event) = split /\s+/, $_, 3;
1786 1828
1787 push @SOUNDS, "$volume,$file"; 1829 push @SOUNDS, "$volume,$file";
1788 1830
1789 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1831 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1790 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1832 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1791 $chunk->volume ($volume * 128 / 100); 1833 $chunk->volume ($volume * 128 / 100);
1792 $chunk 1834 $chunk
1793 }; 1835 };
1794 } 1836 }
1795 } else { 1837 } else {
… …
1797 } 1839 }
1798 } 1840 }
1799} 1841}
1800 1842
1801sub audio_shutdown { 1843sub audio_shutdown {
1802 CFClient::Mix_CloseAudio if $SDL_MIXER; 1844 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1803 undef $SDL_MIXER; 1845 undef $SDL_MIXER;
1804 @SOUNDS = (); 1846 @SOUNDS = ();
1805 %AUDIO_CHUNKS = (); 1847 %AUDIO_CHUNKS = ();
1806} 1848}
1807 1849
… …
1814 1856
1815sub force_refresh { 1857sub force_refresh {
1816 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1858 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1817 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1859 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1818 1860
1819 $CFClient::UI::ROOT->draw; 1861 $CFPlus::UI::ROOT->draw;
1820 1862
1821 $WANT_REFRESH = 0; 1863 $WANT_REFRESH = 0;
1822 $CAN_REFRESH = 0; 1864 $CAN_REFRESH = 0;
1823 $LAST_REFRESH = $NOW; 1865 $LAST_REFRESH = $NOW;
1824 1866
18250 && do {
1826 # some weird model-drawing code, just a joke right now
1827 use CFClient::OpenGL;
1828
1829 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1830 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1831 $demo{r} ||= do {
1832 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1833 $mod->{v} = pack "f*", @{$mod->{v}};
1834 $_ = [scalar @$_, pack "S!*", @$_]
1835 for values %{$mod->{g}};
1836 $mod
1837 };
1838
1839 my $r = $demo{r} or die;
1840
1841 glDepthMask 1;
1842 glClear GL_DEPTH_BUFFER_BIT;
1843 glEnable GL_TEXTURE_2D;
1844 glEnable GL_DEPTH_TEST;
1845 glEnable GL_CULL_FACE;
1846 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1847
1848 glMatrixMode GL_PROJECTION;
1849 glLoadIdentity;
1850 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1851 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1852 glMatrixMode GL_MODELVIEW;
1853 glLoadIdentity;
1854
1855 glPushMatrix;
1856 glTranslate 0, 0, -800;
1857 glScale 1, -1, 1;
1858 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1859 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1860 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1861 glScale 50, 50, 50;
1862
1863 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1864 while (my ($k, $v) = each %{$r->{g}}) {
1865 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1866 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1867 }
1868
1869 glPopMatrix;
1870
1871 glShadeModel GL_FLAT;
1872 glDisable GL_DEPTH_TEST;
1873 glDisable GL_TEXTURE_2D;
1874 glDepthMask 0;
1875
1876 $WANT_REFRESH++;
1877};
1878
1879 CFClient::SDL_GL_SwapBuffers; 1867 CFPlus::SDL_GL_SwapBuffers;
1880} 1868}
1881 1869
1882my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1870my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1883 $NOW = time; 1871 $NOW = time;
1884 1872
1885 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1873 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1886 for CFClient::SDL_PollEvent; 1874 for CFPlus::SDL_PollEvent;
1887 1875
1888 if (%animate_object) { 1876 if (%animate_object) {
1889 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1877 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1890 $WANT_REFRESH++; 1878 $WANT_REFRESH++;
1891 } 1879 }
… …
1915 $CONN->face_prefetch 1903 $CONN->face_prefetch
1916 if $CONN; 1904 if $CONN;
1917}); 1905});
1918 1906
1919%SDL_CB = ( 1907%SDL_CB = (
1920 CFClient::SDL_QUIT => sub { 1908 CFPlus::SDL_QUIT => sub {
1921 Event::unloop -1; 1909 Event::unloop -1;
1922 }, 1910 },
1923 CFClient::SDL_VIDEORESIZE => sub { 1911 CFPlus::SDL_VIDEORESIZE => sub {
1924 }, 1912 },
1925 CFClient::SDL_VIDEOEXPOSE => sub { 1913 CFPlus::SDL_VIDEOEXPOSE => sub {
1926 CFClient::UI::full_refresh; 1914 CFPlus::UI::full_refresh;
1927 }, 1915 },
1928 CFClient::SDL_ACTIVEEVENT => sub { 1916 CFPlus::SDL_ACTIVEEVENT => sub {
1929# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1917# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1930 }, 1918 },
1931 CFClient::SDL_KEYDOWN => sub { 1919 CFPlus::SDL_KEYDOWN => sub {
1932 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1920 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1933 # alt-enter 1921 # alt-enter
1934 $FULLSCREEN_ENABLE->toggle; 1922 $FULLSCREEN_ENABLE->toggle;
1935 video_shutdown; 1923 video_shutdown;
1936 video_init; 1924 video_init;
1937 } else { 1925 } else {
1938 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1926 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1939 } 1927 }
1940 }, 1928 },
1941 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1929 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1942 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1930 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1943 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1931 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1944 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1932 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1945 CFClient::SDL_USEREVENT => sub { 1933 CFPlus::SDL_USEREVENT => sub {
1946 if ($_[0]{code} == 1) { 1934 if ($_[0]{code} == 1) {
1947 audio_channel_finished $_[0]{data1}; 1935 audio_channel_finished $_[0]{data1};
1948 } elsif ($_[0]{code} == 0) { 1936 } elsif ($_[0]{code} == 0) {
1949 audio_music_finished; 1937 audio_music_finished;
1950 } 1938 }
… …
1954############################################################################# 1942#############################################################################
1955 1943
1956$SIG{INT} = $SIG{TERM} = sub { exit }; 1944$SIG{INT} = $SIG{TERM} = sub { exit };
1957 1945
1958{ 1946{
1959 local $SIG{__DIE__} = sub {
1960 return unless defined $^S && !$^S;
1961 Carp::confess $_[0];#d#TODO: remove when stable
1962 CFClient::fatal $_[0];
1963 };
1964
1965 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1947 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1966 CFClient::UI::set_layout ($::CFG->{layout}); 1948 CFPlus::UI::set_layout ($::CFG->{layout});
1967 1949
1968 my %DEF_CFG = ( 1950 my %DEF_CFG = (
1969 sdl_mode => 0, 1951 sdl_mode => 0,
1970 width => 640, 1952 width => 640,
1971 height => 480, 1953 height => 480,
… …
1987 bgm_volume => 0.25, 1969 bgm_volume => 0.25,
1988 face_prefetch => 0, 1970 face_prefetch => 0,
1989 output_sync => 1, 1971 output_sync => 1,
1990 output_count => 1, 1972 output_count => 1,
1991 pickup => 0, 1973 pickup => 0,
1974 inv_sort => "mtime",
1992 default => "profile", # default profile 1975 default => "profile", # default profile
1993 ); 1976 );
1994 1977
1995 while (my ($k, $v) = each %DEF_CFG) { 1978 while (my ($k, $v) = each %DEF_CFG) {
1996 $CFG->{$k} = $v unless exists $CFG->{$k}; 1979 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
2000 1983
2001 sdl_init; 1984 sdl_init;
2002 1985
2003 @SDL_MODES = reverse 1986 @SDL_MODES = reverse
2004 grep $_->[0] >= 640 && $_->[1] >= 480, 1987 grep $_->[0] >= 640 && $_->[1] >= 480,
2005 CFClient::SDL_ListModes; 1988 CFPlus::SDL_ListModes;
2006 1989
2007 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1990 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2008 1991
2009 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1992 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2010 1993
2011 { 1994 {
2012 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1995 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2013 DejaVuSans.ttf 1996 DejaVuSans.ttf
2014 DejaVuSansMono.ttf 1997 DejaVuSansMono.ttf
2015 DejaVuSans-Bold.ttf 1998 DejaVuSans-Bold.ttf
2016 DejaVuSansMono-Bold.ttf 1999 DejaVuSansMono-Bold.ttf
2017 DejaVuSans-Oblique.ttf 2000 DejaVuSans-Oblique.ttf
2018 DejaVuSansMono-Oblique.ttf 2001 DejaVuSansMono-Oblique.ttf
2019 DejaVuSans-BoldOblique.ttf 2002 DejaVuSans-BoldOblique.ttf
2020 DejaVuSansMono-BoldOblique.ttf 2003 DejaVuSansMono-BoldOblique.ttf
2021 ); 2004 );
2022 2005
2023 CFClient::add_font $_ for @fonts; 2006 CFPlus::add_font $_ for @fonts;
2024 2007
2025 CFClient::pango_init; 2008 CFPlus::pango_init;
2026 2009
2027 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2010 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2028 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2011 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2029 2012
2030 $FONT_PROP->make_default; 2013 $FONT_PROP->make_default;
2031 } 2014 }
2032 2015
2033# compare mono (ft) vs. rgba (cairo) 2016# compare mono (ft) vs. rgba (cairo)
2034# ft - 1.8s, cairo 3s, even in alpha-only mode 2017# ft - 1.8s, cairo 3s, even in alpha-only mode
2035# for my $rgba (0..1) { 2018# for my $rgba (0..1) {
2036# my $t1 = Time::HiRes::time; 2019# my $t1 = Time::HiRes::time;
2037# for (1..1000) { 2020# for (1..1000) {
2038# my $layout = CFClient::Layout->new ($rgba); 2021# my $layout = CFPlus::Layout->new ($rgba);
2039# $layout->set_text ("hallo" x 100); 2022# $layout->set_text ("hallo" x 100);
2040# $layout->render; 2023# $layout->render;
2041# } 2024# }
2042# my $t2 = Time::HiRes::time; 2025# my $t2 = Time::HiRes::time;
2043# warn $t2-$t1; 2026# warn $t2-$t1;
… …
2046 video_init; 2029 video_init;
2047 audio_init; 2030 audio_init;
2048} 2031}
2049 2032
2050Event::loop; 2033Event::loop;
2051#CFClient::SDL_Quit; 2034#CFPlus::SDL_Quit;
2052#CFClient::_exit 0; 2035#CFPlus::_exit 0;
2053 2036
2054END { CFClient::SDL_Quit } 2037END { CFPlus::SDL_Quit }
2055 2038
2056=head1 NAME 2039=head1 NAME
2057 2040
2058cfplus - A Crossfire+ and Crossfire game client 2041cfplus - A Crossfire+ and Crossfire game client
2059 2042

Diff Legend

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