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.164 by root, Thu Jul 12 18:28:34 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);
402 506
403 return unless $CONN; 507 return unless $CONN;
404 508
405 status "connection closed"; 509 status "connection closed";
406 510
… …
414sub graphics_setup { 518sub graphics_setup {
415 my $vbox = new CFPlus::UI::VBox; 519 my $vbox = new CFPlus::UI::VBox;
416 520
417 $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]);
418 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
419 $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");
420 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
421 532
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]); 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]);
423 $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");
424 535
425 $mode_slider->connect (changed => sub { 536 $mode_slider->connect (changed => sub {
… …
427 538
428 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
429 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
430 }); 541 });
431 $mode_slider->emit (changed => $mode_slider->{range}[0]); 542 $mode_slider->emit (changed => $mode_slider->{range}[0]);
432
433 my $row = 1;
434 543
435 $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");
436 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
437 state => $CFG->{fullscreen}, 546 state => $CFG->{fullscreen},
438 tooltip => "Bring the client into fullscreen mode.", 547 tooltip => "Bring the client into fullscreen mode.",
… …
444 state => $CFG->{fast}, 553 state => $CFG->{fast},
445 tooltip => "Lower the visual quality considerably to speed up rendering.", 554 tooltip => "Lower the visual quality considerably to speed up rendering.",
446 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
447 ); 556 );
448 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
449 $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");
450 $table->add (1, $row++, new CFPlus::UI::Slider 576 $table->add (1, $row++, new CFPlus::UI::Slider
451 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
452 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
453 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 }
454 ); 589 );
455 590
456 $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");
457 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add (1, $row++, new CFPlus::UI::CheckBox
458 state => $CFG->{fow_enable}, 593 state => $CFG->{fow_enable},
… …
477 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;
478 0 613 0
479 } 614 }
480 ); 615 );
481 616
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"); 617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
490 $table->add (1, $row++, new CFPlus::UI::Slider 618 $table->add (1, $row++, new CFPlus::UI::Slider
491 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 619 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.", 620 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 }, 621 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
509 range => [$CFG->{gauge_size}, 0.2, 0.8], 637 range => [$CFG->{gauge_size}, 0.2, 0.8],
510 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.",
511 on_changed => sub { 639 on_changed => sub {
512 $CFG->{gauge_size} = $_[1]; 640 $CFG->{gauge_size} = $_[1];
513 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 641 $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 642 0
525 } 643 }
526 ); 644 );
527 645
528 $vbox 646 $vbox
… …
633 $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 });
634 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 752 $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 }); 753 $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"); 754 $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 }); 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() } );
638 757
639 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);
640 759
641 for my $x (0..2) { 760 for my $x (0..2) {
642 for my $y (0 .. 2) { 761 for my $y (0 .. 2) {
… …
646 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 },
647 ); 766 );
648 } 767 }
649 } 768 }
650 769
770 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
651 771
652 $table 772 $table
653} 773}
654 774
655sub stats_window { 775sub stats_window {
… …
824 944
825 my $table = $METASERVER->{table}; 945 my $table = $METASERVER->{table};
826 $table->clear; 946 $table->clear;
827 $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...");
828 948
829 my $buf; 949 my $ok = 0;
830 950
831 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 951 CFPlus::background {
952 my $ua = CFPlus::lwp_useragent;
832 953
833 unless ($fh) { 954 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
834 $label->set_text ("unable to contact metaserver: $!"); 955 } sub {
835 return; 956 my ($msg) = @_;
836 } 957 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; 958 $table->clear;
851 959
852 my @tip = ( 960 my @tip = (
853 "The current number of users logged in on the server.", 961 "The current number of users logged in on the server.",
854 "The hostname of the server.", 962 "The hostname of the server.",
… …
864 for 0 .. $#col; 972 for 0 .. $#col;
865 973
866 my @align = qw(1 0 1 1 -1); 974 my @align = qw(1 0 1 1 -1);
867 975
868 my $y = 0; 976 my $y = 0;
869 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 977 for my $m (@{ $msg->{servers} }) {
870 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)};
871 980
872 for ($desc) { 981 for ($desc) {
873 s/<br>/\n/gi; 982 s/<br>/\n/gi;
874 s/<li>/\n· /gi; 983 s/<li>/\n· /gi;
875 s/<.*?>//sgi; 984 s/<.*?>//sgi;
876 s/&/&amp;/g; 985 s/&amp;/&/g;
877 s/</&lt;/g; 986 s/&lt;/</g;
878 s/>/&gt;/g; 987 s/&gt;/>/g;
879 } 988 }
880 989
881 $uptime = sprintf "%dd %02d:%02d:%02d", 990 $uptime = sprintf "%dd %02d:%02d:%02d",
882 (int $m->[8] / 86400), 991 (int $uptime / 86400),
883 (int $m->[8] / 3600) % 24, 992 (int $uptime / 3600) % 24,
884 (int $m->[8] / 60) % 60, 993 (int $uptime / 60) % 60,
885 $m->[8] % 60; 994 $uptime % 60;
886 995
887 $m = [$users, $host, $uptime, $version, $desc]; 996 $m = [$users, $host, $uptime, $version, $desc];
888 997
889 $y++; 998 $y++;
890 999
… …
900 ), 1009 ),
901 (new CFPlus::UI::Empty expand => 1), 1010 (new CFPlus::UI::Empty expand => 1),
902 ]); 1011 ]);
903 1012
904 $table->add ($_, $y, new CFPlus::UI::Label 1013 $table->add ($_, $y, new CFPlus::UI::Label
1014 max_w => $::WIDTH * 0.4,
905 ellipsise => 0, 1015 ellipsise => 0,
906 align => $align[$_], 1016 align => $align[$_],
907 text => $m->[$_], 1017 text => $m->[$_],
908 tooltip => $tip[$_], 1018 tooltip => $tip[$_],
1019 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
909 can_hover => 1, 1020 can_hover => 1,
910 can_events => 1, 1021 can_events => 1,
911 fontsize => 0.8) 1022 fontsize => 0.8)
912 for 0 .. $#$m; 1023 for 0 .. $#$m;
913 } 1024 }
1025 } else {
1026 $ok or $label->set_text ("error while contacting metaserver");
914 } 1027 }
915 }); 1028 };
1029
916} 1030}
917 1031
918sub metaserver_dialog { 1032sub metaserver_dialog {
919 my $vbox = new CFPlus::UI::VBox; 1033 my $vbox = new CFPlus::UI::VBox;
920 my $table = new CFPlus::UI::Table; 1034 my $table = new CFPlus::UI::Table;
… …
924 title => "Server List", 1038 title => "Server List",
925 name => 'metaserver_dialog', 1039 name => 'metaserver_dialog',
926 x => 'center', 1040 x => 'center',
927 y => 'center', 1041 y => 'center',
928 z => 3, 1042 z => 3,
1043 force_w => $::WIDTH * 0.9,
929 force_h => $::HEIGHT * 0.4, 1044 force_h => $::HEIGHT * 0.7,
930 child => $vbox, 1045 child => $vbox,
931 has_close_button => 1, 1046 has_close_button => 1,
932 table => $table, 1047 table => $table,
933 on_visibility_change => sub { 1048 on_visibility_change => sub {
934 update_metaserver ($_[0]) if $_[1]; 1049 update_metaserver ($_[0]) if $_[1];
… …
1010 . "so only set it if you really need to prefetch images. " 1125 . "so only set it if you really need to prefetch images. "
1011 . "This option can be set and unset any time.", 1126 . "This option can be set and unset any time.",
1012 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1127 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1013 ); 1128 );
1014 1129
1015 $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");
1016 $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
1017 text => $CFG->{output_count}, 1141 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.", 1142 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 }, 1143 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1020 ); 1144 );
1021 1145
1022 $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");
1023 $table->add (1, 10, new CFPlus::UI::Entry 1147 $table->add (1, 11, new CFPlus::UI::Entry
1024 text => $CFG->{output_sync}, 1148 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.", 1149 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 }, 1150 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1027 ); 1151 );
1028 1152
1029 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1153 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1030 expand => 1, 1154 expand => 1,
1031 align => 0, 1155 align => 0,
1032 text => "Login", 1156 text => "Login",
1033 on_activate => sub { 1157 on_activate => sub {
1034 $CONN ? stop_game 1158 $CONN ? stop_game
1035 : start_game; 1159 : start_game;
1036 0 1160 0
1037 }, 1161 },
1038 ); 1162 );
1039 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
1040 $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");
1041 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1178 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1042 text => $CFG->{say_command}, 1179 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. " 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. "
1044 . "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. "
1045 . "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.",
1046 on_changed => sub { 1183 on_changed => sub {
1047 my ($self, $value) = @_; 1184 my ($self, $value) = @_;
1048 $CFG->{say_command} = $value; 1185 $CFG->{say_command} = $value;
1049 0 1186 0
1050 } 1187 }
1051 ); 1188 );
1052 1189
1053 $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");
1054 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1191 $table->add (1, $row++, new CFPlus::UI::CheckBox
1055 state => $CFG->{show_tips}, 1192 state => $CFG->{show_tips},
1056 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?",
1057 on_changed => sub { 1194 on_changed => sub {
1058 my ($self, $value) = @_; 1195 my ($self, $value) = @_;
1059 $CFG->{shop_tips} = $value; 1196 $CFG->{show_tips} = $value;
1060 0 1197 0
1061 } 1198 }
1062 ); 1199 );
1063 1200
1064 $vbox->add (new CFPlus::UI::FancyFrame 1201 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1065 label => "Server Info", 1202 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1066 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 },
1067 ); 1212 );
1068 1213
1069 $vbox 1214 $table
1070} 1215}
1071 1216
1072sub message_window { 1217sub message_window {
1073 my $window = new CFPlus::UI::Toplevel 1218 my $window = new CFPlus::UI::Toplevel
1074 name => "message_window", 1219 name => "message_window",
… …
1155 ["Boots" => PICKUP_BOOTS], 1300 ["Boots" => PICKUP_BOOTS],
1156 ["Gloves" => PICKUP_GLOVES], 1301 ["Gloves" => PICKUP_GLOVES],
1157 ["Cloaks" => PICKUP_CLOAK], 1302 ["Cloaks" => PICKUP_CLOAK],
1158 ], 1303 ],
1159 1304
1160 ["Readables", 2, 2, 1305 ["Readables", 2, 0,
1161 ["Spellbooks" => PICKUP_SPELLBOOK], 1306 ["Spellbooks" => PICKUP_SPELLBOOK],
1162 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1307 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1163 ["Normal Books/Scrolls" => PICKUP_READABLES], 1308 ["Normal Books/Scrolls" => PICKUP_READABLES],
1164 ], 1309 ],
1165 ["Misc", 2, 7, 1310 ["Misc", 2, 5,
1166 ["Food" => PICKUP_FOOD], 1311 ["Food" => PICKUP_FOOD],
1167 ["Drinks" => PICKUP_DRINK], 1312 ["Drinks" => PICKUP_DRINK],
1168 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1313 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1169 ["Keys" => PICKUP_KEY], 1314 ["Keys" => PICKUP_KEY],
1170 ["Magical Items" => PICKUP_MAGICAL], 1315 ["Magical Items" => PICKUP_MAGICAL],
1171 ["Potions" => PICKUP_POTION], 1316 ["Potions" => PICKUP_POTION],
1172 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1317 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1173 ["Ignore cursed" => PICKUP_NOT_CURSED], 1318 ["Ignore cursed" => PICKUP_NOT_CURSED],
1174 ["Jewelery" => PICKUP_JEWELS], 1319 ["Jewelery" => PICKUP_JEWELS],
1320 ["Flesh" => PICKUP_FLESH],
1175 ], 1321 ],
1176 ["Weight/Value ratio", 2, 17] 1322 ["Weight/Value ratio", 2, 17]
1177 ) 1323 )
1178 { 1324 {
1179 my ($title, $x, $y, @bits) = @$_; 1325 my ($title, $x, $y, @bits) = @$_;
… …
1229 $table 1375 $table
1230} 1376}
1231 1377
1232my %SORT_ORDER = ( 1378my %SORT_ORDER = (
1233 type => undef, 1379 type => undef,
1234 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
1235 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1386 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1236 or $b->{mtime} <=> $a->{mtime} 1387 or $btime <=> $atime
1237 or $a->{type} <=> $b->{type} 1388 or $a->{type} <=> $b->{type}
1389 } @_
1238 } @_ }, 1390 },
1239 weight => sub { sort { 1391 weight => sub { sort {
1240 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1392 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1241 or $a->{type} <=> $b->{type} 1393 or $a->{type} <=> $b->{type}
1242 } @_ }, 1394 } @_ },
1243); 1395);
… …
1268 #TODO# update to weigh/maxweight 1420 #TODO# update to weigh/maxweight
1269 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1421 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1270 1422
1271 $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);
1272 $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}});
1273 1426
1274 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1427 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1275 1428
1276 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1429 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1277 1430
… …
1306 has_close_button => 1 1459 has_close_button => 1
1307 ; 1460 ;
1308 1461
1309 my $ntb = 1462 my $ntb =
1310 $PL_NOTEBOOK = 1463 $PL_NOTEBOOK =
1311 new CFPlus::UI::Notebook expand => 1, debug => 1; 1464 new CFPlus::UI::Notebook expand => 1;
1312 1465
1313 $ntb->add ( 1466 $ntb->add (
1314 "Statistics (F2)" => $STATS_PAGE = stats_window, 1467 "Statistics (F2)" => $STATS_PAGE = stats_window,
1315 "Shows statistics, where all your Stats and Resistances are shown." 1468 "Shows statistics, where all your Stats and Resistances are shown."
1316 ); 1469 );
1317 $ntb->add ( 1470 $ntb->add (
1318 "Skills (F3)" => $SKILL_PAGE = skill_window, 1471 "Skills (F3)" => $SKILL_PAGE = skill_window,
1319 "Shows all your Skills." 1472 "Shows all your Skills."
1320 ); 1473 );
1321 1474
1322 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);
1323 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1324 $ntb->add ( 1477 $ntb->add (
1325 "Spellbook (F4)" => $spellsw, 1478 "Spellbook (F4)" => $spellsw,
1326 "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."
1327 ); 1480 );
1328 $ntb->add ( 1481 $ntb->add (
1329 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1330 "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 :). "
1331 . "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."
1332 ); 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.");
1333 1488
1334 $ntb->set_current_page ($INVENTORY_PAGE); 1489 $ntb->set_current_page ($INVENTORY_PAGE);
1335 1490
1336 $plwin->add ($ntb); 1491 $plwin->add ($ntb);
1337 $plwin 1492 $plwin
1338} 1493}
1339 1494
1340sub update_bindings {
1341 $BIND_UPD_CB->() if $BIND_UPD_CB;
1342}
1343
1344sub keyboard_setup { 1495sub keyboard_setup {
1345 my $binding_list = new CFPlus::UI::VBox; 1496 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} 1497}
1456 1498
1457sub help_window { 1499sub help_window {
1458 my $win = new CFPlus::UI::Toplevel 1500 my $win = new CFPlus::UI::Toplevel
1459 x => 'center', 1501 x => 'center',
… …
1616 1658
1617sub show_tip_of_the_day { 1659sub show_tip_of_the_day {
1618 # find all tips 1660 # find all tips
1619 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1661 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1620 1662
1621 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1663 CFPlus::DB::get state => "tip_of_the_day", sub {
1664 my ($todindex) = @_;
1622 $todindex = 0 if $todindex >= @tod; 1665 $todindex = 0 if $todindex >= @tod;
1623 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1666 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1624 1667
1625 # create dialog 1668 # create dialog
1626 my $dialog; 1669 my $dialog;
1627 1670
1628 my $close = sub { 1671 my $close = sub {
1629 $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;
1630 }; 1710 };
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} 1711}
1668 1712
1669sub sdl_init { 1713sub sdl_init {
1670 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1671 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
… …
1705 padding => 0, 1749 padding => 0,
1706 z => 100, 1750 z => 100,
1707 force_x => "max", 1751 force_x => "max",
1708 force_y => 0; 1752 force_y => 0;
1709 $DEBUG_STATUS->show; 1753 $DEBUG_STATUS->show;
1710
1711 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1712 1754
1713 $STATUSBOX = new CFPlus::UI::Statusbox; 1755 $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]); 1756 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1715 1757
1716 (new CFPlus::UI::Frame 1758 (new CFPlus::UI::Frame
… …
1753 font => $FONT_FIXED, 1795 font => $FONT_FIXED,
1754 fontsize => $::CFG->{log_fontsize}, 1796 fontsize => $::CFG->{log_fontsize},
1755 indent => -4, 1797 indent => -4,
1756 can_hover => 1, 1798 can_hover => 1,
1757 can_events => 1, 1799 can_events => 1,
1800 max_par => $CFG->{logview_max_par},
1758 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.",
1759 ; 1802 ;
1760 1803
1761 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1804 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1762 title => "Setup", 1805 title => "Setup",
1763 name => "setup_dialog", 1806 name => "setup_dialog",
… …
1774 $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,
1775 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1818 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1776 1819
1777 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1820 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1778 "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.");
1779 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1822 $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."); 1823 "Configure various client-specific settings.");
1781 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1824 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1782 "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.");
1783 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1826 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1784 "Configure the use of audio, sound effects and background music."); 1827 "Configure the use of audio, sound effects and background music.");
1785 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1828 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1817 ); 1860 );
1818 1861
1819 $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,
1820 tooltip => "View Documentation"); 1863 tooltip => "View Documentation");
1821 1864
1865
1822 $BUTTONBAR->add (new CFPlus::UI::Button 1866 $BUTTONBAR->add (new CFPlus::UI::Button
1823 text => "Quit", 1867 text => "Quit",
1824 tooltip => "Terminates the program", 1868 tooltip => "Terminates the program",
1825 on_activate => sub { 1869 on_activate => sub {
1826 if ($CONN) { 1870 if ($CONN) {
… …
1837 } 1881 }
1838 1882
1839 $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]);
1840} 1884}
1841 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
1842sub video_shutdown { 2005sub video_shutdown {
1843 CFPlus::OpenGL::shutdown; 2006 CFPlus::OpenGL::shutdown;
1844 2007
1845 undef $SDL_ACTIVE; 2008 undef $SDL_ACTIVE;
1846} 2009}
1847 2010
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 { 2011sub audio_channel_finished {
1852 my ($channel) = @_; 2012 my ($channel) = @_;
1853 2013
1854 #warn "channel $channel finished\n";#d# 2014 #warn "channel $channel finished\n";#d#
1855} 2015}
1856 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 $MUSIC_PLAYING
2051 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2052
2053 if ($MUSIC_PLAYING) {
2054 warn "fade out";
2055 CFPlus::MixMusic::fade_out 1500;
2056 } else {
2057 warn "new music\n";
2058
2059 my $music = $MUSIC_WANT [rand @MUSIC_WANT];
2060
2061 $MUSIC_PLAYING = $music;
2062
2063 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
2064 $MUSIC_PLAYER->play (0);
2065 }
2066}
2067
1857sub audio_music_finished { 2068sub audio_music_finished {
1858 return unless $CFG->{bgm_enable}; 2069 $MUSIC_PLAYING = undef;
2070 undef $MUSIC_PLAYER;
1859 2071
1860 # TODO: hack, do play loop and mood music 2072 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} 2073}
1866 2074
1867sub audio_init { 2075sub audio_init {
1868 if ($CFG->{audio_enable}) { 2076 if ($CFG->{audio_enable}) {
1869 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2077 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1877 CFPlus::Mix_AllocateChannels 8; 2085 CFPlus::Mix_AllocateChannels 8;
1878 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2086 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1879 2087
1880 audio_music_finished; 2088 audio_music_finished;
1881 2089
2090 local $_;
1882 while (<$fh>) { 2091 while (<$fh>) {
1883 next if /^\s*#/; 2092 next if /^\s*#/;
1884 next if /^\s*$/; 2093 next if /^\s*$/;
1885 2094
1886 my ($file, $volume, $event) = split /\s+/, $_, 3; 2095 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1963 if $CONN; 2172 if $CONN;
1964}); 2173});
1965 2174
1966%SDL_CB = ( 2175%SDL_CB = (
1967 CFPlus::SDL_QUIT => sub { 2176 CFPlus::SDL_QUIT => sub {
1968 Event::unloop -1; 2177 exit;
1969 }, 2178 },
1970 CFPlus::SDL_VIDEORESIZE => sub { 2179 CFPlus::SDL_VIDEORESIZE => sub {
1971 }, 2180 },
1972 CFPlus::SDL_VIDEOEXPOSE => sub { 2181 CFPlus::SDL_VIDEOEXPOSE => sub {
1973 CFPlus::UI::full_refresh; 2182 CFPlus::UI::full_refresh;
1974 }, 2183 },
1975 CFPlus::SDL_ACTIVEEVENT => sub { 2184 CFPlus::SDL_ACTIVEEVENT => sub {
1976# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2185# not useful, as APPACTIVE include sonly iconified state, not unmapped
2186# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2187# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2188# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2189# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1977 }, 2190 },
1978 CFPlus::SDL_KEYDOWN => sub { 2191 CFPlus::SDL_KEYDOWN => sub {
1979 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2192 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1980 # alt-enter 2193 # alt-enter
1981 $FULLSCREEN_ENABLE->toggle; 2194 $FULLSCREEN_ENABLE->toggle;
… …
2002 2215
2003$SIG{INT} = $SIG{TERM} = sub { exit }; 2216$SIG{INT} = $SIG{TERM} = sub { exit };
2004 2217
2005{ 2218{
2006 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2219 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2220 CFPlus::DB::Server::run;
2221
2007 CFPlus::UI::set_layout ($::CFG->{layout}); 2222 CFPlus::UI::set_layout ($::CFG->{layout});
2008 2223
2009 my %DEF_CFG = ( 2224 my %DEF_CFG = (
2010 sdl_mode => 0, 2225 sdl_mode => 0,
2011 width => 640, 2226 width => 640,
2012 height => 480, 2227 height => 480,
2013 fullscreen => 0, 2228 fullscreen => 0,
2014 fast => 0, 2229 fast => 0,
2015 map_scale => 1, 2230 map_scale => 1,
2016 fow_enable => 1, 2231 fow_enable => 1,
2017 fow_intensity => 0.45, 2232 fow_intensity => 0.45,
2018 fow_smooth => 0, 2233 fow_smooth => 0,
2234 map_smoothing => 1,
2019 gui_fontsize => 1, 2235 gui_fontsize => 1,
2020 log_fontsize => 0.7, 2236 log_fontsize => 0.7,
2021 gauge_fontsize => 1, 2237 gauge_fontsize => 1,
2022 gauge_size => 0.35, 2238 gauge_size => 0.35,
2023 stat_fontsize => 0.7, 2239 stat_fontsize => 0.7,
2024 mapsize => 100, 2240 mapsize => 100,
2025 say_command => 'say', 2241 say_command => 'chat',
2026 audio_enable => 1, 2242 audio_enable => 1,
2027 bgm_enable => 1, 2243 bgm_enable => 1,
2028 bgm_volume => 0.25, 2244 bgm_volume => 0.25,
2029 face_prefetch => 0, 2245 face_prefetch => 0,
2030 output_sync => 1, 2246 output_sync => 1,
2031 output_count => 1, 2247 output_count => 1,
2248 output_rate => "",
2032 pickup => 0, 2249 pickup => 0,
2033 inv_sort => "mtime", 2250 inv_sort => "mtime",
2034 default => "profile", # default profile 2251 default => "profile", # default profile
2035 show_tips => 1, 2252 show_tips => 1,
2253 logview_max_par => 1000,
2036 ); 2254 );
2037 2255
2038 while (my ($k, $v) = each %DEF_CFG) { 2256 while (my ($k, $v) = each %DEF_CFG) {
2039 $CFG->{$k} = $v unless exists $CFG->{$k}; 2257 $CFG->{$k} = $v unless exists $CFG->{$k};
2040 } 2258 }
2041 2259
2042 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2260 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2261 $PROFILE = $CFG->{profile}{default};
2262
2263 # convert old bindings (only default profile matters)
2264 if (my $bindings = delete $PROFILE->{bindings}) {
2265 while (my ($mod, $syms) = each %$bindings) {
2266 while (my ($sym, $cmds) = each %$syms) {
2267 push @{ $PROFILE->{macro} }, {
2268 accelkey => [$mod*1, $sym*1],
2269 action => $cmds,
2270 };
2271 }
2272 }
2273 }
2043 2274
2044 sdl_init; 2275 sdl_init;
2045 2276
2046 @SDL_MODES = reverse 2277 @SDL_MODES = reverse
2047 grep $_->[0] >= 640 && $_->[1] >= 480, 2278 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2084# } 2315# }
2085# my $t2 = Time::HiRes::time; 2316# my $t2 = Time::HiRes::time;
2086# warn $t2-$t1; 2317# warn $t2-$t1;
2087# } 2318# }
2088 2319
2320 $startup_done->();
2321
2089 video_init; 2322 video_init;
2090 audio_init; 2323 audio_init;
2091} 2324}
2092 2325
2093show_tip_of_the_day if $CFG->{show_tips}; 2326show_tip_of_the_day if $CFG->{show_tips};
2094 2327
2095Event::loop; 2328Event::loop;
2096#CFPlus::SDL_Quit; 2329#CFPlus::SDL_Quit;
2097#CFPlus::_exit 0; 2330#CFPlus::_exit 0;
2098 2331
2332END {
2099END { CFPlus::SDL_Quit } 2333 CFPlus::SDL_Quit;
2334 CFPlus::DB::Server::stop;
2335}
2100 2336
2101=head1 NAME 2337=head1 NAME
2102 2338
2103cfplus - A Crossfire+ and Crossfire game client 2339cfplus - A Crossfire+ and Crossfire game client
2104 2340

Diff Legend

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