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.113 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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