ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.161 by root, Thu Jul 5 06:57:03 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
41use CFPlus::Pod; 89use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
44 92
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
47 95
48$Event::Eval = 0; 96$Event::Eval = 1;
49$Event::DIED = sub { 97$Event::DIED = sub {
50 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 99};
55 100
56my $MAX_FPS = 60; 101my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
58 103
59our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 105
61our $LAST_REFRESH; 106our $LAST_REFRESH;
62our $NOW; 107our $NOW;
63 108
64our $CFG; 109our $CFG;
… …
102 147
103our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
104our $STATS_PAGE; 149our $STATS_PAGE;
105our $SKILL_PAGE; 150our $SKILL_PAGE;
106our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
107 153
108our $HELP_WINDOW; 154our $HELP_WINDOW;
109our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
110our $FLOORBOX; 156our $FLOORBOX;
111our $GAUGES; 157our $GAUGES;
… …
124 170
125our $INV; 171our $INV;
126our $INVR; 172our $INVR;
127our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
128 174
129our $BIND_EDITOR;
130our $BIND_UPD_CB;
131
132our $PICKUP_CFG; 175our $PICKUP_CFG;
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
133 179
134sub status { 180sub status {
135 $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]);
136} 182}
137 183
138sub debug { 184sub debug {
139 $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;
140} 197}
141 198
142sub destroy_query_dialog { 199sub destroy_query_dialog {
143 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
144 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
145} 202}
146 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
147# server query dialog 207# server query dialog
148sub server_query { 208sub server_query {
149 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 }
150 225
151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
152 x => "center", 227 x => "center",
153 y => "center", 228 y => "center",
154 title => "Server Query", 229 title => "Server Query",
155 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
156 ; 231 ;
157 232
158 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
159 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
160 ellipsise => 0, 235 ellipsise => 0,
161 text => $prompt; 236 text => $prompt;
162 237
163 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
164 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
181 ); 256 );
182 257
183 $dialog->grab_focus; 258 $dialog->grab_focus;
184 259
185 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } elsif ($flags & CS_QUERY_SINGLECHAR) {
186 $dialog->{tooltip} = "#charcreation_focus";
187
188 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
189 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
190 263
191 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
192 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
193 ellipsise => 0, 266 ellipsise => 0,
194 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
195 268
196 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
197 270
… …
209 $conn->send ("reply d"); 282 $conn->send ("reply d");
210 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
211 0 284 0
212 }, 285 },
213 ); 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 }
214 310
215 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
216 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
217 ellipsise => 0, 313 ellipsise => 0,
218 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
343 status "logging in..."; 439 status "logging in...";
344 440
345 $LOGIN_BUTTON->set_text ("Logout"); 441 $LOGIN_BUTTON->set_text ("Logout");
346 $SETUP_DIALOG->hide; 442 $SETUP_DIALOG->hide;
347 443
348 $PROFILE = $CFG->{profile}{default};
349
350 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;
351 445
352 my ($host, $port) = split /:/, $PROFILE->{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
353 447
354 $MAP = new CFPlus::Map $mapsize, $mapsize; 448 $MAP = new CFPlus::Map;
355 449
450 warn "connecting...\n";#d#
356 $CONN = eval { 451 $CONN = eval {
357 new CFPlus::Protocol 452 new CFPlus::Protocol
358 host => $host, 453 host => $host,
359 port => $port || 13327, 454 port => $port || 13327,
360 user => $PROFILE->{user}, 455 user => $PROFILE->{user},
… …
369 statusbox => $STATUSBOX, 464 statusbox => $STATUSBOX,
370 map => $MAP, 465 map => $MAP,
371 mapmap => $MAPMAP, 466 mapmap => $MAPMAP,
372 query => \&server_query, 467 query => \&server_query,
373 468
469 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1,
471 },
472
374 sound_play => sub { 473 sound_play => sub {
375 my ($x, $y, $soundnum, $type) = @_; 474 my ($x, $y, $soundnum, $type) = @_;
376 475
377 $SDL_MIXER 476 $SDL_MIXER
378 or return; 477 or return;
… …
381 or return; 480 or return;
382 481
383 $chunk->play; 482 $chunk->play;
384 }, 483 },
385 }; 484 };
485 warn "connected<$CONN,$@>\n";#d#
386 486
387 if ($CONN) { 487 if ($CONN) {
388 CFPlus::lowdelay fileno $CONN->{fh}; 488 CFPlus::lowdelay fileno $CONN->{fh};
389 489
390 status "login successful"; 490 status "login successful";
… …
397sub stop_game { 497sub stop_game {
398 $LOGIN_BUTTON->set_text ("Login"); 498 $LOGIN_BUTTON->set_text ("Login");
399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 499 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
400 $SETUP_DIALOG->show; 500 $SETUP_DIALOG->show;
401 $PL_WINDOW->hide; 501 $PL_WINDOW->hide;
402 $SPELL_PAGE->clear_spells; 502 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
403 504
404 return unless $CONN; 505 return unless $CONN;
405 506
406 status "connection closed"; 507 status "connection closed";
407 508
… …
415sub graphics_setup { 516sub graphics_setup {
416 my $vbox = new CFPlus::UI::VBox; 517 my $vbox = new CFPlus::UI::VBox;
417 518
418 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 519 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
419 520
521 my $row = 0;
522
523 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
524 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
525 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527
420 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 528 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
421 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
422 530
423 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 531 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
424 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 532 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
425 533
426 $mode_slider->connect (changed => sub { 534 $mode_slider->connect (changed => sub {
… …
428 536
429 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
430 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
431 }); 539 });
432 $mode_slider->emit (changed => $mode_slider->{range}[0]); 540 $mode_slider->emit (changed => $mode_slider->{range}[0]);
433
434 my $row = 1;
435 541
436 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 542 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
437 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
438 state => $CFG->{fullscreen}, 544 state => $CFG->{fullscreen},
439 tooltip => "Bring the client into fullscreen mode.", 545 tooltip => "Bring the client into fullscreen mode.",
… …
445 state => $CFG->{fast}, 551 state => $CFG->{fast},
446 tooltip => "Lower the visual quality considerably to speed up rendering.", 552 tooltip => "Lower the visual quality considerably to speed up rendering.",
447 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
448 ); 554 );
449 555
556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
557 $table->add (1, $row++, new CFPlus::UI::Slider
558 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
559 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
560 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
561 );
562
563 $table->add (1, $row++, new CFPlus::UI::Button
564 expand => 1, align => 0, text => "Apply",
565 tooltip => "Apply the video settings above.",
566 on_activate => sub {
567 video_shutdown ();
568 video_init ();
569 0
570 }
571 );
572
450 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 573 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
451 $table->add (1, $row++, new CFPlus::UI::Slider 574 $table->add (1, $row++, new CFPlus::UI::Slider
452 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
453 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
454 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
578 );
579
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing},
583 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
584 . "This increases load on the graphics subsystem and works only with 2.x servers. "
585 . "Changes take effect at next connection only.",
586 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
455 ); 587 );
456 588
457 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 589 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
458 $table->add (1, $row++, new CFPlus::UI::CheckBox 590 $table->add (1, $row++, new CFPlus::UI::CheckBox
459 state => $CFG->{fow_enable}, 591 state => $CFG->{fow_enable},
… …
478 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
479 0 611 0
480 } 612 }
481 ); 613 );
482 614
483 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
484 $table->add (1, $row++, new CFPlus::UI::Slider
485 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
486 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
487 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
488 );
489
490 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 615 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
491 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add (1, $row++, new CFPlus::UI::Slider
492 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
493 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 618 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
494 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
510 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
511 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 636 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
512 on_changed => sub { 637 on_changed => sub {
513 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
514 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
515 0
516 }
517 );
518
519 $table->add (1, $row++, new CFPlus::UI::Button
520 expand => 1, align => 0, text => "Apply",
521 tooltip => "Apply the video settings",
522 on_activate => sub {
523 video_shutdown ();
524 video_init ();
525 0 640 0
526 } 641 }
527 ); 642 );
528 643
529 $vbox 644 $vbox
… …
634 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 749 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 750 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
636 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 751 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
637 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 752 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
638 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 753 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
754 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
639 755
640 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
641 757
642 for my $x (0..2) { 758 for my $x (0..2) {
643 for my $y (0 .. 2) { 759 for my $y (0 .. 2) {
… …
647 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 763 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
648 ); 764 );
649 } 765 }
650 } 766 }
651 767
768 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
652 769
653 $table 770 $table
654} 771}
655 772
656sub stats_window { 773sub stats_window {
… …
825 942
826 my $table = $METASERVER->{table}; 943 my $table = $METASERVER->{table};
827 $table->clear; 944 $table->clear;
828 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 945 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
829 946
830 my $buf; 947 my $ok = 0;
831 948
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 949 CFPlus::background {
950 my $ua = CFPlus::lwp_useragent;
833 951
834 unless ($fh) { 952 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 953 } sub {
836 return; 954 my ($msg) = @_;
837 } 955 if ($msg) {
838
839 Event->io (fd => $fh, poll => 'r', cb => sub {
840 my $res = sysread $fh, $buf, 8192, length $buf;
841
842 if (!defined $res) {
843 $_[0]->w->cancel;
844 $label->set_text ("error while retrieving server list: $!");
845 } elsif ($res == 0) {
846 $_[0]->w->cancel;
847 status "server list retrieved";
848
849 utf8::decode $buf if utf8::valid $buf;
850
851 $table->clear; 956 $table->clear;
852 957
853 my @tip = ( 958 my @tip = (
854 "The current number of users logged in on the server.", 959 "The current number of users logged in on the server.",
855 "The hostname of the server.", 960 "The hostname of the server.",
… …
865 for 0 .. $#col; 970 for 0 .. $#col;
866 971
867 my @align = qw(1 0 1 1 -1); 972 my @align = qw(1 0 1 1 -1);
868 973
869 my $y = 0; 974 my $y = 0;
870 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 975 for my $m (@{ $msg->{servers} }) {
871 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 976 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
977 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
872 978
873 for ($desc) { 979 for ($desc) {
874 s/<br>/\n/gi; 980 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 981 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 982 s/<.*?>//sgi;
877 s/&/&amp;/g; 983 s/&amp;/&/g;
878 s/</&lt;/g; 984 s/&lt;/</g;
879 s/>/&gt;/g; 985 s/&gt;/>/g;
880 } 986 }
881 987
882 $uptime = sprintf "%dd %02d:%02d:%02d", 988 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 989 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 990 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 991 (int $uptime / 60) % 60,
886 $m->[8] % 60; 992 $uptime % 60;
887 993
888 $m = [$users, $host, $uptime, $version, $desc]; 994 $m = [$users, $host, $uptime, $version, $desc];
889 995
890 $y++; 996 $y++;
891 997
… …
901 ), 1007 ),
902 (new CFPlus::UI::Empty expand => 1), 1008 (new CFPlus::UI::Empty expand => 1),
903 ]); 1009 ]);
904 1010
905 $table->add ($_, $y, new CFPlus::UI::Label 1011 $table->add ($_, $y, new CFPlus::UI::Label
1012 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 1013 ellipsise => 0,
907 align => $align[$_], 1014 align => $align[$_],
908 text => $m->[$_], 1015 text => $m->[$_],
909 tooltip => $tip[$_], 1016 tooltip => $tip[$_],
1017 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 1018 can_hover => 1,
911 can_events => 1, 1019 can_events => 1,
912 fontsize => 0.8) 1020 fontsize => 0.8)
913 for 0 .. $#$m; 1021 for 0 .. $#$m;
914 } 1022 }
1023 } else {
1024 $ok or $label->set_text ("error while contacting metaserver");
915 } 1025 }
916 }); 1026 };
1027
917} 1028}
918 1029
919sub metaserver_dialog { 1030sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 1031 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 1032 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 1036 title => "Server List",
926 name => 'metaserver_dialog', 1037 name => 'metaserver_dialog',
927 x => 'center', 1038 x => 'center',
928 y => 'center', 1039 y => 'center',
929 z => 3, 1040 z => 3,
1041 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 1042 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 1043 child => $vbox,
932 has_close_button => 1, 1044 has_close_button => 1,
933 table => $table, 1045 table => $table,
934 on_visibility_change => sub { 1046 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 1047 update_metaserver ($_[0]) if $_[1];
… …
1011 . "so only set it if you really need to prefetch images. " 1123 . "so only set it if you really need to prefetch images. "
1012 . "This option can be set and unset any time.", 1124 . "This option can be set and unset any time.",
1013 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1014 ); 1126 );
1015 1127
1016 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1128 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1017 $table->add (1, 9, new CFPlus::UI::Entry 1129 $table->add (1, 9, new CFPlus::UI::Entry
1130 text => $CFG->{output_rate},
1131 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1132 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1133 . "default will be used, which is usually around 100kb/s.",
1134 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1135 );
1136
1137 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1138 $table->add (1, 10, new CFPlus::UI::Entry
1018 text => $CFG->{output_count}, 1139 text => $CFG->{output_count},
1019 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1140 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1020 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1021 ); 1142 );
1022 1143
1023 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1144 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1024 $table->add (1, 10, new CFPlus::UI::Entry 1145 $table->add (1, 11, new CFPlus::UI::Entry
1025 text => $CFG->{output_sync}, 1146 text => $CFG->{output_sync},
1026 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1147 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1027 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1028 ); 1149 );
1029 1150
1030 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1031 expand => 1, 1152 expand => 1,
1032 align => 0, 1153 align => 0,
1033 text => "Login", 1154 text => "Login",
1034 on_activate => sub { 1155 on_activate => sub {
1035 $CONN ? stop_game 1156 $CONN ? stop_game
1036 : start_game; 1157 : start_game;
1037 0 1158 0
1038 }, 1159 },
1039 ); 1160 );
1040 1161
1162 $vbox->add (new CFPlus::UI::FancyFrame
1163 label => "Server Info",
1164 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1165 );
1166
1167 $vbox
1168}
1169
1170sub client_setup {
1171 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1172
1173 my $row = 0;
1174
1041 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1042 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1043 text => $CFG->{say_command}, 1177 text => $CFG->{say_command},
1044 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1178 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1045 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1179 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1046 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1180 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1047 on_changed => sub { 1181 on_changed => sub {
1048 my ($self, $value) = @_; 1182 my ($self, $value) = @_;
1049 $CFG->{say_command} = $value; 1183 $CFG->{say_command} = $value;
1050 0 1184 0
1051 } 1185 }
1052 ); 1186 );
1053 1187
1054 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1188 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1055 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1189 $table->add (1, $row++, new CFPlus::UI::CheckBox
1056 state => $CFG->{show_tips}, 1190 state => $CFG->{show_tips},
1057 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1191 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1058 on_changed => sub { 1192 on_changed => sub {
1059 my ($self, $value) = @_; 1193 my ($self, $value) = @_;
1060 $CFG->{show_tips} = $value; 1194 $CFG->{show_tips} = $value;
1061 0 1195 0
1062 } 1196 }
1063 ); 1197 );
1064 1198
1065 $vbox->add (new CFPlus::UI::FancyFrame 1199 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1066 label => "Server Info", 1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1067 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1201 text => $CFG->{logview_max_par},
1202 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1203 . "sends more messages than this number, older messages get removed to save memory and "
1204 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1205 on_changed => sub {
1206 my ($self, $value) = @_;
1207 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1208 0
1209 },
1068 ); 1210 );
1069 1211
1070 $vbox 1212 $table
1071} 1213}
1072 1214
1073sub message_window { 1215sub message_window {
1074 my $window = new CFPlus::UI::Toplevel 1216 my $window = new CFPlus::UI::Toplevel
1075 name => "message_window", 1217 name => "message_window",
… …
1156 ["Boots" => PICKUP_BOOTS], 1298 ["Boots" => PICKUP_BOOTS],
1157 ["Gloves" => PICKUP_GLOVES], 1299 ["Gloves" => PICKUP_GLOVES],
1158 ["Cloaks" => PICKUP_CLOAK], 1300 ["Cloaks" => PICKUP_CLOAK],
1159 ], 1301 ],
1160 1302
1161 ["Readables", 2, 2, 1303 ["Readables", 2, 0,
1162 ["Spellbooks" => PICKUP_SPELLBOOK], 1304 ["Spellbooks" => PICKUP_SPELLBOOK],
1163 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1305 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1164 ["Normal Books/Scrolls" => PICKUP_READABLES], 1306 ["Normal Books/Scrolls" => PICKUP_READABLES],
1165 ], 1307 ],
1166 ["Misc", 2, 7, 1308 ["Misc", 2, 5,
1167 ["Food" => PICKUP_FOOD], 1309 ["Food" => PICKUP_FOOD],
1168 ["Drinks" => PICKUP_DRINK], 1310 ["Drinks" => PICKUP_DRINK],
1169 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1311 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1170 ["Keys" => PICKUP_KEY], 1312 ["Keys" => PICKUP_KEY],
1171 ["Magical Items" => PICKUP_MAGICAL], 1313 ["Magical Items" => PICKUP_MAGICAL],
1172 ["Potions" => PICKUP_POTION], 1314 ["Potions" => PICKUP_POTION],
1173 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1315 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1174 ["Ignore cursed" => PICKUP_NOT_CURSED], 1316 ["Ignore cursed" => PICKUP_NOT_CURSED],
1175 ["Jewelery" => PICKUP_JEWELS], 1317 ["Jewelery" => PICKUP_JEWELS],
1318 ["Flesh" => PICKUP_FLESH],
1176 ], 1319 ],
1177 ["Weight/Value ratio", 2, 17] 1320 ["Weight/Value ratio", 2, 17]
1178 ) 1321 )
1179 { 1322 {
1180 my ($title, $x, $y, @bits) = @$_; 1323 my ($title, $x, $y, @bits) = @$_;
… …
1230 $table 1373 $table
1231} 1374}
1232 1375
1233my %SORT_ORDER = ( 1376my %SORT_ORDER = (
1234 type => undef, 1377 type => undef,
1235 mtime => sub { sort { 1378 mtime => sub {
1379 my $NOW = time;
1380 sort {
1381 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1382 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1383
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1384 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1385 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1386 or $a->{type} <=> $b->{type}
1387 } @_
1239 } @_ }, 1388 },
1240 weight => sub { sort { 1389 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1390 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1391 or $a->{type} <=> $b->{type}
1243 } @_ }, 1392 } @_ },
1244); 1393);
… …
1269 #TODO# update to weigh/maxweight 1418 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1419 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1420
1272 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1421 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory); 1422 $sw1->add ($INV = new CFPlus::UI::Inventory);
1423 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1274 1424
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1425 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1426
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1427 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1428
… …
1307 has_close_button => 1 1457 has_close_button => 1
1308 ; 1458 ;
1309 1459
1310 my $ntb = 1460 my $ntb =
1311 $PL_NOTEBOOK = 1461 $PL_NOTEBOOK =
1312 new CFPlus::UI::Notebook expand => 1, debug => 1; 1462 new CFPlus::UI::Notebook expand => 1;
1313 1463
1314 $ntb->add ( 1464 $ntb->add (
1315 "Statistics (F2)" => $STATS_PAGE = stats_window, 1465 "Statistics (F2)" => $STATS_PAGE = stats_window,
1316 "Shows statistics, where all your Stats and Resistances are shown." 1466 "Shows statistics, where all your Stats and Resistances are shown."
1317 ); 1467 );
1318 $ntb->add ( 1468 $ntb->add (
1319 "Skills (F3)" => $SKILL_PAGE = skill_window, 1469 "Skills (F3)" => $SKILL_PAGE = skill_window,
1320 "Shows all your Skills." 1470 "Shows all your Skills."
1321 ); 1471 );
1322 1472
1323 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1473 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1474 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1325 $ntb->add ( 1475 $ntb->add (
1326 "Spellbook (F4)" => $spellsw, 1476 "Spellbook (F4)" => $spellsw,
1327 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1477 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1328 ); 1478 );
1329 $ntb->add ( 1479 $ntb->add (
1330 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1331 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1481 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1332 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1482 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1333 ); 1483 );
1484 $ntb->add (Pickup => autopickup_setup,
1485 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1334 1486
1335 $ntb->set_current_page ($INVENTORY_PAGE); 1487 $ntb->set_current_page ($INVENTORY_PAGE);
1336 1488
1337 $plwin->add ($ntb); 1489 $plwin->add ($ntb);
1338 $plwin 1490 $plwin
1339} 1491}
1340 1492
1341sub update_bindings {
1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1343}
1344
1345sub keyboard_setup { 1493sub keyboard_setup {
1346 my $binding_list = new CFPlus::UI::VBox; 1494 CFPlus::Macro::keyboard_setup
1347
1348 my $refresh;
1349 $refresh = $BIND_UPD_CB = sub {
1350 $binding_list->clear ();
1351
1352 return unless $PROFILE;
1353
1354 for my $mod (keys %{$PROFILE->{bindings}}) {
1355 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1356 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1357 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1358
1359 my $lbl = join "; ", @$cmds;
1360 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1361 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1362 $hb->add (new CFPlus::UI::Button
1363 text => "delete",
1364 tooltip => "Deletes the binding",
1365 on_activate => sub {
1366 $binding_list->remove ($hb);
1367 delete $PROFILE->{bindings}{$mod}{$sym};
1368 0
1369 });
1370
1371 $hb->add (new CFPlus::UI::Button
1372 text => "edit",
1373 tooltip => "Edits the binding",
1374 on_activate => sub {
1375 $::BIND_EDITOR->set_binding (
1376 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1377 sub {
1378 my ($nmod, $nsym, $ncmds) = @_;
1379 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1380 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1381 $refresh->();
1382 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1383 $SETUP_DIALOG->show;
1384 },
1385 sub {
1386 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1387 $SETUP_DIALOG->show;
1388 });
1389 $::BIND_EDITOR->show;
1390 $SETUP_DIALOG->hide;
1391 0
1392 });
1393
1394 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1395 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1396 }
1397 }
1398 };
1399
1400 my $vb = new CFPlus::UI::VBox;
1401 $vb->add (new CFPlus::UI::FancyFrame
1402 label => "Options",
1403 child => (my $hb = new CFPlus::UI::HBox),
1404 );
1405 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1406 $hb->add (new CFPlus::UI::CheckBox
1407 expand => 1,
1408 state => $CFG->{shift_fire_stop},
1409 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1410 on_changed => sub {
1411 my ($cbox, $value) = @_;
1412 $CFG->{shift_fire_stop} = $value;
1413 0
1414 });
1415
1416 $vb->add (new CFPlus::UI::FancyFrame
1417 label => "Bindings",
1418 child => $binding_list);
1419 $vb->add (my $hb = new CFPlus::UI::HBox);
1420
1421 $hb->add (new CFPlus::UI::Button
1422 text => "record new",
1423 expand => 1,
1424 tooltip => "This button opens the binding editor with an empty binding.",
1425 on_activate => sub {
1426 $::BIND_EDITOR->set_binding (undef, undef, [],
1427 sub {
1428 my ($mod, $sym, $cmds) = @_;
1429 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1430 $refresh->();
1431 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1432 $SETUP_DIALOG->show;
1433 },
1434 sub {
1435 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1436 $SETUP_DIALOG->show;
1437 },
1438 );
1439 $SETUP_DIALOG->hide;
1440 $::BIND_EDITOR->show;
1441 0
1442 },
1443 );
1444
1445 $hb->add (new CFPlus::UI::Button
1446 text => "close",
1447 tooltip => "Closes the binding window",
1448 expand => 1,
1449 on_activate => sub {
1450 $SETUP_DIALOG->hide;
1451 0
1452 }
1453 );
1454
1455 $refresh->();
1456
1457 $vb
1458} 1495}
1459 1496
1460sub help_window { 1497sub help_window {
1461 my $win = new CFPlus::UI::Toplevel 1498 my $win = new CFPlus::UI::Toplevel
1462 x => 'center', 1499 x => 'center',
… …
1619 1656
1620sub show_tip_of_the_day { 1657sub show_tip_of_the_day {
1621 # find all tips 1658 # find all tips
1622 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1659 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1623 1660
1624 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1661 CFPlus::DB::get state => "tip_of_the_day", sub {
1662 my ($todindex) = @_;
1625 $todindex = 0 if $todindex >= @tod; 1663 $todindex = 0 if $todindex >= @tod;
1626 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1664 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1627 1665
1628 # create dialog 1666 # create dialog
1629 my $dialog; 1667 my $dialog;
1630 1668
1631 my $close = sub { 1669 my $close = sub {
1632 $dialog->destroy; 1670 $dialog->destroy;
1671 };
1672
1673 $dialog = new CFPlus::UI::Toplevel
1674 x => "center",
1675 y => "center",
1676 z => 3,
1677 name => 'tip_of_the_day',
1678 force_w => int $WIDTH * 4/9,
1679 force_h => int $WIDTH * 2/9,
1680 title => "Tip of the day #" . (1 + $todindex),
1681 child => my $vbox = new CFPlus::UI::VBox,
1682 has_close_button => 1,
1683 on_delete => $close,
1684 ;
1685
1686 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1688 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1689
1690 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1691
1692 $table->add (0, 0, new CFPlus::UI::Button
1693 text => "Close",
1694 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>.",
1695 on_activate => $close,
1696 );
1697
1698 $table->add (2, 0, new CFPlus::UI::Button
1699 text => "Next",
1700 tooltip => "Show the next <b>Tip of the day</b>.",
1701 on_activate => sub {
1702 $close->();
1703 &show_tip_of_the_day;
1704 },
1705 );
1706
1707 $dialog->show;
1633 }; 1708 };
1634
1635 $dialog = new CFPlus::UI::Toplevel
1636 x => "center",
1637 y => "center",
1638 z => 3,
1639 name => 'tip_of_the_day',
1640 force_w => int $WIDTH * 4/9,
1641 force_h => int $WIDTH * 2/9,
1642 title => "Tip of the day #" . (1 + $todindex),
1643 child => my $vbox = new CFPlus::UI::VBox,
1644 has_close_button => 1,
1645 on_delete => $close,
1646 ;
1647
1648 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1649 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1650 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1651
1652 $vbox->add (my $table = new CFPlus::UI::Table);
1653
1654 $table->add (0, 0, new CFPlus::UI::Button
1655 text => "Close",
1656 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1657 on_activate => $close,
1658 );
1659
1660 $table->add (2, 0, new CFPlus::UI::Button
1661 text => "Next",
1662 tooltip => "Show the next <b>Tip of the day</b>.",
1663 on_activate => sub {
1664 $close->();
1665 &show_tip_of_the_day;
1666 },
1667 );
1668
1669 $dialog->show;
1670} 1709}
1671 1710
1672sub sdl_init { 1711sub sdl_init {
1673 CFPlus::SDL_Init 1712 CFPlus::SDL_Init
1674 and die "SDL::Init failed!\n"; 1713 and die "SDL::Init failed!\n";
… …
1708 padding => 0, 1747 padding => 0,
1709 z => 100, 1748 z => 100,
1710 force_x => "max", 1749 force_x => "max",
1711 force_y => 0; 1750 force_y => 0;
1712 $DEBUG_STATUS->show; 1751 $DEBUG_STATUS->show;
1713
1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1715 1752
1716 $STATUSBOX = new CFPlus::UI::Statusbox; 1753 $STATUSBOX = new CFPlus::UI::Statusbox;
1717 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1754 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1718 1755
1719 (new CFPlus::UI::Frame 1756 (new CFPlus::UI::Frame
… …
1756 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1757 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1758 indent => -4, 1795 indent => -4,
1759 can_hover => 1, 1796 can_hover => 1,
1760 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1761 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1762 ; 1800 ;
1763 1801
1764 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1765 title => "Setup", 1803 title => "Setup",
1766 name => "setup_dialog", 1804 name => "setup_dialog",
… …
1777 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1778 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1779 1817
1780 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1781 "Configure the server to play on, your username, password and other server-related options."); 1819 "Configure the server to play on, your username, password and other server-related options.");
1782 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1820 $SETUP_NOTEBOOK->add (Client => client_setup,
1783 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1821 "Configure various client-specific settings.");
1784 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1785 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1823 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1786 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1787 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1788 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1820 ); 1858 );
1821 1859
1822 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1860 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1823 tooltip => "View Documentation"); 1861 tooltip => "View Documentation");
1824 1862
1863
1825 $BUTTONBAR->add (new CFPlus::UI::Button 1864 $BUTTONBAR->add (new CFPlus::UI::Button
1826 text => "Quit", 1865 text => "Quit",
1827 tooltip => "Terminates the program", 1866 tooltip => "Terminates the program",
1828 on_activate => sub { 1867 on_activate => sub {
1829 if ($CONN) { 1868 if ($CONN) {
… …
1840 } 1879 }
1841 1880
1842 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1881 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1843} 1882}
1844 1883
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001}
2002
1845sub video_shutdown { 2003sub video_shutdown {
1846 CFPlus::OpenGL::shutdown; 2004 CFPlus::OpenGL::shutdown;
1847 2005
1848 undef $SDL_ACTIVE; 2006 undef $SDL_ACTIVE;
1849} 2007}
… …
1880 CFPlus::Mix_AllocateChannels 8; 2038 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2039 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 2040
1883 audio_music_finished; 2041 audio_music_finished;
1884 2042
2043 local $_;
1885 while (<$fh>) { 2044 while (<$fh>) {
1886 next if /^\s*#/; 2045 next if /^\s*#/;
1887 next if /^\s*$/; 2046 next if /^\s*$/;
1888 2047
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 2048 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1966 if $CONN; 2125 if $CONN;
1967}); 2126});
1968 2127
1969%SDL_CB = ( 2128%SDL_CB = (
1970 CFPlus::SDL_QUIT => sub { 2129 CFPlus::SDL_QUIT => sub {
1971 Event::unloop -1; 2130 exit;
1972 }, 2131 },
1973 CFPlus::SDL_VIDEORESIZE => sub { 2132 CFPlus::SDL_VIDEORESIZE => sub {
1974 }, 2133 },
1975 CFPlus::SDL_VIDEOEXPOSE => sub { 2134 CFPlus::SDL_VIDEOEXPOSE => sub {
1976 CFPlus::UI::full_refresh; 2135 CFPlus::UI::full_refresh;
1977 }, 2136 },
1978 CFPlus::SDL_ACTIVEEVENT => sub { 2137 CFPlus::SDL_ACTIVEEVENT => sub {
1979# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2138# not useful, as APPACTIVE include sonly iconified state, not unmapped
2139# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1980 }, 2143 },
1981 CFPlus::SDL_KEYDOWN => sub { 2144 CFPlus::SDL_KEYDOWN => sub {
1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2145 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1983 # alt-enter 2146 # alt-enter
1984 $FULLSCREEN_ENABLE->toggle; 2147 $FULLSCREEN_ENABLE->toggle;
… …
2005 2168
2006$SIG{INT} = $SIG{TERM} = sub { exit }; 2169$SIG{INT} = $SIG{TERM} = sub { exit };
2007 2170
2008{ 2171{
2009 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2172 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2173 CFPlus::DB::Server::run;
2174
2010 CFPlus::UI::set_layout ($::CFG->{layout}); 2175 CFPlus::UI::set_layout ($::CFG->{layout});
2011 2176
2012 my %DEF_CFG = ( 2177 my %DEF_CFG = (
2013 sdl_mode => 0, 2178 sdl_mode => 0,
2014 width => 640, 2179 width => 640,
2015 height => 480, 2180 height => 480,
2016 fullscreen => 0, 2181 fullscreen => 0,
2017 fast => 0, 2182 fast => 0,
2018 map_scale => 1, 2183 map_scale => 1,
2019 fow_enable => 1, 2184 fow_enable => 1,
2020 fow_intensity => 0.45, 2185 fow_intensity => 0.45,
2021 fow_smooth => 0, 2186 fow_smooth => 0,
2187 map_smoothing => 1,
2022 gui_fontsize => 1, 2188 gui_fontsize => 1,
2023 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2191 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
2027 mapsize => 100, 2193 mapsize => 100,
2028 say_command => 'say', 2194 say_command => 'chat',
2029 audio_enable => 1, 2195 audio_enable => 1,
2030 bgm_enable => 1, 2196 bgm_enable => 1,
2031 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
2032 face_prefetch => 0, 2198 face_prefetch => 0,
2033 output_sync => 1, 2199 output_sync => 1,
2034 output_count => 1, 2200 output_count => 1,
2201 output_rate => "",
2035 pickup => 0, 2202 pickup => 0,
2036 inv_sort => "mtime", 2203 inv_sort => "mtime",
2037 default => "profile", # default profile 2204 default => "profile", # default profile
2038 show_tips => 1, 2205 show_tips => 1,
2206 logview_max_par => 1000,
2039 ); 2207 );
2040 2208
2041 while (my ($k, $v) = each %DEF_CFG) { 2209 while (my ($k, $v) = each %DEF_CFG) {
2042 $CFG->{$k} = $v unless exists $CFG->{$k}; 2210 $CFG->{$k} = $v unless exists $CFG->{$k};
2043 } 2211 }
2044 2212
2045 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2213 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2214 $PROFILE = $CFG->{profile}{default};
2215
2216 # convert old bindings (only default profile matters)
2217 if (my $bindings = delete $PROFILE->{bindings}) {
2218 while (my ($mod, $syms) = each %$bindings) {
2219 while (my ($sym, $cmds) = each %$syms) {
2220 push @{ $PROFILE->{macro} }, {
2221 accelkey => [$mod*1, $sym*1],
2222 action => $cmds,
2223 };
2224 }
2225 }
2226 }
2046 2227
2047 sdl_init; 2228 sdl_init;
2048 2229
2049 @SDL_MODES = reverse 2230 @SDL_MODES = reverse
2050 grep $_->[0] >= 640 && $_->[1] >= 480, 2231 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2087# } 2268# }
2088# my $t2 = Time::HiRes::time; 2269# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2270# warn $t2-$t1;
2090# } 2271# }
2091 2272
2273 $startup_done->();
2274
2092 video_init; 2275 video_init;
2093 audio_init; 2276 audio_init;
2094} 2277}
2095 2278
2096show_tip_of_the_day if $CFG->{show_tips}; 2279show_tip_of_the_day if $CFG->{show_tips};
2097 2280
2098Event::loop; 2281Event::loop;
2099#CFPlus::SDL_Quit; 2282#CFPlus::SDL_Quit;
2100#CFPlus::_exit 0; 2283#CFPlus::_exit 0;
2101 2284
2285END {
2102END { CFPlus::SDL_Quit } 2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop;
2288}
2103 2289
2104=head1 NAME 2290=head1 NAME
2105 2291
2106cfplus - A Crossfire+ and Crossfire game client 2292cfplus - A Crossfire+ and Crossfire game client
2107 2293

Diff Legend

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