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.132 by root, Mon Nov 20 16:41:46 2006 UTC vs.
Revision 1.175 by root, Tue Jul 17 22:08:57 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}
… …
58use Compress::LZF; 80use Compress::LZF;
59 81
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
63use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
64use CFPlus::Pod; 89use CFPlus::Pod;
65use CFPlus::BindingEditor;
66use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
67 92
68$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
70 95
71$Event::Eval = 0; 96$Event::Eval = 1;
72$Event::DIED = sub { 97$Event::DIED = sub {
73 CFPlus::fatal Carp::longmess $_[1] 98 CFPlus::fatal Carp::longmess $_[1]
74}; 99};
75 100
76my $MAX_FPS = 60; 101my $MAX_FPS = 60;
… …
134 159
135our $SDL_ACTIVE; 160our $SDL_ACTIVE;
136our %SDL_CB; 161our %SDL_CB;
137 162
138our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
139our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
141 172
142our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 174our $STATUSBOX;
… …
145 176
146our $INV; 177our $INV;
147our $INVR; 178our $INVR;
148our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
149 180
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
154 185
155sub status { 186sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 188}
158 189
… …
174sub destroy_query_dialog { 205sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
177} 208}
178 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
179# server query dialog 213# server query dialog
180sub server_query { 214sub server_query {
181 my ($conn, $flags, $prompt) = @_; 215 my ($conn, $flags, $prompt) = @_;
216
217 # FIXME: a very ugly hack to wait for stat update #d#
218 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
219 unless ($QUERY_TIMER) {
220 $QUERY_TIMER =
221 Event->timer (
222 after => 1,
223 cb => sub {
224 server_query ($conn, $flags, $prompt, 1);
225 $QUERY_TIMER = undef
226 }
227 );
228 return;
229 }
230 }
182 231
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 233 x => "center",
185 y => "center", 234 y => "center",
186 title => "Server Query", 235 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
188 ; 237 ;
189 238
190 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 241 ellipsise => 0,
193 text => $prompt; 242 text => $prompt;
194 243
195 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
213 ); 262 );
214 263
215 $dialog->grab_focus; 264 $dialog->grab_focus;
216 265
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
218 $dialog->{tooltip} = "#charcreation_focus";
219
220 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
221 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
222 269
223 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 272 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
227 274
228 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
229 276
… …
242 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
243 0 290 0
244 }, 291 },
245 ); 292 );
246 293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
316
247 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 319 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
251 ; 321 ;
… …
254 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
255 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
256 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
257 return; 327 return;
258 } 328 }
259
260 $STATS_PAGE->show;
261 $MESSAGE_WINDOW->hide;
262 329
263 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
264 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
265 ellipsise => 0, 332 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
… …
375 status "logging in..."; 442 status "logging in...";
376 443
377 $LOGIN_BUTTON->set_text ("Logout"); 444 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 445 $SETUP_DIALOG->hide;
379 446
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 447 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 448
384 my ($host, $port) = split /:/, $PROFILE->{host}; 449 my ($host, $port) = split /:/, $PROFILE->{host};
385 450
386 $MAP = new CFPlus::Map; 451 $MAP = new CFPlus::Map;
… …
401 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
402 map => $MAP, 467 map => $MAP,
403 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
404 query => \&server_query, 469 query => \&server_query,
405 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
406 sound_play => sub { 475 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
408 477
409 $SDL_MIXER 478 $SDL_MIXER
410 or return; 479 or return;
… …
430 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
434 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
435 507
436 return unless $CONN; 508 return unless $CONN;
437 509
438 status "connection closed"; 510 status "connection closed";
439 511
… …
447sub graphics_setup { 519sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 520 my $vbox = new CFPlus::UI::VBox;
449 521
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 523
524 my $row = 0;
525
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
528 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530
531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
455 $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]); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label
542 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
543 can_events => 1, tooltip => $vidmode_tooltip);
457 544
458 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 546 my ($self, $value) = @_;
460 547
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 550 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 552
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 562 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 565 );
481 566
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 );
573
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
487 ); 589 );
488 590
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 );
599
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
492 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
493 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
… …
498 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
499 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
501 ); 612 );
502 613
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox 615 $table->add (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fow_smooth}, 616 state => $CFG->{fow_smooth},
506 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 617 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
507 on_changed => sub { 618 on_changed => sub {
508 my ($self, $value) = @_; 619 my ($self, $value) = @_;
509 $CFG->{fow_smooth} = $value; 620 $CFG->{fow_smooth} = $value;
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 621 0
512 } 622 }
513 );
514
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 ); 623 );
521 624
522 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 625 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 626 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 627 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 645 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 646 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 647 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 648 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 649 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0
548 }
549 );
550
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0 650 0
558 } 651 }
559 ); 652 );
560 653
561 $vbox 654 $vbox
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 759 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 760 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 761 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 762 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 763 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 764 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
672 765
673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
674
675 for my $x (0..2) {
676 for my $y (0 .. 2) {
677 $table->add ($x + 3, $y,
678 new CFPlus::UI::Entry
679 text => $default_smooth[$x * 3 + $y],
680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
681 );
682 }
683 }
684
685 767
686 $table 768 $table
687} 769}
688 770
689sub stats_window { 771sub stats_window {
… …
886 for 0 .. $#col; 968 for 0 .. $#col;
887 969
888 my @align = qw(1 0 1 1 -1); 970 my @align = qw(1 0 1 1 -1);
889 971
890 my $y = 0; 972 my $y = 0;
891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} } 973 for my $m (@{ $msg->{servers} }) {
897 ) {
898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 974 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 975 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
900 976
901 for ($desc) { 977 for ($desc) {
902 s/<br>/\n/gi; 978 s/<br>/\n/gi;
903 s/<li>/\n· /gi; 979 s/<li>/\n· /gi;
904 s/<.*?>//sgi; 980 s/<.*?>//sgi;
… …
934 max_w => $::WIDTH * 0.4, 1010 max_w => $::WIDTH * 0.4,
935 ellipsise => 0, 1011 ellipsise => 0,
936 align => $align[$_], 1012 align => $align[$_],
937 text => $m->[$_], 1013 text => $m->[$_],
938 tooltip => $tip[$_], 1014 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1015 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
940 can_hover => 1, 1016 can_hover => 1,
941 can_events => 1, 1017 can_events => 1,
942 fontsize => 0.8) 1018 fontsize => 0.8)
943 for 0 .. $#$m; 1019 for 0 .. $#$m;
944 } 1020 }
… …
1045 . "so only set it if you really need to prefetch images. " 1121 . "so only set it if you really need to prefetch images. "
1046 . "This option can be set and unset any time.", 1122 . "This option can be set and unset any time.",
1047 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1048 ); 1124 );
1049 1125
1050 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1126 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1051 $table->add (1, 9, new CFPlus::UI::Entry 1127 $table->add (1, 9, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate},
1129 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1131 . "default will be used, which is usually around 100kb/s.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1133 );
1134
1135 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1136 $table->add (1, 10, new CFPlus::UI::Entry
1052 text => $CFG->{output_count}, 1137 text => $CFG->{output_count},
1053 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1138 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1054 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1055 ); 1140 );
1056 1141
1057 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1142 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1058 $table->add (1, 10, new CFPlus::UI::Entry 1143 $table->add (1, 11, new CFPlus::UI::Entry
1059 text => $CFG->{output_sync}, 1144 text => $CFG->{output_sync},
1060 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1145 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1061 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1062 ); 1147 );
1063 1148
1064 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1065 expand => 1, 1150 expand => 1,
1066 align => 0, 1151 align => 0,
1067 text => "Login", 1152 text => "Login",
1068 on_activate => sub { 1153 on_activate => sub {
1069 $CONN ? stop_game 1154 $CONN ? stop_game
1070 : start_game; 1155 : start_game;
1071 0 1156 0
1072 }, 1157 },
1073 ); 1158 );
1074 1159
1160 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info",
1162 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1163 );
1164
1165 $vbox
1166}
1167
1168sub client_setup {
1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170
1171 my $row = 0;
1172
1075 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1173 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1076 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1077 text => $CFG->{say_command}, 1175 text => $CFG->{say_command},
1078 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. " 1176 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. "
1079 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1177 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1080 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1081 on_changed => sub { 1179 on_changed => sub {
1082 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1083 $CFG->{say_command} = $value; 1181 $CFG->{say_command} = $value;
1084 0 1182 0
1085 } 1183 }
1086 ); 1184 );
1087 1185
1088 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1089 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1187 $table->add (1, $row++, new CFPlus::UI::CheckBox
1090 state => $CFG->{show_tips}, 1188 state => $CFG->{show_tips},
1091 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1092 on_changed => sub { 1190 on_changed => sub {
1093 my ($self, $value) = @_; 1191 my ($self, $value) = @_;
1094 $CFG->{show_tips} = $value; 1192 $CFG->{show_tips} = $value;
1095 0 1193 0
1096 } 1194 }
1097 ); 1195 );
1098 1196
1099 $vbox->add (new CFPlus::UI::FancyFrame 1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1100 label => "Server Info", 1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1101 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1199 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201 . "sends more messages than this number, older messages get removed to save memory and "
1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub {
1204 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1206 0
1207 },
1102 ); 1208 );
1103 1209
1104 $vbox 1210 $table
1105} 1211}
1106 1212
1107sub message_window { 1213sub message_window {
1108 my $window = new CFPlus::UI::Toplevel 1214 my $window = new CFPlus::UI::Toplevel
1109 name => "message_window", 1215 name => "message_window",
… …
1166 1272
1167 $window 1273 $window
1168} 1274}
1169 1275
1170sub autopickup_setup { 1276sub autopickup_setup {
1277 my $r = new CFPlus::UI::ScrolledWindow (
1278 expand => 1,
1279 scroll_y => 1
1280 );
1171 my $table = new CFPlus::UI::Table; 1281 $r->add (my $table = new CFPlus::UI::Table
1282 row_expand => [0],
1283 col_expand => [0, 1, 0, 1],
1284 );
1172 1285
1173 for ( 1286 for (
1174 ["General", 0, 0, 1287 ["General", 0, 0,
1175 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1288 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1176 ["Inhibit autopickup" => PICKUP_INHIBIT], 1289 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1190 ["Boots" => PICKUP_BOOTS], 1303 ["Boots" => PICKUP_BOOTS],
1191 ["Gloves" => PICKUP_GLOVES], 1304 ["Gloves" => PICKUP_GLOVES],
1192 ["Cloaks" => PICKUP_CLOAK], 1305 ["Cloaks" => PICKUP_CLOAK],
1193 ], 1306 ],
1194 1307
1195 ["Readables", 2, 2, 1308 ["Readables", 2, 0,
1196 ["Spellbooks" => PICKUP_SPELLBOOK], 1309 ["Spellbooks" => PICKUP_SPELLBOOK],
1197 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1310 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1198 ["Normal Books/Scrolls" => PICKUP_READABLES], 1311 ["Normal Books/Scrolls" => PICKUP_READABLES],
1199 ], 1312 ],
1200 ["Misc", 2, 7, 1313 ["Misc", 2, 5,
1201 ["Food" => PICKUP_FOOD], 1314 ["Food" => PICKUP_FOOD],
1202 ["Drinks" => PICKUP_DRINK], 1315 ["Drinks" => PICKUP_DRINK],
1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1316 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1204 ["Keys" => PICKUP_KEY], 1317 ["Keys" => PICKUP_KEY],
1205 ["Magical Items" => PICKUP_MAGICAL], 1318 ["Magical Items" => PICKUP_MAGICAL],
1206 ["Potions" => PICKUP_POTION], 1319 ["Potions" => PICKUP_POTION],
1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1320 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1208 ["Ignore cursed" => PICKUP_NOT_CURSED], 1321 ["Ignore cursed" => PICKUP_NOT_CURSED],
1209 ["Jewelery" => PICKUP_JEWELS], 1322 ["Jewelery" => PICKUP_JEWELS],
1323 ["Flesh" => PICKUP_FLESH],
1210 ], 1324 ],
1211 ["Weight/Value ratio", 2, 17] 1325 ["Weight/Value ratio", 2, 17]
1212 ) 1326 )
1213 { 1327 {
1214 my ($title, $x, $y, @bits) = @$_; 1328 my ($title, $x, $y, @bits) = @$_;
… …
1259 $::CONN->send_command ("pickup $::CFG->{pickup}") 1373 $::CONN->send_command ("pickup $::CFG->{pickup}")
1260 if defined $::CONN; 1374 if defined $::CONN;
1261 0 1375 0
1262 }); 1376 });
1263 1377
1264 $table 1378 $r
1265} 1379}
1266 1380
1267my %SORT_ORDER = ( 1381my %SORT_ORDER = (
1268 type => undef, 1382 type => undef,
1269 mtime => sub { 1383 mtime => sub {
… …
1348 has_close_button => 1 1462 has_close_button => 1
1349 ; 1463 ;
1350 1464
1351 my $ntb = 1465 my $ntb =
1352 $PL_NOTEBOOK = 1466 $PL_NOTEBOOK =
1353 new CFPlus::UI::Notebook expand => 1, debug => 1; 1467 new CFPlus::UI::Notebook expand => 1;
1354 1468
1355 $ntb->add ( 1469 $ntb->add (
1356 "Statistics (F2)" => $STATS_PAGE = stats_window, 1470 "Statistics (F2)" => $STATS_PAGE = stats_window,
1357 "Shows statistics, where all your Stats and Resistances are shown." 1471 "Shows statistics, where all your Stats and Resistances are shown."
1358 ); 1472 );
… …
1370 $ntb->add ( 1484 $ntb->add (
1371 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1485 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1372 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1486 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1373 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1487 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1374 ); 1488 );
1489 $ntb->add (Pickup => autopickup_setup,
1490 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1375 1491
1376 $ntb->set_current_page ($INVENTORY_PAGE); 1492 $ntb->set_current_page ($INVENTORY_PAGE);
1377 1493
1378 $plwin->add ($ntb); 1494 $plwin->add ($ntb);
1379 $plwin 1495 $plwin
1380} 1496}
1381 1497
1382sub update_bindings {
1383 $BIND_UPD_CB->() if $BIND_UPD_CB;
1384}
1385
1386sub keyboard_setup { 1498sub keyboard_setup {
1387 my $binding_list = new CFPlus::UI::VBox; 1499 CFPlus::Macro::keyboard_setup
1388
1389 my $refresh;
1390 $refresh = $BIND_UPD_CB = sub {
1391 $binding_list->clear ();
1392
1393 return unless $PROFILE;
1394
1395 for my $mod (keys %{$PROFILE->{bindings}}) {
1396 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1397 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1398 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1399
1400 my $lbl = join "; ", @$cmds;
1401 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1402 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1403 $hb->add (new CFPlus::UI::Button
1404 text => "delete",
1405 tooltip => "Deletes the binding",
1406 on_activate => sub {
1407 $binding_list->remove ($hb);
1408 delete $PROFILE->{bindings}{$mod}{$sym};
1409 0
1410 });
1411
1412 $hb->add (new CFPlus::UI::Button
1413 text => "edit",
1414 tooltip => "Edits the binding",
1415 on_activate => sub {
1416 $::BIND_EDITOR->set_binding (
1417 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1418 sub {
1419 my ($nmod, $nsym, $ncmds) = @_;
1420 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1421 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1422 $refresh->();
1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1425 },
1426 sub {
1427 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1428 $SETUP_DIALOG->show;
1429 });
1430 $::BIND_EDITOR->show;
1431 $SETUP_DIALOG->hide;
1432 0
1433 });
1434
1435 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1436 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1437 }
1438 }
1439 };
1440
1441 my $vb = new CFPlus::UI::VBox;
1442 $vb->add (new CFPlus::UI::FancyFrame
1443 label => "Options",
1444 child => (my $hb = new CFPlus::UI::HBox),
1445 );
1446 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1447 $hb->add (new CFPlus::UI::CheckBox
1448 expand => 1,
1449 state => $CFG->{shift_fire_stop},
1450 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1451 on_changed => sub {
1452 my ($cbox, $value) = @_;
1453 $CFG->{shift_fire_stop} = $value;
1454 0
1455 });
1456
1457 $vb->add (new CFPlus::UI::FancyFrame
1458 label => "Bindings",
1459 child => $binding_list);
1460 $vb->add (my $hb = new CFPlus::UI::HBox);
1461
1462 $hb->add (new CFPlus::UI::Button
1463 text => "record new",
1464 expand => 1,
1465 tooltip => "This button opens the binding editor with an empty binding.",
1466 on_activate => sub {
1467 $::BIND_EDITOR->set_binding (undef, undef, [],
1468 sub {
1469 my ($mod, $sym, $cmds) = @_;
1470 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1471 $refresh->();
1472 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1473 $SETUP_DIALOG->show;
1474 },
1475 sub {
1476 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1477 $SETUP_DIALOG->show;
1478 },
1479 );
1480 $SETUP_DIALOG->hide;
1481 $::BIND_EDITOR->show;
1482 0
1483 },
1484 );
1485
1486 $hb->add (new CFPlus::UI::Button
1487 text => "close",
1488 tooltip => "Closes the binding window",
1489 expand => 1,
1490 on_activate => sub {
1491 $SETUP_DIALOG->hide;
1492 0
1493 }
1494 );
1495
1496 $refresh->();
1497
1498 $vb
1499} 1500}
1500 1501
1501sub help_window { 1502sub help_window {
1502 my $win = new CFPlus::UI::Toplevel 1503 my $win = new CFPlus::UI::Toplevel
1503 x => 'center', 1504 x => 'center',
… …
1660 1661
1661sub show_tip_of_the_day { 1662sub show_tip_of_the_day {
1662 # find all tips 1663 # find all tips
1663 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1664 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1664 1665
1665 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1666 CFPlus::DB::get state => "tip_of_the_day", sub {
1667 my ($todindex) = @_;
1666 $todindex = 0 if $todindex >= @tod; 1668 $todindex = 0 if $todindex >= @tod;
1667 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1669 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1668 1670
1669 # create dialog 1671 # create dialog
1670 my $dialog; 1672 my $dialog;
1671 1673
1672 my $close = sub { 1674 my $close = sub {
1673 $dialog->destroy; 1675 $dialog->destroy;
1676 };
1677
1678 $dialog = new CFPlus::UI::Toplevel
1679 x => "center",
1680 y => "center",
1681 z => 3,
1682 name => 'tip_of_the_day',
1683 force_w => int $WIDTH * 4/9,
1684 force_h => int $WIDTH * 2/9,
1685 title => "Tip of the day #" . (1 + $todindex),
1686 child => my $vbox = new CFPlus::UI::VBox,
1687 has_close_button => 1,
1688 on_delete => $close,
1689 ;
1690
1691 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1692 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1693 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1694
1695 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1696
1697 $table->add (0, 0, new CFPlus::UI::Button
1698 text => "Close",
1699 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>.",
1700 on_activate => $close,
1701 );
1702
1703 $table->add (2, 0, new CFPlus::UI::Button
1704 text => "Next",
1705 tooltip => "Show the next <b>Tip of the day</b>.",
1706 on_activate => sub {
1707 $close->();
1708 &show_tip_of_the_day;
1709 },
1710 );
1711
1712 $dialog->show;
1674 }; 1713 };
1675
1676 $dialog = new CFPlus::UI::Toplevel
1677 x => "center",
1678 y => "center",
1679 z => 3,
1680 name => 'tip_of_the_day',
1681 force_w => int $WIDTH * 4/9,
1682 force_h => int $WIDTH * 2/9,
1683 title => "Tip of the day #" . (1 + $todindex),
1684 child => my $vbox = new CFPlus::UI::VBox,
1685 has_close_button => 1,
1686 on_delete => $close,
1687 ;
1688
1689 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1690 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1691 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1692
1693 $vbox->add (my $table = new CFPlus::UI::Table);
1694
1695 $table->add (0, 0, new CFPlus::UI::Button
1696 text => "Close",
1697 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>.",
1698 on_activate => $close,
1699 );
1700
1701 $table->add (2, 0, new CFPlus::UI::Button
1702 text => "Next",
1703 tooltip => "Show the next <b>Tip of the day</b>.",
1704 on_activate => sub {
1705 $close->();
1706 &show_tip_of_the_day;
1707 },
1708 );
1709
1710 $dialog->show;
1711} 1714}
1712 1715
1713sub sdl_init { 1716sub sdl_init {
1714 CFPlus::SDL_Init 1717 CFPlus::SDL_Init
1715 and die "SDL::Init failed!\n"; 1718 and die "SDL::Init failed!\n";
1716} 1719}
1717 1720
1718sub video_init { 1721sub video_init {
1719 sdl_init;
1720
1721 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1722 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1722 1723
1723 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1724 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1724 1725
1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1726 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1726 $FULLSCREEN = $CFG->{fullscreen}; 1727 $FULLSCREEN = $CFG->{fullscreen};
1727 $FAST = $CFG->{fast}; 1728 $FAST = $CFG->{fast};
1728 1729
1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1730 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1731 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1731 1732
1732 $SDL_ACTIVE = 1; 1733 $SDL_ACTIVE = 1;
1733 $LAST_REFRESH = time - 0.01; 1734 $LAST_REFRESH = time - 0.01;
1734 1735
… …
1749 padding => 0, 1750 padding => 0,
1750 z => 100, 1751 z => 100,
1751 force_x => "max", 1752 force_x => "max",
1752 force_y => 0; 1753 force_y => 0;
1753 $DEBUG_STATUS->show; 1754 $DEBUG_STATUS->show;
1754
1755 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1756 1755
1757 $STATUSBOX = new CFPlus::UI::Statusbox; 1756 $STATUSBOX = new CFPlus::UI::Statusbox;
1758 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1757 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1759 1758
1760 (new CFPlus::UI::Frame 1759 (new CFPlus::UI::Frame
… …
1797 font => $FONT_FIXED, 1796 font => $FONT_FIXED,
1798 fontsize => $::CFG->{log_fontsize}, 1797 fontsize => $::CFG->{log_fontsize},
1799 indent => -4, 1798 indent => -4,
1800 can_hover => 1, 1799 can_hover => 1,
1801 can_events => 1, 1800 can_events => 1,
1801 max_par => $CFG->{logview_max_par},
1802 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1802 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1803 ; 1803 ;
1804 1804
1805 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1805 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1806 title => "Setup", 1806 title => "Setup",
1807 name => "setup_dialog", 1807 name => "setup_dialog",
… …
1818 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1818 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1819 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1819 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1820 1820
1821 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1821 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1822 "Configure the server to play on, your username, password and other server-related options."); 1822 "Configure the server to play on, your username, password and other server-related options.");
1823 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1823 $SETUP_NOTEBOOK->add (Client => client_setup,
1824 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1824 "Configure various client-specific settings.");
1825 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1825 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1826 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1826 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1827 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1827 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1828 "Configure the use of audio, sound effects and background music."); 1828 "Configure the use of audio, sound effects and background music.");
1829 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1829 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1861 ); 1861 );
1862 1862
1863 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1863 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1864 tooltip => "View Documentation"); 1864 tooltip => "View Documentation");
1865 1865
1866
1866 $BUTTONBAR->add (new CFPlus::UI::Button 1867 $BUTTONBAR->add (new CFPlus::UI::Button
1867 text => "Quit", 1868 text => "Quit",
1868 tooltip => "Terminates the program", 1869 tooltip => "Terminates the program",
1869 on_activate => sub { 1870 on_activate => sub {
1870 if ($CONN) { 1871 if ($CONN) {
… …
1881 } 1882 }
1882 1883
1883 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1884 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1884} 1885}
1885 1886
1887sub setup_build_button {
1888 my ($enabled) = @_;
1889 if ($enabled) {
1890 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1891 $BUILD_BUTTON ||= new CFPlus::UI::Button
1892 text => "Build",
1893 tooltip => "Opens the ingame builder",
1894 on_activate => sub {
1895 if ($CONN) {
1896 $CONN->send_ext_req (builder_player_items => sub {
1897 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1898 });
1899 }
1900 0
1901 };
1902 $BUTTONBAR->add ($BUILD_BUTTON);
1903 } else {
1904 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1905 }
1906}
1907
1908sub open_ingame_editor {
1909 my ($msg) = @_;
1910
1911 my $win = new CFPlus::UI::Toplevel
1912 x => 0,
1913 y => 'center',
1914 z => 4,
1915 name => 'builder_window',
1916 force_w => int $WIDTH * 1/4,
1917 force_h => int $HEIGHT * 3/4,
1918 title => "In game builder",
1919 has_close_button => 1;
1920
1921 my $r = new CFPlus::UI::ScrolledWindow (
1922 expand => 1,
1923 scroll_y => 1
1924 );
1925 $r->add (my $vb = new CFPlus::UI::VBox);
1926 $win->add ($r);
1927
1928
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "Disable build mode",
1932 on_activate => sub { $::IN_BUILD_MODE = undef }
1933 );
1934 $vb->add (
1935 new CFPlus::UI::Button
1936 text => "ERASE",
1937 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1938 );
1939
1940 for my $itemarchname (
1941 sort {
1942 $msg->{items}->{$a}->{build_arch_name}
1943 cmp $msg->{items}->{$b}->{build_arch_name}
1944 } keys %{$msg->{items}}
1945 ) {
1946 my $info = $msg->{items}->{$itemarchname};
1947 $vb->add (
1948 new CFPlus::UI::Button text => $info->{build_arch_name},
1949 on_activate => sub {
1950 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1951
1952 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1953 build_mode_query_arch_info ();
1954 }
1955 }
1956 );
1957 }
1958
1959 $win->show;
1960}
1961
1962sub build_mode_query_arch_info {
1963 my ($iteminfo) = $::IN_BUILD_MODE;
1964 my $itemarchname = $iteminfo->{item};
1965 my $info = $iteminfo->{info};
1966
1967 my $dialog = new CFPlus::UI::Toplevel
1968 x => "center",
1969 y => "center",
1970 z => 50,
1971 force_w => int $WIDTH * 1/2,
1972 title => "Enter information for placement of '$itemarchname'",
1973 has_close_button => 1;
1974
1975 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1976
1977 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1978 my $row = 0;
1979 if ($info->{has_name}) {
1980 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1981 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1982 }
1983 if ($info->{has_text}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1986 }
1987 if ($info->{has_connection}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1989 $table->add (1, $row++,
1990 new CFPlus::UI::Entry
1991 expand => 1,
1992 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1993 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1994 );
1995 }
1996
1997 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1998 $hb->add (new CFPlus::UI::Button
1999 text => "Close",
2000 expand => 1,
2001 on_activate => sub { $dialog->hide; 0 },
2002 );
2003 $dialog->show;
2004}
2005
1886sub video_shutdown { 2006sub video_shutdown {
1887 CFPlus::OpenGL::shutdown; 2007 CFPlus::OpenGL::shutdown;
1888 2008
1889 undef $SDL_ACTIVE; 2009 undef $SDL_ACTIVE;
1890} 2010}
1891 2011
1892my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1893my $bgmusic;#TODO#hack#d#
1894
1895sub audio_channel_finished { 2012sub audio_channel_finished {
1896 my ($channel) = @_; 2013 my ($channel) = @_;
1897 2014
1898 #warn "channel $channel finished\n";#d# 2015 #warn "channel $channel finished\n";#d#
1899} 2016}
1900 2017
2018sub audio_music_set {
2019 my ($songs) = @_;
2020
2021 my @want =
2022 grep $_,
2023 map $CONN->{music_meta}{$_},
2024 @$songs;
2025
2026 if (@want) {
2027 @MUSIC_WANT = @want;
2028 &audio_music_changed ();
2029 }
2030}
2031
2032sub audio_music_start {
2033 my $path = $MUSIC_PLAYING->{path}
2034 or return;
2035
2036 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2037 # music might have changed...
2038 $path eq $MUSIC_PLAYING->{path}
2039 or return &audio_music_start ();
2040
2041 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2042
2043 my $NOW = time;
2044
2045 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2046 my $pos = $MUSIC_PLAYING->{stop_pos};
2047 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2048 $MUSIC_START = time - $pos;
2049 } else {
2050 $MUSIC_PLAYER->play (0);
2051 $MUSIC_START = time;
2052 }
2053
2054 delete $MUSIC_PLAYING->{stop_time};
2055 delete $MUSIC_PLAYING->{stop_pos};
2056 }
2057}
2058
2059sub audio_music_changed {
2060 return unless $CFG->{bgm_enable};
2061
2062 # default MUSIC_WANT == MUSIC_DEFAULT
2063 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2064
2065 # if the currently playing song is acceptable, let it continue
2066 return if $MUSIC_PLAYING
2067 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2068
2069 my $NOW = time;
2070
2071 if ($MUSIC_PLAYING) {
2072 $MUSIC_PLAYING->{stop_time} = $NOW;
2073 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2074 CFPlus::MixMusic::fade_out 1000;
2075 } else {
2076 # sort by stop time, oldest first
2077 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2078
2079 # if the most recently-played piece played very recently,
2080 # resume it, else choose the oldest piece for rotation.
2081 $MUSIC_PLAYING =
2082 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2083 ? $MUSIC_WANT[-1]
2084 : $MUSIC_WANT[0];
2085
2086 audio_music_start;
2087 }
2088}
2089
1901sub audio_music_finished { 2090sub audio_music_finished {
1902 return unless $CFG->{bgm_enable}; 2091 $MUSIC_PLAYING = undef;
2092 undef $MUSIC_PLAYER;
1903 2093
1904 # TODO: hack, do play loop and mood music 2094 audio_music_changed;
1905 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1906 $bgmusic->play (0);
1907
1908 push @bgmusic, shift @bgmusic;
1909} 2095}
1910 2096
1911sub audio_init { 2097sub audio_init {
1912 if ($CFG->{audio_enable}) { 2098 if ($CFG->{audio_enable}) {
1913 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2099 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1963 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2149 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1964 2150
1965 $CFPlus::UI::ROOT->draw; 2151 $CFPlus::UI::ROOT->draw;
1966 2152
1967 $WANT_REFRESH = 0; 2153 $WANT_REFRESH = 0;
1968 $CAN_REFRESH = 0; 2154 $CAN_REFRESH = 0;
1969 $LAST_REFRESH = $NOW; 2155 $LAST_REFRESH = $NOW;
1970 2156
1971 CFPlus::SDL_GL_SwapBuffers; 2157 CFPlus::SDL_GL_SwapBuffers;
1972} 2158}
1973 2159
1974my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2160my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1975 $NOW = time; 2161 $NOW = time;
1976 2162
1977 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1978 for CFPlus::SDL_PollEvent; 2164 for CFPlus::poll_events;
1979 2165
1980 if (%animate_object) { 2166 if (%animate_object) {
1981 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1982 $WANT_REFRESH++; 2168 ++$WANT_REFRESH;
1983 } 2169 }
1984 2170
1985 if ($WANT_REFRESH) { 2171 if ($WANT_REFRESH) {
1986 force_refresh; 2172 force_refresh;
1987 } else { 2173 } else {
… …
2008 if $CONN; 2194 if $CONN;
2009}); 2195});
2010 2196
2011%SDL_CB = ( 2197%SDL_CB = (
2012 CFPlus::SDL_QUIT => sub { 2198 CFPlus::SDL_QUIT => sub {
2013 Event::unloop -1; 2199 exit;
2014 }, 2200 },
2015 CFPlus::SDL_VIDEORESIZE => sub { 2201 CFPlus::SDL_VIDEORESIZE => sub {
2016 }, 2202 },
2017 CFPlus::SDL_VIDEOEXPOSE => sub { 2203 CFPlus::SDL_VIDEOEXPOSE => sub {
2018 CFPlus::UI::full_refresh; 2204 CFPlus::UI::full_refresh;
2019 }, 2205 },
2020 CFPlus::SDL_ACTIVEEVENT => sub { 2206 CFPlus::SDL_ACTIVEEVENT => sub {
2021# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2207# not useful, as APPACTIVE include sonly iconified state, not unmapped
2208# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2209# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2210# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2211# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2212# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2022 }, 2213 },
2023 CFPlus::SDL_KEYDOWN => sub { 2214 CFPlus::SDL_KEYDOWN => sub {
2024 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2215 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2025 # alt-enter 2216 # alt-enter
2026 $FULLSCREEN_ENABLE->toggle; 2217 $FULLSCREEN_ENABLE->toggle;
… …
2047 2238
2048$SIG{INT} = $SIG{TERM} = sub { exit }; 2239$SIG{INT} = $SIG{TERM} = sub { exit };
2049 2240
2050{ 2241{
2051 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2242 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2243 CFPlus::DB::Server::run;
2244
2052 CFPlus::UI::set_layout ($::CFG->{layout}); 2245 CFPlus::UI::set_layout ($::CFG->{layout});
2053 2246
2054 my %DEF_CFG = ( 2247 my %DEF_CFG = (
2055 sdl_mode => 0, 2248 sdl_mode => 0,
2056 width => 640, 2249 width => 640,
2057 height => 480, 2250 height => 480,
2058 fullscreen => 0, 2251 fullscreen => 0,
2059 fast => 0, 2252 fast => 0,
2060 map_scale => 1, 2253 map_scale => 1,
2061 fow_enable => 1, 2254 fow_enable => 1,
2062 fow_intensity => 0.45, 2255 fow_intensity => 0,
2063 fow_smooth => 0, 2256 fow_smooth => 1,
2257 map_smoothing => 1,
2064 gui_fontsize => 1, 2258 gui_fontsize => 1,
2065 log_fontsize => 0.7, 2259 log_fontsize => 0.7,
2066 gauge_fontsize => 1, 2260 gauge_fontsize => 1,
2067 gauge_size => 0.35, 2261 gauge_size => 0.35,
2068 stat_fontsize => 0.7, 2262 stat_fontsize => 0.7,
2069 mapsize => 100, 2263 mapsize => 100,
2070 say_command => 'chat', 2264 say_command => 'chat',
2071 audio_enable => 1, 2265 audio_enable => 1,
2072 bgm_enable => 1, 2266 bgm_enable => 1,
2073 bgm_volume => 0.25, 2267 bgm_volume => 0.25,
2074 face_prefetch => 0, 2268 face_prefetch => 0,
2075 output_sync => 1, 2269 output_sync => 1,
2076 output_count => 1, 2270 output_count => 1,
2271 output_rate => "",
2077 pickup => 0, 2272 pickup => 0,
2078 inv_sort => "mtime", 2273 inv_sort => "mtime",
2079 default => "profile", # default profile 2274 default => "profile", # default profile
2080 show_tips => 1, 2275 show_tips => 1,
2276 logview_max_par => 1000,
2081 ); 2277 );
2082 2278
2083 while (my ($k, $v) = each %DEF_CFG) { 2279 while (my ($k, $v) = each %DEF_CFG) {
2084 $CFG->{$k} = $v unless exists $CFG->{$k}; 2280 $CFG->{$k} = $v unless exists $CFG->{$k};
2085 } 2281 }
2086 2282
2087 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2283 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2284 $PROFILE = $CFG->{profile}{default};
2285
2286 # convert old bindings (only default profile matters)
2287 if (my $bindings = delete $PROFILE->{bindings}) {
2288 while (my ($mod, $syms) = each %$bindings) {
2289 while (my ($sym, $cmds) = each %$syms) {
2290 push @{ $PROFILE->{macro} }, {
2291 accelkey => [$mod*1, $sym*1],
2292 action => $cmds,
2293 };
2294 }
2295 }
2296 }
2088 2297
2089 sdl_init; 2298 sdl_init;
2090 2299
2091 @SDL_MODES = reverse 2300 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2092 grep $_->[0] >= 640 && $_->[1] >= 480, 2301 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2093 CFPlus::SDL_ListModes;
2094
2095 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2302 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2096 2303
2097 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2304 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2098 2305
2099 { 2306 {
… …
2141 2348
2142Event::loop; 2349Event::loop;
2143#CFPlus::SDL_Quit; 2350#CFPlus::SDL_Quit;
2144#CFPlus::_exit 0; 2351#CFPlus::_exit 0;
2145 2352
2353END {
2146END { CFPlus::SDL_Quit } 2354 CFPlus::SDL_Quit;
2355 CFPlus::DB::Server::stop;
2356}
2147 2357
2148=head1 NAME 2358=head1 NAME
2149 2359
2150cfplus - A Crossfire+ and Crossfire game client 2360cfplus - A Crossfire+ and Crossfire game client
2151 2361

Diff Legend

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