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.156 by root, Sun Jun 24 19:17:47 2007 UTC

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

Diff Legend

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