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.121 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.170 by root, Sun Jul 15 21:15:14 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @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
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # 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
20 54
21 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;
22 } 67 }
23} 68}
24 69
25# 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
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
41use CFPlus::Pod; 89use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
44 92
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
47 95
48$Event::Eval = 0; 96$Event::Eval = 1;
49$Event::DIED = sub { 97$Event::DIED = sub {
50 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 99};
55 100
56my $MAX_FPS = 60; 101my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
58 103
59our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 105
61our $LAST_REFRESH; 106our $LAST_REFRESH;
62our $NOW; 107our $NOW;
63 108
64our $CFG; 109our $CFG;
… …
102 147
103our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
104our $STATS_PAGE; 149our $STATS_PAGE;
105our $SKILL_PAGE; 150our $SKILL_PAGE;
106our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
107 153
108our $HELP_WINDOW; 154our $HELP_WINDOW;
109our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
110our $FLOORBOX; 156our $FLOORBOX;
111our $GAUGES; 157our $GAUGES;
… …
113 159
114our $SDL_ACTIVE; 160our $SDL_ACTIVE;
115our %SDL_CB; 161our %SDL_CB;
116 162
117our $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
118our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
119our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
120 172
121our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
122our $STATUSBOX; 174our $STATUSBOX;
… …
124 176
125our $INV; 177our $INV;
126our $INVR; 178our $INVR;
127our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
128 180
129our $BIND_EDITOR;
130our $BIND_UPD_CB;
131
132our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
133 185
134sub status { 186sub status {
135 $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]);
136} 188}
137 189
138sub debug { 190sub debug {
139 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
192}
193
194sub message {
195 my ($para) = @_;
196
197 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201 $LOGVIEW->add_paragraph ($para);
202 $LOGVIEW->scroll_to_bottom;
140} 203}
141 204
142sub destroy_query_dialog { 205sub destroy_query_dialog {
143 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
144 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
145} 208}
146 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
147# server query dialog 213# server query dialog
148sub server_query { 214sub server_query {
149 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 }
150 231
151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
152 x => "center", 233 x => "center",
153 y => "center", 234 y => "center",
154 title => "Server Query", 235 title => "Server Query",
155 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
156 ; 237 ;
157 238
158 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
159 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
160 ellipsise => 0, 241 ellipsise => 0,
161 text => $prompt; 242 text => $prompt;
162 243
163 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
164 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
181 ); 262 );
182 263
183 $dialog->grab_focus; 264 $dialog->grab_focus;
184 265
185 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
186 $dialog->{tooltip} = "#charcreation_focus";
187
188 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) {
189 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
190 269
191 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
192 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
193 ellipsise => 0, 272 ellipsise => 0,
194 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
195 274
196 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
197 276
… …
209 $conn->send ("reply d"); 288 $conn->send ("reply d");
210 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
211 0 290 0
212 }, 291 },
213 ); 292 );
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 }
214 316
215 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
216 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
217 ellipsise => 0, 319 ellipsise => 0,
218 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
343 status "logging in..."; 445 status "logging in...";
344 446
345 $LOGIN_BUTTON->set_text ("Logout"); 447 $LOGIN_BUTTON->set_text ("Logout");
346 $SETUP_DIALOG->hide; 448 $SETUP_DIALOG->hide;
347 449
348 $PROFILE = $CFG->{profile}{default};
349
350 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 450 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
351 451
352 my ($host, $port) = split /:/, $PROFILE->{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
353 453
354 $MAP = new CFPlus::Map $mapsize, $mapsize; 454 $MAP = new CFPlus::Map;
355 455
356 $CONN = eval { 456 $CONN = eval {
357 new CFPlus::Protocol 457 new CFPlus::Protocol
358 host => $host, 458 host => $host,
359 port => $port || 13327, 459 port => $port || 13327,
… …
369 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
370 map => $MAP, 470 map => $MAP,
371 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
372 query => \&server_query, 472 query => \&server_query,
373 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
374 sound_play => sub { 478 sound_play => sub {
375 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
376 480
377 $SDL_MIXER 481 $SDL_MIXER
378 or return; 482 or return;
… …
397sub stop_game { 501sub stop_game {
398 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
400 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
401 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
402 $SPELL_PAGE->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
403 510
404 return unless $CONN; 511 return unless $CONN;
405 512
406 status "connection closed"; 513 status "connection closed";
407 514
… …
415sub graphics_setup { 522sub graphics_setup {
416 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
417 524
418 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
419 526
527 my $row = 0;
528
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533
420 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
421 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
422 536
423 $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]); 537 $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]);
424 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
425 539
426 $mode_slider->connect (changed => sub { 540 $mode_slider->connect (changed => sub {
… …
428 542
429 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
430 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
431 }); 545 });
432 $mode_slider->emit (changed => $mode_slider->{range}[0]); 546 $mode_slider->emit (changed => $mode_slider->{range}[0]);
433
434 my $row = 1;
435 547
436 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
437 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
438 state => $CFG->{fullscreen}, 550 state => $CFG->{fullscreen},
439 tooltip => "Bring the client into fullscreen mode.", 551 tooltip => "Bring the client into fullscreen mode.",
… …
445 state => $CFG->{fast}, 557 state => $CFG->{fast},
446 tooltip => "Lower the visual quality considerably to speed up rendering.", 558 tooltip => "Lower the visual quality considerably to speed up rendering.",
447 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
448 ); 560 );
449 561
562 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
563 $table->add (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 );
568
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0
576 }
577 );
578
450 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 579 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
451 $table->add (1, $row++, new CFPlus::UI::Slider 580 $table->add (1, $row++, new CFPlus::UI::Slider
452 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
453 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
454 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
584 );
585
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing},
589 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
590 . "This increases load on the graphics subsystem and works only with 2.x servers. "
591 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
455 ); 593 );
456 594
457 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
458 $table->add (1, $row++, new CFPlus::UI::CheckBox 596 $table->add (1, $row++, new CFPlus::UI::CheckBox
459 state => $CFG->{fow_enable}, 597 state => $CFG->{fow_enable},
… …
478 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
479 0 617 0
480 } 618 }
481 ); 619 );
482 620
483 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
484 $table->add (1, $row++, new CFPlus::UI::Slider
485 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
486 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
487 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
488 );
489
490 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
491 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add (1, $row++, new CFPlus::UI::Slider
492 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
493 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 624 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
494 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
510 range => [$CFG->{gauge_size}, 0.2, 0.8], 641 range => [$CFG->{gauge_size}, 0.2, 0.8],
511 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 642 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
512 on_changed => sub { 643 on_changed => sub {
513 $CFG->{gauge_size} = $_[1]; 644 $CFG->{gauge_size} = $_[1];
514 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
515 0
516 }
517 );
518
519 $table->add (1, $row++, new CFPlus::UI::Button
520 expand => 1, align => 0, text => "Apply",
521 tooltip => "Apply the video settings",
522 on_activate => sub {
523 video_shutdown ();
524 video_init ();
525 0 646 0
526 } 647 }
527 ); 648 );
528 649
529 $vbox 650 $vbox
… …
634 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
636 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
637 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
638 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
639 761
640 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
641 763
642 for my $x (0..2) { 764 for my $x (0..2) {
643 for my $y (0 .. 2) { 765 for my $y (0 .. 2) {
… …
647 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
648 ); 770 );
649 } 771 }
650 } 772 }
651 773
774 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
652 775
653 $table 776 $table
654} 777}
655 778
656sub stats_window { 779sub stats_window {
… …
825 948
826 my $table = $METASERVER->{table}; 949 my $table = $METASERVER->{table};
827 $table->clear; 950 $table->clear;
828 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 951 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
829 952
830 my $buf; 953 my $ok = 0;
831 954
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 955 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent;
833 957
834 unless ($fh) { 958 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 959 } sub {
836 return; 960 my ($msg) = @_;
837 } 961 if ($msg) {
838
839 Event->io (fd => $fh, poll => 'r', cb => sub {
840 my $res = sysread $fh, $buf, 8192, length $buf;
841
842 if (!defined $res) {
843 $_[0]->w->cancel;
844 $label->set_text ("error while retrieving server list: $!");
845 } elsif ($res == 0) {
846 $_[0]->w->cancel;
847 status "server list retrieved";
848
849 utf8::decode $buf if utf8::valid $buf;
850
851 $table->clear; 962 $table->clear;
852 963
853 my @tip = ( 964 my @tip = (
854 "The current number of users logged in on the server.", 965 "The current number of users logged in on the server.",
855 "The hostname of the server.", 966 "The hostname of the server.",
… …
865 for 0 .. $#col; 976 for 0 .. $#col;
866 977
867 my @align = qw(1 0 1 1 -1); 978 my @align = qw(1 0 1 1 -1);
868 979
869 my $y = 0; 980 my $y = 0;
870 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 981 for my $m (@{ $msg->{servers} }) {
871 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 982 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
983 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
872 984
873 for ($desc) { 985 for ($desc) {
874 s/<br>/\n/gi; 986 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 987 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 988 s/<.*?>//sgi;
877 s/&/&amp;/g; 989 s/&amp;/&/g;
878 s/</&lt;/g; 990 s/&lt;/</g;
879 s/>/&gt;/g; 991 s/&gt;/>/g;
880 } 992 }
881 993
882 $uptime = sprintf "%dd %02d:%02d:%02d", 994 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 995 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 996 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 997 (int $uptime / 60) % 60,
886 $m->[8] % 60; 998 $uptime % 60;
887 999
888 $m = [$users, $host, $uptime, $version, $desc]; 1000 $m = [$users, $host, $uptime, $version, $desc];
889 1001
890 $y++; 1002 $y++;
891 1003
… …
901 ), 1013 ),
902 (new CFPlus::UI::Empty expand => 1), 1014 (new CFPlus::UI::Empty expand => 1),
903 ]); 1015 ]);
904 1016
905 $table->add ($_, $y, new CFPlus::UI::Label 1017 $table->add ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 1019 ellipsise => 0,
907 align => $align[$_], 1020 align => $align[$_],
908 text => $m->[$_], 1021 text => $m->[$_],
909 tooltip => $tip[$_], 1022 tooltip => $tip[$_],
1023 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 1024 can_hover => 1,
911 can_events => 1, 1025 can_events => 1,
912 fontsize => 0.8) 1026 fontsize => 0.8)
913 for 0 .. $#$m; 1027 for 0 .. $#$m;
914 } 1028 }
1029 } else {
1030 $ok or $label->set_text ("error while contacting metaserver");
915 } 1031 }
916 }); 1032 };
1033
917} 1034}
918 1035
919sub metaserver_dialog { 1036sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 1037 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 1038 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 1042 title => "Server List",
926 name => 'metaserver_dialog', 1043 name => 'metaserver_dialog',
927 x => 'center', 1044 x => 'center',
928 y => 'center', 1045 y => 'center',
929 z => 3, 1046 z => 3,
1047 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 1048 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 1049 child => $vbox,
932 has_close_button => 1, 1050 has_close_button => 1,
933 table => $table, 1051 table => $table,
934 on_visibility_change => sub { 1052 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 1053 update_metaserver ($_[0]) if $_[1];
… …
1011 . "so only set it if you really need to prefetch images. " 1129 . "so only set it if you really need to prefetch images. "
1012 . "This option can be set and unset any time.", 1130 . "This option can be set and unset any time.",
1013 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1014 ); 1132 );
1015 1133
1016 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1134 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1017 $table->add (1, 9, new CFPlus::UI::Entry 1135 $table->add (1, 9, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate},
1137 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1138 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1139 . "default will be used, which is usually around 100kb/s.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1141 );
1142
1143 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1144 $table->add (1, 10, new CFPlus::UI::Entry
1018 text => $CFG->{output_count}, 1145 text => $CFG->{output_count},
1019 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1020 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1021 ); 1148 );
1022 1149
1023 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1150 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1024 $table->add (1, 10, new CFPlus::UI::Entry 1151 $table->add (1, 11, new CFPlus::UI::Entry
1025 text => $CFG->{output_sync}, 1152 text => $CFG->{output_sync},
1026 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1153 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1027 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1028 ); 1155 );
1029 1156
1030 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1031 expand => 1, 1158 expand => 1,
1032 align => 0, 1159 align => 0,
1033 text => "Login", 1160 text => "Login",
1034 on_activate => sub { 1161 on_activate => sub {
1035 $CONN ? stop_game 1162 $CONN ? stop_game
1036 : start_game; 1163 : start_game;
1037 0 1164 0
1038 }, 1165 },
1039 ); 1166 );
1040 1167
1168 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info",
1170 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1171 );
1172
1173 $vbox
1174}
1175
1176sub client_setup {
1177 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1178
1179 my $row = 0;
1180
1041 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1042 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1043 text => $CFG->{say_command}, 1183 text => $CFG->{say_command},
1044 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. " 1184 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. "
1045 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1185 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1046 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1047 on_changed => sub { 1187 on_changed => sub {
1048 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1049 $CFG->{say_command} = $value; 1189 $CFG->{say_command} = $value;
1050 0 1190 0
1051 } 1191 }
1052 ); 1192 );
1053 1193
1054 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1055 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1195 $table->add (1, $row++, new CFPlus::UI::CheckBox
1056 state => $CFG->{show_tips}, 1196 state => $CFG->{show_tips},
1057 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1197 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1058 on_changed => sub { 1198 on_changed => sub {
1059 my ($self, $value) = @_; 1199 my ($self, $value) = @_;
1060 $CFG->{show_tips} = $value; 1200 $CFG->{show_tips} = $value;
1061 0 1201 0
1062 } 1202 }
1063 ); 1203 );
1064 1204
1065 $vbox->add (new CFPlus::UI::FancyFrame 1205 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1066 label => "Server Info", 1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1067 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1207 text => $CFG->{logview_max_par},
1208 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1209 . "sends more messages than this number, older messages get removed to save memory and "
1210 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1211 on_changed => sub {
1212 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1214 0
1215 },
1068 ); 1216 );
1069 1217
1070 $vbox 1218 $table
1071} 1219}
1072 1220
1073sub message_window { 1221sub message_window {
1074 my $window = new CFPlus::UI::Toplevel 1222 my $window = new CFPlus::UI::Toplevel
1075 name => "message_window", 1223 name => "message_window",
… …
1132 1280
1133 $window 1281 $window
1134} 1282}
1135 1283
1136sub autopickup_setup { 1284sub autopickup_setup {
1285 my $r = new CFPlus::UI::ScrolledWindow (
1286 expand => 1,
1287 scroll_y => 1
1288 );
1137 my $table = new CFPlus::UI::Table; 1289 $r->add (my $table = new CFPlus::UI::Table
1290 row_expand => [0],
1291 col_expand => [0, 1, 0, 1],
1292 );
1138 1293
1139 for ( 1294 for (
1140 ["General", 0, 0, 1295 ["General", 0, 0,
1141 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1296 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1142 ["Inhibit autopickup" => PICKUP_INHIBIT], 1297 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1156 ["Boots" => PICKUP_BOOTS], 1311 ["Boots" => PICKUP_BOOTS],
1157 ["Gloves" => PICKUP_GLOVES], 1312 ["Gloves" => PICKUP_GLOVES],
1158 ["Cloaks" => PICKUP_CLOAK], 1313 ["Cloaks" => PICKUP_CLOAK],
1159 ], 1314 ],
1160 1315
1161 ["Readables", 2, 2, 1316 ["Readables", 2, 0,
1162 ["Spellbooks" => PICKUP_SPELLBOOK], 1317 ["Spellbooks" => PICKUP_SPELLBOOK],
1163 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1318 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1164 ["Normal Books/Scrolls" => PICKUP_READABLES], 1319 ["Normal Books/Scrolls" => PICKUP_READABLES],
1165 ], 1320 ],
1166 ["Misc", 2, 7, 1321 ["Misc", 2, 5,
1167 ["Food" => PICKUP_FOOD], 1322 ["Food" => PICKUP_FOOD],
1168 ["Drinks" => PICKUP_DRINK], 1323 ["Drinks" => PICKUP_DRINK],
1169 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1324 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1170 ["Keys" => PICKUP_KEY], 1325 ["Keys" => PICKUP_KEY],
1171 ["Magical Items" => PICKUP_MAGICAL], 1326 ["Magical Items" => PICKUP_MAGICAL],
1172 ["Potions" => PICKUP_POTION], 1327 ["Potions" => PICKUP_POTION],
1173 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1328 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1174 ["Ignore cursed" => PICKUP_NOT_CURSED], 1329 ["Ignore cursed" => PICKUP_NOT_CURSED],
1175 ["Jewelery" => PICKUP_JEWELS], 1330 ["Jewelery" => PICKUP_JEWELS],
1331 ["Flesh" => PICKUP_FLESH],
1176 ], 1332 ],
1177 ["Weight/Value ratio", 2, 17] 1333 ["Weight/Value ratio", 2, 17]
1178 ) 1334 )
1179 { 1335 {
1180 my ($title, $x, $y, @bits) = @$_; 1336 my ($title, $x, $y, @bits) = @$_;
… …
1225 $::CONN->send_command ("pickup $::CFG->{pickup}") 1381 $::CONN->send_command ("pickup $::CFG->{pickup}")
1226 if defined $::CONN; 1382 if defined $::CONN;
1227 0 1383 0
1228 }); 1384 });
1229 1385
1230 $table 1386 $r
1231} 1387}
1232 1388
1233my %SORT_ORDER = ( 1389my %SORT_ORDER = (
1234 type => undef, 1390 type => undef,
1235 mtime => sub { sort { 1391 mtime => sub {
1392 my $NOW = time;
1393 sort {
1394 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1395 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1396
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1397 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1398 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1399 or $a->{type} <=> $b->{type}
1400 } @_
1239 } @_ }, 1401 },
1240 weight => sub { sort { 1402 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1403 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1404 or $a->{type} <=> $b->{type}
1243 } @_ }, 1405 } @_ },
1244); 1406);
… …
1269 #TODO# update to weigh/maxweight 1431 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1432 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1433
1272 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1434 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory); 1435 $sw1->add ($INV = new CFPlus::UI::Inventory);
1436 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1274 1437
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1438 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1439
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1440 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1441
… …
1307 has_close_button => 1 1470 has_close_button => 1
1308 ; 1471 ;
1309 1472
1310 my $ntb = 1473 my $ntb =
1311 $PL_NOTEBOOK = 1474 $PL_NOTEBOOK =
1312 new CFPlus::UI::Notebook expand => 1, debug => 1; 1475 new CFPlus::UI::Notebook expand => 1;
1313 1476
1314 $ntb->add ( 1477 $ntb->add (
1315 "Statistics (F2)" => $STATS_PAGE = stats_window, 1478 "Statistics (F2)" => $STATS_PAGE = stats_window,
1316 "Shows statistics, where all your Stats and Resistances are shown." 1479 "Shows statistics, where all your Stats and Resistances are shown."
1317 ); 1480 );
1318 $ntb->add ( 1481 $ntb->add (
1319 "Skills (F3)" => $SKILL_PAGE = skill_window, 1482 "Skills (F3)" => $SKILL_PAGE = skill_window,
1320 "Shows all your Skills." 1483 "Shows all your Skills."
1321 ); 1484 );
1322 1485
1323 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1486 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1487 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1325 $ntb->add ( 1488 $ntb->add (
1326 "Spellbook (F4)" => $spellsw, 1489 "Spellbook (F4)" => $spellsw,
1327 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1490 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1328 ); 1491 );
1329 $ntb->add ( 1492 $ntb->add (
1330 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1493 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1331 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1494 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1332 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1333 ); 1496 );
1497 $ntb->add (Pickup => autopickup_setup,
1498 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1334 1499
1335 $ntb->set_current_page ($INVENTORY_PAGE); 1500 $ntb->set_current_page ($INVENTORY_PAGE);
1336 1501
1337 $plwin->add ($ntb); 1502 $plwin->add ($ntb);
1338 $plwin 1503 $plwin
1339} 1504}
1340 1505
1341sub update_bindings {
1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1343}
1344
1345sub keyboard_setup { 1506sub keyboard_setup {
1346 my $binding_list = new CFPlus::UI::VBox; 1507 CFPlus::Macro::keyboard_setup
1347
1348 my $refresh;
1349 $refresh = $BIND_UPD_CB = sub {
1350 $binding_list->clear ();
1351
1352 return unless $PROFILE;
1353
1354 for my $mod (keys %{$PROFILE->{bindings}}) {
1355 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1356 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1357 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1358
1359 my $lbl = join "; ", @$cmds;
1360 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1361 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1362 $hb->add (new CFPlus::UI::Button
1363 text => "delete",
1364 tooltip => "Deletes the binding",
1365 on_activate => sub {
1366 $binding_list->remove ($hb);
1367 delete $PROFILE->{bindings}{$mod}{$sym};
1368 0
1369 });
1370
1371 $hb->add (new CFPlus::UI::Button
1372 text => "edit",
1373 tooltip => "Edits the binding",
1374 on_activate => sub {
1375 $::BIND_EDITOR->set_binding (
1376 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1377 sub {
1378 my ($nmod, $nsym, $ncmds) = @_;
1379 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1380 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1381 $refresh->();
1382 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1383 $SETUP_DIALOG->show;
1384 },
1385 sub {
1386 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1387 $SETUP_DIALOG->show;
1388 });
1389 $::BIND_EDITOR->show;
1390 $SETUP_DIALOG->hide;
1391 0
1392 });
1393
1394 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1395 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1396 }
1397 }
1398 };
1399
1400 my $vb = new CFPlus::UI::VBox;
1401 $vb->add (new CFPlus::UI::FancyFrame
1402 label => "Options",
1403 child => (my $hb = new CFPlus::UI::HBox),
1404 );
1405 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1406 $hb->add (new CFPlus::UI::CheckBox
1407 expand => 1,
1408 state => $CFG->{shift_fire_stop},
1409 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1410 on_changed => sub {
1411 my ($cbox, $value) = @_;
1412 $CFG->{shift_fire_stop} = $value;
1413 0
1414 });
1415
1416 $vb->add (new CFPlus::UI::FancyFrame
1417 label => "Bindings",
1418 child => $binding_list);
1419 $vb->add (my $hb = new CFPlus::UI::HBox);
1420
1421 $hb->add (new CFPlus::UI::Button
1422 text => "record new",
1423 expand => 1,
1424 tooltip => "This button opens the binding editor with an empty binding.",
1425 on_activate => sub {
1426 $::BIND_EDITOR->set_binding (undef, undef, [],
1427 sub {
1428 my ($mod, $sym, $cmds) = @_;
1429 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1430 $refresh->();
1431 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1432 $SETUP_DIALOG->show;
1433 },
1434 sub {
1435 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1436 $SETUP_DIALOG->show;
1437 },
1438 );
1439 $SETUP_DIALOG->hide;
1440 $::BIND_EDITOR->show;
1441 0
1442 },
1443 );
1444
1445 $hb->add (new CFPlus::UI::Button
1446 text => "close",
1447 tooltip => "Closes the binding window",
1448 expand => 1,
1449 on_activate => sub {
1450 $SETUP_DIALOG->hide;
1451 0
1452 }
1453 );
1454
1455 $refresh->();
1456
1457 $vb
1458} 1508}
1459 1509
1460sub help_window { 1510sub help_window {
1461 my $win = new CFPlus::UI::Toplevel 1511 my $win = new CFPlus::UI::Toplevel
1462 x => 'center', 1512 x => 'center',
… …
1619 1669
1620sub show_tip_of_the_day { 1670sub show_tip_of_the_day {
1621 # find all tips 1671 # find all tips
1622 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1672 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1623 1673
1624 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1674 CFPlus::DB::get state => "tip_of_the_day", sub {
1675 my ($todindex) = @_;
1625 $todindex = 0 if $todindex >= @tod; 1676 $todindex = 0 if $todindex >= @tod;
1626 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1677 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1627 1678
1628 # create dialog 1679 # create dialog
1629 my $dialog; 1680 my $dialog;
1630 1681
1631 my $close = sub { 1682 my $close = sub {
1632 $dialog->destroy; 1683 $dialog->destroy;
1684 };
1685
1686 $dialog = new CFPlus::UI::Toplevel
1687 x => "center",
1688 y => "center",
1689 z => 3,
1690 name => 'tip_of_the_day',
1691 force_w => int $WIDTH * 4/9,
1692 force_h => int $WIDTH * 2/9,
1693 title => "Tip of the day #" . (1 + $todindex),
1694 child => my $vbox = new CFPlus::UI::VBox,
1695 has_close_button => 1,
1696 on_delete => $close,
1697 ;
1698
1699 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1700 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1701 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1702
1703 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1704
1705 $table->add (0, 0, new CFPlus::UI::Button
1706 text => "Close",
1707 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>.",
1708 on_activate => $close,
1709 );
1710
1711 $table->add (2, 0, new CFPlus::UI::Button
1712 text => "Next",
1713 tooltip => "Show the next <b>Tip of the day</b>.",
1714 on_activate => sub {
1715 $close->();
1716 &show_tip_of_the_day;
1717 },
1718 );
1719
1720 $dialog->show;
1633 }; 1721 };
1634
1635 $dialog = new CFPlus::UI::Toplevel
1636 x => "center",
1637 y => "center",
1638 z => 3,
1639 name => 'tip_of_the_day',
1640 force_w => int $WIDTH * 4/9,
1641 force_h => int $WIDTH * 2/9,
1642 title => "Tip of the day #" . (1 + $todindex),
1643 child => my $vbox = new CFPlus::UI::VBox,
1644 has_close_button => 1,
1645 on_delete => $close,
1646 ;
1647
1648 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1649 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1650 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1651
1652 $vbox->add (my $table = new CFPlus::UI::Table);
1653
1654 $table->add (0, 0, new CFPlus::UI::Button
1655 text => "Close",
1656 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>.",
1657 on_activate => $close,
1658 );
1659
1660 $table->add (2, 0, new CFPlus::UI::Button
1661 text => "Next",
1662 tooltip => "Show the next <b>Tip of the day</b>.",
1663 on_activate => sub {
1664 $close->();
1665 &show_tip_of_the_day;
1666 },
1667 );
1668
1669 $dialog->show;
1670} 1722}
1671 1723
1672sub sdl_init { 1724sub sdl_init {
1673 CFPlus::SDL_Init 1725 CFPlus::SDL_Init
1674 and die "SDL::Init failed!\n"; 1726 and die "SDL::Init failed!\n";
… …
1708 padding => 0, 1760 padding => 0,
1709 z => 100, 1761 z => 100,
1710 force_x => "max", 1762 force_x => "max",
1711 force_y => 0; 1763 force_y => 0;
1712 $DEBUG_STATUS->show; 1764 $DEBUG_STATUS->show;
1713
1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1715 1765
1716 $STATUSBOX = new CFPlus::UI::Statusbox; 1766 $STATUSBOX = new CFPlus::UI::Statusbox;
1717 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1767 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1718 1768
1719 (new CFPlus::UI::Frame 1769 (new CFPlus::UI::Frame
… …
1756 font => $FONT_FIXED, 1806 font => $FONT_FIXED,
1757 fontsize => $::CFG->{log_fontsize}, 1807 fontsize => $::CFG->{log_fontsize},
1758 indent => -4, 1808 indent => -4,
1759 can_hover => 1, 1809 can_hover => 1,
1760 can_events => 1, 1810 can_events => 1,
1811 max_par => $CFG->{logview_max_par},
1761 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1812 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1762 ; 1813 ;
1763 1814
1764 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1815 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1765 title => "Setup", 1816 title => "Setup",
1766 name => "setup_dialog", 1817 name => "setup_dialog",
… …
1777 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1828 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1778 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1829 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1779 1830
1780 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1831 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1781 "Configure the server to play on, your username, password and other server-related options."); 1832 "Configure the server to play on, your username, password and other server-related options.");
1782 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1833 $SETUP_NOTEBOOK->add (Client => client_setup,
1783 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1834 "Configure various client-specific settings.");
1784 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1835 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1785 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1836 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1786 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1837 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1787 "Configure the use of audio, sound effects and background music."); 1838 "Configure the use of audio, sound effects and background music.");
1788 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1839 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1820 ); 1871 );
1821 1872
1822 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1873 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1823 tooltip => "View Documentation"); 1874 tooltip => "View Documentation");
1824 1875
1876
1825 $BUTTONBAR->add (new CFPlus::UI::Button 1877 $BUTTONBAR->add (new CFPlus::UI::Button
1826 text => "Quit", 1878 text => "Quit",
1827 tooltip => "Terminates the program", 1879 tooltip => "Terminates the program",
1828 on_activate => sub { 1880 on_activate => sub {
1829 if ($CONN) { 1881 if ($CONN) {
… …
1840 } 1892 }
1841 1893
1842 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1894 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1843} 1895}
1844 1896
1897sub setup_build_button {
1898 my ($enabled) = @_;
1899 if ($enabled) {
1900 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1901 $BUILD_BUTTON ||= new CFPlus::UI::Button
1902 text => "Build",
1903 tooltip => "Opens the ingame builder",
1904 on_activate => sub {
1905 if ($CONN) {
1906 $CONN->send_ext_req (builder_player_items => sub {
1907 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1908 });
1909 }
1910 0
1911 };
1912 $BUTTONBAR->add ($BUILD_BUTTON);
1913 } else {
1914 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1915 }
1916}
1917
1918sub open_ingame_editor {
1919 my ($msg) = @_;
1920
1921 my $win = new CFPlus::UI::Toplevel
1922 x => 0,
1923 y => 'center',
1924 z => 4,
1925 name => 'builder_window',
1926 force_w => int $WIDTH * 1/4,
1927 force_h => int $HEIGHT * 3/4,
1928 title => "In game builder",
1929 has_close_button => 1;
1930
1931 my $r = new CFPlus::UI::ScrolledWindow (
1932 expand => 1,
1933 scroll_y => 1
1934 );
1935 $r->add (my $vb = new CFPlus::UI::VBox);
1936 $win->add ($r);
1937
1938
1939 $vb->add (
1940 new CFPlus::UI::Button
1941 text => "Disable build mode",
1942 on_activate => sub { $::IN_BUILD_MODE = undef }
1943 );
1944 $vb->add (
1945 new CFPlus::UI::Button
1946 text => "ERASE",
1947 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1948 );
1949
1950 for my $itemarchname (
1951 sort {
1952 $msg->{items}->{$a}->{build_arch_name}
1953 cmp $msg->{items}->{$b}->{build_arch_name}
1954 } keys %{$msg->{items}}
1955 ) {
1956 my $info = $msg->{items}->{$itemarchname};
1957 $vb->add (
1958 new CFPlus::UI::Button text => $info->{build_arch_name},
1959 on_activate => sub {
1960 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1961
1962 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1963 build_mode_query_arch_info ();
1964 }
1965 }
1966 );
1967 }
1968
1969 $win->show;
1970}
1971
1972sub build_mode_query_arch_info {
1973 my ($iteminfo) = $::IN_BUILD_MODE;
1974 my $itemarchname = $iteminfo->{item};
1975 my $info = $iteminfo->{info};
1976
1977 my $dialog = new CFPlus::UI::Toplevel
1978 x => "center",
1979 y => "center",
1980 z => 50,
1981 force_w => int $WIDTH * 1/2,
1982 title => "Enter information for placement of '$itemarchname'",
1983 has_close_button => 1;
1984
1985 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1986
1987 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1988 my $row = 0;
1989 if ($info->{has_name}) {
1990 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1991 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1992 }
1993 if ($info->{has_text}) {
1994 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1995 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1996 }
1997 if ($info->{has_connection}) {
1998 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1999 $table->add (1, $row++,
2000 new CFPlus::UI::Entry
2001 expand => 1,
2002 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
2003 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
2004 );
2005 }
2006
2007 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2008 $hb->add (new CFPlus::UI::Button
2009 text => "Close",
2010 expand => 1,
2011 on_activate => sub { $dialog->hide; 0 },
2012 );
2013 $dialog->show;
2014}
2015
1845sub video_shutdown { 2016sub video_shutdown {
1846 CFPlus::OpenGL::shutdown; 2017 CFPlus::OpenGL::shutdown;
1847 2018
1848 undef $SDL_ACTIVE; 2019 undef $SDL_ACTIVE;
1849} 2020}
1850 2021
1851my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1852my $bgmusic;#TODO#hack#d#
1853
1854sub audio_channel_finished { 2022sub audio_channel_finished {
1855 my ($channel) = @_; 2023 my ($channel) = @_;
1856 2024
1857 #warn "channel $channel finished\n";#d# 2025 #warn "channel $channel finished\n";#d#
1858} 2026}
1859 2027
2028sub audio_music_set {
2029 my ($songs) = @_;
2030
2031 my @want =
2032 grep $_,
2033 map $CONN->{music_meta}{$_},
2034 @$songs;
2035
2036 if (@want) {
2037 @MUSIC_WANT = @want;
2038 &audio_music_changed ();
2039 }
2040}
2041
2042sub audio_music_start {
2043 my $path = $MUSIC_PLAYING->{path}
2044 or return;
2045
2046 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2047 # music might have changed...
2048 $path eq $MUSIC_PLAYING->{path}
2049 or return &audio_music_start ();
2050
2051 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2052
2053 my $NOW = time;
2054
2055 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2056 my $pos = $MUSIC_PLAYING->{stop_pos};
2057 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2058 $MUSIC_START = time - $pos;
2059 } else {
2060 $MUSIC_PLAYER->play (0);
2061 $MUSIC_START = time;
2062 }
2063
2064 delete $MUSIC_PLAYING->{stop_time};
2065 delete $MUSIC_PLAYING->{stop_pos};
2066 }
2067}
2068
2069sub audio_music_changed {
2070 return unless $CFG->{bgm_enable};
2071
2072 # default MUSIC_WANT == MUSIC_DEFAULT
2073 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2074
2075 # if the currently playing song is acceptable, let it continue
2076 return if $MUSIC_PLAYING
2077 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2078
2079 my $NOW = time;
2080
2081 if ($MUSIC_PLAYING) {
2082 $MUSIC_PLAYING->{stop_time} = $NOW;
2083 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2084 CFPlus::MixMusic::fade_out 1000;
2085 } else {
2086 # sort by stop time, oldest first
2087 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2088
2089 # if the most recently-played piece played very recently,
2090 # resume it, else choose the oldest piece for rotation.
2091 $MUSIC_PLAYING =
2092 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2093 ? $MUSIC_WANT[-1]
2094 : $MUSIC_WANT[0];
2095
2096 audio_music_start;
2097 }
2098}
2099
1860sub audio_music_finished { 2100sub audio_music_finished {
1861 return unless $CFG->{bgm_enable}; 2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
1862 2103
1863 # TODO: hack, do play loop and mood music 2104 audio_music_changed;
1864 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1865 $bgmusic->play (0);
1866
1867 push @bgmusic, shift @bgmusic;
1868} 2105}
1869 2106
1870sub audio_init { 2107sub audio_init {
1871 if ($CFG->{audio_enable}) { 2108 if ($CFG->{audio_enable}) {
1872 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1880 CFPlus::Mix_AllocateChannels 8; 2117 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2118 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 2119
1883 audio_music_finished; 2120 audio_music_finished;
1884 2121
2122 local $_;
1885 while (<$fh>) { 2123 while (<$fh>) {
1886 next if /^\s*#/; 2124 next if /^\s*#/;
1887 next if /^\s*$/; 2125 next if /^\s*$/;
1888 2126
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 2127 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1931 2169
1932my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2170my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1933 $NOW = time; 2171 $NOW = time;
1934 2172
1935 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1936 for CFPlus::SDL_PollEvent; 2174 for CFPlus::poll_events;
1937 2175
1938 if (%animate_object) { 2176 if (%animate_object) {
1939 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1940 $WANT_REFRESH++; 2178 $WANT_REFRESH++;
1941 } 2179 }
… …
1966 if $CONN; 2204 if $CONN;
1967}); 2205});
1968 2206
1969%SDL_CB = ( 2207%SDL_CB = (
1970 CFPlus::SDL_QUIT => sub { 2208 CFPlus::SDL_QUIT => sub {
1971 Event::unloop -1; 2209 exit;
1972 }, 2210 },
1973 CFPlus::SDL_VIDEORESIZE => sub { 2211 CFPlus::SDL_VIDEORESIZE => sub {
1974 }, 2212 },
1975 CFPlus::SDL_VIDEOEXPOSE => sub { 2213 CFPlus::SDL_VIDEOEXPOSE => sub {
1976 CFPlus::UI::full_refresh; 2214 CFPlus::UI::full_refresh;
1977 }, 2215 },
1978 CFPlus::SDL_ACTIVEEVENT => sub { 2216 CFPlus::SDL_ACTIVEEVENT => sub {
1979# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2217# not useful, as APPACTIVE include sonly iconified state, not unmapped
2218# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2219# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2220# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2221# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1980 }, 2222 },
1981 CFPlus::SDL_KEYDOWN => sub { 2223 CFPlus::SDL_KEYDOWN => sub {
1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2224 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1983 # alt-enter 2225 # alt-enter
1984 $FULLSCREEN_ENABLE->toggle; 2226 $FULLSCREEN_ENABLE->toggle;
… …
2005 2247
2006$SIG{INT} = $SIG{TERM} = sub { exit }; 2248$SIG{INT} = $SIG{TERM} = sub { exit };
2007 2249
2008{ 2250{
2009 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2251 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2252 CFPlus::DB::Server::run;
2253
2010 CFPlus::UI::set_layout ($::CFG->{layout}); 2254 CFPlus::UI::set_layout ($::CFG->{layout});
2011 2255
2012 my %DEF_CFG = ( 2256 my %DEF_CFG = (
2013 sdl_mode => 0, 2257 sdl_mode => 0,
2014 width => 640, 2258 width => 640,
2015 height => 480, 2259 height => 480,
2016 fullscreen => 0, 2260 fullscreen => 0,
2017 fast => 0, 2261 fast => 0,
2018 map_scale => 1, 2262 map_scale => 1,
2019 fow_enable => 1, 2263 fow_enable => 1,
2020 fow_intensity => 0.45, 2264 fow_intensity => 0.45,
2021 fow_smooth => 0, 2265 fow_smooth => 0,
2266 map_smoothing => 1,
2022 gui_fontsize => 1, 2267 gui_fontsize => 1,
2023 log_fontsize => 0.7, 2268 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2269 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2270 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2271 stat_fontsize => 0.7,
2027 mapsize => 100, 2272 mapsize => 100,
2028 say_command => 'say', 2273 say_command => 'chat',
2029 audio_enable => 1, 2274 audio_enable => 1,
2030 bgm_enable => 1, 2275 bgm_enable => 1,
2031 bgm_volume => 0.25, 2276 bgm_volume => 0.25,
2032 face_prefetch => 0, 2277 face_prefetch => 0,
2033 output_sync => 1, 2278 output_sync => 1,
2034 output_count => 1, 2279 output_count => 1,
2280 output_rate => "",
2035 pickup => 0, 2281 pickup => 0,
2036 inv_sort => "mtime", 2282 inv_sort => "mtime",
2037 default => "profile", # default profile 2283 default => "profile", # default profile
2038 show_tips => 1, 2284 show_tips => 1,
2285 logview_max_par => 1000,
2039 ); 2286 );
2040 2287
2041 while (my ($k, $v) = each %DEF_CFG) { 2288 while (my ($k, $v) = each %DEF_CFG) {
2042 $CFG->{$k} = $v unless exists $CFG->{$k}; 2289 $CFG->{$k} = $v unless exists $CFG->{$k};
2043 } 2290 }
2044 2291
2045 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2292 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2293 $PROFILE = $CFG->{profile}{default};
2294
2295 # convert old bindings (only default profile matters)
2296 if (my $bindings = delete $PROFILE->{bindings}) {
2297 while (my ($mod, $syms) = each %$bindings) {
2298 while (my ($sym, $cmds) = each %$syms) {
2299 push @{ $PROFILE->{macro} }, {
2300 accelkey => [$mod*1, $sym*1],
2301 action => $cmds,
2302 };
2303 }
2304 }
2305 }
2046 2306
2047 sdl_init; 2307 sdl_init;
2048 2308
2049 @SDL_MODES = reverse 2309 @SDL_MODES = reverse
2050 grep $_->[0] >= 640 && $_->[1] >= 480, 2310 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2087# } 2347# }
2088# my $t2 = Time::HiRes::time; 2348# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2349# warn $t2-$t1;
2090# } 2350# }
2091 2351
2352 $startup_done->();
2353
2092 video_init; 2354 video_init;
2093 audio_init; 2355 audio_init;
2094} 2356}
2095 2357
2096show_tip_of_the_day if $CFG->{show_tips}; 2358show_tip_of_the_day if $CFG->{show_tips};
2097 2359
2098Event::loop; 2360Event::loop;
2099#CFPlus::SDL_Quit; 2361#CFPlus::SDL_Quit;
2100#CFPlus::_exit 0; 2362#CFPlus::_exit 0;
2101 2363
2364END {
2102END { CFPlus::SDL_Quit } 2365 CFPlus::SDL_Quit;
2366 CFPlus::DB::Server::stop;
2367}
2103 2368
2104=head1 NAME 2369=head1 NAME
2105 2370
2106cfplus - A Crossfire+ and Crossfire game client 2371cfplus - A Crossfire+ and Crossfire game client
2107 2372

Diff Legend

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