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.120 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.163 by root, Thu Jul 12 17:56:51 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
56our $VERSION = '0.9';
57 100
58my $MAX_FPS = 60; 101my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
60 103
61our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62 105
63our $LAST_REFRESH; 106our $LAST_REFRESH;
64our $NOW; 107our $NOW;
65 108
66our $CFG; 109our $CFG;
… …
104 147
105our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
106our $STATS_PAGE; 149our $STATS_PAGE;
107our $SKILL_PAGE; 150our $SKILL_PAGE;
108our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
109 153
110our $HELP_WINDOW; 154our $HELP_WINDOW;
111our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
112our $FLOORBOX; 156our $FLOORBOX;
113our $GAUGES; 157our $GAUGES;
… …
115 159
116our $SDL_ACTIVE; 160our $SDL_ACTIVE;
117our %SDL_CB; 161our %SDL_CB;
118 162
119our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_PLAYING;
167our $MUSIC_PLAYER;
120our @SOUNDS; # event => file mapping 168our @SOUNDS; # event => file mapping
121our %AUDIO_CHUNKS; # audio files 169our %AUDIO_CHUNKS; # audio files
122 170
123our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
124our $STATUSBOX; 172our $STATUSBOX;
… …
126 174
127our $INV; 175our $INV;
128our $INVR; 176our $INVR;
129our $INV_RIGHT_HB; 177our $INV_RIGHT_HB;
130 178
131our $BIND_EDITOR;
132our $BIND_UPD_CB;
133
134our $PICKUP_CFG; 179our $PICKUP_CFG;
180
181our $IN_BUILD_MODE;
182our $BUILD_BUTTON;
135 183
136sub status { 184sub status {
137 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 185 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
138} 186}
139 187
140sub debug { 188sub debug {
141 $DEBUG_STATUS->set_text ($_[0]); 189 $DEBUG_STATUS->set_text ($_[0]);
190}
191
192sub message {
193 my ($para) = @_;
194
195 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
196
197 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
198
199 $LOGVIEW->add_paragraph ($para);
200 $LOGVIEW->scroll_to_bottom;
142} 201}
143 202
144sub destroy_query_dialog { 203sub destroy_query_dialog {
145 (delete $_[0]{query_dialog})->destroy 204 (delete $_[0]{query_dialog})->destroy
146 if $_[0]{query_dialog}; 205 if $_[0]{query_dialog};
147} 206}
148 207
208# FIXME: a very ugly hack to wait for stat update look below! #d#
209our $QUERY_TIMER; #d#
210
149# server query dialog 211# server query dialog
150sub server_query { 212sub server_query {
151 my ($conn, $flags, $prompt) = @_; 213 my ($conn, $flags, $prompt) = @_;
214
215 # FIXME: a very ugly hack to wait for stat update #d#
216 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
217 unless ($QUERY_TIMER) {
218 $QUERY_TIMER =
219 Event->timer (
220 after => 1,
221 cb => sub {
222 server_query ($conn, $flags, $prompt, 1);
223 $QUERY_TIMER = undef
224 }
225 );
226 return;
227 }
228 }
152 229
153 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 230 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
154 x => "center", 231 x => "center",
155 y => "center", 232 y => "center",
156 title => "Server Query", 233 title => "Server Query",
157 child => my $vbox = new CFPlus::UI::VBox, 234 child => my $vbox = new CFPlus::UI::VBox,
158 ; 235 ;
159 236
160 my @dialog = my $label = new CFPlus::UI::Label 237 my @dialog = my $label = new CFPlus::UI::Label
161 max_w => $::WIDTH * 0.4, 238 max_w => $::WIDTH * 0.8,
162 ellipsise => 0, 239 ellipsise => 0,
163 text => $prompt; 240 text => $prompt;
164 241
165 if ($flags & CS_QUERY_YESNO) { 242 if ($flags & CS_QUERY_YESNO) {
166 push @dialog, my $hbox = new CFPlus::UI::HBox; 243 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
183 ); 260 );
184 261
185 $dialog->grab_focus; 262 $dialog->grab_focus;
186 263
187 } elsif ($flags & CS_QUERY_SINGLECHAR) { 264 } elsif ($flags & CS_QUERY_SINGLECHAR) {
188 $dialog->{tooltip} = "#charcreation_focus";
189
190 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 265 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
191 $MESSAGE_WINDOW->show; 266 $dialog->{tooltip} = "#charcreation_focus";
192 267
193 unshift @dialog, new CFPlus::UI::Label 268 unshift @dialog, new CFPlus::UI::Label
194 max_w => $::WIDTH * 0.4, 269 max_w => $::WIDTH * 0.8,
195 ellipsise => 0, 270 ellipsise => 0,
196 markup => "\nOr use your keyboard and the text entry below:\n"; 271 markup => "\nOr use your keyboard and the text entry below:\n";
197 272
198 unshift @dialog, my $table = new CFPlus::UI::Table; 273 unshift @dialog, my $table = new CFPlus::UI::Table;
199 274
… …
211 $conn->send ("reply d"); 286 $conn->send ("reply d");
212 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
213 0 288 0
214 }, 289 },
215 ); 290 );
291
292 if ($conn->{chargen_race_description}) {
293 unshift @dialog, new CFPlus::UI::Label
294 max_w => $::WIDTH * 0.8,
295 ellipsise => 0,
296 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
297 ;
298 }
299
300 unshift @dialog, new CFPlus::UI::Face
301 face => $conn->{player}{face},
302 bg => [.2, .2, .2, 1],
303 min_w => 64,
304 min_h => 64,
305 ;
306
307 if ($conn->{chargen_race_title}) {
308 unshift @dialog, new CFPlus::UI::Label
309 allign => 1,
310 ellipsise => 0,
311 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
312 ;
313 }
216 314
217 unshift @dialog, new CFPlus::UI::Label 315 unshift @dialog, new CFPlus::UI::Label
218 max_w => $::WIDTH * 0.4, 316 max_w => $::WIDTH * 0.4,
219 ellipsise => 0, 317 ellipsise => 0,
220 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 318 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
345 status "logging in..."; 443 status "logging in...";
346 444
347 $LOGIN_BUTTON->set_text ("Logout"); 445 $LOGIN_BUTTON->set_text ("Logout");
348 $SETUP_DIALOG->hide; 446 $SETUP_DIALOG->hide;
349 447
350 $PROFILE = $CFG->{profile}{default};
351
352 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 448 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
353 449
354 my ($host, $port) = split /:/, $PROFILE->{host}; 450 my ($host, $port) = split /:/, $PROFILE->{host};
355 451
356 $MAP = new CFPlus::Map $mapsize, $mapsize; 452 $MAP = new CFPlus::Map;
357 453
358 $CONN = eval { 454 $CONN = eval {
359 new CFPlus::Protocol 455 new CFPlus::Protocol
360 host => $host, 456 host => $host,
361 port => $port || 13327, 457 port => $port || 13327,
362 user => $PROFILE->{user}, 458 user => $PROFILE->{user},
363 pass => $PROFILE->{password}, 459 pass => $PROFILE->{password},
364 mapw => $mapsize, 460 mapw => $mapsize,
365 maph => $mapsize, 461 maph => $mapsize,
366 462
367 client => "cfplus $VERSION $] $^O", 463 client => "cfplus $CFPlus::VERSION $] $^O",
368 464
369 map_widget => $MAPWIDGET, 465 map_widget => $MAPWIDGET,
370 logview => $LOGVIEW, 466 logview => $LOGVIEW,
371 statusbox => $STATUSBOX, 467 statusbox => $STATUSBOX,
372 map => $MAP, 468 map => $MAP,
373 mapmap => $MAPMAP, 469 mapmap => $MAPMAP,
374 query => \&server_query, 470 query => \&server_query,
375 471
472 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1,
474 },
475
376 sound_play => sub { 476 sound_play => sub {
377 my ($x, $y, $soundnum, $type) = @_; 477 my ($x, $y, $soundnum, $type) = @_;
378 478
379 $SDL_MIXER 479 $SDL_MIXER
380 or return; 480 or return;
… …
399sub stop_game { 499sub stop_game {
400 $LOGIN_BUTTON->set_text ("Login"); 500 $LOGIN_BUTTON->set_text ("Login");
401 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 501 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
402 $SETUP_DIALOG->show; 502 $SETUP_DIALOG->show;
403 $PL_WINDOW->hide; 503 $PL_WINDOW->hide;
404 $SPELL_PAGE->clear_spells; 504 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
405 506
406 return unless $CONN; 507 return unless $CONN;
407 508
408 status "connection closed"; 509 status "connection closed";
409 510
410 destroy_query_dialog $CONN; 511 destroy_query_dialog $CONN;
411 $CONN->destroy; 512 $CONN->destroy;
412 $CONN = 0; # false, does not autovivify 513 $CONN = 0; # false, does not autovivify
413 514
414 undef $MAP; 515 undef $MAP;
415 undef $PROFILE;
416} 516}
417 517
418sub graphics_setup { 518sub graphics_setup {
419 my $vbox = new CFPlus::UI::VBox; 519 my $vbox = new CFPlus::UI::VBox;
420 520
421 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 521 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
422 522
523 my $row = 0;
524
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
526 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
527 can_events => 1,
528 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
529
423 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 530 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
424 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
425 532
426 $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]); 533 $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]);
427 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 534 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
428 535
429 $mode_slider->connect (changed => sub { 536 $mode_slider->connect (changed => sub {
… …
431 538
432 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
433 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
434 }); 541 });
435 $mode_slider->emit (changed => $mode_slider->{range}[0]); 542 $mode_slider->emit (changed => $mode_slider->{range}[0]);
436
437 my $row = 1;
438 543
439 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
440 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
441 state => $CFG->{fullscreen}, 546 state => $CFG->{fullscreen},
442 tooltip => "Bring the client into fullscreen mode.", 547 tooltip => "Bring the client into fullscreen mode.",
… …
448 state => $CFG->{fast}, 553 state => $CFG->{fast},
449 tooltip => "Lower the visual quality considerably to speed up rendering.", 554 tooltip => "Lower the visual quality considerably to speed up rendering.",
450 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
451 ); 556 );
452 557
558 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
559 $table->add (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
561 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
562 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
563 );
564
565 $table->add (1, $row++, new CFPlus::UI::Button
566 expand => 1, align => 0, text => "Apply",
567 tooltip => "Apply the video settings above.",
568 on_activate => sub {
569 video_shutdown ();
570 video_init ();
571 0
572 }
573 );
574
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 575 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
454 $table->add (1, $row++, new CFPlus::UI::Slider 576 $table->add (1, $row++, new CFPlus::UI::Slider
455 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
456 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
457 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 579 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
580 );
581
582 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
583 $table->add (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing},
585 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
586 . "This increases load on the graphics subsystem and works only with 2.x servers. "
587 . "Changes take effect at next connection only.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
458 ); 589 );
459 590
460 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
461 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add (1, $row++, new CFPlus::UI::CheckBox
462 state => $CFG->{fow_enable}, 593 state => $CFG->{fow_enable},
… …
481 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 612 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
482 0 613 0
483 } 614 }
484 ); 615 );
485 616
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
487 $table->add (1, $row++, new CFPlus::UI::Slider
488 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
489 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
490 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
491 );
492
493 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
494 $table->add (1, $row++, new CFPlus::UI::Slider 618 $table->add (1, $row++, new CFPlus::UI::Slider
495 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 619 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
496 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 620 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
497 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 621 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
513 range => [$CFG->{gauge_size}, 0.2, 0.8], 637 range => [$CFG->{gauge_size}, 0.2, 0.8],
514 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 638 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
515 on_changed => sub { 639 on_changed => sub {
516 $CFG->{gauge_size} = $_[1]; 640 $CFG->{gauge_size} = $_[1];
517 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 641 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
518 0
519 }
520 );
521
522 $table->add (1, $row++, new CFPlus::UI::Button
523 expand => 1, align => 0, text => "Apply",
524 tooltip => "Apply the video settings",
525 on_activate => sub {
526 video_shutdown ();
527 video_init ();
528 0 642 0
529 } 643 }
530 ); 644 );
531 645
532 $vbox 646 $vbox
… …
637 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 751 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 752 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 753 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 754 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 755 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
756 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
642 757
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 758 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644 759
645 for my $x (0..2) { 760 for my $x (0..2) {
646 for my $y (0 .. 2) { 761 for my $y (0 .. 2) {
… …
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 765 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 ); 766 );
652 } 767 }
653 } 768 }
654 769
770 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
655 771
656 $table 772 $table
657} 773}
658 774
659sub stats_window { 775sub stats_window {
… …
828 944
829 my $table = $METASERVER->{table}; 945 my $table = $METASERVER->{table};
830 $table->clear; 946 $table->clear;
831 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 947 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
832 948
833 my $buf; 949 my $ok = 0;
834 950
835 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 951 CFPlus::background {
952 my $ua = CFPlus::lwp_useragent;
836 953
837 unless ($fh) { 954 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
838 $label->set_text ("unable to contact metaserver: $!"); 955 } sub {
839 return; 956 my ($msg) = @_;
840 } 957 if ($msg) {
841
842 Event->io (fd => $fh, poll => 'r', cb => sub {
843 my $res = sysread $fh, $buf, 8192, length $buf;
844
845 if (!defined $res) {
846 $_[0]->w->cancel;
847 $label->set_text ("error while retrieving server list: $!");
848 } elsif ($res == 0) {
849 $_[0]->w->cancel;
850 status "server list retrieved";
851
852 utf8::decode $buf if utf8::valid $buf;
853
854 $table->clear; 958 $table->clear;
855 959
856 my @tip = ( 960 my @tip = (
857 "The current number of users logged in on the server.", 961 "The current number of users logged in on the server.",
858 "The hostname of the server.", 962 "The hostname of the server.",
… …
868 for 0 .. $#col; 972 for 0 .. $#col;
869 973
870 my @align = qw(1 0 1 1 -1); 974 my @align = qw(1 0 1 1 -1);
871 975
872 my $y = 0; 976 my $y = 0;
873 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 977 for my $m (@{ $msg->{servers} }) {
874 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 978 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
979 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
875 980
876 for ($desc) { 981 for ($desc) {
877 s/<br>/\n/gi; 982 s/<br>/\n/gi;
878 s/<li>/\n· /gi; 983 s/<li>/\n· /gi;
879 s/<.*?>//sgi; 984 s/<.*?>//sgi;
880 s/&/&amp;/g; 985 s/&amp;/&/g;
881 s/</&lt;/g; 986 s/&lt;/</g;
882 s/>/&gt;/g; 987 s/&gt;/>/g;
883 } 988 }
884 989
885 $uptime = sprintf "%dd %02d:%02d:%02d", 990 $uptime = sprintf "%dd %02d:%02d:%02d",
886 (int $m->[8] / 86400), 991 (int $uptime / 86400),
887 (int $m->[8] / 3600) % 24, 992 (int $uptime / 3600) % 24,
888 (int $m->[8] / 60) % 60, 993 (int $uptime / 60) % 60,
889 $m->[8] % 60; 994 $uptime % 60;
890 995
891 $m = [$users, $host, $uptime, $version, $desc]; 996 $m = [$users, $host, $uptime, $version, $desc];
892 997
893 $y++; 998 $y++;
894 999
… …
904 ), 1009 ),
905 (new CFPlus::UI::Empty expand => 1), 1010 (new CFPlus::UI::Empty expand => 1),
906 ]); 1011 ]);
907 1012
908 $table->add ($_, $y, new CFPlus::UI::Label 1013 $table->add ($_, $y, new CFPlus::UI::Label
1014 max_w => $::WIDTH * 0.4,
909 ellipsise => 0, 1015 ellipsise => 0,
910 align => $align[$_], 1016 align => $align[$_],
911 text => $m->[$_], 1017 text => $m->[$_],
912 tooltip => $tip[$_], 1018 tooltip => $tip[$_],
1019 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
913 can_hover => 1, 1020 can_hover => 1,
914 can_events => 1, 1021 can_events => 1,
915 fontsize => 0.8) 1022 fontsize => 0.8)
916 for 0 .. $#$m; 1023 for 0 .. $#$m;
917 } 1024 }
1025 } else {
1026 $ok or $label->set_text ("error while contacting metaserver");
918 } 1027 }
919 }); 1028 };
1029
920} 1030}
921 1031
922sub metaserver_dialog { 1032sub metaserver_dialog {
923 my $vbox = new CFPlus::UI::VBox; 1033 my $vbox = new CFPlus::UI::VBox;
924 my $table = new CFPlus::UI::Table; 1034 my $table = new CFPlus::UI::Table;
… …
928 title => "Server List", 1038 title => "Server List",
929 name => 'metaserver_dialog', 1039 name => 'metaserver_dialog',
930 x => 'center', 1040 x => 'center',
931 y => 'center', 1041 y => 'center',
932 z => 3, 1042 z => 3,
1043 force_w => $::WIDTH * 0.9,
933 force_h => $::HEIGHT * 0.4, 1044 force_h => $::HEIGHT * 0.7,
934 child => $vbox, 1045 child => $vbox,
935 has_close_button => 1, 1046 has_close_button => 1,
936 table => $table, 1047 table => $table,
937 on_visibility_change => sub { 1048 on_visibility_change => sub {
938 update_metaserver ($_[0]) if $_[1]; 1049 update_metaserver ($_[0]) if $_[1];
… …
1014 . "so only set it if you really need to prefetch images. " 1125 . "so only set it if you really need to prefetch images. "
1015 . "This option can be set and unset any time.", 1126 . "This option can be set and unset any time.",
1016 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1127 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1017 ); 1128 );
1018 1129
1019 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1130 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1020 $table->add (1, 9, new CFPlus::UI::Entry 1131 $table->add (1, 9, new CFPlus::UI::Entry
1132 text => $CFG->{output_rate},
1133 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1134 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1135 . "default will be used, which is usually around 100kb/s.",
1136 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1137 );
1138
1139 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1140 $table->add (1, 10, new CFPlus::UI::Entry
1021 text => $CFG->{output_count}, 1141 text => $CFG->{output_count},
1022 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1142 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1023 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1143 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1024 ); 1144 );
1025 1145
1026 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1146 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1027 $table->add (1, 10, new CFPlus::UI::Entry 1147 $table->add (1, 11, new CFPlus::UI::Entry
1028 text => $CFG->{output_sync}, 1148 text => $CFG->{output_sync},
1029 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1149 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1030 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1150 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1031 ); 1151 );
1032 1152
1033 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1153 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1034 expand => 1, 1154 expand => 1,
1035 align => 0, 1155 align => 0,
1036 text => "Login", 1156 text => "Login",
1037 on_activate => sub { 1157 on_activate => sub {
1038 $CONN ? stop_game 1158 $CONN ? stop_game
1039 : start_game; 1159 : start_game;
1040 0 1160 0
1041 }, 1161 },
1042 ); 1162 );
1043 1163
1164 $vbox->add (new CFPlus::UI::FancyFrame
1165 label => "Server Info",
1166 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1167 );
1168
1169 $vbox
1170}
1171
1172sub client_setup {
1173 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1174
1175 my $row = 0;
1176
1044 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1177 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1045 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1178 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1046 text => $CFG->{say_command}, 1179 text => $CFG->{say_command},
1047 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. " 1180 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. "
1048 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1181 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1049 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1182 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1050 on_changed => sub { 1183 on_changed => sub {
1051 my ($self, $value) = @_; 1184 my ($self, $value) = @_;
1052 $CFG->{say_command} = $value; 1185 $CFG->{say_command} = $value;
1053 0 1186 0
1054 } 1187 }
1055 ); 1188 );
1056 1189
1057 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1190 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1058 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1191 $table->add (1, $row++, new CFPlus::UI::CheckBox
1059 state => $CFG->{show_tips}, 1192 state => $CFG->{show_tips},
1060 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1193 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1061 on_changed => sub { 1194 on_changed => sub {
1062 my ($self, $value) = @_; 1195 my ($self, $value) = @_;
1063 $CFG->{shop_tips} = $value; 1196 $CFG->{show_tips} = $value;
1064 0 1197 0
1065 } 1198 }
1066 ); 1199 );
1067 1200
1068 $vbox->add (new CFPlus::UI::FancyFrame 1201 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1069 label => "Server Info", 1202 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1070 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1203 text => $CFG->{logview_max_par},
1204 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1205 . "sends more messages than this number, older messages get removed to save memory and "
1206 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1207 on_changed => sub {
1208 my ($self, $value) = @_;
1209 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1210 0
1211 },
1071 ); 1212 );
1072 1213
1073 $vbox 1214 $table
1074} 1215}
1075 1216
1076sub message_window { 1217sub message_window {
1077 my $window = new CFPlus::UI::Toplevel 1218 my $window = new CFPlus::UI::Toplevel
1078 name => "message_window", 1219 name => "message_window",
… …
1159 ["Boots" => PICKUP_BOOTS], 1300 ["Boots" => PICKUP_BOOTS],
1160 ["Gloves" => PICKUP_GLOVES], 1301 ["Gloves" => PICKUP_GLOVES],
1161 ["Cloaks" => PICKUP_CLOAK], 1302 ["Cloaks" => PICKUP_CLOAK],
1162 ], 1303 ],
1163 1304
1164 ["Readables", 2, 2, 1305 ["Readables", 2, 0,
1165 ["Spellbooks" => PICKUP_SPELLBOOK], 1306 ["Spellbooks" => PICKUP_SPELLBOOK],
1166 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1307 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1167 ["Normal Books/Scrolls" => PICKUP_READABLES], 1308 ["Normal Books/Scrolls" => PICKUP_READABLES],
1168 ], 1309 ],
1169 ["Misc", 2, 7, 1310 ["Misc", 2, 5,
1170 ["Food" => PICKUP_FOOD], 1311 ["Food" => PICKUP_FOOD],
1171 ["Drinks" => PICKUP_DRINK], 1312 ["Drinks" => PICKUP_DRINK],
1172 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1313 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1173 ["Keys" => PICKUP_KEY], 1314 ["Keys" => PICKUP_KEY],
1174 ["Magical Items" => PICKUP_MAGICAL], 1315 ["Magical Items" => PICKUP_MAGICAL],
1175 ["Potions" => PICKUP_POTION], 1316 ["Potions" => PICKUP_POTION],
1176 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1317 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1177 ["Ignore cursed" => PICKUP_NOT_CURSED], 1318 ["Ignore cursed" => PICKUP_NOT_CURSED],
1178 ["Jewelery" => PICKUP_JEWELS], 1319 ["Jewelery" => PICKUP_JEWELS],
1320 ["Flesh" => PICKUP_FLESH],
1179 ], 1321 ],
1180 ["Weight/Value ratio", 2, 17] 1322 ["Weight/Value ratio", 2, 17]
1181 ) 1323 )
1182 { 1324 {
1183 my ($title, $x, $y, @bits) = @$_; 1325 my ($title, $x, $y, @bits) = @$_;
… …
1233 $table 1375 $table
1234} 1376}
1235 1377
1236my %SORT_ORDER = ( 1378my %SORT_ORDER = (
1237 type => undef, 1379 type => undef,
1238 mtime => sub { sort { 1380 mtime => sub {
1381 my $NOW = time;
1382 sort {
1383 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1384 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1385
1239 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1386 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1240 or $b->{mtime} <=> $a->{mtime} 1387 or $btime <=> $atime
1241 or $a->{type} <=> $b->{type} 1388 or $a->{type} <=> $b->{type}
1389 } @_
1242 } @_ }, 1390 },
1243 weight => sub { sort { 1391 weight => sub { sort {
1244 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1392 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1245 or $a->{type} <=> $b->{type} 1393 or $a->{type} <=> $b->{type}
1246 } @_ }, 1394 } @_ },
1247); 1395);
… …
1272 #TODO# update to weigh/maxweight 1420 #TODO# update to weigh/maxweight
1273 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1421 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1274 1422
1275 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1423 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 $sw1->add ($INV = new CFPlus::UI::Inventory); 1424 $sw1->add ($INV = new CFPlus::UI::Inventory);
1425 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1277 1426
1278 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1427 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1279 1428
1280 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1429 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1281 1430
… …
1310 has_close_button => 1 1459 has_close_button => 1
1311 ; 1460 ;
1312 1461
1313 my $ntb = 1462 my $ntb =
1314 $PL_NOTEBOOK = 1463 $PL_NOTEBOOK =
1315 new CFPlus::UI::Notebook expand => 1, debug => 1; 1464 new CFPlus::UI::Notebook expand => 1;
1316 1465
1317 $ntb->add ( 1466 $ntb->add (
1318 "Statistics (F2)" => $STATS_PAGE = stats_window, 1467 "Statistics (F2)" => $STATS_PAGE = stats_window,
1319 "Shows statistics, where all your Stats and Resistances are shown." 1468 "Shows statistics, where all your Stats and Resistances are shown."
1320 ); 1469 );
1321 $ntb->add ( 1470 $ntb->add (
1322 "Skills (F3)" => $SKILL_PAGE = skill_window, 1471 "Skills (F3)" => $SKILL_PAGE = skill_window,
1323 "Shows all your Skills." 1472 "Shows all your Skills."
1324 ); 1473 );
1325 1474
1326 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1475 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1327 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1328 $ntb->add ( 1477 $ntb->add (
1329 "Spellbook (F4)" => $spellsw, 1478 "Spellbook (F4)" => $spellsw,
1330 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1479 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1331 ); 1480 );
1332 $ntb->add ( 1481 $ntb->add (
1333 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1334 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1483 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1335 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1336 ); 1485 );
1486 $ntb->add (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1337 1488
1338 $ntb->set_current_page ($INVENTORY_PAGE); 1489 $ntb->set_current_page ($INVENTORY_PAGE);
1339 1490
1340 $plwin->add ($ntb); 1491 $plwin->add ($ntb);
1341 $plwin 1492 $plwin
1342} 1493}
1343 1494
1344sub update_bindings {
1345 $BIND_UPD_CB->() if $BIND_UPD_CB;
1346}
1347
1348sub keyboard_setup { 1495sub keyboard_setup {
1349 my $binding_list = new CFPlus::UI::VBox; 1496 CFPlus::Macro::keyboard_setup
1350
1351 my $refresh;
1352 $refresh = $BIND_UPD_CB = sub {
1353 $binding_list->clear ();
1354
1355 return unless $PROFILE;
1356
1357 for my $mod (keys %{$PROFILE->{bindings}}) {
1358 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1359 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1360 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1361
1362 my $lbl = join "; ", @$cmds;
1363 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1364 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1365 $hb->add (new CFPlus::UI::Button
1366 text => "delete",
1367 tooltip => "Deletes the binding",
1368 on_activate => sub {
1369 $binding_list->remove ($hb);
1370 delete $PROFILE->{bindings}{$mod}{$sym};
1371 0
1372 });
1373
1374 $hb->add (new CFPlus::UI::Button
1375 text => "edit",
1376 tooltip => "Edits the binding",
1377 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (
1379 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1380 sub {
1381 my ($nmod, $nsym, $ncmds) = @_;
1382 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1383 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1384 $refresh->();
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1387 },
1388 sub {
1389 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1390 $SETUP_DIALOG->show;
1391 });
1392 $::BIND_EDITOR->show;
1393 $SETUP_DIALOG->hide;
1394 0
1395 });
1396
1397 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1398 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1399 }
1400 }
1401 };
1402
1403 my $vb = new CFPlus::UI::VBox;
1404 $vb->add (new CFPlus::UI::FancyFrame
1405 label => "Options",
1406 child => (my $hb = new CFPlus::UI::HBox),
1407 );
1408 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1409 $hb->add (new CFPlus::UI::CheckBox
1410 expand => 1,
1411 state => $CFG->{shift_fire_stop},
1412 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1413 on_changed => sub {
1414 my ($cbox, $value) = @_;
1415 $CFG->{shift_fire_stop} = $value;
1416 0
1417 });
1418
1419 $vb->add (new CFPlus::UI::FancyFrame
1420 label => "Bindings",
1421 child => $binding_list);
1422 $vb->add (my $hb = new CFPlus::UI::HBox);
1423
1424 $hb->add (new CFPlus::UI::Button
1425 text => "record new",
1426 expand => 1,
1427 tooltip => "This button opens the binding editor with an empty binding.",
1428 on_activate => sub {
1429 $::BIND_EDITOR->set_binding (undef, undef, [],
1430 sub {
1431 my ($mod, $sym, $cmds) = @_;
1432 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1433 $refresh->();
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 },
1437 sub {
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 },
1441 );
1442 $SETUP_DIALOG->hide;
1443 $::BIND_EDITOR->show;
1444 0
1445 },
1446 );
1447
1448 $hb->add (new CFPlus::UI::Button
1449 text => "close",
1450 tooltip => "Closes the binding window",
1451 expand => 1,
1452 on_activate => sub {
1453 $SETUP_DIALOG->hide;
1454 0
1455 }
1456 );
1457
1458 $refresh->();
1459
1460 $vb
1461} 1497}
1462 1498
1463sub help_window { 1499sub help_window {
1464 my $win = new CFPlus::UI::Toplevel 1500 my $win = new CFPlus::UI::Toplevel
1465 x => 'center', 1501 x => 'center',
… …
1622 1658
1623sub show_tip_of_the_day { 1659sub show_tip_of_the_day {
1624 # find all tips 1660 # find all tips
1625 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1661 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1626 1662
1627 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1663 CFPlus::DB::get state => "tip_of_the_day", sub {
1664 my ($todindex) = @_;
1628 $todindex = 0 if $todindex >= @tod; 1665 $todindex = 0 if $todindex >= @tod;
1629 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1666 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1630 1667
1631 # create dialog 1668 # create dialog
1632 my $dialog; 1669 my $dialog;
1633 1670
1634 my $close = sub { 1671 my $close = sub {
1635 $dialog->destroy; 1672 $dialog->destroy;
1673 };
1674
1675 $dialog = new CFPlus::UI::Toplevel
1676 x => "center",
1677 y => "center",
1678 z => 3,
1679 name => 'tip_of_the_day',
1680 force_w => int $WIDTH * 4/9,
1681 force_h => int $WIDTH * 2/9,
1682 title => "Tip of the day #" . (1 + $todindex),
1683 child => my $vbox = new CFPlus::UI::VBox,
1684 has_close_button => 1,
1685 on_delete => $close,
1686 ;
1687
1688 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1691
1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1693
1694 $table->add (0, 0, new CFPlus::UI::Button
1695 text => "Close",
1696 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>.",
1697 on_activate => $close,
1698 );
1699
1700 $table->add (2, 0, new CFPlus::UI::Button
1701 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub {
1704 $close->();
1705 &show_tip_of_the_day;
1706 },
1707 );
1708
1709 $dialog->show;
1636 }; 1710 };
1637
1638 $dialog = new CFPlus::UI::Toplevel
1639 x => "center",
1640 y => "center",
1641 z => 3,
1642 name => 'tip_of_the_day',
1643 force_w => int $WIDTH * 4/9,
1644 force_h => int $WIDTH * 2/9,
1645 title => "Tip of the day #" . (1 + $todindex),
1646 child => my $vbox = new CFPlus::UI::VBox,
1647 has_close_button => 1,
1648 on_delete => $close,
1649 ;
1650
1651 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1652 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1653 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1654
1655 $vbox->add (my $table = new CFPlus::UI::Table);
1656
1657 $table->add (0, 0, new CFPlus::UI::Button
1658 text => "Close",
1659 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>.",
1660 on_activate => $close,
1661 );
1662
1663 $table->add (2, 0, new CFPlus::UI::Button
1664 text => "Next",
1665 tooltip => "Show the next <b>Tip of the day</b>.",
1666 on_activate => sub {
1667 $close->();
1668 &show_tip_of_the_day;
1669 },
1670 );
1671
1672 $dialog->show;
1673} 1711}
1674 1712
1675sub sdl_init { 1713sub sdl_init {
1676 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1677 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
… …
1711 padding => 0, 1749 padding => 0,
1712 z => 100, 1750 z => 100,
1713 force_x => "max", 1751 force_x => "max",
1714 force_y => 0; 1752 force_y => 0;
1715 $DEBUG_STATUS->show; 1753 $DEBUG_STATUS->show;
1716
1717 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1718 1754
1719 $STATUSBOX = new CFPlus::UI::Statusbox; 1755 $STATUSBOX = new CFPlus::UI::Statusbox;
1720 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1756 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1721 1757
1722 (new CFPlus::UI::Frame 1758 (new CFPlus::UI::Frame
… …
1759 font => $FONT_FIXED, 1795 font => $FONT_FIXED,
1760 fontsize => $::CFG->{log_fontsize}, 1796 fontsize => $::CFG->{log_fontsize},
1761 indent => -4, 1797 indent => -4,
1762 can_hover => 1, 1798 can_hover => 1,
1763 can_events => 1, 1799 can_events => 1,
1800 max_par => $CFG->{logview_max_par},
1764 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1801 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1765 ; 1802 ;
1766 1803
1767 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1804 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1768 title => "Setup", 1805 title => "Setup",
1769 name => "setup_dialog", 1806 name => "setup_dialog",
… …
1780 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1817 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1781 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1818 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1782 1819
1783 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1820 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1784 "Configure the server to play on, your username, password and other server-related options."); 1821 "Configure the server to play on, your username, password and other server-related options.");
1785 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1822 $SETUP_NOTEBOOK->add (Client => client_setup,
1786 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1823 "Configure various client-specific settings.");
1787 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1824 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1788 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1825 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1789 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1826 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1790 "Configure the use of audio, sound effects and background music."); 1827 "Configure the use of audio, sound effects and background music.");
1791 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1828 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1823 ); 1860 );
1824 1861
1825 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1862 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1826 tooltip => "View Documentation"); 1863 tooltip => "View Documentation");
1827 1864
1865
1828 $BUTTONBAR->add (new CFPlus::UI::Button 1866 $BUTTONBAR->add (new CFPlus::UI::Button
1829 text => "Quit", 1867 text => "Quit",
1830 tooltip => "Terminates the program", 1868 tooltip => "Terminates the program",
1831 on_activate => sub { 1869 on_activate => sub {
1832 if ($CONN) { 1870 if ($CONN) {
… …
1843 } 1881 }
1844 1882
1845 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1883 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1846} 1884}
1847 1885
1886sub setup_build_button {
1887 my ($enabled) = @_;
1888 if ($enabled) {
1889 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1890 $BUILD_BUTTON ||= new CFPlus::UI::Button
1891 text => "Build",
1892 tooltip => "Opens the ingame builder",
1893 on_activate => sub {
1894 if ($CONN) {
1895 $CONN->send_ext_req (builder_player_items => sub {
1896 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1897 });
1898 }
1899 0
1900 };
1901 $BUTTONBAR->add ($BUILD_BUTTON);
1902 } else {
1903 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1904 }
1905}
1906
1907sub open_ingame_editor {
1908 my ($msg) = @_;
1909
1910 my $win = new CFPlus::UI::Toplevel
1911 x => 0,
1912 y => 'center',
1913 z => 4,
1914 name => 'builder_window',
1915 force_w => int $WIDTH * 1/4,
1916 force_h => int $HEIGHT * 3/4,
1917 title => "In game builder",
1918 has_close_button => 1;
1919
1920 my $r = new CFPlus::UI::ScrolledWindow (
1921 expand => 1,
1922 scroll_y => 1
1923 );
1924 $r->add (my $vb = new CFPlus::UI::VBox);
1925 $win->add ($r);
1926
1927
1928 $vb->add (
1929 new CFPlus::UI::Button
1930 text => "Disable build mode",
1931 on_activate => sub { $::IN_BUILD_MODE = undef }
1932 );
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "ERASE",
1936 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1937 );
1938
1939 for my $itemarchname (
1940 sort {
1941 $msg->{items}->{$a}->{build_arch_name}
1942 cmp $msg->{items}->{$b}->{build_arch_name}
1943 } keys %{$msg->{items}}
1944 ) {
1945 my $info = $msg->{items}->{$itemarchname};
1946 $vb->add (
1947 new CFPlus::UI::Button text => $info->{build_arch_name},
1948 on_activate => sub {
1949 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1950
1951 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1952 build_mode_query_arch_info ();
1953 }
1954 }
1955 );
1956 }
1957
1958 $win->show;
1959}
1960
1961sub build_mode_query_arch_info {
1962 my ($iteminfo) = $::IN_BUILD_MODE;
1963 my $itemarchname = $iteminfo->{item};
1964 my $info = $iteminfo->{info};
1965
1966 my $dialog = new CFPlus::UI::Toplevel
1967 x => "center",
1968 y => "center",
1969 z => 50,
1970 force_w => int $WIDTH * 1/2,
1971 title => "Enter information for placement of '$itemarchname'",
1972 has_close_button => 1;
1973
1974 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1975
1976 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1977 my $row = 0;
1978 if ($info->{has_name}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1981 }
1982 if ($info->{has_text}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1985 }
1986 if ($info->{has_connection}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1988 $table->add (1, $row++,
1989 new CFPlus::UI::Entry
1990 expand => 1,
1991 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1992 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1993 );
1994 }
1995
1996 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1997 $hb->add (new CFPlus::UI::Button
1998 text => "Close",
1999 expand => 1,
2000 on_activate => sub { $dialog->hide; 0 },
2001 );
2002 $dialog->show;
2003}
2004
1848sub video_shutdown { 2005sub video_shutdown {
1849 CFPlus::OpenGL::shutdown; 2006 CFPlus::OpenGL::shutdown;
1850 2007
1851 undef $SDL_ACTIVE; 2008 undef $SDL_ACTIVE;
1852} 2009}
1853 2010
1854my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1855my $bgmusic;#TODO#hack#d#
1856
1857sub audio_channel_finished { 2011sub audio_channel_finished {
1858 my ($channel) = @_; 2012 my ($channel) = @_;
1859 2013
1860 #warn "channel $channel finished\n";#d# 2014 #warn "channel $channel finished\n";#d#
1861} 2015}
1862 2016
2017sub audio_music_set {
2018 my ($songs) = @_;
2019
2020 my $count = @$songs;
2021 my @meta;
2022
2023 for my $name (@$songs) {
2024 CFPlus::DB::get resmap => $name, sub {
2025 my ($data) = @_;
2026
2027 if ($data) {
2028 $data = JSON::XS->new->utf8->decode ($data);
2029 $data->{path} = CFPlus::DB::path_of $name;
2030 push @meta, $data;
2031 }
2032
2033 unless (--$count) {
2034 if (@meta) {
2035 @MUSIC_WANT = @meta;
2036 &audio_music_changed ();
2037 }
2038 }
2039 };
2040 }
2041}
2042
2043sub audio_music_changed {
2044 return unless $CFG->{bgm_enable};
2045
2046 # default MUSIC_WANT, undef/0 == MUSIC_DEFAULT
2047 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2048
2049 # if the currently playing song is acceptable, let it continue
2050 return if grep $MUSIC_PLAYING eq $_->{path}, @MUSIC_WANT;
2051
2052 if (defined $MUSIC_PLAYING) {
2053 warn "fade out";
2054 CFPlus::MixMusic::fade_out 2000;
2055 } else {
2056 warn "new music\n";
2057
2058 my $music = $MUSIC_WANT [rand @MUSIC_WANT];
2059
2060 $MUSIC_PLAYING = $music->{path};
2061
2062 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
2063 $MUSIC_PLAYER->play (0);
2064 }
2065}
2066
1863sub audio_music_finished { 2067sub audio_music_finished {
1864 return unless $CFG->{bgm_enable}; 2068 $MUSIC_PLAYING = undef;
2069 undef $MUSIC_PLAYER;
1865 2070
1866 # TODO: hack, do play loop and mood music 2071 audio_music_changed;
1867 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1868 $bgmusic->play (0);
1869
1870 push @bgmusic, shift @bgmusic;
1871} 2072}
1872 2073
1873sub audio_init { 2074sub audio_init {
1874 if ($CFG->{audio_enable}) { 2075 if ($CFG->{audio_enable}) {
1875 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2076 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1883 CFPlus::Mix_AllocateChannels 8; 2084 CFPlus::Mix_AllocateChannels 8;
1884 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2085 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1885 2086
1886 audio_music_finished; 2087 audio_music_finished;
1887 2088
2089 local $_;
1888 while (<$fh>) { 2090 while (<$fh>) {
1889 next if /^\s*#/; 2091 next if /^\s*#/;
1890 next if /^\s*$/; 2092 next if /^\s*$/;
1891 2093
1892 my ($file, $volume, $event) = split /\s+/, $_, 3; 2094 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1969 if $CONN; 2171 if $CONN;
1970}); 2172});
1971 2173
1972%SDL_CB = ( 2174%SDL_CB = (
1973 CFPlus::SDL_QUIT => sub { 2175 CFPlus::SDL_QUIT => sub {
1974 Event::unloop -1; 2176 exit;
1975 }, 2177 },
1976 CFPlus::SDL_VIDEORESIZE => sub { 2178 CFPlus::SDL_VIDEORESIZE => sub {
1977 }, 2179 },
1978 CFPlus::SDL_VIDEOEXPOSE => sub { 2180 CFPlus::SDL_VIDEOEXPOSE => sub {
1979 CFPlus::UI::full_refresh; 2181 CFPlus::UI::full_refresh;
1980 }, 2182 },
1981 CFPlus::SDL_ACTIVEEVENT => sub { 2183 CFPlus::SDL_ACTIVEEVENT => sub {
1982# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2184# not useful, as APPACTIVE include sonly iconified state, not unmapped
2185# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2186# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2187# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2188# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1983 }, 2189 },
1984 CFPlus::SDL_KEYDOWN => sub { 2190 CFPlus::SDL_KEYDOWN => sub {
1985 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2191 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1986 # alt-enter 2192 # alt-enter
1987 $FULLSCREEN_ENABLE->toggle; 2193 $FULLSCREEN_ENABLE->toggle;
… …
2008 2214
2009$SIG{INT} = $SIG{TERM} = sub { exit }; 2215$SIG{INT} = $SIG{TERM} = sub { exit };
2010 2216
2011{ 2217{
2012 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2218 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2219 CFPlus::DB::Server::run;
2220
2013 CFPlus::UI::set_layout ($::CFG->{layout}); 2221 CFPlus::UI::set_layout ($::CFG->{layout});
2014 2222
2015 my %DEF_CFG = ( 2223 my %DEF_CFG = (
2016 sdl_mode => 0, 2224 sdl_mode => 0,
2017 width => 640, 2225 width => 640,
2018 height => 480, 2226 height => 480,
2019 fullscreen => 0, 2227 fullscreen => 0,
2020 fast => 0, 2228 fast => 0,
2021 map_scale => 1, 2229 map_scale => 1,
2022 fow_enable => 1, 2230 fow_enable => 1,
2023 fow_intensity => 0.45, 2231 fow_intensity => 0.45,
2024 fow_smooth => 0, 2232 fow_smooth => 0,
2233 map_smoothing => 1,
2025 gui_fontsize => 1, 2234 gui_fontsize => 1,
2026 log_fontsize => 0.7, 2235 log_fontsize => 0.7,
2027 gauge_fontsize => 1, 2236 gauge_fontsize => 1,
2028 gauge_size => 0.35, 2237 gauge_size => 0.35,
2029 stat_fontsize => 0.7, 2238 stat_fontsize => 0.7,
2030 mapsize => 100, 2239 mapsize => 100,
2031 say_command => 'say', 2240 say_command => 'chat',
2032 audio_enable => 1, 2241 audio_enable => 1,
2033 bgm_enable => 1, 2242 bgm_enable => 1,
2034 bgm_volume => 0.25, 2243 bgm_volume => 0.25,
2035 face_prefetch => 0, 2244 face_prefetch => 0,
2036 output_sync => 1, 2245 output_sync => 1,
2037 output_count => 1, 2246 output_count => 1,
2247 output_rate => "",
2038 pickup => 0, 2248 pickup => 0,
2039 inv_sort => "mtime", 2249 inv_sort => "mtime",
2040 default => "profile", # default profile 2250 default => "profile", # default profile
2041 show_tips => 1, 2251 show_tips => 1,
2252 logview_max_par => 1000,
2042 ); 2253 );
2043 2254
2044 while (my ($k, $v) = each %DEF_CFG) { 2255 while (my ($k, $v) = each %DEF_CFG) {
2045 $CFG->{$k} = $v unless exists $CFG->{$k}; 2256 $CFG->{$k} = $v unless exists $CFG->{$k};
2046 } 2257 }
2047 2258
2048 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2259 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2260 $PROFILE = $CFG->{profile}{default};
2261
2262 # convert old bindings (only default profile matters)
2263 if (my $bindings = delete $PROFILE->{bindings}) {
2264 while (my ($mod, $syms) = each %$bindings) {
2265 while (my ($sym, $cmds) = each %$syms) {
2266 push @{ $PROFILE->{macro} }, {
2267 accelkey => [$mod*1, $sym*1],
2268 action => $cmds,
2269 };
2270 }
2271 }
2272 }
2049 2273
2050 sdl_init; 2274 sdl_init;
2051 2275
2052 @SDL_MODES = reverse 2276 @SDL_MODES = reverse
2053 grep $_->[0] >= 640 && $_->[1] >= 480, 2277 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2090# } 2314# }
2091# my $t2 = Time::HiRes::time; 2315# my $t2 = Time::HiRes::time;
2092# warn $t2-$t1; 2316# warn $t2-$t1;
2093# } 2317# }
2094 2318
2319 $startup_done->();
2320
2095 video_init; 2321 video_init;
2096 audio_init; 2322 audio_init;
2097} 2323}
2098 2324
2099show_tip_of_the_day if $CFG->{show_tips}; 2325show_tip_of_the_day if $CFG->{show_tips};
2100
2101use Data::Dumper; warn Dumper [CFPlus::win32_proxy_info()];#d#
2102 2326
2103Event::loop; 2327Event::loop;
2104#CFPlus::SDL_Quit; 2328#CFPlus::SDL_Quit;
2105#CFPlus::_exit 0; 2329#CFPlus::_exit 0;
2106 2330
2331END {
2107END { CFPlus::SDL_Quit } 2332 CFPlus::SDL_Quit;
2333 CFPlus::DB::Server::stop;
2334}
2108 2335
2109=head1 NAME 2336=head1 NAME
2110 2337
2111cfplus - A Crossfire+ and Crossfire game client 2338cfplus - A Crossfire+ and Crossfire game client
2112 2339

Diff Legend

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