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.146 by root, Wed Apr 4 02:43:30 2007 UTC vs.
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 72 if %PAR::LibCache;
51 73
52use Time::HiRes 'time'; 74use Time::HiRes 'time';
53use Event; 75use Event;
76use List::Util qw(max min);
54 77
55use Crossfire; 78use Crossfire;
56use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
57 80
58use Compress::LZF; 81use Compress::LZF;
59 82
60use CFPlus; 83use CFPlus;
61use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
62use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
63use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
64use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
66use CFPlus::Pod; 92use CFPlus::Pod;
67use CFPlus::MapWidget; 93use CFPlus::MapWidget;
68use CFPlus::Macro; 94use CFPlus::Macro;
69 95
70$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
102 128
103our $MAP; 129our $MAP;
104our $MAPMAP; 130our $MAPMAP;
105our $MAPWIDGET; 131our $MAPWIDGET;
106our $BUTTONBAR; 132our $BUTTONBAR;
107our $LOGVIEW;
108our $CONSOLE;
109our $METASERVER; 133our $METASERVER;
110our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
111our $QUIT_DIALOG; 135our $QUIT_DIALOG;
112our $HOST_ENTRY; 136our $HOST_ENTRY;
113our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
136 160
137our $SDL_ACTIVE; 161our $SDL_ACTIVE;
138our %SDL_CB; 162our %SDL_CB;
139 163
140our $SDL_MIXER; 164our $SDL_MIXER;
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT;
167our $MUSIC_START;
168our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
141our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
142our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNKS; # audio files
143 174
144our $ALT_ENTER_MESSAGE; 175our $ALT_ENTER_MESSAGE;
145our $STATUSBOX; 176our $STATUSBOX;
… …
149our $INVR; 180our $INVR;
150our $INV_RIGHT_HB; 181our $INV_RIGHT_HB;
151 182
152our $PICKUP_CFG; 183our $PICKUP_CFG;
153 184
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
156
157sub status { 185sub status {
158 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 186 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
159} 187}
160 188
161sub debug { 189sub debug {
162 $DEBUG_STATUS->set_text ($_[0]); 190 $DEBUG_STATUS->set_text ($_[0]);
163} 191}
164 192
165sub message { 193sub message {
166 my ($para) = @_; 194 my ($para) = @_;
167 195 $MESSAGE_WINDOW->message ($para);
168 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
169
170 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
171
172 $LOGVIEW->add_paragraph ($para);
173 $LOGVIEW->scroll_to_bottom;
174} 196}
175 197
176sub destroy_query_dialog { 198sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 199 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 200 if $_[0]{query_dialog};
… …
206 title => "Server Query", 228 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 229 child => my $vbox = new CFPlus::UI::VBox,
208 ; 230 ;
209 231
210 my @dialog = my $label = new CFPlus::UI::Label 232 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 234 ellipsise => 0,
213 text => $prompt; 235 text => $prompt;
214 236
215 if ($flags & CS_QUERY_YESNO) { 237 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 238 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 255 );
234 256
235 $dialog->grab_focus; 257 $dialog->grab_focus;
236 258
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 259 } elsif ($flags & CS_QUERY_SINGLECHAR) {
238 $dialog->{tooltip} = "#charcreation_focus";
239
240 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 260 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 261 $dialog->{tooltip} = "#charcreation_focus";
242 262
243 unshift @dialog, new CFPlus::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 265 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
247 267
248 unshift @dialog, my $table = new CFPlus::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
249 269
250 $table->add (0, 0, new CFPlus::UI::Button 270 $table->add_at (0, 0, new CFPlus::UI::Button
251 text => "Next Race", 271 text => "Next Race",
252 on_activate => sub { 272 on_activate => sub {
253 $conn->send ("reply n"); 273 $conn->send ("reply n");
254 destroy_query_dialog $conn; 274 destroy_query_dialog $conn;
255 0 275 0
256 }, 276 },
257 ); 277 );
258 $table->add (2, 0, new CFPlus::UI::Button 278 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Accept", 279 text => "Accept",
260 on_activate => sub { 280 on_activate => sub {
261 $conn->send ("reply d"); 281 $conn->send ("reply d");
262 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
263 0 283 0
264 }, 284 },
265 ); 285 );
266 286
287 if ($conn->{chargen_race_description}) {
288 unshift @dialog, new CFPlus::UI::Label
289 max_w => $::WIDTH * 0.8,
290 ellipsise => 0,
291 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
292 ;
293 }
294
295 unshift @dialog, new CFPlus::UI::Face
296 face => $conn->{player}{face},
297 bg => [.2, .2, .2, 1],
298 min_w => 64,
299 min_h => 64,
300 ;
301
302 if ($conn->{chargen_race_title}) {
303 unshift @dialog, new CFPlus::UI::Label
304 allign => 1,
305 ellipsise => 0,
306 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
307 ;
308 }
309
267 unshift @dialog, new CFPlus::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 311 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 312 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 313 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271 ; 314 ;
… …
275 $conn->send ("reply $stat"); 318 $conn->send ("reply $stat");
276 destroy_query_dialog $conn; 319 destroy_query_dialog $conn;
277 return; 320 return;
278 } 321 }
279 322
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282
283 unshift @dialog, new CFPlus::UI::Label 323 unshift @dialog, new CFPlus::UI::Label
284 max_w => $::WIDTH * 0.4, 324 max_w => $::WIDTH * 0.4,
285 ellipsise => 0, 325 ellipsise => 0,
286 markup => "\nOr use your keyboard and the text entry below:\n"; 326 markup => "\nOr use your keyboard and the text entry below:\n";
287 327
288 unshift @dialog, my $table = new CFPlus::UI::Table; 328 unshift @dialog, my $table = new CFPlus::UI::Table;
289 329
290 # left: re-roll 330 # left: re-roll
291 $table->add (0, 0, new CFPlus::UI::Button 331 $table->add_at (0, 0, new CFPlus::UI::Button
292 text => "Roll Again", 332 text => "Roll Again",
293 on_activate => sub { 333 on_activate => sub {
294 $conn->send ("reply y"); 334 $conn->send ("reply y");
295 destroy_query_dialog $conn; 335 destroy_query_dialog $conn;
296 0 336 0
… …
310 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 350 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
311 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 351 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
312 ], 352 ],
313 ), 1 .. 2; 353 ), 1 .. 2;
314 354
315 $table->add (2, 0, new CFPlus::UI::Button 355 $table->add_at (2, 0, new CFPlus::UI::Button
316 text => "Swap Stats", 356 text => "Swap Stats",
317 on_activate => sub { 357 on_activate => sub {
318 $conn->{stat_change_with} = $sw2->{value}; 358 $conn->{stat_change_with} = $sw2->{value};
319 $conn->send ("reply $sw1->{value}"); 359 $conn->send ("reply $sw1->{value}");
320 destroy_query_dialog $conn; 360 destroy_query_dialog $conn;
321 0 361 0
322 }, 362 },
323 ); 363 );
324 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 364 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
325 365
326 # right: accept 366 # right: accept
327 $table->add (4, 0, new CFPlus::UI::Button 367 $table->add_at (4, 0, new CFPlus::UI::Button
328 text => "Accept", 368 text => "Accept",
329 on_activate => sub { 369 on_activate => sub {
330 $conn->send ("reply n"); 370 $conn->send ("reply n");
331 $STATS_PAGE->hide; 371 $STATS_PAGE->hide;
332 destroy_query_dialog $conn; 372 destroy_query_dialog $conn;
… …
413 maph => $mapsize, 453 maph => $mapsize,
414 454
415 client => "cfplus $CFPlus::VERSION $] $^O", 455 client => "cfplus $CFPlus::VERSION $] $^O",
416 456
417 map_widget => $MAPWIDGET, 457 map_widget => $MAPWIDGET,
418 logview => $LOGVIEW,
419 statusbox => $STATUSBOX, 458 statusbox => $STATUSBOX,
420 map => $MAP, 459 map => $MAP,
421 mapmap => $MAPMAP, 460 mapmap => $MAPMAP,
422 query => \&server_query, 461 query => \&server_query,
423 462
424 sound_play => sub { 463 setup_req => {
425 my ($x, $y, $soundnum, $type) = @_; 464 smoothing => $CFG->{map_smoothing}*1,
426
427 $SDL_MIXER
428 or return;
429
430 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
431 or return;
432
433 $chunk->play;
434 }, 465 },
435 }; 466 };
436 467
437 if ($CONN) { 468 if ($CONN) {
438 CFPlus::lowdelay fileno $CONN->{fh}; 469 CFPlus::lowdelay fileno $CONN->{fh};
… …
448 $LOGIN_BUTTON->set_text ("Login"); 479 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 480 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 481 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 482 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 483 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485
486 &audio_music_set ([]);
453 487
454 return unless $CONN; 488 return unless $CONN;
455 489
456 status "connection closed"; 490 status "connection closed";
457 491
… …
467 501
468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 502 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469 503
470 my $row = 0; 504 my $row = 0;
471 505
472 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 506 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
473 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 507 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
474 can_events => 1, 508 can_events => 1,
475 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 509 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
476 510
511 my $vidmode_tooltip =
512 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
513 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
514
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 515 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
478 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 516 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
479 517
518 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
480 $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]); 519 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
481 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 520 tooltip => $vidmode_tooltip);
521 $hbox->add (my $mode_label = new CFPlus::UI::Label
522 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
523 can_events => 1, tooltip => $vidmode_tooltip);
482 524
483 $mode_slider->connect (changed => sub { 525 $mode_slider->connect (changed => sub {
484 my ($self, $value) = @_; 526 my ($self, $value) = @_;
485 527
486 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 528 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
487 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 529 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
488 }); 530 });
489 $mode_slider->emit (changed => $mode_slider->{range}[0]); 531 $mode_slider->emit (changed => $mode_slider->{range}[0]);
490 532
491 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 533 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
492 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 534 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
493 state => $CFG->{fullscreen}, 535 state => $CFG->{fullscreen},
494 tooltip => "Bring the client into fullscreen mode.", 536 tooltip => "Bring the client into fullscreen mode.",
495 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
496 ); 538 );
497 539
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 540 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
499 $table->add (1, $row++, new CFPlus::UI::CheckBox 541 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
500 state => $CFG->{fast}, 542 state => $CFG->{fast},
501 tooltip => "Lower the visual quality considerably to speed up rendering.", 543 tooltip => "Lower the visual quality considerably to speed up rendering.",
502 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 544 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
503 ); 545 );
504 546
547 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
548 $table->add_at (1, $row++, new CFPlus::UI::Slider
549 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
550 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
551 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
552 );
553
554 $table->add_at (1, $row++, new CFPlus::UI::Button
555 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the video settings above.",
557 on_activate => sub {
558 video_shutdown ();
559 video_init ();
560 0
561 }
562 );
563
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 564 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
506 $table->add (1, $row++, new CFPlus::UI::Slider 565 $table->add_at (1, $row++, new CFPlus::UI::Slider
507 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 566 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
508 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 567 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
509 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 568 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
510 ); 569 );
511 570
571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
572 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{map_smoothing},
574 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
575 . "This increases load on the graphics subsystem and works only with 2.x servers. "
576 . "Changes take effect at next connection only.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
578 );
579
512 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 580 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
513 $table->add (1, $row++, new CFPlus::UI::CheckBox 581 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
514 state => $CFG->{fow_enable}, 582 state => $CFG->{fow_enable},
515 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 583 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
516 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 584 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
517 ); 585 );
518 586
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 587 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
520 $table->add (1, $row++, new CFPlus::UI::Slider 588 $table->add_at (1, $row++, new CFPlus::UI::Slider
521 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 589 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
522 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 590 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
524 ); 592 );
525 593
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fow_smooth},
529 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
530 on_changed => sub {
531 my ($self, $value) = @_;
532 $CFG->{fow_smooth} = $value;
533 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
534 0
535 }
536 );
537
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
539 $table->add (1, $row++, new CFPlus::UI::Slider
540 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
541 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
542 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
543 );
544
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
546 $table->add (1, $row++, new CFPlus::UI::Slider 595 $table->add_at (1, $row++, new CFPlus::UI::Slider
547 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
548 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 597 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
549 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 598 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
550 ); 599 );
551 600
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider 602 $table->add_at (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 603 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 604 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
556 on_changed => sub { 605 on_changed => sub {
557 $CFG->{gauge_fontsize} = $_[1]; 606 $CFG->{gauge_fontsize} = $_[1];
558 &set_gauge_window_fontsize; 607 &set_gauge_window_fontsize;
559 0 608 0
560 } 609 }
561 ); 610 );
562 611
563 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 612 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
564 $table->add (1, $row++, new CFPlus::UI::Slider 613 $table->add_at (1, $row++, new CFPlus::UI::Slider
565 range => [$CFG->{gauge_size}, 0.2, 0.8], 614 range => [$CFG->{gauge_size}, 0.2, 0.8],
566 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 615 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
567 on_changed => sub { 616 on_changed => sub {
568 $CFG->{gauge_size} = $_[1]; 617 $CFG->{gauge_size} = $_[1];
569 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 618 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
570 0 619 0
571 } 620 }
572 ); 621 );
573 622
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
584 $vbox 623 $vbox
585} 624}
586 625
587sub audio_setup { 626sub audio_setup {
588 my $vbox = new CFPlus::UI::VBox; 627 my $vbox = new CFPlus::UI::VBox;
589 628
590 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 629 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
591 630
592 my $row = 0; 631 my $row = 0;
593 632
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
595 $table->add (1, $row++, new CFPlus::UI::CheckBox 634 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
596 state => $CFG->{audio_enable}, 635 state => $CFG->{audio_enable},
597 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.", 636 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.",
598 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 637 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
599 ); 638 );
600# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 639# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
601# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 640# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
602# $CFG->{effects_volume} = $_[1]; 641# $CFG->{effects_volume} = $_[1];
603# }); 642# });
604 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
605 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 644 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
606 $hbox->add (new CFPlus::UI::CheckBox 645 $hbox->add (new CFPlus::UI::CheckBox
607 expand => 1, state => $CFG->{bgm_enable}, 646 expand => 1, state => $CFG->{bgm_enable},
608 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 647 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
609 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 648 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
610 ); 649 );
… …
612 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
613 tooltip => "The volume of the background music. Changes are instant.", 652 tooltip => "The volume of the background music. Changes are instant.",
614 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
615 ); 654 );
616 655
617 $table->add (1, $row++, new CFPlus::UI::Button 656 $table->add_at (1, $row++, new CFPlus::UI::Button
618 expand => 1, align => 0, text => "Apply", 657 expand => 1, align => 0, text => "Apply",
619 tooltip => "Apply the audio settings", 658 tooltip => "Apply the audio settings",
620 on_activate => sub { 659 on_activate => sub {
621 audio_shutdown (); 660 audio_shutdown ();
622 audio_init (); 661 audio_init ();
… …
681} 720}
682 721
683sub debug_setup { 722sub debug_setup {
684 my $table = new CFPlus::UI::Table; 723 my $table = new CFPlus::UI::Table;
685 724
686 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 725 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
687 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 726 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
688 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 727 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
689 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 728 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
690 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 729 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
691 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 730 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
692 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 731 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
693 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 732 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
694 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 733 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
695 734
696 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
697
698 for my $x (0..2) {
699 for my $y (0 .. 2) {
700 $table->add ($x + 3, $y,
701 new CFPlus::UI::Entry
702 text => $default_smooth[$x * 3 + $y],
703 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
704 );
705 }
706 }
707
708 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 735 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736
737 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
739 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
740 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
741 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
742 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745
746 $c->add_items ({
747 type => "line_loop",
748 color => [0, 1, 0],
749 width => 9,
750 coord_mode => "abs",
751 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
752 });
753
754 $c->add_items ({
755 type => "lines",
756 color => [1, 1, 0],
757 width => 2,
758 coord_mode => "rel",
759 coord => [[0,0], [1,1], [1,0], [0,1]],
760 });
761
762 $c->add_items ({
763 type => "polygon",
764 color => [0, 0.43, 0],
765 width => 2,
766 coord_mode => "rel",
767 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
768 });
709 769
710 $table 770 $table
711} 771}
712 772
713sub stats_window { 773sub stats_window {
… …
761 [2, 4, st_spd => "Spd", 10.54], 821 [2, 4, st_spd => "Spd", 10.54],
762 [2, 5, st_wspd => "WSp", 10.54], 822 [2, 5, st_wspd => "WSp", 10.54],
763 ) { 823 ) {
764 my ($col, $row, $id, $label, $template) = @$_; 824 my ($col, $row, $id, $label, $template) = @$_;
765 825
766 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 826 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
767 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 827 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
768 align => +1, template => $template, tooltip => "#stat_$label"); 828 align => +1, template => $template, tooltip => "#stat_$label");
769 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 829 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
770 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 830 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
771 align => -1, text => $label, tooltip => "#stat_$label"); 831 align => -1, text => $label, tooltip => "#stat_$label");
772 } 832 }
773 833
774 $vb->add (new CFPlus::UI::FancyFrame 834 $vb->add (new CFPlus::UI::FancyFrame
… …
815 cold => ["Cold", 875 cold => ["Cold",
816 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 876 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
817 ghit => ["Ghost hit", 877 ghit => ["Ghost hit",
818 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 878 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
819 ); 879 );
880
820 for (qw/slow holyw conf fire depl magic 881 for (qw/slow holyw conf fire depl magic
821 drain acid pois para deat phys 882 drain acid pois para deat phys
822 blind fear tund elec cold ghit/) 883 blind fear tund elec cold ghit/)
823 { 884 {
824 $tbl2->add ($col, $row, 885 $tbl2->add_at ($col, $row,
825 $STATWIDS->{"res_$_"} = 886 $STATWIDS->{"res_$_"} =
826 new CFPlus::UI::Label 887 new CFPlus::UI::Label
827 font => $FONT_FIXED, 888 font => $FONT_FIXED,
828 template => "-100%", 889 template => "-100%",
829 align => +1, 890 align => +1,
830 valign => 0, 891 valign => 0,
831 can_events => 1, 892 can_events => 1,
832 can_hover => 1, 893 can_hover => 1,
833 tooltip => $resist_names{$_}->[1], 894 tooltip => $resist_names{$_}->[1],
834 ); 895 );
835 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 896 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
836 font => $FONT_FIXED, 897 font => $FONT_FIXED,
837 can_hover => 1, 898 can_hover => 1,
838 can_events => 1, 899 can_events => 1,
839 path => "ui/resist/resist_$_.png", 900 path => "ui/resist/resist_$_.png",
840 tooltip => $resist_names{$_}->[1], 901 tooltip => $resist_names{$_}->[1],
841 ); 902 );
842 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 903 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
843 text => $resist_names{$_}->[0], 904 text => $resist_names{$_}->[0],
844 font => $FONT_FIXED, 905 font => $FONT_FIXED,
845 can_hover => 1, 906 can_hover => 1,
846 can_events => 1, 907 can_events => 1,
847 tooltip => $resist_names{$_}->[1], 908 tooltip => $resist_names{$_}->[1],
… …
880 return if $METASERVER_ATIME > time; 941 return if $METASERVER_ATIME > time;
881 $METASERVER_ATIME = time + 60; 942 $METASERVER_ATIME = time + 60;
882 943
883 my $table = $METASERVER->{table}; 944 my $table = $METASERVER->{table};
884 $table->clear; 945 $table->clear;
885 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 946 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
886 947
887 my $ok = 0; 948 my $ok = 0;
888 949
889 CFPlus::background { 950 CFPlus::background {
890 my $ua = CFPlus::lwp_useragent; 951 my $ua = CFPlus::lwp_useragent;
… …
901 "The time this server has been running without being restarted.", 962 "The time this server has been running without being restarted.",
902 "The server software version - a '+' indicates a Crossfire+ server.", 963 "The server software version - a '+' indicates a Crossfire+ server.",
903 "Short information about this server provided by its admins.", 964 "Short information about this server provided by its admins.",
904 ); 965 );
905 my @col = qw(#Users Host Uptime Version Description); 966 my @col = qw(#Users Host Uptime Version Description);
906 $table->add ($_, 0, new CFPlus::UI::Label 967 $table->add_at ($_, 0, new CFPlus::UI::Label
907 can_hover => 1, can_events => 1, 968 can_hover => 1, can_events => 1,
908 align => 0, fg => [1, 1, 0], 969 align => 0, fg => [1, 1, 0],
909 text => $col[$_], tooltip => $tip[$_]) 970 text => $col[$_], tooltip => $tip[$_])
910 for 0 .. $#col; 971 for 0 .. $#col;
911 972
… …
933 994
934 $m = [$users, $host, $uptime, $version, $desc]; 995 $m = [$users, $host, $uptime, $version, $desc];
935 996
936 $y++; 997 $y++;
937 998
938 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 999 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
939 (new CFPlus::UI::Button 1000 (new CFPlus::UI::Button
940 text => "Use", 1001 text => "Use",
941 tooltip => "Put this server into the <b>Host:Port</b> field", 1002 tooltip => "Put this server into the <b>Host:Port</b> field",
942 on_activate => sub { 1003 on_activate => sub {
943 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1004 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
946 }, 1007 },
947 ), 1008 ),
948 (new CFPlus::UI::Empty expand => 1), 1009 (new CFPlus::UI::Empty expand => 1),
949 ]); 1010 ]);
950 1011
951 $table->add ($_, $y, new CFPlus::UI::Label 1012 $table->add_at ($_, $y, new CFPlus::UI::Label
952 max_w => $::WIDTH * 0.4, 1013 max_w => $::WIDTH * 0.4,
953 ellipsise => 0, 1014 ellipsise => 0,
954 align => $align[$_], 1015 align => $align[$_],
955 text => $m->[$_], 1016 text => $m->[$_],
956 tooltip => $tip[$_], 1017 tooltip => $tip[$_],
… …
997 1058
998 $vbox->add (new CFPlus::UI::FancyFrame 1059 $vbox->add (new CFPlus::UI::FancyFrame
999 label => "Connection Settings", 1060 label => "Connection Settings",
1000 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1001 ); 1062 );
1002 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1063 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1003 1064
1004 { 1065 {
1005 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1066 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1006 1067
1007 $vbox->add ( 1068 $vbox->add (
1008 $HOST_ENTRY = new CFPlus::UI::Entry 1069 $HOST_ENTRY = new CFPlus::UI::Entry
1009 expand => 1, 1070 expand => 1,
1010 text => $CFG->{profile}{default}{host}, 1071 text => $CFG->{profile}{default}{host},
… …
1024 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1085 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1025 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1026 ); 1087 );
1027 } 1088 }
1028 1089
1029 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1030 $table->add (1, 4, new CFPlus::UI::Entry 1091 $table->add_at (1, 4, new CFPlus::UI::Entry
1031 text => $CFG->{profile}{default}{user}, 1092 text => $CFG->{profile}{default}{user},
1032 tooltip => "The name of your character on the server", 1093 tooltip => "The name of your character on the server",
1033 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1034 ); 1095 );
1035 1096
1036 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1037 $table->add (1, 5, new CFPlus::UI::Entry 1098 $table->add_at (1, 5, new CFPlus::UI::Entry
1038 text => $CFG->{profile}{default}{password}, 1099 text => $CFG->{profile}{default}{password},
1039 hidden => 1, 1100 hidden => 1,
1040 tooltip => "The password for your character", 1101 tooltip => "The password for your character",
1041 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1042 ); 1103 );
1043 1104
1044 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1045 $table->add (1, 7, new CFPlus::UI::Slider 1106 $table->add_at (1, 7, new CFPlus::UI::Slider
1046 force_w => 100, 1107 force_w => 100,
1047 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1108 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1048 tooltip => "This is the size of the portion of the map update the server sends you. " 1109 tooltip => "This is the size of the portion of the map update the server sends you. "
1049 . "If you set this to a high value you will be able to see further, " 1110 . "If you set this to a high value you will be able to see further, "
1050 . "but you also increase bandwidth requirements and latency. " 1111 . "but you also increase bandwidth requirements and latency. "
1051 . "This option is only used once at log-in.", 1112 . "This option is only used once at log-in.",
1052 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1053 ); 1114 );
1054 1115
1055 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1056 $table->add (1, 8, new CFPlus::UI::CheckBox
1057 state => $CFG->{face_prefetch},
1058 tooltip => "<b>Background Image Prefetch</b>\n\n"
1059 . "If enabled, the client automatically pre-fetches images from the server. "
1060 . "This might increase or create lag, but increases the chances "
1061 . "of faces being ready for display when you encounter them. "
1062 . "It also uses up server bandwidth on every connect, "
1063 . "so only set it if you really need to prefetch images. "
1064 . "This option can be set and unset any time.",
1065 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1066 );
1067
1068 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1116 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1069 $table->add (1, 9, new CFPlus::UI::Entry 1117 $table->add_at (1, 8, new CFPlus::UI::Entry
1070 text => $CFG->{output_rate}, 1118 text => $CFG->{output_rate},
1071 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1072 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1073 . "default will be used, which is usually around 100kb/s.", 1121 . "default will be used, which is usually around 100kb/s.",
1074 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1075 ); 1123 );
1076 1124
1077 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1078 $table->add (1, 10, new CFPlus::UI::Entry 1126 $table->add_at (1, 9, new CFPlus::UI::Entry
1079 text => $CFG->{output_count}, 1127 text => $CFG->{output_count},
1080 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1128 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1081 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1082 ); 1130 );
1083 1131
1084 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1085 $table->add (1, 11, new CFPlus::UI::Entry 1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1086 text => $CFG->{output_sync}, 1134 text => $CFG->{output_sync},
1087 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1088 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1089 ); 1137 );
1090 1138
1091 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1139 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1092 expand => 1, 1140 expand => 1,
1093 align => 0, 1141 align => 0,
1094 text => "Login", 1142 text => "Login",
1095 on_activate => sub { 1143 on_activate => sub {
1096 $CONN ? stop_game 1144 $CONN ? stop_game
1097 : start_game; 1145 : start_game;
1098 0 1146 0
1099 }, 1147 },
1100 ); 1148 );
1101 1149
1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1150 $vbox->add (new CFPlus::UI::FancyFrame
1103 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1151 label => "Server Info",
1104 text => $CFG->{say_command}, 1152 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1105 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. "
1106 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1107 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1108 on_changed => sub {
1109 my ($self, $value) = @_;
1110 $CFG->{say_command} = $value;
1111 0
1112 }
1113 ); 1153 );
1114 1154
1155 $vbox
1156}
1157
1158sub client_setup {
1159 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1160
1161 my $row = 0;
1162
1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1163 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1116 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1164 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1117 state => $CFG->{show_tips}, 1165 state => $CFG->{show_tips},
1118 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1166 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1119 on_changed => sub { 1167 on_changed => sub {
1120 my ($self, $value) = @_; 1168 my ($self, $value) = @_;
1121 $CFG->{show_tips} = $value; 1169 $CFG->{show_tips} = $value;
1122 0 1170 0
1123 } 1171 }
1124 ); 1172 );
1125 1173
1126 $vbox->add (new CFPlus::UI::FancyFrame 1174 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1127 label => "Server Info", 1175 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1128 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1176 text => $CFG->{logview_max_par},
1129 ); 1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1130 1178 . "sends more messages than this number, older messages get removed to save memory and "
1131 $vbox 1179 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1132}
1133
1134sub message_window {
1135 my $window = new CFPlus::UI::Toplevel
1136 name => "message_window",
1137 title => "Messages",
1138 border_bg => [1, 1, 1, 1],
1139 x => "max",
1140 y => 0,
1141 force_w => $::WIDTH * 0.4,
1142 force_h => $::HEIGHT * 0.5,
1143 child => (my $vbox = new CFPlus::UI::VBox),
1144 has_close_button => 1;
1145
1146 $vbox->add ($LOGVIEW);
1147
1148 $vbox->add (my $input = new CFPlus::UI::Entry
1149 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1150 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1151 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1152 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1153 on_focus_in => sub { 1180 on_changed => sub {
1154 my ($input, $prev_focus) = @_; 1181 my ($self, $value) = @_;
1155 1182 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1156 delete $input->{refocus_map};
1157
1158 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1159 $input->{refocus_map} = 1;
1160 }
1161 delete $input->{auto_activated};
1162
1163 0 1183 0
1164 }, 1184 },
1165 on_activate => sub {
1166 my ($input, $text) = @_;
1167 $input->set_text ('');
1168
1169 if ($text =~ /^\/(.*)/) {
1170 $::CONN->user_send ($1);
1171 } else {
1172 my $say_cmd = $::CFG->{say_command} || 'say';
1173 $::CONN->user_send ("$say_cmd $text");
1174 }
1175 if ($input->{refocus_map}) {
1176 delete $input->{refocus_map};
1177 $MAPWIDGET->focus_in
1178 }
1179
1180 0
1181 },
1182 on_escape => sub {
1183 $MAPWIDGET->grab_focus;
1184
1185 0
1186 },
1187 );
1188
1189 $CONSOLE = {
1190 window => $window,
1191 input => $input,
1192 }; 1185 );
1193 1186
1194 $window 1187 $table
1195} 1188}
1196 1189
1197sub autopickup_setup { 1190sub autopickup_setup {
1191 my $r = new CFPlus::UI::ScrolledWindow (
1192 expand => 1,
1193 scroll_y => 1
1194 );
1198 my $table = new CFPlus::UI::Table; 1195 $r->add (my $table = new CFPlus::UI::Table
1196 row_expand => [0],
1197 col_expand => [0, 1, 0, 1],
1198 );
1199 1199
1200 for ( 1200 for (
1201 ["General", 0, 0, 1201 ["General", 0, 0,
1202 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1202 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1203 ["Inhibit autopickup" => PICKUP_INHIBIT], 1203 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1238 ], 1238 ],
1239 ["Weight/Value ratio", 2, 17] 1239 ["Weight/Value ratio", 2, 17]
1240 ) 1240 )
1241 { 1241 {
1242 my ($title, $x, $y, @bits) = @$_; 1242 my ($title, $x, $y, @bits) = @$_;
1243 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1243 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1244 1244
1245 for (@bits) { 1245 for (@bits) {
1246 ++$y; 1246 ++$y;
1247 1247
1248 my $mask = $_->[1]; 1248 my $mask = $_->[1];
1249 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1249 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1250 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1250 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1251 state => $::CFG->{pickup} & $mask, 1251 state => $::CFG->{pickup} & $mask,
1252 on_changed => sub { 1252 on_changed => sub {
1253 my ($box, $value) = @_; 1253 my ($box, $value) = @_;
1254 1254
1255 if ($value) { 1255 if ($value) {
… …
1266 1266
1267 ${$_->[2]} = $checkbox if $_->[2]; 1267 ${$_->[2]} = $checkbox if $_->[2];
1268 } 1268 }
1269 } 1269 }
1270 1270
1271 $table->add (2, 18, new CFPlus::UI::ValSlider 1271 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1272 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1272 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1273 template => ">= 99", 1273 template => ">= 99",
1274 to_value => sub { ">= " . 5 * $_[0] }, 1274 to_value => sub { ">= " . 5 * $_[0] },
1275 on_changed => sub { 1275 on_changed => sub {
1276 my ($slider, $value) = @_; 1276 my ($slider, $value) = @_;
… …
1279 $::CFG->{pickup} |= int $value 1279 $::CFG->{pickup} |= int $value
1280 if $value; 1280 if $value;
1281 1; 1281 1;
1282 }); 1282 });
1283 1283
1284 $table->add (3, 18, new CFPlus::UI::Button 1284 $table->add_at (3, 18, new CFPlus::UI::Button
1285 text => "set", 1285 text => "set",
1286 on_activate => sub { 1286 on_activate => sub {
1287 $::CONN->send_command ("pickup $::CFG->{pickup}") 1287 $::CONN->send_command ("pickup $::CFG->{pickup}")
1288 if defined $::CONN; 1288 if defined $::CONN;
1289 0 1289 0
1290 }); 1290 });
1291 1291
1292 $table 1292 $r
1293} 1293}
1294 1294
1295my %SORT_ORDER = ( 1295my %SORT_ORDER = (
1296 type => undef, 1296 type => undef,
1297 mtime => sub { 1297 mtime => sub {
… …
1376 has_close_button => 1 1376 has_close_button => 1
1377 ; 1377 ;
1378 1378
1379 my $ntb = 1379 my $ntb =
1380 $PL_NOTEBOOK = 1380 $PL_NOTEBOOK =
1381 new CFPlus::UI::Notebook expand => 1, debug => 1; 1381 new CFPlus::UI::Notebook expand => 1;
1382 1382
1383 $ntb->add ( 1383 $ntb->add_tab (
1384 "Statistics (F2)" => $STATS_PAGE = stats_window, 1384 "Statistics (F2)" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown." 1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 ); 1386 );
1387 $ntb->add ( 1387 $ntb->add_tab (
1388 "Skills (F3)" => $SKILL_PAGE = skill_window, 1388 "Skills (F3)" => $SKILL_PAGE = skill_window,
1389 "Shows all your Skills." 1389 "Shows all your Skills."
1390 ); 1390 );
1391 1391
1392 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1392 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1393 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1393 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1394 $ntb->add ( 1394 $ntb->add_tab (
1395 "Spellbook (F4)" => $spellsw, 1395 "Spellbook (F4)" => $spellsw,
1396 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1396 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1397 ); 1397 );
1398 $ntb->add ( 1398 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1400 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 ); 1402 );
1403 $ntb->add_tab (Pickup => autopickup_setup,
1404 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1403 1405
1404 $ntb->set_current_page ($INVENTORY_PAGE); 1406 $ntb->set_current_page ($INVENTORY_PAGE);
1405 1407
1406 $plwin->add ($ntb); 1408 $plwin->add ($ntb);
1407 $plwin 1409 $plwin
… …
1573 1575
1574sub show_tip_of_the_day { 1576sub show_tip_of_the_day {
1575 # find all tips 1577 # find all tips
1576 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1578 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1577 1579
1578 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1580 CFPlus::DB::get state => "tip_of_the_day", sub {
1581 my ($todindex) = @_;
1579 $todindex = 0 if $todindex >= @tod; 1582 $todindex = 0 if $todindex >= @tod;
1580 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1583 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1581 1584
1582 # create dialog 1585 # create dialog
1583 my $dialog; 1586 my $dialog;
1584 1587
1585 my $close = sub { 1588 my $close = sub {
1586 $dialog->destroy; 1589 $dialog->destroy;
1590 };
1591
1592 $dialog = new CFPlus::UI::Toplevel
1593 x => "center",
1594 y => "center",
1595 z => 3,
1596 name => 'tip_of_the_day',
1597 force_w => int $WIDTH * 4/9,
1598 force_h => int $WIDTH * 2/9,
1599 title => "Tip of the day #" . (1 + $todindex),
1600 child => my $vbox = new CFPlus::UI::VBox,
1601 has_close_button => 1,
1602 on_delete => $close,
1603 ;
1604
1605 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1606 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1607 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1608
1609 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1610
1611 $table->add_at (0, 0, new CFPlus::UI::Button
1612 text => "Close",
1613 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1614 on_activate => $close,
1615 );
1616
1617 $table->add_at (2, 0, new CFPlus::UI::Button
1618 text => "Next",
1619 tooltip => "Show the next <b>Tip of the day</b>.",
1620 on_activate => sub {
1621 $close->();
1622 &show_tip_of_the_day;
1623 },
1624 );
1625
1626 $dialog->show;
1587 }; 1627 };
1588
1589 $dialog = new CFPlus::UI::Toplevel
1590 x => "center",
1591 y => "center",
1592 z => 3,
1593 name => 'tip_of_the_day',
1594 force_w => int $WIDTH * 4/9,
1595 force_h => int $WIDTH * 2/9,
1596 title => "Tip of the day #" . (1 + $todindex),
1597 child => my $vbox = new CFPlus::UI::VBox,
1598 has_close_button => 1,
1599 on_delete => $close,
1600 ;
1601
1602 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1603 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1604 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1605
1606 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1607
1608 $table->add (0, 0, new CFPlus::UI::Button
1609 text => "Close",
1610 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1611 on_activate => $close,
1612 );
1613
1614 $table->add (2, 0, new CFPlus::UI::Button
1615 text => "Next",
1616 tooltip => "Show the next <b>Tip of the day</b>.",
1617 on_activate => sub {
1618 $close->();
1619 &show_tip_of_the_day;
1620 },
1621 );
1622
1623 $dialog->show;
1624} 1628}
1625 1629
1626sub sdl_init { 1630sub sdl_init {
1627 CFPlus::SDL_Init 1631 CFPlus::SDL_Init
1628 and die "SDL::Init failed!\n"; 1632 and die "SDL::Init failed!\n";
1629} 1633}
1630 1634
1631sub video_init { 1635sub video_init {
1632 sdl_init;
1633
1634 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1636 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1635 1637
1636 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1638 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1637 1639
1638 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1640 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1639 $FULLSCREEN = $CFG->{fullscreen}; 1641 $FULLSCREEN = $CFG->{fullscreen};
1640 $FAST = $CFG->{fast}; 1642 $FAST = $CFG->{fast};
1641 1643
1642 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1644 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1643 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1645 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1644 1646
1645 $SDL_ACTIVE = 1; 1647 $SDL_ACTIVE = 1;
1646 $LAST_REFRESH = time - 0.01; 1648 $LAST_REFRESH = time - 0.01;
1647 1649
… …
1689 1691
1690 $MAPWIDGET = new CFPlus::MapWidget; 1692 $MAPWIDGET = new CFPlus::MapWidget;
1691 $MAPWIDGET->connect (activate_console => sub { 1693 $MAPWIDGET->connect (activate_console => sub {
1692 my ($mapwidget, $preset) = @_; 1694 my ($mapwidget, $preset) = @_;
1693 1695
1694 if ($CONSOLE) { 1696 $MESSAGE_WINDOW->activate_console ($preset)
1695 $CONSOLE->{input}->{auto_activated} = 1; 1697 if $MESSAGE_WINDOW;
1696 $CONSOLE->{input}->grab_focus;
1697
1698 if ($preset && $CONSOLE->{input}->get_text eq '') {
1699 $CONSOLE->{input}->set_text ($preset);
1700 }
1701 }
1702 }); 1698 });
1703 $MAPWIDGET->show; 1699 $MAPWIDGET->show;
1704 $MAPWIDGET->grab_focus; 1700 $MAPWIDGET->grab_focus;
1705
1706 $LOGVIEW = new CFPlus::UI::TextScroller
1707 expand => 1,
1708 font => $FONT_FIXED,
1709 fontsize => $::CFG->{log_fontsize},
1710 indent => -4,
1711 can_hover => 1,
1712 can_events => 1,
1713 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1714 ;
1715 1701
1716 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1717 title => "Setup", 1703 title => "Setup",
1718 name => "setup_dialog", 1704 name => "setup_dialog",
1719 x => 'center', 1705 x => 'center',
… …
1723 force_h => $::HEIGHT * 0.6, 1709 force_h => $::HEIGHT * 0.6,
1724 has_close_button => 1, 1710 has_close_button => 1,
1725 ; 1711 ;
1726 1712
1727 $METASERVER = metaserver_dialog; 1713 $METASERVER = metaserver_dialog;
1714 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1728 1715
1729 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1716 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1730 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1717 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1731 1718
1732 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1719 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1733 "Configure the server to play on, your username, password and other server-related options."); 1720 "Configure the server to play on, your username, password and other server-related options.");
1734 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1721 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1735 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1722 "Configure various client-specific settings.");
1736 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1723 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1737 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1724 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1738 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1725 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1739 "Configure the use of audio, sound effects and background music."); 1726 "Configure the use of audio, sound effects and background music.");
1740 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1727 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1741 "Lets you define, edit and delete key bindings." 1728 "Lets you define, edit and delete key bindings."
1742 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1729 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1743 . "with nothing set and the recording started. After doing the actions you " 1730 . "with nothing set and the recording started. After doing the actions you "
1744 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1731 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1745 . "After pressing the combo the binding will be saved automatically and the " 1732 . "After pressing the combo the binding will be saved automatically and the "
1746 . "binding editor closes"); 1733 . "binding editor closes");
1747 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1734 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1748 "Some debuggin' options. Do not ask."); 1735 "Some debuggin' options. Do not ask.");
1749 1736
1750 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1737 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1751 1738
1752 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1739 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1753 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1740 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1754 1741
1755 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1742 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1756 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1743 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1757 1744
1758 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 1745 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
1759 1746
1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1747 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1793 } 1780 }
1794 1781
1795 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1782 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1796} 1783}
1797 1784
1798sub setup_build_button {
1799 my ($enabled) = @_;
1800 if ($enabled) {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 $BUILD_BUTTON ||= new CFPlus::UI::Button
1803 text => "Build",
1804 tooltip => "Opens the ingame builder",
1805 on_activate => sub {
1806 if ($CONN) {
1807 $CONN->send_ext_req (builder_player_items => sub {
1808 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1809 });
1810 }
1811 0
1812 };
1813 $BUTTONBAR->add ($BUILD_BUTTON);
1814 } else {
1815 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1816 }
1817}
1818
1819sub open_ingame_editor {
1820 my ($msg) = @_;
1821
1822 my $win = new CFPlus::UI::Toplevel
1823 x => 0,
1824 y => 'center',
1825 z => 4,
1826 name => 'builder_window',
1827 force_w => int $WIDTH * 1/4,
1828 force_h => int $HEIGHT * 3/4,
1829 title => "In game builder",
1830 has_close_button => 1;
1831
1832 my $r = new CFPlus::UI::ScrolledWindow (
1833 expand => 1,
1834 scroll_y => 1
1835 );
1836 $r->add (my $vb = new CFPlus::UI::VBox);
1837 $win->add ($r);
1838
1839
1840 $vb->add (
1841 new CFPlus::UI::Button
1842 text => "Disable build mode",
1843 on_activate => sub { $::IN_BUILD_MODE = undef }
1844 );
1845 $vb->add (
1846 new CFPlus::UI::Button
1847 text => "ERASE",
1848 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1849 );
1850
1851 for my $itemarchname (
1852 sort {
1853 $msg->{items}->{$a}->{build_arch_name}
1854 cmp $msg->{items}->{$b}->{build_arch_name}
1855 } keys %{$msg->{items}}
1856 ) {
1857 my $info = $msg->{items}->{$itemarchname};
1858 $vb->add (
1859 new CFPlus::UI::Button text => $info->{build_arch_name},
1860 on_activate => sub {
1861 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1862
1863 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1864 build_mode_query_arch_info ();
1865 }
1866 }
1867 );
1868 }
1869
1870 $win->show;
1871}
1872
1873sub build_mode_query_arch_info {
1874 my ($iteminfo) = $::IN_BUILD_MODE;
1875 my $itemarchname = $iteminfo->{item};
1876 my $info = $iteminfo->{info};
1877
1878 my $dialog = new CFPlus::UI::Toplevel
1879 x => "center",
1880 y => "center",
1881 z => 50,
1882 force_w => int $WIDTH * 1/2,
1883 title => "Enter information for placement of '$itemarchname'",
1884 has_close_button => 1;
1885
1886 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1887
1888 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1889 my $row = 0;
1890 if ($info->{has_name}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1892 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1893 }
1894 if ($info->{has_text}) {
1895 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1896 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1897 }
1898 if ($info->{has_connection}) {
1899 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1900 $table->add (1, $row++,
1901 new CFPlus::UI::Entry
1902 expand => 1,
1903 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1904 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1905 );
1906 }
1907
1908 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1909 $hb->add (new CFPlus::UI::Button
1910 text => "Close",
1911 expand => 1,
1912 on_activate => sub { $dialog->hide; 0 },
1913 );
1914 $dialog->show;
1915}
1916
1917sub video_shutdown { 1785sub video_shutdown {
1918 CFPlus::OpenGL::shutdown; 1786 CFPlus::OpenGL::shutdown;
1919 1787
1920 undef $SDL_ACTIVE; 1788 undef $SDL_ACTIVE;
1921} 1789}
1922 1790
1923my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1924my $bgmusic;#TODO#hack#d#
1925
1926sub audio_channel_finished { 1791sub audio_channel_finished {
1927 my ($channel) = @_; 1792 my ($channel) = @_;
1928 1793
1929 #warn "channel $channel finished\n";#d# 1794# warn "channel $channel finished\n";#d#
1795}
1796
1797our %AUDIO_PLAY;
1798our %AUDIO_CHUNK;
1799
1800sub audio_sound_push($) {
1801 my ($face) = @_;
1802
1803 if (my $chunk = $AUDIO_CHUNK{$face}) {
1804 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1805 my (undef, $dx, $dy, $vol) = @$_;
1806
1807 my $channel = $chunk->play
1808 or return;
1809
1810 $channel->volume (128 + $vol);
1811 $dx = $dx / 10 * 255;
1812 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816 }
1817 } else {
1818 # sound_meta not set means data is in flight either way
1819 my $meta = $CONN->{sound_meta}{$face}
1820 or return;
1821
1822 # fetch from database
1823 CFPlus::DB::get res_data => $meta->{name}, sub {
1824 my $vol = $meta->{meta}{volume} || 100;
1825 my $rwops = new CFPlus::RW $_[0];
1826 my $chunk = new CFPlus::MixChunk $rwops;
1827 $chunk->volume ($vol * 128 / 100);
1828 $AUDIO_CHUNK{$face} = $chunk;
1829
1830 audio_sound_push ($face);
1831 };
1832 }
1833}
1834
1835sub audio_sound_play {
1836 my ($face, $dx, $dy, $vol) = @_;
1837
1838 $SDL_MIXER
1839 or return;
1840
1841 my $queue = $AUDIO_PLAY{$face} ||= [];
1842 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1843 audio_sound_push $face
1844 unless @$queue > 1;
1845}
1846
1847sub audio_music_set {
1848 my ($songs) = @_;
1849
1850 my @want =
1851 grep $_,
1852 map $CONN->{music_meta}{$_},
1853 @$songs;
1854
1855 if (@want) {
1856 @MUSIC_WANT = @want;
1857 &audio_music_changed ();
1858 }
1859}
1860
1861sub audio_music_start {
1862 my $meta = $MUSIC_PLAYING_META;
1863
1864 CFPlus::DB::get res_data => $meta->{name}, sub {
1865 return unless $SDL_MIXER;
1866
1867 # music might have changed...
1868 $meta eq $MUSIC_PLAYING_META
1869 or return &audio_music_start ();
1870
1871 $MUSIC_PLAYING_DATA = \$_[0];
1872
1873 my $rwops = $meta->{path}
1874 ? new_from_file CFPlus::RW $meta->{path}
1875 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1876
1877 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1878 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1879
1880 my $NOW = time;
1881
1882 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1883 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1884 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1885 $MUSIC_START = time - $pos;
1886 } else {
1887 $MUSIC_PLAYER->play (0);
1888 $MUSIC_START = time;
1889 }
1890
1891 delete $MUSIC_PLAYING_META->{stop_time};
1892 delete $MUSIC_PLAYING_META->{stop_pos};
1893 }
1894}
1895
1896sub audio_music_changed {
1897 return unless $CFG->{bgm_enable};
1898 return unless $SDL_MIXER;
1899
1900 # default MUSIC_WANT == MUSIC_DEFAULT
1901 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1902
1903 # if the currently playing song is acceptable, let it continue
1904 return if $MUSIC_PLAYING_META
1905 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1906
1907 my $NOW = time;
1908
1909 if ($MUSIC_PLAYING_META) {
1910 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1911 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1912 CFPlus::MixMusic::fade_out 1000;
1913 } else {
1914 # sort by stop time, oldest first
1915 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1916
1917 # if the most recently-played piece played very recently,
1918 # resume it, else choose the oldest piece for rotation.
1919 $MUSIC_PLAYING_META =
1920 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1921 ? $MUSIC_WANT[-1]
1922 : $MUSIC_WANT[0];
1923
1924 audio_music_start;
1925 }
1930} 1926}
1931 1927
1932sub audio_music_finished { 1928sub audio_music_finished {
1933 return unless $CFG->{bgm_enable}; 1929 undef $MUSIC_PLAYER;
1930 undef $MUSIC_PLAYING_META;
1931 undef $MUSIC_PLAYING_DATA;
1934 1932
1935 # TODO: hack, do play loop and mood music 1933 audio_music_changed;
1936 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1937 $bgmusic->play (0);
1938
1939 push @bgmusic, shift @bgmusic;
1940} 1934}
1941 1935
1942sub audio_init { 1936sub audio_init {
1943 if ($CFG->{audio_enable}) { 1937 if ($CFG->{audio_enable}) {
1944 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1938 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1945 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1939 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1946 1940
1947 unless ($SDL_MIXER) { 1941 unless ($SDL_MIXER) {
1948 status "Unable to open sound device: there will be no sound"; 1942 status "Unable to open sound device: there will be no sound";
1949 return; 1943 return;
1950 }
1951
1952 CFPlus::Mix_AllocateChannels 8;
1953 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1954
1955 audio_music_finished;
1956
1957 local $_;
1958 while (<$fh>) {
1959 next if /^\s*#/;
1960 next if /^\s*$/;
1961
1962 my ($file, $volume, $event) = split /\s+/, $_, 3;
1963
1964 push @SOUNDS, "$volume,$file";
1965
1966 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1967 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1968 $chunk->volume ($volume * 128 / 100);
1969 $chunk
1970 };
1971 }
1972 } else {
1973 status "unable to open sound config: $!";
1974 } 1944 }
1945
1946 CFPlus::Mix_AllocateChannels 16;
1947 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1948
1949 audio_music_finished;
1950 } else {
1951 undef $SDL_MIXER;
1975 } 1952 }
1976} 1953}
1977 1954
1978sub audio_shutdown { 1955sub audio_shutdown {
1979 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1956 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
1994 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1995 1972
1996 $CFPlus::UI::ROOT->draw; 1973 $CFPlus::UI::ROOT->draw;
1997 1974
1998 $WANT_REFRESH = 0; 1975 $WANT_REFRESH = 0;
1999 $CAN_REFRESH = 0; 1976 $CAN_REFRESH = 0;
2000 $LAST_REFRESH = $NOW; 1977 $LAST_REFRESH = $NOW;
2001 1978
2002 CFPlus::SDL_GL_SwapBuffers; 1979 CFPlus::SDL_GL_SwapBuffers;
2003} 1980}
2004 1981
2005my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1982my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2006 $NOW = time; 1983 $NOW = time;
2007 1984
2008 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1985 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2009 for CFPlus::SDL_PollEvent; 1986 for CFPlus::poll_events;
2010 1987
2011 if (%animate_object) { 1988 if (%animate_object) {
2012 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1989 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2013 $WANT_REFRESH++; 1990 ++$WANT_REFRESH;
2014 } 1991 }
2015 1992
2016 if ($WANT_REFRESH) { 1993 if ($WANT_REFRESH) {
2017 force_refresh; 1994 force_refresh;
2018 } else { 1995 } else {
… …
2028sub animation_stop { 2005sub animation_stop {
2029 my ($widget) = @_; 2006 my ($widget) = @_;
2030 delete $animate_object{$widget}; 2007 delete $animate_object{$widget};
2031} 2008}
2032 2009
2033# check once/second for faces that need to be prefetched
2034# this should, of course, only run on demand, but
2035# SDL forces worse things on us....
2036
2037Event->timer (after => 1, interval => 0.25, cb => sub {
2038 $CONN->face_prefetch
2039 if $CONN;
2040});
2041
2042%SDL_CB = ( 2010%SDL_CB = (
2043 CFPlus::SDL_QUIT => sub { 2011 CFPlus::SDL_QUIT => sub {
2044 Event::unloop -1; 2012 exit;
2045 }, 2013 },
2046 CFPlus::SDL_VIDEORESIZE => sub { 2014 CFPlus::SDL_VIDEORESIZE => sub {
2047 }, 2015 },
2048 CFPlus::SDL_VIDEOEXPOSE => sub { 2016 CFPlus::SDL_VIDEOEXPOSE => sub {
2049 CFPlus::UI::full_refresh; 2017 CFPlus::UI::full_refresh;
2050 }, 2018 },
2051 CFPlus::SDL_ACTIVEEVENT => sub { 2019 CFPlus::SDL_ACTIVEEVENT => sub {
2052# not useful, as APPACTIVE include sonly iconified state, not unmapped 2020# not useful, as APPACTIVE include sonly iconified state, not unmapped
2053# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2021# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2022# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2054# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2023# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2055# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2024# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2056# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2025# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2057 }, 2026 },
2058 CFPlus::SDL_KEYDOWN => sub { 2027 CFPlus::SDL_KEYDOWN => sub {
… …
2082 2051
2083$SIG{INT} = $SIG{TERM} = sub { exit }; 2052$SIG{INT} = $SIG{TERM} = sub { exit };
2084 2053
2085{ 2054{
2086 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2055 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2056 CFPlus::DB::Server::run;
2057
2087 CFPlus::UI::set_layout ($::CFG->{layout}); 2058 CFPlus::UI::set_layout ($::CFG->{layout});
2088 2059
2089 my %DEF_CFG = ( 2060 my %DEF_CFG = (
2090 sdl_mode => 0, 2061 sdl_mode => 0,
2091 width => 640, 2062 width => 640,
2092 height => 480, 2063 height => 480,
2093 fullscreen => 0, 2064 fullscreen => 0,
2094 fast => 0, 2065 fast => 0,
2095 map_scale => 1, 2066 map_scale => 1,
2096 fow_enable => 1, 2067 fow_enable => 1,
2097 fow_intensity => 0.45, 2068 fow_intensity => 0,
2098 fow_smooth => 0, 2069 map_smoothing => 1,
2099 gui_fontsize => 1, 2070 gui_fontsize => 1,
2100 log_fontsize => 0.7, 2071 log_fontsize => 0.7,
2101 gauge_fontsize => 1, 2072 gauge_fontsize => 1,
2102 gauge_size => 0.35, 2073 gauge_size => 0.35,
2103 stat_fontsize => 0.7, 2074 stat_fontsize => 0.7,
2104 mapsize => 100, 2075 mapsize => 100,
2105 say_command => 'chat',
2106 audio_enable => 1, 2076 audio_enable => 1,
2107 bgm_enable => 1, 2077 bgm_enable => 1,
2108 bgm_volume => 0.25, 2078 bgm_volume => 0.25,
2109 face_prefetch => 0,
2110 output_sync => 1, 2079 output_sync => 1,
2111 output_count => 1, 2080 output_count => 1,
2112 output_rate => "", 2081 output_rate => "",
2113 pickup => 0, 2082 pickup => 0,
2114 inv_sort => "mtime", 2083 inv_sort => "mtime",
2115 default => "profile", # default profile 2084 default => "profile", # default profile
2116 show_tips => 1, 2085 show_tips => 1,
2086 logview_max_par => 1000,
2117 ); 2087 );
2118 2088
2119 while (my ($k, $v) = each %DEF_CFG) { 2089 while (my ($k, $v) = each %DEF_CFG) {
2120 $CFG->{$k} = $v unless exists $CFG->{$k}; 2090 $CFG->{$k} = $v unless exists $CFG->{$k};
2121 } 2091 }
… …
2135 } 2105 }
2136 } 2106 }
2137 2107
2138 sdl_init; 2108 sdl_init;
2139 2109
2140 @SDL_MODES = reverse 2110 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2141 grep $_->[0] >= 640 && $_->[1] >= 480, 2111 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2142 CFPlus::SDL_ListModes;
2143
2144 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2112 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2113
2114 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2145 2115
2146 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2116 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2147 2117
2148 { 2118 {
2149 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2119 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2190 2160
2191Event::loop; 2161Event::loop;
2192#CFPlus::SDL_Quit; 2162#CFPlus::SDL_Quit;
2193#CFPlus::_exit 0; 2163#CFPlus::_exit 0;
2194 2164
2165END {
2195END { CFPlus::SDL_Quit } 2166 CFPlus::SDL_Quit;
2167 CFPlus::DB::Server::stop;
2168}
2196 2169
2197=head1 NAME 2170=head1 NAME
2198 2171
2199cfplus - A Crossfire+ and Crossfire game client 2172cfplus - A Crossfire+ and Crossfire game client
2200 2173

Diff Legend

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