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.116 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 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 CFPlus::error $_[1];
53}; 99};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 100
66my $MAX_FPS = 60; 101my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
68 103
69our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 105
71our $LAST_REFRESH; 106our $LAST_REFRESH;
72our $NOW; 107our $NOW;
73 108
74our $CFG; 109our $CFG;
75our $CONN; 110our $CONN;
111our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 112our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 113
78our $WANT_REFRESH; 114our $WANT_REFRESH;
79our $CAN_REFRESH; 115our $CAN_REFRESH;
80 116
… …
111 147
112our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
113our $STATS_PAGE; 149our $STATS_PAGE;
114our $SKILL_PAGE; 150our $SKILL_PAGE;
115our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
116 153
117our $HELP_WINDOW; 154our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
119our $FLOORBOX; 156our $FLOORBOX;
120our $GAUGES; 157our $GAUGES;
… …
133 170
134our $INV; 171our $INV;
135our $INVR; 172our $INVR;
136our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
137 174
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 175our $PICKUP_CFG;
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
142 179
143sub status { 180sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 181 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 182}
146 183
147sub debug { 184sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 185 $DEBUG_STATUS->set_text ($_[0]);
186}
187
188sub message {
189 my ($para) = @_;
190
191 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
192
193 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
194
195 $LOGVIEW->add_paragraph ($para);
196 $LOGVIEW->scroll_to_bottom;
149} 197}
150 198
151sub destroy_query_dialog { 199sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
154} 202}
155 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
156# server query dialog 207# server query dialog
157sub server_query { 208sub server_query {
158 my ($conn, $flags, $prompt) = @_; 209 my ($conn, $flags, $prompt) = @_;
210
211 # FIXME: a very ugly hack to wait for stat update #d#
212 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
213 unless ($QUERY_TIMER) {
214 $QUERY_TIMER =
215 Event->timer (
216 after => 1,
217 cb => sub {
218 server_query ($conn, $flags, $prompt, 1);
219 $QUERY_TIMER = undef
220 }
221 );
222 return;
223 }
224 }
159 225
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 227 x => "center",
162 y => "center", 228 y => "center",
163 title => "Server Query", 229 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
165 ; 231 ;
166 232
167 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 235 ellipsise => 0,
170 text => $prompt; 236 text => $prompt;
171 237
172 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 256 );
191 257
192 $dialog->grab_focus; 258 $dialog->grab_focus;
193 259
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
199 263
200 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 266 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
204 268
205 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
206 270
… …
218 $conn->send ("reply d"); 282 $conn->send ("reply d");
219 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
220 0 284 0
221 }, 285 },
222 ); 286 );
287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
223 310
224 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 313 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 441 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 442 $SETUP_DIALOG->hide;
356 443
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 444 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 445
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
360 447
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 448 $MAP = new CFPlus::Map;
362 449
363 $CONN = eval { 450 $CONN = eval {
364 new CFPlus::Protocol 451 new CFPlus::Protocol
365 host => $host, 452 host => $host,
366 port => $port || 13327, 453 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 454 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 455 pass => $PROFILE->{password},
369 mapw => $mapsize, 456 mapw => $mapsize,
370 maph => $mapsize, 457 maph => $mapsize,
458
459 client => "cfplus $CFPlus::VERSION $] $^O",
371 460
372 map_widget => $MAPWIDGET, 461 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 462 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 463 statusbox => $STATUSBOX,
375 map => $MAP, 464 map => $MAP,
376 mapmap => $MAPMAP, 465 mapmap => $MAPMAP,
377 query => \&server_query, 466 query => \&server_query,
378 467
468 setup_req => {
469 smoothing => $CFG->{map_smoothing}*1,
470 },
471
379 sound_play => sub { 472 sound_play => sub {
380 my ($x, $y, $soundnum, $type) = @_; 473 my ($x, $y, $soundnum, $type) = @_;
381 474
382 $SDL_MIXER 475 $SDL_MIXER
383 or return; 476 or return;
… …
402sub stop_game { 495sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 496 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 497 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 498 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 499 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 500 $SPELL_LIST->clear_spells;
501 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
408 502
409 return unless $CONN; 503 return unless $CONN;
410 504
411 status "connection closed"; 505 status "connection closed";
412 506
… …
420sub graphics_setup { 514sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 515 my $vbox = new CFPlus::UI::VBox;
422 516
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 517 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 518
519 my $row = 0;
520
521 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
522 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
523 can_events => 1,
524 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
525
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 527 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 528
428 $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]); 529 $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]);
429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 530 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
430 531
431 $mode_slider->connect (changed => sub { 532 $mode_slider->connect (changed => sub {
… …
433 534
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 535 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 536 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
436 }); 537 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 538 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438
439 my $row = 1;
440 539
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 541 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 542 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 543 tooltip => "Bring the client into fullscreen mode.",
… …
450 state => $CFG->{fast}, 549 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 550 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 551 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 552 );
454 553
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
555 $table->add (1, $row++, new CFPlus::UI::Slider
556 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
557 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
558 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
559 );
560
561 $table->add (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the video settings above.",
564 on_activate => sub {
565 video_shutdown ();
566 video_init ();
567 0
568 }
569 );
570
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456 $table->add (1, $row++, new CFPlus::UI::Slider 572 $table->add (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 573 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 574 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 575 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
576 );
577
578 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{map_smoothing},
581 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
582 . "This increases load on the graphics subsystem and works only with 2.x servers. "
583 . "Changes take effect at next connection only.",
584 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
460 ); 585 );
461 586
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 588 $table->add (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 589 state => $CFG->{fow_enable},
… …
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 608 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0 609 0
485 } 610 }
486 ); 611 );
487 612
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 );
494
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 613 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 614 $table->add (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 615 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 616 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 617 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 633 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 634 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 635 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 636 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 637 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0
521 }
522 );
523
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0 638 0
531 } 639 }
532 ); 640 );
533 641
534 $vbox 642 $vbox
… …
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 747 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 748 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 749 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 750 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 751 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
752 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 753
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 754 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 755
647 for my $x (0..2) { 756 for my $x (0..2) {
648 for my $y (0 .. 2) { 757 for my $y (0 .. 2) {
… …
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 761 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 ); 762 );
654 } 763 }
655 } 764 }
656 765
766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 767
658 $table 768 $table
659} 769}
660 770
661sub stats_window { 771sub stats_window {
… …
830 940
831 my $table = $METASERVER->{table}; 941 my $table = $METASERVER->{table};
832 $table->clear; 942 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 943 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 944
835 my $buf; 945 my $ok = 0;
836 946
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 947 CFPlus::background {
948 my $ua = CFPlus::lwp_useragent;
838 949
839 unless ($fh) { 950 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 951 } sub {
841 return; 952 my ($msg) = @_;
842 } 953 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 954 $table->clear;
857 955
858 my @tip = ( 956 my @tip = (
859 "The current number of users logged in on the server.", 957 "The current number of users logged in on the server.",
860 "The hostname of the server.", 958 "The hostname of the server.",
… …
870 for 0 .. $#col; 968 for 0 .. $#col;
871 969
872 my @align = qw(1 0 1 1 -1); 970 my @align = qw(1 0 1 1 -1);
873 971
874 my $y = 0; 972 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 973 for my $m (@{ $msg->{servers} }) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 974 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
975 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877 976
878 for ($desc) { 977 for ($desc) {
879 s/<br>/\n/gi; 978 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 979 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 980 s/<.*?>//sgi;
882 s/&/&amp;/g; 981 s/&amp;/&/g;
883 s/</&lt;/g; 982 s/&lt;/</g;
884 s/>/&gt;/g; 983 s/&gt;/>/g;
885 } 984 }
886 985
887 $uptime = sprintf "%dd %02d:%02d:%02d", 986 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 987 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 988 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 989 (int $uptime / 60) % 60,
891 $m->[8] % 60; 990 $uptime % 60;
892 991
893 $m = [$users, $host, $uptime, $version, $desc]; 992 $m = [$users, $host, $uptime, $version, $desc];
894 993
895 $y++; 994 $y++;
896 995
… …
906 ), 1005 ),
907 (new CFPlus::UI::Empty expand => 1), 1006 (new CFPlus::UI::Empty expand => 1),
908 ]); 1007 ]);
909 1008
910 $table->add ($_, $y, new CFPlus::UI::Label 1009 $table->add ($_, $y, new CFPlus::UI::Label
1010 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 1011 ellipsise => 0,
912 align => $align[$_], 1012 align => $align[$_],
913 text => $m->[$_], 1013 text => $m->[$_],
914 tooltip => $tip[$_], 1014 tooltip => $tip[$_],
1015 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 1016 can_hover => 1,
916 can_events => 1, 1017 can_events => 1,
917 fontsize => 0.8) 1018 fontsize => 0.8)
918 for 0 .. $#$m; 1019 for 0 .. $#$m;
919 } 1020 }
1021 } else {
1022 $ok or $label->set_text ("error while contacting metaserver");
920 } 1023 }
921 }); 1024 };
1025
922} 1026}
923 1027
924sub metaserver_dialog { 1028sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 1029 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 1030 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 1034 title => "Server List",
931 name => 'metaserver_dialog', 1035 name => 'metaserver_dialog',
932 x => 'center', 1036 x => 'center',
933 y => 'center', 1037 y => 'center',
934 z => 3, 1038 z => 3,
1039 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 1040 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 1041 child => $vbox,
937 has_close_button => 1, 1042 has_close_button => 1,
938 table => $table, 1043 table => $table,
939 on_visibility_change => sub { 1044 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 1045 update_metaserver ($_[0]) if $_[1];
… …
1016 . "so only set it if you really need to prefetch images. " 1121 . "so only set it if you really need to prefetch images. "
1017 . "This option can be set and unset any time.", 1122 . "This option can be set and unset any time.",
1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1019 ); 1124 );
1020 1125
1021 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1126 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1022 $table->add (1, 9, new CFPlus::UI::Entry 1127 $table->add (1, 9, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate},
1129 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1131 . "default will be used, which is usually around 100kb/s.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1133 );
1134
1135 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1136 $table->add (1, 10, new CFPlus::UI::Entry
1023 text => $CFG->{output_count}, 1137 text => $CFG->{output_count},
1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1138 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1026 ); 1140 );
1027 1141
1028 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1142 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1029 $table->add (1, 10, new CFPlus::UI::Entry 1143 $table->add (1, 11, new CFPlus::UI::Entry
1030 text => $CFG->{output_sync}, 1144 text => $CFG->{output_sync},
1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1145 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1033 ); 1147 );
1034 1148
1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1036 expand => 1, 1150 expand => 1,
1037 align => 0, 1151 align => 0,
1038 text => "Login", 1152 text => "Login",
1039 on_activate => sub { 1153 on_activate => sub {
1040 $CONN ? stop_game 1154 $CONN ? stop_game
1041 : start_game; 1155 : start_game;
1042 0 1156 0
1043 }, 1157 },
1044 ); 1158 );
1045 1159
1160 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info",
1162 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1163 );
1164
1165 $vbox
1166}
1167
1168sub client_setup {
1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170
1171 my $row = 0;
1172
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1173 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1175 text => $CFG->{say_command},
1049 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1176 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1177 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub { 1179 on_changed => sub {
1053 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value; 1181 $CFG->{say_command} = $value;
1055 0 1182 0
1056 } 1183 }
1057 ); 1184 );
1058 1185
1059 $vbox->add (new CFPlus::UI::FancyFrame 1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1060 label => "Server Info", 1187 $table->add (1, $row++, new CFPlus::UI::CheckBox
1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1188 state => $CFG->{show_tips},
1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1190 on_changed => sub {
1191 my ($self, $value) = @_;
1192 $CFG->{show_tips} = $value;
1193 0
1194 }
1062 ); 1195 );
1063 1196
1064 $vbox 1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201 . "sends more messages than this number, older messages get removed to save memory and "
1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub {
1204 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1206 0
1207 },
1208 );
1209
1210 $table
1065} 1211}
1066 1212
1067sub message_window { 1213sub message_window {
1068 my $window = new CFPlus::UI::Toplevel 1214 my $window = new CFPlus::UI::Toplevel
1069 name => "message_window", 1215 name => "message_window",
… …
1123 window => $window, 1269 window => $window,
1124 input => $input, 1270 input => $input,
1125 }; 1271 };
1126 1272
1127 $window 1273 $window
1128}
1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1160 ;
1161
1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164 $vb->add (new CFPlus::UI::Label
1165 text => "You should find a savebed and apply it first!",
1166 max_w => $WIDTH * 0.25,
1167 ellipsize => 0,
1168 );
1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170 $hb->add (new CFPlus::UI::Button
1171 text => "Ok",
1172 expand => 1,
1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174 );
1175 $hb->add (new CFPlus::UI::Button
1176 text => "Quit anyway",
1177 expand => 1,
1178 on_activate => sub { exit },
1179 );
1180 }
1181
1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1184} 1274}
1185 1275
1186sub autopickup_setup { 1276sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1277 my $table = new CFPlus::UI::Table;
1188 1278
… …
1206 ["Boots" => PICKUP_BOOTS], 1296 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1297 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1298 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1299 ],
1210 1300
1211 ["Readables", 2, 2, 1301 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1302 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1303 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1304 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1305 ],
1216 ["Misc", 2, 7, 1306 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1307 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1308 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1309 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1310 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1311 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1312 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1313 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1314 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1315 ["Jewelery" => PICKUP_JEWELS],
1316 ["Flesh" => PICKUP_FLESH],
1226 ], 1317 ],
1227 ["Weight/Value ratio", 2, 17] 1318 ["Weight/Value ratio", 2, 17]
1228 ) 1319 )
1229 { 1320 {
1230 my ($title, $x, $y, @bits) = @$_; 1321 my ($title, $x, $y, @bits) = @$_;
… …
1280 $table 1371 $table
1281} 1372}
1282 1373
1283my %SORT_ORDER = ( 1374my %SORT_ORDER = (
1284 type => undef, 1375 type => undef,
1285 mtime => sub { sort { 1376 mtime => sub {
1377 my $NOW = time;
1378 sort {
1379 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1380 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1381
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1382 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1383 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1384 or $a->{type} <=> $b->{type}
1385 } @_
1289 } @_ }, 1386 },
1290 weight => sub { sort { 1387 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1388 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1389 or $a->{type} <=> $b->{type}
1293 } @_ }, 1390 } @_ },
1294); 1391);
… …
1319 #TODO# update to weigh/maxweight 1416 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1417 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1418
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1419 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1420 $sw1->add ($INV = new CFPlus::UI::Inventory);
1421 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1422
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1423 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1424
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1425 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1426
… …
1357 has_close_button => 1 1455 has_close_button => 1
1358 ; 1456 ;
1359 1457
1360 my $ntb = 1458 my $ntb =
1361 $PL_NOTEBOOK = 1459 $PL_NOTEBOOK =
1362 new CFPlus::UI::Notebook expand => 1, debug => 1; 1460 new CFPlus::UI::Notebook expand => 1;
1363 1461
1364 $ntb->add ( 1462 $ntb->add (
1365 "Statistics (F2)" => $STATS_PAGE = stats_window, 1463 "Statistics (F2)" => $STATS_PAGE = stats_window,
1366 "Shows statistics, where all your Stats and Resistances are shown." 1464 "Shows statistics, where all your Stats and Resistances are shown."
1367 ); 1465 );
1368 $ntb->add ( 1466 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1467 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1468 "Shows all your Skills."
1371 ); 1469 );
1372 1470
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1471 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1472 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1473 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1474 "Spellbook (F4)" => $spellsw,
1377 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1475 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1378 ); 1476 );
1379 $ntb->add ( 1477 $ntb->add (
1380 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1478 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1381 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1479 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1382 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1480 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1383 ); 1481 );
1482 $ntb->add (Pickup => autopickup_setup,
1483 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1384 1484
1385 $ntb->set_current_page ($INVENTORY_PAGE); 1485 $ntb->set_current_page ($INVENTORY_PAGE);
1386 1486
1387 $plwin->add ($ntb); 1487 $plwin->add ($ntb);
1388 $plwin 1488 $plwin
1389} 1489}
1390 1490
1391sub update_bindings {
1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1393}
1394
1395sub keyboard_setup { 1491sub keyboard_setup {
1396 my $binding_list = new CFPlus::UI::VBox; 1492 CFPlus::Macro::keyboard_setup
1397
1398 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear ();
1401
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406
1407 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button
1411 text => "delete",
1412 tooltip => "Deletes the binding",
1413 on_activate => sub {
1414 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1416 0
1417 });
1418
1419 $hb->add (new CFPlus::UI::Button
1420 text => "edit",
1421 tooltip => "Edits the binding",
1422 on_activate => sub {
1423 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1425 sub {
1426 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->();
1430 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1431 $SETUP_DIALOG->show;
1432 },
1433 sub {
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 });
1437 $::BIND_EDITOR->show;
1438 $SETUP_DIALOG->hide;
1439 0
1440 });
1441
1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1444 }
1445 }
1446 };
1447
1448 my $vb = new CFPlus::UI::VBox;
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1454 $hb->add (new CFPlus::UI::CheckBox
1455 expand => 1,
1456 state => $CFG->{shift_fire_stop},
1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1458 on_changed => sub {
1459 my ($cbox, $value) = @_;
1460 $CFG->{shift_fire_stop} = $value;
1461 0
1462 });
1463
1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1468
1469 $hb->add (new CFPlus::UI::Button
1470 text => "record new",
1471 expand => 1,
1472 tooltip => "This button opens the binding editor with an empty binding.",
1473 on_activate => sub {
1474 $::BIND_EDITOR->set_binding (undef, undef, [],
1475 sub {
1476 my ($mod, $sym, $cmds) = @_;
1477 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1478 $refresh->();
1479 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1480 $SETUP_DIALOG->show;
1481 },
1482 sub {
1483 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484 $SETUP_DIALOG->show;
1485 },
1486 );
1487 $SETUP_DIALOG->hide;
1488 $::BIND_EDITOR->show;
1489 0
1490 },
1491 );
1492
1493 $hb->add (new CFPlus::UI::Button
1494 text => "close",
1495 tooltip => "Closes the binding window",
1496 expand => 1,
1497 on_activate => sub {
1498 $SETUP_DIALOG->hide;
1499 0
1500 }
1501 );
1502
1503 $refresh->();
1504
1505 $vb
1506} 1493}
1507 1494
1508sub help_window { 1495sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1496 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1497 x => 'center',
1511 y => 'center', 1498 y => 'center',
1512 z => 2, 1499 z => 4,
1513 name => 'doc_browser', 1500 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1501 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1502 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1503 title => "Help Browser",
1517 has_close_button => 1; 1504 has_close_button => 1;
… …
1605 }; 1592 };
1606 1593
1607 $win 1594 $win
1608} 1595}
1609 1596
1597sub open_string_query {
1598 my ($title, $cb, $txt, $tooltip) = @_;
1599 my $dialog = new CFPlus::UI::Toplevel
1600 x => "center",
1601 y => "center",
1602 z => 50,
1603 force_w => $WIDTH * 4/5,
1604 title => $title;
1605
1606 $dialog->add (
1607 my $e = new CFPlus::UI::Entry
1608 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1609 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1610 tooltip => $tooltip
1611 );
1612
1613 $e->grab_focus;
1614 $e->set_text ($txt) if $txt;
1615 $dialog->show;
1616}
1617
1618sub open_quit_dialog {
1619 unless ($QUIT_DIALOG) {
1620 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1621 x => "center",
1622 y => "center",
1623 z => 50,
1624 title => "Really Quit?",
1625 on_key_down => sub {
1626 my ($dialog, $ev) = @_;
1627 $ev->{sym} == 27 and $dialog->hide;
1628 }
1629 ;
1630
1631 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1632
1633 $vb->add (new CFPlus::UI::Label
1634 text => "You should find a savebed and apply it first!",
1635 max_w => $WIDTH * 0.25,
1636 ellipsize => 0,
1637 );
1638 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1639 $hb->add (new CFPlus::UI::Button
1640 text => "Ok",
1641 expand => 1,
1642 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1643 );
1644 $hb->add (new CFPlus::UI::Button
1645 text => "Quit anyway",
1646 expand => 1,
1647 on_activate => sub { exit },
1648 );
1649 }
1650
1651 $QUIT_DIALOG->show;
1652 $QUIT_DIALOG->grab_focus;
1653}
1654
1655sub show_tip_of_the_day {
1656 # find all tips
1657 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1658
1659 CFPlus::DB::get state => "tip_of_the_day", sub {
1660 my ($todindex) = @_;
1661 $todindex = 0 if $todindex >= @tod;
1662 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1663
1664 # create dialog
1665 my $dialog;
1666
1667 my $close = sub {
1668 $dialog->destroy;
1669 };
1670
1671 $dialog = new CFPlus::UI::Toplevel
1672 x => "center",
1673 y => "center",
1674 z => 3,
1675 name => 'tip_of_the_day',
1676 force_w => int $WIDTH * 4/9,
1677 force_h => int $WIDTH * 2/9,
1678 title => "Tip of the day #" . (1 + $todindex),
1679 child => my $vbox = new CFPlus::UI::VBox,
1680 has_close_button => 1,
1681 on_delete => $close,
1682 ;
1683
1684 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1685 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1686 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1687
1688 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1689
1690 $table->add (0, 0, new CFPlus::UI::Button
1691 text => "Close",
1692 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>.",
1693 on_activate => $close,
1694 );
1695
1696 $table->add (2, 0, new CFPlus::UI::Button
1697 text => "Next",
1698 tooltip => "Show the next <b>Tip of the day</b>.",
1699 on_activate => sub {
1700 $close->();
1701 &show_tip_of_the_day;
1702 },
1703 );
1704
1705 $dialog->show;
1706 };
1707}
1708
1610sub sdl_init { 1709sub sdl_init {
1611 CFPlus::SDL_Init 1710 CFPlus::SDL_Init
1612 and die "SDL::Init failed!\n"; 1711 and die "SDL::Init failed!\n";
1613} 1712}
1614 1713
… …
1646 padding => 0, 1745 padding => 0,
1647 z => 100, 1746 z => 100,
1648 force_x => "max", 1747 force_x => "max",
1649 force_y => 0; 1748 force_y => 0;
1650 $DEBUG_STATUS->show; 1749 $DEBUG_STATUS->show;
1651
1652 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1653 1750
1654 $STATUSBOX = new CFPlus::UI::Statusbox; 1751 $STATUSBOX = new CFPlus::UI::Statusbox;
1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1752 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1656 1753
1657 (new CFPlus::UI::Frame 1754 (new CFPlus::UI::Frame
… …
1694 font => $FONT_FIXED, 1791 font => $FONT_FIXED,
1695 fontsize => $::CFG->{log_fontsize}, 1792 fontsize => $::CFG->{log_fontsize},
1696 indent => -4, 1793 indent => -4,
1697 can_hover => 1, 1794 can_hover => 1,
1698 can_events => 1, 1795 can_events => 1,
1796 max_par => $CFG->{logview_max_par},
1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1797 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1700 ; 1798 ;
1701 1799
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1800 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 1801 title => "Setup",
1704 name => "setup_dialog", 1802 name => "setup_dialog",
… …
1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1813 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1814 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717 1815
1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1816 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1719 "Configure the server to play on, your username, password and other server-related options."); 1817 "Configure the server to play on, your username, password and other server-related options.");
1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1818 $SETUP_NOTEBOOK->add (Client => client_setup,
1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1819 "Configure various client-specific settings.");
1722 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1820 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1723 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1821 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1724 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1822 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1725 "Configure the use of audio, sound effects and background music."); 1823 "Configure the use of audio, sound effects and background music.");
1726 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1824 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1758 ); 1856 );
1759 1857
1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1858 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1761 tooltip => "View Documentation"); 1859 tooltip => "View Documentation");
1762 1860
1861
1763 $BUTTONBAR->add (new CFPlus::UI::Button 1862 $BUTTONBAR->add (new CFPlus::UI::Button
1764 text => "Quit", 1863 text => "Quit",
1765 tooltip => "Terminates the program", 1864 tooltip => "Terminates the program",
1766 on_activate => sub { 1865 on_activate => sub {
1767 if ($CONN) { 1866 if ($CONN) {
… …
1778 } 1877 }
1779 1878
1780 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1879 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1781} 1880}
1782 1881
1882sub setup_build_button {
1883 my ($enabled) = @_;
1884 if ($enabled) {
1885 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1886 $BUILD_BUTTON ||= new CFPlus::UI::Button
1887 text => "Build",
1888 tooltip => "Opens the ingame builder",
1889 on_activate => sub {
1890 if ($CONN) {
1891 $CONN->send_ext_req (builder_player_items => sub {
1892 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1893 });
1894 }
1895 0
1896 };
1897 $BUTTONBAR->add ($BUILD_BUTTON);
1898 } else {
1899 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1900 }
1901}
1902
1903sub open_ingame_editor {
1904 my ($msg) = @_;
1905
1906 my $win = new CFPlus::UI::Toplevel
1907 x => 0,
1908 y => 'center',
1909 z => 4,
1910 name => 'builder_window',
1911 force_w => int $WIDTH * 1/4,
1912 force_h => int $HEIGHT * 3/4,
1913 title => "In game builder",
1914 has_close_button => 1;
1915
1916 my $r = new CFPlus::UI::ScrolledWindow (
1917 expand => 1,
1918 scroll_y => 1
1919 );
1920 $r->add (my $vb = new CFPlus::UI::VBox);
1921 $win->add ($r);
1922
1923
1924 $vb->add (
1925 new CFPlus::UI::Button
1926 text => "Disable build mode",
1927 on_activate => sub { $::IN_BUILD_MODE = undef }
1928 );
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "ERASE",
1932 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1933 );
1934
1935 for my $itemarchname (
1936 sort {
1937 $msg->{items}->{$a}->{build_arch_name}
1938 cmp $msg->{items}->{$b}->{build_arch_name}
1939 } keys %{$msg->{items}}
1940 ) {
1941 my $info = $msg->{items}->{$itemarchname};
1942 $vb->add (
1943 new CFPlus::UI::Button text => $info->{build_arch_name},
1944 on_activate => sub {
1945 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1946
1947 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1948 build_mode_query_arch_info ();
1949 }
1950 }
1951 );
1952 }
1953
1954 $win->show;
1955}
1956
1957sub build_mode_query_arch_info {
1958 my ($iteminfo) = $::IN_BUILD_MODE;
1959 my $itemarchname = $iteminfo->{item};
1960 my $info = $iteminfo->{info};
1961
1962 my $dialog = new CFPlus::UI::Toplevel
1963 x => "center",
1964 y => "center",
1965 z => 50,
1966 force_w => int $WIDTH * 1/2,
1967 title => "Enter information for placement of '$itemarchname'",
1968 has_close_button => 1;
1969
1970 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1971
1972 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1973 my $row = 0;
1974 if ($info->{has_name}) {
1975 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1976 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1977 }
1978 if ($info->{has_text}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1981 }
1982 if ($info->{has_connection}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1984 $table->add (1, $row++,
1985 new CFPlus::UI::Entry
1986 expand => 1,
1987 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1988 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1989 );
1990 }
1991
1992 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1993 $hb->add (new CFPlus::UI::Button
1994 text => "Close",
1995 expand => 1,
1996 on_activate => sub { $dialog->hide; 0 },
1997 );
1998 $dialog->show;
1999}
2000
1783sub video_shutdown { 2001sub video_shutdown {
1784 CFPlus::OpenGL::shutdown; 2002 CFPlus::OpenGL::shutdown;
1785 2003
1786 undef $SDL_ACTIVE; 2004 undef $SDL_ACTIVE;
1787} 2005}
… …
1818 CFPlus::Mix_AllocateChannels 8; 2036 CFPlus::Mix_AllocateChannels 8;
1819 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2037 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1820 2038
1821 audio_music_finished; 2039 audio_music_finished;
1822 2040
2041 local $_;
1823 while (<$fh>) { 2042 while (<$fh>) {
1824 next if /^\s*#/; 2043 next if /^\s*#/;
1825 next if /^\s*$/; 2044 next if /^\s*$/;
1826 2045
1827 my ($file, $volume, $event) = split /\s+/, $_, 3; 2046 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1904 if $CONN; 2123 if $CONN;
1905}); 2124});
1906 2125
1907%SDL_CB = ( 2126%SDL_CB = (
1908 CFPlus::SDL_QUIT => sub { 2127 CFPlus::SDL_QUIT => sub {
1909 Event::unloop -1; 2128 exit;
1910 }, 2129 },
1911 CFPlus::SDL_VIDEORESIZE => sub { 2130 CFPlus::SDL_VIDEORESIZE => sub {
1912 }, 2131 },
1913 CFPlus::SDL_VIDEOEXPOSE => sub { 2132 CFPlus::SDL_VIDEOEXPOSE => sub {
1914 CFPlus::UI::full_refresh; 2133 CFPlus::UI::full_refresh;
1915 }, 2134 },
1916 CFPlus::SDL_ACTIVEEVENT => sub { 2135 CFPlus::SDL_ACTIVEEVENT => sub {
1917# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2136# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2138# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2139# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2140# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1918 }, 2141 },
1919 CFPlus::SDL_KEYDOWN => sub { 2142 CFPlus::SDL_KEYDOWN => sub {
1920 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2143 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1921 # alt-enter 2144 # alt-enter
1922 $FULLSCREEN_ENABLE->toggle; 2145 $FULLSCREEN_ENABLE->toggle;
… …
1943 2166
1944$SIG{INT} = $SIG{TERM} = sub { exit }; 2167$SIG{INT} = $SIG{TERM} = sub { exit };
1945 2168
1946{ 2169{
1947 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2170 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2171 CFPlus::DB::Server::run;
2172
1948 CFPlus::UI::set_layout ($::CFG->{layout}); 2173 CFPlus::UI::set_layout ($::CFG->{layout});
1949 2174
1950 my %DEF_CFG = ( 2175 my %DEF_CFG = (
1951 sdl_mode => 0, 2176 sdl_mode => 0,
1952 width => 640, 2177 width => 640,
1953 height => 480, 2178 height => 480,
1954 fullscreen => 0, 2179 fullscreen => 0,
1955 fast => 0, 2180 fast => 0,
1956 map_scale => 1, 2181 map_scale => 1,
1957 fow_enable => 1, 2182 fow_enable => 1,
1958 fow_intensity => 0.45, 2183 fow_intensity => 0.45,
1959 fow_smooth => 0, 2184 fow_smooth => 0,
2185 map_smoothing => 1,
1960 gui_fontsize => 1, 2186 gui_fontsize => 1,
1961 log_fontsize => 0.7, 2187 log_fontsize => 0.7,
1962 gauge_fontsize => 1, 2188 gauge_fontsize => 1,
1963 gauge_size => 0.35, 2189 gauge_size => 0.35,
1964 stat_fontsize => 0.7, 2190 stat_fontsize => 0.7,
1965 mapsize => 100, 2191 mapsize => 100,
1966 say_command => 'say', 2192 say_command => 'chat',
1967 audio_enable => 1, 2193 audio_enable => 1,
1968 bgm_enable => 1, 2194 bgm_enable => 1,
1969 bgm_volume => 0.25, 2195 bgm_volume => 0.25,
1970 face_prefetch => 0, 2196 face_prefetch => 0,
1971 output_sync => 1, 2197 output_sync => 1,
1972 output_count => 1, 2198 output_count => 1,
2199 output_rate => "",
1973 pickup => 0, 2200 pickup => 0,
1974 inv_sort => "mtime", 2201 inv_sort => "mtime",
1975 default => "profile", # default profile 2202 default => "profile", # default profile
2203 show_tips => 1,
2204 logview_max_par => 1000,
1976 ); 2205 );
1977 2206
1978 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
1979 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
1980 } 2209 }
1981 2210
1982 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2211 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2212 $PROFILE = $CFG->{profile}{default};
2213
2214 # convert old bindings (only default profile matters)
2215 if (my $bindings = delete $PROFILE->{bindings}) {
2216 while (my ($mod, $syms) = each %$bindings) {
2217 while (my ($sym, $cmds) = each %$syms) {
2218 push @{ $PROFILE->{macro} }, {
2219 accelkey => [$mod*1, $sym*1],
2220 action => $cmds,
2221 };
2222 }
2223 }
2224 }
1983 2225
1984 sdl_init; 2226 sdl_init;
1985 2227
1986 @SDL_MODES = reverse 2228 @SDL_MODES = reverse
1987 grep $_->[0] >= 640 && $_->[1] >= 480, 2229 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2024# } 2266# }
2025# my $t2 = Time::HiRes::time; 2267# my $t2 = Time::HiRes::time;
2026# warn $t2-$t1; 2268# warn $t2-$t1;
2027# } 2269# }
2028 2270
2271 $startup_done->();
2272
2029 video_init; 2273 video_init;
2030 audio_init; 2274 audio_init;
2031} 2275}
2276
2277show_tip_of_the_day if $CFG->{show_tips};
2032 2278
2033Event::loop; 2279Event::loop;
2034#CFPlus::SDL_Quit; 2280#CFPlus::SDL_Quit;
2035#CFPlus::_exit 0; 2281#CFPlus::_exit 0;
2036 2282
2283END {
2037END { CFPlus::SDL_Quit } 2284 CFPlus::SDL_Quit;
2285 CFPlus::DB::Server::stop;
2286}
2038 2287
2039=head1 NAME 2288=head1 NAME
2040 2289
2041cfplus - A Crossfire+ and Crossfire game client 2290cfplus - A Crossfire+ and Crossfire game client
2042 2291

Diff Legend

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