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

Diff Legend

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